fix: redevelop index pages

pages/index/index.js

@@ -15,9 +15,6 @@ Page({
     cardNo: '',
     cardSecret: '',
     scanTimer: null,
-    scanOverShow: false,
-    scanResMsg: '',
-    scanSuccess: true,
     baseStr: 'data:image/jpg;base64,',
     QRCodeBase64: '',
     qrcodeDialog: false
@@ -41,7 +38,7 @@ Page({
   onShareAppMessage () {
     return {
       title: 'ITTHealth',
-      path: '/page/index/index'
+      path: '/pages/index/index'
     }
   },
   // 获取首页信息
@@ -107,93 +104,34 @@ Page({
       url: '/pages/createFile/createFile?form=index',
     })
   },
-  handleScanCode () {
-    wx.navigateTo({
-      url: '/pages/exchange/exchange?form=index',
-    })
-    return
-    var that = this
-    wx.scanCode({
-      onlyFromCamera: true,
-      scanType: ['barCode','qrCode'],
-      success (res) {
-        wx.vibrateShort({
-          type: 'medium',
-        })
-        var response = res.result
-        if (response.indexOf('|') !== -1) {
-          var code = response.split('|')[0]
-          var password = response.split('|')[1]
-          that.setData({
-            cardNo: code,
-            cardSecret: password
-          })
-          var scantime = setTimeout(() => {
-            that.userEntityRechargeFn()
-          }, 500);
-          that.setData({
-            scanTimer: scantime
-          })
-        } else {
-          wx.showModal({
-            content: '请扫描正确的二维码',
-            confirmColor: '#333',
-            showCancel: false
-          })
+  /*   车子的图片 做跳转交互，跳转做判断，0次则跳出去充值弹框，充值弹窗有两个选择 ：若激活卡，则跳转至实体卡兑换页面；若充值，则跳转至体验卡购买页面 */
+  handlActions () {
+    if (this.data.useNumber == 0) {
+      wx.showModal({
+        title: '去充值',
+        cancelColor: '#666',
+        cancelText: '激活卡',
+        confirmText: '去充值',
+        confirmColor: '#333',
+        success (res) {
+          if (res.confirm) {
+            wx.navigateTo({
+              url: '/pages/buy/buy?form=index',
+            })
+          } else if (res.cancel) {
+            wx.navigateTo({
+              url: '/pages/exchange/exchange',
+            })
+          }
         }
-      }
-    })
-  },
-  // 重新扫描
-  handleRescan () {
-    this.setData({
-      scanOverShow: false,
-      scanResMsg: '',
-      scanSuccess: true
-    })
-    this.handleScanCode()
-  },
-  // 实体卡充值
-  userEntityRechargeFn () {
-    var that = this
-    clearTimeout(that.data.scanTimer)
-    wx.showLoading({
-      title: '充值中...',
-      mask: true
-    })
-    var data = {
-      cardNo: that.data.cardNo,
-      cardSecret: that.data.cardSecret
-    }
-    userEntityRecharge(data).then(res => {
-      wx.hideLoading()
-      console.log(res);
-      this.setData({
-        scanOverShow: true,
-        scanResMsg: res.msg,
-        scanSuccess: true
       })
-    }).catch(e => {
-      wx.hideLoading()
-      this.setData({
-        scanOverShow: true,
-        scanResMsg: e,
-        scanSuccess: false
+    } else {
+      wx.navigateTo({
+        url: '/pages/appointment/appointment'
       })
-    })
-  },
-  onClickHide () {
-    this.setData({
-      scanOverShow: false
-    })
-  },
-  noop () {},
-  //  去预约
-  handleAppointment () {
-    wx.navigateTo({
-      url: '/pages/appointment/appointment?form=index',
-    })
+    }
   },
+
   handleShowQRCode (e) {
     var that = this
     var id = e.currentTarget.dataset.id

pages/index/index.wxml

@@ -7,9 +7,7 @@
           <van-icon name="location" size="20px"/>
           <text class="l-text">{{locationStr}}</text>
         </view>
-        <view class="scan" bindtap="handleScanCode">
-          <van-icon name="scan" size="20px"/>
-        </view>
+        <view class="scan" bindtap="handleScanCode"></view>
       </view>
     </view>
   </view>
@@ -68,7 +66,7 @@
     </view>
     <view class="add-btn absolute-btn ittflex" bindtap="handleAddCheck">添加检测人</view>
   </view>
-  <view class="index-banner">
+  <view class="index-banner" bindtap="handlActions">
     <image class="index-img" src="../../imaes/index.jpg"></image>
   </view>
   <view class="my-dialog" wx:if="{{qrcodeDialog}}" bindtap="handleCloseQRCode">
@@ -76,20 +74,4 @@
       <image class="qr-content" src="{{QRCodeBase64}}"></image>
     </view>
   </view>
-  <van-overlay show="{{ scanOverShow }}" bind:click="onClickHide">
-    <view class="wrapper ittflex">
-      <view class="modal" catch:tap="noop">
-        <view class="status-icon">
-          <image class="status-img" src="{{scanSuccess ? '../../imaes/chenggong@2x.png' : '../../imaes/shibai@2x.png'}}"></image>
-        </view>
-        <view class="status-text">
-          <text class="scan-msg">{{scanResMsg}}</text>
-        </view>
-        <view class="actions ittflex">
-          <view class="status-btn itt-btn success-btn" wx:if="{{scanSuccess}}" bindtap="handleAppointment">立即去预约</view>
-          <view class="status-btn itt-btn rescan-btn" bindtap="handleRescan" wx:else>重新扫描</view>
-        </view>
-      </view>
-    </view>
-  </van-overlay>
 </view>