jufubao-mall 2.0.16-beta9 → 2.0.17

package/package.json

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

package/src/components/JfbMallConfirm/Api.js

@@ -68,7 +68,7 @@ module.exports = [
   {
     mapFnName: 'cardList',
     title: '展示可选卡列表',
-    path: '/mall/v1/order/list-binded-cards',
+    path: '/mall/v1/order/list-binded-cards/mall',
     isRule: false,
     params: {},
     isConsole: true,
@@ -86,7 +86,7 @@ module.exports = [
   {
     mapFnName: 'selectCard',
     title: '选择卡',
-    path: '/mall/v1/order/use-binded-card',
+    path: '/mall/v1/order/use-binded-card/mall',
     isRule: false,
     data: {
       namespace: ['namespace', 'String', true],
@@ -119,7 +119,7 @@ module.exports = [
   {
     mapFnName: 'addCard',
     title: '添加卡',
-    path: '/mall/v1/order/use-new-card',
+    path: '/mall/v1/order/use-new-card/mall',
     isRule: false,
     data: {
       namespace: ['namespace', 'String', true],
@@ -266,7 +266,7 @@ module.exports = [
   {
     mapFnName: "useBindedWallet",
     title: "使用已绑钱包",
-    path: "/mall/v1/order/use-binded-wallet",
+    path: "/mall/v1/order/use-binded-wallet/mall",
     isRule: false,
     data: {
       selected_card_list_json: ['卡', 'string', true],

package/src/components/JfbMallNewShopList/JfbMallNewShopList.vue

@@ -514,7 +514,7 @@
 
         let data = {
           ...this.options,
-          namespace: 'cake',//this.xnamespace,
+          namespace: this.xnamespace,
           keyword: this.keyword,
           city_code: this.stateCity.city_code,
           type:'sell',

package/src/components/JfbMallShop/JfbMallShop.vue

@@ -285,7 +285,9 @@
         rowSpacing: 16,
         columnSpacing: 16,
         showPrice: "",
+        showDiscount: "",
         isAddCart: "",
+        differ: "",
       }
     },
     watch: {
@@ -293,6 +295,13 @@
         if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
         if (this.$configProject['isPreview']) this.init(value)
       },
+      isShowCodeProduct(value){
+        if(this.$configProject.isPreview){
+          if(value){
+            this.p_getProductList();
+          }
+        }
+      }
     },
     computed: {
       ...mapState({
@@ -305,11 +314,7 @@
       },
 
       outPadding(){
-        let str = `${this.checkValue(this.padding.top, 32)}rpx`;
-        str = `${str} ${this.checkValue(this.padding.right, 32)}rpx`;
-        str = `${str} ${this.checkValue(this.padding.bottom, 32)}rpx`;
-        str = `${str} ${this.checkValue(this.padding.left,32)}rpx`;
-        return str
+        return this.getMarginAndPadding(this.padding, 32);
       },
       contProductStyles(){
         let itemWidth = (750 - this.padding.right - this.padding.left - (this.columnSpacing * (this.row_num - 1))) / this.row_num;
@@ -340,7 +345,7 @@
         }
       },
       isShowCodeProduct(){
-        return this.showCode === 'Y' && this.shopInfo.consume_options.find(item => item.consume_mode === 'CODE')
+        return this.showCode === 'Y' && this.shopInfo.consume_options.findIndex(item => item.consume_mode === 'CODE') !== -1;
       },
       cartIcon(){
         return this.cartStyle || 'icongouwuche-01';
@@ -478,39 +483,45 @@
        * @param container {object} 业务组件对象自己
        */
       init(container) {
-        this.showExchange = gCPVal(container, 'showExchange', 'Y');
-        this.exchangeName = gCPVal(container, 'exchangeName', '聚好兑');
+        let isShowCashier = getContainerPropsValue(container, 'content.isShowCashier', '');
+        let isShowExchange = getContainerPropsValue(container, 'content.isShowExchange', '');
+        let oldShowCashier = isShowCashier || isShowExchange;
+
+        this.showExchange = oldShowCashier || gCPVal(container, 'showExchange', 'Y');
+        let exchangeOldName = gCPVal(container, 'name', '');
+        this.exchangeName = exchangeOldName || gCPVal(container, 'exchangeName', '聚好兑');
         this.exchangeBtnName = gCPVal(container, 'exchangeBtnName', '聚好兑');
         this.exchangeRemark = getContainerPropsValue(container, 'content.remark', '到店消费任意金额可用');
         this.exchangePath = getContainerPropsValue(container, 'content.exchangePath', {value: ""}).value;
-        this.showScan = gCPVal(container, 'showScan', 'Y');
+        this.showScan = oldShowCashier || gCPVal(container, 'showScan', 'Y');
         this.scanName = getContainerPropsValue(container, 'content.scanName', '扫码提货');
         this.scanBtnName = gCPVal(container, 'scanBtnName', '扫一扫')
         this.scanRemark = getContainerPropsValue(container, 'content.scanRemark', '');
         this.scanPath = getContainerPropsValue(container, 'content.scanPath', {value: ""}).value;
-        this.showTake = gCPVal(container, 'showTake', 'Y');
+        this.showTake = oldShowCashier || gCPVal(container, 'showTake', 'Y');
         this.takeBtnName = gCPVal(container, 'takeBtnName', '去提货');
         this.takeName = getContainerPropsValue(container, 'content.takeName', '快捷提货');
         this.takeRemark = getContainerPropsValue(container, 'content.takeRemark', '');
         this.takePath = getContainerPropsValue(container, 'content.takePath', {value: ""}).value;
-        this.showMovie = gCPVal(container, 'showMovie', 'Y');
+        this.showMovie = gCPVal(container, 'showMovie', ['Y',"N"], {isOld: true});
         this.movieName = gCPVal(container, 'movieName', '在线选座');
         this.movieBtnName = gCPVal(container, 'movieBtnName', '去订票');
         this.moviePath = getContainerPropsValue(container, 'content.moviePath', {value: ""}).value;
-        this.showFood = gCPVal(container, 'showFood', 'Y');
+        this.showFood = gCPVal(container, 'showFood', ['Y',"N"], {isOld: true});
+        console.log("this.showFood", this.showFood);
+
         this.foodName = gCPVal(container, 'foodName', '到店自取');
         this.foodBtnName = gCPVal(container, 'foodBtnName', '去下单');
         this.foodPath = getContainerPropsValue(container, 'content.foodPath', {value: ""}).value;
-        this.showTravel = gCPVal(container, 'showTravel', 'Y');
+        this.showTravel = gCPVal(container, 'showTravel', ['Y',"N"], {isOld: true});
         this.travelName = gCPVal(container, 'travelName', '旅游门店');
         this.travelBtnName = gCPVal(container, 'travelBtnName', '去订票');
         this.travelPath = getContainerPropsValue(container, 'content.travelPath', {value: ""}).value;
-        this.showCode = gCPVal(container, 'showCode', 'Y');
+        this.showCode = gCPVal(container, 'showCode', ['Y',"N"], {isOld: true});
         this.productInfoPath = getContainerPropsValue(container, 'content.productInfoPath', {value: ""}).value;
         this.codePath = getContainerPropsValue(container, 'content.codePath', {value: ""}).value;
 
-        this.isShowCashier = getContainerPropsValue(container, 'content.isShowCashier', 'Y');
-        this.padding =  getContainerPropsValue(container, "content.padding",{});
+        this.padding = gCPVal(container, 'padding', [16], {sKey: 'paddingStatus', isPMR:true, isCPM: true, fields:['padding']});
         this.spacing = Number(getContainerPropsValue(container, 'content.spacing', 32));
 
         //商品样式关联属性
@@ -533,7 +544,9 @@
         this.cartStyle = gCPVal(container, 'cartStyle', 'icongouwuche-01');
         this.cartName = gCPVal(container, 'cartName', '购买');
         this.showPrice = gCPVal(container, 'showPrice', 'Y');
+        this.showDiscount = gCPVal(container, 'showDiscount', 'Y');
         this.isAddCart = gCPVal(container, 'isAddCart', 'Y');
+        this.differ = gCPVal(container, 'differ', 1);
 
         console.log("cartStyle", this.cartName, this.cartStyle);
 
@@ -541,6 +554,12 @@
         console.log("this.row_num", this.row_num);
       },
       p_getProductList(){
+        let params = {}
+        if(this.showPrice==='Y' && this.showDiscount==='Y'){
+          params.is_show_uprice = this.$xdUniHelper.multiplyFloatNumber(this.differ,100)
+        } else {
+          params.is_show_uprice=-1
+        }
         jfbRootExec("getShopProductList", {
           vm: this,
           data: {
@@ -554,6 +573,7 @@
             sort: 'default',
             page_size: this.page_size,
             page_token: this.page_token,
+            ...params,
           }
         }).then(res => {
           let list = res.list.map(item => {

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

@@ -14,7 +14,9 @@ export default function (data, gValue,gColor,oldData){
   if(gValue.isAdd === true && gValue.isFirst) {
     showOtherEnter = "Y";
   }
-
+  if(data.name){
+    data.exchangeName = data.exchangeName || data.name;
+  }
   return [
     {
       ele: 'title',
@@ -114,7 +116,7 @@ export default function (data, gValue,gColor,oldData){
       ele: 'el-input',
       valueKey: 'exchangeName',
       labelInline: true,
-      value: dataVal({ data, key: 'exchangeName', dValue: data.name||'', gValue }),
+      value: dataVal({ data, key: 'exchangeName', dValue: '', gValue }),
       hidden: data.showExchange !== 'Y',
       groupKey: 'content',
       className: 'input80',

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

@@ -52,7 +52,7 @@ export default function (data={},gValue={},gColor={},oldData) {
       value: dataVal({
         data,
         key:'padding',
-        dValue:[0],
+        dValue:[16],
         gValue,
         isPM: true,
         isCPM: true,

package/src/components/JfbMallShopList/JfbMallShopList.vue

@@ -21,7 +21,7 @@
       <view
         class="query_wrap"
         v-if="showQuery === 'Y'"
-        :class="{isFixed:isFixed}" 
+        :class="{isFixed:isFixed}"
         :style="[queryWrapStyle]"
       >
         <view class="query_item" style="visibility:hidden" @click="switchQueryModal('sort')">
@@ -225,7 +225,7 @@
         filterBgcColor:'',
         filterColor: '',
         filterStyle: {},
-        showQuery:'',   
+        showQuery:'',
         isFixed: false,
         keyFilter: 'keyFilter',
         brand_ids: "",
@@ -597,7 +597,7 @@
 
   .jfb-mall-shop-list {
     &__body{
-      z-index: 101;
+      z-index: 99;
       .query_header_fixed{
         height: unit(100, rpx);
       }
@@ -637,7 +637,7 @@
           border-top: 1px solid #F5F5F5;
           width: 100%;
         }
-        
+
       }
       .modal{
         position: fixed;
@@ -725,7 +725,7 @@
             height: unit(40, rpx);
             border-radius: unit(20, rpx);
             line-height: unit(40, rpx);
-            color: #FF8D1A; 
+            color: #FF8D1A;
             font-size: unit(20, rpx);
             flex-shrink: 0;
             margin-left: unit(16, rpx);