优化

src/api/indexAI.js

@@ -340,8 +340,8 @@ export function GetOrderAddress() {
     const auth = getAuthCredentials();
     formData.append('loginMark', auth.loginMark);
     formData.append('token', auth.token);
-    const userInfo = JSON.parse(window.localStorage.getItem("userInfoV1"));
-    formData.append('WXuserid', userInfo.loginName);
+    const weChat = window.localStorage.getItem("weChat");
+    formData.append('WXuserid', weChat);
     return request({
         url: '/aidesign/outside/GetOrderAddress',
         method: 'post',

src/layout/index.vue

@@ -14,7 +14,6 @@ declare let wx: any;
   }
 })
 export default class extends Vue {
-  userInfo: any = {};
   @Watch("$route")
   routechange(to: any, from: any) { }
   created() { }

src/main.ts

@@ -9,8 +9,6 @@ Vue.prototype.$qs = qs;
 import request from "./utils/request";
 import preventClick from "./utils/clickStatefrom";
 import "./assets/iconfont/iconfont.css";
-import magnetlogadd from "./utils/magnetLogAdd.js";
-Vue.prototype.$magnetlogadd = magnetlogadd;
 import "@/components";
 Vue.use(preventClick);
 import ElDialog from "element-ui/lib/dialog";

src/router/index.ts

@@ -137,6 +137,7 @@ async function handleWxidLoginMode(to, next, wxId, WecomType) {
     if (checkLoginStatus()) return next();
     // 4. wxid参数校验
     if (!wxId) return redirectToError(next);
+    window.localStorage.setItem('weChat', wxId);
     const formData = new FormData();
     const timestamp = new Date().getTime().toString();
     const nonce = getGuid();
@@ -151,6 +152,7 @@ async function handleWxidLoginMode(to, next, wxId, WecomType) {
           // console.log("res=", res)
           window.localStorage.setItem('AIToken', res.Data.token);
           window.localStorage.setItem('isRefreshProvider', res.Data.isRefreshProvider);
+          window.localStorage.setItem('weChat', res.Data.weChat);
           console.log(`新登录成功，Token已缓存，即将进入 ${to.path}`);
           // debugger
           next();

src/utils/index.ts

@@ -116,7 +116,7 @@ export const toLBHome = () => {
     let WecomType = sessionStorage.getItem("userWecomType");
     // 导购来源和无来源的点击小房子为退出应用，其他为返回到首页
     if (WecomType && WecomType == '4') {
-      console.log("----导购来源---")
+      // console.log("----导购来源---")
       wx.invoke('closeWindow', {}, (res) => {
         if (res.err_msg === 'closeWindow:ok') {
           console.log("关闭应用成功")
@@ -125,7 +125,7 @@ export const toLBHome = () => {
         }
       });
     } else if (agentFromAI && agentFromAI === 'dg' || (!agent && !WecomType)) {
-      console.log("----导购or无---")
+      // console.log("----导购or无---")
       wx.invoke('closeWindow', {}, (res) => {
         if (res.err_msg === 'closeWindow:ok') {
           console.log("关闭应用成功")
@@ -144,66 +144,84 @@ export const toLBHome = () => {
   }
 }
 
-export const toXiaoChengxu = (appid) => {
-  let url = window.location.href.split("#")[0];
-  wx.ready(function () {
-    wx.checkJsApi({
-      jsApiList: ["agentConfig", "launchMiniprogram"], // 需要检测的JS接口列表
-      success: function (res) {
-        const formData = new FormData();
-        formData.append('url', url);
-        formData.append('agent', '1');
-        wecomTicket(formData).then(response => {
-          if (response.status == 200) {
-            let yingyongData = response.Data;
-            wx.agentConfig({
-              corpid: yingyongData.appid, // 必填，企业微信的corpid，必须与当前登录的企业一致
-              agentid: yingyongData.agentID, // 必填，企业微信的应用id （e.g. 1000247）
-              timestamp: yingyongData.timestamp, // 必填，生成签名的时间戳
-              nonceStr: yingyongData.noncestr, // 必填，生成签名的随机串
-              signature: yingyongData.signature, // 必填，签名，见附录-JS-SDK使用权限签名算法
-              jsApiList: ["launchMiniprogram"], //必填，传入需要使用的接口名称
-              success: function (res) {
-                wx.invoke(
-                  "launchMiniprogram",
-                  {
-                    appid: appid, // 需跳转的小程序appid
-                    path: "" // 所需跳转的小程序内页面路径及参数。非必填
-                  },
-                  function (res) {
-                    if (res.err_msg == "launchMiniprogram:ok") {
-                      // 正常
-                      console.log("正常");
-                    } else {
-                      // 错误处理
-                    }
-                  }
-                );
-              },
-              fail: function (res) {
-                if (res.errMsg.indexOf("function not exist") > -1) {
-                  alert("版本过低请升级");
-                }
-              }
-            });
+// 全局变量：标记agentConfig是否已成功初始化
+let isAgentConfigSuccess = false;
+
+/* 跳转小程序（需先调用getWxconfig初始化）
+ * @param {string} appid 目标小程序appid
+ * @returns {Promise} 跳转成功/失败的Promise
+ */
+export const toXiaoChengxu = async (appid) => {
+  try {
+    if (!appid) {
+      throw new Error("小程序appid不能为空");
+    }
+    // 1. 确保agentConfig已成功初始化（如果未初始化，会自动执行）
+    await getWxconfig();
+    // 2. 检查launchMiniprogram接口是否可用
+    await new Promise((resolve, reject) => {
+      wx.checkJsApi({
+        jsApiList: ["launchMiniprogram"],
+        success: function (res) {
+          // console.log("checkJsApi结果：", res);
+          // 检查接口是否真的可用
+          if (res.checkResult.launchMiniprogram !== true) {
+            reject(new Error("当前环境不支持launchMiniprogram接口，请确认企业微信版本和应用权限"));
+          } else {
+            resolve();
           }
-        });
-      }
+        },
+        fail: function (err) {
+          reject(new Error(`checkJsApi失败：${JSON.stringify(err)}`));
+        }
+      });
     });
-  });
-}
+
+    // 3. 调用跳转接口
+    await new Promise((resolve, reject) => {
+      wx.invoke(
+        "launchMiniprogram",
+        {
+          appid: appid, // 目标小程序appid
+          path: "" // 小程序内路径（非必填）
+        },
+        function (res) {
+          // console.log("launchMiniprogram调用结果：", res);
+          if (res.err_msg === "launchMiniprogram:ok") {
+            // console.log("小程序跳转成功");
+            resolve(res);
+          } else {
+            reject(new Error(`跳转失败：${res.err_msg}`));
+          }
+        }
+      );
+    });
+
+  } catch (error) {
+    console.error("小程序跳转流程异常：", error.message);
+    alert(`跳转失败：${error.message}`);
+    throw error; // 抛出错误，方便上层处理
+  }
+};
 
 // 获取微信API授权信息
 export const getWxconfig = () => {
-  const jsApiList = ['getSetting', 'authorize', 'showModal', 'openSetting', 'downloadFile', 'saveImageToPhotosAlbum', 'hideMenuItems'];
+  if (isAgentConfigSuccess) {
+    return;
+  }
+  const jsApiList = ['getSetting', 'authorize', 'showModal', 'openSetting', 'downloadFile', 'saveImageToPhotosAlbum', 'closeWindow', 'hideMenuItems', 'launchMiniprogram'];
   let url = window.location.href.split("#")[0];
   const formData = new FormData();
   formData.append('url', url);
   formData.append('agent', '1');
   wecomTicket(formData).then(response => {
-    console.log("wecomTicket-response=", response)
     if (response.StatusCode == 200) {
       let qiyeData = response.Data;
+      // console.log("corpid=", qiyeData.appid)
+      // console.log("agentid=", qiyeData.agentID)
+      // console.log("timestamp=", qiyeData.timestamp)
+      // console.log("nonceStr=", qiyeData.noncestr)
+      // console.log("signature=", qiyeData.signature)
       wx.agentConfig({
         debug: true,
         corpid: qiyeData.appid,
@@ -214,16 +232,22 @@ export const getWxconfig = () => {
         jsApiList: [...jsApiList],
         success: function (res) {
           console.log('获取签名成功');
+          isAgentConfigSuccess = true; // 标记配置成功
           wx.hideMenuItems({
             menuList: [
+              "menuItem:share:appMessage",    // 转发给朋友/同事
               "menuItem:share:wechat",
               "menuItem:openWithBrowser",
+              "menuItem:share:email",         // 通过邮件转发
               "menuItem:copyUrl",
               "menuItem:share:wechat_friend",
-              "menuItem:share:timeline"
+              "menuItem:share:timeline",
+              "menuItem:openWithBrowser", // PC端浏览器打开
+              "menuItem:openWithSafari",  // 移动端iOS
+              "menuItem:openWithChrome"   // 移动端Android
             ],
             success: () => {
-              console.log('菜单隐藏成功');
+              // console.log('菜单隐藏成功');
             },
             fail: (err) => {
               console.log('菜单隐藏失败：', err);
@@ -231,7 +255,7 @@ export const getWxconfig = () => {
           });
         },
         fail: function (res) {
-          console.log("获取签名失败", res);
+          // console.log("获取签名失败", res);
           if (res.errMsg.indexOf('function not exist') > -1) {
             alert('版本过低请升级');
           }
@@ -255,8 +279,8 @@ export const checkWxWorkEnvAndUserCache = () => {
     }
     const userAgent = window.navigator.userAgent.toLowerCase();
     const isWxWorkEnv = userAgent.includes('wxwork');
-    console.log("userAgent", userAgent)
-    console.log("isWxWorkEnv", isWxWorkEnv)
+    // console.log("userAgent", userAgent)
+    // console.log("isWxWorkEnv", isWxWorkEnv)
     if (!isWxWorkEnv) {
       console.error('校验失败：当前环境非企业微信APP/客户端');
       sessionStorage.setItem("errorMsgTit", "请在企微客户端打开链接")

src/utils/magnetLogAdd.js

@@ -1,52 +0,0 @@
-//埋点
-import axios from "axios";
-
-let magnetLogAdd = {};
-
-magnetLogAdd.setLog = (magnetName,callback) => {
-    let isMobile = '';
-    if( /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent) ) {
-        isMobile = '0';
-    }else {
-        isMobile = '1';
-    }
-    let userInfo = JSON.parse(window.localStorage.getItem("userInfoV1"));
-    let agentFrom = window.localStorage.getItem('agentFrom');
-    if (agentFrom != undefined){
-        if (agentFrom == 'hbs'){
-            magnetName = '好邦手' + magnetName;
-        }
-        if (agentFrom == 'ssb'){
-            magnetName = '随身邦' + magnetName;
-        }
-        if (agentFrom == 'stoneLikePaint'){
-            magnetName = '服务商随身邦' + magnetName;
-        }
-        if (agentFrom == 'goldShop'){
-            magnetName = '金牌店随身邦' + magnetName;
-        }
-    }
-    let obj = {
-        userId: userInfo.userId,
-        userName: userInfo.userName,
-        orgCode: userInfo.sysUserExt.orgCode,
-        orgName: userInfo.sysUserExt.orgName,
-        level: userInfo.sysUserExt.salesLevel,
-        whatEnd: isMobile,
-        magnetName: magnetName
-    };
-    if(agentFrom == 'stoneLikePaint' || agentFrom == 'goldShop'){
-        let loginTypeList = userInfo.loginTypeList?userInfo.loginTypeList:[];
-        let shopList = [];
-        loginTypeList.forEach(function (item) {
-            if (item.shopType == agentFrom) {
-                shopList = item.shopList;
-                return
-            }
-        });
-        obj.level = shopList.length>0?shopList[0].sales_level:''
-    };
-    axios.post(`${process.env.VUE_APP_BASE_API}/wxportal/magnetLogAdd`,obj,{timeout:5000}).finally(callback);
-}
-
-export default magnetLogAdd;

src/utils/wecomLogin.ts

@@ -87,6 +87,7 @@ export const doWecomLogin = async (code: string, wxId?: string): Promise<void> =
         if (res && res.StatusCode === 200 && res.Data && res.Data.token) {
             window.localStorage.setItem('AIToken', res.Data.token);
             window.localStorage.setItem('isRefreshProvider', res.Data.isRefreshProvider);
+            window.localStorage.setItem('weChat', res.Data.weChat);
             // 处理身份，身份可能为多个，只能按身份权限大小来固定为某个身份；
             if (res.Data.userType) {
                 // 使用位运算
@@ -110,25 +111,9 @@ export const doWecomLogin = async (code: string, wxId?: string): Promise<void> =
                 window.localStorage.setItem('agentFromAI', 'xlskf');
             }
             isLogging = false;
-            // console.log("router.currentRoute.fullPath=",router.currentRoute.fullPath)
-            // 重新跳转目标页面（此时登录状态已满足）
-            // router.push(router.currentRoute.fullPath);
         } else {
             isLogging = false;
         }
-        // else if (res && res.StatusCode === 403) {
-        //     // 无权限 → 跳错误页
-        //     isLogging = false;
-        //     sessionStorage.setItem("errorMsgTit", '无操作权限');
-        //     router.push('/error');
-        // } else if (res && res.StatusCode === 420) {
-        //     // 需重新获取 code → 清除缓存并重定向
-        //     isLogging = false;
-        //     getQyCode(); // 你的获取企业微信二维码/授权链接的函数
-        // } else {
-        //     isLogging = false;
-        //     throw new Error(res && res.Message ? res.Message : '登录失败');
-        // }
     } catch (error) {
         isLogging = false;
         console.error('企业微信登录失败：', error);

src/views/AIDesign/GeneratePlan.vue

@@ -178,14 +178,6 @@ export default class GeneratePlan extends Vue {
     private getPicList() {
         let that = this;
         const formData = new FormData();
-        // const userInfo: any = JSON.parse(window.localStorage.getItem("userInfoV1")!);
-        // let roleIdArray = [];
-        // if (userInfo.roles.length > 0) {
-        //     userInfo.roles.forEach(item => {
-        //         roleIdArray.push(item.roleId);
-        //     })
-        // }
-        // formData.append('roleIds', roleIdArray.join(','));
         // formData.append('WXuserid', userInfo.loginName);
         formData.append('baseType', 0);//必填 0外墙 1内墙
         const agentFrom = window.localStorage.getItem('agentFromAI');

src/views/AIDesign/design.vue

@@ -460,7 +460,6 @@ export default class extends Vue {
   private showChooseProject = false;
   private showProjectPopover = false;
   created() {
-    // this.getServiceCode();
     // 图片头
     if (window.location.href.indexOf('aidesign.') > -1) {
       this.imgBaseUrl = 'https://aidesign.nipponpaint.com.cn'
@@ -525,21 +524,7 @@ export default class extends Vue {
     );
     this.color_selItem = selectedItem || null;
   }
-  private getServiceCode() {
-    let that = this;
-    const userInfo: any = JSON.parse(window.localStorage.getItem("userInfoV1")!);
-    let serviceCodeArray = [];
-    if (userInfo.loginTypeList.length > 0) {
-      userInfo.loginTypeList.forEach(item => {
-        if (item.shopType == 'stoneLikePaint') {
-          item.shopList.forEach(childItem => {
-            serviceCodeArray.push(childItem.shop_code);
-          })
-        }
-      })
-    }
-    that.serviceCodeArray = serviceCodeArray;
-  }
+
   // 处理文件选择（对应 beforeRead + afterRead）
   handleFileChange(e) {
     const file = e.target.files[0]; // 获取选中的文件
@@ -637,8 +622,6 @@ export default class extends Vue {
   }
   GetReadStateFn() {
     const formData = new FormData();
-    const userInfo: any = JSON.parse(window.localStorage.getItem("userInfoV1")!);
-    // formData.append('WXuserid', userInfo.loginName);
     const outsideType_val = this.activeName === '外墙质感' ? 0 : 1;
     formData.append('outsideType', outsideType_val);
     GetReadState(formData).then(response => {
@@ -650,8 +633,6 @@ export default class extends Vue {
 
   UpdateReadStateFn() {
     const formData = new FormData();
-    // const userInfo: any = JSON.parse(window.localStorage.getItem("userInfoV1")!);
-    // formData.append('WXuserid', userInfo.loginName);
     const outsideType_val = this.activeName === '外墙质感' ? 0 : 1;
     formData.append('outsideType', outsideType_val);
     UpdateReadState(formData).then(response => { });
@@ -905,7 +886,6 @@ export default class extends Vue {
       this.$toast.fail('请选择图片');
       return;
     }
-    // const userInfo: any = JSON.parse(window.localStorage.getItem("userInfoV1")!);
     const formData = new FormData();
     if (this.activeName === '外墙质感') {
       // 如果字典渲染有误，不让提交；墙面工艺、电子色卡都为必填项且没有不需要；
@@ -942,46 +922,6 @@ export default class extends Vue {
       formData.append('DesignStyle', "CHANGE_COLOR");
       formData.append('Color', this.color_selValue)
     }
-    // 其他项
-    // let serviceCodeArray = [];
-    // if (userInfo.loginTypeList.length > 0) {
-    //   userInfo.loginTypeList.forEach(item => {
-    //     if (item.shopType == 'stoneLikePaint') {
-    //       item.shopList.forEach(childItem => {
-    //         serviceCodeArray.push(childItem.shop_code);
-    //       })
-    //     }
-    //   })
-    // }
-    // // 用户企微ID
-    // formData.append('WXuserid', userInfo.loginName);
-    // // 项目ID
-    // if (this.checkedProject && this.projectBoxShow == true && this.activeName === '外墙质感') {
-    //   formData.append('projectid', this.checkedProject.projectid);
-    // }
-    // 企微类型
-    // formData.append('wecomType', 5);
-    // // 服务商代码
-    // if (serviceCodeArray.length > 0) {
-    //   formData.append('serivceCode', serviceCodeArray.join(','));
-    // }
-    // // 姓名
-    // formData.append('userName', userInfo.userName);
-    // const customerCode = userInfo.sysUserExt && userInfo.sysUserExt.customerCode ? userInfo.sysUserExt.customerCode : '';
-    // // 经销商代码
-    // formData.append('distributorCode', customerCode);
-    // //原服务商用户、新增经销商用户
-    // // 大区
-    // formData.append('regionName', userInfo.officeName || '');
-    // // 公司名称
-    // formData.append('companyName', userInfo.companyName || '');
-    // // 员工号
-    // let employeeID = userInfo.sysUserExt && userInfo.sysUserExt.sapEmployeeId ? userInfo.sysUserExt.sapEmployeeId : '';
-    // formData.append('employeeID', employeeID);
-    // //销售部---原服务商用户、新增经销商用户
-    // formData.append('salesDepartment', userInfo.subOfficeName || '');
-    // // 销售部ID
-    // formData.append('salesDepartmentCode', userInfo.subOfficeCode || '');
     // 样式图片
     if (this.Userfile1) {
       formData.append('Userfile1', this.Userfile1);
@@ -1059,8 +999,6 @@ export default class extends Vue {
   private updateCheckedProjectLastNum(projectId) {
     let that = this;
     const formData = new FormData();
-    // const userInfo: any = JSON.parse(window.localStorage.getItem("userInfoV1")!);
-    // formData.append('ServiceCode', that.serviceCodeArray.join(','));
     formData.append('projectid', projectId);
     GetProjectlist(formData).then(response => {
       if (response.StatusCode == 200) {
@@ -1075,8 +1013,6 @@ export default class extends Vue {
   GetProjectListFn() {
     let that = this;
     const formData = new FormData();
-    const userInfo: any = JSON.parse(window.localStorage.getItem("userInfoV1")!);
-    // formData.append('ServiceCode', that.serviceCodeArray.join(','));
     if (that.projectSearchValue.trim().length != 0) {
       formData.append('keyWord', that.projectSearchValue);
     }
@@ -1110,18 +1046,7 @@ export default class extends Vue {
   private getPicList() {
     let that = this;
     const formData = new FormData();
-    // const userInfo: any = JSON.parse(window.localStorage.getItem("userInfoV1")!);
-    // let roleIdArray = [];
-    // if (userInfo.roles.length > 0) {
-    //   userInfo.roles.forEach(item => {
-    //     roleIdArray.push(item.roleId);
-    //   })
-    // }
-    // formData.append('roleIds', roleIdArray.join(','));
-    // formData.append('WXuserid', userInfo.loginName);
     formData.append('baseType', 0);
-    // formData.append('wecomType', this.wecomType);
-    // const isRefresh = userInfo.isRefreshProvider === '是' ? 1 : 0;//0=否 1=是
     const isRefreshProvider = window.localStorage.getItem("isRefreshProvider");
     const isRefresh = isRefreshProvider === '是' ? 1 : 0;//0=否 1=是
     formData.append('isRefresh', isRefresh);

src/views/AIDesign/diagnose.vue

@@ -90,7 +90,6 @@ export default class extends Vue {
     private dialogContent = '';
     private wallType = '';
     created() {
-        // this.getServiceCode();
     }
     activated() {
         // 初始化数据
@@ -112,21 +111,6 @@ export default class extends Vue {
         this.oldf_id = null;
         sessionStorage.removeItem("diagnoseSelectedImage")
     }
-    private getServiceCode() {
-        let that = this;
-        const userInfo: any = JSON.parse(window.localStorage.getItem("userInfoV1")!);
-        let serviceCodeArray = [];
-        if (userInfo.loginTypeList.length > 0) {
-            userInfo.loginTypeList.forEach(item => {
-                if (item.shopType == 'stoneLikePaint') {
-                    item.shopList.forEach(childItem => {
-                        serviceCodeArray.push(childItem.shop_code);
-                    })
-                }
-            })
-        }
-        that.serviceCodeArray = serviceCodeArray;
-    }
     // 处理文件选择（对应 beforeRead + afterRead）
     handleFileChange(e) {
         const file = e.target.files[0]; // 获取选中的文件
@@ -177,51 +161,8 @@ export default class extends Vue {
             return;
         }
         const formData = new FormData();
-        // const userInfo: any = JSON.parse(window.localStorage.getItem("userInfoV1")!);
-        // let serviceCodeArray = [];
-        // if (userInfo.loginTypeList.length > 0) {
-        //     userInfo.loginTypeList.forEach(item => {
-        //         if (item.shopType == 'stoneLikePaint') {
-        //             item.shopList.forEach(childItem => {
-        //                 serviceCodeArray.push(childItem.shop_code);
-        //             })
-        //         }
-        //     })
-        // }
-        // // 用户企微ID
-        // formData.append('WXuserid', userInfo.loginName);
         // 企微类型
         const agentFrom = window.localStorage.getItem('agentFromAI');
-        // const wecomType = getWecomType(agentFrom);
-        // formData.append('wecomType', 5);
-        // // 服务商代码
-        // if (serviceCodeArray.length > 0) {
-        //     formData.append('serivceCode', serviceCodeArray.join(','));
-        // }
-        // // 姓名
-        // formData.append('userName', userInfo.userName);
-        // const customerCode = userInfo.sysUserExt && userInfo.sysUserExt.customerCode ? userInfo.sysUserExt.customerCode : '';
-        // // 经销商代码
-        // formData.append('distributorCode', customerCode);
-        // //原服务商用户、新增经销商用户
-        // // 大区
-        // formData.append('regionName', userInfo.officeName || '');
-        // // 公司名称
-        // formData.append('companyName', userInfo.companyName || '');
-        // // 员工号
-        // let employeeID = userInfo.sysUserExt && userInfo.sysUserExt.sapEmployeeId ? userInfo.sysUserExt.sapEmployeeId : '';
-        // formData.append('employeeID', employeeID);
-        // // 立邦员工，返回新增字段(hbs立邦员工);
-        // if (agentFrom === 'hbs') {
-        //     //销售部及ID---立邦员工取值orgName和orgCode
-        //     formData.append('salesDepartment', userInfo.sysUserExt && userInfo.sysUserExt.orgName ? userInfo.sysUserExt.orgName : '');
-        //     formData.append('salesDepartmentCode', userInfo.sysUserExt && userInfo.sysUserExt.orgCode ? userInfo.sysUserExt.orgCode : '');
-        // } else {
-        //     //销售部---原服务商用户、新增经销商用户
-        //     formData.append('salesDepartment', userInfo.subOfficeName || '');
-        //     // 销售部ID
-        //     formData.append('salesDepartmentCode', userInfo.subOfficeCode || '');
-        // }
         // 样式图片
         if (this.Userfile1) {
             formData.append('Userfile1', this.Userfile1);
@@ -267,8 +208,6 @@ export default class extends Vue {
 
     GetReadStateFn() {
         const formData = new FormData();
-        // const userInfo: any = JSON.parse(window.localStorage.getItem("userInfoV1")!);
-        // formData.append('WXuserid', userInfo.loginName);
         // 0外墙 1内墙
         const Entrytype = this.wallType === 'inside' ? 1 : 0;
         formData.append('Entrytype', Entrytype);
@@ -281,8 +220,6 @@ export default class extends Vue {
 
     UpdateReadStateFn() {
         const formData = new FormData();
-        // const userInfo: any = JSON.parse(window.localStorage.getItem("userInfoV1")!);
-        // formData.append('WXuserid', userInfo.loginName);
         // 0外墙 1内墙
         const Entrytype = this.wallType === 'inside' ? 1 : 0;
         formData.append('Entrytype', Entrytype);

src/views/AIDesign/diagnoseHistory.vue

@@ -193,11 +193,9 @@ export default class Resout extends Vue {
 
     // 获取数据列表 - 支持加载更多
     getDataInfioList(isLoadMore = false): void {
-        const userInfo: any = JSON.parse(window.localStorage.getItem("userInfoV1")!);
         // 0外墙 1内墙
         const Entrytype = this.wallType === 'inside' ? 1 : 0;
         const queryJson = {
-            // WXuserid: userInfo.loginName,
             Entrytype
         };
         const formData = new FormData();

src/views/AIDesign/diagnoseResult.vue

@@ -439,7 +439,6 @@ export default class DiagnosisPage extends Vue {
 
     GetReadStateFn() {
         const formData = new FormData();
-        // const userInfo: any = JSON.parse(window.localStorage.getItem("userInfoV1")!);
         // formData.append('WXuserid', userInfo.loginName);
         // 0外墙 1内墙
         const Entrytype = this.wallType === 'inside' ? 1 : 0;
@@ -470,7 +469,6 @@ export default class DiagnosisPage extends Vue {
     // 更新未读状态
     UpdateReadStateFn() {
         const formData = new FormData();
-        // const userInfo: any = JSON.parse(window.localStorage.getItem("userInfoV1")!);
         // formData.append('WXuserid', userInfo.loginName);
         // 0外墙 1内墙
         const Entrytype = this.wallType === 'inside' ? 1 : 0;

src/views/AIDesign/history.vue

@@ -201,7 +201,6 @@ export default class Resout extends Vue {
 
   // 获取数据列表 - 支持加载更多
   getDataInfioList(isLoadMore = false): void {
-    // const userInfo: any = JSON.parse(window.localStorage.getItem("userInfoV1")!);
     const queryJson = {
       // WXuserid: userInfo.loginName
     };

src/views/AIDesign/insideDesign.vue

@@ -211,7 +211,6 @@ export default class extends Vue {
   private currentScrollElement: HTMLElement | null = null;
   @Ref('textureRef') private textureRef!: HTMLDivElement;
   created() {
-    // this.getServiceCode();
     // 图片头
     if (window.location.href.indexOf('aidesign.') > -1) {
       this.imgBaseUrl = 'https://aidesign.nipponpaint.com.cn'
@@ -392,22 +391,6 @@ export default class extends Vue {
       });
     }
   }
-
-  private getServiceCode() {
-    let that = this;
-    const userInfo: any = JSON.parse(window.localStorage.getItem("userInfoV1")!);
-    let serviceCodeArray = [];
-    if (userInfo.loginTypeList.length > 0) {
-      userInfo.loginTypeList.forEach(item => {
-        if (item.shopType == 'stoneLikePaint') {
-          item.shopList.forEach(childItem => {
-            serviceCodeArray.push(childItem.shop_code);
-          })
-        }
-      })
-    }
-    that.serviceCodeArray = serviceCodeArray;
-  }
   // 处理文件选择（对应 beforeRead + afterRead）
   handleFileChange(e) {
     const file = e.target.files[0]; // 获取选中的文件
@@ -461,7 +444,6 @@ export default class extends Vue {
 
   GetReadStateFn() {
     const formData = new FormData();
-    // const userInfo: any = JSON.parse(window.localStorage.getItem("userInfoV1")!);
     // formData.append('WXuserid', userInfo.loginName);
     insideGetReadState(formData).then(response => {
       if (response.StatusCode == 200) {
@@ -472,7 +454,6 @@ export default class extends Vue {
 
   insideUpdateReadStateFn() {
     const formData = new FormData();
-    // const userInfo: any = JSON.parse(window.localStorage.getItem("userInfoV1")!);
     // formData.append('WXuserid', userInfo.loginName);
     insideUpdateReadState(formData).then(response => { });
   }
@@ -614,17 +595,6 @@ export default class extends Vue {
       return;
     }
     const formData = new FormData();
-    // const userInfo: any = JSON.parse(window.localStorage.getItem("userInfoV1")!);
-    // let serviceCodeArray = [];
-    // if (userInfo.loginTypeList.length > 0) {
-    //   userInfo.loginTypeList.forEach(item => {
-    //     if (item.shopType == 'stoneLikePaint') {
-    //       item.shopList.forEach(childItem => {
-    //         serviceCodeArray.push(childItem.shop_code);
-    //       })
-    //     }
-    //   })
-    // }
     // formData.append('WXuserid', userInfo.loginName);
     let DesignStyle_selValue_sub = this.DesignStyle_selValue;
     //风格有值，清除纹理和色卡
@@ -647,31 +617,6 @@ export default class extends Vue {
     } else {
       formData.append('oldf_id', this.oldf_id);
     }
-    // 企微类型
-    // const agentFrom = window.localStorage.getItem('agentFromAI');
-    // const wecomType = getWecomType(agentFrom);
-    // formData.append('wecomType', 5);
-    // // 服务商代码
-    // if (serviceCodeArray.length > 0) {
-    //   formData.append('serivceCode', serviceCodeArray.join(','));
-    // }
-    // // 姓名
-    // formData.append('userName', userInfo.userName);
-    // const customerCode = userInfo.sysUserExt && userInfo.sysUserExt.customerCode ? userInfo.sysUserExt.customerCode : '';
-    // // 经销商代码
-    // formData.append('distributorCode', customerCode);
-    // //原服务商用户、新增经销商用户
-    // // 大区
-    // formData.append('regionName', userInfo.officeName || '');
-    // // 公司名称
-    // formData.append('companyName', userInfo.companyName || '');
-    // // 员工号
-    // let employeeID = userInfo.sysUserExt && userInfo.sysUserExt.sapEmployeeId ? userInfo.sysUserExt.sapEmployeeId : '';
-    // formData.append('employeeID', employeeID);
-    // //销售部---原服务商用户、新增经销商用户
-    // formData.append('salesDepartment', userInfo.subOfficeName || '');
-    // // 销售部ID
-    // formData.append('salesDepartmentCode', userInfo.subOfficeCode || '');
     // 遍历打印
     formData.forEach((value, key) => {
       console.log(`key: ${key}, value: ${value}`);
@@ -713,14 +658,6 @@ export default class extends Vue {
   private getPicList() {
     let that = this;
     const formData = new FormData();
-    // const userInfo: any = JSON.parse(window.localStorage.getItem("userInfoV1")!);
-    // let roleIdArray = [];
-    // if (userInfo.roles.length > 0) {
-    //   userInfo.roles.forEach(item => {
-    //     roleIdArray.push(item.roleId);
-    //   })
-    // }
-    // formData.append('roleIds', roleIdArray.join(','));
     // formData.append('WXuserid', userInfo.loginName);
     formData.append('baseType', 1);//必填 0外墙 1内墙
     const agentFrom = window.localStorage.getItem('agentFromAI');

src/views/AIDesign/result.vue

@@ -154,24 +154,17 @@ export default class extends Vue {
     console.log("this.$route", this.$route)
     checkAndSaveUserWecomType();
     getWxconfig();
-    // this.getServiceCode();
   }
 
   activated() {
     this.initialize();
     this.wallType = this.$route.query.wallType || 'outside';
-    const userInfo: any = JSON.parse(window.localStorage.getItem("userInfoV1")!);
-    const customerCode = userInfo && userInfo.sysUserExt ? userInfo.sysUserExt.customerCode : '';
-    const salesLevel = userInfo && userInfo.sysUserExt ? userInfo.sysUserExt.salesLevel : '';
     // 外墙-服务商随身邦
     if (this.agentFrom === 'stoneLikePaint' && this.wallType === 'outside') {
       this.showArtificial = true;
       this.getIsNeedProjectFlag();//获取是否关联了项目
     }
-    // 和部分经销商展示转人工
-    // else if(customerCode && (salesLevel === 'customer_level' || salesLevel === 'reseller_level')){
-    //   this.showArtificial = true;
-    // }
+
     // 从经销商随身邦进入的，显示转人工按钮，没有次数限制
     if ((this.agentFrom === 'ssb' || this.agentFrom === 'dg') && this.wallType === 'outside') {
       this.showArtificial = true;
@@ -215,14 +208,6 @@ export default class extends Vue {
   getIsNeedProjectFlag() {
     let that = this;
     const formData = new FormData();
-    // const userInfo: any = JSON.parse(window.localStorage.getItem("userInfoV1")!);
-    // let roleIdArray = [];
-    // if (userInfo.roles.length > 0) {
-    //   userInfo.roles.forEach(item => {
-    //     roleIdArray.push(item.roleId);
-    //   })
-    // }
-    // formData.append('roleIds', roleIdArray.join(','));
     // formData.append('WXuserid', userInfo.loginName);
     formData.append('baseType', 0);//0外墙--这里只用查询外墙
     const agentFrom = window.localStorage.getItem('agentFromAI');
@@ -259,24 +244,8 @@ export default class extends Vue {
       }
     });
   }
-  private getServiceCode() {
-    let that = this;
-    const userInfo: any = JSON.parse(window.localStorage.getItem("userInfoV1")!);
-    let serviceCodeArray = [];
-    if (userInfo.loginTypeList.length > 0) {
-      userInfo.loginTypeList.forEach(item => {
-        if (item.shopType == 'stoneLikePaint') {
-          item.shopList.forEach(childItem => {
-            serviceCodeArray.push(childItem.shop_code);
-          })
-        }
-      })
-    }
-    that.serviceCodeArray = serviceCodeArray;
-  }
   GetReadStateFn() {
     const formData = new FormData();
-    // const userInfo: any = JSON.parse(window.localStorage.getItem("userInfoV1")!);
     // formData.append('WXuserid', userInfo.loginName);
     if (this.wallType === 'outside') {
       const outsideType_val = this.F_OutsideType || 0;
@@ -290,7 +259,6 @@ export default class extends Vue {
   }
   UpdateReadStateFn() {
     const formData = new FormData();
-    // const userInfo: any = JSON.parse(window.localStorage.getItem("userInfoV1")!);
     // formData.append('WXuserid', userInfo.loginName);
     const outsideType_val = this.F_OutsideType || 0;
     formData.append('outsideType', outsideType_val);
@@ -583,11 +551,8 @@ export default class extends Vue {
     };
     formData.append('eventdata', JSON.stringify(eventdataObj));//事件数据
     AddTrackEvent(formData)//埋点
-    // console.log('转人工设计');
     // 实现转人工设计逻辑
-    // that.$magnetlogadd.setLog('AI外墙设计-转人工设计', function () {
     toXiaoChengxu(`${process.env.VUE_APP_BASE_DISID6}`);
-    // })
   }
 
   private handleAIfun() {
@@ -866,7 +831,8 @@ export default class extends Vue {
     height: auto;
     margin-right: 10px;
   }
-  .iconbig{
+
+  .iconbig {
     width: 48px;
     height: auto;
     margin-right: 5px;
@@ -885,7 +851,7 @@ export default class extends Vue {
     height: 72px;
     border-radius: 8px;
     background: rgba(240, 240, 240, 1);
-    margin:8px 1%;
+    margin: 8px 1%;
   }
 
   .action-button-small {

src/views/login/index.vue

@@ -2,13 +2,8 @@
   <div>
     <div class="login">
       <van-form @submit="onSubmit1" style="width: 100%;">
-        <van-field
-          v-model="username"
-          name="username"
-          label="用户名"
-          placeholder="请输入用户名"
-          :rules="[{ required: true, message: '请输入用户名' }]"
-        />
+        <van-field v-model="username" name="username" label="用户名" placeholder="请输入用户名"
+          :rules="[{ required: true, message: '请输入用户名' }]" />
         <!-- <van-field
           v-model="password"
           type="password"
@@ -39,7 +34,7 @@
 </template>
 <script lang="ts">
 import { Component, Vue, Watch, Prop } from "vue-property-decorator";
-import {  initGuidInfo,doWecomLogin } from '@/utils/wecomLogin.ts';
+import { initGuidInfo, doWecomLogin } from '@/utils/wecomLogin.ts';
 
 
 @Component
@@ -65,55 +60,17 @@ export default class extends Vue {
     let that = this;
     that.wxUserId = that.$route.query.wxUserId as string;
   }
-  async onSubmit(values) {
-    console.log("submit", values);
-    let that = this;
-    let obj = values;
-    // obj.wxUserId = this.wxUserId;
-    // let [err, data] = await this.$post("/sysuser/bindingUser", obj);
-    // let bindingUser: any = data;
-    // if (err && err.code == 301) {
-    //   this.$toast(err.msg);
-    //   this.username = "";
-    //   this.password = "";
-    // } else {
-    //   let [err, data] = await this.$post("/sysuser/getUserInfo", {
-    //     userId: bindingUser.user.userId
-    //   });
-    //   let getUserInfo: any = data;
-    //   window.localStorage.setItem(
-    //     "userInfoV1",
-    //     JSON.stringify(getUserInfo.wxUser)
-    //   );
-    //   this.$router.push(`/home`);
-    // }
-    let paramValueAgent = that.agentValue;
-    if (paramValueAgent == 'hbs') {
-      obj.userType = '0';
-    } else if (paramValueAgent == 'ssb') {
-      obj.userType = '1';
-    } else {
-      obj.userType = '2';
-    }
-    let [err, data] = await this.$post("/wx/getUserByPassWord", obj);
-    console.log(err);
-    console.log(data);
-    if (!err) {
-      console.log("login --sysUser = " + data.sysUser)
-      let getUserInfo: any = data;
-      window.localStorage.setItem("userInfoV1", JSON.stringify(getUserInfo.sysUser));
-      window.localStorage.setItem('agentFrom', that.agentValue);
-      window.localStorage.setItem("loginNumber", 1);
-      this.$router.push(`/homeIndex?userId=${data.sysUser.userId}&agent=${that.agentValue}`);
-    }
-  }
   onSubmit1() {
     window.localStorage.clear();
+    window.localStorage.setItem('loginMode', 'codeLogin');
     initGuidInfo();
-    doWecomLogin('QWert!@345',this.username)
+    doWecomLogin('QWert!@345', this.username)
       .then(() => {
+        debugger
         this.$router.push('/');
         console.log(`模拟登录成功`);
+      }).catch((err) => {
+        console.log("err=", err)
       })
   }
 }