jufubao-base 1.0.184 → 1.0.186-beta1

package/package.json

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

package/src/components/JfbBaseFastLink/Attr.js

@@ -27,9 +27,22 @@ export default {
           {label: '悬浮', value: 'fixed'},
         ],
         inline: false,
-        notice: `使用悬浮布局时，快速链接数量不可超过<span style="color:red"> 3 </span>个，并且把该组件移动到最后`
+        notice: `使用悬浮布局时，链接数量不可超过<span style="color:red"> 3 </span>个，超出部分不显示, 并且把该组件移动到最后`
       },
-      data['is_layout'] ==='fixed' && {
+      {
+        label: '默认是否收起:',
+        ele: 'xd-radio',
+        valueKey: 'isNotExpand',
+        groupKey:'content',
+        value: data['isNotExpand'] || 'Y',
+        className: 'input80',
+        list: [
+          {label: '是', value: 'Y'},
+          {label: '否', value: 'N'},
+        ],
+        hidden: data['is_layout'] !=='fixed'
+      },
+      data['is_layout'] ==='fixed' && 0 &&  {
         label: '自定义名称:',
         ele: 'el-input',
         type: 'text',
@@ -68,16 +81,16 @@ export default {
         },
       },
       {
-        label: '间距:',
+        label: '行间距:',
         ele: 'el-input',
         groupKey:'style',
         type: 'number',
         valueKey: 'padding',
         value: data.padding===undefined? data.padding: '',
-        placeholder: '请输入间距',
+        placeholder: '请输入行间距',
         className: 'input60',
         inline: false,
-        notice: '设置间距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
+        notice: '设置行间距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
       },
       {
         label: '外边距设置:',

package/src/components/JfbBaseFastLink/JfbBaseFastLink.vue

@@ -50,6 +50,7 @@
           >弹窗模式方便编辑(占位)，在线上此模块不显</view>
         </template>
         <xd-fast-nav
+          :is-not-expand="isNotExpand === 'Y'"
           :list="listNave"
           :color="mainColor"
           :is-preview="isPreview"
@@ -86,6 +87,7 @@
         list: [],
         backgroundColor: '',
         isPreview:false,
+        isNotExpand: 'Y',
 
         //基础信息
         background: '#fff',
@@ -104,12 +106,7 @@
         is_border_c: '',
 
         //其他
-        margin: {
-          top: 0,
-          left: 0,
-          right: 0,
-          bottom: 0
-        },
+        margin: {},
         padding: 20, //间距
       }
     },
@@ -157,7 +154,7 @@
       handleClick(item){
         if(item.path && item.path.value) {
           this.$xdUniHelper.navigateTo({
-            url : `${item.path.value}` 
+            url : `${item.path.value}`
           })
         }
       },
@@ -173,7 +170,7 @@
         this.iconColor = getContainerPropsValue(container, 'content.iconColor', '#999');
         this.padding = getContainerPropsValue(container, 'content.padding', 20);
         this.is_layout = getContainerPropsValue(container, 'content.is_layout', 'noraml');
-        this.fastName = getContainerPropsValue(container, 'content.fastName', '快速导航');
+        //this.fastName = getContainerPropsValue(container, 'content.fastName', '快速导航');
         this.is_border = getContainerPropsValue(container, 'content.is_border', 'N');
         this.is_border_c = getContainerPropsValue(container, 'content.is_border_c', '#fff');
         this.is_border_w = getContainerPropsValue(container, 'content.is_border_w', 2);
@@ -187,6 +184,7 @@
         this.margin = getContainerPropsValue(container, 'content.margin', {top: 0, left: 0, right: 0, bottom: 0});
         this.subColor = getContainerPropsValue(container, 'content.textSubColor', '#000');
         this.fontSubSize = getContainerPropsValue(container, 'content.fontSubSize', 24);
+        this.isNotExpand = getContainerPropsValue(container, 'content.isNotExpand', 'Y');
         if(this.is_layout === 'fixed') {
           this.listNave = this.list.map(item=>{
             let {appValue,path} = item.path
@@ -212,6 +210,8 @@
               jumpUrl = `${jumpUrl}${bus}`;
               return { name: item.name, path: jumpUrl, icon: item.icon, size: item.size }
             }
+          }).filter((item,index)=>{
+            return index < 3
           });
         }
 

package/src/components/JfbBaseFastLink/XdFastNav.vue

@@ -75,7 +75,12 @@
           return {}
         }
       },
+      isNotExpand:{
+        type:Boolean,
+        default: true
+      },
     },
+
     data(){
       return {
         uizIndex: 100,
@@ -83,6 +88,11 @@
         lineColor: '#fff'
       }
     },
+    watch:{
+      isNotExpand(value){
+        this.close = value;
+      }
+    },
 
     computed:{
       uiTop(){
@@ -92,6 +102,8 @@
 
     created() {
       this.lineColor = Color(this.color).alpha(0.2).toString();
+      this.close =  this.isNotExpand;
+
     },
 
     methods: {

package/src/components/JfbBaseOrderDetail/Attr.js

@@ -489,6 +489,48 @@ 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_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,25 @@
           <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">
+              <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" style="color:#999;display:flex;align-items:center;margin-left:10px">
+              <text> 收起</text>
+              <xd-font-icon
+                style="margin-left: 8rpx"
+                size="28"
+                icon="iconxia_down"
+              ></xd-font-icon>
+            </view>         
+          </view>
+          <view v-if="showAllProductDetail" v-html="info.product_detail">
           </view>
-          <view v-html="info.productDetail"></view>
         </view>
         <view
           v-if="info.custom_content"
@@ -835,6 +850,11 @@ export default {
       logo: "",
 
       noticeBgc:'',
+      is_open: '',
+      is_show: '',
+      showAllProductDetail: false,
+      is_show_all_detail: '',
+      showPreviewCode: true
     };
   },
   watch: {
@@ -921,6 +941,7 @@ export default {
           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
         },
       })
         .then((res) => {
@@ -1047,7 +1068,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 = []
@@ -1119,6 +1140,18 @@ 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.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(() => {