Merge branch 'develop'

Pages/index/index.js

@@ -20,6 +20,9 @@ Page({
     static_host: api.getStaticHost()
   },
   onConfirmEntry(){
+    this.setData({
+      showEntryTip:false
+    })
     //wx.setStorageSync('hasEntry', true);
   },
   onCloseEntry(){

Pages/index/index.json

@@ -2,6 +2,7 @@
   "component": true,
   "usingComponents": {
     "t-image": "tdesign-miniprogram/image/image",
+    "van-overlay": "@vant/weapp/overlay/index",
     "van-dialog": "@vant/weapp/dialog/index"
   }
 }

Pages/index/index.wxml

@@ -28,7 +28,26 @@
   </view>
   
 </view>
-<van-dialog
+<van-overlay show="{{ showEntryTip }}" >
+ <view class="wrapper">
+  <view class="privacyBox">
+  <view class="title">温馨提示</view>
+<view class="entrymsg" >
+ <view> 亲爱的用户，感谢您信任并使用肝胆相照互联网医院医师端！我们依据最新法律法规的要求，制定了<text class="navigator" bindtap="go" data-url="/Pages/agreement_page/index?agreement_id=9">《隐私协议》</text>。请您仔细阅《隐私协议》，并确认了解我们对您的个人信息处理原则。</view>
+<view>如您同意《隐私协议》，请点击“同意”开始使用我们的产品和服务。</view>
+</view>
+<view class="btnbox">
+   <view class="cancel" bindtap="onCloseEntry">不同意</view>
+  <button id="agree-btn" 
+  plain
+  class="confirm" 
+  open-type="agreePrivacyAuthorization" bindagreeprivacyauthorization="onConfirmEntry">同意并继续</button>
+</view>
+</view>
+ </view>
+</van-overlay> 
+
+ <!-- <van-dialog
   use-slot
   title="温馨提示"
   show="{{ showEntryTip }}"
@@ -46,8 +65,25 @@
 <view>如您同意《隐私协议》，请点击“同意”开始使用我们的产品和服务。</view>
 </view>
 
-</van-dialog>
+</van-dialog>  -->
-<van-dialog
+<van-overlay show="{{ showEntryTip_second }}" >
+ <view class="wrapper">
+  <view class="privacyBox">
+  <view class="title">温馨提示</view>
+<view class="entrymsg" >
+ <view> 很抱歉，如您不同意《隐私协议》，可能无法继续正常使用我们的服务，请您先同意哦~</view>
+</view>
+<view class="btnbox">
+   <view class="cancel" bindtap="onCloseEntry_second">不同意</view>
+  <button id="agree-btn" 
+  plain
+  class="confirm" 
+  bindtap="onConfirmEntry_second">好的</button>
+</view>
+</view>
+ </view>
+</van-overlay> 
+<!-- <van-dialog
   title="温馨提示"
   show="{{ showEntryTip_second }}"
   message="很抱歉，如您不同意《隐私协议》，可能无法继续正常使用我们的服务，请您先同意哦~"
@@ -58,5 +94,5 @@
   bind:confirm="onConfirmEntry_second"
   bind:cancel="onCloseEntry_second"
 >
-</van-dialog>
+</van-dialog> -->
 

Pages/index/index.wxss

@@ -30,4 +30,55 @@
 }
 .navigator{
   color:#3CC7C0
-}
+}
+
+
+.wrapper {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 100%;
+
+}
+.privacyBox {
+  width:90%;
+  background-color: #fff;
+  border-radius: 30rpx;
+}
+.privacyBox .title{
+  margin: 0;
+  text-align: center;
+  font-weight: 500;
+    line-height:24px;
+    padding-top:24px;
+    text-align: center;
+  font-size:16px;
+}
+.btnbox{
+  display: flex;
+  align-items: center;
+  border-top:1rpx solid #efefef;
+  width:100%;
+  font-size: 17px;
+}
+.btnbox .cancel{
+  flex:1;
+  height: 50px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.btnbox .confirm{
+  margin: 0;
+  height: 50px;
+  padding: 0;
+  color: #3CC7C0;
+  flex:1; 
+  font-size: 17px;
+  border: none!important;
+  border-left:1rpx solid #efefef!important;
+  display: flex;
+  background-color: none!important;
+  justify-content: center;
+  align-items: center;
+}

Pages/login/index.js

@@ -88,6 +88,9 @@ Page({
     wx.navigateBack()
   },
   onConfirmEntry(){
+    this.setData({
+      showEntryTip:false
+    })
    // wx.setStorageSync('hasEntry', true);
   },
   onCloseEntry(){
@@ -99,7 +102,7 @@ Page({
   onConfirmEntry_second(){
     this.setData({
       showEntryTip_second:false,
-     // showEntryTip:false,
+      //showEntryTip:false,
     });
     //wx.setStorageSync('hasEntry', true);
     

Pages/login/index.json

@@ -3,6 +3,7 @@
     "van-button": "@vant/weapp/button/index",
     "van-image": "@vant/weapp/image/index", 
     "van-checkbox": "@vant/weapp/checkbox/index",
+    "van-overlay": "@vant/weapp/overlay/index",
     "van-dialog": "@vant/weapp/dialog/index",
     "van-checkbox-group": "@vant/weapp/checkbox-group/index"
   }

Pages/login/index.wxml

@@ -40,7 +40,25 @@
     </view>
   </view>
 </view>
-<van-dialog
+<van-overlay show="{{ showEntryTip }}" >
+ <view class="wrapper">
+  <view class="privacyBox">
+  <view class="title">温馨提示</view>
+<view class="entrymsg" >
+ <view> 亲爱的用户，感谢您信任并使用肝胆相照互联网医院医师端！我们依据最新法律法规的要求，制定了<text class="navigator" bindtap="go" data-url="/Pages/agreement_page/index?agreement_id=9">《隐私协议》</text>。请您仔细阅《隐私协议》，并确认了解我们对您的个人信息处理原则。</view>
+<view>如您同意《隐私协议》，请点击“同意”开始使用我们的产品和服务。</view>
+</view>
+<view class="btnbox">
+   <view class="cancel" bindtap="onCloseEntry">不同意</view>
+  <button id="agree-btn" 
+  plain
+  class="confirm" 
+  open-type="agreePrivacyAuthorization" bindagreeprivacyauthorization="onConfirmEntry">同意并继续</button>
+</view>
+</view>
+ </view>
+</van-overlay> 
+<!-- <van-dialog
   use-slot
   title="温馨提示"
   show="{{ showEntryTip }}"
@@ -58,8 +76,26 @@
 <view>如您同意《隐私协议》，请点击“同意”开始使用我们的产品和服务。</view>
 </view>
 
-</van-dialog>
+</van-dialog>-->
-<van-dialog
+
+<van-overlay show="{{ showEntryTip_second }}" >
+ <view class="wrapper">
+  <view class="privacyBox">
+  <view class="title">温馨提示</view>
+<view class="entrymsg" >
+ <view> 很抱歉，如您不同意《隐私协议》，可能无法继续正常使用我们的服务，请您先同意哦~</view>
+</view>
+<view class="btnbox">
+   <view class="cancel" bindtap="onCloseEntry_second">不同意</view>
+  <button id="agree-btn" 
+  plain
+  class="confirm" 
+  bindtap="onConfirmEntry_second">好的</button>
+</view>
+</view>
+ </view>
+</van-overlay> 
+<!--<van-dialog
   title="温馨提示"
   show="{{ showEntryTip_second }}"
   message="很抱歉，如您不同意《隐私协议》，可能无法继续正常使用我们的服务，请您先同意哦~"
@@ -70,4 +106,4 @@
   bind:confirm="onConfirmEntry_second"
   bind:cancel="onCloseEntry_second"
 >
-</van-dialog>
+</van-dialog> -->

Pages/login/index.wxss

@@ -90,3 +90,53 @@
 .navigator{
   color:#3CC7C0
 }
+.wrapper {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 100%;
+
+}
+.privacyBox {
+  width:90%;
+  background-color: #fff;
+  border-radius: 30rpx;
+}
+.privacyBox .title{
+  margin: 0;
+  text-align: center;
+  font-weight: 500;
+    line-height:24px;
+    padding-top:24px;
+    text-align: center;
+  font-size:16px;
+}
+.btnbox{
+  display: flex;
+  align-items: center;
+  border-top:1rpx solid #efefef;
+  width:100%;
+  font-size: 17px;
+}
+.btnbox .cancel{
+  flex:1;
+  height: 50px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.btnbox .confirm{
+  margin: 0;
+  height: 50px;
+  padding: 0;
+  color: #3CC7C0;
+  flex:1; 
+  font-size: 17px;
+  border: none!important;
+  border-left:1rpx solid #efefef!important;
+  display: flex;
+  background-color: none!important;
+  justify-content: center;
+  align-items: center;
+}
+

commpents/myprofile/index.js

@@ -803,6 +803,7 @@ Component({
         if(this.data.zhiye_file_list.length < 2){wx.showToast({title: '医师执业证至少2张',icon: "error"});return}
         params.license_cert = this.data.zhiye_file_list.map(e => e.url);//医师执业证
         if(this.data.zige_file_list.length == 0){wx.showToast({title: '请上传医师资格证',icon: "error"});return}
+        if(this.data.zige_file_list.length<2){wx.showToast({title: '医师资格证至少2张',icon: "error"});return}
         params.qualification_cert = this.data.zige_file_list.map(e => e.url);//医生资格证
         if(this.data.zhicheng_file_list.length == 0){wx.showToast({title: '请上传职称证',icon: "error"});return}
         params.work_cert = this.data.zhicheng_file_list.map(e => e.url);//工作证，职称证

commpents/myprofile/index.wxml

@@ -324,7 +324,7 @@
         bindUploadFile="doUploadFile"
         bindDeleteFile="doDeleteFile"
         bind:showNote="onshowZiGeNote"
-        upload_cell_desc="请提供清晰的资格证书原件照片，照片需包含证书编号、加盖钢印的证书照片、姓名等信息，最少上传1张。" 
+        upload_cell_desc="请提供清晰的资格证书原件照片，照片需包含证书编号、加盖钢印的证书照片、姓名等信息，最少上传2张。" 
         upload_cell_note="查看示例"
         upload_cell_note_show="{{!(indentity && iden_auth_disabled)}}"
         deletable="{{!(indentity && iden_auth_disabled)}}"