jufubao-third 1.0.8 → 1.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-third",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "private": false,
   "description": "聚福宝业务组件第三方购物平台包",
   "main": "index.js",
@@ -51,7 +51,7 @@
     "color": "^3.1.3",
     "core-js": "^2.6.5",
     "flyio": "^0.6.2",
-    "gxd-uni-library-editx": "1.0.69",
+    "gxd-uni-library-editx": "1.0.123",
     "jweixin-module": "^1.6.0",
     "md5": "^2.3.0",
     "path-to-regexp": "^6.2.1",

package/src/components/JfbThirdBlock/JfbThirdBlock.vue

@@ -13,7 +13,9 @@
       :class="{ editx : isEditx && active }"
       v-if="isEditx && active && !noBorder"
     >
-      <view class="jfb-third-block__edit-icon" @click="delEdit">删除</view>
+      <view class="jfb-third-block__edit-icon" @click.stop="delEdit">
+        <xd-font-icon icon="iconshanchu-01" color="#fff" size="30"></xd-font-icon>
+      </view>
     </view>
     <!-- #endif -->
     <view class="jfb-third-block__body">
@@ -28,7 +30,7 @@
   import JfbThirdBlockMixin from "./JfbThirdBlockMixin";
   import {getContainerPropsValue} from "@/utils/xd.base";
   import componentsMixins from "@/mixins/componentsMixins";
-  
+
   export default {
     name: "JfbThirdBlock",
     components: {
@@ -60,11 +62,11 @@
         if (height) this.height = height;
       },
       onJfbLoad(options) {
-      
+
       },
     }
   }
-  
+
 
 </script>
 

package/src/components/JfbThirdBlock/JfbThirdBlockLess.less

@@ -33,7 +33,7 @@
       left:0;
       bottom:0;
       right:0;
-      z-index: 4;
+      z-index: var(--preview-z-index);
       cursor: pointer;
     }
 
@@ -44,17 +44,18 @@
     cursor: pointer;
     position: absolute;
     right: unit(0, rpx);
-    top: unit(-52, rpx);
+    top: unit(0, rpx);
     height: unit(50, rpx);
-    line-height: unit(50, rpx);
+    z-index: 100;
     display: flex;
     justify-content: center;
     align-items: center;
-    background: rgba(0, 0, 0, .6);
-    border-radius: unit(10, rpx);
+    background: rgba(0, 0, 0, .4);
+    border-radius: 0 0 0 20rpx;
     box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
     color: #fff;
     font-size: unit(22, rpx);
+    padding: 0 6rpx 0 6px;
 
     &-icon{
       padding: 0 unit(20, rpx);

package/src/components/JfbThirdPay/JfbThirdPay.vue

@@ -10,7 +10,9 @@
       :class="{ editx : isEditx && active }"
       v-if="isEditx && active"
     >
-      <view class="jfb-third-pay__edit-icon" @click="delEdit">删除</view>
+      <view class="jfb-third-pay__edit-icon" @click.stop="delEdit">
+        <xd-font-icon icon="iconshanchu-01" color="#fff" size="30"></xd-font-icon>
+      </view>
     </view>
     <!-- #endif -->
     <view class="jfb-third-pay__body">
@@ -317,7 +319,7 @@
           valid_token: "",  //验证码token
         },
         renderChecked: "renderChecked",
-        
+
         product_total_price: "",
         total_price: "",
         servicePrice: "",
@@ -325,10 +327,10 @@
 
         jwxSDK: null,
         validImageAPIUrl: "",
-        
+
         //请求参数
         main_order_id: "",
-  
+
         cardList: [],   //卡绑定列表
         selectedCardList: [], //卡绑定使用的
         options: {},
@@ -391,7 +393,7 @@
         //设置业务请求代码
         this.options = 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'
@@ -426,7 +428,7 @@
             ...this.options,
           }
         }).then(res => {
-         
+
           if(res.pay_status === "Y"){
             //已支付， 跳转成功页
             this.$xdUniHelper.redirectTo({
@@ -528,7 +530,7 @@
         let valid_token = this.$xdUniHelper.randomChar(20);
         this.$set(this.cardForm, "valid_token", valid_token);
       },
-      
+
       //扫码
       doScanCode(){
         // #ifdef H5
@@ -565,7 +567,7 @@
           if (list.card_password) list.card_password = list.card_password.substr(0, 2) + '********' + list.card_password.substr(-3);
           return list;
         }
-        
+
         //array
         return list.map(item => {
           if(item.card_use_certificate) item.card_use_certificate = item.card_use_certificate.substr(0, 2) + '********' + item.card_use_certificate.substr(-3);
@@ -632,7 +634,7 @@
 
               //重合的卡券列表
               let repeatCardList = selected_card_list.filter(item => r_cards.includes(item.card_number));
-              
+
               if(repeatCardList.length > 0){
                 let repeatCard = repeatCardList[0];
                 //重复的以前的卡数据
@@ -762,7 +764,7 @@
         }
 
       },
-      
+
       handlerPayCheck(channel_provider_id, flat){
         if(flat) this.channel_provider_id = channel_provider_id;
         else this.channel_provider_id = "";
@@ -901,7 +903,7 @@
           box-sizing: border-box;
           margin: 30rpx auto;
           font-size: 28rpx;
-          
+
           .icon{
             width: 64rpx;
             height: 64rpx;

package/src/components/JfbThirdPay/JfbThirdPayLess.less

@@ -33,7 +33,7 @@
       left:0;
       bottom:0;
       right:0;
-      z-index: 4;
+      z-index: var(--preview-z-index);
       cursor: pointer;
     }
 
@@ -44,17 +44,18 @@
     cursor: pointer;
     position: absolute;
     right: unit(0, rpx);
-    top: unit(-52, rpx);
+    top: unit(0, rpx);
     height: unit(50, rpx);
-    line-height: unit(50, rpx);
+    z-index: 100;
     display: flex;
     justify-content: center;
     align-items: center;
-    background: rgba(0, 0, 0, .6);
-    border-radius: unit(10, rpx);
+    background: rgba(0, 0, 0, .4);
+    border-radius: 0 0 0 20rpx;
     box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
     color: #fff;
     font-size: unit(22, rpx);
+    padding: 0 6rpx 0 6px;
 
     &-icon{
       padding: 0 unit(20, rpx);

package/src/components/JfbThirdPay/WalletMix.js

@@ -1,4 +1,9 @@
 import { jfbRootExec } from "@/utils/xd.event";
+// #ifdef H5
+import cookie from "@/common/cookie";
+//#endif
+import {Base64} from "js-base64";
+
 export default {
   data(){
     return {
@@ -219,6 +224,29 @@ export default {
         }, 'create_order');
       })
     },
+
+
+    handleToPay(res){
+      let payPath = '';
+      let isMp = false;
+      // #ifdef H5
+      payPath = cookie.get(`jfb-pay-path-${this.brandInfo.site_id}`);
+      if(navigator.userAgent.match(/miniprogram/i)) isMp = true;
+      //#endif
+      if(payPath && isMp) {
+        payPath = Base64.encodeURI(`${this.thirdPayPath}?order_id=${res['pay_order_id']}&main_order_id=${res['order_id']}`);
+        this['$xdUniHelper'].redirectTo({
+          url: `/pages/jumptomp/jumptomp?callback=${payPath}`
+        });
+      }
+      else {
+        this.$xdUniHelper.redirectTo({
+          url: this.thirdPayPath + `?order_id=${res['pay_order_id']}&main_order_id=${res['order_id']}`
+        }, false, true)
+      }
+    },
+
+
     createSettleOrder(options, successCb){
       let postData = {
         ...options,
@@ -241,9 +269,7 @@ export default {
         }else{
           //支持补差， 跳转补差页
           if(this.payThird){
-            this.$xdUniHelper.redirectTo({
-              url: this.thirdPayPath + `?order_id=${res.pay_order_id}&main_order_id=${res.order_id}`
-            })
+            this.handleToPay(res);
           }else{
             this.$xdAlert({
               content: '余额不足，请选择其他票券',
@@ -256,4 +282,4 @@ export default {
       })
     }
   }
-}
+}