Merge branch 'master' of http://8.140.50.127:3000/JSY/jsy-app

pages/agreement.vue

@@ -1,11 +1,22 @@
 <template>
-	<view class="login-container">
+	<view class="login-container" v-if="showPop">
 		<view class="title">
 			<image :src="appInfo.logo"></image>
 			<text>{{appInfo.name}}</text>
 		</view>
-		<view class="login-form-content" v-if="!showPop">
-			<u-loading-icon size="50" mode="circle" :vertical="true" text="页面加载中" />
+		<view class="bottom_text">
+			<view>浙ICP备2023018079号-2A</view>
+			<view>浙江及时雨智能灌溉设备有限责任公司</view>
+		</view>
+	</view>
+	<view class="login-container" v-else style="background-image: url(../static/images/login/login_bg1.png);">
+		<view class="title">
+			<image :src="appInfo.logo"></image>
+			<text>{{appInfo.name}}</text>
+		</view>
+		<view class="login-form-content" >
+			<image src="/static/images/login/jz.gif" style="width: 120px; height: 120px;margin-top: 50%;" :vertical="true"></image>
+			<!-- <u-loading-icon size="50" mode="circle" :vertical="true" text="数据恢复中" /> -->
 			<u-button size="large" text="重新登录" @click="reLoginFun" v-if="reLogin" />
 		</view>
 		<view class="bottom_text">
@@ -13,7 +24,6 @@
 			<view>浙江及时雨智能灌溉设备有限责任公司</view>
 		</view>
 	</view>
-
 	<!-- 协议弹窗 -->
 	<u-popup mode="center" :show="showPop" :is-mask-click="false">
 		<view style="background: #f3f3f3;max-width: 70vw;padding: 10px;    border-radius: 5px;">
@@ -64,7 +74,7 @@
 
 	onLoad(() => {
 		loginJS.hasToken().then(res => {
-			showPop.value = true;
+			showPop.value = false;
 			// 登录
 			loginJS.getInfo().then(() => {
 				uni.switchTab({