jufubao-mall 2.0.27-beta3 → 2.0.27-beta4

package/package.json

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

package/src/components/JfbMallConfirm/JfbMallConfirm.vue

@@ -73,50 +73,52 @@
                 </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="48rpx" 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: #333333;">{{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="48rpx" paddingTB="24rpx" 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: #333333;">{{shop.deliveryPickLabel || "选择配送方式"}}</view>
+                </picker>
+              </xd-list-item>
+              <template>
+                <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'" 
+                  :label="shop.time_label" showRight paddingLR="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="配送费用" showBottom paddingLR="48rpx">
-                    <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="48rpx" paddingTB="24rpx" showBottom @click="toSetSelectShop(shopIndex)">
+                  <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="48rpx" @click="toSetSelectTime(shopIndex,shop)">
-                    {{shop.selectTime ? shop.selectTime.dateTime : "请选择"}}
+                  <xd-list-item v-if="shop.takeoutTimeList" :label="shop.time_label" show-right paddingLR="48rpx" paddingTB="24rpx" @click="toSetTakeoutTime(shopIndex,shop)">
+                    <view style="">{{shop.takeoutTime ? shop.takeoutTime.dateTime : '请选择'}}</view>
                   </xd-list-item>
-                  <view v-if="shop.deliveryPickValue === 'takeout'" >
-                    <!-- 配送方式：到店自提 -->
-                    <xd-list-item label="选择门店" show-right paddingLR="48rpx" @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="48rpx" @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="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>
+                </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" :style=[blockSectionStyleComp]>
           <view class="title">备注信息</view>
-          <input v-model="comment" class="order_market" :maxlength="200" placeholder="建议留言前先与平台沟通确认，最多只支持200字"/>
+          <input v-model="comment" class="order_market" :maxlength="50" placeholder="建议留言前先与平台沟通确认，最多只支持50字"/>
         </view>
         <!-- 展示vip -->
         <view v-if="is_show_vip_card_list === 'Y'" class="section" style="overflow: hidden;" :style=[blockSectionStyleComp]>
@@ -189,7 +191,7 @@
             </xd-list-item>
           </view>
         </view>
-        <view :style="fixedBottomPlaceholder"></view>
+        <view :style=[fixedBottomPlaceholder]></view>
         <!-- 靠低支付,  增加淘福客布局 -->
         <view class="fixe_bottom" :style="prod_bottom">
           <view class="fixed_bottom_body" :style="[bottomBoxStyle]">
@@ -311,7 +313,7 @@
         ></xd-select-time>
         <xd-down-drawer
           :show.sync="showShopList"
-          height="60vh"
+          height="45vh"
         >
           <template v-if="showShopList">
             <view :style="{height: '100rpx'}"></view>
@@ -456,6 +458,8 @@
         showCouponChose: false,
         couponList: [],
 
+        fixedBottomBodyHeight: 0,
+
         //面板
         xnamespace: "",
         showBuyer: "",
@@ -612,8 +616,9 @@
         return flat;
       },
       fixedBottomPlaceholder() {
-        let bottomHeight = this.bottomPadding.top + this.bottomPadding.bottom;
-        return this.fixedStyle({paddingBottom: 40 + bottomHeight, zIndex: 110}, 'bottom', false);
+        return {
+          height: (this.fixedBottomBodyHeight + 14) + 'px'
+        }
       },
       prod_bottom() {
         return this.fixedStyle({height: 0, zIndex: 111});
@@ -798,11 +803,11 @@
           this.showPrice = "Y"
         }
 
-        let contStyle = this.getRelationStatus(container,'cont_style',{ sectionHeightStatus: ['sectionHeight'], lrPaddingStatus: ['lrPadding'] }, `{"spacing":20,"margin":{"bottom":0,"top":0,"left":0,"right":0},"backgroundColor": "rgba(245, 245, 245, 1)"}`);
+        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.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":0,"left":0,"right":0}}`);
+        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']})
@@ -850,6 +855,21 @@
         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(){
@@ -1629,7 +1649,7 @@
           color: #999999;
         }
         .logistics_tip{
-          padding: 24rpx 48rpx;
+          padding: 0 48rpx 24rpx;
           font-size: 24rpx;
           color: var(--g-theme-dangerColor);
         }
@@ -1637,6 +1657,11 @@
           padding: 20rpx 48rpx;
           font-size: 24rpx;
         }
+        .delivery{
+          ::v-deep .xd-my-list-item:last-child{
+            border-bottom: none !important;
+          }
+        }
         .shop_name{
           padding: 24rpx 48rpx;
           border-bottom: 1px solid #eee;

package/src/components/JfbMallConfirm/XdAddrDefault.vue

@@ -93,7 +93,7 @@
 
           .icon_wrap{
             width: 44rpx;
-            padding: 8rpx 0 0 0rpx;
+            padding: 8rpx 12rpx 0 0rpx;
             box-sizing: border-box;
           }
         }

package/src/components/JfbMallConfirm/XdListItem.vue

@@ -103,6 +103,8 @@ export default {
     .my-list_label{
       font-size: 28rpx;
       font-weight: 400;
+      height: 40rpx;
+      line-height: 40rpx;
     }
   }
   &.size_default{
@@ -110,6 +112,8 @@ export default {
     .my-list_label{
       font-size: 28rpx;
       font-weight: 400;
+      height: 40rpx;
+      line-height: 40rpx;
     }
   }
   &.size_small{

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

@@ -179,7 +179,7 @@ export default function (data, gValue,gColor,oldData){
         key: 'addr_style',
         gValue,
         fields: { addrLrPaddingStatus: ['addrLrPadding'] },
-        sValue: `{"margin":{"bottom":0,"top":0,"left":0,"right":0}}`,
+        sValue: `{"margin":{"bottom":0,"top":16,"left":16,"right":16}}`,
       }),
       labelInline:true,
       isTplRef: true, //内容引用模版被禁用
@@ -209,7 +209,7 @@ export default function (data, gValue,gColor,oldData){
         key: 'cont_style',
         gValue,
         fields: { sectionHeightStatus: ['sectionHeight'], lrPaddingStatus: ['lrPadding'] },
-        sValue: `{"spacing":20,"margin":{"bottom":0,"top":0,"left":0,"right":0},"backgroundColor": "rgba(245, 245, 245, 1)"}`,
+        sValue: `{"spacing":16,"margin":{"bottom":0,"top":0,"left":16,"right":16},"backgroundColor": "rgba(245, 245, 245, 1)"}`,
       }),
       labelInline:true,
       isTplRef: true, //内容引用模版被禁用

package/src/components/JfbMallConfirm/shopList.vue

@@ -1,25 +1,25 @@
 <template>
   <view class="chose_shop_list">
-    <view class="shop-search">
-      <input
-        class="uni-input"
-        placeholder="输入门店名称"
-        :value="keyword"
-        @input="handleInput"
-        @confirm="handleInput"
-      />
-      <view>
-        <xd-font-icon icon="iconsousuo_mian" color="#666" size="32"></xd-font-icon>
-      </view>
-    </view>
-    <view class="chose_location">
+    <view class="shop_header">
       <xd-city-show
         city-location-type="baidu"
         @done="handleCityDone"
         @onChange="handleCityChange"
         color="#333"></xd-city-show>
-      <view class="switch_city" @click="handleCityChange">切换城市 <xd-font-icon size="28" icon="iconxiangyou_xian"></xd-font-icon> </view>
+      <view class="shop-search">
+        <input
+          class="uni-input"
+          placeholder="输入门店名称"
+          :value="keyword"
+          @input="handleInput"
+          @confirm="handleInput"
+        />
+        <view>
+          <xd-font-icon icon="iconsousuo_mian" color="#999999" size="32"></xd-font-icon>
+        </view>
+      </view>
     </view>
+    
     <view class="shop_list" v-if="list && list.length">
       <view
         class="shop_item"
@@ -33,31 +33,38 @@
         <view class="shop_info">
           <view class="shop_name">
             <view class="_name">{{item.resource_shop_name}}</view>
-            <view class="distance" v-if="item.distance">{{item.distance}}</view>
+            <!-- <view class="distance" v-if="item.distance">{{item.distance}}</view> -->
           </view>
           <view>
             <view class="shop_sub">
-              <view class="_icon"><xd-font-icon size="32" icon="icondizhitubiao"></xd-font-icon></view>
-              <view>{{item.address}}</view>
+              <!-- <view class="_icon"><xd-font-icon size="32" icon="icondizhitubiao"></xd-font-icon></view> -->
+              <view class="addr_text">{{item.address}}</view>
+              <view v-if="item.distance">{{item.distance}}</view>
             </view>
             <view class="shop_sub">
-              <view class="_icon"><xd-font-icon size="32" icon="icondianhuatubiao"></xd-font-icon></view>
+              <view class="_icon"><xd-font-icon size="24" icon="icondianhuatubiao"></xd-font-icon></view>
               <view>{{item.phone}}</view>
             </view>
           </view>
         </view>
       </view>
     </view>
-    <view v-else class="empty_data">该地区暂无可选门店</view>
+    <view v-else class="empty_data">
+      <xd-no-data :scaleSize="3" iconType="shop">
+        <view style="margin-top: -100rpx;">该地区暂无可选门店</view>
+      </xd-no-data>
+    </view>
   </view>
 </template>
 <script>
 import XdCityShow from "@/components/XdCityShowApi/XdCityShowApi"
 import XdFontIcon from "@/components/XdFontIcon/XdFontIcon"
+import XdNoData from "@/components/XdNoData/XdNoData"
 export default {
   components: {
     XdCityShow,
-    XdFontIcon
+    XdFontIcon,
+    XdNoData
   },
   props: {
     getCityInfoByLocation: {
@@ -102,23 +109,42 @@ export default {
 <style lang="less" scoped>
   .chose_shop_list{
     background: #F7F7F7;
-    padding: 32rpx;
+    padding: 16rpx;
     position: relative;
-    height: calc(60vh - 164rpx);
+    height: 45vh;
   }
+  .shop_header{
+    position: absolute;
+    top: -80rpx;
+    left: 8rpx;
+    display: flex;
+    ::v-deep .xd-city__name-title{
+      color: #999999 !important;
+      font-size: 24rpx !important;
+    }
+    ::v-deep .xd-city__name-icon{
+      color: #999999 !important;
 
+      .xd-iconfont {
+        font-size: 28rpx !important;
+      }
+    }
+  }
   .shop-search {
-    position: absolute;
     border:1px solid #eee;
-    top: -80rpx;
-    left: 30rpx;
-    width: 400rpx;
+    width: 420rpx;
     padding: 10rpx 20rpx;
     border-radius: 40rpx;
     background-color: #f8f8f8;
     display: flex;
     justify-content: flex-start;
     align-items: center;
+    margin-left: 8rpx;
+
+    ::v-deep .uni-input-placeholder{
+      color: #999999;
+    }
+    
 
     & .uni-input {
       font-size: 28rpx;
@@ -155,23 +181,24 @@ export default {
     font-size: 28rpx;
   }
   .empty_data{
-    line-height: 300rpx;
     text-align: center;
     font-size: 28rpx;
     color: #999999;
+    height: 100%;
   }
   .shop_list{
-    height: calc(60vh - 164rpx);
+    height: 100%;
     overflow-y: auto;
     .shop_item{
       display: flex;
       background: #FFFFFF;
-      padding: 20rpx;
+      padding: 16rpx;
       margin-bottom: 20rpx;
+      border-radius: 16rpx;
     }
     .shop_image{
-      width: 200rpx;
-      height: 200rpx;
+      width: 160rpx;
+      height: 160rpx;
       border: 1px solid #DDD;
       image{
         width: 100%;
@@ -185,13 +212,21 @@ export default {
       flex: 1;
       margin-left: 24rpx;
       justify-content: space-between;
+
+      .addr_text{
+        width: 420rpx;
+        padding-right: 20rpx;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
     }
     .shop_name{
       display: flex;
       align-items: flex-start;
       justify-content: space-between;
       font-size: 32rpx;
-      color: #242424;
+      color: #333333;
       ._name{
         flex: 1;
         width: 200rpx;
@@ -207,6 +242,7 @@ export default {
     }
     .shop_sub{
       display: flex;
+      align-items: center;
       color: #999999;
       font-size: 24rpx;
       margin-top: 20rpx;