jufubao-base 1.0.68 → 1.0.69-beta1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.68",
+  "version": "1.0.69-beta1",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",

package/src/components/JfbBasePay/JfbBasePay.vue

@@ -179,6 +179,8 @@ import XdFormInput from "@/components/XdFormInput/XdFormInput";
 import XdRadio from "@/components/XdRadio/XdRadio";
 import XdUnit from "@/components/XdUnit/XdUnit";
 import StyleForm from "@/utils/StyleForm";
+import {isWechat,isWechatTools} from "@/utils/xd.base";
+
 let styleForm = new StyleForm({bgColor: '#fafafa'}, getContainerPropsValue, 'pay');
 
 export default {
@@ -240,8 +242,9 @@ export default {
   },
   created() {
     this.init(this.container);
+
     // #ifdef H5
-    if (!this.$configProject.isPreview){
+    if (!this.$configProject.isPreview && (isWechat() || isWechatTools())){
       this.p_getH5WxAuthorize()
     }
     // #endif
@@ -356,9 +359,10 @@ export default {
     },
     //第三方支付
     doThirdPay() {
-      if(this.$configProject.isPreview) return ;
-      const { channel_provider_id, order_id, payInfo } = this;
-      let { login_providers = [] } = this.projectAttr;
+      if (this.$configProject.isPreview) return;
+      const {channel_provider_id, order_id, payInfo} = this;
+      let {login_providers = []} = this.projectAttr;
+      console.log(this.projectAttr)
       if (+payInfo.channel_amount > 0 && !this.channel_provider_id) {
         uni.showToast({
           title: "请选择支付方式",
@@ -367,17 +371,32 @@ export default {
         return false;
       }
       this.$xdShowLoading({});
+
+      let data = {
+        order_id,
+        channel_provider_id,
+        login_providers: login_providers.join(","),
+      };
+      // #ifdef H5
+      if (!(!this.$configProject.isPreview && (isWechat() || isWechatTools()))){
+        data['pay_success_url'] = `${window.location.protocol}//${window.location.host}/${this.projectAttr.deploy_dir}`;
+        data['pay_success_url'] += this.getSuccessUrl + `?order_id=${this.main_order_id}`;
+      }
+      // #endif
+
+
       jfbRootExec("setThirdPlace", {
         vm: this,
-        data: {
-          order_id,
-          channel_provider_id,
-          login_providers: login_providers.join(",")
-        },
+        data,
       })
         .then((res) => {
           this.$xdHideLoading();
-          console.log("thirdPay", res);
+          // #ifdef H5
+          if(res && res.payment_type === 'url') {
+            window.location.replace(res.payment_url);
+            return
+          }
+          // #endif
           const { channel_data } = res;
           const paySignData = JSON.parse(Base64.decode(channel_data));
           this.openTemplatePay(paySignData, (ps) => {