jufubao-mall 2.0.16-beta4 → 2.0.16-beta5

package/package.json

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

package/src/components/JfbMallNewShopList/JfbMallNewShopList.vue

@@ -76,6 +76,11 @@
           @on-event="handleToEvent"
         ></cus-shops>
       </view>
+      <xd-more
+        v-if="(isPreview || !hasNextPage) && (shopList && shopList.length > 0)"
+        :color="footerColor"
+        :background="footerColor"
+      ><text>我是有底线的</text></xd-more>
     </view>
   </view>
 </template>
@@ -92,6 +97,7 @@
   import XdQueryFilter from "./XdQueryFilter"
   import { baseIsEmpty, } from "@/utils/xd.base";
   import CusShops from "@/components/CusShops/CusShops.vue";
+  import XdMore from "@/components/XdMore/XdMore.vue";
   let $vm = null;
 
   export default {
@@ -101,11 +107,13 @@
       XdFontIcon,
       XdButton,
       XdQueryFilter,
+      XdMore
     },
     mixins: [componentsMixins,extsMixins,JfbMallNewShopListMixin],
     data() {
       return {
         //系统变量
+        isPreview:false,
         closeMask: true,
         shopList: null,
         page_size: 10,
@@ -135,6 +143,7 @@
         bodyPadding:{},
         contentBgColor:'rgba(0,0,0,0)',
         cusStyle:{}, //门店样式设置
+        footerColor:'#ddd',
 
 
         //搜索条件
@@ -176,6 +185,9 @@
           }, 500)
         }
       },
+      showQuery(val){
+        if(val === 'Y') this.getSearchFilterList();
+      },
     },
     filters:{
       filterLabels(val){
@@ -263,7 +275,7 @@
         this.serverType = gCPVal(container, 'serverType', [['SELL']]);
         this.shopType = gCPVal(container, 'shopType', '');
         this.shopListStyle =  gCPVal(container, 'shopListStyle', 'v2');
-        this.showQuery = gCPVal(container, 'showQuery', 'N');
+        this.showQuery = 'Y'//gCPVal(container, 'showQuery', 'N');
         if(this.showQuery === 'Y') this.filterMode = gCPVal(container, 'filterMode', [['filter']])
         else this.filterMode = [];
 
@@ -328,7 +340,7 @@
         //高级属性
         this.shopInfoPath = gCPVal(container, "shopInfoPath", {value: ""}).value;
         this.isAutoJump = gCPVal(container, 'isAutoJump', []);
-        this.scanPath = gCPVal(container, 'cscanPath', {value: ''}).value;
+        this.scanPath = gCPVal(container, 'scanPath', {value: ''}).value;
         this.jhdPath = gCPVal(container, "jhdPath", {value: ""}).value;
         this.qpPath = gCPVal(container, 'qpPath', {value: ''}).value;
         this.seatPath = gCPVal(container, 'seatPath', {value: ''}).value;
@@ -567,6 +579,7 @@
       //==system event===
       onJfbLoad(options) {
 
+
         //测试数据
         // options['brand_id'] = '1007871,100535';
         // options['shop_category_ids'] = 'book,cake';

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

@@ -306,6 +306,33 @@ export default (data, gValue, gColor, oldData={})=>{
           {value:'travel', label: '旅游门票',input:'',def:'去订票',check: false,placeholder:''}
         ])
       },
+      rules:[{
+        validator: (rule, value, callback) => {
+          debugger
+          let errorStr = '';
+          //设置为空
+          if(!value || (value && value.length === 0)) {
+            callback();
+            return;
+          }
+          //非空，判断设置的名称长度不能大于4
+          if(value && value.length > 0) {
+            let len = value.length;
+            for(let i = 0; i < len; i++) {
+              if(value[i].input.length > 4) {
+                errorStr = `${value[i].label}名称最大长度不能超过4个汉字`;
+                break
+              }
+            }
+          }
+          if(errorStr) {
+            callback(errorStr)
+            return
+          }
+
+          callback()
+        }, message: '输入名称内容最多4字', trigger: ['blur', 'change']
+      }]
     },
     {ele: 'group_end'},
   ].filter(i=>i)

package/src/components/JfbMallShop/JfbMallShop.vue

@@ -263,6 +263,7 @@
         travelPath: "",
         showCode: '',
         productInfoPath: "",
+        codePath: "",
 
         cartStyle: '',
         cartName: "",
@@ -502,6 +503,7 @@
         this.travelPath = getContainerPropsValue(container, 'content.travelPath', {value: ""}).value;
         this.showCode = gCPVal(container, 'showCode', 'Y');
         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",{});
@@ -605,7 +607,8 @@
         let sy = `${item.province_name}${item.city_name}${item.area_name}${item.street_name}`;
         return `${sy}${item.address}`;
       },
-      handleToExchange(key) {
+      handleToExchange(item) {
+        let key = item.consume_mode;
         let params = JSON.parse(JSON.stringify(this.options || {}));
         if(params['shop_id']) delete params['shop_id'];
         params['x-params'] = Base64.encodeURI(`shop_id:${this.shopInfo.shop_id}`);
@@ -669,7 +672,7 @@
       },
       handleDetail(item){
         if (this.$configProject['isPreview'])return;
-        toProductDetail(this, item, this.productInfoPath, true);
+        toProductDetail(this, item, this.codePath, true);
       },
       toCallPhone(){
         uni.makePhoneCall({

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

@@ -104,20 +104,20 @@ export default (data)=>{
       },
       inline: false,
     },
-    {
-      label: '商品详情:',
-      ele: 'xd-select-pages-path',
-      valueKey: 'productInfoPath',
-      placeholder: '请选择旅游门票跳转路径',
-      groupKey:'advanced',
-      value: data['productInfoPath'] || null,
-      labelInline:true,
-      className: "input100",
-      setting: {
-        router: XdBus.getParentApi('getPagesTree'),
-      },
-      inline: false,
-    },
+    // {
+    //   label: '商品详情:',
+    //   ele: 'xd-select-pages-path',
+    //   valueKey: 'productInfoPath',
+    //   placeholder: '请选择旅游门票跳转路径',
+    //   groupKey:'advanced',
+    //   value: data['productInfoPath'] || null,
+    //   labelInline:true,
+    //   className: "input100",
+    //   setting: {
+    //     router: XdBus.getParentApi('getPagesTree'),
+    //   },
+    //   inline: false,
+    // },
 
     {
       label: '版本号:',

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

@@ -101,7 +101,8 @@ export default function (data, gValue,gColor,oldData){
       groupKey: 'content',
       className: 'input80',
       placeholder: "聚好兑",
-      inline: false
+      inline: false,
+      max: 5,
     },
     {
       label: '标题',
@@ -113,6 +114,7 @@ export default function (data, gValue,gColor,oldData){
       groupKey: 'content',
       className: 'input80',
       inline: false,
+      max: 5,
       placeholder: "聚好兑"
     },
     { ele: 'group_end' },
@@ -142,6 +144,7 @@ export default function (data, gValue,gColor,oldData){
       groupKey: 'content',
       className: 'input80',
       placeholder: "扫一扫",
+      max: 5,
       inline: false
     },
     {
@@ -154,6 +157,7 @@ export default function (data, gValue,gColor,oldData){
       groupKey: 'content',
       className: 'input80',
       inline: false,
+      max: 5,
       placeholder: "扫码提货"
     },
     { ele: 'group_end' },
@@ -183,6 +187,7 @@ export default function (data, gValue,gColor,oldData){
       groupKey: 'content',
       className: 'input80',
       placeholder: "去提货",
+      max: 5,
       inline: false
     },
     {
@@ -195,6 +200,7 @@ export default function (data, gValue,gColor,oldData){
       groupKey: 'content',
       className: 'input80',
       inline: false,
+      max: 5,
       placeholder: "快捷提货"
     },
     { ele: 'group_end' },
@@ -224,6 +230,7 @@ export default function (data, gValue,gColor,oldData){
       groupKey: 'content',
       className: 'input80',
       placeholder: "去订票",
+      max: 5,
       inline: false
     },
     {
@@ -236,6 +243,7 @@ export default function (data, gValue,gColor,oldData){
       groupKey: 'content',
       className: 'input80',
       inline: false,
+      max: 5,
       placeholder: "在线选座"
     },
     { ele: 'group_end' },
@@ -280,6 +288,7 @@ export default function (data, gValue,gColor,oldData){
       groupKey: 'content',
       className: 'input80',
       placeholder: "去下单",
+      max: 5,
       inline: false
     },
     {
@@ -292,6 +301,7 @@ export default function (data, gValue,gColor,oldData){
       groupKey: 'content',
       className: 'input80',
       inline: false,
+      max: 5,
       placeholder: "到店自取"
     },
     { ele: 'group_end' },
@@ -321,6 +331,7 @@ export default function (data, gValue,gColor,oldData){
       groupKey: 'content',
       className: 'input80',
       placeholder: "去订票",
+      max: 5,
       inline: false
     },
     {
@@ -333,6 +344,7 @@ export default function (data, gValue,gColor,oldData){
       groupKey: 'content',
       className: 'input80',
       inline: false,
+      max: 5,
       placeholder: "旅游门店"
     },
     { ele: 'group_end' },