修改优化后提交

33a12c07 · chaiwei · a66e0558 · 33a12c07 · 33a12c07 · 33a12c07
Commit 33a12c07 authored Apr 28, 2020 by chaiwei
9 changed files
--- a/src/pages/applications/contractDownload/contractDownload.vue
+++ b/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();

--- a/src/pages/applications/contractDownload/contractDownloadList.vue
+++ b/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

--- a/src/pages/applications/electronicContract/electronicContract.vue
+++ b/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"

--- a/src/pages/applications/electronicContract/electronicContractList.vue
+++ b/src/pages/applications/electronicContract/electronicContractList.vue
@@ -32,26 +32,36 @@ export default {
  },
  components: {},
  created() {
-    this.wxConfig();
     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',

--- a/src/pages/applications/userRegisters/companyRegister.vue
+++ b/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.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,7 +1162,13 @@ export default {
    },
    logout() {
      let vm = this;
-      let url = process.env.rootPath + "/organizations/outerOrgans/delete";
+      hlsPopup.showConfirm({
+        title: "提示",
+        content: "请确认合同是否都已下载完成，注销后无法下载,请知悉,谢谢！",
+        onConfirm: function(index) {
+          if (index === 1) {
+            let url =
+              process.env.rootPath + "/organizations/outerOrgans/delete";
            let param = {
              openId: window.localStorage.openId
            };
@@ -1171,11 +1177,18 @@ export default {
              vm.hlsPopup.hideLoading();
              if (res.code == 0) {
                vm.$vux.toast.text(res.message, "middle");
-          window.open("http://sign.hitachics.com/www/#/UserRegister", "_self");
+                window.open(
+                  "http://sign.hitachics.com/www/#/UserRegister",
+                  "_self"
+                );
              } else {
                vm.$vux.toast.text(res.message, "middle");
              }
            });
+          }
+          // console.log(index);
+        }
+      });
    },
    // 认证结果返回给接口
    authResult(id, code, suc) {

--- a/src/pages/applications/userRegisters/personalRegister.vue
+++ b/src/pages/applications/userRegisters/personalRegister.vue
@@ -17,7 +17,12 @@
              style="float:left;width:20px;height:20px;margin: 2px 5px 0 0;"
            />姓名:
          </section>
-          <input slot="content" v-model="personName" style="text-align: left;font-size:12px"  readonly/>
+          <input
+            slot="content"
+            v-model="personName"
+            style="text-align: left;font-size:12px"
+            readonly
+          />
        </item>
        <item style="border-bottom:1px solid #d0d0d0">
          <section slot="name" style="font-size:14px">
@@ -45,7 +50,7 @@
            v-model="phoneNumber"
            style="text-align: left;font-size:14px"
            placeholder="请输入电话号码"
-            @blur = "goTop()"
+            @blur="goTop()"
          />
        </item>
        <div style="margin: 40px 0 0 14px;color:#333333;font-size:14px">
@@ -63,7 +68,7 @@
              @change="uploadUpImg($event)"
              ref="avatarInput"
              class="uppic"
-            /> -->
+            />-->
            <img :src="cardUp" alt class="pic" @click="addCardImage()" />
          </div>

@@ -89,15 +94,15 @@
          style="width:120px;height:30px;border-radius:15px;background-color:#09bb07;color:#FFFFFF;margin:70px 0 0 -60px;position:relative;left:50%;"
        >下一步</button>
      </list-item>
-     
    </h-content>

-    <h-content v-else-if="status == 1">
+    <h-content v-if="status == 1">
      <list-item class="personalInf" style="padding:20px;height:100%">
        <div style="height:40px;border-bottom:1px solid #d0d0d0">
-          <div class="personalInf-text" style=" width: 150px;line-height: 30px;text-align: center;border-radius: 5px;background-color: #ddd;font-size:16px;font-weight:700;color:#11111187">
-            个人信息
-          </div>
+          <div
+            class="personalInf-text"
+            style=" width: 150px;line-height: 30px;text-align: center;border-radius: 5px;background-color: #ddd;font-size:16px;font-weight:700;color:#11111187"
+          >个人信息</div>
        </div>
        <item style="border-bottom:1px solid #d0d0d0">
          <section slot="name" style="font-size:14px">
@@ -157,7 +162,7 @@
              class="uppic"
              disabled
            />-->
-            <img :src="cardUp1" alt class="pic" @click="previewImage()"/>
+            <img :src="cardUp1" alt class="pic" @click="previewImage()" />
          </div>

          <!-- <div style="border:1px solid #b2b2b2;width:50%;border-radius:5px;position:relative;">
@@ -187,11 +192,11 @@
 </template>

 <script>
-import {getUrlParam} from '@/scripts/utils'
+import { getUrlParam } from "@/scripts/utils";
 export default {
  data() {
    return {
-      cardUp:require("../../../assets/userRegister/camear.png") , //身份证正面url
+      cardUp: require("../../../assets/userRegister/camear.png"), //身份证正面url
      identificationNumber: "",
      phoneNumber: "",
      personName: "",
@@ -200,9 +205,9 @@ export default {
      phoneNumber1: "",
      personName1: "",
      status: "",
-      serverId:"",
-      preview_url:"",//图片预览地址
-      attchmentId:"",//附件预览id
+      serverId: "",
+      preview_url: "", //图片预览地址
+      attchmentId: "" //附件预览id
    };
  },
  components: {},
@@ -227,19 +232,19 @@ export default {
  methods: {
    // 调用微信接口的基础配置
    wxConfig() {
-      let clientUrl = '';
+      let clientUrl = "";
      let u = navigator.userAgent;
-      let isAndroid = u.indexOf('Android') > -1 || u.indexOf('Linux') > -1; //g
+      let isAndroid = u.indexOf("Android") > -1 || u.indexOf("Linux") > -1; //g
      let isIOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/); //ios终端
      if (isAndroid) {
        //这个是安卓操作系统
-        console.log('机型：android');
-        clientUrl = location.href
+        console.log("机型：android");
+        clientUrl = location.href;
      }
      if (isIOS) {
-      　　//这个是ios操作系统
-          console.log('机型：ios');
-          clientUrl = location.href.split('#')[0];
+        //这个是ios操作系统
+        console.log("机型：ios");
+        clientUrl = location.href.split("#")[0];
      }
      // let clientUrl = encodeURIComponent(location.href)
      // let url = $config.rootPath + '/js/sdk/getWxConfig?wxCode=' + $config.wxCode + '&clientUrl=' + clientUrl
@@ -265,9 +270,9 @@ export default {
            "hideOptionMenu"
          ] // 必填，需要使用的JS接口列表，所有JS接口列表见附录2
        });
-         wx.ready(function () { 
+        wx.ready(function() {
          wx.hideOptionMenu();
-         })
+        });
      });
    },
    addCardImage: function() {
@@ -289,13 +294,12 @@ export default {
      //   }

      // }
-
    },
    //预览图片
    previewImage() {
      hlsPopup.showBigPicture({
        imgUrl: window.sessionStorage.cardUp1
-      })
+      });
    },
    uploadToWeixinServer(localId) {
      let self = this;
@@ -310,29 +314,32 @@ export default {
        }
      });
    },
-    uploadToserver(serverId){
-      console.log('mediaId',serverId);
+    uploadToserver(serverId) {
+      console.log("mediaId", serverId);
      let vm = this;
      let url = process.env.rootPath + "/auth/upload/image/hls/from/wx";
      let param = {
        openId: window.localStorage.openId,
        mediaId: serverId,
        sourceType: "app_file_id_card",
-          fileName: new Date().getTime() + '.jpg'
+        fileName: new Date().getTime() + ".jpg"
      };
      vm.hlsPopup.showLoading("请稍等");
      vm.$post(url, param).then(function(res) {
        vm.hlsPopup.hideLoading();
-          vm.personName = res['姓名'];
-          vm.identificationNumber = res['公民身份号码'];
+        vm.personName = res["姓名"];
+        vm.identificationNumber = res["公民身份号码"];
        vm.attchmentId = res["attchmentId"];
-          window.sessionStorage.cardUp1 = process.env.rootPath + "/app/fileViewSvc?attachment_id=" + vm.attchmentId  + "&apiName=download&sysName=HCL_UPLOAD_FILE&access_token=" + window.localStorage.access_token_rl;    
-
+        window.sessionStorage.cardUp1 =
+          process.env.rootPath +
+          "/app/fileViewSvc?attachment_id=" +
+          vm.attchmentId +
+          "&apiName=download&sysName=HCL_UPLOAD_FILE&access_token=" +
+          window.localStorage.access_token_rl;
      });
    },
    // 下一步
    next_step() {
-      
      let vm = this;
      if (
        !vm.personName ||
@@ -342,16 +349,13 @@ export default {
      ) {
        vm.hlsPopup.showLongCenter("必输字端不能为空！");
        return;
-      }
-      else if(vm.hlsUtil.isCardID(vm.identificationNumber)) {
+      } else if (vm.hlsUtil.isCardID(vm.identificationNumber)) {
        vm.hlsPopup.showLongCenter("身份证号有误");
        return;
-      }
-      else if(!vm.hlsUtil.phoneNumber(vm.phoneNumber)) {
+      } else if (!vm.hlsUtil.phoneNumber(vm.phoneNumber)) {
        vm.hlsPopup.showLongCenter("手机号码有误!");
        return;
-      } 
-      else {
+      } else {
        sessionStorage.setItem("personName", vm.personName);
        sessionStorage.setItem("identificationNumber", vm.identificationNumber);
        sessionStorage.setItem("phoneNumber", vm.phoneNumber);
@@ -362,20 +366,20 @@ export default {
          idNo: vm.identificationNumber,
          name: vm.personName,
          mobile: vm.phoneNumber,
-          redirectUrl:"http://sign.hitachics.com/www/#/UserRegister/PersonalRegister?Regstatus=1"
+          redirectUrl:
+            "http://sign.hitachics.com/www/#/UserRegister/PersonalRegister?Regstatus=1"
        };
        vm.hlsPopup.showLoading("请稍等");
        vm.$post(url, param).then(function(res) {
          vm.hlsPopup.hideLoading();
-          if(res.code == 0){
+          if (res.code == 0) {
            vm.$vux.toast.text(res.message, "middle");
            if (res.url) {
              window.open(res.url, "_self");
            }
-          }else{
+          } else {
            vm.$vux.toast.text(res.message, "middle");
          }
-
        });
      }
    },
@@ -399,13 +403,13 @@ export default {
      }
    },
    // 认证结果返回给接口
-    authResult(id,code,suc){
+    authResult(id, code, suc) {
      let vm = this;
      let url = "http://sign.hitachics.com/core/api/public/listen/auth/result";
      let param = {
-          "contextId": id,
-          "verifycode": code,
-          "success":suc
+        contextId: id,
+        verifycode: code,
+        success: suc
      };
      vm.hlsPopup.showLoading("请稍等");
      vm.$post(url, param).then(function(res) {
@@ -413,35 +417,45 @@ export default {
      });
    },
    // 注销
-    logout(){
+    logout() {
      let vm = this;
+      hlsPopup.showConfirm({
+        title: "签名成功",
+        content: "请确认合同是否都已下载完成，注销后无法下载,请知悉,谢谢！",
+        onConfirm: function(index) {
+          if (index === 1) {
            let url = process.env.rootPath + "/accounts/outerAccounts/delete";
            let param = {
-        openId: window.localStorage.openId,
+              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')
+              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");
+              }
+            });
+          }
        }
-          
      });
    },
    // 键盘消失，页面回到顶部
-    goTop(){
+    goTop() {
      setTimeout(function() {
-          var scrollHeight = document.documentElement.scrollTop || document.body.scrollTop || 0;
+        var scrollHeight =
+          document.documentElement.scrollTop || document.body.scrollTop || 0;
        console.log(scrollHeight);
        window.scrollTo(0, Math.max(scrollHeight, 0));
      }, 100);
    }
-
  },
-  created(){
+  created() {
    this.wxConfig();
    // wx.hideOptionMenu();
    var Request = new this.UrlSearch(); //实例化
@@ -449,18 +463,21 @@ export default {
    var contextId = Request.contextId;
    var verifycode = Request.verifycode;
    var success = Request.passed;
-    if(this.status == 1){
-      this.authResult(contextId,verifycode,success);
+    if (this.status == 1) {
+      this.authResult(contextId, verifycode, success);
    }
    var data = this.$route.params.userInfo;
-    if(data){
-      this.cardUp = process.env.rootPath + "/app/fileViewSvc?attachment_id=" + data.attachmentId  + "&apiName=download&sysName=HCL_UPLOAD_FILE&access_token=" + window.localStorage.access_token_rl;
+    if (data) {
+      this.cardUp =
+        process.env.rootPath +
+        "/app/fileViewSvc?attachment_id=" +
+        data.attachmentId +
+        "&apiName=download&sysName=HCL_UPLOAD_FILE&access_token=" +
+        window.localStorage.access_token_rl;
      this.identificationNumber = data.idNo;
      this.phoneNumber = data.mobile;
      this.personName = data.name;
    }
-
-    
  }
 };
 </script>

--- a/src/pages/applications/userRegisters/readonlyCompanyReg.vue
+++ b/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,7 +342,13 @@ export default {
    },
    logout() {
      let vm = this;
-      let url = process.env.rootPath + "/organizations/outerOrgans/delete";
+      hlsPopup.showConfirm({
+        title: "提示",
+        content: "请确认合同是否都已下载完成，注销后无法下载,请知悉,谢谢！",
+        onConfirm: function(index) {
+          if (index === 1) {
+            let url =
+              process.env.rootPath + "/organizations/outerOrgans/delete";
            let param = {
              openId: window.localStorage.openId
            };
@@ -351,11 +357,18 @@ export default {
              vm.hlsPopup.hideLoading();
              if (res.code == 0) {
                vm.$vux.toast.text(res.message, "middle");
-          window.open("http://sign.hitachics.com/www/#/UserRegister", "_self");
+                window.open(
+                  "http://sign.hitachics.com/www/#/UserRegister",
+                  "_self"
+                );
              } else {
                vm.$vux.toast.text(res.message, "middle");
              }
            });
+          }
+          console.log(index);
+        }
+      });
    },
    // 调用微信接口的基础配置
    wxConfig() {
@@ -396,11 +409,11 @@ export default {
            "hideOptionMenu"
          ] // 必填，需要使用的JS接口列表，所有JS接口列表见附录2
        });
-         wx.ready(function () { 
+        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;

--- a/src/pages/applications/userRegisters/readonlyPersonalReg.vue
+++ b/src/pages/applications/userRegisters/readonlyPersonalReg.vue
@@ -93,8 +93,14 @@ export default {
        imgUrl: vm.cardUp
      });
    },
+    // 注销
    logout() {
      let vm = this;
+      hlsPopup.showConfirm({
+        title: "签名成功",
+        content: "请确认合同是否都已下载完成，注销后无法下载,请知悉,谢谢！",
+        onConfirm: function(index) {
+          if (index === 1) {
            let url = process.env.rootPath + "/accounts/outerAccounts/delete";
            let param = {
              openId: window.localStorage.openId
@@ -111,7 +117,9 @@ export default {
              } else {
                vm.$vux.toast.text(res.message, "middle");
              }
-        // vm.$vux.toast.text(res.message, "middle");
+            });
+          }
+        }
      });
    },
    // 调用微信接口的基础配置

--- a/src/pages/home.vue
+++ b/src/pages/home.vue
@@ -5,17 +5,17 @@
        <!-- <header class="header">
          <input v-model="searchInput" placeholder="请输入功能名">
          <img src="../assets/image/home/functionList@2x.png" @click="search">
-        </header> -->
+        </header>-->
        <!-- <swipe :interval="5000" :showIndicators="false" class="swipe">
          <swipe-item v-for="img in imgList" :key="img.pictureUrl">
            <img :src="img.pictureUrl">
          </swipe-item>
-        </swipe> -->
+        </swipe>-->
        <!-- <div class="function">
          <function-item
            v-for="item in moduleSeparateList.slice(0,4)" :key="item.moduleId" :functionIcon="item.moduleIcon"
            :functionName="item.moduleName"
-            :data="item" @clickFunction="goModuleFunction"/> -->
+        :data="item" @clickFunction="goModuleFunction"/>-->
        <!--<function-item :functionIcon="require('../assets/image/home/allFunction@2x.png')" :functionName="'全部'" @clickFunction="goAllFunction"/>-->
        <!-- </div> -->
      </div>
@@ -23,9 +23,15 @@
        <header>常用应用</header>
        <div class="function">
          <function-item
-            v-for="item in functionList" :key="item.functionId" :functionIcon="item.functionIcon"
-            :functionName="item.functionName" style="width:33.3%"
-            :data="item" class="function-item vue-1px" @clickFunction="goFunctionHome"/>
+            v-for="item in functionList"
+            :key="item.functionId"
+            :functionIcon="item.functionIcon"
+            :functionName="item.functionName"
+            style="width:33.3%"
+            :data="item"
+            class="function-item vue-1px"
+            @clickFunction="goFunctionHome"
+          />
          <!-- <div class="function-item" @click="goAllFunction">
          <img src="../assets/image/home/functionMore@2x.png">
          </div>-->
@@ -42,7 +48,7 @@
          </ul>
          <ul id="p2"/>
        </div>
-      </div> -->
+      </div>-->
      <!-- <div class="middle-box bottom-box">
        <header>为您推荐<span @click="moreRecommend">更多</span></header>
        <div class="function">
@@ -50,17 +56,17 @@
            <img :src="item.recommendUrl">
          </div>
        </div>
-      </div> -->
+      </div>-->
    </h-content>
  </h-view>
 </template>

 <script>
-import functionState from './functionState'
-import {getUrlParam} from '@/scripts/utils'
+import functionState from "./functionState";
+import { getUrlParam } from "@/scripts/utils";

 export default {
-  data () {
+  data() {
    return {
      imgList: [],
      recommendList: [],
@@ -70,33 +76,37 @@ export default {
      area: {},
      box1: {},
      box2: {},
-      searchInput: '',
-    }
-  },
-  beforeCreate: function () {
+      searchInput: "",
+      subscribe: false
+    };
  },
-  created: function () {
-    this.wxConfig();
+  beforeCreate: function() {},
+  created: function() {
    // debugger;
    // window.localStorage.setItem('user_id', 2009)
    // this.imgList = [...functionState.bannerList]
    // this.recommendList = [...functionState.recommendList]
-    this.moduleSeparateList = [...functionState.moduleSeparateList]
+    this.moduleSeparateList = [...functionState.moduleSeparateList];
    this.moduleSeparateList.forEach(item => {
-      this.functionList = this.functionList.concat(item.functions)
-    })
+      this.functionList = this.functionList.concat(item.functions);
+    });
    this.getToken().then(res => {
+      this.wxConfig();
+      // if (window.localStorage.openId) {
+      //   this.getWxUserInfo(window.localStorage.openId);
+      // }
      // this.noticeQuery()
      // 注意，此处用户个人信息是写死的user_id  后续项目实施中根据以下代码实时获取企业通讯录个人信息
-       var code = getUrlParam('code');
-      //  code  = '111';
-       if(code){
+      var code = getUrlParam("code");
+      // code = "111";
+      if (code) {
        this.getOpenId(code);
+        
      }
-    })
-  },
-  updated: function () {
+      this.subscribe = window.localStorage.subscribe;
+    });
  },
+  updated: function() {},
  methods: {
    // 获取中台token
    // hlsSupportToken () {
@@ -156,9 +166,9 @@ export default {
            "hideOptionMenu"
          ] // 必填，需要使用的JS接口列表，所有JS接口列表见附录2
        });
-         wx.ready(function () { 
+        wx.ready(function() {
          wx.hideOptionMenu();
-         })
+        });
      });
    },
    // search () {
@@ -189,7 +199,7 @@ export default {
    //     },
    //   })
    // },
-    getToken () {
+    getToken() {
      let vm = this;
      let url = process.env.loginPathRl + "admin";
      let param = {};
@@ -197,35 +207,64 @@ export default {
        window.localStorage.setItem("access_token_rl", res.access_token);
      });
    },
-    goFunctionHome (data) {
+    goFunctionHome(data) {
+      if (this.subscribe) {
        this.$router.push({
-        name: data.functionState,
-      })
+          name: data.functionState
+        });
+      } else {
+        hlsPopup.showPopup({
+          title: "提示",
+          content: "未关注公众号，请先关注后再进入!",
+          onConfirm() {}
+        });
+      }
    },
    // moreRecommend () {
    //   console.log('go moreRecommend')
    // },
-    getOpenId (code) {
-      let vm = this
+    getOpenId(code) {
+      let vm = this;
      let url = process.env.basePathRl + "getOpenId";
      let param = {
-          "apiKey":"handexinxi",
-          "code": code
-      }
-      // window.localStorage.openId = "1234567"
-      vm.hlsHttp.post(url,param).then(function (res) {
+        apiKey: "handexinxi",
+        code: code
+      };
+      // window.localStorage.openId = "oBdoRwI9gj9Brbe9iqlDCg5G2dDc";
+      // vm.getWxUserInfo(window.localStorage.openId);
+      vm.hlsHttp.post(url, param).then(function(res) {
        if (res.resultCode == "00") {
          window.localStorage.openId = res.result;
+          if (window.localStorage.openId) {
+            vm.getWxUserInfo(window.localStorage.openId);
          }
-      })
-    },
+        }
+      });
    },
-}
+    getWxUserInfo(id) {
+      let vm = this;
+      let url = process.env.basePathRl + "getWxUserInfo";
+      let params = {
+        apiKey: "handexinxi",
+        openid: id
+        // openid: "oBdoRwI9gj9Brbe9iqlDCg5G2dDc"
+      };
+
+      // window.localStorage.openId = "1234567"
+      vm.hlsHttp.post(url, params).then(function(res) {
+        if (res.resultCode == "00") {
+          vm.subscribe = window.localStorage.subscribe = res.result.subscribe;
+          // console.log("vvvv", res.result.subscribe);
+        }
+      });
+    }
+  }
+};
 </script>
 <style lang="less" scoped type="text/less">
-  @import "../styles/vue-1px";
+@import "../styles/vue-1px";

-  #home {
+#home {
  .top-box {
    // height: 264px;
    width: 100%;
@@ -247,7 +286,7 @@ export default {
        // border: 1px solid white;
        border-radius: 15px;
        text-align: center;
-          color: #B6B6B6;
+        color: #b6b6b6;
        font-size: 12px;
      }

@@ -272,23 +311,22 @@ export default {
      position: absolute;
      bottom: 0;
      background: url("../assets/image/home/moduleBg@2x.png");
-        Background-size: 100%;
+      background-size: 100%;
      padding-top: 43px;
      display: flex;
      justify-content: space-between;

      &:before {
-          content: ''
+        content: "";
      }

      &:after {
-          content: ''
+        content: "";
      }

      .function-item {
        text-align: center;
      }
-
    }
  }

@@ -301,31 +339,31 @@ export default {
      display: flex;
      align-items: center;
      line-height: 100%;
-        color: #5D98F6;
+      color: #5d98f6;
      position: relative;

      &:before {
-          content: '';
+        content: "";
        width: 4px;
        height: 15px;
        margin-right: 9px;
        margin-left: 10px;
-          background-image: linear-gradient(-180deg, #5D98F6 0%, #76BCEE 100%);
+        background-image: linear-gradient(-180deg, #5d98f6 0%, #76bcee 100%);
        border-radius: 2px;
      }

      &:after {
-          .setBottomLine()
+        .setBottomLine();
      }

      span {
        font-size: 12px;
-          color: #878A8D;
+        color: #878a8d;
        position: absolute;
        right: 15px;
      }
    }
-      .function{
+    .function {
      display: flex;
      flex-wrap: wrap;

@@ -363,7 +401,7 @@ export default {
    width: 100%;
    height: 42px;
    margin-top: 8px;
-      background-color: #FFFFFF;
+    background-color: #ffffff;
    display: flex;
    justify-content: flex-start;
    align-items: center;
@@ -371,7 +409,7 @@ export default {
      -webkit-flex: 0 0 20%;
      flex: 0 0 20%;
      max-width: 20%;
-        color: #E84A55;
+      color: #e84a55;
      font-size: 14px;
      //margin-left: 3.2%;
      height: 100%;
@@ -453,5 +491,5 @@ export default {
      }
    }
  }
-  }
+}
 </style>