From 8224711ae05d55c2325b1761b6854b30a2c402d5 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Wed, 4 Aug 2021 14:20:19 +0800
Subject: [PATCH] no message

---
 components/add-tips/index.js        |  6 ++++--
 pages/home/customer-list/index.wxml |  4 +---
 pages/home/index/index.js           |  3 +++
 pages/login/index.js                | 19 +++++++------------
 pages/ztbvip/member/index.js        |  6 ++++++
 pages/ztbvip/member/index.wxml      |  3 +--
 6 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/components/add-tips/index.js b/components/add-tips/index.js
index c044222..50c03ec 100644
--- a/components/add-tips/index.js
+++ b/components/add-tips/index.js
@@ -29,7 +29,9 @@ Component({
   },
   lifetimes: {
     attached: function() {
-      if (wx.getStorageSync(STORAGE_KEY)) return;
+      if (wx.getStorageSync(STORAGE_KEY)) {
+        return
+      }
       let rect = wx.getMenuButtonBoundingClientRect ? wx.getMenuButtonBoundingClientRect() : null
       let {screenWidth} = wx.getSystemInfoSync()
       this.setData({
@@ -41,7 +43,7 @@ Component({
         this.setData({ SHOW_TOP: true })
       }, 500)
       this.duraTimer = setTimeout(() => {
-        this.hidden();
+        this.hidden()
       }, (this.data.duration + this.data.delay) * 1000)
     },
     detached: function() {
diff --git a/pages/home/customer-list/index.wxml b/pages/home/customer-list/index.wxml
index 4a26c87..5be4fd2 100644
--- a/pages/home/customer-list/index.wxml
+++ b/pages/home/customer-list/index.wxml
@@ -107,9 +107,7 @@
   catchtouchstart="touchStart" catchtouchmove="touchMove" catchtouchend="touchEnd" catchtouchcancel="touchEnd">
   <text wx:for="{{orderList}}" wx:key="index" class="list-text" style="height:{{itemHeight}}rpx;color:{{index == touchmoveIndex ? '#008AFF' : '#333333'}}">{{item.sign}}</text>
 </view>
-<view class="list-alert" wx:if="{{touchmove && orderList[touchmoveIndex].sign}}">
-  {{orderList[touchmoveIndex].sign}}
-</view>
+<view class="list-alert" wx:if="{{touchmove && orderList[touchmoveIndex].sign}}">{{orderList[touchmoveIndex].sign}}</view>
 
 <!-- <van-popup show="{{ show }}" custom-style="background: transparent;" bind:close="onClickHide">
   <view class="flex flex-center flex-column" catch:tap="noop">
diff --git a/pages/home/index/index.js b/pages/home/index/index.js
index 6dbcafb..798f5e5 100644
--- a/pages/home/index/index.js
+++ b/pages/home/index/index.js
@@ -60,6 +60,9 @@ Component({
         nickname = app.userInfo.realName.substring(0, 14)
       }
       getFactoryLicence().then(result => {
+        if(!result.data.expirationTime){
+          return
+        }
         app.userInfo.expirationTime = result.data.expirationTime.substring(0, 10)
         app.userInfo.isExpiration = result.data.isExpiration
         this.setData({
diff --git a/pages/login/index.js b/pages/login/index.js
index d7905a2..856f5ae 100644
--- a/pages/login/index.js
+++ b/pages/login/index.js
@@ -45,9 +45,6 @@ Page({
         this.data.url += '?' + options.key + '=' + options.value
       }
     }
-    this.wxLogin()
-  },
-  onReady: function () {
     app.globalData.token = app.globalData.token || storage.get('Authorization')
     if(this.data.code){
       this.fetchQrCode(this.data.code)
@@ -55,6 +52,13 @@ Page({
       this.setData({ loging: true})
       this.fetchUserInfo(app.globalData.token)
     }
+    wx.login({
+      success: res => {
+        wechatApplet({ authCode: res.code }).then(result => {
+          storage.put('tmpAuthToken', result.data.tmpAuthToken, 98)
+        })
+      }
+    })
   },
   /************************************** 获取用户信息，进行登录  ********************************************/
   checkFactoryId: function(storageFactoryId){
@@ -194,15 +198,6 @@ Page({
       this.setData({ loging: false})
     })
   },
-  wxLogin: function(){
-    wx.login({
-      success: res => {
-        wechatApplet({ authCode: res.code }).then(result => {
-          storage.put('tmpAuthToken', result.data.tmpAuthToken, 98)
-        })
-      }
-    })
-  },
   /************************************** 注册流程  ********************************************/
   readAgreement: function () {
     if(this.data.loging){
diff --git a/pages/ztbvip/member/index.js b/pages/ztbvip/member/index.js
index c2355ca..d265007 100644
--- a/pages/ztbvip/member/index.js
+++ b/pages/ztbvip/member/index.js
@@ -23,6 +23,9 @@ Scene({
 		wx.showLoading({ title: '加载中', mask: true })
 		if(util.isEmpty(app.userInfo.expirationTime)){
 			getFactoryLicence().then(result => {
+				if(!result.data.expirationTime){
+          return
+        }
 				app.userInfo.expirationTime = result.expirationTime.substring(0, 10)
 				app.userInfo.isExpiration = result.isExpiration
 				this.setData({ expirationTime:app.userInfo.expirationTime, isExpiration: result.isExpiration })
@@ -46,6 +49,9 @@ Scene({
 	onEvent: function(message){
     if (message.what == 300) {
       getFactoryLicence().then(result => {
+				if(!result.data.expirationTime){
+          return
+        }
 				app.userInfo.expirationTime = result.data.expirationTime.substring(0, 10)
 				app.userInfo.isExpiration = result.data.isExpiration
 				this.setData({ expirationTime: app.userInfo.expirationTime, isExpiration: result.data.isExpiration })
diff --git a/pages/ztbvip/member/index.wxml b/pages/ztbvip/member/index.wxml
index 553a5d0..1b93dd5 100644
--- a/pages/ztbvip/member/index.wxml
+++ b/pages/ztbvip/member/index.wxml
@@ -13,8 +13,7 @@
           <van-tag round type="warning" wx:if="{{isExpiration}}">已逾期</van-tag>
         </view>
 				<view class="flex flex-center" style="font-size:28rpx;">
-					<!-- <text class="text-black">{{vipInfo.isVIP==1?'付费会员':'非会员'}}</text> -->
-					<text style="font-size:12px;color: #6f6f6f;">到期时间：{{expirationTime}}</text>
+					<text style="font-size:12px;color: #6f6f6f;">到期时间：{{expirationTime || '- -'}}</text>
 				</view>
 			</view>
       <view class="cu-btn vip-btn" bindtap="vipForm">立即续费</view>