模考

pages4/login/login.vue

@@ -349,6 +349,7 @@ export default {
 		},
 		// 微信、密码、验证码 登录成功的回调
 		loginCallback(res, types) {
+			console.log('登录页面：', this.isBack)
 			// if(res.data.data && res.data.data.full_info){
 				//信息完善，直接进入页面
 				uni.setStorageSync('user_account', res.data.data.user_account);

pages5/mockExam/examApply.vue

@@ -36,7 +36,7 @@
                     <view class="item_title">
                         <text class="star_red">*</text>
                         <text class="number">03</text>
-                        <text class="category">企业特性</text>
+                        <text class="category">企业名称</text>
                     </view>
                     <u-form-item label=" " label-width="74" prop="companyName" :border-bottom='false'>
                         <view class="inputs">
@@ -132,7 +132,7 @@ export default {
         }
     },
     onLoad(option) {
-        console.log('option: ', option, decodeURIComponent(option.scene))
+        console.log('option--: ', option, decodeURIComponent(option.scene))
         if (option.scene) {
             let tid = decodeURIComponent(option.scene)
             this.activityId = tid.split('=')[1]
@@ -140,9 +140,17 @@ export default {
         }
     },
     onShow() {
-        if (this.$method.isGoLogin()) { // 扫二维码进来的没登录需要跳到登录页，登录后返回
-            return
-        }
+        // if (this.$method.isGoLogin()) { // 扫二维码进来的没登录需要跳到登录页，登录后返回
+        //     return
+        // }
+        console.log('222222222222222')
+        if (!uni.getStorageSync('user_account')) {
+			uni.navigateTo({
+				url: '/pages4/login/login?isBack=true'
+			})
+			return
+		}
+        console.log('33333333333')
         this.getActivity()
     },
     // 必须要在onReady生命周期，因为onLoad生命周期组件可能尚未创建完毕

pages5/mockExam/registrationSuccess.vue

@@ -15,7 +15,7 @@
             </view>
             <view class="middles">
                 <view class="qr_codes">
-                    <image class="code" src="../static/erCode.png"></image>
+                    <image class="code" src="../static/erCode.png" show-menu-by-longpress="true"></image>
                 </view>
                 <view class="discern">长按识别二维码 加活动专属微信号</view>    
             </view>
@@ -46,17 +46,19 @@
         <view class="distance_time">
             <view class="time_item">
                 距模考开始时间还有：
-                <u-count-down :timestamp="startTime" :show-days="true" separator="zh" 
+                <u-count-down v-if="sDay > 1" :timestamp="lastStartDay" :show-days="true" separator="zh" 
 					:show-hours="false" :show-minutes="false" :show-seconds="false" font-size="28"
 					bg-color="#DFECFD" separator-color="#222222" color="#222222" separator-size="28">
 				</u-count-down>
+                <text v-else>0天</text>
             </view>
             <view class="time_item">
                 距模考结束时间还有：
-                <u-count-down :timestamp="endTime" :show-days="true" separator="zh" 
+                <u-count-down v-if="eDay > 1" :timestamp="lastEndDay" :show-days="true" separator="zh" 
 					:show-hours="false" :show-minutes="false" :show-seconds="false" font-size="28"
 					bg-color="#DFECFD" separator-color="#222222" color="#222222" separator-size="28">
 				</u-count-down>
+                <text v-else>0天</text>
             </view>
             <view class="time_item">活动咨询电话：020-87085982/87085982</view>
         </view>
@@ -74,13 +76,21 @@ export default {
         return {
             startTime: '',
             endTime: '',
+            lastStartDay: '',
+            lastEndDay: '',
+            sDay: '',
+            eDay: '',
         }
     },
     onLoad(option) {
         console.log('option: ', option)
-        // option.startTime * 1000   ,1662087489
-        this.startTime = option.startTime - parseInt(curTime/1000)
-        this.endTime = option.endTime - parseInt(curTime/1000)
+        this.startTime = option.startTime
+        this.endTime = option.endTime
+        this.lastStartDay = option.startTime - parseInt(curTime/1000)
+        this.lastEndDay = option.endTime - parseInt(curTime/1000)
+        this.sDay = this.lastStartDay/24/60/60
+        this.eDay = this.lastEndDay/24/60/60
+        console.log('lastStartDay', this.lastStartDay, this.lastEndDay, this.sDay, this.eDay)
     },
     onShow() {