jufubao-base 1.0.189 → 1.0.191

package/get.package.path.js

@@ -8,11 +8,11 @@
  */
 const getPackagePath = (threePackagePath, packname = 'gxd-commands-bussiness')=>{
   if(packname === 'gxd-commands-bussiness') {
-    return `/Users/shiyonggao/home/root/Base-Jufubao/xd-commands-bussiness/${threePackagePath}`;
+    return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-commands-bussiness/${threePackagePath}`;
   }
 
   if (packname === 'gxd-uni-library-editx') {
-    return `/Users/shiyonggao/home/root/Base-Jufubao/xd-uni-library-editx/${threePackagePath}`;
+    return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-uni-library-editx/${threePackagePath}`;
   }
 
 };

package/package.json

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

package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue

@@ -737,7 +737,6 @@ export default {
             if (this.$configProject.isPreview) {
               console.log("handleBindLogin", "预览模式不跳转", this.inCallback);
             }
-
             else {
               this.handleClick(entry);
             }
@@ -779,7 +778,7 @@ export default {
       if (this.$configProject['isPreview']) return;
 
       //登陆成功，有回调地址返回回调地址
-      if(this.inCallback) {
+      if(this.inCallbackUrlOrg) {
         this.$xdUniHelper.redirectTo({
           url:this.inCallback
         }, false);

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

@@ -489,6 +489,60 @@ export default {
         },
         inline: false,
       },
+      {
+        label: '是否展开票券信息:',
+        ele: 'xd-radio',
+        valueKey: 'is_open',
+        value: data['is_open'] || 'N',
+        groupKey:'content',
+        placeholder: '请选择是否展开票券信息',
+        multiple: false,
+        className: 'input80',
+        list: [
+          { label: '展开', value: 'Y' },
+          { 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',
+        valueKey: 'is_show_all_detail',
+        value: data['is_show_all_detail'] || 'N',
+        groupKey:'content',
+        placeholder: '请选择是否展开商品详情',
+        multiple: false,
+        className: 'input80',
+        list: [
+          { label: '展开', value: 'Y' },
+          { label: '收起', value: 'N' },
+        ]
+      },
+      {
+        label: '提货码展示/隐藏:',
+        ele: 'xd-radio',
+        valueKey: 'is_show',
+        value: data['is_show'] || '1',
+        groupKey:'content',
+        placeholder: '请选择提货码展示/隐藏',
+        multiple: false,
+        className: 'input80',
+        list: [
+          { label: '显示', value: '1' },
+          { label: '隐藏', value: '0' },
+        ]
+      },
     ].filter(i=>i)
   },
 }

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -259,7 +259,7 @@
             class="jfb-base-order-detail__body-card jfb-base-order-detail__body-cashier"
           >
             <view class="jfb-base-order-detail__body-cashier-text">{{info.codes[0].show_type === "qrcode" ? "二维码" : "条形码" }}</view>
-            <view style="position: relative">
+            <view v-if="showPreviewCode" style="position: relative">
               <image
                 :style="{
                   height: info.codes[0].show_type === 'qrcode' ? '50vw' : '25vw',
@@ -556,20 +556,18 @@
             ></view>
           </view>
           <view v-if="info.pay_info.cards && info.pay_info.cards.length > 0">
-            <view class="jfb-base-order-detail__body-show" v-if="!showPayCard">
+            <view @click="showPayCard = true" class="jfb-base-order-detail__body-show" v-if="!showPayCard">
               <text>使用 {{ info.pay_info.cards.length }} 张票券 展开</text>
               <xd-font-icon
                 style="margin-left: 8rpx"
-                @click="showPayCard = true"
                 size="28"
                 icon="iconxia_down"
               ></xd-font-icon>
             </view>
-            <view class="jfb-base-order-detail__body-show" v-else>
+            <view @click="showPayCard = false" class="jfb-base-order-detail__body-show" v-else>
               <text>使用{{ info.pay_info.cards.length }}张票券 收起</text>
               <xd-font-icon
                 style="margin-left: 8rpx"
-                @click="showPayCard = false"
                 size="28"
                 icon="iconshang_up"
               ></xd-font-icon>
@@ -653,8 +651,26 @@
           <view class="jfb-base-order-detail__body-shop-title">
             <view :style="{ background: mainColor }"></view>
             <view>商品详情</view>
+            <view @click="showAllProductDetail=!showAllProductDetail" v-if="!showAllProductDetail" class="jfb-base-order-detail__body-product-show">
+              <text> 展开</text>
+              <xd-font-icon
+                style="margin-left: 8rpx"
+                size="28"
+                icon="iconxia_down"
+              ></xd-font-icon>
+            </view>
+            <view @click="showAllProductDetail=!showAllProductDetail" v-if="showAllProductDetail" class="jfb-base-order-detail__body-product-show">
+              <text> 收起</text>
+              <xd-font-icon
+                style="margin-left: 8rpx"
+                size="28"
+                icon="iconxia_down"
+              ></xd-font-icon>
+            </view>         
+          </view>
+          <view class="jfb-base-order-detail__body-html" v-if="showAllProductDetail">
+            <view v-html="info.productDetail"></view>
           </view>
-          <view v-html="info.productDetail"></view>
         </view>
         <view
           v-if="info.custom_content"
@@ -835,6 +851,12 @@ export default {
       logo: "",
 
       noticeBgc:'',
+      is_open: '',
+      is_show: '',
+      showAllProductDetail: false,
+      is_show_all_detail: '',
+      showPreviewCode: true,
+      is_show_product: "",
     };
   },
   watch: {
@@ -914,13 +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: Number(this.is_show),
+          is_show_product: this.is_show_product === "Y" ? 1 : 0,
         },
       })
         .then((res) => {
@@ -1047,7 +1071,7 @@ export default {
           }
 
           //增加删除订单按钮
-          if(this.is_show_delete_order  === 'Y') {
+          if(this.is_show_delete_order === 'Y') {
             let pay = (res.buttons||[]).filter(item => item.action === 'pay');
             let del = [{action:'delete', text:'删除订单', type: 'info'}];
             if(pay.length === 1) del = []
@@ -1060,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) => {
@@ -1077,6 +1102,11 @@ export default {
               .catch((err) => {
                 console.log(err, "err");
               });
+            } catch (error) {
+              console.log(error,'apapapa');
+              
+            }
+            
           }
           else {
             this.info = res;
@@ -1119,6 +1149,19 @@ export default {
       this.viewStatus = getContainerPropsValue(container, "content.viewStatus", "mall");
       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.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') {
+          this.showPreviewCode = false;
+        } else {
+          this.showPreviewCode = true;
+        }
+      }
     },
     getCountDown() {
       this.timer = setInterval(() => {
@@ -1773,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;