jufubao-mall 2.0.35-beta8 → 2.0.35-beta91

package/package.json

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

package/src/components/JfbMallCart/JfbMallCart.vue

@@ -118,7 +118,8 @@
                           </view>
                           <view class="prod_price">
                             <view style="display:flex;align-items:center">
-                              <xd-unit :price="prod.sale_price" :isOld="false" color="#333" :iconSize="0.3" :fontSize="36"/>
+                              // <xd-unit :price="prod.sale_price" :isOld="false" color="#333" :iconSize="0.3" :fontSize="36"/>
+                              <CusPrice :iconSize="0.3" :priceSize="36" :showPrice="prod.show_prices"></CusPrice>
                             </view>
                             <xd-number
                               v-if="prod.status === 'ok'"
@@ -158,9 +159,12 @@
               <text class="text ml14">全选</text>
               <text>（{{ checkedProdList.length }}）</text>
             </view>
-            <view class="flex" v-if="!editCart">
-              <text class="text">合计：</text>
-              <xd-unit :price="calcTotal" :isOld="false"></xd-unit>
+            <view v-if="!editCart">
+              <view class="flex">
+                <text class="text">合计：</text>
+                <xd-unit :price="calcTotal" :isOld="false"></xd-unit>
+              </view>
+              <view class="flex save">共省：¥{{ saveTotal }}</view>
             </view>
           </view>
           <xd-button v-if="editCart"
@@ -205,6 +209,7 @@ import { getContainerPropsValue , toProductDetail, gCPVal} from "@/utils/xd.base
 import getServiceUrl from "@/common/getServiceUrl";
 import XdProductStatus from "@/components/XdProductStatus/XdProductStatus";
 import XdNoData from "@/components/XdNoData/XdNoData";
+import CusPrice from '@/components/CusPrice/CusPrice'
 import {mapActions} from "vuex";
 import {getJfbConfig,getColorBaseUrl} from "@/lib/conf.domain";
 import Color from "color"
@@ -225,6 +230,7 @@ export default {
     UniSwipeActionItem,
     XdProductStatus,
     XdNoData,
+    CusPrice
   },
   mixins: [componentsMixins, extsMixins, JfbMallCartMixin],
   data() {
@@ -368,6 +374,12 @@ export default {
         return pre + next.num * next.sale_price;
       }, 0);
     },
+    //已选商品共省
+    saveTotal() {
+      return this.checkedProdList.reduce((pre, next) => {
+        return pre + next.num * next.diff_price;
+      }, 0);
+    },
 
     boxShadow() {
       return this.titleContShadow
@@ -1113,4 +1125,9 @@ export default {
   margin-left: 32rpx;
   margin-right: 32rpx;
 }
+.save {
+  color: #ff0000;
+  font-size: 24rpx;
+  margin-left: 10rpx;
+}
 </style>

package/src/components/JfbMallConfirm/JfbMallConfirm.vue

@@ -121,12 +121,6 @@
           <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]>
-          <cus-vip-list :list="vipCardList"
-            :vip_card_id="vip_card_id"
-            :plus_saving_money="orderFee.plus_saving_money"
-            @choseVipCard="handleChoseVipCard"></cus-vip-list>
-        </view>
 
         <!-- 订单费用详情 -->
         <!-- 礼包不显示订单信息 -->
@@ -345,6 +339,13 @@
           </template>
         </xd-down-drawer>
       </template>
+      <CusVipOpenDialog
+        v-if="!isVip"
+        :bgImg="openVipBgImg"
+        :btnBgImg="openVipBtnBgImg"
+        @onOpen="handleOpenVip"
+        @onClose="handleCloseOpenVip"
+      ></CusVipOpenDialog>
     </view>
   </view>
 </template>
@@ -374,6 +375,7 @@
   import XdAddrDefault from "./XdAddrDefault"
   import CusPrice from '@/components/CusPrice/CusPrice'
   import CusVipList from "@/components/CusVipList/CusVipList"
+  import CusVipOpenDialog from "@/components/CusVipOpenDialog/CusVipOpenDialog"
   export default {
     // #ifdef MP-WEIXIN
     options: { styleIsolation: 'shared' },
@@ -396,6 +398,7 @@
       XdAddrOld,
       CusPrice,
       CusVipList,
+      CusVipOpenDialog
     },
     mixins: [componentsMixins,extsMixins,JfbMallConfirmMixin,OrderMixin],
     data() {
@@ -534,7 +537,10 @@
         showLogisticsTip: "Y",
         logisticsTipText: "",
         checkPayMethod: [],
-        ticketPositionStatus: "N"
+        ticketPositionStatus: "N",
+        openVipBtnBgImg: "",
+        openVipBgImg: "",
+        openVipPath: ""
       }
     },
     computed: {
@@ -765,7 +771,10 @@
       this.isPreview = this.$configProject['isPreview'];
       this.is_plus_site = this.projectAttr.headers['X-Site-Group']==="vip";
       this.init(this.container);
-      this.isVip = this.getTokenForKey('user_level') === 'VIP';
+      this.isVip = this.getTokenForKey('user_level') && this.getTokenForKey('user_level') === 'VIP' ? true : false;
+      if (this.$configProject['isPreview']) {
+        this.isVip=true
+      }
       console.log("this.isVip", this.isVip);
     },
     methods: {
@@ -882,7 +891,13 @@
         this.coupon_layout = gCPVal(container, 'coupon_layout', ['1']);
         this.checkPayMethod = gCPVal(container, 'checkPayMethod', []);
         console.log("this.checkPayMethod", this.checkPayMethod);
-
+        this.openVipBgImg = getServiceUrl(
+          getContainerPropsValue(container, "content.openVipBgImg", { url: "" }).url,
+        );
+        this.openVipBtnBgImg = getServiceUrl(
+          getContainerPropsValue(container, "content.openVipBtnBgImg", { url: "" }).url
+        );
+        this.openVipPath = getContainerPropsValue(container, "content.openVipPath", { value: "" }).value;
         if(this.skipToPay === 'N'){
           this.hasAlertCardChose = true;
         }
@@ -1490,7 +1505,7 @@
           }
         }
         if(this.is_show_vip_card_list === 'Y' && !this.vipCardList.length){
-          this.p_getVipList();
+          // this.p_getVipList();
         }
 
       },
@@ -1559,6 +1574,14 @@
         })
         this.p_getCartConfirm();
       },
+      handleCloseOpenVip() {
+        this.$xdUniHelper.navigateBack()
+      },
+      handleOpenVip() {
+        this.$xdUniHelper.navigateTo({
+          url: this.openVipPath
+        })
+      },
 
       onJfbShow(options) {
         console.log('event.onJfbShow', options)

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

@@ -623,6 +623,46 @@ export default function (data={},gValue={},gColor={},oldData) {
         showAlpha: true
       },
     },
-    {ele: "group_end"},
+    { ele: "group_end" },
+    {
+      label: "开通PLUS背景图",
+      ele: 'xd-upload',
+      valueKey: "openVipBgImg",
+      groupKey: "style",
+      value: data.openVipBgImg || {},
+      defaultValue: data.openVipBgImg || null,
+      slot: true,
+      oneWidth: 355,
+      oneHeight: 355,
+      elinputClassName: 'input40',
+      tipsformet: '上传文件格式：@imageType@，不超过@size@MB.建议宽度为<span style="color:red">710px</span>，高度为<span style="color:red">710px</span>',
+      type: ['jpg', 'png', 'jpeg'],
+      styleType: 'one',
+      uploadType: 'aliyun',
+      size: 5,
+      action: 'action',
+      sort: true,
+      maxlen: 100,
+    },
+    {
+      label: "开通PLUS按钮背景图",
+      ele: 'xd-upload',
+      valueKey: "openVipBtnBgImg",
+      groupKey: "style",
+      value: data.openVipBtnBgImg || {},
+      defaultValue: data.openVipBtnBgImg || null,
+      slot: true,
+      oneWidth: 223,
+      oneHeight: 44,
+      elinputClassName: 'input40',
+      tipsformet: '上传文件格式：@imageType@，不超过@size@MB.建议宽度为<span style="color:red">446px</span>，宽度为<span style="color:red">88px</span>',
+      type: ['jpg', 'png', 'jpeg'],
+      styleType: 'one',
+      uploadType: 'aliyun',
+      size: 5,
+      action: 'action',
+      sort: true,
+      maxlen: 100,
+    },
   ]
 }

package/src/components/JfbMallResourceShop/XdBaiduMap.vue

@@ -15,8 +15,8 @@
 
 <script>
 
-  import BaiduMap from 'modules/vue-baidu-map/components/map/Map.vue';
-  import BmMarker from 'modules/vue-baidu-map/components/overlays/Marker';
+  import BaiduMap from 'vue-baidu-map/components/map/Map.vue';
+  import BmMarker from 'vue-baidu-map/components/overlays/Marker';
 
   export default {
     name: "XdBaiduMap",
@@ -48,7 +48,7 @@
       if(!this.ak) throw new Error('请传入百度AK值');
     },
     methods:{
-
+    
     }
   }
 </script>

package/src/components/JfbMallShop/XdBaiduMap.vue

@@ -15,8 +15,8 @@
 
 <script>
 
-  import BaiduMap from 'modules/vue-baidu-map/components/map/Map.vue';
-  import BmMarker from 'modules/vue-baidu-map/components/overlays/Marker';
+  import BaiduMap from 'vue-baidu-map/components/map/Map.vue';
+  import BmMarker from 'vue-baidu-map/components/overlays/Marker';
 
   export default {
     name: "XdBaiduMap",
@@ -48,7 +48,7 @@
       if(!this.ak) throw new Error('请传入百度AK值');
     },
     methods:{
-
+    
     }
   }
 </script>

package/src/components/JfbMallShopVip/Api.js

@@ -7,18 +7,10 @@
 module.exports = [
   {
     mapFnName: 'getNearbyVipShopList',
-    title: '下线门店列表',
-    path: '/mall/v1/shop/list',
+    title: '获取附近门店列表',
+    path: '/mall/v1/shop/msearch',
     isRule: false,
-    params: {
-      brand_ids: ['品牌ID', 'String', 'true'],
-      keyword: ['搜索关键字', 'String', 'true'],
-      city_code: ['城市CODE', 'String', 'true'],
-      latitude: ['纬度', 'String', 'true'],
-      longitude: ['经度', 'String', 'true'],
-      xnamespace: ['业务线', 'String','true'],
-      consume_mode:['服务类型', 'String','true']
-    },
+    params: {},
     isConsole: true,
     disabled: true,
   },