jufubao-base 1.0.159-beta16 → 1.0.159-beta18

package/src/components/JfbBaseMultipleExpress/Mock.js

@@ -11,6 +11,8 @@ module.exports = {
       "logistics_number": "SF1685689779402",
       "package_id": "K8bX6_E7KZcIq7K6DiHJb",
       "product_list": [{
+        'brand_id': 20001,
+        'brand_name': "维尔纳斯",
         "product_id": 60006948,
         "product_name": "生日蛋糕",
         "sku_id": "0",
@@ -19,6 +21,8 @@ module.exports = {
         "thumb": "\/\/sandbox-img.jufubao.cn\/uploads\/20230406\/0b890cd5a947d9c5724b412d34cd4000.png",
         "price": 2103
       }, {
+        'brand_id': 20001,
+        'brand_name': "维尔纳斯",
         "product_id": 60006948,
         "product_name": "生日蛋糕",
         "sku_id": "0",
@@ -36,6 +40,8 @@ module.exports = {
       "logistics_number": "75580431357494",
       "package_id": "GSoLqqSNzneETTn-QlZZG",
       "product_list": [{
+        'brand_id': 2,
+        'brand_name': "北京味多美蛋糕叔叔/HEYTEA/喜茶/凯蒂猫/Quange/全格",
         "product_id": 60006948,
         "product_name": "生日蛋糕",
         "sku_id": "0",
@@ -53,6 +59,8 @@ module.exports = {
       "logistics_number": "75580918666266",
       "package_id": "oxrqHZEeKn_a9qrjwYwRG",
       "product_list": [{
+        'brand_id': 2,
+        'brand_name': "北京味多美蛋糕叔叔/HEYTEA/喜茶/凯蒂猫/Quange/全格",
         "product_id": 60006948,
         "product_name": "生日蛋糕",
         "sku_id": "0",
@@ -70,6 +78,8 @@ module.exports = {
       "logistics_number": "1231",
       "package_id": "axz_Mgal3f3G5k3eELsUd",
       "product_list": [{
+        'brand_id': 20167,
+        'brand_name': "派悦坊",
         "product_id": 60006948,
         "product_name": "生日蛋糕",
         "sku_id": "0",

package/src/components/JfbBaseOrderDetail/Attr.js

@@ -260,6 +260,20 @@ export default {
           }
         },
       },
+      {
+        label: "是否展示可用门店:",
+        ele: 'xd-radio',
+        valueKey: "is_show_support_shop",
+        value: data['is_show_support_shop'] || 'N',
+        groupKey:'content',
+        placeholder: '请选择是否展示可用门店',
+        multiple: false,
+        className: 'input80',
+        list: [
+          { label: '是', value: 'Y' },
+          { label: '否', value: 'N' },
+        ]
+      },
       {
         label: '外填充:',
         ele: 'xd-margin-padding',
@@ -273,6 +287,15 @@ export default {
         inline: false,
         notice: '设置外填充，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
       },
+      {
+        label: '品牌文字颜色:',
+        ele: 'xd-color',
+        valueKey: 'brandTextColor',
+        groupKey:'style',
+        value: data['brandTextColor'] || null,
+        placeholder: '请选择品牌文字颜色',
+        classNmae: 'input80',
+      },
       {
         label: '背景颜色:',
         ele: 'xd-color',

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -13,9 +13,7 @@
       :class="{ editx: isEditx && active }"
       v-if="isEditx && active && !noBorder"
     >
-      <view class="jfb-base-order-detail__edit-icon" @click="delEdit"
-        >删除</view
-      >
+      <view class="jfb-base-order-detail__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
     <view class="jfb-base-order-detail__body" v-if="info && info !== null">
@@ -50,11 +48,8 @@
           <view
             v-if="info.status.loading_timeout != '-1'"
             :style="{ marginLeft: '40rpx' }"
-            >{{ info.status.status_name }}：{{ timeMsg }}</view
-          >
-          <view v-else :style="{ marginLeft: '40rpx' }">
-            {{ info.status.status_name }}
-          </view>
+          >{{ info.status.status_name }}：{{ timeMsg }}</view>
+          <view v-else :style="{ marginLeft: '40rpx' }">{{ info.status.status_name }}</view>
         </view>
         <view style="height: 90rpx;"></view>
       </view>
@@ -80,11 +75,8 @@
                 mode="scaleToFill"
                 :src="info.film_show.thumb"
               ></xd-jfb-image>
-
               <view class="jfb-base-order-detail__body-no-delivery-info-right">
-                <view
-                  class="jfb-base-order-detail__body-no-delivery-info-right-name"
-                >
+                <view class="jfb-base-order-detail__body-no-delivery-info-right-name">
                   <view>{{ info.film_show.name }}</view>
                 </view>
                 <view
@@ -118,9 +110,7 @@
                   v-if="info.film_show.seat_name"
                 >
                   <view>座位：</view>
-                  <view :style="{ color: mainColor, fontWeight: 700 }">{{
-                    info.film_show.seat_name
-                  }}</view>
+                  <view :style="{ color: mainColor, fontWeight: 700 }">{{info.film_show.seat_name }}</view>
                 </view>
                 <view
                   class="jfb-base-order-detail__body-no-delivery-info-right-item"
@@ -134,9 +124,7 @@
               class="jfb-base-order-detail__body-delivery-bottom"
               v-if="info.film_show.detail && info.film_show.detail !== null"
             >
-              <view class="jfb-base-order-detail__body-delivery-bottom-title">{{
-                info.film_show.detail.title
-              }}</view>
+              <view class="jfb-base-order-detail__body-delivery-bottom-title">{{info.film_show.detail.title }}</view>
               <view
                 v-for="(Ditem, Dindex) in info.film_show.detail.items"
                 :key="Dindex"
@@ -165,9 +153,7 @@
           >
             <view class="jfb-base-order-detail__body-delivery-title">
               <view>子订单号：{{ item.sub_order_id }}</view>
-              <view :style="{ color: mainColor }">{{
-                item.status.status_name
-              }}</view>
+              <view :style="{ color: mainColor }">{{item.status.status_name}}</view>
             </view>
             <view
               style="border-bottom: 1px solid #eeeeee"
@@ -185,18 +171,13 @@
                   :src="Sitem.product_thumb"
                 ></xd-jfb-image>
                 <view class="jfb-base-order-detail__body-delivery-content-info">
-                  <view
-                    class="jfb-base-order-detail__body-delivery-content-info-name"
-                    >{{ Sitem.product_name }}</view
-                  >
+                  <view class="jfb-base-order-detail__body-delivery-content-info-name">{{ Sitem.product_name }}</view>
+                  <view v-if="Sitem.brand_name" class="brand-name" :style="{color:brandTextColor}">{{ Sitem.brand_name }}</view>
                   <view
                     v-if="Sitem.product_sku_name"
                     class="jfb-base-order-detail__body-delivery-content-info-sku"
-                    >规格：{{ Sitem.product_sku_name }}</view
-                  >
-                  <view
-                    class="jfb-base-order-detail__body-delivery-content-info-price"
-                  >
+                  >规格：{{ Sitem.product_sku_name }}</view>
+                  <view class="jfb-base-order-detail__body-delivery-content-info-price">
                     <view :style="{ fontSize: '32rpx', color: mainColor }">
                       <xd-unit
                         :price="Sitem.sale_price"
@@ -205,15 +186,12 @@
                         v-if="biz_code !== 'gift' || info.is_show_gift_price"
                       ></xd-unit>
                     </view>
-                    <view
-                      style="
+                    <view style="
                         font-size: 28rpx;
                         color: #999999;
                         display: flex;
                         align-items: center;
-                      "
-                      >x {{ Sitem.product_num }}</view
-                    >
+                      ">x {{ Sitem.product_num }}</view>
                   </view>
                 </view>
               </view>
@@ -264,9 +242,7 @@
             v-for="(item, index) in info.settle_tag_info.settle_tag_info_list"
             :key="index"
             class="jfb-base-order-detail__body-settle-list"
-          >
-            {{ item.label }}：{{ item.value }}
-          </view>
+          >{{ item.label }}：{{ item.value }}</view>
         </view>
         <view v-if="info.codes && info.codes.length > 0">
           <view
@@ -313,9 +289,7 @@
                 color: mainColor,
                 background: bgColor,
               }"
-            >
-              {{ info.codes[0].code_end_time }}
-            </view>
+            >{{ info.codes[0].code_end_time }}</view>
           </view>
           <view v-else>
             <view
@@ -329,8 +303,7 @@
               v-for="(item, index) in info.codes"
               :key="index"
             >
-              <view
-                style="
+              <view style="
                   color: #999;
                   background: #eee;
                   border-radius: 20rpx;
@@ -340,9 +313,7 @@
                   font-size: 24rpx;
                   padding: 10rpx 0;
                   margin: 32rpx 0 32rpx 32rpx;
-                "
-                >{{info.codes.length > 10 ? index + 1 : `0${index + 1}` }}</view
-              >
+                ">{{info.codes.length > 10 ? index + 1 : `0${index + 1}` }}</view>
               <view
                 class="jfb-base-order-detail__body-card jfb-base-order-detail__body-num"
                 v-if="item.show_type === 'text' && !item.password"
@@ -353,8 +324,7 @@
                 <view
                   class="jfb-base-order-detail__body-num-info-copy"
                   @click="copy(item.code)"
-                  >复制</view
-                >
+                >复制</view>
                 <view
                   v-if="item.code_end_time"
                   class="jfb-base-order-detail__body-cashier-code"
@@ -363,9 +333,7 @@
                     color: mainColor,
                     background: bgColor,
                   }"
-                >
-                  {{ item.code_end_time }}
-                </view>
+                >{{ item.code_end_time }}</view>
               </view>
 
               <view
@@ -385,8 +353,7 @@
                   <view
                     class="jfb-base-order-detail__body-num-info-copy"
                     @click="copy(item.code)"
-                    >复制</view
-                  >
+                  >复制</view>
                 </view>
                 <view
                   class="jfb-base-order-detail__body-num"
@@ -406,12 +373,9 @@
                       color: mainColor,
                       background: bgColor,
                     }"
-                  >
-                    {{ item.code_end_time }}
-                  </view>
+                  >{{ item.code_end_time }}</view>
                 </view>
               </view>
-
               <view
                 class="jfb-base-order-detail__body-card"
                 v-if="item.show_type === 'qrcode'"
@@ -471,8 +435,7 @@
                   <view
                     class="jfb-base-order-detail__body-num-info-copy"
                     @click="handleToJump(item.code)"
-                    >访问</view
-                  >
+                  >访问</view>
                   <view
                     class="jfb-base-order-detail__body-num-info-copy"
                     @click="copy(item.code)"
@@ -491,7 +454,7 @@
             </view>
           </view>
         </view>
-        <view v-if="info.support_shops">
+        <view v-if="info.support_shops && is_show_support_shop === 'Y'">
           <view
             class="jfb-base-order-detail__body-card jfb-base-order-detail__body-jump"
             :style="{
@@ -527,9 +490,7 @@
         >
           <view class="jfb-base-order-detail__body-shop-title">
             <view :style="{ background: mainColor }"></view>
-            <view>
-              {{ info.shop.layer_name }}
-            </view>
+            <view>{{ info.shop.layer_name }}</view>
           </view>
           <view class="jfb-base-order-detail__body-shop-name">
             {{ info.shop.shop_name }}
@@ -795,6 +756,7 @@ export default {
   mixins: [componentsMixins, extsMixins, JfbBaseOrderDetailMixin],
   data() {
     return {
+
       info: null,
       brandPath: "", //查看品牌路径
       showPayCard: false,
@@ -813,6 +775,8 @@ export default {
       isPreview: false, //是否预览
       biz_code: "",
       is_not_show_price: "",
+      brandTextColor:'',
+      is_show_support_shop: "",
 
       showPassword: false,
       dialogPassword: "",
@@ -1068,80 +1032,28 @@ export default {
      */
     init(container) {
       this.bgColor = this.$colorChange(this.mainColor).alpha(0.1).toString();
-      this.brandPath = getContainerPropsValue(container, "content.brandPath", {
-        value: "",
-      }).value;
-      this.payPath = getContainerPropsValue(container, "content.payPath", {
-        value: "",
-      }).value;
-      // this.logisticsPath = getContainerPropsValue(
-      //   container,
-      //   "content.logisticsPath",
-      //   { value: "" }
-      // ).value;
-      this.packageListPath = getContainerPropsValue(
-        container,
-        "content.packageListPath",
-        { value: "" }
-      ).value;
-      this.webViewPath = getContainerPropsValue(
-        container,
-        "content.webViewPath",
-        {
-          value: "",
-        }
-      ).value;
-      this.margin = getContainerPropsValue(container, "content.margin", {
-        top: 0,
-        left: 0,
-        right: 0,
-        bottom: 0,
-      });
+      this.brandPath = getContainerPropsValue(container, "content.brandPath", {value: "",}).value;
+      this.payPath = getContainerPropsValue(container, "content.payPath", {value: "",}).value;
+
+
+      this.packageListPath = getContainerPropsValue(container, "content.packageListPath", { value: "" }).value;
+      this.webViewPath = getContainerPropsValue(container, "content.webViewPath", {value: "",}).value;
+      this.margin = getContainerPropsValue(container, "content.margin", {top: 0, left: 0, right: 0, bottom: 0,});
       this.radius = getContainerPropsValue(container, "content.radius", 0);
-      this.backgroundColor = getContainerPropsValue(
-        container,
-        "content.backgroundColor",
-        "#f8f8f8"
-      );
+      this.backgroundColor = getContainerPropsValue(container, "content.backgroundColor", "#f8f8f8");
+      this.brandTextColor = getContainerPropsValue(container, "content.brandTextColor", this.mainColor);
       this.padding = getContainerPropsValue(container, "content.padding", 20);
 
-      this.is_shadow = getContainerPropsValue(
-        container,
-        "content.is_shadow",
-        "N"
-      );
-      this.is_shadow_bg = getContainerPropsValue(
-        container,
-        "content.is_shadow_bg",
-        "#fff"
-      );
-      this.is_shadow_w = getContainerPropsValue(
-        container,
-        "content.is_shadow_w",
-        "10"
-      );
-
-      this.is_border = getContainerPropsValue(
-        container,
-        "content.is_border",
-        "N"
-      );
+      this.is_shadow = getContainerPropsValue(container, "content.is_shadow", "N");
+      this.is_shadow_bg = getContainerPropsValue(container, "content.is_shadow_bg", "#fff");
+      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.viewStatus = getContainerPropsValue(
-        container,
-        "content.viewStatus",
-        "mall"
-      );
+      this.is_border_c = getContainerPropsValue(container, "content.is_border_c", "#fff");
+      this.is_border_w = getContainerPropsValue(container, "content.is_border_w", 2);
+      this.viewStatus = getContainerPropsValue(container, "content.viewStatus", "mall");
+      this.is_show_support_shop = getContainerPropsValue(container, "content.is_show_support_shop", "N");
     },
     getCountDown() {
       this.timer = setInterval(() => {
@@ -1298,6 +1210,14 @@ export default {
 
 .jfb-base-order-detail {
   &__body {
+    .brand-name {
+      padding-top: 5rpx;
+      font-size: 24rpx;
+      margin-bottom: 6rpx;
+      .uni-max-cut(2, 64);
+      line-height: 32rpx;
+    }
+
     color: #333;
     .logo-icon {
       width: unit(80, rpx) !important;
@@ -1437,7 +1357,7 @@ export default {
           flex-direction: column;
           justify-content: space-between;
           margin-left: unit(28, rpx);
-          height: unit(160, rpx);
+          min-height: unit(160, rpx);
 
           &-name {
             font-size: unit(32, rpx);
@@ -1453,7 +1373,7 @@ export default {
 
           &-sku {
             color: #999999;
-            font-size: unit(28, rpx);
+            font-size: unit(24, rpx);
             .uni-max-cut(2, 80);
           }
 

package/src/components/JfbBaseOrderDetail/bizMock.js

@@ -32,12 +32,14 @@ export default {
         "loading_timeout": 0
       },
       "products": [{
+        'brand_id': 2,
+        'brand_name': "北京味多美蛋糕叔叔/HEYTEA/喜茶/凯蒂猫/Quange/全格",
         "product_id": 60006948,
-        "product_name": "实物商品jls（单规格）1",
+        "product_name": "动物奶油】ins小清新动物奶油生日蛋糕",
         "product_sku_id": "0",
         "product_sku_name": "草莓",
         "product_type": "good",
-        "product_num": 1,
+        "product_num": 8,
         "product_thumb": "\/\/sandbox-img.jufubao.cn\/uploads\/20230406\/0b890cd5a947d9c5724b412d34cd4000.png",
         "sale_price": 1549,
         "product_form_data": [{"label": "祝福语", "value": "心想事成！"}]

package/src/components/JfbBaseOrderList/Attr.js

@@ -52,6 +52,15 @@ export default {
         placeholder: '请选择背景颜色',
         classNmae: 'input80',
       },
+      {
+        label: '品牌文字颜色:',
+        ele: 'xd-color',
+        valueKey: 'brandTextColor',
+        groupKey:'style',
+        value: data['brandTextColor'] || null,
+        placeholder: '请选择品牌文字颜色',
+        classNmae: 'input80',
+      },
       {
         label: '间距:',
         ele: 'el-input',