jufubao-mall 2.0.35-beta10 → 2.0.35-beta12

package/package.json

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

package/src/components/JfbMallNewShopList/JfbMallNewShopList.vue

@@ -271,7 +271,7 @@
        */
       init(container) {
         //基础
-        this.xnamespace = gCPVal(container, "xnamespace", this.projectAttr.business_code||this.xnamespace);
+        this.xnamespace = gCPVal(container, "xnamespace", '');
         this.serverType = gCPVal(container, 'serverType', [['SELL']]);
         this.shopType = gCPVal(container, 'shopType', '');
         this.shopListStyle =  gCPVal(container, 'shopListStyle', 'v2');

package/src/components/JfbMallShopVip/JfbMallShopVip.vue

@@ -112,35 +112,35 @@
               </template>
               <template v-else-if="nearbyShopList.length >0">
                 <template v-for="(item,index) in nearbyShopList">
-                  <view
-                    :style="[
-                      cusStyle.item,
-                      (index === 0?{marginTop: itemTop + 'rpx'}:{}),
-                    ]"
-                    class="shop_list-item"
-                    :class='[{"shop_list-item-act":resource_shop_id === item.resource_shop_id}]'
-                    :key="item.key"
-                    :id="`scroll-${item.resource_shop_id}`"
-                    @click="handleToEvent(item, 'shop')"
-                  >
-                    <view class="shop_list-item-title">
-                      <view class="title">
-                        <view>{{item.resource_shop_name}}</view>
-                        <view class="active" v-if="resource_shop_id === item.resource_shop_id">正在预览</view>
+                  <view :style="[cusStyleBox]">
+
+                    <view
+                      :style="[cusStyle.item, (index === 0?{marginTop: itemTop + 'rpx'}:{})]"
+                      class="shop_list-item"
+                      :class='[{"shop_list-item-act":resource_shop_id === item.resource_shop_id}]'
+                      :key="item.key"
+                      :id="`scroll-${item.resource_shop_id}`"
+                      @click="handleToEvent(item, 'shop')"
+                    >
+                      <view class="shop_list-item-title">
+                        <view class="title">
+                          <view>{{item.resource_shop_name}}</view>
+                          <view class="active" v-if="resource_shop_id === item.resource_shop_id">正在预览</view>
+                        </view>
+                        <view @click.stop="handleToEvent(item, 'detail')">
+                          <text>详情</text>
+                          <xd-font-icon icon="iconxiangyou_xian" color="#999" size="30" width="26" height="26"></xd-font-icon>
+                        </view>
                       </view>
-                      <view @click.stop="handleToEvent(item, 'detail')">
-                        <text>详情</text>
-                        <xd-font-icon icon="iconxiangyou_xian" color="#999" size="30" width="26" height="26"></xd-font-icon>
+                      <view class="address" :style="{marginBottom:item['business_time_name']?'16rpx':0}">
+                        <view>{{item.address}}</view>
+                        <view
+                          v-if="item.distance_conversion || item.distance"
+                          :style="[cusStyle.distance]"
+                        >{{item.distance_conversion || item.distance}}</view>
                       </view>
+                      <view class="openTime" v-if="item['business_time_name']">营业时间：{{item['business_time_name']}}</view>
                     </view>
-                    <view class="address" :style="{marginBottom:item['business_time_name']?'16rpx':0}">
-                      <view>{{item.address}}</view>
-                      <view
-                        v-if="item.distance_conversion || item.distance"
-                        :style="[cusStyle.distance]"
-                      >{{item.distance_conversion || item.distance}}</view>
-                    </view>
-                    <view class="openTime" v-if="item['business_time_name']">营业时间：{{item['business_time_name']}}</view>
                   </view>
                 </template>
                 <xd-more>更多附近门店可搜索名称或地址查询</xd-more>
@@ -231,6 +231,7 @@
         //style
         bodyPadding: {},
         cusStyle: {},
+        cusStyleBox:{},
         cardItemShadowWidth:0,
         itemTop:0,
         itemBottom:0,
@@ -268,7 +269,7 @@
         return {
           height: this.layoutInfo.bodyMinHeightRpx + 'rpx',
           '--main-color': this.tabStyle.actColor,
-          '--main-alpha-color': this.$colorChange(this.mainColor).alpha(0.01).toString(),
+          '--main-alpha-color': this.$colorChange(this.mainColor).alpha(0.1).toString(),
           '--main-alpha5-color': this.$colorChange(this.mainColor).alpha(0.2).toString()
         }
       },
@@ -341,7 +342,7 @@
        * @param container {object} 业务组件对象自己
        */
       init(container) {
-        this.xnamespace = gCPVal(container, 'xnamespace', this.projectAttr.business_code||this.xnamespace);
+        this.xnamespace = gCPVal(container, 'xnamespace', '');
         this.serverType = gCPVal(container, 'serverType', [['SELL']]);
         this.showOftenTab = 'N' //todo gCPVal(container, 'showOftenTab', 'N');
         if(this.showOftenTab === 'N') this.titleList = [{label: '附近门店', value: 'nearby'}];
@@ -431,17 +432,20 @@
           this.itemTop = 0;
           this.itemBottom = 0;
         }
-
+        this.cusStyleBox = {
+          'border-radius':cardItemRadius + 'rpx',
+          backgroundColor: cardItemBgColor,
+          'margin-right': `${right}rpx`,
+          'margin-left': `${left}rpx`,
+          'margin-bottom': `${cardItemSpace}rpx`,
+        }
         this.cusStyle = {
           'item':{
-            'margin-bottom': `${cardItemSpace}rpx`,
             'border-radius':cardItemRadius + 'rpx',
             'box-shadow': cardItemShadow,
             'border': cardItemBorder,
-            'backgroundColor': cardItemBgColor,
             'padding': this.getMarginAndPadding(itemPadding, 0),
-            'margin-right': `${right}rpx`,
-            'margin-left': `${left}rpx`
+
           },
           'image':{
             'border-radius': itemImageRadius + 'rpx',
@@ -975,6 +979,7 @@
             & > view:last-child {
               flex-shrink: 0;
               margin-left: 48rpx;
+              line-height: 44rpx;
               font-size: 24rpx;
               color: #999;
               display: flex;