jufubao-food 1.0.15-beta2 → 1.0.15-beta3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-food",
-  "version": "1.0.15-beta2",
+  "version": "1.0.15-beta3",
   "private": false,
   "description": "聚福宝业务组件餐饮插件包",
   "main": "index.js",

package/src/components/JfbFoodConfirmV2/JfbFoodConfirmV2.vue

@@ -21,7 +21,9 @@
           <view class="shop_wrap" @click="toSwitchShop">
             <view class="shop_info">
               <view class="_name"><xd-font-icon icon="iconshouye" :color="mainColor" size="36" style="margin-right: 8rpx;"></xd-font-icon>{{ shopInfo.shop_name }}</view>
-              <view class="_dist">{{ shopInfo.distance_conversion}}
+              <view class="_dist">
+                <!-- {{ shopInfo.distance_conversion}} -->
+                更多门店
                 <xd-font-icon icon="iconxiangyou_xian" color="#666666" :size="20" style="margin-left: 8rpx;"></xd-font-icon>
               </view>
             </view>

package/src/components/JfbFoodProductList/JfbFoodProductList.vue

@@ -118,8 +118,15 @@
             <xd-unit :price="cartPrice" :isOld="false"></xd-unit>
           </view>
           <view>
-            <xd-button v-if="cartProductList.length" width="170rpx" size="small" type="primary" @click="handleSubmitCart">选好了</xd-button>
-            <xd-button v-else width="170rpx" size="small" type="primary" :disabled="true">选好了</xd-button>
+            <xd-button v-if="cartProductList.length"
+              :cusStyle="{fontSize: '28rpx'}"
+              width="170rpx" size="small" type="primary"
+              @click="handleSubmitCart"
+            >选好了</xd-button>
+            <xd-button v-else
+              :cusStyle="{fontSize: '28rpx'}"
+              width="170rpx" size="small" type="primary" :disabled="true"
+            >选好了</xd-button>
           </view>
         </view>
         <view class="cart_product_modal" v-if="cartProductShow">
@@ -170,14 +177,17 @@
               @click="setCurShop(i)"
             >
               <view class="shop_name_bar">
-                <view class="shop_name">{{item.resource_shop_name}} <view class="curr_active">正在预览</view></view>
+                <view class="shop_name">
+                  <text style="margin-right: 16rpx;">{{item.resource_shop_name}}</text>
+                  <view class="curr_active">正在预览</view>
+                </view>
                 <view class="more_r">详情 <xd-font-icon icon="iconxiangyou_xian" :size="24"></xd-font-icon></view>
               </view>
               <view class="shop_addr_bar">
                 <view>{{item.address}}</view>
                 <view>{{item.distance}}</view>
               </view>
-              <view class="shop_time">营业时间：09-21:00</view>
+              <view class="shop_time" v-if="item.business_time_name">营业时间：{{ item.business_time_name }}</view>
             </view>
           </view>
           <view class="chose_other" @click="handleSwitchShop">选择其他门店 <xd-font-icon icon="iconxiangyou_xian" :size="24"></xd-font-icon></view>
@@ -380,8 +390,8 @@
        * @param container {object} 业务组件对象自己
        */
       init(container) {
-        this.foodDetailPath = getContainerPropsValue(container, 'content.foodDetailPath', {value: "/Smallline/food/pinfo"}).value;
-        this.confirmPath = getContainerPropsValue(container, 'content.confirmPath', {value: "/Smallline/food/confirmv2"}).value;
+        this.foodDetailPath = getContainerPropsValue(container, 'content.foodDetailPath', {value: ""}).value;
+        this.confirmPath = getContainerPropsValue(container, 'content.confirmPath', {value: ""}).value;
         this.switchStorePath = getContainerPropsValue(container, 'content.switchStorePath', { value: ''}).value;
         this.showDiscount = gCPVal(container, 'showDiscount', "Y");
         this.differ = gCPVal(container, 'differ', 1);
@@ -474,7 +484,7 @@
       },
       handleSwitchShop(){
         this.$xdUniHelper.navigateTo({
-          url: this.switchStorePath + "?brand_id=" + this.shopInfo.brand_id + "&resource_shop_id=" + this.resource_shop_id,
+          url: this.switchStorePath + "?brand_id=" + this.brand_id + "&resource_shop_id=" + this.resource_shop_id,
         })
       },
       setCurShop(index){
@@ -1304,7 +1314,7 @@
       }
     }
     .take_shop_wrap{
-      background-color: #eee;
+      background-color: #f8f8f8;
       .take_title{
         background-color: #FFFFFF;
         padding: 24rpx 32rpx;
@@ -1333,19 +1343,20 @@
           background-color: rgba(229, 1, 14, 0.03);
           .shop_name_bar{
             .curr_active{
-              display: flex;
+              display: inline-flex;
             }
           }
         }
         .shop_name_bar{
           display: flex;
-          align-items: center;
+          align-items: flex-start;
           justify-content: space-between;
           font-size: 32rpx;
           color: #333333;
           .shop_name{
-            display: flex;
             align-items: center;
+            flex: 1;
+            padding-right: 40rpx;
           }
           .curr_active{
             border: 1px solid rgba(229, 1, 14, 0.2);
@@ -1356,7 +1367,7 @@
             align-items: center;
             justify-content: center;
             font-size: 24rpx;
-            margin-left: 16rpx;
+            // margin-left: 16rpx;
             display: none;
           }
           .more_r{
@@ -1364,6 +1375,7 @@
             align-items: center;
             color: #999999;
             font-size: 24rpx;
+            padding-top: 8rpx;
           }
         }
         .shop_addr_bar{

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

@@ -192,7 +192,7 @@ export default function (data={},gValue={},gColor={},oldData) {
       ele: 'xd-radio',
       groupKey: 'style',
       valueKey: 'radiusStatus',
-      value: statusDataVal({data, key:'radiusStatus', cValue:'N',}),
+      value: statusDataVal({data, key:'radiusStatus', cValue:'D',}),
       labelInline:true,
       list: [
         {label: '默认', value: 'D'},
@@ -234,7 +234,7 @@ export default function (data={},gValue={},gColor={},oldData) {
       ele: 'xd-radio',
       groupKey: 'style',
       valueKey: 'imageRadiusStatus',
-      value: statusDataVal({data, key:'imageRadiusStatus', cValue:'N'}),
+      value: statusDataVal({data, key:'imageRadiusStatus', cValue:'D'}),
       labelInline:true,
       list: [
         {label: '默认', value: 'D'},