jufubao-third 1.0.6-beta1 → 1.0.6-beta3

package/package.json

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

package/src/components/JfbThirdBlock/JfbThirdBlockLess.less

@@ -14,7 +14,6 @@
 //start
 .jfb-third-block {
   box-sizing: border-box;
-  min-height: unit(100, rpx);
 
   &__body{
       position: relative;
@@ -22,10 +21,11 @@
       z-index: 2
   }
 
-  &.editx,&:hover {
+  &.editx,&.editx:hover {
     position: relative;
+    min-height: unit(100, rpx);
     z-index: 3;
-    &::after{
+    &::after {
       border: 2rpx dashed blue;
       content: " ";
       position: absolute;
@@ -36,6 +36,7 @@
       z-index: 4;
       cursor: pointer;
     }
+
   }
 
 

package/src/components/JfbThirdPay/Attr.js

@@ -9,6 +9,7 @@ export default {
       ele: "xd-choose-namespace",
       valueKey: "xnamespace",
       value: "",
+      groupKey: "advanced",
       handleCustom: (cb) => {
         XdBus.getParentApi('getOptionsNamespaces')()
           .then(res => {
@@ -23,6 +24,7 @@ export default {
       valueKey: 'orderSuccessPath', //form[valueKey]
       placeholder: '请选择核销成功路径',
       value: null,
+      groupKey: "advanced",
       setting: {
         router: XdBus.getParentApi('getPagesTree'),
 
@@ -35,6 +37,7 @@ export default {
       valueKey: 'thirdPayPath', //form[valueKey]
       placeholder: '请选择支付路径',
       value: null,
+      groupKey: "advanced",
       setting: {
         router: XdBus.getParentApi('getPagesTree'),
 

package/src/components/JfbThirdPay/JfbThirdPay.vue

@@ -166,6 +166,7 @@
         :getUserWalletList="getUserWalletList"
         :useBindedWallet="p_useBindedWallet"
         @onChose="handleWalletChose"
+        @onAlert="() => hasAlertCardChose = true"
       ></xd-wallet-chose>
     </template>
 
@@ -564,7 +565,7 @@
           vm: this,
           data: {
             ...cardForm,
-            selected_card_list: submitCardList,
+            selected_card_list_json: JSON.stringify(submitCardList),
             total_price,
             namespace: this.xnamespace,
             ...options,
@@ -676,7 +677,7 @@
             data: {
               total_price,
               card_number: ticket.card_number,
-              selected_card_list: submitCardList,
+              selected_card_list_json: JSON.stringify(submitCardList),
               namespace: this.xnamespace,
               ...options,
               ...this.options,

package/src/components/JfbThirdPay/JfbThirdPayLess.less

@@ -14,7 +14,6 @@
 //start
 .jfb-third-pay {
   box-sizing: border-box;
-  min-height: unit(100, rpx);
 
   &__body{
       position: relative;
@@ -22,10 +21,11 @@
       z-index: 2
   }
 
-  &.editx,&:hover {
+  &.editx,&.editx:hover {
     position: relative;
+    min-height: unit(100, rpx);
     z-index: 3;
-    &::after{
+    &::after {
       border: 2rpx dashed blue;
       content: " ";
       position: absolute;
@@ -36,6 +36,7 @@
       z-index: 4;
       cursor: pointer;
     }
+
   }
 
 

package/src/components/JfbThirdPay/WalletMix.js

@@ -23,7 +23,8 @@ export default {
     },
     //是否支持三方支付、补差
     payThird(){
-      return this.otherPayMethod.find(item => item.method === 'third')
+      return true;
+      // return this.otherPayMethod.find(item => item.method === 'third')
     },
     orderNeedPayPrice(){
       let choseCardPay = this.choseCard ? this.choseCard.cardPayPrice : 0;
@@ -178,7 +179,11 @@ export default {
         //票券跟钱包都未选择，给用户提示
         if(selected_card_list.length == 0 && selected_wallet_list.length == 0){
           if(!this.hasAlertCardChose){
-            this.showCardPayChose = true;
+            if(this.payCard){
+              this.showCardPayChose = true;
+            }else{
+              this.showWalletChose = true;
+            }
             return false;
           }else{
             //支持补差, 提示是否使用补差