jufubao-base 1.0.186-beta1 → 1.0.186-beta3

package/package.json

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

package/src/components/JfbBaseOrderDetail/Api.js

@@ -12,6 +12,7 @@ module.exports = [
     isRule: false,
     params: {
       main_order_id: ['id', 'Number', '必选'],
+      is_show_product: ['是否显示商品 1=显示,0=隐藏 仅电子码商品', 'Number', '非必选'],
     },
     isConsole: true,
     disabled: true,

package/src/components/JfbBaseOrderDetail/Attr.js

@@ -503,6 +503,18 @@ export default {
           { label: '收起', value: 'N' },
         ]
       },
+      {
+        label: '是否显示商品信息:',
+        ele: 'xd-radio',
+        valueKey: 'is_show_product',
+        groupKey:'content',
+        value:data['is_show_product'] || 'Y',
+        placeholder: '请选择',
+        list: [
+          {"label": "是", "value": "Y"},
+          {"label": "否", "value": "N"},
+        ],
+      },
       {
         label: '是否展开商品详情:',
         ele: 'xd-radio',
@@ -521,14 +533,14 @@ export default {
         label: '提货码展示/隐藏:',
         ele: 'xd-radio',
         valueKey: 'is_show',
-        value: data['is_show'] || 1,
+        value: data['is_show'] || '1',
         groupKey:'content',
         placeholder: '请选择提货码展示/隐藏',
         multiple: false,
         className: 'input80',
         list: [
-          { label: '显示', value: 1 },
-          { label: '隐藏', value: 0 },
+          { label: '显示', value: '1' },
+          { label: '隐藏', value: '0' },
         ]
       },
     ].filter(i=>i)

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -651,7 +651,7 @@
           <view class="jfb-base-order-detail__body-shop-title">
             <view :style="{ background: mainColor }"></view>
             <view>商品详情</view>
-            <view @click="showAllProductDetail=!showAllProductDetail" v-if="!showAllProductDetail" style="color:#999;display:flex;align-items:center;margin-left:10px">
+            <view @click="showAllProductDetail=!showAllProductDetail" v-if="!showAllProductDetail" class="jfb-base-order-detail__body-product-show">
               <text> 展开</text>
               <xd-font-icon
                 style="margin-left: 8rpx"
@@ -659,7 +659,7 @@
                 icon="iconxia_down"
               ></xd-font-icon>
             </view>
-            <view @click="showAllProductDetail=!showAllProductDetail" v-if="showAllProductDetail" style="color:#999;display:flex;align-items:center;margin-left:10px">
+            <view @click="showAllProductDetail=!showAllProductDetail" v-if="showAllProductDetail" class="jfb-base-order-detail__body-product-show">
               <text> 收起</text>
               <xd-font-icon
                 style="margin-left: 8rpx"
@@ -668,7 +668,8 @@
               ></xd-font-icon>
             </view>         
           </view>
-          <view v-if="showAllProductDetail" v-html="info.product_detail">
+          <view class="jfb-base-order-detail__body-html" v-if="showAllProductDetail">
+            <view v-html="info.productDetail"></view>
           </view>
         </view>
         <view
@@ -854,7 +855,8 @@ export default {
       is_show: '',
       showAllProductDetail: false,
       is_show_all_detail: '',
-      showPreviewCode: true
+      showPreviewCode: true,
+      is_show_product: "",
     };
   },
   watch: {
@@ -934,14 +936,15 @@ export default {
         this.getCountDown();
       }
     },
-    getOrderDetail() {
+    getOrderDetail() {      
       jfbRootExec("getBaseOrderDetail", {
         vm: this,
         data: {
           main_order_id: this.main_order_id,
           custom_content_page_id: this.pageAttr.page_id,
           custom_content_container_id: this.cid,
-          is_show_jhd_code: this.is_show
+          is_show_jhd_code: Number(this.is_show),
+          is_show_product: this.is_show_product === "Y" ? 1 : 0,
         },
       })
         .then((res) => {
@@ -1081,11 +1084,12 @@ export default {
           }
 
           if (res.product) {
-            jfbRootExec("getBaseProductDetail", {
+            try {
+              jfbRootExec("getBaseProductDetail", {
               vm: this,
               data: {
-                xnamespace: info.product.business_code,
-                product_id: info.product.product_id,
+                xnamespace: res.product.business_code,
+                product_id: res.product.product_id,
               },
             })
               .then((result) => {
@@ -1098,6 +1102,11 @@ export default {
               .catch((err) => {
                 console.log(err, "err");
               });
+            } catch (error) {
+              console.log(error,'apapapa');
+              
+            }
+            
           }
           else {
             this.info = res;
@@ -1141,12 +1150,13 @@ export default {
       this.is_show_support_shop = getContainerPropsValue(container, "content.is_show_support_shop", "N");
       this.is_show_delete_order = getContainerPropsValue(container, "content.is_show_delete_order", "N");
       this.is_open = getContainerPropsValue(container, "content.is_open", "N");
-      this.is_show = getContainerPropsValue(container, "content.is_show", 1);
+      this.is_show = getContainerPropsValue(container, "content.is_show", '1');
       this.showPayCard = this.is_open==='Y'
       this.is_show_all_detail = getContainerPropsValue(container, "content.is_show_all_detail", "N");
+      this.is_show_product = getContainerPropsValue(container, "content.is_show_product", "Y");
       this.showAllProductDetail = this.is_show_all_detail==='Y'
       if(this.isPreview) {
-        if(this.is_show===0) {
+        if(this.is_show==='0') {
           this.showPreviewCode = false;
         } else {
           this.showPreviewCode = true;
@@ -1806,6 +1816,24 @@ export default {
       }
     }
 
+    &-product {
+      &-show {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        padding: unit(16, rpx);
+        border-radius: unit(4, rpx);
+        color: #999999;
+        font-size: unit(24, rpx);
+        margin-left:10px
+      }
+    }
+
+    &-html {
+      padding: unit(20, rpx) 0;
+      color: #999;
+    }
+
   }
   .dialog_password{
     text-align: center;

package/src/components/JfbBaseSuccess/Attr.js

@@ -37,7 +37,7 @@ export default {
         ele: 'xd-radio',
         valueKey: 'is_show_product',
         groupKey:'content',
-        value:data['is_show_product']|| '',
+        value:data['is_show_product'] || 'Y',
         placeholder: '请选择',
         list: [
           {"label": "是", "value": "Y"},

package/src/components/JfbBaseWallet/Attr.js

@@ -14,12 +14,15 @@ export default {
         groupKey:'content',
         value: data['newLabel'] || null,
         defaultValue: data['newLabel'],
+        setting: {
+          isNeedSwitch: false,
+        },
         list: [
           {
             icon: "iconpiao",
             label: "票券",
             value: 'card',
-            sort: 1
+            sort: 1,
           },
           {
             icon: "iconyuanbao",