正式上线前集中优化改进

project.config.json

@@ -66,7 +66,7 @@
     ],
     "include": []
   },
-  "appid": "wxa4ece062e60e93a5",
+  "appid": "wxfc95e2961d481f58",
   "scripts": {
     "beforeCompile": "pnpm run beforeCompile",
     "beforePreview": "pnpm run beforeCompile",

src/app.ts

@@ -25,16 +25,16 @@ App<IAppOption>({
   globalData: {
     // dev
     // appid:wxa4ece062e60e93a5
-    url: 'https://m.wtx.hbraas.com',
-    upFileUrl: 'https://m.wtx.hbraas.com/',
-    imageUrl: 'https://m.wtx.hbraas.com/GeneB/',
+    // url: 'https://m.wtx.hbraas.com',
+    // upFileUrl: 'https://m.wtx.hbraas.com/',
+    // imageUrl: 'https://m.wtx.hbraas.com/GeneB/',
 
     // pro
     // appid:wx96104303877e3fd9 老的正式环境，已弃用
     // appid:wxfc95e2961d481f58
-    // url: 'https://m.hbgene.hbsaas.com',
-    // upFileUrl: 'https://m.hbgene.hbsaas.com/',
-    // imageUrl: 'https://m.hbgene.hbsaas.com/GeneB/',
+    url: 'https://m.hbgene.hbsaas.com',
+    upFileUrl: 'https://m.hbgene.hbsaas.com/',
+    imageUrl: 'https://m.hbgene.hbsaas.com/GeneB/',
 
     Timestamp: new Date().getTime(),
 

src/components/popup/index.scss

@@ -1217,6 +1217,40 @@
   }
 }
 
+.popup20 {
+  .badge {
+    position: relative;
+    z-index: 1;
+    display: block;
+    margin: 0 auto;
+    width: 220rpx;
+    height: 278rpx;
+  }
+  .container {
+    margin-top: -150rpx;
+    padding: 166rpx 60rpx 48rpx;
+    background: linear-gradient(180deg, #ffe8e4 0%, #ffffff 56.28%, #ffffff 100%);
+    border-radius: 48rpx;
+    .title {
+      text-align: center;
+      font-size: 32rpx;
+      color: #010105;
+    }
+    .submit {
+      margin: 32rpx auto 0;
+      width: 440rpx;
+      height: 88rpx;
+      font-size: 32rpx;
+      color: #ffffff;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      background: linear-gradient(184deg, #f23a2f 0%, #fc684f 100%);
+      border-radius: 84rpx 84rpx 84rpx 84rpx;
+    }
+  }
+}
+
 .close {
   margin: 32rpx auto 0;
   display: block;

src/components/popup/index.wxml

@@ -380,6 +380,15 @@
       </view>
     </view>
   </view>
+  <view class="popup20" wx:elif="{{type==='touristsInviteCode'}}">
+    <image class="badge" src="{{imageUrl}}icon125.png?t={{Timestamp}}"></image>
+    <view class="container">
+      <view class="title">
+        请您扫描医生专属邀约码加入
+      </view>
+      <view class="submit" bind:tap="handleOk">我知道了</view>
+    </view>
+  </view>
   <image
     wx:if="{{params.close}}"
     class="close"

src/doctor/pages/askDoctor/index.scss

@@ -231,7 +231,7 @@ page {
               display: flex;
               align-items: center;
               justify-content: center;
-              background: linear-gradient( 356deg, #1D6BFF 0%, #4F8DFF 100%);
+              background: linear-gradient(356deg, #1d6bff 0%, #4f8dff 100%);
             }
           }
         }
@@ -314,6 +314,21 @@ page {
           }
         }
       }
+      .module-list-none {
+        margin-top: 156px;
+        .icon {
+          margin: 0 auto;
+          display: block;
+          width: 466rpx;
+          height: 276rpx;
+        }
+        .content {
+          margin: 38rpx 0 0;
+          text-align: center;
+          font-size: 32rpx;
+          color: #abaeb4;
+        }
+      }
       .place {
         height: 15vh;
       }
@@ -386,6 +401,21 @@ page {
       }
     }
   }
+  .list-none {
+    margin-top: 26px;
+    .icon {
+      margin: 0 auto;
+      display: block;
+      width: 310rpx;
+      height: 184rpx;
+    }
+    .content {
+      margin: 8rpx 0 0;
+      text-align: center;
+      font-size: 28rpx;
+      color: rgba(1, 1, 5, 0.4);
+    }
+  }
   .submit {
     margin-top: 24rpx;
     width: 690rpx;
@@ -398,5 +428,8 @@ page {
     align-items: center;
     justify-content: center;
     border-radius: 64rpx 64rpx 64rpx 64rpx;
+    &.dsiable{
+      background: #cfd1d5;
+    }
   }
 }

src/doctor/pages/askDoctor/index.ts

@@ -39,6 +39,7 @@ Page({
     questionActiveList: [] as any[],
     headerQuestionList: [] as any,
 
+    isRequestEnd: false,
     isLoad: false,
     isFinish: false,
     messageList: [
@@ -142,6 +143,7 @@ Page({
         isVisitAdl: res.isVisitAdl,
         adlMsgId: res.adlMsgId,
         isLoad: false,
+        isRequestEnd: true,
         isFinish: nextMsgId === res.nextMsgId,
       })
       this.filterCreateTime()
@@ -241,7 +243,6 @@ Page({
   handleSendWord() {
     const { messageList, wordList, wordIndex, userInfo } = this.data
     const { wordId, word } = wordList[wordIndex]
-    console.log(wordList[wordIndex])
     this.setData({
       messageList: [
         ...messageList,
@@ -303,8 +304,8 @@ Page({
                   Clinic: clinic,
                   ClinicType: clinicType,
                 },
-                doctorAvatar: doctorAvatar,
-                doctorName: doctorName,
+                doctorAvatar,
+                doctorName,
               },
             ],
           })

src/doctor/pages/askDoctor/index.wxml

@@ -1,3 +1,5 @@
+<page-meta page-style="{{ messageListShow ? 'overflow: hidden;' : '' }}" />
+
 <navbar fixed title="问医生" custom-style="background:{{background}}" back>
   <van-icon name="arrow-left" slot="left" size="18px" color="#000" bind:tap="handleBack" />
 </navbar>
@@ -100,6 +102,10 @@
           </view>
         </view>
       </view>
+      <view class="module-list-none" wx:if="{{!messageList.length && isRequestEnd}}">
+        <image class="icon" src="{{imageUrl}}icon126.png?t={{Timestamp}}"></image>
+        <view class="content">常见的问题正在更新中哦~</view>
+      </view>
       <view id="place" class="place"></view>
     </scroll-view>
   </view>
@@ -127,7 +133,7 @@
 >
   <view class="popup-message">
     <view class="title">发送消息</view>
-    <view class="list">
+    <view class="list" wx:if="{{wordList.length}}">
       <view
         class="l-item {{wordIndex===index && 'active'}}"
         wx:for="{{wordList}}"
@@ -138,7 +144,11 @@
         {{item.word}}
       </view>
     </view>
-    <view class="submit" bind:tap="handleSendWord">发送</view>
+    <view class="list-none" wx:else>
+      <image class="icon" src="{{imageUrl}}icon126.png?t={{Timestamp}}"></image>
+      <view class="content">常见的回答正在更新中哦~</view>
+    </view>
+    <view class="submit {{!wordList.length && 'dsiable'}}" bind:tap="handleSendWord">发送</view>
   </view>
 </van-popup>
 

src/pages/ask/index.scss

@@ -67,6 +67,21 @@ page {
           }
         }
       }
+      .module-list-none {
+        margin-top: 156px;
+        .icon {
+          margin: 0 auto;
+          display: block;
+          width: 466rpx;
+          height: 276rpx;
+        }
+        .content {
+          margin: 38rpx 0 0;
+          text-align: center;
+          font-size: 32rpx;
+          color: #ABAEB4;
+        }
+      }
       .date {
         padding-top: 20rpx;
         font-size: 28rpx;
@@ -550,11 +565,20 @@ page {
           color: rgba(40, 48, 49, 1);
         }
       }
-      .none {
-        display: block;
-        margin: 30rpx auto;
-        width: 344rpx;
-        max-height: 302rpx;
+      .list-none {
+        margin-top: 26px;
+        .icon {
+          margin: 0 auto;
+          display: block;
+          width: 310rpx;
+          height: 184rpx;
+        }
+        .content {
+          margin: 8rpx 0 0;
+          text-align: center;
+          font-size: 28rpx;
+          color: rgba(1, 1, 5, 0.4);
+        }
       }
     }
   }

src/pages/ask/index.ts

@@ -31,6 +31,7 @@ Page({
     questionActiveList: [] as any[],
     headerQuestionList: [] as any,
 
+    isRequestEnd: false,
     isLoad: false,
     isFinish: false,
     messageList: [] as IMessageItem[],
@@ -72,6 +73,7 @@ Page({
     }).then((res) => {
       this.setData({
         headerQuestionList: res.list,
+        isRequestEnd: true,
       })
     })
   },

src/pages/ask/index.wxml

@@ -82,6 +82,10 @@
           </view>
         </view>
       </view>
+      <view class="module-list-none" wx:if="{{!headerQuestionList.length && !messageList.length && isRequestEnd}}">
+        <image class="icon" src="{{imageUrl}}icon124.png?t={{Timestamp}}"></image>
+        <view class="content">常见的问题正在更新中哦~</view>
+      </view>
       <view id="place" class="place"></view>
     </scroll-view>
   </view>
@@ -114,7 +118,10 @@
         <view class="content">{{item.Question}}</view>
         <van-icon color="#ADB3B4" name="arrow" />
       </view>
-      <image class="none" src="{{imageUrl}}none.png" mode="widthFix" wx:if="{{!questionActiveList.length}}"></image>
+      <view class="list-none" wx:if="{{!questionActiveList.length}}">
+        <image class="icon" src="{{imageUrl}}icon124.png?t={{Timestamp}}"></image>
+        <view class="content">常见的问题正在更新中哦~</view>
+      </view>
     </view>
   </view>
 </view>

src/pages/index/index.scss

@@ -31,7 +31,7 @@
     z-index: 1;
     margin-top: -80rpx;
     padding: 42rpx 40rpx;
-    background: linear-gradient(346deg, #f7f7fa 0%, #ffe5dc 100%);
+    background: linear-gradient(14deg, #f7f7fa 0%,#f7f7fa 40%, #ffe5dc 100%);
     border-radius: 32rpx 32rpx 0 0;
     .apply {
       position: relative;
@@ -247,6 +247,21 @@
           }
         }
       }
+      .module-list-none {
+        margin-top: 26px;
+        .icon {
+          margin: 0 auto;
+          display: block;
+          width: 310rpx;
+          height: 184rpx;
+        }
+        .content {
+          margin: 8rpx 0 0;
+          text-align: center;
+          font-size: 28rpx;
+          color: rgba(1, 1, 5, 0.4);
+        }
+      }
     }
   }
 }

src/pages/index/index.wxml

@@ -23,7 +23,7 @@
       <image wx:else class="a-img" src="{{imageUrl}}index-apply.png?t={{Timestamp}}"></image>
       <view class="content">
         <view class="c-title" wx:if="{{applyWord.ApplyButtonWordOne}}">{{applyWord.ApplyButtonWordOne}}</view>
-        <view class="c-content"  wx:if="{{applyWord.ApplyButtonWordTwo}}">{{applyWord.ApplyButtonWordTwo}}</view>
+        <view class="c-content" wx:if="{{applyWord.ApplyButtonWordTwo}}">{{applyWord.ApplyButtonWordTwo}}</view>
       </view>
       <image
         wx:if="{{userInfo.ApplyIntentionId}}"
@@ -61,7 +61,7 @@
           <image class="icon" src="{{imageUrl}}icon1.png?t={{Timestamp}}"></image>
         </view>
       </view>
-      <view class="module-list">
+      <view class="module-list" wx:if="{{questionList.length}}">
         <view class="module-item" wx:for="{{questionList}}" wx:key="Id" bindtap="handleAskItem" data-id="{{item.Id}}">
           <view class="item-header">
             <image class="icon" src="{{imageUrl}}icon2.png?t={{Timestamp}}"></image>
@@ -77,6 +77,10 @@
           </view>
         </view>
       </view>
+      <view class="module-list-none" wx:else>
+        <image class="icon" src="{{imageUrl}}icon124.png?t={{Timestamp}}"></image>
+        <view class="content">常见的问题正在更新中哦~</view>
+      </view>
     </view>
   </view>
 </view>

src/pages/my/index.ts

@@ -3,9 +3,12 @@ const app = getApp<IAppOption>()
 Page({
   data: {
     popupShow: false,
-    popupType: 'stayTuned',
+    // popupType: 'stayTuned',
+    popupType: 'touristsInviteCode',
     popupParams: {},
 
+    userInfo: {} as any,
+
     showPatient: false,
     applyWord: {
       ApplyButtonWordOne: '',
@@ -91,6 +94,28 @@ Page({
       popupShow: false,
     })
   },
+  handlePopupOk() {
+    this.setData({
+      popupShow: false,
+    })
+  },
+  handlePatient(e) {
+    const { url, pname } = e.currentTarget.dataset
+    const { userInfo } = this.data
+    if (pname) {
+      app.mpBehavior({ PageName: pname })
+    }
+    if (userInfo.PatientId <= 0) {
+      this.setData({
+        popupShow: true,
+        popupType: 'touristsInviteCode',
+      })
+      return
+    }
+    wx.navigateTo({
+      url,
+    })
+  },
   routerTo(e: any) {
     const { url, pname } = e.currentTarget.dataset
     if (pname) {

src/pages/my/index.wxml

@@ -37,7 +37,7 @@
     <view class="list-header">
       <view class="name">切换身份</view>
     </view>
-    <view class="item" bind:tap="routerTo" data-url="/patient/pages/login/index" data-pname="BTN_MY_SWITCHPATIENT">
+    <view class="item" bind:tap="handlePatient" data-url="/patient/pages/login/index" data-pname="BTN_MY_SWITCHPATIENT">
       <image class="icon" src="{{imageUrl}}icon13.png?t={{Timestamp}}"></image>
       <view class="wrap">
         <view class="name">我已开启基因治疗</view>
@@ -56,4 +56,4 @@
   </view>
 </view>
 
-<popup model:show="{{popupShow}}" type="{{popupType}}" params="{{popupParams}}" bind:cancel="handlePopupCancel"></popup>
+<popup model:show="{{popupShow}}" type="{{popupType}}" params="{{popupParams}}" bind:cancel="handlePopupCancel" bind:ok="handlePopupOk"></popup>

src/patient/pages/askPatient/index.scss

@@ -307,6 +307,21 @@ page {
           }
         }
       }
+      .module-list-none {
+        margin-top: 156px;
+        .icon {
+          margin: 0 auto;
+          display: block;
+          width: 466rpx;
+          height: 276rpx;
+        }
+        .content {
+          margin: 38rpx 0 0;
+          text-align: center;
+          font-size: 32rpx;
+          color: #ABAEB4;
+        }
+      }
       .place {
         height: 15vh;
       }
@@ -433,11 +448,20 @@ page {
             color: rgba(40, 48, 49, 1);
           }
         }
-        .none {
-          display: block;
-          margin: 30rpx auto;
-          width: 344rpx;
-          max-height: 302rpx;
+        .list-none {
+          margin-top: 26px;
+          .icon {
+            margin: 0 auto;
+            display: block;
+            width: 310rpx;
+            height: 184rpx;
+          }
+          .content {
+            margin: 8rpx 0 0;
+            text-align: center;
+            font-size: 28rpx;
+            color: rgba(1, 1, 5, 0.4);
+          }
         }
       }
     }

src/patient/pages/askPatient/index.ts

@@ -35,6 +35,7 @@ Page({
     questionActiveList: [] as any[],
     headerQuestionList: [] as any,
 
+    isRequestEnd: false,
     isLoad: false,
     isFinish: false,
     messageList: [
@@ -131,6 +132,7 @@ Page({
         adlMsgId: res.adlMsgId,
         isLoad: false,
         isFinish: nextMsgId === res.nextMsgId,
+        isRequestEnd: true,
       })
       this.filterCreateTime()
       if (!nextMsgId) {

src/patient/pages/askPatient/index.wxml

@@ -108,6 +108,10 @@
           </view>
         </view>
       </view>
+      <view class="module-list-none" wx:if="{{!messageList.length && isRequestEnd}}">
+        <image class="icon" src="{{imageUrl}}icon124.png?t={{Timestamp}}"></image>
+        <view class="content">常见的问题正在更新中哦~</view>
+      </view>
       <view id="place" class="place"></view>
     </scroll-view>
   </view>
@@ -148,7 +152,10 @@
           <view class="content">{{item.question}}</view>
           <van-icon color="#ADB3B4" name="arrow" />
         </view>
-        <image class="none" src="{{imageUrl}}none.png" mode="widthFix" wx:if="{{!questionActiveList.length}}"></image>
+        <view class="list-none" wx:if="{{!questionActiveList.length}}">
+          <image class="icon" src="{{imageUrl}}icon124.png?t={{Timestamp}}"></image>
+          <view class="content">常见的问题正在更新中哦~</view>
+        </view>
       </view>
     </view>
   </view>