jufubao-base 1.0.198-beta1 → 1.0.200-beta1

package/src/components/JfbBaseOrderList/JfbBaseOrderList.vue

@@ -64,104 +64,129 @@
           class="jfb-base-order-list__body-order"
           :style="{ padding: outMargin }"
         >
-          <view
-            @click="handleToLink(detailPath, item)"
-            class="jfb-base-order-list__body-order-item"
-            v-for="item in orderList"
-            :key="item.main_order_id"
-            :style="{
-              background: backgroundColor,
-              border: borderBox,
-              borderRadius: radius + 'rpx',
-              boxShadow: shadowBox,
-              marginBottom: padding + 'rpx',
-            }"
-          >
-            <view class="jfb-base-order-list__body-order-item-biz">
-              <xd-font-icon
-                v-if="item.biz_code_icon"
-                :icon="item.biz_code_icon"
-                :size="item['biz_code_icon_size']"
-              ></xd-font-icon>
-              <view :class="{ marginLeft: item.biz_code_icon }">{{item.biz_code_name }}</view>
-            </view>
-            <view class="jfb-base-order-list__body-order-item-title">
-              <view>订单编号:{{ item.main_order_id }}</view>
-              <view :style="{color:item.status.status_type !== 'error' ? mainColor : '#999999',}">{{ item.status.status_name }}</view>
-            </view>
-            <view class="order-list">
-              <view
-                class="jfb-base-order-list__body-order-item-content"
-                v-for="(Sitem, Sindex) in item.products"
-                :key="Sitem.key"
-                v-if="(item['isOpen'] === false && Sindex < showLen) || item['isOpen']"
-              >
-                <image :src="Sitem.product_thumb" style="background: #ffffff" mode="aspectFit"></image>
-                <view class="jfb-base-order-list__body-order-item-content-info">
-                  <view class="jfb-base-order-list__body-order-item-content-info-name">{{ Sitem.product_name }}</view>
-                  <view class="brand-name" v-if="Sitem.brand_name" :style="{color:brandTextColor}">{{ Sitem.brand_name }}</view>
-                  <view v-if="Sitem.product_sku_name" class="jfb-base-order-list__body-order-item-content-info-skuname">规格：{{ Sitem.product_sku_name }}</view>
-                  <view class="jfb-base-order-list__body-order-item-content-info-price">
-                    <view></view>
-                    <view class="info-price">
-                      <text>X</text>
-                      <text>{{ Sitem.product_num }}</text>
+          <template v-if="layout_style === 'old'">
+            <view
+              @click="handleToLink(detailPath, item)"
+              class="jfb-base-order-list__body-order-item"
+              v-for="item in orderList"
+              :key="item.main_order_id"
+              :style="{
+                background: backgroundColor,
+                border: borderBox,
+                borderRadius: radius + 'rpx',
+                boxShadow: shadowBox,
+                marginBottom: padding + 'rpx',
+              }"
+            >
+              <view class="jfb-base-order-list__body-order-item-biz">
+                <xd-font-icon
+                  v-if="item.biz_code_icon"
+                  :icon="item.biz_code_icon"
+                  :size="item['biz_code_icon_size']"
+                ></xd-font-icon>
+                <view :class="{ marginLeft: item.biz_code_icon }">{{item.biz_code_name }}</view>
+              </view>
+              <view class="jfb-base-order-list__body-order-item-title">
+                <view>订单编号:{{ item.main_order_id }}</view>
+                <view :style="{color:item.status.status_type !== 'error' ? mainColor : '#999999',}">{{ item.status.status_name }}</view>
+              </view>
+              <view class="order-list">
+                <view
+                  class="jfb-base-order-list__body-order-item-content"
+                  v-for="(Sitem, Sindex) in item.products"
+                  :key="Sitem.key"
+                  v-if="(item['isOpen'] === false && Sindex < showLen) || item['isOpen']"
+                >
+                  <image :src="Sitem.product_thumb" style="background: #ffffff" mode="aspectFit"></image>
+                  <view class="jfb-base-order-list__body-order-item-content-info">
+                    <view class="jfb-base-order-list__body-order-item-content-info-name">{{ Sitem.product_name }}</view>
+                    <view class="brand-name" v-if="Sitem.brand_name" :style="{color:brandTextColor}">{{ Sitem.brand_name }}</view>
+                    <view v-if="Sitem.product_sku_name" class="jfb-base-order-list__body-order-item-content-info-skuname">规格：{{ Sitem.product_sku_name }}</view>
+                    <view class="jfb-base-order-list__body-order-item-content-info-price">
+                      <view></view>
+                      <view class="info-price">
+                        <text>X</text>
+                        <text>{{ Sitem.product_num }}</text>
+                      </view>
                     </view>
                   </view>
                 </view>
+                <view
+                  class="order-list-icon"
+                  :style="{ bottom: item['isOpen'] ? '-30rpx' : '-54rpx' }"
+                  v-if="item.products.length > showLen"
+                  @click.stop="switchOpen(item)"
+                >
+                  <view :style="{ background: backgroundColor }">
+                    <xd-font-icon
+                      color="#666"
+                      :icon="item['isOpen'] ? 'iconshang_up' : 'iconxia_down'"
+                      size="24"
+                    ></xd-font-icon>
+                  </view>
+                </view>
+              </view>
+              <view class="jfb-base-order-list__body-order-item-bottom">
+                <view>下单时间:{{ item.created_time_text }}</view>
+                <view v-if="item.biz_code !== 'gift' && item.is_not_show_price !== 'Y'">
+                  <text>合计:</text>
+                  <xd-unit
+                    :isOld="false"
+                    :price="item.total_amount"
+                    :color="mainColor"
+                    :fontSize="28"
+                  ></xd-unit>
+                </view>
+                <view 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
-                class="order-list-icon"
-                :style="{ bottom: item['isOpen'] ? '-30rpx' : '-54rpx' }"
-                v-if="item.products.length > showLen"
-                @click.stop="switchOpen(item)"
+                class="jfb-base-order-list__body-order-item-pay"
+                v-if="item.buttons.length"
               >
-                <view :style="{ background: backgroundColor }">
-                  <xd-font-icon
-                    color="#666"
-                    :icon="item['isOpen'] ? 'iconshang_up' : 'iconxia_down'"
-                    size="24"
-                  ></xd-font-icon>
+                <view v-for="(btn,index) in item.buttons" :key="btn.key">
+                  <xd-button
+                    :type="getBtnType(btn.action)"
+                    size="mini"
+                    @click="handleBtnEvent(btn.action, item)"
+                  >{{ btn.text }}</xd-button>
                 </view>
               </view>
             </view>
-            <view class="jfb-base-order-list__body-order-item-bottom">
-              <view>下单时间:{{ item.created_time_text }}</view>
-              <view v-if="item.biz_code !== 'gift' && item.is_not_show_price !== 'Y'">
-                <text>合计:</text>
-                <xd-unit
-                  :isOld="false"
-                  :price="item.total_amount"
-                  :color="mainColor"
-                  :fontSize="28"
-                ></xd-unit>
-              </view>
-              <view 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>
+          </template>
+          <template v-if="layout_style === 'tfk'">
             <view
-              class="jfb-base-order-list__body-order-item-pay"
-              v-if="item.buttons.length"
+              @click="handleToLink(detailPath, item)"
+              class="jfb-base-order-list__body-order-item"
+              v-for="item in orderList"
+              :key="item.main_order_id"
+              :style="{
+                background: backgroundColor,
+                border: borderBox,
+                borderRadius: radius + 'rpx',
+                boxShadow: shadowBox,
+                marginBottom: padding + 'rpx',
+              }"
             >
-              <view v-for="(btn,index) in item.buttons" :key="btn.key">
-                <xd-button
-                  :type="getBtnType(btn.action)"
-                  size="mini"
-                  @click="handleBtnEvent(btn.action, item)"
-                >{{ btn.text }}</xd-button>
-              </view>
+              <xd-tfk-order-item 
+                :mainColor="mainColor"
+                :isShowOrderNo="isShowOrderNo"
+                :brandTextColor="brandTextColor"
+                :item="item"
+                @handleBtnEvent="action => handleBtnEvent(action, item)"
+              ></xd-tfk-order-item>
             </view>
-          </view>
+          </template>
         </view>
         <view v-else class="jfb-base-order-list__body-no">
           <xd-font-icon
@@ -189,6 +214,7 @@ import extsMixins from "@/mixins/extsMixins";
 import { getContainerPropsValue } from "@/utils/xd.base";
 import getServiceUrl from "@/common/getServiceUrl";
 import Color from "color";
+import XdTfkOrderItem from "./XdTfkOrderItem"
 
 export default {
   name: "JfbBaseOrderList",
@@ -197,6 +223,7 @@ export default {
     XdTab,
     XdUnit,
     XdButton,
+    XdTfkOrderItem,
   },
   mixins: [componentsMixins, extsMixins, JfbBaseOrderListMixin],
   data() {
@@ -226,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: {
@@ -239,6 +268,8 @@ export default {
         right: 0,
         bottom: 0,
       },
+      layout_style: "old",
+      isShowOrderNo: "Y",
 
       noticeBgc:'',
     };
@@ -253,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: {
@@ -308,13 +341,27 @@ 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;
+      this.layout_style = getContainerPropsValue(container, "content.layout_style", "old");
+      this.isShowOrderNo = getContainerPropsValue(container, "content.isShowOrderNo", "Y");
       this.tabList = getContainerPropsValue(container, "content.orderTypeList", []).map((item) => {
         return {
           name: item.customName || item.label,

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

@@ -0,0 +1,267 @@
+<template>
+  <view class="xd-tfk-order-item">
+    <view class="o_header">
+      <view class="h_l">
+        <xd-font-icon
+          v-if="item.biz_code_icon"
+          :icon="item.biz_code_icon"
+          :size="item['biz_code_icon_size']"
+        ></xd-font-icon>
+        <view :class="{ marginLeft: item.biz_code_icon }" style="margin-left: 20rpx;">{{item.biz_code_name }}</view>
+      </view>
+      <view v-if="isShowOrderNo==='N'" class="o_status" :style="{
+        color:item.status.status_type !== 'error' ? mainColor : '#999999',
+      }">{{ item.status.status_name }}</view>
+    </view>
+    <view class="o_title" v-if="isShowOrderNo==='Y'">
+      <view class="o_number">订单编号:{{ item.main_order_id }}</view>
+      <view class="o_status" :style="{
+        color:item.status.status_type !== 'error' ? mainColor : '#999999',
+      }">{{ item.status.status_name }}</view>
+    </view>
+    <view class="prod_list">
+      <!-- 单个商品展示商品信息 -->
+      <template v-if="item.products.length == 1">
+        <view class="one_prod" v-for="Sitem in item.products" :key="Sitem.key">
+          <view class="prod_img">
+            <image :src="Sitem.product_thumb" style="background: #ffffff" mode="aspectFill"></image>
+          </view>
+          <view class="prod_info">
+            <view class="prod_name">{{ Sitem.product_name }}</view>
+            <view v-if="Sitem.brand_name" class="prod_brand" :style="{color: brandTextColor}">{{ Sitem.brand_name }}</view>
+            <view v-if="Sitem.product_sku_name" class="prod_sku">规格：{{ Sitem.product_sku_name }}</view>
+            <view class="prod_price">
+              <view>￥448</view>
+              <view class="info-price">
+                <text>x</text>
+                <text>{{ Sitem.product_num }}</text>
+              </view>
+            </view>
+          </view>
+        </view>
+      </template>
+
+      <!-- 多个商品展示更多商品信息 -->
+      <view v-if="item.products.length > 1" class="more_prod">
+        <view class="img_list">
+          <view class="prod_img" v-for="prod in item.products" :key="prod.key">
+            <image :src="prod.product_thumb" style="background: #ffffff" mode="aspectFit"></image>
+          </view>
+        </view>
+        <view class="right_arrow">
+          <xd-font-icon icon='iconxiangyou_xian' :size="26" color="#bdc0c5"></xd-font-icon>
+        </view>
+      </view>
+    </view>
+    <view class="prod_total">
+      <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}}件商品
+        <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">
+      <view style="flex: 1;"></view>
+      <view class="btn" 
+        v-for="(btn,index) in item.buttons" :key="btn.key"
+        @click="handleBtnEvent(btn.action, item)"
+      >{{btn.text}}</view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import XdFontIcon from "@/components/XdFontIcon/XdFontIcon"
+  import XdUnit from "@/components/XdUnit/XdUnit"
+  export default{
+    name:"XdTfkOrderItem",
+    components: {
+      XdFontIcon,
+      XdUnit,
+    },
+    props:{
+      item: Object,
+      mainColor: String,
+      isShowOrderNo: {
+        type: String,
+      },
+      brandTextColor: String
+    },
+    data(){
+      return{
+      }
+    },
+    methods:{
+      handleBtnEvent(action){
+        this.$emit('handleBtnEvent', action)
+      },
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+  .xd-tfk-order-item{
+    padding-left: 30rpx;
+    overflow: hidden;
+    .o_header{
+      height: 90rpx;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      border-bottom: 1px solid #EDEDED;
+      padding-right: 30rpx;
+      color: #333333;
+      font-size: 28rpx;
+
+      .h_l{
+        display: flex;
+        align-items: center;
+      }
+    }
+    .o_title{
+      height: 80rpx;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding-right: 30rpx;
+      color: #333333;
+      font-size: 24rpx;
+      border-bottom: 1px solid #EDEDED;
+    }
+    .one_prod{
+      display: flex;
+      align-items: center;
+      width: 100%;
+      padding: 30rpx 30rpx 30rpx 0;
+      box-sizing: border-box;
+      .prod_img{
+        width: 140rpx;
+        height: 140rpx;
+        background-color: #f5f5f9;
+        image{
+          width: 100%;
+          height: 100%;
+        }
+      }
+      .prod_info{
+        flex: 1;
+        padding-left: 30rpx;
+        .prod_name{
+          color: #2e2f30;
+          font-size: 30rpx;
+        }
+        .prod_brand{
+          font-size: 24rpx;
+          margin-top: 8rpx;
+        }
+        .prod_sku{
+          color: #797d82;
+          font-size: 24rpx;
+          margin-top: 8rpx;
+        }
+      }
+      .prod_price{
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        color: rgb(46, 47, 48);
+        font-size: 30rpx;
+        margin-top: 12rpx;
+        .info-price{
+          display: flex;
+          color: #bdc0c5;
+          font-size: 26rpx;
+        }
+      }
+    }
+    .prod_list{
+      position: relative;
+      .right_arrow{
+        position: absolute;
+        right: 0px;
+        height: 100%;
+        width: 60rpx;
+        top: 0;
+        background: #FFF;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+      }
+    }
+    .more_prod{
+      display: flex;
+      flex-wrap: nowrap;
+      overflow: auto;
+      padding: 30rpx 30rpx 30rpx 0;
+      width: 100%;
+      .img_list{
+        display: flex;
+        flex-wrap: nowrap;
+        padding-right: 60rpx;
+      }
+      .prod_img{
+        width: 140rpx;
+        height: 140rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        image{
+          width: 100%;
+          height: 100%;
+        }
+      }
+    }
+    .prod_total{
+      height: 80rpx;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding-right: 30rpx;
+      border-top: 1px solid #EDEDED;
+      color: #2e2f30;
+      font-size: 26rpx;
+      .serve_fee{
+        display: flex;
+        align-items: center;
+      }
+    }
+    .prod_footer{
+      padding: 16rpx 30rpx 16rpx 0;
+      display: flex;
+      align-items: center;
+      border-top: 1px solid #EDEDED;
+      .btn{
+        width: 170rpx;
+        height: 66rpx;
+        border: 1px solid #EDEDED;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        margin-left: 20rpx;
+        color: #2e2f30;
+        font-size: 24rpx;
+      }
+    }
+  }
+</style>

package/src/components/JfbBasePosterBigSmall/JfbBasePosterBigSmall.vue

@@ -19,10 +19,10 @@
         class="jfb-base-poster-big-small__body-wrap"
         :style="{
           margin: margin,
-          flexDirection: position === 1 ? 'row' : 'row-reverse',
         }"
         v-if="isShowAd"
       >
+        <!--大图-->
         <view
           v-if="isCarousel === 1"
           :style="{
@@ -98,6 +98,8 @@
           </xd-swiper-dot>
           <view v-if="isPreview" class="carousel-mask"></view>
         </view>
+        <!--大图-->
+        <!--小图-->
         <view
           :style="{
             width: bigWidth + 'rpx',
@@ -268,6 +270,7 @@
             </view>
           </view>
         </view>
+        <!--小图-->
       </view>
     </view>
   </view>
@@ -297,12 +300,7 @@ export default {
     return {
       params:{},
       height: 0, //组件高度
-      mS: {
-        top: 0,
-        bottom: 0,
-        left: 0,
-        right: 0,
-      }, //间距
+      mS: {}, //间距
       isPreview: false, //是否预览
       test: {
         content_id: "KpBbUKdj4aBejwe7Fh1ki",
@@ -364,9 +362,7 @@ export default {
   },
   computed: {
     margin() {
-      return `${this.mS.top || 0}rpx ${this.mS.right || 0}rpx ${
-        this.mS.bottom || 0
-      }rpx ${this.mS.left || 0}rpx`;
+      return this.getMarginAndPadding(this.mS, 0);
     },
     msMarginComputed() {
       if (this.position === 1) {
@@ -793,10 +789,11 @@ export default {
       // 获取大小图之间间距，如果没有则设置默认值
       this.msMargin = getContainerPropsValue(container, "content.msMargin", 10);
       // 获取安全区域宽度，减去margin的值，再除以2，获取大图宽度
-      this.bigWidth = getWidthHeight(this.height,this.mS,this.msMargin).bigWidth;
-      this.bigHeight = getWidthHeight(this.height,this.mS,this.msMargin).bigHeight;
+      this.bigWidth = getWidthHeight(this.height,this.mS,this.msMargin , this).bigWidth;
+      this.bigHeight = getWidthHeight(this.height,this.mS,this.msMargin, this).bigHeight;
       // 获取容器高度，减去margin的值，再除以2，获取小图高度
-      this.smallHeight = getWidthHeight(this.height,this.mS,this.msMargin).smallHeight;
+      this.smallHeight = getWidthHeight(this.height, this.mS, this.msMargin, this).smallHeight;
+
       // 获取大图数据
       this.isCarousel = getContainerPropsValue(
         container,
@@ -882,6 +879,10 @@ export default {
   &__body {
     &-wrap {
       display: flex;
+      justify-content: space-between;
+      align-items: flex-start;
+      border:1px solid red;
+      overflow: hidden;
     }
   }
 }