更新 登录页面逻辑

miniprogram/app.json

@@ -25,7 +25,7 @@
     "selectedColor": "#1195db",
     "color": "#8a8a8a",
     "list": [{
-        "pagePath": "pages/index/index",
+        "pagePath": "pages/takePhoto/takePhoto",
         "text": "随身拍",
         "selectedIconPath": "./images/tabs/camera-.png",
         "iconPath": "./images/tabs/camera.png"

miniprogram/pages/index/index.js

@@ -27,7 +27,7 @@ Page({
       })
     }
 
-    wx.navigateTo({
+    wx.switchTab({
       url: '/pages/takePhoto/takePhoto',
     })
 

miniprogram/pages/newCachePage/newCachePage.js

@@ -185,7 +185,7 @@ Page({
           try {
             let res = await postApi('/user/wx/login', {
               openId: wx.getStorageSync('openId'),
-              phone
+              phone: 18988988889
             })
             console.log(res)
             if (res.data.status == 0) {

miniprogram/pages/securityCheck/securityCheck.js

@@ -32,10 +32,9 @@ Page({
       })
       this.getList()
     } else {
-      wx.navigateTo({
+      wx.switchTab({
         url: '/pages/takePhoto/takePhoto',
       })
-
     }
   },
   async getList() {
@@ -147,9 +146,13 @@ Page({
   },
   onPullDownRefresh() {
     this.getList()
-
+  },
+  onShow() {
+    this.setData({
+      loginStatus: wx.getStorageSync('userId')
+    })
   },
   onLoad(options) {
-    this.getList()
+    // this.getList()
   },
 })

miniprogram/pages/securityCheck/securityCheck.wxml

@@ -1,10 +1,18 @@
-<view wx:if="{{loginStatus}}" class="box mb30" wx:for="{{list}}" wx:key="id">
-  <view class="title mb10">{{item.checkItemName}}</view>
-  <view wx:if="{{item.viewUrl}}">
-    <image wx:if="{{item.isImage}}" class="img" src="{{item.viewUrl}}"></image>
-    <video wx:else class="img" src="{{item.viewUrl}}"></video>
+<view wx:if="{{loginStatus}}">
+  <view wx:if="{{list.length}}">
+    <view class="box mb30" wx:for="{{list}}" wx:key="id">
+      <view class="title mb10">{{item.checkItemName}}</view>
+      <view wx:if="{{item.viewUrl}}">
+        <image wx:if="{{item.isImage}}" class="img" src="{{item.viewUrl}}"></image>
+        <video wx:else class="img" src="{{item.viewUrl}}"></video>
+      </view>
+      <view bindtap="uploadMedia" data-id="{{item.id}}" class="take-photo retake mb10" wx:else="">拍照</view>
+      <view class="next retake" bindtap="uploadMedia" data-id="{{item.id}}" wx:if="{{item.viewUrl}}">重拍</view>
+    </view>
+  </view>
+  <view class="tac" style="color: #666;" wx:else="">
+    <view style="font-size: 32rpx;margin-top:10vh;margin-bottom: 10rpx;">暂无数据</view>
+    <view style="font-size: 24rpx;">下拉刷新</view>
   </view>
-  <view bindtap="uploadMedia" data-id="{{item.id}}" class="take-photo retake mb10" wx:else="">拍照</view>
-  <view class="next retake" bindtap="uploadMedia" data-id="{{item.id}}" wx:if="{{item.viewUrl}}">重拍</view>
 </view>
-<view wx:if="{{!loginStatus}}" bindtap="login" class="go">登录</view>
+<view wx:else bindtap="login" class="go">去登录</view>

miniprogram/pages/takeBill/takeBill.js

@@ -59,7 +59,7 @@ Page({
     })
   },
   goBack() {
-    wx.redirectTo({
+    wx.switchTab({
       url: '/pages/takePhoto/takePhoto',
     })
   },

miniprogram/pages/takePhoto/success/success.js

@@ -3,7 +3,7 @@ Page({
     shareImageUrl: ''
   },
   go() {
-    wx.navigateTo({
+    wx.switchTab({
       url: '/pages/takePhoto/takePhoto',
     })
   },

project.private.config.json

@@ -2,67 +2,9 @@
   "condition": {
     "miniprogram": {
       "list": [
-        {
-          "name": "pages/test/test",
-          "pathName": "pages/test/test",
-          "query": "",
-          "scene": null
-        },
-        {
-          "name": "缓存注册船舶",
-          "pathName": "pages/cachePage/cachePage",
-          "query": "",
-          "scene": null
-        },
-        {
-          "name": "",
-          "pathName": "pages/takePhoto/success/success",
-          "query": "",
-          "scene": null
-        },
-        {
-          "name": "",
-          "pathName": "pages/takePhoto/success/success",
-          "query": "",
-          "scene": null
-        },
-        {
-          "name": "",
-          "pathName": "pages/share/share",
-          "query": "shareImageUrl=https://hhd-pat-1255802371.cos.ap-shanghai.myqcloud.com/pat/images/%E8%88%B9%E7%8E%8B1647422492928.?sign=q-sign-algorithm%3Dsha1%26q-ak%3DAKID4xb091cy4tRikV0EBrGOGsCF1WkhMlum%26q-sign-time%3D1647422493%3B93158697600%26q-key-time%3D1647422493%3B93158697600%26q-header-list%3Dhost%26q-url-param-list%3D%26q-signature%3D721ca8bebf3e18a92730897ad52b9bf9036e51b9",
-          "launchMode": "default",
-          "scene": 1007
-        },
-        {
-          "name": "",
-          "pathName": "pages/newCachePage/newCachePage",
-          "query": "",
-          "scene": null
-        },
-        {
-          "name": "",
-          "pathName": "pages/takePhoto/takePhoto",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "",
-          "pathName": "pages/takeBill/takeBill",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "",
-          "pathName": "pages/takeBill/canvas/canvas",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
         {
           "name": "",
-          "pathName": "pages/newCachePage/newCachePage",
+          "pathName": "pages/index/index",
           "query": "",
           "launchMode": "default",
           "scene": null