jufubao-base 1.0.279-beta1 → 1.0.279

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.279-beta1",
+  "version": "1.0.279",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",

package/src/components/JfbBaseHeader/JfbBaseHeader.vue

@@ -502,6 +502,7 @@
             text-align: left;
             font-size: unit(28, rpx);
             padding-left: 20rpx;
+            .uni-cut(1,40);
           }
           .search_btn_in{
             height: 48rpx;

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -160,8 +160,7 @@
           <view>{{ Ditem.value }}</view>
         </view>
       </view>
-        <!--mall code sub orders info-->
-        <view v-if="['none'].includes(code_location) && info.sub_orders && info.sub_orders.length > 0">
+        <view v-if="info.sub_orders && info.sub_orders.length > 0">
           <view
             :style="{
               background: backgroundColor,
@@ -250,7 +249,6 @@
             </view>
           </view>
         </view>
-        <!--mall code orders info-->
         <view
           v-if="info.settle_tag_info"
           class="jfb-base-order-detail__body-card jfb-base-order-detail__body-settle"
@@ -496,7 +494,6 @@
             </view>
           </view>
         </view>
-        <!--shop-->
         <view v-if="info.support_shops && is_show_support_shop === 'Y'">
           <view
             class="jfb-base-order-detail__body-card jfb-base-order-detail__body-jump"
@@ -531,114 +528,13 @@
             marginBottom: padding + 'rpx',
           }"
         >
-          <view class="jfb-base-order-detail__body-shop-title" v-if="['none'].includes(code_location)">
+          <view class="jfb-base-order-detail__body-shop-title">
             <view :style="{ background: mainColor }"></view>
             <view>{{ info.shop.layer_name }}</view>
           </view>
-          <view class="order-shop">
-            <view>
-              <view :class="{top: ['top'].includes(code_location)}" class="jfb-base-order-detail__body-shop-name">{{ info.shop.shop_name }}</view>
-              <view class="jfb-base-order-detail__body-shop-address">地址： {{ info.shop.shop_address }}</view>
-            </view>
-            <view
-              @click="handleLocation(info.shop)"
-              v-if="['top'].includes(code_location)"
-            ><xd-font-icon icon="iconfabu" :color="mainColor" size="30"></xd-font-icon></view>
-          </view>
-
-        </view>
-        <!--shop-->
-        <!--food sub orders info-->
-        <view v-if="['top'].includes(code_location) &&  info.sub_orders && info.sub_orders.length > 0">
-          <view
-            :style="{
-              background: backgroundColor,
-              border: borderBox,
-              borderRadius: radius + 'rpx',
-              boxShadow: shadowBox,
-              marginBottom: padding + 'rpx',
-            }"
-            v-for="(item, index) in info.sub_orders"
-            :key="index"
-            class="jfb-base-order-detail__body-card jfb-base-order-detail__body-delivery"
-          >
-            <view class="jfb-base-order-detail__body-delivery-title">
-              <view>子订单号：{{ item.sub_order_id }}</view>
-              <view :style="{ color: mainColor }">{{item.status.status_name}}</view>
-            </view>
-            <view
-              style="border-bottom: 1px solid #eeeeee"
-              v-for="(Sitem, Sindex) in item.products"
-              :key="Sindex"
-            >
-              <view class="jfb-base-order-detail__body-delivery-content">
-                <xd-jfb-image
-                  width="200"
-                  height="200"
-                  bgc="#f8f8f8"
-                  radius="10"
-                  shadow="10"
-                  mode="scaleToFill"
-                  :src="Sitem.product_thumb"
-                ></xd-jfb-image>
-                <view class="jfb-base-order-detail__body-delivery-content-info">
-                  <view class="jfb-base-order-detail__body-delivery-content-info-name">{{ Sitem.product_name }}</view>
-                  <view v-if="Sitem.brand_name" class="brand-name" :style="{color:brandTextColor}">{{ Sitem.brand_name }}</view>
-                  <view
-                    v-if="Sitem.product_sku_name"
-                    class="jfb-base-order-detail__body-delivery-content-info-sku"
-                  >规格：{{ Sitem.product_sku_name }}</view>
-                  <view class="jfb-base-order-detail__body-delivery-content-info-price">
-                    <view :style="{ fontSize: '32rpx', color: mainColor }">
-                      <xd-unit
-                        :price="Sitem.sale_price"
-                        :color="mainColor"
-                        :fontSize="32"
-                        v-if="biz_code !== 'gift' || info.is_show_gift_price"
-                      ></xd-unit>
-                    </view>
-                    <view style="
-                        font-size: 28rpx;
-                        color: #999999;
-                        display: flex;
-                        align-items: center;
-                      ">x {{ Sitem.product_num }}</view>
-                  </view>
-                </view>
-              </view>
-              <view
-                class="jfb-base-order-detail__body-delivery-content-info-form"
-                v-for="(Fitem, Findex) in Sitem.product_form_data"
-                :key="Findex"
-                :style="{backgroundColor:noticeBgc,color: warningColor,borderRadius: radius + 'rpx',}"
-              >
-                <view> {{ Fitem.label }}： </view>
-                <view> {{ Fitem.value }} </view>
-              </view>
-            </view>
-            <view
-              class="jfb-base-order-detail__body-delivery-bottom"
-              v-if="item.info && item.info.length > 0"
-            >
-              <view class="jfb-base-order-detail__body-delivery-bottom-title">{{item.service_name}}</view>
-              <view
-                v-for="(Ditem, Dindex) in item.info"
-                :key="Dindex"
-                class="jfb-base-order-detail__body-delivery-bottom-item"
-                :style="{
-                  marginBottom: lineHeight + 'rpx'
-                }"
-              >
-                <view style="width: 130rpx;display: flex;">
-                  <view v-html="Ditem.label"></view>
-                  <text v-if="Ditem.label">:</text>
-                </view>
-                <view v-html="Ditem.value"></view>
-              </view>
-            </view>
-          </view>
+          <view class="jfb-base-order-detail__body-shop-name">{{ info.shop.shop_name }}</view>
+          <view class="jfb-base-order-detail__body-shop-address">地址： {{ info.shop.shop_address }}</view>
         </view>
-        <!--food sub orders info-->
         <view
           :style="{
             background: backgroundColor,
@@ -1066,8 +962,6 @@ export default {
       showSupplement: false,
       supplementList: [],
       supplementTitle: "",
-
-      code_location:'none',
     };
   },
   watch: {
@@ -1139,15 +1033,6 @@ export default {
       this.getOrderDetail();
     },
 
-    handleLocation({shop_address,shop_name,shop_latitude,shop_longitude,...shop}){
-      this.handleOpenLocation({
-        address: shop_address,
-        name: shop_name,
-        latitude: shop_latitude,
-        longitude: shop_longitude
-      },()=>{})
-    },
-
     getAmount(price) {
       return this.$xdUniHelper.divisionFloatNumber(price,100)
     },
@@ -1190,9 +1075,6 @@ export default {
             return;
           }
 
-          //餐饮电子码
-          if(res['code_location']) this.code_location = res['code_location']
-
           this.biz_code = res.biz_code;
           this.is_not_show_price = res.is_not_show_price;
 
@@ -1676,32 +1558,6 @@ export default {
       line-height: 32rpx;
     }
 
-    .order-shop {
-      display: flex;
-      justify-content: flex-start;
-      align-items: center;
-
-      & .top {
-        margin-top: 0!important;
-        margin-bottom: 10rpx!important;
-      }
-
-      & > view {
-        &:nth-child(1) {
-          flex: 1;
-        }
-        &:nth-child(2) {
-          flex-shrink: 0;
-          width: 80rpx;
-          height: 80rpx;
-          display: flex;
-          justify-content: flex-end;
-          align-items: center;
-        }
-      }
-    }
-
-
     color: #333;
     .logo-icon {
       width: unit(80, rpx) !important;
@@ -1975,7 +1831,7 @@ export default {
           }
         }
       }
-
+      
     }
 
 
@@ -2029,8 +1885,6 @@ export default {
     }
 
     &-shop {
-      padding-top: 20rpx;
-      padding-bottom: 20rpx;
       &-title {
         display: flex;
         align-items: center;
@@ -2052,7 +1906,7 @@ export default {
 
       &-name {
         color: #333333;
-        font-size: unit(32, rpx);
+        font-size: unit(36, rpx);
         margin-top: unit(24, rpx);
         margin-bottom: unit(24, rpx);
       }
@@ -2103,7 +1957,7 @@ export default {
         color: #737373;
       }
     }
-
+ 
     &-order {
       display: flex;
       align-items: center;