armg 6 днів тому
батько
коміт
fdf58bc00a
5 змінених файлів з 50 додано та 4 видалено
  1. 2 0
      .env.development
  2. 2 1
      .env.production
  3. 0 1
      src/router/index.ts
  4. 37 1
      src/utils/index.ts
  5. 9 1
      src/views/AIDesign/index.vue

+ 2 - 0
.env.development

@@ -8,3 +8,5 @@ devtool=cheap-module-eval-source-map
 VUE_APP_AIDESIGN=https://aidesigntest.nipponpaint.com.cn/
 # 应用地址
 VUE_APP_AUTHURL=https://aidesigntest.nipponpaint.com.cn/AiDesignWeb/
+VUE_APP_Target=https://suishenbangtest.nipponpaint.com.cn/wxportal-api/
+

+ 2 - 1
.env.production

@@ -3,4 +3,5 @@ VUE_APP_publicPath=/AiDesignWeb/
 VUE_APP_AIDESIGN_API='https://aidesign.nipponpaint.com.cn/'
 devtool=cheap-module-source-map
 # 应用地址
-VUE_APP_AUTHURL=https://aidesign.nipponpaint.com.cn/AiDesignWeb/
+VUE_APP_AUTHURL=https://aidesign.nipponpaint.com.cn/AiDesignWeb/
+VUE_APP_Target=/

+ 0 - 1
src/router/index.ts

@@ -169,7 +169,6 @@ function handleNewLoginMode(to, next, wxId) {
           window.localStorage.setItem('AIToken', res.Data.token);
           window.localStorage.setItem('isRefreshProvider', res.Data.isRefreshProvider);
           const { WecomType } = to.query;
-          console.log("WecomType===",WecomType)
           window.localStorage.setItem('agentFrom', getAgentFrom(parseInt(WecomType)));
           window.localStorage.setItem('agentFromAI', getAgentFrom(parseInt(WecomType)));
           console.log(`新登录成功,Token已缓存,即将进入 ${to.path}`);

+ 37 - 1
src/utils/index.ts

@@ -111,7 +111,43 @@ export const getAgentFrom = (WecomType: number) => {
 
 
 export const toLBHome = () => {
-  router.replace('/');
+  const loginMode = sessionStorage.getItem("loginMode")
+  if (loginMode === 'wxidLogin') {
+    let baseUrl: string = "";
+    process.env.VUE_APP_BASE_API == "/api/"
+      ? (baseUrl = process.env.VUE_APP_Target)
+      : (baseUrl = process.env.VUE_APP_BASE_API);
+    let agent = window.localStorage.getItem('agentFrom');
+    let agentFromAI = window.localStorage.getItem('agentFromAI');
+    let WecomType = sessionStorage.getItem("userWecomType");
+    // 导购来源和无来源的点击小房子为退出应用,其他为返回到首页
+    if (WecomType && WecomType == '4') {
+      console.log("----导购来源---")
+      wx.invoke('closeWindow', {}, (res) => {
+        if (res.err_msg === 'closeWindow:ok') {
+          console.log("关闭应用成功")
+        } else {
+          console.log("关闭应用失败")
+        }
+      });
+    } else if (agentFromAI && agentFromAI === 'dg' || (!agent && !WecomType)) {
+      console.log("----导购or无---")
+      wx.invoke('closeWindow', {}, (res) => {
+        if (res.err_msg === 'closeWindow:ok') {
+          console.log("关闭应用成功")
+        } else {
+          console.log("关闭应用失败")
+        }
+      });
+    } else {
+      if (!agent && WecomType) {
+        agent = getAgentFrom(parseInt(WecomType)) || 'ssb';
+      }
+      window.location.href = baseUrl.replace("wxportal-api/", "") + '?agent=' + agent;
+    }
+  } else {
+    router.replace('/');
+  }
 }
 
 export const toXiaoChengxu = (appid) => {

+ 9 - 1
src/views/AIDesign/index.vue

@@ -1,8 +1,15 @@
 <template>
   <div class="home-container AI-Design-container">
-    <div class="header">
+    <div class="header" v-if="loginMode === 'codeLogin'">
       <van-nav-bar title="首页"></van-nav-bar>
     </div>
+    <div class="header" v-if="loginMode === 'wxidLogin'">
+      <van-nav-bar title="首页" left-arrow @click-left="returnPage" @click-right="toHome">
+        <template #right>
+          <van-icon name="wap-home-o" color="#333" size="26" />
+        </template>
+      </van-nav-bar>
+    </div>
     <!-- 顶部装饰背景图 -->
     <div class="top-bg">
       <img v-show="currentTab === 'inside'" src="@/assets/AIDesign/top-inside.jpg" class="bg-image" />
@@ -104,6 +111,7 @@ export default class extends Vue {
   // }
   // 入口新判断
   created() {
+    this.loginMode = sessionStorage.getItem("loginMode");
     getWxconfig();
     const agentFrom = window.localStorage.getItem('agentFrom');
     // 经销商随身邦,好邦手进去,默认在内墙空间;服务商进去,默认外墙空间