bug处理

src/app.json

@@ -103,7 +103,7 @@
     },
     {
       "root": "doc",
-      "pages": ["pages/doc1/index"]
+      "pages": ["pages/doc1/index", "pages/doc2/index"]
     }
   ],
   "preloadRule": {},

src/components/patient-tab-bar/index.wxml

@@ -4,7 +4,7 @@
       class="tab-item"
       bind:tap="handleNav"
       data-index="{{index}}"
-      icon="{{imageUrl}}tabbar/{{active==index ? item.iconActive: item.icon}}.png"
+      icon="{{imageUrl}}tabbar/{{active==index ? item.iconActive: item.icon}}.png?r=1"
     >
       <view class="name {{index==active && 'active'}}">{{item.text}}</view>
       <view class="hot"></view>

src/doc/pages/doc2/index.json

@@ -0,0 +1,9 @@
+{
+  "navigationStyle": "default",
+  "navigationBarTitleText": "协议相关",
+  "usingComponents": {
+    "mp-html": "mp-html",
+    "van-tab": "@vant/weapp/tab/index",
+    "van-tabs": "@vant/weapp/tabs/index"
+  }
+}

src/doc/pages/doc2/index.scss

@@ -0,0 +1,3 @@
+.page{
+  padding: 0 40rpx;
+}

src/doc/pages/doc2/index.wxml

@@ -0,0 +1,4 @@
+<van-tabs active="{{ active }}" color="#B982FF" sticky swipeable bind:change="onChange">
+  <van-tab title="用户协议"><mp-html content="{{doc}}"></mp-html></van-tab>
+  <van-tab title="隐私政策"><mp-html content="{{doc}}"></mp-html></van-tab>
+</van-tabs>

src/pages/login/index.ts

@@ -169,6 +169,13 @@ Page({
     })
   },
   handlePatient() {
+    const { isLogin, loginType, isNewReg } = app.globalData
+    if (isLogin == 1 && loginType == 1 && isNewReg == 1) {
+      wx.reLaunch({
+        url: '/patient/pages/index/index',
+      })
+      return
+    }
     wx.redirectTo({
       url: '/patient/pages/login/index',
     })
@@ -197,9 +204,9 @@ Page({
       popupShow: false,
     })
   },
-  handleBack(){
+  handleBack() {
     wx.navigateBack()
-  }
+  },
 })
 
 export {}

src/patient/pages/enterInfo/index.ts

@@ -156,7 +156,7 @@ Page({
     }).then(() => {
       app.startLogin(() => {
         wx.reLaunch({
-          url: '/patient/pages/index/index',
+          url: '/patient/pages/index/index?visitors=1',
         })
       })
     })

src/patient/pages/index/index.ts

@@ -50,6 +50,13 @@ Page({
   onLoad(options) {
     const systemInfo = wx.getSystemInfoSync()
 
+    if (options.visitors === '1') {
+      wx.showToast({
+        title: '未完成注册，登录失败',
+        icon: 'none',
+      })
+    }
+
     app.zdGetTheme().then((res) => {
       this.setData({
         theme: res,

src/patient/pages/live/index.wxml

@@ -62,7 +62,7 @@
             >
               <view class="btn active" wx:if="{{item.SignUpStatus==1}}">审核中</view>
               <block wx:elif="{{item.SignUpStatus==2}}">
-                <view class="btn" wx:if="{{item.BeginTimeValue * 1 < dateValue * 1}}">参会</view>
+                <view class="btn" wx:if="{{item.BeginTimeValue * 1 < dateValue * 1}}">点此参加</view>
                 <view class="btn active" wx:else>已报名</view>
               </block>
               <block wx:elif="{{item.SignUpStatus==3}}">

src/patient/pages/login/index.wxml

@@ -30,9 +30,9 @@
         ></image>
         <view class="a-content">
           我已阅读并同意
-          <text class="link" bind:tap="handleLink" data-url="/doc/patient/pages/doc2/index">《用户协议》</text>
+          <text class="link" bind:tap="handleLink" data-url="/doc/pages/doc2/index">《用户协议》</text>
           和
-          <text class="link" bind:tap="handleLink" data-url="/doc/patient/pages/doc2/index">《隐私政策》</text>
+          <text class="link" bind:tap="handleLink" data-url="/doc/pages/doc2/index?active=1">《隐私政策》</text>
         </view>
       </view>
       <view class="a-col">
@@ -52,7 +52,7 @@
         ></image>
         <view class="a-content">
           我同意依照此
-          <text class="link" bind:tap="handleLink" data-url="/doc/patient/pages/doc2/index">《隐私政策》</text>
+          <text class="link" bind:tap="handleLink" data-url="/doc/pages/doc2/index?active=1">《隐私政策》</text>
           规定收集我的个人敏感信息
         </view>
       </view>

src/patient/pages/my/index.wxml

@@ -52,7 +52,7 @@
           <van-icon name="arrow" />
         </view>
       </view>
-      <view bind:tap="routerTo" class="row" data-url="">
+      <view bind:tap="routerTo" class="row" data-url="/doc/pages/doc2/index">
         <view class="col">
           <image class="icon" src="{{imageUrl}}icon35.png?t={{Timestamp}}"></image>
           协议相关