jufubao-mall 1.0.39 → 1.0.40-beta2

package/package.json

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

package/src/components/JfbMallBrandWall/Attr.js

@@ -7,6 +7,20 @@ export default {
   style: [],
   content: (data) => {
     return [
+      {
+        label: '更改分类label(可排序):',
+        ele: 'xd-set-sort-label',
+        valueKey: 'newLabel',
+        value: data['newLabel'] || null,
+        disabled: false,
+        defaultValue: data['newLabel'],
+        list: [
+          {label: "全部", value: "all",sort:1},
+          {label: "线上", value: "stod",sort:2},
+          {label: "线下", value: "sell",sort:3},
+          {label: "电子码", value: "code",sort:4}
+        ]
+      },
       {
         label: "选择业务线",
         ele: "xd-choose-namespace",

package/src/components/JfbMallBrandWall/JfbMallBrandWall.vue

@@ -138,6 +138,7 @@
         isTitleBorderW: '',
         isTitleBorderColor:'',
         titlePadding: '',
+        newLabel: []
       }
     },
     computed: {
@@ -145,6 +146,16 @@
         stateCity: state => state.cityLocation.city
       }),
       showTabs(){
+        this.tabs.forEach((item1, index) => {
+        const item2 = this.newLabel.find((item) => item.value === item1.value);
+
+        if (item2) {
+          item1.label = item2.newLabel||item1.label;
+          item1.sort = item2.sort
+        }
+        });
+        this.tabs.sort((a,b)=>a.sort - b.sort) 
+        console.log(this.tabs,'amamamaam');
         if(this.has_sell) return this.tabs;
         else return this.tabs.filter(item => item.value !== 'sell');
       },
@@ -191,6 +202,23 @@
     watch: {
       container(value) {
         this.init(value)
+      },
+      newLabel: {
+        deep:true,
+        handler(n,o) {
+          if(this.isPreview) {
+            // 遍历tabs，找到newLabel中value与item1.value相同的项，将其赋值给item1.label
+           this.tabs.forEach((item1, index) => {
+              const item2 = this.newLabel.find((item) => item.value === item1.value);
+
+              if (item2) {
+                item1.label = item2.newLabel||item1.label;
+                item1.sort = item2.sort
+              }
+              });
+             this.tabs.sort((a,b)=>a.sort - b.sort) 
+          }
+        }
       }
     },
     created() {
@@ -240,7 +268,7 @@
         this.isContBorderW = getContainerPropsValue(container, 'content.isContBorderW', 0);
         this.radius = getContainerPropsValue(container, 'content.radius', 0);
         this.contentBoxBgc = getContainerPropsValue(container, 'content.contentBoxBgc', 'rgba(0,0,0,0)');
-        
+        this.newLabel = getContainerPropsValue(container, 'content.newLabel', []);
         
       },
       switchTab(i){

package/src/components/JfbMallShop/Attr.js

@@ -7,7 +7,62 @@ export default {
   style: [],
   content: (data) => {
     return [
-      
+      {
+        label: '是否展示随心兑:',
+        ele: 'xd-radio',
+        valueKey: 'isShowExchange',
+        value: data.isShowExchange || "Y",
+        rules: [
+          {required: true, message: '请选择', trigger: ['blur', 'change']}
+        ],
+        list: [
+          {"label": "显示", "value": "Y"},
+          {"label": "隐藏", "value": "N"},
+        ]
+      },
+      {
+        label: '名称:', //label
+        ele: 'el-input', //package 名称
+        type: 'text',
+        valueKey: 'name', //form[valueKey]
+        value: data.name || '', //v-model
+        placeholder: '请输入随心兑名称',
+        className: 'input80', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
+        rules: [
+          {
+            required: true,
+            message: '请输入随心兑名称',
+            trigger: 'blur'
+          },
+        ]
+      },
+      {
+        label: '备注:', //label
+        ele: 'el-input', //package 名称
+        type: 'text',
+        valueKey: 'remark', //form[valueKey]
+        value: data.remark || '', //v-model
+        placeholder: '请输入随心兑备注',
+        className: 'input80', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
+        rules: [
+          {
+            required: true,
+            message: '请输入随心兑备注',
+            trigger: 'blur'
+          },
+        ]
+      },
+      {
+        label: '随心兑跳转路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'exchangePath',
+        placeholder: '请选择随心兑跳转路径',
+        value: data['exchangePath'] || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
     ].filter(i=>i)
   },
   advanced: [

package/src/components/JfbMallShop/JfbMallShop.vue

@@ -31,7 +31,7 @@
               </view>
               <view class="shop_sub" v-if="0">
                 <view><xd-font-icon size="26" icon="icondianhuatubiao"></xd-font-icon></view>
-                <view>{{shopInfo.phone}}</view>
+                <view>{{shopInfo.phone}}</view></view>
               </view>
             </view>
           </view>
@@ -44,7 +44,13 @@
             </view>
           </xd-button>
         </view>
-        
+      </view>
+      <view v-if="isShowExchange==='Y'" class="shop_wrap-exchange">
+        <view>
+          <view style="margin-bottom:10rpx">{{exchangeName}}</view>
+          <view>{{exchangeRemark}}</view>
+        </view>
+        <xd-button @click="handleToExchange" style="margin:0" type="primary" size="small">去兑换</xd-button>
       </view>
       <view class="shop_map" v-if="initBaidu">
         <view class="_title">门店地图</view>
@@ -69,6 +75,7 @@
   import XdBaiduMap from "./XdBaiduMap"
   // #endif
   import { jfbRootExec } from "@/utils/xd.event";
+  import { getContainerPropsValue } from "@/utils/xd.base";
   import JfbMallShopMixin from "./JfbMallShopMixin";
   import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins"
@@ -96,11 +103,16 @@
         shopInfo: {},
         options: {},
         selfMask: true,
-        xnamespace: ""
+        xnamespace: "",
+        isShowExchange:'Y',
+        exchangeName: '',
+        exchangeRemark: '',
+        exchangePath: ''
       }
     },
     watch: {
       container(value) {
+        console.log('aaaa');
         this.init(value)
       }
     },
@@ -157,11 +169,21 @@
           this.$xdHideLoading();
         })
       },
+      handleToExchange() {
+        let params=Base64.encodeURI(`shop_id:${this.shopInfo.shop_id}`)
+        this.$xdUniHelper.navigateTo({
+          url: `${this.exchangePath}?x-params=${params}`
+        })
+      },
       /**
        * @description 监听事件变化
        * @param container {object} 业务组件对象自己
        */
       init(container) {
+        this.isShowExchange = getContainerPropsValue(container, 'content.isShowExchange', 'N');
+        this.exchangeName = getContainerPropsValue(container, 'content.name', '随心兑');
+        this.exchangeRemark = getContainerPropsValue(container, 'content.remark', '到店消费任意金额可用');
+        this.exchangePath = getContainerPropsValue(container, 'content.exchangePath', {value: ""}).value;
       },
       
       toCallPhone(){
@@ -213,6 +235,17 @@
         border-radius: unit(16, rpx);
         padding: unit(24, rpx);
         background: #FFFFFF;
+
+        &-exchange {
+          margin: unit(24, rpx) unit(42, rpx);
+          padding: unit(24, rpx);
+          background: #D8D8D8;
+          border-radius: unit(20,rpx);
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+          color: #3D3D3D;
+        }
         
         &-info {
           display: flex;

package/src/components/JfbMallShopList/Attr.js

@@ -45,6 +45,30 @@ export default {
         },
         inline: false,
       },
+      {
+        label: '是否支持聚好兑:',
+        ele: 'xd-radio',
+        valueKey: 'isShowExchange',
+        value: data.isShowExchange || "Y",
+        rules: [
+          {required: true, message: '请选择', trigger: ['blur', 'change']}
+        ],
+        list: [
+          {"label": "支持", "value": "Y"},
+          {"label": "不支持", "value": "N"},
+        ]
+      },
+      {
+        label: '兑换跳转路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'exchangePath',
+        placeholder: '请选择兑换跳转路径',
+        value: data['exchangePath'] || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
       ...styleForm.getForm(data, '内容配置')
     ].filter(i=>i)
   },

package/src/components/JfbMallShopList/JfbMallShopList.vue

@@ -59,7 +59,8 @@
               <view class="_name">{{item.resource_shop_name}}</view>
               <view class="distance" v-if="item.distance">{{item.distance}}</view>
             </view>
-            <view>
+            <view style="display:flex;justify-content:space-between">
+              <view>
               <view class="shop_sub">
                 <view class="_icon"><xd-font-icon size="28" icon="icondizhitubiao"></xd-font-icon></view>
                 <view>{{getAddress(item)}}</view>
@@ -68,17 +69,25 @@
                 <view class="_icon"><xd-font-icon size="28" icon="icondianhuatubiao"></xd-font-icon></view>
                 <view>{{item.phone}}</view>
               </view>
+              <view v-if="item.time_slot_name" class="shop_sub">
+                <view class="_icon"><xd-font-icon size="28" icon="iconshijian-01"></xd-font-icon></view>
+                <view>{{item.time_slot_name}}</view>
+              </view>
+              </view>
+              <xd-button @click="handleToExchange(item)" v-if="isShowExchange==='Y'" style="margin:0" type="primary" size="mini">去兑换</xd-button>
             </view>
           </view>
         </view>
       </view>
-      <view v-else-if="loaded" class="empty_data"> 该地区暂无门店数据</view>
+      <view v-else-if="loaded" class="empty_data">当前地址暂无符合条件的店铺
+换个地址看看吧～</view>
     </view>
   </view>
 </template>
 
 <script>
   import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+  import XdButton from '@/components/XdButton/XdButton'
   import { jfbRootExec } from "@/utils/xd.event";
   import JfbMallShopListMixin from "./JfbMallShopListMixin";
   import componentsMixins from "@/mixins/componentsMixins";
@@ -93,7 +102,8 @@
   export default {
     name: "JfbMallShopList",
     components: {
-      XdFontIcon
+      XdFontIcon,
+      XdButton
     },
     mixins: [componentsMixins,extsMixins,JfbMallShopListMixin],
     data() {
@@ -118,7 +128,9 @@
         choseCityPath: "",
         shopInfoPath: "",
         ...styleForm.getDataItem(),
-        selfMask: true
+        selfMask: true,
+        isShowExchange: 'Y',
+        exchangePath: ''
       }
     },
     watch: {
@@ -169,8 +181,10 @@
        * @param container {object} 业务组件对象自己
        */
       init(container) {
+        this.isShowExchange = getContainerPropsValue(container, 'content.isShowExchange', 'Y');
         this.choseCityPath = getContainerPropsValue(container, "content.choseCityPath", {value: ""}).value;
         this.shopInfoPath = getContainerPropsValue(container, "content.shopInfoPath", {value: ""}).value;
+        this.exchangePath = getContainerPropsValue(container, "content.exchangePath", {value: ""}).value;
         this.xnamespace = getContainerPropsValue(container, "content.xnamespace", this.projectAttr.business_code);
         styleForm.getInitItem(this, container );
       },
@@ -186,6 +200,12 @@
           url: this.shopInfoPath + `?${params}`
         })
       },
+      handleToExchange(item) {
+        let params=Base64.encodeURI(`shop_id:${item.shop_id}`)
+        this.$xdUniHelper.navigateTo({
+          url: `${this.exchangePath}?x-params=${params}`
+        })
+      },
       getList(){
         this.loading = true;
         this.$xdShowLoading({});
@@ -303,7 +323,7 @@
         color: #666;
       }
       .shop_list{
-        padding: unit(24, rpx);
+        // padding: unit(24, rpx);
         .shop_item{
           display: flex;
           justify-content: flex-start;
@@ -339,7 +359,7 @@
           display: flex;
           align-items: center;
           justify-content: space-between;
-          font-size: unit(32, rpx);
+          font-size: unit(24, rpx);
           line-height: unit(50, rpx);
           color: #242424;
           margin-bottom: unit(16, rpx);
@@ -365,9 +385,10 @@
         .shop_sub{
           display: flex;
           color: #999;
-          font-size: unit(24, rpx);
-          margin-bottom: unit(10, rpx);
+          font-size: unit(18, rpx);
+          margin-bottom: unit(8, rpx);
           line-height: unit(36, rpx);
+          max-width: unit(320,rpx);
           ._icon{
             width: unit(40, rpx);
             margin-right: unit(6, rpx);