jufubao-third 1.0.11 → 1.0.13-beta1

package/package.json

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

package/src/components/JfbThirdPay/Api.js

@@ -15,7 +15,7 @@ module.exports = [
   {
     mapFnName: 'getThirdListCards',
     title: '三方 - 展示可选卡券列表',
-    path: "/mall/v1/order/list-binded-cards",
+    path: "/mall/v1/order/list-binded-cards/thirdmall",
     isRule: false,
     params: {
     },
@@ -25,7 +25,7 @@ module.exports = [
   {
     mapFnName: 'setThirdSelectCard',
     title: '三方 - 选择卡券',
-    path: '/mall/v1/order/pre/use-binded-card',
+    path: '/mall/v1/order/use-binded-card/thirdmall',
     isRule: false,
     data: {
       selected_card_list_json: [
@@ -69,7 +69,7 @@ module.exports = [
   {
     mapFnName: 'setThirdAddCard',
     title: '三方 - 添加新卡券',
-    path: '/mall/v1/order/pre/use-new-card',
+    path: '/mall/v1/order/use-new-card/thirdmall',
     isRule: false,
     data: {
       selected_card_list_json: [
@@ -140,7 +140,7 @@ module.exports = [
   {
     mapFnName: "useBindedWallet",
     title: "使用已绑钱包",
-    path: "/mall/v1/order/pre/use-binded-wallet",
+    path: "/mall/v1/order/use-binded-wallet/thirdmall",
     isRule: false,
     data: {
       selected_card_list_json: ['卡', 'string', true],

package/src/components/JfbThirdPay/Attr.js

@@ -3,57 +3,70 @@
 export default {
   style: [],
   advanced: [],
-  content: [
-    {
-      label: "选择业务线",
-      ele: "xd-choose-namespace",
-      valueKey: "xnamespace",
-      value: "",
-      groupKey: "advanced",
-      handleCustom: (cb) => {
-        XdBus.getParentApi('getOptionsNamespaces')()
-          .then(res => {
-            cb(res.list)
-          })
-          .catch();
-      }
-    },
-    {
-      label: '支付成功路径:', //label
-      ele: 'xd-select-pages-path', //package 名称
-      valueKey: 'orderSuccessPath', //form[valueKey]
-      placeholder: '请选择核销成功路径',
-      value: null,
-      groupKey: "advanced",
-      setting: {
-        router: XdBus.getParentApi('getPagesTree'),
+  content:(data)=>{
+    return [
+      {
+        label: "支付时是否跳过补差提示:",
+        ele: 'xd-radio',
+        valueKey: "skipTip",
+        value: data['skipTip'] || 'N',
+        groupKey:'content',
+        list: [
+          {label: '是', value: 'Y'},
+          {label: '否', value: 'N'},
+        ],
+      },
+      {
+        label: "选择业务线",
+        ele: "xd-choose-namespace",
+        valueKey: "xnamespace",
+        value: data['xnamespace'] || null,
+        groupKey: "advanced",
+        handleCustom: (cb) => {
+          XdBus.getParentApi('getOptionsNamespaces')()
+            .then(res => {
+              cb(res.list)
+            })
+            .catch();
+        }
+      },
+      {
+        label: '支付成功路径:', //label
+        ele: 'xd-select-pages-path', //package 名称
+        valueKey: 'orderSuccessPath', //form[valueKey]
+        placeholder: '请选择核销成功路径',
+        value:  data['orderSuccessPath'] || null,
+        groupKey: "advanced",
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
 
+        },
+        inline: false,
       },
-      inline: false,
-    },
-    {
-      label: '三方支付补差路径:', //label
-      ele: 'xd-select-pages-path', //package 名称
-      valueKey: 'thirdPayPath', //form[valueKey]
-      placeholder: '请选择支付路径',
-      value: null,
-      groupKey: "advanced",
-      setting: {
-        router: XdBus.getParentApi('getPagesTree'),
+      {
+        label: '三方支付补差路径:', //label
+        ele: 'xd-select-pages-path', //package 名称
+        valueKey: 'thirdPayPath', //form[valueKey]
+        placeholder: '请选择支付路径',
+        value: data['thirdPayPath'] || null,
+        groupKey: "advanced",
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
 
+        },
+        inline: false,
+      },
+      {
+        label: "是否可以使用新票券",
+        ele: "xd-radio",
+        valueKey: 'bindCard',
+        value: data['thirdPayPath'] || '1',
+        groupKey: 'content',
+        list: [
+          {label: "是", value: "1"},
+          {label: "否", value: "2"},
+        ]
       },
-      inline: false,
-    },
-    {
-      label: "是否可以使用新票券",
-      ele: "xd-radio",
-      valueKey: 'bindCard',
-      value: "",
-      groupKey: 'content',
-      list: [
-        {label: "是", value: "1"},
-        {label: "否", value: "2"},
-      ]
-    },
-  ],
+    ]
+  },
 }

package/src/components/JfbThirdPay/JfbThirdPay.vue

@@ -396,7 +396,8 @@
         orderSuccessPath: "",
         thirdPayPath: "",
         xnamespace: "",
-        bindCard: '1'
+        bindCard: '1',
+        skipTip: "N",
       }
     },
     watch: {
@@ -487,6 +488,7 @@
         this.thirdPayPath = getContainerPropsValue(container, 'content.thirdPayPath', {value: ""}).value;
         this.xnamespace = getContainerPropsValue(container, 'content.xnamespace', this.projectAttr.business_code);
         this.bindCard = getContainerPropsValue(container,"content.bindCard","1");
+        this.skipTip = getContainerPropsValue(container, "content.skipTip", "N");
       },
       getTimeFormat(time){
         let date = null;
@@ -610,7 +612,7 @@
         if(!submitCardList.length){
           //支持补差, 提示是否使用补差
           if(this.payThird){
-            if(!this.isPlusSite){
+            if(this.skipTip === 'N'){
               await this.handleConfirmAllWxPay();
             }
           }else{

package/src/components/JfbThirdPay/WalletMix.js

@@ -192,7 +192,9 @@ export default {
           }else{
             //支持补差, 提示是否使用补差
             if(this.payThird){
-              await this.handleConfirmAllWxPay();
+              if(this.skipTip === 'N'){
+                await this.handleConfirmAllWxPay();
+              }
             }else{
               //不支持补差，仅提示
               return this.$xdAlert({content: "请选择兑换方式"})