Merge branch 'channel-access' of gitlab.gongsibao.com:jiangyong/zhichan into channel-access

channel-access/src/views/fqembed/companylist.vue

@@ -430,7 +430,10 @@ export default {
       detailsData: {},
       baseURL: "",
       detailsNeedNo: "",
-      headers: {}
+      headers: {
+        headers: {}
+      },
+      companyParams: {}
     };
   },
   methods: {
@@ -535,7 +538,7 @@ export default {
                 pageSize: "20",
                 needNo: "",
                 solutionNo: this.schemeNo || "",
-                bizType: "companyreg",
+                bizType: "esp.companyreg",
                 orderNo: this.serviceNo || "",
                 status: this.scheme || "",
                 companyName: this.entName || "",
@@ -589,7 +592,7 @@ export default {
                 needNo: "",
                 solutionNo: this.cSchemeNo || "", //方案编号
                 companyName: this.cEntName || "",
-                bizType: "companyreg_cloud",
+                bizType: "esp.companyreg_cloud",
                 orderNo: this.cServiceNo || "", //服务单号
                 status: this.cScheme || "", //方案状态
                 park: this.regPark || "", //注册园区
@@ -630,23 +633,56 @@ export default {
     }
   },
   watch: {},
-  created() {
-    if (process.env.NODE_ENV == "development") {
-      //开发环境
-      this.baseURL = "/api/web/action/icapi/springBoard";
-    } else if (process.env.NODE_ENV == "production") {
-      //生产环境
-      this.baseURL = "/web/action/icapi/springBoard";
-    }
-    this.headers = {
-      headers: {
-        token: "3260d5a2452441dd93ecc7ecb35f6dc0",
-        userpin: "417c247bc8664999a508fd710cc25567"
+  created() {},
+  async mounted() {
+    if (this.$route.query) {
+      this.companyParams = { ...this.$route.query };
+      this.headers.headers.token = this.companyParams.token;
+      console.log(this.companyParams);
+      var authUrl = "/web/auth/accessAuth/springBoard";
+      if (process.env.NODE_ENV == "development") {
+        //开发环境
+        this.baseURL = "/api/web/action/icapi/springBoard";
+        authUrl = "/api/web/auth/accessAuth/springBoard";
+      } else if (process.env.NODE_ENV == "production") {
+        //生产环境
+        this.baseURL = "/web/action/icapi/springBoard";
+        authUrl = "/web/auth/accessAuth/springBoard";
       }
-    };
-    // console.log(JSON.parse(this.$route.query.data));
-  },
-  mounted() {
+      await req
+        .post(
+          authUrl,
+          {
+            actionType: "getNeedUserPinByChannelUserId",
+            actionBody: {
+              needNo: this.companyParams.needNo, // Y 需求号
+              channelUserId: this.companyParams.userId, // Y 渠道用户ID
+              channelUserName: "", // N 渠道用户名
+              mobile: this.companyParams.mobile, // N 渠道用户手机号
+              nickName: this.companyParams.nickName, // N 用户昵称
+              orgName: this.companyParams.orgName // N 公司名称
+            }
+          },
+          {
+            headers: {
+              token: this.companyParams.token
+            }
+          }
+        )
+        .then(res => {
+          if (res.data.status == 0) {
+            this.headers.headers.userpin = res.data.data.userpin;
+            if (res.data.data.channelTypeCode == "esp.companyreg") {
+              this.activeName = "1";
+            } else if (
+              res.data.data.channelTypeCode == "esp.companyreg_cloud"
+            ) {
+              this.activeName = "2";
+            }
+          }
+          console.log(res.data);
+        });
+    }
     this.getListData();
   }
 };

channel-access/src/views/fqembed/needProxy.vue

@@ -9,11 +9,13 @@ export default {
     };
   },
   created() {
+
     if (this.$route.query) {
       this.companyParams = this.$route.query;
+      console.log(this.$route.query)
       this.$router.push({
         path: "/companylist",
-        query: {data:JSON.stringify(this.companyParams)}
+        query: this.companyParams
       });
       console.log(123, this.companyParams);
     }