jufubao-base 1.0.418 → 1.0.419-beta4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.418",
+  "version": "1.0.419-beta4",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",
@@ -51,7 +51,7 @@
     "dingtalk-jsapi": "^3.0.31",
     "flyio": "^0.6.2",
     "gxd-commands-bussiness": "^1.0.12",
-    "gxd-uni-library-editx": "1.0.196-beta13",
+    "gxd-uni-library-editx": "1.0.198-beta1",
     "jweixin-module": "^1.6.0",
     "md5": "^2.3.0",
     "path-to-regexp": "^6.2.1",

package/src/components/JfbBasePay/Mock.js

@@ -5,7 +5,7 @@ module.exports = {
         "channel_provider_id":"1rRq74ACKJj5nIx5CgLpb",
         "channel_provider_name":"微信支付",
         "channel_code":"wxpay",
-        "channel_loog":""
+        "channel_logo":"https://jfb-public-images.oss-cn-qingdao.aliyuncs.com/system-paychannel-logo-wxpay.png?x-oss-process=style/200_200"
       }
     ],
     "request_id":"aba26aa6eb494d07"

package/src/components/JfbBaseSuccess/Api.js

@@ -21,7 +21,7 @@ module.exports = [
     disabled: true,
   },
   {
-    mapFnName: 'getMallProductDetail',
+    mapFnName: 'getMallSuccessProductDetail',
     title: '获取商品详情',
     path: '/product/v1/:xnamespace/product/item/:product_id/content',
     isRule: false,

package/src/components/JfbBaseSuccess/JfbBaseSuccess.vue

@@ -125,14 +125,14 @@
               <view class="jfb-base-success__body-icon-item-tip">{{info.status.comment }}</view>
             </view>
             <view class="jfb-base-success__body-icon-btn">
-              <view v-for="(item, index) in info['btn']" :key="index">
+              <view v-for="(item) in btnComp" :key="item.value">
                 <xd-button
                   v-if="item['label']"
                   size="small"
                   :type="item['type']"
+                  :disabled="item['disabled']"
                   @click="handleOnBtnClick(item)"
-                  >{{ item["label"] }}
-                </xd-button>
+                  >{{ item["label"] }}</xd-button>
               </view>
             </view>
           </view>
@@ -543,11 +543,17 @@ export default {
       is_plus_site: false,
       layoutStyle: '1',
 
+      //优化返回按钮参数
+      ext_params: '',
+      btn_disabled: true,
+
       //按钮
       btnTextColor:'',
       btnBgColor:'',
       btnBorderColor:'',
       btnTextSize: '',
+      custom_btn_name: '',
+      custom_btn_path:'',
 
       info: null,
       timeer: null,
@@ -575,6 +581,18 @@ export default {
   computed: {
     ...mapState(["brandInfo", "siteInfo", "jfbAuthorize"]),
     ...styleForm.getComputedItem(),
+    btnComp(){
+     return [
+       { label: "返回首页", value: 1, type: "default", radius: "12rpx", disabled: this.btn_disabled },
+       this.custom_btn_name && {
+         label: this.custom_btn_name,
+         value: 2,
+         type: "primary",
+         radius: "12rpx",
+         disabled: this.btn_disabled
+       },
+     ].filter(i=>i)
+    },
   },
   created() {
     this.isPreview = this.$configProject.isPreview;
@@ -669,19 +687,16 @@ export default {
     init(value) {
       this.order_id = this.$xdUniHelper.parseURL()["params"].order_id;
       this.bgColor = this.$colorChange(this.mainColor).alpha(0.1).toString();
+      this.custom_btn_name = getContainerPropsValue(value, "content.custom_btn_name",'')
       this.boxBgColor =  getContainerPropsValue(value, "content.boxBgColor", '#f8f8f8');
       this.btnBgColor =  getContainerPropsValue(value, "content.btnBgColor", '#e5e5e5');
       this.btnTextColor =  getContainerPropsValue(value, "content.btnTextColor", '#666');
       this.btnBorderColor = getContainerPropsValue(value, "content.btnBorderColor", 'rgba(0,0,0,0)');
       this.btnTextSize = getContainerPropsValue(value, "content.btnTextSize", '28');
       this.payBgColor = getContainerPropsValue(value, "content.payBgColor", '#fff');
-      console.log("this., fontSize: btnTextSize + 'rpx'", this.btnTextSize)
+
       this.layoutStyle = getContainerPropsValue(value, "content.layoutStyle", '1');
-      this.custom_btn_path = getContainerPropsValue(
-        value,
-        "content.custom_btn_path",
-        { value: "" }
-      ).value;
+      this.custom_btn_path = getContainerPropsValue(value, "content.custom_btn_path", { value: "" }).value;
       this.is_show_code = getContainerPropsValue(
         value,
         "content.is_show_code",
@@ -829,22 +844,15 @@ export default {
 
     handleOrderResolve(info) {
       //#ifdef MP-WEIXIN
-      if(info.is_clear_vip_cookie && info.is_clear_vip_cookie === 'Y'){
+      if(info['is_clear_vip_cookie'] && info['is_clear_vip_cookie'] === 'Y'){
         this.jfbAuthorize.removeToken('access');
       }
       //#endif
-      info.btn = [
-        { label: "返回首页", value: 1, type: "default", radius: "12rpx" },
-        {
-          label: getContainerPropsValue(
-            this.container,
-            "content.custom_btn_name"
-          ),
-          value: 2,
-          type: "primary",
-          radius: "12rpx",
-        },
-      ];
+
+      //设置请求参数
+      if(info['pay_info'] && info['pay_info']['ext_params']) this.ext_params = info['pay_info']['ext_params'];
+      this.btn_disabled = false;
+
       if (info.status.status_type === "success") {
         info.status.icon = "iconchenggong";
         info.status.iconColor = "#43CF7C";
@@ -859,8 +867,7 @@ export default {
         info.status.iconColor = "#F7AF57";
       }
 
-      //设置码状态
-      //info.codes = [info.codes[0]]
+
       info.codes =
         info.codes &&
         info.codes.map((item) => {
@@ -906,7 +913,7 @@ export default {
       //设置预览内容
       info["productDetail"] = null;
       if (info.product) {
-        jfbRootExec("getMallProductDetail", {
+        jfbRootExec("getMallSuccessProductDetail", {
           vm: this,
           data: {
             xnamespace: (info.product && info.product.business_code) || 'cake',
@@ -977,16 +984,24 @@ export default {
     handleOnBtnClick(btn) {
       if (this.$configProject.isPreview) return;
       if (btn["value"] === 1) {
-        this.$xdUniHelper.redirectTo(
-          {
-            url: this.index,
-          },
-          false
-        );
+        let index = this.index;
+        if(this.ext_params) {
+          if(this.index.indexOf('?') === -1) index = this.index + '?' + this.ext_params;
+          else index = this.index + '&' + this.ext_params;
+        }
+
+        this.$xdUniHelper.redirectTo({url: index,}, false);
       }
       if (btn["value"] === 2) {
+        if(!this.custom_btn_path) return;
+
+        let custom_btn_path = this.custom_btn_path;
+        if (this.ext_params) {
+          if (this.custom_btn_path.indexOf('?') === -1) custom_btn_path = this.custom_btn_path + '?' + this.ext_params;
+          else custom_btn_path = this.custom_btn_path + '&' + this.ext_params;
+        }
         this.$xdUniHelper.redirectTo({
-          url: `${this.custom_btn_path}`,
+          url: custom_btn_path,
         });
       }
     },
@@ -1092,7 +1107,7 @@ export default {
         color: #999;
         border-top: unit(1, rpx) solid #eee;
         padding-top: unit(20, rpx);
-        
+
         text {
           margin-right: unit(10, rpx);
         }
@@ -1369,7 +1384,7 @@ export default {
     z-index: 1;
     display: flex;
     box-sizing: border-box;
-   
+
   .card-left {
     flex: 1;
     display: flex;

package/src/components/JfbBaseSuccess/Mock.js

@@ -8,11 +8,13 @@ module.exports = {
       "status_name": "出票成功",
       "status_type": "success",
       "comment": "非常感谢您购买我们的产品",
-      "loading": false
+      "loading": false,
+
     },
     "pay_info": {
       "goods_amount": 9990,
-      "real_pay_amount": 9990
+      "real_pay_amount": 9990,
+      "ext_params":"x-jfb-os=jhd"
     },
     "settle_info":[
       {"label": "核销门店", "value": "安德鲁森中航城店", "type": "text"},
@@ -80,9 +82,9 @@ module.exports = {
     },
     "request_id": "741ac434786f7615"
   },
-  getMallProductDetail: {
-    "content": "<p><img src=\"https:\/\/platformshop.oss-cn-shenzhen.aliyuncs.com\/20220613\/14532365520bf6.jpg\" style=\"max-width:100%;\"><img src=\"https:\/\/platformshop.oss-cn-shenzhen.aliyuncs.com\/20220613\/145323713ba3e0.jpg\" style=\"max-width: 100%;\"><img src=\"https:\/\/platformshop.oss-cn-shenzhen.aliyuncs.com\/20220613\/1453237682d0cc.jpg\" style=\"max-width: 100%;\"><img src=\"https:\/\/platformshop.oss-cn-shenzhen.aliyuncs.com\/20220613\/145323816d84c4.jpg\" style=\"max-width: 100%;\"><img src=\"https:\/\/platformshop.oss-cn-shenzhen.aliyuncs.com\/20220613\/14532386679796.jpg\" style=\"max-width: 100%;\"><img src=\"https:\/\/platformshop.oss-cn-shenzhen.aliyuncs.com\/20220613\/14533527112a00.jpg\" style=\"max-width: 100%;\"><img src=\"https:\/\/platformshop.oss-cn-shenzhen.aliyuncs.com\/20220613\/145335318df93f.jpg\" style=\"max-width: 100%;\"><img src=\"https:\/\/platformshop.oss-cn-shenzhen.aliyuncs.com\/20220613\/14533537753c3b.jpg\" style=\"max-width: 100%;\"><img src=\"https:\/\/platformshop.oss-cn-shenzhen.aliyuncs.com\/20220613\/14533549316755.jpg\" style=\"max-width: 100%;\"><img src=\"https:\/\/platformshop.oss-cn-shenzhen.aliyuncs.com\/20220613\/1453442402b3bd.jpg\" style=\"max-width: 100%;\"><img src=\"https:\/\/platformshop.oss-cn-shenzhen.aliyuncs.com\/20220613\/14534430357133.jpg\" style=\"max-width: 100%;\"><img src=\"https:\/\/platformshop.oss-cn-shenzhen.aliyuncs.com\/20220613\/1453443697498a.jpg\" style=\"max-width: 100%;\"><img src=\"https:\/\/platformshop.oss-cn-shenzhen.aliyuncs.com\/20220613\/145344621531a2.jpg\" style=\"max-width: 100%;\"><img src=\"https:\/\/platformshop.oss-cn-shenzhen.aliyuncs.com\/20220613\/14534510f6a6b.jpg\" style=\"max-width: 100%;\"><img src=\"https:\/\/platformshop.oss-cn-shenzhen.aliyuncs.com\/20220613\/1454067511348c.jpg\" style=\"max-width: 100%;\"><img src=\"https:\/\/platformshop.oss-cn-shenzhen.aliyuncs.com\/20220613\/145409551879e3.jpg\" style=\"max-width: 100%;\"><img src=\"https:\/\/platformshop.oss-cn-shenzhen.aliyuncs.com\/20220613\/14540991640a31.jpg\" style=\"max-width: 100%;\"><br><\/p>",
-    "request_id": "ee9e2d1c3be667c6"
+  getMallSuccessProductDetail: {
+    content: '<p><img class="tinymce-image" src="//sandbox-img.jufubao.cn/uploads/20230522/61f22091cc434863e2d52cce0d769221.jpg" /></p>',
+    request_id: "11438a7010425aff"
   }
 }