jufubao-mall 2.0.33 → 2.0.35-beta1

package/src/components/JfbMallConfirm/JfbMallConfirm.vue

@@ -15,16 +15,10 @@
       </view>
     </view>
     <!-- #endif -->
-    <view class="jfb-mall-confirm__body" :style="{
-      minHeight: layoutInfo.bodyMinHeight,
-      '--main-color': mainColor,
-      '--section-height': sectionHeight + 'px',
-      '--order-line-height': (orderInfoHeight * $rpxNum) + 'px',
-      '--money-box-height': moneyBoxHeight + 'px'
-    }">
+    <view class="jfb-mall-confirm__body" :style="[bodyStyleComp]">
       <template>
-        <view class="section">
-          <view v-if="showTopLine === 'Y'" class="decorate"></view>
+        <view class="section" :style="[addrStyleComp]">
+          <view v-if="showTopLine === 'T'" class="decorate" style="top:0;"></view>
           <view v-if="show_pick_up_address==='Y'" @click="toAddress('Y')">
             <xd-addr-old v-if="address_layout==='old'" :curAddr="curCacheAddr"></xd-addr-old>
             <xd-addr-default v-else :curAddr="curCacheAddr"></xd-addr-default>
@@ -33,14 +27,15 @@
             <xd-addr-old v-if="address_layout==='old'" :curAddr="curAddr"></xd-addr-old>
             <xd-addr-default v-else :curAddr="curCacheAddr"></xd-addr-default>
           </view>
+          <view v-if="showTopLine === 'B'" class="decorate" style="bottom: 0;"></view>
         </view>
-        <view v-if="showBuyer == 'Y'" class="buyer_info section">
-          <view>订购人信息</view>
-          <input v-model="buyer_phone_number" class="uni-input" :focus="true" placeholder="订购人手机号" />
+        <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 class="prod_info_wrap">
-          <view v-for="(shop, shopIndex) in shopList" :key="shopIndex" class="shop_item section">
+          <view v-for="(shop, shopIndex) in shopList" :key="shopIndex" class="shop_item section"  :style=[blockSectionStyleComp]>
             <view class="shop_name">{{shop.repo_name || "未命名"}}</view>
             <view class="prod_list">
               <view v-for="(prod,i) in shop.product" :key="i">
@@ -54,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"/> -->
@@ -78,50 +73,55 @@
                 </view>
               </view>
             </view>
-              <!-- 配送信息 -->
-              <view v-if="shop.support_delivery_method_options.length" class="delivery">
-                <xd-list-item v-if="shop.sub_show_delivery_method==='Y'" label="配送方式" showRight paddingLR="60rpx" showBottom size="large">
-                  <picker @change="e => bindPickerChange(e, shopIndex)"
-                    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>
-                  </picker>
+            <!-- 配送信息 -->
+            <view v-if="shop.support_delivery_method_options.length" class="delivery">
+              <xd-list-item v-if="shop.sub_show_delivery_method==='Y'" label="配送方式" showRight :paddingLR="isCardLayout ? '32rpx' : '48rpx'" paddingTB="24rpx" showBottom size="large" class="xd-my-list-item">
+                <picker @change="e => bindPickerChange(e, shopIndex)"
+                  range-key="label" :range="shop.support_delivery_method_options"
+                  :value="shop.support_delivery_method_options.findIndex(ll => ll.value == shop.deliveryPickValue)"
+                >
+                  <view style="color: #333333;">{{shop.deliveryPickLabel || "选择配送方式"}}</view>
+                </picker>
+              </xd-list-item>
+              <template>
+                <xd-list-item v-if="shop.sub_show_delivery_price==='Y'" label="配送费用" showBottom :paddingLR="isCardLayout ? '32rpx' : '48rpx'" paddingTB="24rpx" class="xd-my-list-item">
+                  <xd-unit :price="shop.user_logistics_amount_origin" :fontSize="28" :isOld="false"></xd-unit>
+                </xd-list-item>
+                <xd-list-item v-if="shop.deliveryPickValue === 'samecity'" class="xd-my-list-item"
+                  :label="shop.time_label" showRight :paddingLR="isCardLayout ? '32rpx' : '48rpx'" paddingTB="24rpx" showBottom
+                  @click="toSetSelectTime(shopIndex,shop)">
+                  {{shop.selectTime ? shop.selectTime.dateTime : "请选择"}}
                 </xd-list-item>
-                <view>
-                  <xd-list-item v-if="shop.sub_show_delivery_price==='Y'" label="配送费" paddingLR="60rpx">
-                    <xd-unit :price="shop.user_logistics_amount_origin" :isOld="false"></xd-unit>
+                <template v-if="shop.deliveryPickValue === 'takeout'" >
+                  <!-- 配送方式：到店自提 -->
+                  <xd-list-item label="选择门店" show-right :paddingLR="isCardLayout ? '32rpx' : '48rpx'" paddingTB="24rpx" showBottom @click="toSetSelectShop(shopIndex)" class="xd-my-list-item">
+                  <view style="text-overflow: ellipsis;overflow: hidden;white-space: nowrap;width: 460rpx;text-align: right;">
+                    {{shop.choseShop ? shop.choseShop.resource_shop_name : "请选择"}}
+                  </view>
                   </xd-list-item>
-                  <xd-list-item v-if="shop.deliveryPickValue === 'samecity' && shop.is_support_delivery == 'Y'" :label="shop.time_label" showRight paddingLR="60rpx" @click="toSetSelectTime(shopIndex,shop)">
-                    {{shop.selectTime ? shop.selectTime.dateTime : "请选择"}}
+                  <xd-list-item v-if="shop.takeoutTimeList" :label="shop.time_label" show-right :paddingLR="isCardLayout ? '32rpx' : '48rpx'" paddingTB="24rpx" @click="toSetTakeoutTime(shopIndex,shop)" class="xd-my-list-item">
+                    <view style="">{{shop.takeoutTime ? shop.takeoutTime.dateTime : '请选择'}}</view>
                   </xd-list-item>
-                  <view v-if="shop.deliveryPickValue === 'takeout'" >
-                    <!-- 配送方式：到店自提 -->
-                    <xd-list-item label="选择门店" show-right paddingLR="60rpx" @click="toSetSelectShop(shopIndex)">
-                    <view style="color: #999999;">
-                      {{shop.choseShop ? shop.choseShop.resource_shop_name : "请选择"}}
-                    </view>
-                    </xd-list-item>
-                    <xd-list-item v-if="shop.takeoutTimeList" :label="shop.time_label" show-right paddingLR="60rpx" @click="toSetTakeoutTime(shopIndex,shop)">
-                      <view style="color: #999999;">{{shop.takeoutTime ? shop.takeoutTime.dateTime : '请选择'}}</view>
-                    </xd-list-item>
-                  </view>
-                </view>
-              </view>
-              <xd-list-item v-if="shop.delivery_message" :label="shop.delivery_message" paddingLR="60rpx" size="large"></xd-list-item>
-              <view v-if="shop.is_support_delivery == 'N'" :style="{background:bgColor,color:warningColor}" class="err_message">
-                {{shop.message}}
-              </view>
+                </template>
+              </template>
+            </view>
+            <!-- <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>
           </view>
         </view>
 
         <!-- 订单备注信息 -->
-        <view v-if="showOrderComment == 'Y'" class="order_comment section">
+        <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="50" placeholder="建议留言前先与平台沟通确认，最多只支持50字"/>
         </view>
         <!-- 展示vip -->
-        <view v-if="is_show_vip_card_list === 'Y'" class="section">
+        <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"
@@ -130,67 +130,68 @@
 
         <!-- 订单费用详情 -->
         <!-- 礼包不显示订单信息 -->
-        <view class="order_fee">
+        <view class="order_fee" :style=[blockSectionStyleComp]>
           <view v-if="showPrice === 'Y'" class="money_box">
-            <xd-list-item label="商品价格" paddingLR="60rpx" size="small">
-              <xd-unit :price="gift_id ? orderFee.product_amount : orderFee.origin_amount" :isOld="false" :fontSize="24" :iconSize="0.3"></xd-unit>
+            <xd-list-item v-if="showProductPrice" label="商品价格" :paddingLR="isCardLayout ? '32rpx' : '48rpx'" :showBottom="showLogisticsAmount&&main_show_delivery_price==='Y'">
+              <xd-unit :price="gift_id ? orderFee.product_amount : orderFee.origin_amount" :isOld="false" :fontSize="28" :iconSize="0.3"></xd-unit>
             </xd-list-item>
-            <xd-list-item v-if="showLogisticsAmount&&main_show_delivery_price==='Y'" label="商品运费" paddingLR="60rpx" paddingTB="0" size="small">
-              <xd-unit :price="orderFee.user_logistics_amount_origin" :isOld="false" :fontSize="24" :iconSize="0.3"></xd-unit>
+            <xd-list-item v-if="showLogisticsAmount&&main_show_delivery_price==='Y'" label="商品运费" :paddingLR="isCardLayout ? '32rpx' : '48rpx'">
+              <xd-unit :price="orderFee.user_logistics_amount_origin" :isOld="false" :fontSize="28" :iconSize="0.3"></xd-unit>
             </xd-list-item>
           </view>
           <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="60rpx" size="small">
-                <view slot="label" style="color: #86541E;">PLUS专享立减</view>
-                <xd-unit :largeZero="false" :price="-orderFee.plus_saving_money" :isOld="false" :fontSize="24" :iconSize="0.3"></xd-unit>
+              <xd-list-item v-if="isShowPlusSavingMoney" label="PLUS专享立减" showBottom :paddingLR="isCardLayout ? '32rpx' : '48rpx'">
+                <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="60rpx" size="small">
-                <xd-unit :largeZero="false" :price="-orderFee.user_logistics_discount_amount" :isOld="false" :fontSize="24" :iconSize="0.3"></xd-unit>
+              <xd-list-item v-if="showLogisticsDiscount&&main_show_delivery_price==='Y'" label="运费减免" :showBottom="!!showPayMethods.length" :paddingLR="isCardLayout ? '32rpx' : '48rpx'">
+                <xd-unit :largeZero="false" :price="-orderFee.user_logistics_discount_amount" :isOld="false" :fontSize="28" :iconSize="0.3"></xd-unit>
               </xd-list-item>
             </template>
-            <!-- <xd-list-item label="账户余额" paddingLR="60rpx" size="small" showRight>
-              <view>45.00</view>
-            </xd-list-item> -->
+
             <template v-for="item in otherPayMethod">
-              <xd-list-item v-if="item.method === 'card'" :key="item.method" :label="item.show_name" paddingLR="60rpx" size="small" :showRight="!(choseCoupon && choseCoupon.cardPayPrice)" @click="toChoseCard">
+              <xd-list-item v-if="item.method === 'card'" :key="item.method" :label="item.show_name" :paddingLR="isCardLayout ? '32rpx' : '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="24" :iconSize="0.3"></xd-unit>
-                  <view v-else>请选择</view>
+                  <xd-unit v-if="choseCard && choseCard.cardPayPrice" :price="choseCard.cardPayPrice" :isOld="false" :fontSize="28" :iconSize="0.3"></xd-unit>
+                  <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="60rpx" size="small" :showRight="!(choseCoupon && choseCoupon.cardPayPrice)" @click="toChoseWallet">
+              <xd-list-item v-if="item.method === 'wallet'" :key="item.method" :label="item.show_name" :paddingLR="isCardLayout ? '32rpx' : '48rpx'" showBottom :showRight="!(choseCoupon && choseCoupon.cardPayPrice)" @click="toChoseWallet">
+                <view slot="label">
+                  {{ item.show_name }}<text :style="{color:mainColor}" style="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="24" :iconSize="0.3"></xd-unit>
+                  <xd-unit v-if="choseWallet && choseWallet.walletPayPrice" :price='choseWallet.walletPayPrice' :isOld="false" :fontSize="28" :iconSize="0.3"></xd-unit>
                   <view v-else>请选择</view>
                 </view>
               </xd-list-item>
-              <xd-list-item v-if="item.method === 'coupon'" :key="item.method" :label="item.show_name" paddingLR="60rpx" size="small" :showRight="!(choseCard && choseCard.cardPayPrice)" @click="toChoseCoupon">
+              <xd-list-item v-if="item.method === 'coupon'" :key="item.method" :label="item.show_name" :paddingLR="isCardLayout ? '32rpx' : '48rpx'" showBottom :showRight="!(choseCard && choseCard.cardPayPrice)" @click="toChoseCoupon">
                 <view v-if="(choseCoupon && choseCoupon.cardPayPrice)" slot="label">
                   {{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="60rpx" size="small">
-              <xd-unit :price="orderFee.total_amount" :isOld="false" :fontSize="24" :iconSize="0.3"></xd-unit>
+            <xd-list-item label="订单金额" :paddingLR="isCardLayout ? '32rpx' : '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]">
@@ -204,12 +205,16 @@
             </view>
             <view v-else class="flex_l" :style="{
               justifyContent: bottomPricePosition
-            }">实付：<xd-unit :price="orderNeedPayPrice" :isOld="false"></xd-unit>
+            }">
+              <view>
+                <view class="t_price">实付：<xd-unit :price="orderNeedPayPrice" :isOld="false"></xd-unit></view>
+                <view v-if="orderDiscountPrice > 0" class="b_price">共省<xd-unit :price="orderDiscountPrice" :isOld="false" :fontSize="24" :iconSize="0.3"></xd-unit></view>
+              </view>
             </view>
             <view>
               <xd-button :disabled="is_can_buy!=='Y'"
                 :radius="bottomBtnRadius + 'rpx'"
-                :style="{
+                :cusStyle="{
                   height: bottomBtnHeight + 'rpx',
                   lineHeight: bottomBtnHeight + 'rpx',
                 }"
@@ -252,12 +257,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"
@@ -265,15 +272,9 @@
           :useBindedWallet="useBindedWallet"
           @onChose="handleWalletChose"
           @onAlert="() => hasAlertCardChose = true"
+          @onInit="handleWalletInit"
         ></xd-wallet-chose>
         <cus-coupon-chose
-          :couponRadius="couponRadius"
-          :couponImageUrl="couponImageUrl"
-          :couponTitleBgColor="couponTitleBgColor"
-          :couponUseBtnPadding="couponUseBtnPadding"
-          :couponBtnRadius="couponBtnRadius"
-          :couponBtnTextStyle="couponBtnTextStyle"
-          :couponLeftBgColor="couponLeftBgColor"
           v-if="payCoupon"
           ref="xdCouponChose"
           :hadChoseCoupon="choseCoupon && choseCoupon.selectedCardList"
@@ -289,6 +290,8 @@
           :orderNeedPayPrice="orderNeedPayPrice"
           :getSettleListCoupons="getSettleListCoupons"
           :setSettleSelectCoupon="setSettleSelectCoupon"
+          :layoutStyle="coupon_layout"
+          @onInit="handleCouponInit"
         ></cus-coupon-chose>
         <xd-select-time
           v-if="showSelectTime"
@@ -314,7 +317,7 @@
         ></xd-select-time>
         <xd-down-drawer
           :show.sync="showShopList"
-          height="60vh"
+          height="45vh"
         >
           <template v-if="showShopList">
             <view :style="{height: '100rpx'}"></view>
@@ -363,7 +366,7 @@
   import JfbMallConfirmMixin from "./JfbMallConfirmMixin";
   import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins"
-  import { getContainerPropsValue } from "@/utils/xd.base";
+  import { getContainerPropsValue, gCPVal } from "@/utils/xd.base";
   import getServiceUrl from "@/common/getServiceUrl"
   import OrderMixin from "./orderMixin"
   import { mapState } from "vuex"
@@ -372,6 +375,9 @@
   import CusPrice from '@/components/CusPrice/CusPrice'
   import CusVipList from "@/components/CusVipList/CusVipList"
   export default {
+    // #ifdef MP-WEIXIN
+    options: { styleIsolation: 'shared' },
+    // #endif
     name: "JfbMallConfirm",
     components: {
       XdFontIcon,
@@ -395,6 +401,7 @@
     data() {
       return {
         closeMask:true,
+        isPreview: false,
         isVip: false,
         keyword:'',
         page_size: 10,
@@ -418,7 +425,7 @@
         scene: "",
         buyer_phone_number: "", //订购人手机号
         comment: "",  //订单备注
-
+        optionsBlessing: {},
 
         gift_id: "",
         gift_mode: "",
@@ -447,13 +454,18 @@
         showCardPayChoseWay: "",  //支付按钮： pay_btn; 选择票券：chose_card
         choseCard: null,
         hasAlertCardChose: false,
+        cardList: [],
 
         showWalletChose: false,
         choseWallet: null,
+        wallet_total_amount: "",
 
         //优惠券
         choseCoupon: null,
         showCouponChose: false,
+        couponList: [],
+
+        fixedBottomBodyHeight: 0,
 
         //面板
         xnamespace: "",
@@ -474,9 +486,9 @@
         blessFontSize: 24,  //动态输入语提示字体大小
         brandTextColor:'',
         address_layout: 'old',
-        sectionHeight: 8,
+        sectionHeight: 16,
         orderInfoHeight: 16,
-        showTopLine: "N",
+        showTopLine: "B",
         blessTextColor: "",
         priceTextColor: "",
         bottomPadding: {},
@@ -485,6 +497,18 @@
         bottomPayText: "",
         bottomPricePosition: "",
 
+        bodyPadding: {},
+
+        cont_style: "",
+        isCardLayout: false,
+        lrPadding: {},
+        radius: 0,
+        blockShadow: '',
+
+        addrLrPadding: {},
+        addrRadius: 0,
+        addrShadow: '',
+
         //优惠券
         couponBtnRadius: 16,
         couponLeftBgColor: "",
@@ -493,6 +517,7 @@
         couponUseBtnPadding: {},
         couponImageUrl: "",
 		    moneyBoxHeight: 16,
+        coupon_layout: '1',
 
         show_pick_up_address: 'N', //显示取货地址
         show_receive_address: 'Y', //显示收货地址
@@ -505,6 +530,11 @@
         is_plus_site: false,
         skipTip: "N",
         skipToPay: "",
+        guidePay: "",
+        showLogisticsTip: "Y",
+        logisticsTipText: "",
+        checkPayMethod: [],
+        ticketPositionStatus: "N"
       }
     },
     computed: {
@@ -514,6 +544,10 @@
         brandInfo: state => state.brandInfo,
         siteInfo: state => state.siteInfo,
       }),
+      showProductPrice(){
+        let price = this.gift_id ? this.orderFee.product_amount : this.orderFee.origin_amount;
+        return price;
+      },
       //是否展示plus立减
       isShowPlusSavingMoney(){
         if(this.is_show_vip_card_list === 'Y') return this.vip_card_id;
@@ -595,6 +629,11 @@
         })
         return flat;
       },
+      fixedBottomPlaceholder() {
+        return {
+          height: (this.fixedBottomBodyHeight + 14) + 'px'
+        }
+      },
       prod_bottom() {
         return this.fixedStyle({height: 0, zIndex: 111});
       },
@@ -637,15 +676,57 @@
         let result = this.$xdUniHelper.cutFloatNumber(total_amount, total);
         return result;
       },
+      orderDiscountPrice(){
+        let total = 0;
+        if(this.orderFee.user_logistics_discount_amount){
+          total = this.$xdUniHelper.addFloatNumber(total, this.orderFee.user_logistics_discount_amount);
+        }
+        if(this.isShowPlusSavingMoney){
+          total = this.$xdUniHelper.addFloatNumber(total, this.orderFee.plus_saving_money);
+        }
+        return total;
+      },
       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, 16)
+        }
+      },
+      bodyStyleComp(){
+        let defaultStr = '{"spacing":16,"margin":{"bottom":0,"top":0,"left":16,"right":16},"backgroundColor": "rgba(245, 245, 245, 1)"}';
+        let isCard = this.cont_style === defaultStr;
+        console.log( 'bodyStyleComp', isCard);
+        return {
+          minHeight: this.layoutInfo.bodyMinHeight,
+          '--main-color': this.mainColor,
+          '--section-height': (this.sectionHeight * this.$rpxNum) + 'px',
+          '--order-line-height': (this.orderInfoHeight * this.$rpxNum) + 'px',
+          '--money-box-height': (this.moneyBoxHeight * this.$rpxNum) + 'px',
+          '--cont-lr-padding': isCard ? '16px' : '24px',
+          padding: this.getMarginAndPadding(this.bodyPadding,0),
+        }
+      },
+      blockSectionStyleComp(){
+        return {
+          marginLeft: this.lrPadding.left + 'rpx',
+          marginRight: this.lrPadding.right + 'rpx',
+          borderRadius: this.radius + 'rpx',
+          boxShadow: this.blockShadow,
         }
       },
+      addrStyleComp(){
+        let style =  {
+          marginLeft: this.addrLrPadding.left + 'rpx',
+          marginRight: this.addrLrPadding.right + 'rpx',
+          marginTop: this.addrLrPadding.top + 'rpx',
+          borderRadius: this.addrRadius + 'rpx',
+          boxShadow: this.addrShadow,
+          overflow: 'hidden'
+        }
+        return style;
+      },
+      defaultUseWalletFirst(){
+        return this.checkPayMethod.includes('wallet');
+      }
     },
     watch: {
       container(value,oldValue) {
@@ -681,6 +762,7 @@
       }
     },
     created() {
+      this.isPreview = this.$configProject['isPreview'];
       this.is_plus_site = this.projectAttr.headers['X-Site-Group']==="vip";
       this.init(this.container);
       this.isVip = this.getTokenForKey('user_level') === 'VIP';
@@ -692,8 +774,15 @@
         this.order_id = options.order_id || '';
         this.gift_id = options['gift_partner'] || "";
         this.gift_mode = options.mode || "";
-
         this.scene = options.scene || "";
+        //祝福语从链接参数传递过来
+        if(options.blessing){
+          try{
+            this.optionsBlessing = JSON.parse(Base64.decode(options.blessing));
+          }catch(e){
+            console.error("blessing解析失败", e);
+          }
+        }
 
         await this.p_getAddrList(); //收货
         await this.p_getCacheAddrList(); //取货
@@ -725,45 +814,93 @@
         this.paySuccessPath = getContainerPropsValue(container, 'content.paySuccessPath', {value: ""}).value;
         this.choseCityPath = getContainerPropsValue(container, 'content.choseCityPath',{value: "/system/system/city"}).value;
         this.preview = getContainerPropsValue(container, 'content.preview', "N");
-        this.blessFontSize = getContainerPropsValue(container, 'content.blessFontSize', "24");
+        
         this.showActivityPrice = getContainerPropsValue(container, 'content.showActivityPrice', 'N');
         this.bindCard = getContainerPropsValue(container,"content.bindCard","1");
 	      this.useMode = getContainerPropsValue(container, 'content.useMode', "market");
         this.showPrice = getContainerPropsValue(container, 'content.showPrice', "Y");
-        this.brandTextColor = getContainerPropsValue(container, "content.brandTextColor", this.mainColor);
         this.address_layout = getContainerPropsValue(container, 'content.address_layout', "old");
-        this.sectionHeight = getContainerPropsValue(container, 'content.sectionHeight', "8");
-        this.orderInfoHeight = getContainerPropsValue(container, 'content.orderInfoHeight', "16");
-        this.showTopLine = getContainerPropsValue(container, 'content.showTopLine', "N");
-        this.blessTextColor = getContainerPropsValue(container, 'content.blessTextColor', this.mainColor);
-        this.priceTextColor = getContainerPropsValue(container, 'content.priceTextColor', this.mainColor);
-        this.bottomPadding = getContainerPropsValue(container, 'content.bottomPadding', {});
-        this.bottomBtnRadius = getContainerPropsValue(container, 'content.bottomBtnRadius', "");
-        this.bottomBtnHeight = getContainerPropsValue(container, 'content.bottomBtnHeight', 60);
-        this.bottomPayText = getContainerPropsValue(container, 'content.bottomPayText', "支付");
-        this.bottomPricePosition = getContainerPropsValue(container, 'content.bottomPricePosition', "left");
+        this.showTopLine = getContainerPropsValue(container, 'content.showTopLine', "B");
+        this.skipTip = getContainerPropsValue(container, "content.skipTip", "N");
+        this.skipToPay = getContainerPropsValue(container, "content.skipToPay", "Y");
+        this.guidePay = getContainerPropsValue(container, "content.guidePay", "");
+        this.showLogisticsTip = gCPVal(container, 'showLogisticsTip', "Y");
+        this.logisticsTipText = gCPVal(container, 'logisticsTipText', '订单生成后72小时发货，如遇节假日发货顺延');
+        this.ticketPositionStatus = gCPVal(container, 'ticketPositionStatus', "N")
+        console.log("this.showLogisticsTip", this.showLogisticsTip);
         if(this.useMode === "market"){
           this.showPrice = "Y"
         }
 
-        this.couponBtnRadius = getContainerPropsValue(container, "content.couponBtnRadius", 16);
-        this.couponUseBtnPadding = getContainerPropsValue(container, "content.couponUseBtnPadding", {top: 20, left: 20, right: 20, bottom: 20});
-        this.couponBtnTextStyle = getContainerPropsValue(container, "content.couponBtnTextStyle", {
-          color: '#fff',
-          bgColor: '#ff5722',
-          fontSize: '30rpx',
-          fontWeight: 'normal'
-        });
-        this.couponTitleBgColor = getContainerPropsValue(container, "content.couponTitleBgColor", 'rgba(255, 87, 51, 0.1)');
-        this.couponRadius = getContainerPropsValue(container, "content.couponRadius", 16);
-        this.couponLeftBgColor = getContainerPropsValue(container, "content.couponLeftBgColor", "linear-gradient(180deg, #FFA852 0%, #FF5733 100%)");
-        this.couponImageUrl = getContainerPropsValue(container, "content.couponImageUrl", "");
-        this.moneyBoxHeight = getContainerPropsValue(container, "content.moneyBoxHeight", 16);
-        this.skipTip = getContainerPropsValue(container, "content.skipTip", "N");
-        this.skipToPay = getContainerPropsValue(container, "content.skipToPay", "N");
-        if(this.skipToPay === 'Y'){
+        let contStyle = this.getRelationStatus(container,'cont_style',{ sectionHeightStatus: ['sectionHeight'], lrPaddingStatus: ['lrPadding'] }, `{"spacing":16,"margin":{"bottom":0,"top":0,"left":16,"right":16},"backgroundColor": "rgba(245, 245, 245, 1)"}`);
+        this.cont_style = contStyle;
+        this.isCardLayout = '{"spacing":16,"margin":{"bottom":0,"top":0,"left":16,"right":16},"backgroundColor": "rgba(245, 245, 245, 1)"}' === contStyle;
+        this.sectionHeight = gCPVal(container, 'sectionHeight', [16], {sKey: "sectionHeightStatus", fields: ['sectionHeight'], cusFields: ['cont_style', 'spacing', contStyle]});
+        this.lrPadding = gCPVal(container, 'lrPadding', [0], {sKey:'lrPaddingStatus',fields:['lrPadding'],isPMR: true, cusFields: ['cont_style', 'margin', contStyle]})
+
+        let addrStyle = this.getRelationStatus(container,'addr_style',{ addrLrPaddingStatus: ['addrLrPadding'] }, `{"margin":{"bottom":0,"top":16,"left":16,"right":16}}`);
+        this.addrLrPadding = gCPVal(container, 'addrLrPadding', [0], {sKey:'addrLrPaddingStatus',fields:['addrLrPadding'],isPMR: true, cusFields: ['addr_style', 'margin', addrStyle]});
+
+        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.dangerColor], {sKey: "formTipStatus", fields: ['blessFontSize', 'blessTextColor']});
+        this.priceTextColor = gCPVal(container, 'priceTextColor', [this.mainColor], {sKey: "activityPriceStatus", fields: ['priceTextColor']})
+        this.bottomPadding = gCPVal(container, 'bottomPadding', [16], {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']});
+        this.bottomPricePosition = gCPVal(container, 'bottomPricePosition', ['flex-start'], {sKey: "btnPriceStatus", fields: ['bottomPricePosition']});
+
+        //优惠券样式升级为不在面板设置
+        // this.couponBtnRadius = getContainerPropsValue(container, "content.couponBtnRadius", 16);
+        // this.couponUseBtnPadding = getContainerPropsValue(container, "content.couponUseBtnPadding", {top: 20, left: 20, right: 20, bottom: 20});
+        // this.couponBtnTextStyle = getContainerPropsValue(container, "content.couponBtnTextStyle", {
+        //   color: '#fff',
+        //   bgColor: '#ff5722',
+        //   fontSize: '30rpx',
+        //   fontWeight: 'normal'
+        // });
+        // this.couponTitleBgColor = getContainerPropsValue(container, "content.couponTitleBgColor", 'rgba(255, 87, 51, 0.1)');
+        // this.couponRadius = getContainerPropsValue(container, "content.couponRadius", 16);
+        // this.couponLeftBgColor = getContainerPropsValue(container, "content.couponLeftBgColor", "linear-gradient(180deg, #FFA852 0%, #FF5733 100%)");
+        // this.couponImageUrl = getContainerPropsValue(container, "content.couponImageUrl", "");
+
+        //取公用盒间距；2.0改版要求
+        // this.moneyBoxHeight = getContainerPropsValue(container, "content.moneyBoxHeight", 16);
+        this.moneyBoxHeight = this.sectionHeight;
+        // this.orderInfoHeight = 20;
+
+        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', ['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', ['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;
         }
+        this.$nextTick(() => {
+          setTimeout(() => {
+            this.getDomReadyRect();
+          }, 200)
+        });
+      },
+      getDomReadyRect(){
+        return new Promise((resolve, reject) => {
+          let query = uni.createSelectorQuery();
+          query.select('.fixed_bottom_body').boundingClientRect(rect => {
+            console.log('getDomReadyRect', rect);
+            this.fixedBottomBodyHeight = rect.height;
+            resolve(rect);
+          }).exec();
+        });
       },
       //选择元宝
       toChoseWallet(){
@@ -779,6 +916,9 @@
         console.log(this.choseWallet)
         this.showWalletChose = false;
       },
+      handleWalletInit(total){
+        this.wallet_total_amount = this.$xdUniHelper.divisionFloatNumber(total, 100);
+      },
 
       //only选择满减券
       toChoseCoupon(){
@@ -791,6 +931,9 @@
         this.choseCoupon = data;
         this.showCouponChose = false;
       },
+      handleCouponInit(coupList){
+        this.couponList = coupList;
+      },
 
       //only选择卡片
       toChoseCard(){
@@ -808,11 +951,17 @@
       },
       handleCardChoseAlert(){
         this.hasAlertCardChose = true;
-        //滚动到底部
-        uni.pageScrollTo({
-          scrollTop: 99999,
-          duration: 0
-        })
+        if(this.ticketPositionStatus === 'Y'){
+          //滚动到底部
+          uni.pageScrollTo({
+            scrollTop: 99999,
+            duration: 0
+          })
+        }
+        
+      },
+      handleCardInit(cardList){
+        this.cardList = cardList;
       },
       getUserWalletList(cb){
         jfbRootExec("getUserWallet", {
@@ -924,7 +1073,7 @@
           }
           this.useTickAndWalletPay(selected_card_list, selected_wallet_list);
         }else{
-          if(this.skipToPay === 'N'){
+          if(this.skipToPay === 'Y'){
             this.showCardPay = true;
           }else{
             this.useTickAndWalletPay([], [])
@@ -1289,9 +1438,16 @@
               var formData = JSON.parse(prod.product_form_data);
               if(formData.length > 0){
                 prod['blessingKey'] = true;
-                prod['blessingData'] = formData[0];
+                let blessingData = formData[0]
+                prod['blessingData'] = blessingData;
                 //复制祝福语从临时存入量
                 if(tempProd.blessing) prod['blessing'] = tempProd.blessing;
+                else{
+                  let blessKey = blessingData.id;
+                  if(this.optionsBlessing['product_id'] == prod.product_id && this.optionsBlessing[blessKey]){
+                    prod['blessing'] = this.optionsBlessing[blessKey];
+                  }
+                }
               }
               return prod;
             }catch(err){
@@ -1356,7 +1512,7 @@
       },
 
       p_getPayMethod(support_methods){
-        jfbRootExec("getPayMethod", {
+        jfbRootExec("getMallPayMethod", {
           vm: this,
           data: {
             support_methods: JSON.stringify(support_methods)
@@ -1371,6 +1527,7 @@
         // if (this.preview === 'Y') {
         //   return this.$xdAlert({content: "体验模式不支持配送地址设置", width: '65vw'})
         // }
+        if(this.isPreview) return;
         if(isCache === 'Y') {
           this.$xdUniHelper.navigateTo({
             url: this.shipAddressPath + "?back=true&cache_key="+ this.order_id
@@ -1384,7 +1541,14 @@
 
       bindPickerChange(e, index){
         let pickIndex = e.detail.value;
-        this.tempShopList = this.$xdUniHelper.cloneDeep(this.shopList);
+        let tempShopList = this.$xdUniHelper.cloneDeep(this.shopList);
+        this.tempShopList = tempShopList.map((item, ii) => {
+          if(index === ii){
+            item.takeoutTime = null;
+            item.selectTime = null;
+          }
+          return item;
+        });
         this.shopList = this.shopList.map((item,ii) => {
           if(index === ii){
             let cur = item.support_delivery_method_options[pickIndex];
@@ -1414,7 +1578,8 @@
   @padding_l_r: 50rpx;
   .jfb-mall-confirm {
     &__body{
-      // background: #F7F7F7;
+      overflow: auto;
+      color: #333333;
       .section{
         margin-bottom: var(--section-height);
         background: #FFFFFF;
@@ -1440,26 +1605,20 @@
         width: 100%;
         height: 3px;
         position: absolute;
-        top: 0;
         left: 0;
       }
       .order_fee{
-        // padding: var(--order-line-height) 0;
+        overflow: hidden;
         ::v-deep .xd-my-list-item{
-          padding-bottom: var(--order-line-height) !important;
-          padding-top: var(--order-line-height) !important;
-          // padding-top: 0 !important;
-          // padding-bottom: 0 !important;
-
-          &.logistics_discount{
-            // padding-top: var(--order-line-height) !important;
-          }
+          &.logistics_discount{}
         }
 
         .money_box{
           margin-bottom: var(--money-box-height);
           background-color: #FFFFFF;
-          padding: var(--order-line-height) 0;
+          &:last-child{
+            margin-bottom: 0;
+          }
         }
       }
       .shipping-address{
@@ -1500,10 +1659,13 @@
         }
       }
       .buyer_info{
-        padding: 24rpx 60rpx;
+        padding: 24rpx var(--cont-lr-padding);
         display: flex;
         align-items: center;
         font-size: 28rpx;
+        ::v-deep .uni-input-placeholder{
+          color: #999999;
+        }
         .uni-input{
           font-size: 28rpx;
           height: 64rpx;
@@ -1515,17 +1677,39 @@
         }
       }
       .prod_info_wrap{
+        ::v-deep .uni-input-placeholder{
+          color: #999999;
+        }
+        .logistics_tip{
+          padding: 0 var(--cont-lr-padding) 24rpx;
+          font-size: 24rpx;
+          color: var(--g-theme-dangerColor);
+        }
         .err_message{
-          padding: 16rpx 60rpx;
-          font-size: 28rpx;
+          padding: 20rpx var(--cont-lr-padding);
+          font-size: 24rpx;
+        }
+        .delivery{
+          // #ifdef H5
+          ::v-deep .xd-my-list-item:last-child{
+            border-bottom: none !important;
+          }
+          // #endif
+          // #ifdef MP-WEIXIN
+          .xd-my-list-item:last-child{
+            ::v-deep .xd-my-list-item{
+              border-bottom: none !important;
+            }
+          }
+          // #endif
         }
         .shop_name{
-          padding: 24rpx 60rpx;
+          padding: 24rpx var(--cont-lr-padding);
           border-bottom: 1px solid #eee;
           font-size: 28rpx;
         }
         .prod_item{
-          padding: 24rpx 60rpx;
+          padding: 24rpx var(--cont-lr-padding);
           box-sizing: border-box;
           height: auto;
           background: #FFFFFF;
@@ -1533,10 +1717,9 @@
           border-radius: 10rpx;
 
           .prod_img{
-            width: 160rpx;
-            height: 160rpx;
+            width: 180rpx;
+            height: 180rpx;
             margin-right: 24rpx;
-            background: #DDD;
             image{
               width: 100%;
               height: 100%;
@@ -1550,7 +1733,7 @@
             width: 100rpx;
           }
           .prod_tit{
-            font-size: 32rpx;
+            font-size: 28rpx;
             .uni-max-cut(2, 80);
             line-height: unit(40, rpx);
           }
@@ -1559,15 +1742,15 @@
           }
 
           .prod_brand {
-            font-size: 26rpx;
-            padding-top: unit(10, rpx);
-            line-height: unit(32, rpx);
+            font-size: 24rpx;
+            padding-top: 4rpx;
+            line-height: 32rpx;
           }
 
           .prod_specs{
-            padding-top: unit(10, rpx);
+            padding-top: unit(4, rpx);
             display: block;
-            font-size: 26rpx;
+            font-size: 24rpx;
             color: #999999;
             line-height: unit(32, rpx);
           }
@@ -1578,7 +1761,7 @@
           }
         }
         .wish_comment{
-          padding: 24rpx 60rpx;
+          padding: 0 var(--cont-lr-padding);
           input{
             background: #F7F7F7;
             height: 68rpx;
@@ -1588,24 +1771,28 @@
           }
           .bless_tip{
             font-size: 26rpx;
-            margin: 16rpx 0;
+            margin: 20rpx 0 24rpx;
           }
         }
       }
       .order_comment{
-        padding: 24rpx 60rpx;
+        padding: 24rpx var(--cont-lr-padding);
         .title{
           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{
@@ -1624,6 +1811,19 @@
           padding: 0 32rpx;
           color: #ff5733;
         }
+        .t_price{
+          display: flex;
+          align-items: center;
+          font-weight: 500;
+          color: #FF2C18;
+        }
+        .b_price{
+          display: flex;
+          align-items: center;
+          font-size: 24rpx;
+          color: #FF2C18;
+          font-weight: 400;
+        }
       }
     }
   }