jufubao-third 1.0.17 → 1.0.18

package/package.json

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

package/src/components/JfbThirdPay/JfbThirdPay.vue

@@ -22,7 +22,7 @@
             <view class="column-item noBorder">
               <view v-if="product_total_price" class="column_label text_gray">商品总额</view>
               <view class="column_value text-gray">
-                <xd-unit 
+                <xd-unit
                   :colorNew="isShowIcon ? '': '#999'"
                   :price="product_total_price"
                   :isOld="false"
@@ -63,7 +63,7 @@
             </view>
           </view>
         </view>
-        
+
         <!-- <view v-if="show_vip_card==='Y'" class="pay_section">
           <cus-vip-list :list="vipCardList"
             :vip_card_id="vip_card_id"
@@ -344,6 +344,7 @@
   import { getContainerPropsValue } from "@/utils/xd.base";
   import CusVipOpenDialog from "@/components/CusVipOpenDialog/CusVipOpenDialog"
   import getServiceUrl from "@/common/getServiceUrl"
+  import {Base64} from "js-base64";
   export default {
     name: "JfbThirdPay",
     components: {
@@ -497,7 +498,7 @@
         this.validImageAPIUrl = this.brandInfo['api_host'] + '/common/v1/valid_code/image/show'
 
         this.getOrderConfirm();
-        
+
       },
       /**
        * @description 监听事件变化
@@ -551,6 +552,29 @@
           }
         }).then(res => {
 
+          // #ifdef H5
+
+          if(res['pay_url']) {
+            let url = res['pay_url'];
+
+            //判断是否为微信小程序宿主
+            if(res['pay_jump_type'] === 'wx_mini' && this.isMpInH5Comp) {
+              const {host, deploy_dir} = this.brandInfo;
+              //未设置success_url参数时候自己拼接
+              if(res['pay_url'].indexOf('success_url') === -1) {
+                const success_url = `https://${host}/${deploy_dir}${this.orderSuccessPath}?order_id=${res['order_id']}`;
+                if(res['pay_url'].indexOf('?') > -1) url += `&success_url=${Base64.encodeURI(success_url)}`;
+                else url += `?success_url=${Base64.encodeURI(success_url)}`;
+              }
+
+              url = `/pages/jumptomp/jumptomp?callback=${Base64.encodeURI(url)}&isThird=1`;
+            }
+
+            this.$xdUniHelper.redirectTo({url}, false, true);
+            return;
+          }
+          //#endif
+
           if(res.pay_status === "Y"){
             //已支付， 跳转成功页
             this.$xdUniHelper.redirectTo({

package/src/components/JfbThirdPay/WalletMix.js

@@ -41,7 +41,13 @@ export default {
     showOldPay(){
       if(this.payWallet) return false;
       return true;
-    }
+    },
+
+    // #ifdef H5
+    isMpInH5Comp(){
+      return navigator.userAgent.match(/miniprogram/i)
+    },
+    //#endif
   },
   methods: {
     //选择元宝
@@ -233,7 +239,7 @@ export default {
       let isMp = false;
       // #ifdef H5
       payPath = this.jfbAuthorize.getMpKey('paySetting');
-      if(navigator.userAgent.match(/miniprogram/i)) isMp = true;
+      if(this.isMpInH5Comp) isMp = true;
       //#endif
       if(payPath && isMp) {
         payPath = Base64.encodeURI(`${this.thirdPayPath}?order_id=${res['pay_order_id']}&main_order_id=${res['order_id']}`);
@@ -250,6 +256,14 @@ export default {
 
 
     createSettleOrder(options, successCb){
+      // #ifdef H5
+      //（小程序套嵌模式下单时候需要设置支付成功页面地址）
+      if(this.isMpInH5Comp) {
+        const {host, deploy_dir} = this.brandInfo;
+        options['success_url'] = `https://${host}/${deploy_dir}${this.orderSuccessPath}?order_id=@order_id@`;
+      }
+      //#endif
+
       let postData = {
         ...options,
         main_order_id: this.main_order_id,
@@ -270,13 +284,15 @@ export default {
 
           // #ifdef H5
           //判断是否为微信小程序宿主
-          if(navigator.userAgent.match(/miniprogram/i)
-            && res['pay_jump_type'] === 'wx_mini'
-          ) {
+          if(this.isMpInH5Comp && res['pay_jump_type'] === 'wx_mini') {
             const {host, deploy_dir} = this.brandInfo;
-            const success_url = `https://${host}/${deploy_dir}${this.orderSuccessPath}?order_id=${res['order_id']}`;
-            if(res['pay_url'].indexOf('?') > -1) url += `&success_url=${Base64.encodeURI(success_url)}&callback_url=${encodeURIComponent(success_url)}`;
-            else url += `?success_url=${Base64.encodeURI(success_url)}&callback_url=${encodeURIComponent(success_url)}`;
+            //未设置success_url参数时候自己拼接
+            if(res['pay_url'].indexOf('success_url') === -1) {
+              const success_url = `https://${host}/${deploy_dir}${this.orderSuccessPath}?order_id=${res['order_id']}`;
+              if(res['pay_url'].indexOf('?') > -1) url += `&success_url=${Base64.encodeURI(success_url)}`;
+              else url += `?success_url=${Base64.encodeURI(success_url)}`;
+            }
+
             url = `/pages/jumptomp/jumptomp?callback=${Base64.encodeURI(url)}&isThird=1`;
           }
           //#endif