jufubao-base 1.0.187-beta2 → 1.0.187-beta3

package/src/components/JfbBaseOrderList/JfbBaseOrderList.vue

@@ -253,11 +253,13 @@ export default {
       is_shadow: "Y",
       is_shadow_bg: 0,
       is_shadow_w: 0,
+      sectionShadow: "",
 
       //边框
       is_border: "Y",
       is_border_w: 0,
       is_border_c: "",
+      sectionBorder: "",
 
       //其他
       margin: {
@@ -282,14 +284,16 @@ 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)";
+      // 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";
+      // if (this.is_border === "Y")
+      //   return `${this.is_border_w}rpx solid ${this.is_border_c}`;
+      // else return "0";
+      return this.sectionBorder;
     },
   },
   watch: {
@@ -337,10 +341,22 @@ export default {
       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");
+      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,
+      })
 
       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);
+      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.detailPath = getContainerPropsValue(container, "content.detailPath", { value: "" }).value;
       this.payPath = getContainerPropsValue(container, "content.payPath", {value: "",}).value;

package/src/components/JfbBaseOrderList/Mock.js

@@ -9,6 +9,7 @@ module.exports = {
       "created_time": 1684491205,
       "status": {"status": "UNPAID", "status_name": "未支付", "status_type": "wait"},
       "total_amount": 2678,
+      "main_user_server_amount": 12,
       "biz_code": "cake",
       "biz_code_name": "蛋糕(勿改)订单",
       "biz_code_icon": "icondangao-01",
@@ -111,6 +112,7 @@ module.exports = {
       "status": {"status": "HANDLER_ING", "status_name": "处理中", "status_type": "wait"},
       "total_amount": 10920,
       "biz_code": "gift",
+      "is_not_show_price": "Y",
       "biz_code_name": "礼包(勿改)订单",
       "biz_code_icon": "icondalibao-01",
       "products": [{
@@ -134,6 +136,7 @@ module.exports = {
       "status": {"status": "COMPLETED", "status_name": "已完成", "status_type": "success"},
       "total_amount": 4800,
       "biz_code": "movie",
+      "is_not_show_price": "Y",
       "biz_code_name": "电影(勿改)订单",
       "biz_code_icon": "icondianying-01",
       "products": [{

package/src/components/JfbBaseOrderList/XdTfkOrderItem.vue

@@ -54,14 +54,31 @@
       </view>
     </view>
     <view class="prod_total">
-      <view></view>
+      <view>
+        <view class="serve_fee" style="color:#999" v-if="item['main_user_server_amount'] !== undefined && item['main_user_server_amount'] > 0">
+          <text>（平台服务费：</text>
+          <xd-unit
+            :isOld="false"
+            :price="item['main_user_server_amount']"
+            :fontSize="24"
+            :is-gray="true"
+            color="#999"
+            :icon-size=".25"
+          ></xd-unit>
+          <text>）</text>
+        </view>
+      </view>
       <view style="display: flex;align-items: center;">
-        共{{item.products.length}}件商品 实付
-        <xd-unit
-          :isOld="false"
-          :price="item.total_amount"
-          :color="mainColor"
-          :fontSize="28"></xd-unit>
+        共{{item.products.length}}件商品
+        <template v-if="item.biz_code !== 'gift' && item.is_not_show_price !== 'Y'">
+          实付
+          <xd-unit
+            :isOld="false"
+            :price="item.total_amount"
+            :color="mainColor"
+            :fontSize="28"></xd-unit>
+        </template>
+        
       </view>
     </view>
     <view v-if="item.buttons.length" class="prod_footer">
@@ -224,6 +241,10 @@
       border-top: 1px solid #EDEDED;
       color: #2e2f30;
       font-size: 26rpx;
+      .serve_fee{
+        display: flex;
+        align-items: center;
+      }
     }
     .prod_footer{
       padding: 16rpx 30rpx 16rpx 0;