jufubao-mall 2.0.27-beta2 → 2.0.27-beta3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-mall",
-  "version": "2.0.27-beta2",
+  "version": "2.0.27-beta3",
   "private": false,
   "description": "聚福宝商城业务组件插件包",
   "main": "index.js",

package/src/components/JfbMallConfirm/JfbMallConfirm.vue

@@ -30,8 +30,8 @@
           <view v-if="showTopLine === 'B'" class="decorate" style="bottom: 0;"></view>
         </view>
         <view v-if="showBuyer == 'Y'" class="buyer_info section"  :style=[blockSectionStyleComp]>
-          <view>订购人信息</view>
-          <input v-model="buyer_phone_number" class="uni-input" :focus="true" placeholder="订购人手机号" />
+          <view>订购信息</view>
+          <input v-model="buyer_phone_number" class="uni-input" :focus="true" placeholder="请填写订购人手机号" />
         </view>
         <!-- 商品信息 -->
         <view class="prod_info_wrap">
@@ -49,7 +49,7 @@
                         prod_tit_one:prod.brand_name||prod.product_sku_name||(showActivityPrice==='Y'&&prod.is_activity==='Y')
                       }">{{prod.product_name}}</view>
                     <view class="prod_brand" :style="{color:brandTextColor}" v-if="prod.brand_name">{{prod.brand_name}}</view>
-                    <view class="prod_specs" v-if="prod.product_sku_name">{{prod.product_sku_name}}</view>
+                    <view class="prod_specs" v-if="prod.product_sku_name">规格：{{prod.product_sku_name}}</view>
                     <view class="prod_price">
                       <view style="display:flex;align-items:center">
                         <!-- <xd-unit :price="prod.sale_price" :isOld="false" color="#333" :iconSize="0.3" :fontSize="32"/> -->
@@ -80,11 +80,11 @@
                     range-key="label" :range="shop.support_delivery_method_options"
                     :value="shop.support_delivery_method_options.findIndex(ll => ll.value == shop.deliveryPickValue)"
                   >
-                    <view style="color: #999999;">{{shop.deliveryPickLabel || "选择配送方式"}}</view>
+                    <view style="color: #333333;">{{shop.deliveryPickLabel || "选择配送方式"}}</view>
                   </picker>
                 </xd-list-item>
                 <view>
-                  <xd-list-item v-if="shop.sub_show_delivery_price==='Y'" label="配送费" showBottom paddingLR="48rpx">
+                  <xd-list-item v-if="shop.sub_show_delivery_price==='Y'" label="配送费用" showBottom paddingLR="48rpx">
                     <xd-unit :price="shop.user_logistics_amount_origin" :isOld="false"></xd-unit>
                   </xd-list-item>
                   <xd-list-item v-if="shop.deliveryPickValue === 'samecity' && shop.is_support_delivery == 'Y'" :label="shop.time_label" showRight paddingLR="48rpx" @click="toSetSelectTime(shopIndex,shop)">
@@ -103,7 +103,10 @@
                   </view>
                 </view>
               </view>
-              <xd-list-item v-if="shop.delivery_message" :label="shop.delivery_message" paddingLR="48rpx" size="large"></xd-list-item>
+              <!-- <xd-list-item v-if="shop.delivery_message" :label="shop.delivery_message" paddingLR="48rpx" size="large"></xd-list-item> -->
+              <view v-if="showLogisticsTip === 'Y' && shop.deliveryPickValue === 'logistics'" class="logistics_tip">
+                {{logisticsTipText}}
+              </view>
               <view v-if="shop.is_support_delivery == 'N'" :style="{background:bgColor,color:warningColor}" class="err_message">
                 {{shop.message}}
               </view>
@@ -113,10 +116,10 @@
         <!-- 订单备注信息 -->
         <view v-if="showOrderComment == 'Y'" class="order_comment section" :style=[blockSectionStyleComp]>
           <view class="title">备注信息</view>
-          <textarea v-model="comment" :maxlength="50" type="textarea" placeholder="备注信息，限50字以内"/>
+          <input v-model="comment" class="order_market" :maxlength="200" placeholder="建议留言前先与平台沟通确认，最多只支持200字"/>
         </view>
         <!-- 展示vip -->
-        <view v-if="is_show_vip_card_list === 'Y'" class="section" :style=[blockSectionStyleComp]>
+        <view v-if="is_show_vip_card_list === 'Y'" class="section" style="overflow: hidden;" :style=[blockSectionStyleComp]>
           <cus-vip-list :list="vipCardList"
             :vip_card_id="vip_card_id"
             :plus_saving_money="orderFee.plus_saving_money"
@@ -137,7 +140,7 @@
           <view v-if="showPrice === 'Y' || otherPayMethod.filter(it => it.method!=='third').length" class="money_box">
             <template v-if="showPrice === 'Y'">
               <xd-list-item v-if="isShowPlusSavingMoney" label="PLUS专享立减" showBottom paddingLR="48rpx">
-                <view slot="label" style="color: #86541E;">PLUS专享立减</view>
+                <view slot="label" style="color: #7F5629;">PLUS专享立减</view>
                 <xd-unit :largeZero="false" :price="-orderFee.plus_saving_money" :isOld="false" :fontSize="28" :iconSize="0.3"></xd-unit>
               </xd-list-item>
               <xd-list-item v-if="showLogisticsDiscount&&main_show_delivery_price==='Y'" label="运费减免" :showBottom="!!showPayMethods.length" paddingLR="48rpx">
@@ -149,17 +152,20 @@
               <xd-list-item v-if="item.method === 'card'" :key="item.method" :label="item.show_name" paddingLR="48rpx" showBottom :showRight="!(choseCoupon && choseCoupon.cardPayPrice)" @click="toChoseCard">
                 <view slot="label">{{item.show_name}} <text v-if="choseCard && choseCard.cardPayPrice" style="color:red;margin-left: 4px;">(已选{{ choseCard.selectedCardList.length }}张)</text></view>
                 <view v-if="(choseCoupon && choseCoupon.cardPayPrice)">
-                  <view style="color:#CCCCCC;font-size: 20rpx">已使用其他票券，不可用</view>
+                  <view style="color:#CCCCCC;font-size: 24rpx">已使用其他票券，不可用</view>
                 </view>
                 <view v-else>
                   <!-- <view v-if="choseCard && choseCard.cardPayPrice" slot="label">{{item.show_name}} <text style="color:red;margin-left: 4px;">(已选{{ choseCard.selectedCardList.length }}张)</text></view> -->
                   <xd-unit v-if="choseCard && choseCard.cardPayPrice" :price="choseCard.cardPayPrice" :isOld="false" :fontSize="28" :iconSize="0.3"></xd-unit>
-                  <view v-else>请选择</view>
+                  <view v-else>{{cardList.length}}张可用</view>
                 </view>
               </xd-list-item>
               <xd-list-item v-if="item.method === 'wallet'" :key="item.method" :label="item.show_name" paddingLR="48rpx" showBottom :showRight="!(choseCoupon && choseCoupon.cardPayPrice)" @click="toChoseWallet">
+                <view slot="label">
+                  {{ item.show_name }}<text style="color:red;margin-left: 8px;font-size: 24rpx;">(剩余{{ wallet_total_amount }})</text>
+                </view>
                 <view v-if="(choseCoupon && choseCoupon.cardPayPrice)">
-                  <view style="color:#CCCCCC;font-size: 20rpx">已使用其他票券，不可用</view>
+                  <view style="color:#CCCCCC;font-size: 24rpx">已使用其他票券，不可用</view>
                 </view>
                 <view v-else>
                   <xd-unit v-if="choseWallet && choseWallet.walletPayPrice" :price='choseWallet.walletPayPrice' :isOld="false" :fontSize="28" :iconSize="0.3"></xd-unit>
@@ -171,19 +177,19 @@
                   {{item.show_name}} <text style="color:red;margin-left: 4px;">(已选{{ choseCoupon.selectedCardList.length }}张)</text>
                 </view>
                 <view v-else>
-                  <view style="color:#CCCCCC;font-size: 20rpx" v-if="(choseWallet && choseWallet.walletPayPrice)||(choseCard && choseCard.cardPayPrice)">已使用其他票券，不可用</view>
-                  <view v-else>请选择</view>
+                  <view style="color:#CCCCCC;font-size: 24rpx" v-if="(choseWallet && choseWallet.walletPayPrice)||(choseCard && choseCard.cardPayPrice)">已使用其他票券，不可用</view>
+                  <view v-else>{{couponList.length}}张可用</view>
                 </view>
               </xd-list-item>
             </template>
           </view>
           <view v-if="!is_plus_site && orderFee.total_amount && showPrice === 'Y'" class="money_box">
-            <xd-list-item label="订单总额" paddingLR="48rpx">
+            <xd-list-item label="订单金额" paddingLR="48rpx">
               <xd-unit :price="orderFee.total_amount" :isOld="false" :fontSize="28" :iconSize="0.3"></xd-unit>
             </xd-list-item>
           </view>
         </view>
-        <view :style="{height: '100rpx'}"></view>
+        <view :style="fixedBottomPlaceholder"></view>
         <!-- 靠低支付,  增加淘福客布局 -->
         <view class="fixe_bottom" :style="prod_bottom">
           <view class="fixed_bottom_body" :style="[bottomBoxStyle]">
@@ -245,12 +251,14 @@
             :addSettleCard="addSettleCard"
             @onChose="handleCardChose"
             @onAlert="handleCardChoseAlert"
+            @onInit="handleCardInit"
           >
           </xd-card-pay-chose>
         </template>
         <xd-wallet-chose
           v-if="payWallet"
           ref="xdWalletChose"
+          :defaultUseFirst="defaultUseWalletFirst"
           :hadChoseWallet="choseWallet && choseWallet.selectedWalletList"
           :layoutInfo="layoutInfo"
           :show.sync="showWalletChose"
@@ -258,6 +266,7 @@
           :useBindedWallet="useBindedWallet"
           @onChose="handleWalletChose"
           @onAlert="() => hasAlertCardChose = true"
+          @onInit="handleWalletInit"
         ></xd-wallet-chose>
         <cus-coupon-chose
           v-if="payCoupon"
@@ -276,6 +285,7 @@
           :getSettleListCoupons="getSettleListCoupons"
           :setSettleSelectCoupon="setSettleSelectCoupon"
           :layoutStyle="coupon_layout"
+          @onInit="handleCouponInit"
         ></cus-coupon-chose>
         <xd-select-time
           v-if="showSelectTime"
@@ -435,13 +445,16 @@
         showCardPayChoseWay: "",  //支付按钮： pay_btn; 选择票券：chose_card
         choseCard: null,
         hasAlertCardChose: false,
+        cardList: [],
 
         showWalletChose: false,
         choseWallet: null,
+        wallet_total_amount: "",
 
         //优惠券
         choseCoupon: null,
         showCouponChose: false,
+        couponList: [],
 
         //面板
         xnamespace: "",
@@ -505,6 +518,9 @@
         skipTip: "N",
         skipToPay: "",
         guidePay: "",
+        showLogisticsTip: "Y",
+        logisticsTipText: "",
+        checkPayMethod: [],
       }
     },
     computed: {
@@ -595,6 +611,10 @@
         })
         return flat;
       },
+      fixedBottomPlaceholder() {
+        let bottomHeight = this.bottomPadding.top + this.bottomPadding.bottom;
+        return this.fixedStyle({paddingBottom: 40 + bottomHeight, zIndex: 110}, 'bottom', false);
+      },
       prod_bottom() {
         return this.fixedStyle({height: 0, zIndex: 111});
       },
@@ -638,12 +658,8 @@
         return result;
       },
       bottomBoxStyle(){
-        let padding = `${this.checkValue(this.bottomPadding.top, 20)}rpx`;
-        padding = `${padding} ${this.checkValue(this.bottomPadding.right, 20)}rpx`;
-        padding = `${padding} ${this.checkValue(this.bottomPadding.bottom, 20)}rpx`;
-        padding = `${padding} ${this.checkValue(this.bottomPadding.left, 20)}rpx`;
         return {
-          padding: padding
+          padding: this.getMarginAndPadding(this.bottomPadding, 20)
         }
       },
       bodyStyleComp(){
@@ -673,8 +689,10 @@
           boxShadow: this.addrShadow,
           overflow: 'hidden'
         }
-       
         return style;
+      },
+      defaultUseWalletFirst(){
+        return this.checkPayMethod.includes('wallet');
       }
     },
     watch: {
@@ -773,6 +791,9 @@
         this.skipTip = getContainerPropsValue(container, "content.skipTip", "N");
         this.skipToPay = getContainerPropsValue(container, "content.skipToPay", "N");
         this.guidePay = getContainerPropsValue(container, "content.guidePay", "");
+        this.showLogisticsTip = gCPVal(container, 'showLogisticsTip', "Y");
+        this.logisticsTipText = gCPVal(container, 'logisticsTipText', '订单生成后72小时发货，如遇节假日发货顺延');
+        console.log("this.showLogisticsTip", this.showLogisticsTip);
         if(this.useMode === "market"){
           this.showPrice = "Y"
         }
@@ -786,9 +807,9 @@
 
         this.brandTextColor = gCPVal(container, 'brandTextColor', [this.mainColor], {sKey: "brandTextStatus", fields: ['brandTextColor']})
         this.blessFontSize = gCPVal(container, 'blessFontSize', [24], {sKey: 'formTipStatus', fields: ['blessFontSize', 'blessTextColor']});
-        this.blessTextColor = gCPVal(container, 'blessTextColor', [this.mainColor], {sKey: "formTipStatus", fields: ['blessFontSize', 'blessTextColor']});
+        this.blessTextColor = gCPVal(container, 'blessTextColor', [this.dangerColor], {sKey: "formTipStatus", fields: ['blessFontSize', 'blessTextColor']});
         this.priceTextColor = gCPVal(container, 'priceTextColor', [this.mainColor], {sKey: "activityPriceStatus", fields: ['priceTextColor']})
-        this.bottomPadding = gCPVal(container, 'bottomPadding', [0], {sKey: "bottomPaddingStatus", fields: ['bottomPadding']});
+        this.bottomPadding = gCPVal(container, 'bottomPadding', [20], {sKey: "bottomPaddingStatus", fields: ['bottomPadding']});
         this.bottomBtnRadius = gCPVal(container, 'bottomBtnRadius', [40], {sKey: "btnStyleStatus", fields: ['bottomBtnRadius', 'bottomBtnHeight', 'bottomPayText']});
         this.bottomBtnHeight = gCPVal(container, 'bottomBtnHeight', [60], {sKey: "btnStyleStatus", fields: ['bottomBtnRadius', 'bottomBtnHeight', 'bottomPayText']});
         this.bottomPayText = gCPVal(container, 'bottomPayText', ["支付"], {sKey: "btnStyleStatus", fields: ['bottomBtnRadius', 'bottomBtnHeight', 'bottomPayText']});
@@ -816,13 +837,15 @@
         this.bodyPadding = gCPVal(container,'bodyPadding', [0], {sKey:'bodyPaddingStatus',fields:['bodyPadding'],isPMR: true});
         
         this.radius = gCPVal(container, 'radius', [this.gStyleValue.radius, 0], {sKey: "radiusStatus", fields: ['radius']})||0
-        let blockShadow = gCPVal(container, 'blockShadow', [this.gStyleValue.shadow, {color: '#e5e5e5', width: '10'}], {sKey: "blockShadowStatus", fields: ['blockShadow']});
+        let blockShadow = gCPVal(container, 'blockShadow', ['none'], {sKey: "blockShadowStatus", fields: ['blockShadow']});
         this.blockShadow = blockShadow ? this.getBSStr(blockShadow, 'shadow') : 'none';
 
         this.addrRadius = gCPVal(container, 'addrRadius', [this.gStyleValue.radius, 0], {sKey:'addrRadiusStatus',fields:['addrRadius']})||0;
-        let addrShadow = gCPVal(container, 'addrShadow', [this.gStyleValue.shadow, {color: '#e5e5e5', width: '10'}], {sKey: "addrShadowStatus", fields: ['addrShadow']});
+        let addrShadow = gCPVal(container, 'addrShadow', ['none'], {sKey: "addrShadowStatus", fields: ['addrShadow']});
         this.addrShadow = addrShadow ? this.getBSStr(addrShadow, 'shadow') : 'none';
         this.coupon_layout = gCPVal(container, 'coupon_layout', ['1']);
+        this.checkPayMethod = gCPVal(container, 'checkPayMethod', []);
+        console.log("this.checkPayMethod", this.checkPayMethod);
 
         if(this.skipToPay === 'N'){
           this.hasAlertCardChose = true;
@@ -842,6 +865,9 @@
         console.log(this.choseWallet)
         this.showWalletChose = false;
       },
+      handleWalletInit(total){
+        this.wallet_total_amount = this.$xdUniHelper.divisionFloatNumber(total, 100);
+      },
 
       //only选择满减券
       toChoseCoupon(){
@@ -854,6 +880,9 @@
         this.choseCoupon = data;
         this.showCouponChose = false;
       },
+      handleCouponInit(coupList){
+        this.couponList = coupList;
+      },
 
       //only选择卡片
       toChoseCard(){
@@ -877,6 +906,9 @@
           duration: 0
         })
       },
+      handleCardInit(cardList){
+        this.cardList = cardList;
+      },
       getUserWalletList(cb){
         jfbRootExec("getUserWallet", {
           vm: this,
@@ -1579,6 +1611,9 @@
         display: flex;
         align-items: center;
         font-size: 28rpx;
+        ::v-deep .uni-input-placeholder{
+          color: #999999;
+        }
         .uni-input{
           font-size: 28rpx;
           height: 64rpx;
@@ -1590,6 +1625,14 @@
         }
       }
       .prod_info_wrap{
+        ::v-deep .uni-input-placeholder{
+          color: #999999;
+        }
+        .logistics_tip{
+          padding: 24rpx 48rpx;
+          font-size: 24rpx;
+          color: var(--g-theme-dangerColor);
+        }
         .err_message{
           padding: 20rpx 48rpx;
           font-size: 24rpx;
@@ -1653,7 +1696,7 @@
           }
         }
         .wish_comment{
-          padding: 0 48rpx 24rpx;
+          padding: 0 48rpx;
           input{
             background: #F7F7F7;
             height: 68rpx;
@@ -1663,7 +1706,7 @@
           }
           .bless_tip{
             font-size: 26rpx;
-            margin: 16rpx 0;
+            margin: 20rpx 0 24rpx;
           }
         }
       }
@@ -1673,14 +1716,18 @@
           font-size: 28rpx;
           margin-bottom: 24rpx;
         }
-        textarea{
+        .order_market{
           border-radius: 8rpx;
           box-sizing: border-box;
           background: #F7F7F7;
           width: 100%;
           padding: 20rpx;
-          height: 168rpx;
           font-size: unit(24,rpx);
+          height: 74rpx;
+
+          ::v-deep .uni-input-placeholder{
+            color: #999999;
+          }
         }
       }
       .fixe_bottom{

package/src/components/JfbMallConfirm/Mock.js

@@ -376,7 +376,7 @@ module.exports = {
       {
         repo_name: "仓库3",
         supplier_id: 61527,
-        delivery_method: "takeout",
+        delivery_method: "logistics",
         user_logistics_amount: 50,
         user_logistics_discount_id: "0",
         user_logistics_discount_name: "",

package/src/components/JfbMallConfirm/XdAddrDefault.vue

@@ -1,20 +1,22 @@
 <template>
   <view class="xd-addr-default">
     <view v-if="curAddr" class="addr_wrap">
-      <view class="icon_addr">
-        <xd-font-icon size="32" style="color: #B1B1B1;" icon="icondizhitubiao"></xd-font-icon>
-      </view>
       <view class="addr_info">
         <view class="addr_name">{{curAddr.name}} <text class="_phone">{{curAddr.phone}}</text></view>
         <view class="address-detail">
-          {{curAddr.province_name}}{{curAddr.city_name}}{{curAddr.area_name}}{{curAddr.street_name}}{{curAddr.address_detail}}{{curAddr.house_number}}
+          <view class="icon_wrap">
+            <xd-font-icon size="28" style="color: #999999;" icon="icondizhitubiao"></xd-font-icon>
+          </view>
+          <view style="flex:1;width: 500rpx;">
+            {{curAddr.province_name}}{{curAddr.city_name}}{{curAddr.area_name}}{{curAddr.street_name}}{{curAddr.address_detail}}{{curAddr.house_number}}
+          </view>
         </view>
         <view class="address-prompt-message">
           为方便您顺利收件，请填写真实姓名
         </view>
       </view>
       <view class="arrow_right">
-        <xd-font-icon size="32" style="color: #B1B1B1;" icon="iconxiangyou_xian"></xd-font-icon>
+        <!-- <xd-font-icon size="32" style="color: #B1B1B1;" icon="iconxiangyou_xian"></xd-font-icon> -->
       </view>
     </view>
     <view class="empty_addr" v-else>
@@ -57,7 +59,7 @@
     .addr_wrap{
       display: flex;
       align-items: center;
-      padding: 34rpx 0 34rpx 12rpx;
+      padding: 32rpx 0 32rpx 48rpx;
       .icon_addr{
         display: flex;
         width: 70rpx;
@@ -74,20 +76,31 @@
         flex: 1;
         width: 400rpx;
         .addr_name{
-          font-size: 30rpx;
-          color: #191a1b;
+          font-size: 28rpx;
+          font-weight: 500;
+          color: #333333;
+          padding-left: 44rpx;
         }
         ._phone{
-          color: #797d82;
           margin-left: 8rpx;
         }
         .address-detail{
-          font-size: 26rpx;
-          color: #797d82;
+          font-size: 28rpx;
+          color: #666666;
+          margin: 20rpx 0 8rpx;
+          display: flex;
+          align-items: flex-start;
+
+          .icon_wrap{
+            width: 44rpx;
+            padding: 8rpx 0 0 0rpx;
+            box-sizing: border-box;
+          }
         }
         .address-prompt-message{
-          font-size: 22rpx;
-          color: #baa27a;
+          font-size: 24rpx;
+          color: var(--g-theme-dangerColor);
+          padding-left: 44rpx;
         }
       }
     }

package/src/components/JfbMallConfirm/XdAddrOld.vue

@@ -51,7 +51,7 @@
       color: #333;
       font-weight: 500;
       .default_tag{
-        background: #FE7A63;
+        background: var(--g-theme-mainColor);
         font-size: 24rpx;
         font-weight: 400;
         padding: 8rpx 16rpx;

package/src/components/JfbMallConfirm/XdListItem.vue

@@ -24,7 +24,7 @@
         v-if="showRight"
         :style="{
           marginLeft: '10rpx',
-          color: '#B1B1B1'
+          color: rIconColor
         }"
         size="24"
         icon="iconxiangyou_xian"
@@ -52,7 +52,7 @@ export default {
     },
     paddingTB:{
       type: String,
-      default: "24rpx"
+      default: "20rpx"
     },
     paddingLR: {
       type: String,
@@ -81,6 +81,10 @@ export default {
     className: {
       type: String,
       default: ''
+    },
+    rIconColor: {
+      type: String,
+      default: '#333333'
     }
   }
 

package/src/components/JfbMallConfirm/cusAttr/content.js

@@ -9,6 +9,10 @@ import {
 } from "@/utils/AttrTools";
 
 export default function (data, gValue,gColor,oldData){
+  console.log("content data", data);
+  if(data.showTopLine === 'Y'){
+    data.showTopLine = 'T';
+  }
 
   return [
     {
@@ -82,7 +86,7 @@ export default function (data, gValue,gColor,oldData){
       label: "使用新票券",
       ele: "xd-radio",
       valueKey: "bindCard",
-      value: dataVal({data, key:'bindCard', dValue: "1", gValue}),
+      value: dataVal({data, key:'bindCard', dValue: "", gValue}),
       groupKey:'content',
       labelInline: true,
       inline: false,
@@ -106,6 +110,20 @@ export default function (data, gValue,gColor,oldData){
         {label: '不跳过', value: 'N'},
       ],
     },
+    {
+      label: "默认选中",
+      ele: 'xd-check',
+      valueKey: "checkPayMethod",
+      value: data.checkPayMethod,
+      groupKey: "content",
+      labelInline: true,
+      inline: false,
+      notice: "钱包与积分是否默认选中",
+      list: [
+        { label: "钱包", value: "wallet" },
+        { label: "积分", value: "score"}
+      ]
+    },
     {
       ele: 'title',
       label: '组件样式',
@@ -113,7 +131,7 @@ export default function (data, gValue,gColor,oldData){
       groupKey:'content',
     },
     {
-      label: "收货地址",
+      label: "地址样式",
       ele: "xd-style-image",
       groupKey: 'content',
       valueKey: "address_layout",
@@ -233,7 +251,7 @@ export default function (data, gValue,gColor,oldData){
     },
     {
       ele: 'title',
-      label: '显示内容',
+      label: '展示内容',
       size: 'small',
       groupKey:'content',
     },
@@ -303,6 +321,35 @@ export default function (data, gValue,gColor,oldData){
         tips:['显示','不显示'],
         isBackType: 'string'
       },
-    }
+    },
+    {
+      label: '快递提示',
+      ele: 'xd-cus-switch',
+      valueKey: 'showLogisticsTip',
+      value: dataVal({data, key:'showLogisticsTip', dValue: 'Y', gValue}),
+      className: 'input100',
+      groupKey:'content',
+      labelInline:true,
+      inline: false,
+      cusStyle:{marginBottom: '10px'},
+      setting: {
+        tips:['显示','不显示'],
+        isBackType: 'string'
+      },
+      notice:'仅针对配送方式为快递的商品展示',
+    },
+    {ele: 'group_start'},
+    {
+      label: "",
+      ele: "el-input",
+      valueKey: "logisticsTipText",
+      value: dataVal({data, key:'logisticsTipText', dValue: '', gValue}),
+      hidden: data.showLogisticsTip === 'N',
+      labelInline: true,
+      className: 'input100',
+      placeholder: '订单生成后72小时发货，如遇节假日发货顺延',
+      groupKey:'content',
+    },
+    {ele: 'group_end'},
   ].filter(i=>i)
 }