jufubao-third 1.0.0-beta4 → 1.0.0-beta5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-third",
-  "version": "1.0.0-beta4",
+  "version": "1.0.0-beta5",
   "private": false,
   "description": "聚福宝业务组件第三方购物平台包",
   "main": "index.js",

package/src/components/JfbThirdPay/Attr.js

@@ -4,6 +4,19 @@ export default {
   style: [],
   advanced: [],
   content: [
+    {
+      label: "选择业务线",
+      ele: "xd-choose-namespace",
+      valueKey: "xnamespace",
+      value: "",
+      handleCustom: (cb) => {
+        XdBus.getParentApi('getOptionsNamespaces')()
+          .then(res => {
+            cb(res.list)
+          })
+          .catch();
+      }
+    },
     {
       label: '支付成功路径:', //label
       ele: 'xd-select-pages-path', //package 名称

package/src/components/JfbThirdPay/JfbThirdPay.vue

@@ -294,8 +294,6 @@
           valid_code: "",   //验证码正文
           valid_token: "",  //验证码token
         },
-        orderSuccessPath: "",
-        thirdPayPath: "",
         renderChecked: "renderChecked",
         
         total_price: "",
@@ -307,6 +305,11 @@
   
         cardList: [],   //卡绑定列表
         selectedCardList: [], //卡绑定使用的
+
+        //面板
+        orderSuccessPath: "",
+        thirdPayPath: "",
+        xnamespace: "",
       }
     },
     watch: {
@@ -346,7 +349,6 @@
     },
     created() {
       this.init(this.container);
-      this.xnamespace =this.projectAttr.business_code;
       let valid_token = this.$xdUniHelper.randomChar(20);
       this.$set(this.cardForm, "valid_token", valid_token);
 
@@ -358,6 +360,9 @@
     },
     methods: {
       onJfbLoad(options) {
+        //设置业务请求代码
+        this.setNameSpace(options);
+        
         let { main_order_id} = options;
         this.main_order_id = main_order_id;
         this.validImageAPIUrl = this.brandInfo['api_host'] + '/common/v1/valid_code/image/show'
@@ -371,6 +376,7 @@
       init(container) {
         this.orderSuccessPath = getContainerPropsValue(container, 'content.orderSuccessPath', {value: ""}).value;
         this.thirdPayPath = getContainerPropsValue(container, 'content.thirdPayPath', {value: ""}).value;
+        this.xnamespace = getContainerPropsValue(container, 'content.xnamespace', this.projectAttr.business_code);
       },
       getTimeFormat(time){
         let date = null;
@@ -385,7 +391,8 @@
         jfbRootExec("getThirdOrderInfo", {
           vm: this,
           data: {
-            main_order_id: this.main_order_id
+            main_order_id: this.main_order_id,
+            namespace: this.xnamespace,
           }
         }).then(res => {
          
@@ -427,7 +434,8 @@
         jfbRootExec("getListUserPayChannel", {
           vm: this,
           data: {
-            providers: this.projectAttr.pay_channels
+            providers: this.projectAttr.pay_channels,
+            namespace: this.xnamespace,
           }
         }).then(res => {
           console.log("p_getListUserPayChannel", res);
@@ -461,7 +469,8 @@
         this.createSettleOrder({
           pay_card_list: submitCardList,
           other_channel_pay_price: needPayPrice,
-          need_pay_price: needPayPrice
+          need_pay_price: needPayPrice,
+          namespace: this.xnamespace,
         }, res => {
           this.$xdLog.setARMSInfo({
             main_order_id,
@@ -546,6 +555,7 @@
             ...cardForm,
             selected_card_list: submitCardList,
             total_price,
+            namespace: this.xnamespace,
             ...options
           }
         })
@@ -655,6 +665,7 @@
               total_price,
               card_number: ticket.card_number,
               selected_card_list: submitCardList,
+              namespace: this.xnamespace,
               ...options
             }
           }).then(res => {

package/src/components/JfbThirdPay/WalletMix.js

@@ -63,6 +63,7 @@ export default {
       jfbRootExec("getPayMethod", {
         vm: this,
         data: {
+          namespace: this.xnamespace,
           support_methods: JSON.stringify(support_methods)
         }
       }).then(res => {
@@ -80,6 +81,7 @@ export default {
       jfbRootExec("getThirdListCards", {
         vm: this,
         data: {
+          namespace: this.xnamespace,
         }
       }).then(res => {
         const {list} = res;
@@ -115,6 +117,7 @@ export default {
       jfbRootExec("setThirdSelectCard", {
         vm: this,
         data: {
+          namespace: this.xnamespace,
           ...options,
         }
       }).then(res => {
@@ -131,7 +134,7 @@ export default {
         vm: this,
         data: {
           support_method: "wallet",
-          business_code: this.xnamespace
+          namespace: this.xnamespace
         }
       }).then(res => {
         cb(res);
@@ -180,7 +183,8 @@ export default {
       this.createSettleOrder({
         selected_card_list_json: JSON.stringify(selected_card_list),
         selected_wallet_list_json: JSON.stringify(selected_wallet_list),
-        need_pay_price: this.orderNeedPayPrice
+        need_pay_price: this.orderNeedPayPrice,
+        namespace: this.xnamespace,
       }, (res) => {
         console.warn("创建订单成功");
         console.warn(res);
@@ -199,6 +203,7 @@ export default {
         ...options,
         main_order_id: this.main_order_id,
         notify_provider_id: this.projectAttr['notify_provider_id'],
+        namespace: this.xnamespace,
       };
       this.$xdShowLoading({});
       jfbRootExec("setThirdCreateOrder",{