7.3提交

custom-tab-bar/index.js

@@ -3,7 +3,7 @@ const app=getApp();
 import {throttle} from "../utils/util"
 import {storeBindingsBehavior} from "mobx-miniprogram-bindings"
 import {store} from '../store/store.js'
-import {getSign,getProjectStatus} from "../api/api"
+import {getExpertSign,getProjectStatus,getBankInfo,getfangxinSite} from "../api/api"
 Component({
     behaviors:[storeBindingsBehavior],
     storeBindings:{
@@ -40,6 +40,7 @@ Component({
     data: {
         isIos:false,
         showAgree:false,
+        showCancel:true,
         //active:'list',
         img_host:app.hostConfig().imghost,
       tabList:[{
@@ -91,9 +92,37 @@ Component({
                 showDraft:false
             })
         },
+        getSite(){
+            getfangxinSite().then(res=>{
+                app.method.navigateTo({
+                    url:'/case/pages/webSign/webSign?src='+encodeURIComponent(res.linkUrl)
+                })
+            })
+        },
+        getBank(){
+          getBankInfo().then(res=>{
+              console.log(res)
+           if(!res){
+               wx.showToast({
+                 title: '请先绑定信息',
+                 icon:"none",
+                 duration:3000
+                 
+               })
+               app.method.navigateTo({
+                url: '/case/pages/bankCard/bankCard',
+              })    
+           }else{
+                 this.setData({
+                        showAgree:true
+                })
+           }
+          
+       })
+     },
         handleGetSign(){
-            getSign().then(res=>{
-                if(res && res.signImg){
+            getExpertSign().then(res=>{
+                if(res && res.taskStatus==1){
                     let caseDraft=wx.getStorageSync('caseDraft');
                     if(caseDraft){
                         this.setData({
@@ -106,9 +135,8 @@ Component({
                     }
                    
                 }else{
-                    this.setData({
-                        showAgree:true
-                    })
+                    this.getBank();
+                   
                 }  
             }).catch(error=>{
                  if(error.code==30007){
@@ -127,9 +155,10 @@ Component({
             this.setData({
                 showAgree:false
             });
-            app.method.navigateTo({
-                url:'/case/pages/agreement/agreement'
-            })
+            this.getSite();
+            // app.method.navigateTo({
+            //     url:'/case/pages/agreement/agreement'
+            // })
           },
           onCancelAgree(){
             this.setData({

custom-tab-bar/index.wxml

@@ -1,7 +1,7 @@
 <!--components/tabBar/tabBar.wxml-->
 <view class="tab"> 
     <van-tabbar active="{{ active }}" bind:change="onChange" border="{{false}}" z-index="9999">
-  <van-tabbar-item name="{{item.id}}" wx:for="{{tabList}}" key="id">
+  <van-tabbar-item name="{{item.id}}" wx:for="{{tabList}}" wx:key="id">
     <image
       slot="icon"
       src="{{item.normal }}"
@@ -20,6 +20,6 @@
 </van-tabbar>
   <image src="{{img_host+'/create.png'}}" alt="" class="create {{isIos?'isIos':''}}" bind:tap="goCreate"/>
 </view>
-<dialog showDialog="{{showAgree}}" showCancel="{{showCancel}}" bind:confirm="onConfirmAgree" bind:cancel="onCancelAgree"  title="项目协议"  confirmText="查看" message="创建病例前需签署《人工肝病例登记系统》电子协议书"></dialog>
+<dialog showDialog="{{showAgree}}" showCancel="{{showCancel}}" bind:confirm="onConfirmAgree" bind:cancel="onCancelAgree"  title="项目协议"  confirmText="确定" message="创建病例前需签署《人工肝病例登记系统》电子协议书"></dialog>
 
 <dialog showDialog="{{showDraft}}" title="注意" message="您已有一条草稿，是否去编辑？" confirmText="确定" bind:confirm="onConfirmDraft" bind:cancel="onCancelDraft"></dialog>