Merge remote-tracking branch 'origin/master'

src/components/pay/addPay.vue

@@ -148,6 +148,26 @@ export default {
             type: String,
             default: ''
         },
+        // 淘宝授权url
+        taobaoAuthUrl: {
+            type: String,
+            default: ''
+        },
+        // 拼多多授权url
+        pddAuthUrl: {
+            type: String,
+            default: ''
+        },
+        // 京东授权url
+        jdAuthUrl: {
+            type: String,
+            default: ''
+        },
+        // 是否存在自供货 存在自供货 则不支持支付宝代收款
+        isExistSelfSupplys: {
+            type: Boolean,
+            default: false
+        },
     },
     components: {
         GuipInput,
@@ -186,8 +206,7 @@ export default {
             
             // 添加收款方式确认按钮文本
             addPayconfirmText: '确定',
-            // 淘宝授权url
-            taobaoAuthUrl: '',
+            
             // 公司简称
             company_short_name: '',
             // 商户号
@@ -198,20 +217,14 @@ export default {
             appid: '',
             // 支付宝账号
             alipay_account: '',
-            // 是否存在自供货 存在自供货 则不支持支付宝代收款
-            isExistSelfSupplys: false,
             // 代收款 收款账号
             receive_payment_account: '',
             // 代收款 收款人姓名
             receive_payment_name: '',
             // 是否是平台支付 0平台支付 1自营支付
             isPayPublic: '0',
-            // 拼多多授权url
-            pddAuthUrl: '',
             // 拼多多店铺名称
             pdd_shop_name: '',
-            // 京东授权url
-            jdAuthUrl: '',
 
             // localSiteInfo: { ...this.siteInfo }
         }
@@ -221,7 +234,6 @@ export default {
     },
     mounted() {
         // store.commit('SET_PAGETITLE', '营销推广');
-        this.getAddablePays()
     },
     methods: {
         updateDialogByPayType() {
@@ -256,38 +268,6 @@ export default {
             this.pdd_shop_name = '';
             this.isPayPublic = '0'; // 重置支付宝标签页
         },
-        // 获取可添加的收款方式
-        getAddablePays() {
-            this.$http('POST', '/agentnew/ajax_get_addable_pays', {
-                // 参数名: 参数值,
-            },{
-                headers:{
-                    'Auth': this.token
-                }
-            }).then(response => {
-                this.tableLoading = false
-                this.$nextTick(() => {
-                    if(response.data[PAY_TYPE_TAOBAO]) {
-                        this.taobaoAuthUrl = response.data[PAY_TYPE_TAOBAO].authurl
-                    }
-                    
-                    if (response.data[PAY_TYPE_ALIPAY]) {
-                        this.isExistSelfSupplys = response.data[PAY_TYPE_ALIPAY].is_exist_self_supplys
-                    }
-                    
-                    if (response.data[PAY_TYPE_PDD]) {
-                        this.pddAuthUrl = response.data[PAY_TYPE_PDD].authurl
-                    }
-                    
-                    if (response.data[PAY_TYPE_JINGDONG]) { 
-                        this.jdAuthUrl = response.data[PAY_TYPE_JINGDONG].authurl
-                    }
-                    
-                })
-            }).catch(error => {
-                console.error(error, 'error')
-            })
-        },
         // 弹框相关方法---start
         showAddPaymentMethodDialog(type, type_desc) {
             console.log(type, 'type');
@@ -409,7 +389,7 @@ export default {
         },
         authToken(newVal) {
             this.token = newVal;
-        }
+        },
     }
 
 }

src/views/agent/siteBaseSetting.vue

@@ -402,7 +402,8 @@
             </div>
         </div>
 
-        <addPay :payType="addPayType" :visible="isShowAddPay" @update:visible="handleEvent" :authToken="authToken"></addPay>
+        <addPay :payType="addPayType" :visible="isShowAddPay" @update:visible="handleEvent" :authToken="authToken" 
+        :taobaoAuthUrl="taobaoAuthUrl" :isExistSelfSupplys="isExistSelfSupplys" :pddAuthUrl="pddAuthUrl" :jdAuthUrl="jdAuthUrl"></addPay>
     </div>
 </template>
 <script>
@@ -481,6 +482,17 @@ export default {
             authToken: '',
             addablePays: [],
 
+            // 淘宝授权url
+            taobaoAuthUrl: '',
+            // 是否存在自供货 存在自供货 则不支持支付宝代收款
+            isExistSelfSupplys: false,
+            // 拼多多授权url
+            pddAuthUrl: '',
+            // 拼多多店铺名称
+            pdd_shop_name: '',
+            // 京东授权url
+            jdAuthUrl: '',
+
             domainOptions: [
                 {
                     value: '.chachongz.com',
@@ -539,6 +551,22 @@ export default {
             }).then(response => {
                 this.$nextTick(() => {
                     this.addablePays = response.data
+                    if(response.data[PAY_TYPE_TAOBAO]) {
+                        this.taobaoAuthUrl = response.data[PAY_TYPE_TAOBAO].authurl
+                    }
+                    
+                    if (response.data[PAY_TYPE_ALIPAY]) {
+                        this.isExistSelfSupplys = response.data[PAY_TYPE_ALIPAY].is_exist_self_supplys
+                    }
+                    
+                    if (response.data[PAY_TYPE_PDD]) {
+                        this.pddAuthUrl = response.data[PAY_TYPE_PDD].authurl
+                    }
+                    
+                    if (response.data[PAY_TYPE_JINGDONG]) { 
+                        this.jdAuthUrl = response.data[PAY_TYPE_JINGDONG].authurl
+                    }
+                    
                 })
             }).catch(error => {
                 console.error(error, 'error')