修改优化后提交

src/pages/applications/contractDownload/contractDownload.vue

@@ -92,6 +92,7 @@ export default {
     this.offsize = 1;
     this.pagesize = 10;
     this.index = [1, 0, 0];
+          // window.localStorage.openId = "1234567"
     if (window.localStorage.openId) {
       this.getUserInfo(window.localStorage.openId);
     }
@@ -120,6 +121,7 @@ export default {
         "/sign/info/hclc/query/by/openid?openId=" +
         openId;
       vm.hlsPopup.showLoading("请稍等");
+
       // vm.getData();
       vm.$post(url).then(function(res) {
         vm.hlsPopup.hideLoading();

src/pages/applications/contractDownload/contractDownloadList.vue

@@ -9,7 +9,7 @@
             <p style="margin-top:3px">{{item.file_sign_name}}</p>
           </div>
           <button
-            style="float:right;margin-top:5px;background-color:#09bb07;color:#ffffff;width:50px;border-radius:3px"
+            style="float:right;margin-top:5px;background-color:#09bb07;color:#ffffff;width:70px;border-radius:3px"
             @click="downloadContract(item.attachment_id)"
           >下载</button>
         </div>
@@ -51,6 +51,16 @@ export default {
   mounted() {
     // this._initLoad()
   },
+  activated(){
+    this.wxConfig();
+    if (this.$route.params.itemData) {
+      window.localStorage.SignDownloadData = JSON.stringify(
+        this.$route.params.itemData.sign_file_list
+      );
+    }
+    // console.log(JSON.parse(window.localStorage.unSignData));
+    this.data = JSON.parse(window.localStorage.SignDownloadData); 
+  },
   methods: {
     // createSign() {
     //     let url = "http://sign.hitachics.com/core/r/api/app/fileViewSvc?attachment_id=13435&apiName=download&sysName=HCL_UPLOAD_FILE&access_token="+window.localStorage.access_token_rl

src/pages/applications/electronicContract/electronicContract.vue

@@ -62,11 +62,11 @@
         <list-item :item-height="80" v-if="myIndex == 1">
           <!-- <div :key="index" :proportion="[5,1]" :show-arrow="true"> -->
           <item style="margin-top:10px" v-for="(item,index) in signData" :key="index">
-            <img
+            <!-- <img
               slot="left-icon"
               src="../../../assets/electronicContract/contract-icon.png"
               class="left-icon"
-            />
+            /> -->
             <div slot="name" class="text" style="width: 70%;font-size: 12px;">
               <div
                 class="cont-type"

src/pages/applications/electronicContract/electronicContractList.vue

@@ -32,26 +32,36 @@ export default {
   },
   components: {},
   created() {
-    this.wxConfig();
-    if(this.$route.params.itemData){
+     if(this.$route.params.itemData){
+      // console.log('33333333333',this.$route.params.itemData.un_sign_file_list)
     window.localStorage.unSignData = JSON.stringify(this.$route.params.itemData.un_sign_file_list);
+
     }
-    // console.log(JSON.parse(window.localStorage.unSignData));
     this.data = JSON.parse(window.localStorage.unSignData);
-    console.log("22222222222", this.data);
+    this.wxConfig();
     this.offsize = 1;
     this.pagesize = 10;
     this.index = [1, 0, 0];
   },
   mounted() {
     // this._initLoad()
+
+  },
+  activated(){
+    if(this.$route.params.itemData){
+      // console.log('33333333333',this.$route.params.itemData.un_sign_file_list)
+    window.localStorage.unSignData = JSON.stringify(this.$route.params.itemData.un_sign_file_list);
+
+    }
+    this.data = JSON.parse(window.localStorage.unSignData);
   },
+
   methods: {
     createSign() {
       let goUrl = this.data[0].sign_url
       if (goUrl) {
         // 
-        this.hlsPopup.showLoading("请稍等");
+        // this.hlsPopup.showLoading("请稍等");
         window.open(goUrl, "_self");
         // let url = window.open('http://www.baidu.com','_self');
         
@@ -66,43 +76,43 @@ export default {
       // 打开模态框
     },
 
-    load_count: function() {
-      let vm = this;
-      let url = process.env.basePath + "contract_count";
-      let param = {};
-      // hlsPopup.showLoadingWithoutBackdrop();
-      vm.$post(url, param).then(function(res) {
-        vm.info = res;
-        vm.changeData();
-      });
-    },
+    // load_count: function() {
+    //   let vm = this;
+    //   let url = process.env.basePath + "contract_count";
+    //   let param = {};
+    //   // hlsPopup.showLoadingWithoutBackdrop();
+    //   vm.$post(url, param).then(function(res) {
+    //     vm.info = res;
+    //     vm.changeData();
+    //   });
+    // },
 
-    loadMore: function() {
-      let vm = this;
-      vm.offsize = vm.offsize + 1;
-      let url = process.env.basePath + "app_get_contract_selected";
-      let param = {
-        offsize: vm.offsize,
-        searchInput: vm.searchCondition.input
-      };
-      vm.$post(url, param).then(function(res) {
-        let returnData = [];
-        returnData = res.getContract_list;
-        if (returnData.length === 0) {
-          vm.$refs.scroll.update(true);
-        } else if (returnData.length > 0 && returnData.length < vm.pagesize) {
-          vum.forEach(returnData, function(data, index, array) {
-            vm.con_list.push(array[index]);
-          });
-          vm.$refs.scroll.update(true);
-        } else if (returnData.length === vm.pagesize) {
-          vum.forEach(returnData, function(data, index, array) {
-            vm.con_list.push(array[index]);
-          });
-          vm.$refs.scroll.update(false);
-        }
-      });
-    },
+    // loadMore: function() {
+    //   let vm = this;
+    //   vm.offsize = vm.offsize + 1;
+    //   let url = process.env.basePath + "app_get_contract_selected";
+    //   let param = {
+    //     offsize: vm.offsize,
+    //     searchInput: vm.searchCondition.input
+    //   };
+    //   vm.$post(url, param).then(function(res) {
+    //     let returnData = [];
+    //     returnData = res.getContract_list;
+    //     if (returnData.length === 0) {
+    //       vm.$refs.scroll.update(true);
+    //     } else if (returnData.length > 0 && returnData.length < vm.pagesize) {
+    //       vum.forEach(returnData, function(data, index, array) {
+    //         vm.con_list.push(array[index]);
+    //       });
+    //       vm.$refs.scroll.update(true);
+    //     } else if (returnData.length === vm.pagesize) {
+    //       vum.forEach(returnData, function(data, index, array) {
+    //         vm.con_list.push(array[index]);
+    //       });
+    //       vm.$refs.scroll.update(false);
+    //     }
+    //   });
+    // },
     // goContractMainten: function (list) {
     //   this.$router.push({
     //     name: 'ContractSign',

src/pages/applications/userRegisters/companyRegister.vue

@@ -2,7 +2,7 @@
   <h-view class="public-style companyRegister" title="企业用户注册">
     <h-content v-if="status != '成功'">
       <list-item class="reg-content">
-        <div class="repre-type" v-if="faceAuthStatus != 'SUCCESS'">
+        <!-- <div class="repre-type" v-if="faceAuthStatus != 'SUCCESS'">
           
           <input type="radio" name="agent" v-model="agentType" @change="isAgent" value="Y" />
           代理店
@@ -16,8 +16,8 @@
             @change="isAgent"
             value="N"
           />非代理店
-        </div>
-        <div class="repre-type" v-if="faceAuthStatus == 'SUCCESS'">
+        </div>-->
+        <!-- <div class="repre-type" v-if="faceAuthStatus == 'SUCCESS'">
           代理店
           <input type="radio" name="agent" v-model="agentType" @change="isAgent" value="Y" disabled/>
           非代理店
@@ -29,8 +29,8 @@
             value="N"
             disabled
           />
-        </div>
-        <div class="repre-type" v-if="faceAuthStatus != 'SUCCESS' && agentType == 'Y'">
+        </div>-->
+        <div class="repre-type" v-if="faceAuthStatus != 'SUCCESS'">
           <span>经办人类型：</span>
           <input
             type="radio"
@@ -47,7 +47,7 @@
             value="法定代表人"
           />法定代表人
         </div>
-        <div class="repre-type" v-if="faceAuthStatus == 'SUCCESS' && agentType == 'Y'">
+        <div class="repre-type" v-if="faceAuthStatus == 'SUCCESS'">
           <span>经办人类型：</span>
           <input
             type="radio"
@@ -260,25 +260,7 @@
               <input type="text" class="edit" v-model="jbName" readonly />
             </div>
           </div>
-          <div class="info_list">
-            <div class="list_left" style="width:30%;">
-              <img
-                src="../../../assets/userRegister/phone.png"
-                alt
-                style="width:16px;height:16px;margin-right:5px;"
-              />
-              手机号码：
-            </div>
-            <div class="list_right" style="width:70%;">
-              <input
-                type="text"
-                class="edit"
-                v-model="jbPhoneNumber"
-                @blur="goTop()"
-                placeholder="请输入手机号码"
-              />
-            </div>
-          </div>
+
           <div class="info_list" v-if="faceAuthStatus =='SUCCESS'">
             <div class="list_left" style="width:41%;">
               <img
@@ -305,6 +287,25 @@
               <input type="text" class="edit" v-model="jbIdNumber" readonly />
             </div>
           </div>
+          <div class="info_list">
+            <div class="list_left" style="width:30%;">
+              <img
+                src="../../../assets/userRegister/phone.png"
+                alt
+                style="width:16px;height:16px;margin-right:5px;"
+              />
+              手机号码：
+            </div>
+            <div class="list_right" style="width:70%;">
+              <input
+                type="text"
+                class="edit"
+                v-model="jbPhoneNumber"
+                @blur="goTop()"
+                placeholder="请输入手机号码"
+              />
+            </div>
+          </div>
           <div style="margin: 10px 0 0 14px;color:#636363">
             <p>请上传身份证照片</p>
           </div>
@@ -425,7 +426,7 @@
     </h-content>
     <h-content v-if="status == '成功'">
       <list-item class="reg-content">
-        <div class="repre-type">
+        <!-- <div class="repre-type">
           <input
             type="radio"
             name="agent"
@@ -443,8 +444,8 @@
             value="N"
             disabled
           />非代理店
-        </div>
-        <div class="repre-type" v-if="agentType == 'Y'">
+        </div>-->
+        <div class="repre-type">
           <span>经办人类型：</span>
           <input
             type="radio"
@@ -586,31 +587,31 @@
               <input type="text" class="edit" v-model="jbName" readonly />
             </div>
           </div>
+
           <div class="info_list">
-            <div class="list_left" style="width:30%;">
+            <div class="list_left" style="width:48%;">
               <img
-                src="../../../assets/userRegister/phone.png"
+                src="../../../assets/userRegister/idCard.png"
                 alt
                 style="width:16px;height:16px;margin-right:5px;"
               />
-              手机号码：
+              经办人身份证号：
             </div>
-            <div class="list_right" style="width:70%;">
-              <input type="text" class="edit" v-model="jbPhoneNumber" readonly />
+            <div class="list_right" style="width:52%;">
+              <input type="text" class="edit" v-model="jbIdNumber" readonly />
             </div>
           </div>
-
           <div class="info_list">
-            <div class="list_left" style="width:48%;">
+            <div class="list_left" style="width:30%;">
               <img
-                src="../../../assets/userRegister/idCard.png"
+                src="../../../assets/userRegister/phone.png"
                 alt
                 style="width:16px;height:16px;margin-right:5px;"
               />
-              经办人身份证号：
+              手机号码：
             </div>
-            <div class="list_right" style="width:52%;">
-              <input type="text" class="edit" v-model="jbIdNumber" readonly />
+            <div class="list_right" style="width:70%;">
+              <input type="text" class="edit" v-model="jbPhoneNumber" readonly />
             </div>
           </div>
           <!-- <div style="margin: 10px 0 0 14px;color:#636363">
@@ -717,7 +718,7 @@ import { getUrlParam } from "@/scripts/utils";
 export default {
   data() {
     return {
-      agentType: "Y",
+      // agentType: "Y",
       staffType: "法定代表人",
       cardUp: require("../../../assets/userRegister/camear.png"), //身份证照片url
       busLic: require("../../../assets/userRegister/camear.png"), //营业执照照片url
@@ -780,13 +781,13 @@ export default {
   updated: function() {},
   methods: {
     // 是否是代理店
-    isAgent() {
-      console.log(this.agentType);
-      // window.localStorage.agentType = this.agentType;
-      if (this.agentType == "N") {
-        this.staffType = "法定代表人";
-      }
-    },
+    // isAgent() {
+    //   console.log(this.agentType);
+    //   // window.localStorage.agentType = this.agentType;
+    //   if (this.agentType == "N") {
+    //     this.staffType = "法定代表人";
+    //   }
+    // },
 
     // 调用微信接口的基础配置
     wxConfig() {
@@ -827,9 +828,9 @@ export default {
             "hideOptionMenu"
           ] // 必填，需要使用的JS接口列表，所有JS接口列表见附录2
         });
-         wx.ready(function () { 
-           wx.hideOptionMenu();
-         })
+        wx.ready(function() {
+          wx.hideOptionMenu();
+        });
       });
     },
     // 法人和其他人切换状态
@@ -1062,7 +1063,7 @@ export default {
           legalName: vm.legalRepresentativeName,
           legalIdNo: vm.legalRepresentativeCardNumber,
           agentType: "1",
-          dealerFlag: vm.agentType,
+          // dealerFlag: vm.agentType,
           redirectUrl:
             "http://sign.hitachics.com/www/#/UserRegister/CompanyRegister?Regstatus=1"
         };
@@ -1127,7 +1128,6 @@ export default {
           legalName: vm.legalRepresentativeName1,
           legalIdNo: vm.legalRepresentativeCardNumber1,
           agentType: "2",
-          dealerFlag: vm.agentType,
           redirectUrl:
             "http://sign.hitachics.com/www/#/UserRegister/CompanyRegister?Regstatus=2"
         };
@@ -1162,18 +1162,31 @@ export default {
     },
     logout() {
       let vm = this;
-      let url = process.env.rootPath + "/organizations/outerOrgans/delete";
-      let param = {
-        openId: window.localStorage.openId
-      };
-      vm.hlsPopup.showLoading("请稍等");
-      vm.$post(url, param).then(function(res) {
-        vm.hlsPopup.hideLoading();
-        if (res.code == 0) {
-          vm.$vux.toast.text(res.message, "middle");
-          window.open("http://sign.hitachics.com/www/#/UserRegister", "_self");
-        } else {
-          vm.$vux.toast.text(res.message, "middle");
+      hlsPopup.showConfirm({
+        title: "提示",
+        content: "请确认合同是否都已下载完成，注销后无法下载,请知悉,谢谢！",
+        onConfirm: function(index) {
+          if (index === 1) {
+            let url =
+              process.env.rootPath + "/organizations/outerOrgans/delete";
+            let param = {
+              openId: window.localStorage.openId
+            };
+            vm.hlsPopup.showLoading("请稍等");
+            vm.$post(url, param).then(function(res) {
+              vm.hlsPopup.hideLoading();
+              if (res.code == 0) {
+                vm.$vux.toast.text(res.message, "middle");
+                window.open(
+                  "http://sign.hitachics.com/www/#/UserRegister",
+                  "_self"
+                );
+              } else {
+                vm.$vux.toast.text(res.message, "middle");
+              }
+            });
+          }
+          // console.log(index);
         }
       });
     },

src/pages/applications/userRegisters/readonlyCompanyReg.vue

@@ -2,7 +2,7 @@
   <h-view class="public-style companyRegister" title="企业用户注册">
     <h-content>
       <list-item class="reg-content">
-        <div class="repre-type">
+        <!-- <div class="repre-type">
           代理店
           <input
             type="radio"
@@ -19,8 +19,8 @@
             value="N"
             disabled
           />
-        </div>
-        <div class="repre-type" v-if="agentType == 'Y'">
+        </div>-->
+        <div class="repre-type">
           <span>经办人类型：</span>
           <input
             type="radio"
@@ -296,8 +296,8 @@ export default {
       attachmentId: "",
       orgAttachmentId: "",
       attachmentId1: "",
-      orgAttachmentId1: "",
-      agentType: ""
+      orgAttachmentId1: ""
+      // agentType: ""
     };
   },
   components: {
@@ -342,18 +342,31 @@ export default {
     },
     logout() {
       let vm = this;
-      let url = process.env.rootPath + "/organizations/outerOrgans/delete";
-      let param = {
-        openId: window.localStorage.openId
-      };
-      vm.hlsPopup.showLoading("请稍等");
-      vm.$post(url, param).then(function(res) {
-        vm.hlsPopup.hideLoading();
-        if (res.code == 0) {
-          vm.$vux.toast.text(res.message, "middle");
-          window.open("http://sign.hitachics.com/www/#/UserRegister", "_self");
-        } else {
-          vm.$vux.toast.text(res.message, "middle");
+      hlsPopup.showConfirm({
+        title: "提示",
+        content: "请确认合同是否都已下载完成，注销后无法下载,请知悉,谢谢！",
+        onConfirm: function(index) {
+          if (index === 1) {
+            let url =
+              process.env.rootPath + "/organizations/outerOrgans/delete";
+            let param = {
+              openId: window.localStorage.openId
+            };
+            vm.hlsPopup.showLoading("请稍等");
+            vm.$post(url, param).then(function(res) {
+              vm.hlsPopup.hideLoading();
+              if (res.code == 0) {
+                vm.$vux.toast.text(res.message, "middle");
+                window.open(
+                  "http://sign.hitachics.com/www/#/UserRegister",
+                  "_self"
+                );
+              } else {
+                vm.$vux.toast.text(res.message, "middle");
+              }
+            });
+          }
+          console.log(index);
         }
       });
     },
@@ -396,11 +409,11 @@ export default {
             "hideOptionMenu"
           ] // 必填，需要使用的JS接口列表，所有JS接口列表见附录2
         });
-         wx.ready(function () { 
-           wx.hideOptionMenu();
-         })
+        wx.ready(function() {
+          wx.hideOptionMenu();
+        });
       });
-    },
+    }
   },
   created() {
     this.wxConfig();
@@ -408,7 +421,7 @@ export default {
     var agentType = data.agentType;
     console.log(data);
     if (agentType == 1) {
-      this.agentType = data.dealerFlag;
+      // this.agentType = data.dealerFlag;
       this.organizationName = data.name;
       this.socialCode = data.idNo;
       this.legalRepresentativeName = data.legalName;
@@ -429,7 +442,7 @@ export default {
         "&apiName=download&sysName=HCL_UPLOAD_FILE&access_token=" +
         window.localStorage.access_token_rl;
     } else if (agentType == 2) {
-      this.agentType = data.dealerFlag;
+      // this.agentType = data.dealerFlag;
       this.staffType = "组织其他员工";
       this.jbName = data.agentName;
       this.jbPhoneNumber = data.mobile;

src/pages/applications/userRegisters/readonlyPersonalReg.vue

@@ -93,25 +93,33 @@ export default {
         imgUrl: vm.cardUp
       });
     },
+    // 注销
     logout() {
       let vm = this;
-      let url = process.env.rootPath + "/accounts/outerAccounts/delete";
-      let param = {
-        openId: window.localStorage.openId
-      };
-      vm.hlsPopup.showLoading("请稍等");
-      vm.$post(url, param).then(function(res) {
-        vm.hlsPopup.hideLoading();
-        if (res.code == 0) {
-          vm.$vux.toast.text(res.message, "middle");
-          window.open(
-            "http://sign.hitachics.com/www/#/UserRegister",
-            "_self"
-          );
-        } else {
-          vm.$vux.toast.text(res.message, "middle");
+      hlsPopup.showConfirm({
+        title: "签名成功",
+        content: "请确认合同是否都已下载完成，注销后无法下载,请知悉,谢谢！",
+        onConfirm: function(index) {
+          if (index === 1) {
+            let url = process.env.rootPath + "/accounts/outerAccounts/delete";
+            let param = {
+              openId: window.localStorage.openId
+            };
+            vm.hlsPopup.showLoading("请稍等");
+            vm.$post(url, param).then(function(res) {
+              vm.hlsPopup.hideLoading();
+              if (res.code == 0) {
+                vm.$vux.toast.text(res.message, "middle");
+                window.open(
+                  "http://sign.hitachics.com/www/#/UserRegister",
+                  "_self"
+                );
+              } else {
+                vm.$vux.toast.text(res.message, "middle");
+              }
+            });
+          }
         }
-        // vm.$vux.toast.text(res.message, "middle");
       });
     },
     // 调用微信接口的基础配置