提交diamagnetic

yanzhu-ui-app/miniprogram/pages/project_qr/index.js

@@ -304,8 +304,18 @@ Page({
       getMaPhoneNumber(data).then(res => {
         if (res.code == 200) {
           let phoneNumber = res.data;
-          //使用手机号码查询详情
-          if (this.data.userPost == "1") {
+          this.initData(phoneNumber);
+        }
+      })
+    } else {
+      //用户决绝授权
+      app.toast("请允许微信手机号一键登录");
+    }
+  },
+
+  initData(phoneNumber){
+//使用手机号码查询详情
+if (this.data.userPost == "1") {
   findProSubDeptsInfo(this.data.proId, phoneNumber).then(deptRes => {
     if (deptRes.code == 200 && deptRes.data) {
       deptRes.data.subDeptLeaderPhone = phoneNumber;
@@ -362,7 +372,7 @@ Page({
       });
     }
   });
-          } else {
+} else {
   findProSubDeptsUser(this.data.proId, phoneNumber).then(userRes => {
     if (userRes.code == 200 && userRes.data) {
         if (userRes.data.userInfos) {
@@ -407,13 +417,7 @@ Page({
       });
     }
   });
-          }
-        }
-      })
-    } else {
-      //用户决绝授权
-      app.toast("请允许微信手机号一键登录");
-    }
+}
   },
 
   /**
@@ -670,6 +674,13 @@ Page({
     });
   },
 
+  /**
+   * 签名..
+   */
+  startSignFile_0(){
+    this.initData(this.data.userPhoneNumber);
+  },
+
   /**
    * 开始签署文件
    * @param {*} skip 
@@ -677,8 +688,8 @@ Page({
   startSignFile(skip) {
     let _fileForm = {};
     let currDate = new Date().toLocaleString().substring(0, 10).split("/");
-    currDate[2] = currDate[2].replace("上午","").replace("下午","");
-    if (this.data.userPost == 1) {
+    currDate[2] = currDate[2].replace("上","").replace("下","").replace("午","");
+    if (this.data.form.userPost == 1) {
       _fileForm.fName = this.data.form.subDeptLeaderName;
       _fileForm.fCardId = this.data.form.subDeptLeaderCode;
       _fileForm.fSex = this.getGenderFromIdCard(this.data.form.subDeptLeaderCode);

yanzhu-ui-app/miniprogram/pages/project_qr/index.wxml

@@ -688,7 +688,7 @@
             <project-select init="{{initProject}}"></project-select>
             <van-steps steps="{{ flowNodes }}" active="{{ active }}" />
             <view class="kaoshimianban">
-                <jyq-result wx:if="{{busExamInfos.passMark<=busExamInfos.userMark}}" iconPath="https://xiangguan.sxyanzhu.com/profile/icon/cg.png" title="恭喜！考试通过" description="本次考试已顺利完成，您可以去签署安全承诺文件了。" actionText="立 即 签 署" bind:action="startSignFile" />
+                <jyq-result wx:if="{{busExamInfos.passMark<=busExamInfos.userMark}}" iconPath="https://xiangguan.sxyanzhu.com/profile/icon/cg.png" title="恭喜！考试通过" description="本次考试已顺利完成，您可以去签署安全承诺文件了。" actionText="立 即 签 署" bind:action="startSignFile_0" />
                 <jyq-result wx:if="{{busExamInfos.passMark>busExamInfos.userMark}}" iconPath="https://xiangguan.sxyanzhu.com/profile/icon/sb.png" title="很遗憾！考试未通过" description="本次考试未通过，重新考试通过后您才可以签署安全承诺文件，请返回学习或继续考试。" actionText="继 续 考 试" bind:action="anewBusEduQuestion" descActionText="返 回 学 习" bind:descAction="onClickPreviousNode" />
                 <!-- <view class="time-unit">
                     <text class="timeline_for_state_2 timeline_for_state_6" wx:if="{{busExamInfos.passMark>busExamInfos.userMark}}">很 遗 憾 ！ 考 试 不 通 过</text><text class="timeline_for_state_1 timeline_for_state_6" wx:if="{{busExamInfos.passMark<=busExamInfos.userMark}}">恭 喜 ！ 考 试 通 过</text>