jufubao-base 1.0.181-beta9 → 1.0.182-beta1

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -129,6 +129,9 @@
                 v-for="(Ditem, Dindex) in info.film_show.detail.items"
                 :key="Dindex"
                 class="jfb-base-order-detail__body-delivery-bottom-item"
+                :style="{
+                  marginBottom: lineHeight + 'rpx'
+                }"
               >
                 <view style="width: 130rpx"
                   >{{ Ditem.label }} <span v-if="Ditem.label">:</span>
@@ -214,6 +217,9 @@
                 v-for="(Ditem, Dindex) in item.info"
                 :key="Dindex"
                 class="jfb-base-order-detail__body-delivery-bottom-item"
+                :style="{
+                  marginBottom: lineHeight + 'rpx'
+                }"
               >
                 <view style="width: 130rpx;display: flex;">
                   <view v-html="Ditem.label"></view>
@@ -510,6 +516,9 @@
             v-for="(item, index) in info.detail"
             :key="index"
             class="jfb-base-order-detail__body-order"
+            :style="{
+              marginBottom: lineHeight + 'rpx'
+            }"
           >
             <view :style="{ fontWeight: item.style }">
               <view style="display: flex;">
@@ -541,6 +550,9 @@
             <view
               v-if="item.type !== 'line'"
               class="jfb-base-order-detail__body-price"
+              :style="{
+                marginBottom: lineHeight + 'rpx'
+              }"
             >
               <view :style="{ fontWeight: item.style }">{{ item.label }}</view>
               <xd-unit
@@ -566,7 +578,7 @@
               ></xd-font-icon>
             </view>
             <view class="jfb-base-order-detail__body-show" v-else>
-              <text>使用{{ info.pay_info.cards.length }}张票券 收起</text>
+              使用{{ info.pay_info.cards.length }}张票券 收起
               <xd-font-icon
                 style="margin-left: 8rpx"
                 @click="showPayCard = false"
@@ -582,7 +594,7 @@
               :key="index"
             >
               <view>票券：{{ item.card_type_name }}</view>
-              <view class="list-item">
+              <view>
                 <view>编号：{{ item.card_number }}</view>
                 <xd-unit
                   :fontSize="28"
@@ -590,7 +602,6 @@
                   :price="item.card_use_point"
                   :unit="item['card_unit']"
                 ></xd-unit>
-                <view v-if="item['card_discount_use_point'] > 0" class="discount">已优惠:{{item['card_discount_use_point']}}</view>
               </view>
             </view>
           </view>
@@ -617,35 +628,6 @@
             </view>
           </view>
         </view>
-        <!--旅游模块-->
-        <view
-          v-if="info.extras &&
-          info.extras.travel_booking_info &&
-          info.extras.travel_booking_info['travelers'] &&
-          info.extras.travel_booking_info['travelers'].length > 0"
-          :style="{
-            background: backgroundColor,
-            border: borderBox,
-            borderRadius: radius + 'rpx',
-            boxShadow: shadowBox,
-            marginBottom: padding + 'rpx',
-          }"
-          class="jfb-base-order-detail__body-card jfb-base-order-detail__body-booking"
-        >
-          <view class="jfb-base-order-detail__body-delivery-bottom-title">预订信息</view>
-          <view class="jfb-base-order-detail__body-line"></view>
-          <view class="jfb-base-order-detail__body-booking-list">
-            <view v-for="(item,index) in info.extras.travel_booking_info.travelers" :key="index" class="jfb-base-order-detail__body-booking-list-item">
-              <view :style="{color:mainColor,background:bgColor}" class="jfb-base-order-detail__body-booking-list-item-num">游客{{index+1}}</view>
-              <view class="jfb-base-order-detail__body-booking-list-item-info">
-                <view class="jfb-base-order-detail__body-booking-list-item-info-name">{{item.name}}</view>
-                <view v-if="item.id_card_no" class="jfb-base-order-detail__body-booking-list-item-info-item">身份证：{{item.id_card_no}}</view>
-                <view v-if="item.mobile" class="jfb-base-order-detail__body-booking-list-item-info-item">手机号：{{item.mobile}}</view>
-              </view>
-            </view>
-          </view>
-        </view>
-        <!--旅游模块-->
         <view
           v-if="info.productDetail"
           class="jfb-base-order-detail__body-card jfb-base-order-detail__body-shop"
@@ -833,6 +815,7 @@ export default {
       },
       is_hot: "Y",
       logo: "",
+      lineHeight: 20,
 
       noticeBgc:'',
     };
@@ -926,17 +909,6 @@ export default {
         .then((res) => {
           this.biz_code = res.biz_code;
           this.is_not_show_price = res.is_not_show_price;
-
-          //旅游模块
-          if(res.extras && res.extras.travel_booking_info) {
-            try{
-              res.extras.travel_booking_info = JSON.parse(res.extras.travel_booking_info)
-            }catch(e){
-              res.extras.travel_booking_info = {}
-            }
-          }
-
-          //预览模块
           if (this.isPreview) {
             switch (this.viewStatus) {
               case "mall":
@@ -1001,12 +973,6 @@ export default {
                 item.card_use_point,
                 100
               );
-              if(item['card_discount_use_point'] !== undefined && item['card_discount_use_point'] > 0) {
-                item.card_discount_use_point = this.$xdUniHelper.divisionFloatNumber(
-                  item.card_discount_use_point,
-                  100
-                );
-              }
               return item;
             });
           res.codes =
@@ -1119,6 +1085,7 @@ export default {
       this.viewStatus = getContainerPropsValue(container, "content.viewStatus", "mall");
       this.is_show_support_shop = getContainerPropsValue(container, "content.is_show_support_shop", "N");
       this.is_show_delete_order = getContainerPropsValue(container, "content.is_show_delete_order", "N");
+      this.lineHeight = getContainerPropsValue(container, "content.lineHeight", 20);
     },
     getCountDown() {
       this.timer = setInterval(() => {
@@ -1706,37 +1673,6 @@ export default {
       }
     }
 
-    &-booking {
-      &-list {
-        &-item {
-          display: flex;
-          align-items: baseline;
-          margin-bottom: 40rpx;
-          &-num {
-            font-size: 24rpx;
-            margin-right: 24rpx;
-            width: 120rpx;
-            height: 50rpx;
-            text-align: center;
-            line-height: 50rpx;
-            border-radius: 16rpx;
-          }
-          &-info {
-            flex: 1;
-            &-name {
-              font-size: 32rpx;
-              margin-bottom: 20rpx;
-            }
-            &-item {
-              font-size: 24rpx;
-              color: #666;
-              margin-bottom: 16rpx;
-            }
-          }
-        }
-      }
-    }
-
     &-line {
       border-bottom: unit(2, rpx) solid #f2f2f2;
       margin-bottom: unit(40, rpx);
@@ -1782,22 +1718,5 @@ export default {
     border-radius: unit(12, rpx);
     padding: unit(14, rpx) unit(28, rpx);
   }
-
-  .list-item {
-    position: relative;
-
-    & > .discount {
-      position: absolute;
-      left:0;
-      right:0;
-      bottom:-20rpx;
-      height: 20rpx;
-      font-size: 20rpx;
-      line-height: 20rpx;
-      color: #aaa;
-      text-align: right;
-    }
-
-  }
 }
 </style>

package/src/components/JfbBaseOrderDetail/Mock.js

@@ -17,11 +17,6 @@ module.exports = {
       "loading": false,
       "loading_timeout": -1
     },
-    "extras": {
-      "first_logistics_package_id": "",
-      "logistics_count": 0,
-      "travel_booking_info": "{\"travelers\":[{\"name\":\"\\u6d4b\\u8bd5\",\"mobile\":\"18888888889\",\"id_card_no\":\"130102198304285898\",\"id_card_type\":\"1\"}]}"
-    },
     "film_show": {
       "name": "聚福宝-万里归途",
       "thumb": "https:\/\/p0.pipi.cn\/mmdb\/25bfd6ddb53c7e5015d23c5bc24d876c03d41.jpg?imageMogr2\/thumbnail\/1246x1246%3E",

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: '原有布局', value: 'old'},
+          {label: '淘福客布局', value: 'tfk'},
+        ],
+        groupKey: "content",
+      },
       {
         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',

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() {
@@ -239,6 +266,8 @@ export default {
         right: 0,
         bottom: 0,
       },
+      layout_style: "old",
+      isShowOrderNo: "Y",
 
       noticeBgc:'',
     };
@@ -315,6 +344,8 @@ export default {
 
       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,