Merge branch 'master' of http://gitea.intra.yunpaper.com/zhangqi/kuailelunwen_new_houtai

src/components/bindGoods.vue

@@ -102,7 +102,8 @@ export default {
                           item.selected = false
                           if(item.skus){
                               Object.entries(item.skus).forEach(([key, val]) => {
-                                  item.skus[key] = `${val.title} ￥${val.price}`;
+                                  item.skus[key] = val.title
+                                  if(val.price) item.skus[key] = `${val.title} ￥${val.price}`;
                               });
                           }
                       });

src/components/site/addSiteStep/step2.vue

@@ -28,7 +28,7 @@
                                                     :options="taobaoList" :options_null="!taobaoList.length">
 
                                         <template #trigger>
-                                            <span v-if="selectTaobao">{{ selectTaobao.short_name }} {{ selectTaobao.account }}</span>
+                                            <span v-if="selectTaobao.short_name || selectTaobao.account">{{ selectTaobao.short_name }} {{ selectTaobao.account }}</span>
                                             <span v-else-if="!taobaoList.length">暂无收款账号，稍后配置</span>
                                             <span v-else>未绑定店铺</span>
                                         </template>
@@ -157,7 +157,7 @@
                     <el-form ref="formRef" v-if="siteInfo.sale_channel === '3'">
                         <div class="flex-wrap">
                             <div class="flex-left">
-                                <div class="shopadd-wrap" v-if="pddList.length">
+                                <div class="shopadd-wrap" v-if="!pddList.length">
                                     <p class="shopadd-title">店铺授权</p>
                                     <div class="flex-between shopadd-area">
                                         <div>
@@ -176,7 +176,7 @@
                                                     :options="pddList" :options_null="!pddList.length">
 
                                         <template #trigger>
-                                            <span v-if="selectPdd">{{ selectPdd.short_name }} {{ selectPdd.account }}</span>
+                                            <span v-if="selectPdd.short_name || selectPdd.account">{{ selectPdd.short_name }} {{ selectPdd.account }}</span>
                                             <span v-else-if="pddList.length === 0">暂无收款账号，稍后配置</span>
                                             <span v-else>未绑定拼多多店铺</span>
                                         </template>
@@ -235,7 +235,7 @@
                                                     :options="jdList" :options_null="!jdList.length">
 
                                         <template #trigger>
-                                            <span v-if="selectJd">{{ selectJd.short_name }} {{ selectJd.account }}</span>
+                                            <span v-if="selectJd.short_name || selectJd.account">{{ selectJd.short_name }} {{ selectJd.account }}</span>
                                             <span v-else-if="jdList.length === 0">暂无收款账号，稍后配置</span>
                                             <span v-else>未绑定京东店铺</span>
                                         </template>
@@ -548,9 +548,10 @@ export default {
           this.isShowAddPay = true;
           this.authToken = this.token;
       },
-      handleEvent() {
+      handleEvent(data) {
-          this.getPayList()
+          this.isShowAddPay = data
-          this.getAddablePays()
+          // this.getPayList()
+          // this.getAddablePays()
       },
       jumpStep(){
           this.$router.push('/')

src/views/agent/siteServiceAdd.vue

@@ -208,7 +208,7 @@
                     </div>
                 </el-form>
 
-                <bindGoods :showBind="showBind" :uid="uid" :type="type" :pati="pati" :pageCode="pageCode"
+                <bindGoods :showBind="showBind" :uid="uid" :type="type" :pdd_pati="pdd_pati" :pdd_pagecode="pdd_pagecode"
                     @handleBind="handleBind">
                 </bindGoods>
 
@@ -268,8 +268,8 @@ export default {
             menuList: {},
             siteAddUrl: '/agent/siteAdd',
             showBind: false,
-            pati: '',
+            pdd_pati: '',
-            pageCode: '',
+            pdd_pagecode: '',
             dialogDelBindConfim: false,
             delRow: {},
             dialogDelServiceConfim: false,
@@ -554,10 +554,10 @@ export default {
         },
         async initPddParam(uid) {
             if (typeof window.PDD_OPEN_init === 'function') {
-                this.pageCode = await this.getPddPageCode(uid)
+                this.pdd_pagecode = await this.getPddPageCode(uid)
 
-                await window.PDD_OPEN_init({ code: this.pageCode })
+                await window.PDD_OPEN_init({ code: this.pdd_pagecode })
-                this.pati = await window.PDD_OPEN_getPati()
+                this.pdd_pati = await window.PDD_OPEN_getPati()
             } else {
                 console.error('PDD_OPEN_init 不存在，SDK 未正确加载');
             }