jufubao-base 1.0.190 → 1.0.192-beta1

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -129,6 +129,9 @@
                 v-for="(Ditem, Dindex) in info.film_show.detail.items"
                 :key="Dindex"
                 class="jfb-base-order-detail__body-delivery-bottom-item"
+                :style="{
+                  marginBottom: lineHeight + 'rpx'
+                }"
               >
                 <view style="width: 130rpx"
                   >{{ Ditem.label }} <span v-if="Ditem.label">:</span>
@@ -214,6 +217,9 @@
                 v-for="(Ditem, Dindex) in item.info"
                 :key="Dindex"
                 class="jfb-base-order-detail__body-delivery-bottom-item"
+                :style="{
+                  marginBottom: lineHeight + 'rpx'
+                }"
               >
                 <view style="width: 130rpx;display: flex;">
                   <view v-html="Ditem.label"></view>
@@ -259,7 +265,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',
@@ -510,6 +516,9 @@
             v-for="(item, index) in info.detail"
             :key="index"
             class="jfb-base-order-detail__body-order"
+            :style="{
+              marginBottom: lineHeight + 'rpx'
+            }"
           >
             <view :style="{ fontWeight: item.style }">
               <view style="display: flex;">
@@ -541,6 +550,9 @@
             <view
               v-if="item.type !== 'line'"
               class="jfb-base-order-detail__body-price"
+              :style="{
+                marginBottom: lineHeight + 'rpx'
+              }"
             >
               <view :style="{ fontWeight: item.style }">{{ item.label }}</view>
               <xd-unit
@@ -556,20 +568,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 +663,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"
@@ -683,41 +711,51 @@
         :style="prod_bottom"
         v-if="info.buttons && info.buttons.length > 0"
       >
-        <view v-for="(item, index) in info.buttons" :key="index">
-          <view
-            style="display: flex; align-items: center"
-            v-if="item.action === 'pay'"
-          >
+        <view :style="[bottomBoxStyle]" class="btn_wrap">
+          <view v-for="(item, index) in info.buttons" :key="index">
             <view
-              style="display: flex; align-items: center; margin-right: 30rpx"
-              v-if="biz_code !== 'gift' || info.is_show_gift_price"
+              style="display: flex; align-items: center"
+              v-if="item.action === 'pay'"
             >
-              <text>应付：</text>
-              <xd-unit
-                :price="info.pay_info.real_pay_amount"
-                :font-size="36"
-                :iocn-size="0.45"
-              ></xd-unit>
+              <view
+                style="display: flex; align-items: center; margin-right: 30rpx"
+                v-if="biz_code !== 'gift' || info.is_show_gift_price"
+              >
+                <text>应付：</text>
+                <xd-unit
+                  :price="info.pay_info.real_pay_amount"
+                  :font-size="36"
+                  :iocn-size="0.45"
+                ></xd-unit>
+              </view>
+              <view>
+                <xd-button
+                  @click="handleToPay"
+                  size="small"
+                  type="primary"
+                  :style="{
+                    height: bottomBtnHeight + 'rpx',
+                    lineHeight: bottomBtnHeight + 'rpx',
+                  }"
+                  :radius="bottomBtnRadius + 'rpx'"
+                  :bg-color="mainColor"
+                  >{{ item.text }}
+                </xd-button>
+              </view>
             </view>
-            <view>
+            <view v-else>
               <xd-button
-                @click="handleToPay"
                 size="small"
-                type="primary"
-                radius="40rpx"
-                :bg-color="mainColor"
-                >{{ item.text }}
-              </xd-button>
+                :type="item.type !== undefined ? item.type: 'primary'"
+                :radius="bottomBtnRadius + 'rpx'"
+                :style="{
+                  height: bottomBtnHeight + 'rpx',
+                  lineHeight: bottomBtnHeight + 'rpx',
+                }"
+                @click="handleAction(item)"
+              >{{ item.text }}</xd-button>
             </view>
           </view>
-          <view v-else>
-            <xd-button
-              size="small"
-              :type="item.type !== undefined ? item.type: 'primary'"
-              radius="40rpx"
-              @click="handleAction(item)"
-            >{{ item.text }}</xd-button>
-          </view>
         </view>
       </view>
     </view>
@@ -824,17 +862,26 @@ export default {
       is_border_w: 0,
       is_border_c: "",
 
+
       //其他
-      margin: {
-        top: 0,
-        left: 0,
-        right: 0,
-        bottom: 0,
-      },
+      margin: {},
       is_hot: "Y",
       logo: "",
+      lineHeight: 20,
 
       noticeBgc:'',
+      sectionShadow: "",
+      sectionBorder: "",
+      bottomBtnRadius: 0,
+      bottomPadding: "",
+      bottomBgColor: "",
+      bottomBtnHeight: "",
+      is_open: '',
+      is_show: '',
+      showAllProductDetail: false,
+      is_show_all_detail: '',
+      showPreviewCode: true,
+      is_show_product: "",
     };
   },
   watch: {
@@ -873,15 +920,21 @@ export default {
       return str
     },
     shadowBox() {
-      if (this.is_shadow === "Y")
-        return `0 0 ${this.is_shadow_w}rpx ${this.is_shadow_bg}`;
-      else return "0 0 0 rgba(0,0,0,0)";
+      return this.sectionShadow;
     },
     borderBox() {
-      if (this.is_border === "Y")
-        return `${this.is_border_w}rpx solid ${this.is_border_c}`;
-      else return "0";
+      return this.sectionBorder;
     },
+    bottomBoxStyle(){
+      let padding = `${this.checkValue(this.bottomPadding.top, 20)}rpx`;
+      padding = `${padding} ${this.checkValue(this.bottomPadding.right, 20)}rpx`;
+      padding = `${padding} ${this.checkValue(this.bottomPadding.bottom, 20)}rpx`;
+      padding = `${padding} ${this.checkValue(this.bottomPadding.left, 20)}rpx`;
+      return {
+        padding: padding,
+        backgroundColor: this.bottomBgColor,
+      }
+    }
   },
   created() {
     this.noticeBgc = Color(this.warningColor).alpha(0.2).toString();
@@ -914,13 +967,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 +1102,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 +1115,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 +1133,11 @@ export default {
               .catch((err) => {
                 console.log(err, "err");
               });
+            } catch (error) {
+              console.log(error,'apapapa');
+              
+            }
+            
           }
           else {
             this.info = res;
@@ -1113,12 +1174,43 @@ export default {
       this.is_shadow_w = getContainerPropsValue(container, "content.is_shadow_w", "10");
 
       this.is_border = getContainerPropsValue(container, "content.is_border", "N");
-      this.is_hot = getContainerPropsValue(container, "content.is_hot", "Y");
       this.is_border_c = getContainerPropsValue(container, "content.is_border_c", "#fff");
       this.is_border_w = getContainerPropsValue(container, "content.is_border_w", 2);
+
+      this.is_hot = getContainerPropsValue(container, "content.is_hot", "Y");
       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.lineHeight = getContainerPropsValue(container, "content.lineHeight", 20);
+      let sectionShadow = getContainerPropsValue(container, "content.sectionShadow", "");
+      this.sectionShadow = this.getShadowCompatibleOldStyle(sectionShadow, {
+        type: this.is_shadow,
+        width: this.is_shadow_w,
+        color: this.is_shadow_bg,
+      })
+      let sectionBorder = getContainerPropsValue(container, "content.sectionBorder", "");
+      this.sectionBorder = this.getBorderCompatibleOldStyle(sectionBorder, {
+        type: this.is_border,
+        width: this.is_border_w,
+        color: this.is_border_c,
+      })
+      this.bottomBtnRadius = getContainerPropsValue(container, "content.bottomBtnRadius", 0);
+      this.bottomPadding = getContainerPropsValue(container, "content.bottomPadding", {});
+      this.bottomBgColor = getContainerPropsValue(container, "content.bottomBgColor", "#ffffff");
+      this.bottomBtnHeight = getContainerPropsValue(container, "content.bottomBtnHeight", 60);
+      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(() => {
@@ -1758,8 +1850,6 @@ export default {
       position: fixed;
       left: 0;
       right: 0;
-      height: unit(100, rpx);
-      padding: 0 unit(30, rpx);
       box-shadow: 0 0 unit(10, rpx) rgba(0, 0, 0, 0.15);
       background: #fff;
       z-index: 3000;
@@ -1767,12 +1857,33 @@ export default {
       justify-content: flex-end;
       align-items: center;
 
-      & > view {
-        margin-left: unit(20, rpx);
-        font-size: @xd-font-size-lg;
+      .btn_wrap{
+        display: flex;
+        & > view {
+          margin-left: unit(20, rpx);
+          font-size: @xd-font-size-lg;
+        }
       }
     }
 
+    &-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/JfbBaseOrderList/Attr.js

@@ -4,6 +4,17 @@ export default {
   style: [],
   content: (data)=>{
     return [
+      {
+        label: "布局样式配置",
+        ele: "xd-radio",
+        valueKey: "layout_style",
+        value: data.layout_style || 'old',
+        list: [
+          {label: '布局1', value: 'old'},
+          {label: '布局2', value: 'tfk'},
+        ],
+        groupKey: "style",
+      },
       {
         label: '设置订单状态:',
         ele: 'xd-order-setting',
@@ -30,6 +41,18 @@ export default {
           {required: true, message: '设置订单配置错误！请检查配置', trigger: 'change'},
         ],
       },
+      {
+        label: "是否展示订单号:",
+        ele: 'xd-radio',
+        valueKey: 'isShowOrderNo',
+        value: data['isShowOrderNo'] || 'Y',
+        groupKey:'style',
+        list: [
+          {label: '是', value: 'Y'},
+          {label: '否', value: 'N'},
+        ],
+        hidden: data.layout_style !== 'tfk'
+      },
       {
         label: '外填充:',
         ele: 'xd-margin-padding',
@@ -73,11 +96,38 @@ export default {
         inline: false,
         notice: '间距设置，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
       },
+      {
+        label: "投影设置:",
+        ele: "xd-shadow",
+        valueKey: "sectionShadow",
+        value: data.sectionShadow || {},
+        groupKey:'style',
+        handleCustom({action, data}) {
+          XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+              data.cb([])
+            });
+        },
+      },
+      {
+        label: '边框设置：',
+        ele: 'xd-border',
+        valueKey: 'sectionBorder',
+        groupKey:'style',
+        value: data.sectionBorder || {},
+        placeholder: '请选择边框设置',
+        inline: false,
+      },
       {
         ele: 'title',
         label: '投影设置',
         size: 'small',
         groupKey:'style',
+        hidden: true,
       },
       {
         label: '是否有投影:',
@@ -91,7 +141,8 @@ export default {
         list: [
           {label: '是', value: 'Y'},
           {label: '否', value: 'N'},
-        ]
+        ],
+        hidden: true,
       },
       data['is_shadow'] === 'Y' && {
         label: '投影颜色:',
@@ -101,6 +152,7 @@ export default {
         value: data['is_shadow_bg'] || '',
         placeholder: '请选择投影颜色',
         classNmae: 'input80',
+        hidden: true,
       },
       data['is_shadow'] === 'Y' && {
         label: '投影范围:',
@@ -123,12 +175,14 @@ export default {
               console.error(error);
             });
         },
+        hidden: true,
       },
       {
         ele: 'title',
         label: '边框设置',
         size: 'small',
         groupKey:'style',
+        hidden: true,
       },
       {
         label: '是否有边框:',
@@ -142,7 +196,8 @@ export default {
         list: [
           {label: '是', value: 'Y'},
           {label: '否', value: 'N'},
-        ]
+        ],
+        hidden: true,
       },
       data['is_border'] === 'Y' && {
         label: '边框颜色:',
@@ -152,6 +207,7 @@ export default {
         value: data['is_border_c'] || '',
         placeholder: '请选择边框颜色',
         classNmae: 'input80',
+        hidden: true,
       },
       data['is_border'] === 'Y' && {
         label: '边框大小:',
@@ -162,6 +218,7 @@ export default {
         value: data['is_border_w'] || '',
         placeholder: '请输入边框大小',
         className: 'input80',
+        hidden: true,
       },
       {
         label: '内容圆角设置:',