jufubao-mall 2.0.27-beta4 → 2.0.27-beta6

package/package.json

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

package/src/components/JfbMallConfirm/JfbMallConfirm.vue

@@ -87,7 +87,7 @@
                 <xd-list-item v-if="shop.sub_show_delivery_price==='Y'" label="配送费用" showBottom paddingLR="48rpx" paddingTB="24rpx">
                   <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' && shop.is_support_delivery == 'Y'" 
+                <xd-list-item v-if="shop.deliveryPickValue === 'samecity'" 
                   :label="shop.time_label" showRight paddingLR="48rpx" paddingTB="24rpx" showBottom
                   @click="toSetSelectTime(shopIndex,shop)">
                   {{shop.selectTime ? shop.selectTime.dateTime : "请选择"}}
@@ -164,7 +164,7 @@
               </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>
+                  {{ 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: 24rpx">已使用其他票券，不可用</view>
@@ -205,7 +205,11 @@
             </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'"
@@ -481,7 +485,7 @@
         address_layout: 'old',
         sectionHeight: 16,
         orderInfoHeight: 16,
-        showTopLine: "N",
+        showTopLine: "B",
         blessTextColor: "",
         priceTextColor: "",
         bottomPadding: {},
@@ -525,6 +529,7 @@
         showLogisticsTip: "Y",
         logisticsTipText: "",
         checkPayMethod: [],
+        ticketPositionStatus: "N"
       }
     },
     computed: {
@@ -662,9 +667,19 @@
         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(){
         return {
-          padding: this.getMarginAndPadding(this.bottomPadding, 20)
+          padding: this.getMarginAndPadding(this.bottomPadding, 16)
         }
       },
       bodyStyleComp(){
@@ -770,6 +785,18 @@
           this.jwxSDK = res.jwxSDK;
         })
         // #endif
+
+        if(this.ticketPositionStatus === 'Y'){
+          this.$nextTick(() => {
+            setTimeout(() => {
+              uni.pageScrollTo({
+                scrollTop: 10000,
+                duration: 200
+              })
+            }, 1000)
+          })
+          
+        }
       },
       /**
        * @description 监听事件变化
@@ -792,12 +819,13 @@
 	      this.useMode = getContainerPropsValue(container, 'content.useMode', "market");
         this.showPrice = getContainerPropsValue(container, 'content.showPrice', "Y");
         this.address_layout = getContainerPropsValue(container, 'content.address_layout', "old");
-        this.showTopLine = getContainerPropsValue(container, 'content.showTopLine', "N");
+        this.showTopLine = getContainerPropsValue(container, 'content.showTopLine', "B");
         this.skipTip = getContainerPropsValue(container, "content.skipTip", "N");
-        this.skipToPay = getContainerPropsValue(container, "content.skipToPay", "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"
@@ -814,7 +842,7 @@
         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', [20], {sKey: "bottomPaddingStatus", fields: ['bottomPadding']});
+        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']});
@@ -1507,7 +1535,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];
@@ -1537,7 +1572,7 @@
   @padding_l_r: 50rpx;
   .jfb-mall-confirm {
     &__body{
-      // background: #F7F7F7;
+      overflow: auto;
       color: #333333;
       .section{
         margin-bottom: var(--section-height);
@@ -1771,6 +1806,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;
+        }
       }
     }
   }

package/src/components/JfbMallConfirm/Mock.js

@@ -224,7 +224,7 @@ module.exports = {
             product_thumb:
               "https://sandbox-img.jufubao.cn/uploads/20230406/0b890cd5a947d9c5724b412d34cd4000.png",
             product_form_data:
-              '[{"id":"blessing","type":"input","struct":{"title":"祝福语","explain":"请务必确保输入的号码准确无误，填错号码无法进行退还操作，后果自负。","default":"","placeholder":"","required":true},"options":[],"value":"祝福语"}]',
+              '[{"id":"blessing","type":"input","struct":{"title":"祝福语","explain":"请务必准确填写号码，号码错误将无法进行退还操作。","default":"","placeholder":"","required":true},"options":[],"value":"祝福语"}]',
             brand_id: 3,
             brand_name: "北京味多美蛋糕叔叔/HEYTEA/喜茶/凯蒂猫/Quange/全格",
             aftersale_service: ",refund,exchange",
@@ -278,7 +278,7 @@ module.exports = {
             product_thumb:
               "https://sandbox-img.jufubao.cn/uploads/20230406/0b890cd5a947d9c5724b412d34cd4000.png",
             product_form_data:
-              '[{"id":"blessing","type":"input","struct":{"title":"祝福语","explain":"请务必确保输入的号码准确无误，填错号码无法进行退还操作，后果自负。","default":"","placeholder":"","required":true},"options":[],"value":"祝福语"}]',
+              '[{"id":"blessing","type":"input","struct":{"title":"祝福语","explain":"请务必准确填写号码，号码错误将无法进行退还操作。","default":"","placeholder":"","required":true},"options":[],"value":"祝福语"}]',
             brand_id: 3,
             brand_name: "北京味多美蛋糕叔叔/HEYTEA/喜茶/凯蒂猫/Quange/全格",
             aftersale_service: ",refund,exchange",

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

@@ -56,7 +56,7 @@ export default function (data, gValue,gColor,oldData){
       label: "引导支付",
       ele: "xd-radio",
       valueKey: "skipToPay",
-      value: dataVal({data, key:'skipToPay', dValue: 'N', gValue}),
+      value: dataVal({data, key:'skipToPay', dValue: 'Y', gValue}),
       groupKey: "content",
       labelInline: true,
       className: 'input100',
@@ -68,25 +68,25 @@ export default function (data, gValue,gColor,oldData){
       ]
     },
     //2.0新属性
-    // {
-    //   label: "票券定位",
-    //   ele: "xd-radio",
-    //   valueKey: "ticketPositionStatus",
-    //   value: dataVal({data, key: "ticketPositionStatus", dValue: "N", gValue}),
-    //   groupKey: "content",
-    //   labelInline: true,
-    //   inline: false,
-    //   notice: "开启后会提示票券选择，点击自动滚动到选择支付位置",
-    //   list: [
-    //     { label: "显示", value: "Y" },
-    //     { label: "隐藏", value: "N" },
-    //   ]
-    // },
+    {
+      label: "票券定位",
+      ele: "xd-radio",
+      valueKey: "ticketPositionStatus",
+      value: dataVal({data, key: "ticketPositionStatus", dValue: "N", gValue}),
+      groupKey: "content",
+      labelInline: true,
+      inline: false,
+      notice: "开启后会提示票券选择，点击自动滚动到选择支付位置",
+      list: [
+        { label: "显示", value: "Y" },
+        { label: "隐藏", value: "N" },
+      ]
+    },
     {
       label: "使用新票券",
       ele: "xd-radio",
       valueKey: "bindCard",
-      value: dataVal({data, key:'bindCard', dValue: "", gValue}),
+      value: dataVal({data, key:'bindCard', dValue: "1", gValue}),
       groupKey:'content',
       labelInline: true,
       inline: false,
@@ -158,7 +158,7 @@ export default function (data, gValue,gColor,oldData){
       label: "横线",
       ele: "xd-radio",
       valueKey: "showTopLine",
-      value: dataVal({data, key:'showTopLine', dValue: "N", gValue}),
+      value: dataVal({data, key:'showTopLine', dValue: "B", gValue}),
       groupKey:'content',
       labelInline: true,
       isTplRef: true, //内容引用模版被禁用

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

@@ -407,7 +407,7 @@ export default function (data={},gValue={},gColor={},oldData) {
       value: dataVal({
         data,
         key:'bottomPadding',
-        dValue:[20],
+        dValue:[16],
         gValue,
         isPM: true,
         isCPM: true,

package/src/components/JfbMallConfirm/shopList.vue

@@ -1,11 +1,13 @@
 <template>
   <view class="chose_shop_list">
     <view class="shop_header">
-      <xd-city-show
-        city-location-type="baidu"
-        @done="handleCityDone"
-        @onChange="handleCityChange"
-        color="#333"></xd-city-show>
+      <view style="display: flex;align-items: center;">
+        <xd-city-show
+          city-location-type="baidu"
+          @done="handleCityDone"
+          @onChange="handleCityChange"
+          color="#333"></xd-city-show>
+      </view>
       <view class="shop-search">
         <input
           class="uni-input"
@@ -15,7 +17,7 @@
           @confirm="handleInput"
         />
         <view>
-          <xd-font-icon icon="iconsousuo_mian" color="#999999" size="32"></xd-font-icon>
+          <xd-font-icon icon="iconsousuo_mian" color="#999999" size="28"></xd-font-icon>
         </view>
       </view>
     </view>
@@ -109,7 +111,7 @@ export default {
 <style lang="less" scoped>
   .chose_shop_list{
     background: #F7F7F7;
-    padding: 16rpx;
+    padding: 0 16rpx 16rpx;
     position: relative;
     height: 45vh;
   }
@@ -126,14 +128,14 @@ export default {
       color: #999999 !important;
 
       .xd-iconfont {
-        font-size: 28rpx !important;
+        font-size: 24rpx !important;
       }
     }
   }
   .shop-search {
-    border:1px solid #eee;
+    border:1px solid #f8f8f8;
     width: 420rpx;
-    padding: 10rpx 20rpx;
+    padding: 16rpx 32rpx;
     border-radius: 40rpx;
     background-color: #f8f8f8;
     display: flex;
@@ -147,7 +149,7 @@ export default {
     
 
     & .uni-input {
-      font-size: 28rpx;
+      font-size: 24rpx;
       flex: 1;
       color: #333;
       line-height: 36rpx;
@@ -189,6 +191,7 @@ export default {
   .shop_list{
     height: 100%;
     overflow-y: auto;
+    padding-top: 16rpx;
     .shop_item{
       display: flex;
       background: #FFFFFF;
@@ -210,8 +213,7 @@ export default {
       flex-direction: column;
       width: 200rpx;
       flex: 1;
-      margin-left: 24rpx;
-      justify-content: space-between;
+      margin-left: 16rpx;
 
       .addr_text{
         width: 420rpx;
@@ -245,7 +247,7 @@ export default {
       align-items: center;
       color: #999999;
       font-size: 24rpx;
-      margin-top: 20rpx;
+      margin-top: 16rpx;
       line-height: 1.6;
       ._icon{
         width: 40rpx;