jufubao-base 1.0.197-beta5 → 1.0.197-beta8

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: '内容圆角设置:',

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": [{