Merge branch 'Version2' into onlineDev

src/DRP/HDrpManagement/agentManage/detail/tabs/ShopManage.vue

@@ -54,7 +54,7 @@
               <span :style="{color:utils.statusAndColor(data.record.status)}">{{ data.record.status }}</span>
             </template>
             <template v-else-if="data.column.dataIndex == 'qrcord'">
-              <a-qrcode :value="baseUrl+'wechatBind?wechatBindUserid='+data.record.sys_enterprise_hrid+'&userName='+data.record.name" size="100" />
+              <a-qrcode :value="useAuthStore().qrCordBaseUrl+'wechatBind?wechatBindUserid='+data.record.sys_enterprise_hrid+'&userName='+data.record.name" size="100" />
             </template>
             <template v-else>
               {{ data.record[data.column.dataIndex] }}
@@ -72,6 +72,7 @@
 <script setup>
 import normalTable from '@/template/normalTable/index.vue'
 import SelectModel from '@/components/selectModel/index2.vue'
+import { useAuthStore } from '@/stores/modules/auth.js'
 import Api from '@/api/api'
 import utils from '@/utils/utils'
 

src/DRP/HDrpManagement/agentManage/detail/tabs/agentGroup.vue

@@ -3,7 +3,7 @@
    <a-table :dataSource="dataSource" :columns="utils.TBLayout('agentGrouptable')" size="small" bordered>
     <template #bodyCell="{ column, record }">
       <template v-if="column.dataIndex == 'qrcord'">
-        <a-qrcode :value="baseUrl+'wechatBind?wechatBindUserid='+record.sys_enterprise_hrid+'&userName='+record.name" size="100" />
+        <a-qrcode :value="useAuthStore().qrCordBaseUrl+'wechatBind?wechatBindUserid='+record.sys_enterprise_hrid+'&userName='+record.name" size="100" />
       </template>
       <template v-else>{{ record[column.dataIndex] }}</template>
     </template>
@@ -15,6 +15,7 @@ import Api from '@/api/api'
 import utils from '@/utils/utils'
 import {ref,defineProps,createVNode, defineComponent,defineEmits, inject} from 'vue'
 import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+import { useAuthStore } from '@/stores/modules/auth.js'
 import { Modal } from 'ant-design-vue';
 let baseUrl = inject('baseUrl')
 const props = defineProps(['enterpriseid','dataSource'])

src/DRP/HDrpManagement/depManage/detail/index.vue

@@ -5,7 +5,7 @@
         <a-popover trigger="click">
           <template #content>
             <div class="code">
-              <a-qrcode :value="`https://www.jiushengboard.cc/BindSalesman?hrid=${userData.hrid}&username=${userData.name}`" />
+              <a-qrcode :value="`${useAuthStore().qrCordBaseUrl}BindSalesman?hrid=${userData.hrid}&username=${userData.name}`" />
               <div class="descript">微信扫码绑定账号</div>
             </div>
           </template>
@@ -30,6 +30,7 @@ import detailTemplate from '@/components/detailTemplate/index.vue'
 import edit from './modules/edit.vue'
 import ceateAccount from './modules/ceateAccount.vue'
 import bindUserToAccount from './modules/bindUserToAccount.vue'
+import { useAuthStore } from '@/stores/modules/auth.js'
 import { useRouter } from "vue-router";
 import { onMounted,ref } from "vue";
 const router = useRouter()

src/stores/modules/auth.js

@@ -17,7 +17,8 @@ export const useAuthStore = defineStore('auth', {
       current:[],
       tableConfigs:{},
       hiddenSensitiveFields:false,
-      fieldsParam:{}
+      fieldsParam:{},
+      qrCordBaseUrl:'',//二维码基本地址
     }
   },
   // 开启数据缓存
@@ -26,7 +27,7 @@ export const useAuthStore = defineStore('auth', {
     strategies: [
       {
         storage: localStorage,
-        paths: ['system', 'mods','app','accountList','nowAccount','actSystem','current','tableConfigs','hiddenSensitiveFields']
+        paths: ['system', 'mods','app','accountList','nowAccount','actSystem','current','tableConfigs','hiddenSensitiveFields','qrCordBaseUrl']
       }
     ]
   },
@@ -127,7 +128,16 @@ export const useAuthStore = defineStore('auth', {
      * 设置默认账号
      */
     async defaultAccount (account,fn) {
-
+      switch (account.siteid) {
+        case 'cucu':
+          this.qrCordBaseUrl = 'https://lsa.cnyunl.com/'
+          break;
+        case 'CCYOSG':
+          this.qrCordBaseUrl = 'https://www.jiushengboard.cc/'
+          break;
+        default:
+          break;
+      }
       account ? this.nowAccount = account : this.nowAccount
 
       sessionStorage.setItem('token',this.nowAccount.token)