jufubao-base 1.0.166 → 1.0.167-beta3

package/package.json

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

package/src/components/JfbBaseAfterOrderDetail/Attr.js

@@ -32,6 +32,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',
+      },
       {
         ele: 'title',
         label: '投影设置',

package/src/components/JfbBaseAfterOrderDetail/JfbBaseAfterOrderDetail.vue

@@ -10,9 +10,7 @@
       :class="{ editx: isEditx && active }"
       v-if="isEditx && active"
     >
-      <view class="jfb-base-after-order-detail__edit-icon" @click="delEdit"
-        >删除</view
-      >
+      <view class="jfb-base-after-order-detail__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
     <view
@@ -48,20 +46,13 @@
             :key="index"
             class="jfb-base-after-order-detail__body-movie-content"
           >
-            <image
-              style="background: #ffffff"
-              mode="aspectFit"
-              :src="item.thumb"
-            ></image>
+            <image style="background: #ffffff" mode="aspectFit" :src="item.thumb"></image>
             <view class="jfb-base-after-order-detail__body-movie-content-info">
-              <view
-                class="jfb-base-after-order-detail__body-movie-content-info-top"
-              >
-                <view> {{ item.product_name }} </view>
+              <view class="jfb-base-after-order-detail__body-movie-content-info-top">
+                <view>{{ item.product_name }} </view>
+                <view v-if="item.brand_name" class="brand-name" :style="{color:brandTextColor}">{{ item.brand_name }}</view>
               </view>
-              <view
-                class="jfb-base-after-order-detail__body-movie-content-info-bottom"
-              >
+              <view class="jfb-base-after-order-detail__body-movie-content-info-bottom">
                 <view >
                   <xd-unit v-if="info.business_icon !== 'gift' && info.is_not_show_price !== 'Y'" :price="item.sale_price"></xd-unit>
                 </view>
@@ -74,15 +65,9 @@
             <view
               v-if="info.after_sale_method === 'exchange'"
               :style="{ color: mainColor }"
-              >换成：{{ info.exchangeMsg }}</view>
-            <!-- <view
-              v-else-if="info.after_sale_method === 'again'"
-              :style="{ color: mainColor }"
-            >补发快递：{{ info['express_name'] }}</view> -->
+            >换成：{{ info.exchangeMsg }}</view>
             <view v-else :style="{ color: mainColor }">
-              <view v-if="info.business_code !== 'gift' && info.is_not_show_price !== 'Y'">
-                已退款：¥{{ info.total_refund_sale_amount }}
-              </view>
+              <view v-if="info.business_code !== 'gift' && info.is_not_show_price !== 'Y'">已退款：¥{{ info.total_refund_sale_amount }}</view>
             </view>
           </view>
         </view>
@@ -114,17 +99,13 @@
           </view>
         </view>
         <view class="jfb-base-after-order-detail__body-order-item">
-          <view class="jfb-base-after-order-detail__body-order-item-label"
-            >申请时间：</view
-          >
+          <view class="jfb-base-after-order-detail__body-order-item-label">申请时间：</view>
           <view class="jfb-base-after-order-detail__body-order-item-value">
             {{ info.created_time }}
           </view>
         </view>
         <view class="jfb-base-after-order-detail__body-order-item" style="padding-bottom: 0;">
-          <view class="jfb-base-after-order-detail__body-order-item-label"
-            >服务类型：</view
-          >
+          <view class="jfb-base-after-order-detail__body-order-item-label">服务类型：</view>
           <view class="jfb-base-after-order-detail__body-order-item-value">
             {{ info.after_sale_method_name }}
           </view>
@@ -156,6 +137,7 @@ export default {
       //基础
       radius: 0,
       backgroundColor: "",
+      brandTextColor:'',
       padding: 0,
 
       //投影
@@ -169,12 +151,7 @@ export default {
       is_border_c: "",
 
       //其他
-      margin: {
-        top: 0,
-        left: 0,
-        right: 0,
-        bottom: 0,
-      },
+      margin: {},
     };
   },
   watch: {
@@ -287,51 +264,19 @@ export default {
      * @param container {object} 业务组件对象自己
      */
     init(container) {
-      this.margin = getContainerPropsValue(container, "content.margin", {
-        top: 0,
-        left: 0,
-        right: 0,
-        bottom: 0,
-      });
+      this.margin = getContainerPropsValue(container, "content.margin", {});
       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_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_border_c = getContainerPropsValue(
-        container,
-        "content.is_border_c",
-        "#fff"
-      );
-      this.is_border_w = getContainerPropsValue(
-        container,
-        "content.is_border_w",
-        2
-      );
+      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);
     },
   },
 };
@@ -357,6 +302,13 @@ export default {
 
 .jfb-base-after-order-detail {
   &__body {
+    .brand-name {
+      padding-top: 5rpx;
+      font-size: 24rpx;
+      margin-bottom: 6rpx;
+      .uni-max-cut(2, 64);
+      line-height: 32rpx;
+    }
     &-card {
       border-radius: unit(20, rpx);
       padding: unit(30,rpx) unit(40, rpx);
@@ -397,15 +349,24 @@ export default {
           display: flex;
           flex-direction: column;
           justify-content: space-between;
-          height: unit(160,rpx);
+          min-height: unit(160,rpx);
 
           &-top {
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
             color: #333;
             font-size: unit(32, rpx);
-            .uni-max-cut(1, 64);
+
+            .brand-name {
+              padding-top: 5rpx;
+              font-size: 24rpx;
+              margin-bottom: 6rpx;
+              .uni-max-cut(2, 64);
+              line-height: 32rpx;
+            }
+
+            & > view:nth-child(1) {
+              .uni-max-cut(2, 80);
+              line-height: 40rpx;
+            }
           }
 
           &-bottom {

package/src/components/JfbBaseAfterOrderDetail/Mock.js

@@ -24,8 +24,10 @@ module.exports = {
     "refund_freight_price": 0,
     "is_refund_freight_price": "Y",
     "sale_goods": [{
+      'brand_id': 2,
+      'brand_name': "北京味多美蛋糕叔叔/HEYTEA/喜茶/凯蒂猫/Quange/全格",
       "product_id": 581,
-      "product_name": "聚福宝-万里归途",
+      "product_name": "动物奶油】ins小清新动物奶油生日蛋糕",
       "product_sku_id": "F60487-9137767320-1306340102#07#04",
       "product_sku_name": "5厅（看3D影片需自备3D眼镜）-7排4列",
       "thumb": "https:\/\/p0.pipi.cn\/mmdb\/25bfd6ddb53c7e5015d23c5bc24d876c03d41.jpg?imageMogr2\/thumbnail\/1246x1246%3E",
@@ -43,7 +45,6 @@ module.exports = {
     "created_time": 1680233512,
     "refund_method_name": "原路返回",
     "after_sale_type_name": "",
-    "business_name": "",
     "business_icon": "icondangao-01",
     "request_id": "5be757202592d8e1"
   }

package/src/components/JfbBaseAfterOrderList/Attr.js

@@ -27,6 +27,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',

package/src/components/JfbBaseAfterOrderList/JfbBaseAfterOrderList.vue

@@ -13,9 +13,7 @@
       :class="{ editx: isEditx && active }"
       v-if="isEditx && active && !noBorder"
     >
-      <view class="jfb-base-after-order-list__edit-icon" @click="delEdit"
-        >删除</view
-      >
+      <view class="jfb-base-after-order-list__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
     <view class="jfb-base-after-order-list__body">
@@ -40,7 +38,10 @@
             </view>
             <view class="jfb-base-after-order-list__body-order-content">
               <view class="image"></view>
-              <view></view>
+              <view>
+                <view></view>
+                <view></view>
+              </view>
             </view>
           </view>
         </view>
@@ -69,32 +70,23 @@
                     :size="item.business_icon_size"
                   ></xd-font-icon>
                 </view>
-
                 <view>{{ item.business_name }}订单</view>
               </view>
               <view class="jfb-base-after-order-list__body-order-title">
                 <view>服务单号：{{ item.order_id }}</view>
-                <view :style="{ color: mainColor }">
-                  <!-- <xd-font-icon
-                  style="margin-right: 16rpx"
-                  icon="iconqianbao-01"
-                  size="40rpx"
-                  :color="mainColor"
-                ></xd-font-icon> -->
-                  {{ item.after_sale_method_name }}
-                </view>
+                <view :style="{ color: mainColor }">{{ item.after_sale_method_name }}</view>
               </view>
               <view
                 class="jfb-base-after-order-list__body-order-content"
                 v-for="(Sitem, Sindex) in item.sale_goods"
                 :key="Sindex"
               >
-                <image
-                  style="background: #ffffff"
-                  mode="aspectFit"
-                  :src="Sitem.thumb"
-                ></image>
-                <view>{{ Sitem.product_name }}</view>
+                <view><image mode="aspectFit" :src="Sitem.thumb"></image></view>
+                <view>
+                  <view>{{ Sitem.product_name }}</view>
+                  <view v-if="Sitem.brand_name" class="brand-name" :style="{color:brandTextColor}">{{ Sitem.brand_name }}</view>
+                </view>
+
               </view>
             </view>
           </view>
@@ -129,6 +121,7 @@ export default {
   mixins: [componentsMixins, extsMixins, JfbBaseAfterOrderListMixin],
   data() {
     return {
+
       orderList: [],
       detailPath: "",
       page_size: 10,
@@ -136,6 +129,7 @@ export default {
       hasNext: true,
       next_page_token: "",
       loadingList: true,
+      brandTextColor:'',
 
       //基础
       radius: 0,
@@ -153,12 +147,7 @@ export default {
       is_border_c: "",
 
       //其他
-      margin: {
-        top: 0,
-        left: 0,
-        right: 0,
-        bottom: 0,
-      },
+      margin: {},
     };
   },
   watch: {
@@ -198,51 +187,21 @@ export default {
      * @param container {object} 业务组件对象自己
      */
     init(container) {
-      this.margin = getContainerPropsValue(container, "content.margin", {top: 0, left: 0, right: 0, bottom: 0,});
+      this.margin = getContainerPropsValue(container, "content.margin", {});
       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_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_border_c = getContainerPropsValue(
-        container,
-        "content.is_border_c",
-        "#fff"
-      );
-      this.is_border_w = getContainerPropsValue(
-        container,
-        "content.is_border_w",
-        2
-      );
-      this.detailPath = getContainerPropsValue(
-        container,
-        "content.detailPath",
-        { value: "" }
-      ).value;
+      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);
+      this.detailPath = getContainerPropsValue(container, "content.detailPath", { value: "" }).value;
     },
     getList() {
       this.$xdShowLoading({});
@@ -313,6 +272,13 @@ export default {
 
 .jfb-base-after-order-list {
   &__body {
+    .brand-name {
+      padding-top: 5rpx;
+      font-size: 24rpx;
+      margin-bottom: 6rpx;
+      .uni-max-cut(2, 64);
+      line-height: 32rpx;
+    }
     &-no {
       display: flex;
       justify-content: center;
@@ -381,11 +347,18 @@ export default {
         align-items: center;
         padding-top: unit(40, rpx);
 
-        image {
-          width: unit(160, rpx);
-          height: unit(160, rpx);
-          border-radius: unit(8, rpx);
+        & > view:first-child {
+          width: 160rpx;
+          height: 160rpx;
           flex-shrink: 0;
+          margin-right: 20rpx;
+
+          image {
+            width: unit(160, rpx);
+            height: unit(160, rpx);
+            border-radius: unit(8, rpx);
+            flex-shrink: 0;
+          }
         }
 
         .image{
@@ -395,21 +368,28 @@ export default {
             flex: none;
           }
         }
-        & > view:last-child{
-          .skeleton-wrap &{
-            .skeleton-item(300rpx);
-          }
-        }
 
-        view {
-          margin-left: unit(20, rpx);
+        & > view:last-child {
           flex: 1;
-          font-size: unit(32, rpx);
-          color: #333333;
-          font-weight: 500;
-          .uni-max-cut(1, 64);
-          line-height: unit(64, rpx);
+          & > view {
+            &:nth-child(2) {
+              margin-top: 20rpx;
+            }
+            .skeleton-wrap &{
+              .skeleton-item(100%);
+            }
+          }
         }
+
+        //& > view {
+        //  margin-left: unit(20, rpx);
+        //  flex: 1;
+        //  font-size: unit(32, rpx);
+        //  color: #333333;
+        //  font-weight: 500;
+        //  .uni-max-cut(1, 64);
+        //  line-height: unit(64, rpx);
+        //}
       }
 
       &-bottom {

package/src/components/JfbBaseAfterOrderList/Mock.js

@@ -24,8 +24,10 @@ module.exports = {
         "express_code": "59",
         "express_number": "4421323",
         "sale_goods": [{
+          'brand_id': 2,
+          'brand_name': "北京味多美蛋糕叔叔/HEYTEA/喜茶/凯蒂猫/Quange/全格",
           "product_id": 60007292,
-          "product_name": "按体积测试运费商品jls---00002",
+          "product_name": "港荣蒸蛋糕 奶香味手撕蛋糕900g",
           "product_sku_id": "70015687",
           "product_sku_name": "芒果 冷冻8个月保质期",
           "thumb": "\/\/sandbox-img.jufubao.cn\/uploads\/20230506\/11ab53c23b2896b6350608d136b47e4c.jpg",
@@ -67,8 +69,10 @@ module.exports = {
         "express_code": "59",
         "express_number": "123",
         "sale_goods": [{
+          'brand_id': 2,
+          'brand_name': "北京味多美蛋糕叔叔",
           "product_id": 60007292,
-          "product_name": "按体积测试运费商品jls---00002",
+          "product_name": "箱面包蛋糕早餐面包办公室零食",
           "product_sku_id": "70015687",
           "product_sku_name": "芒果 冷冻8个月保质期",
           "thumb": "\/\/sandbox-img.jufubao.cn\/uploads\/20230506\/11ab53c23b2896b6350608d136b47e4c.jpg",
@@ -110,8 +114,10 @@ module.exports = {
         "express_code": "59",
         "express_number": "12312",
         "sale_goods": [{
+          'brand_id': 2,
+          'brand_name': "HEYTEA",
           "product_id": 60007216,
-          "product_name": "花（多规格）0426s",
+          "product_name": "港荣蒸蛋糕 奶香味手撕蛋糕900g/箱面包蛋糕早餐面包办公室零食",
           "product_sku_id": "70015857",
           "product_sku_name": "白 小盆",
           "thumb": "\/\/sandbox-img.jufubao.cn\/uploads\/20230506\/f4fccd31ee8b8ee8bb9013ed228cdc66.jpeg",
@@ -153,6 +159,8 @@ module.exports = {
         "express_code": "59",
         "express_number": "11111",
         "sale_goods": [{
+          'brand_id': 2,
+          'brand_name': "喜茶/凯蒂猫",
           "product_id": 60006948,
           "product_name": "实物商品jls（单规格）1",
           "product_sku_id": "0",