Commit 44c74735 by 谢中龙

修改参数

parent cb25350b
...@@ -454,7 +454,7 @@ const prod_brand_config = { ...@@ -454,7 +454,7 @@ const prod_brand_config = {
touchPointStorageTime: 30 * 60 * 1000,//单位毫秒 touchPointStorageTime: 30 * 60 * 1000,//单位毫秒
orderingMustOpenCard: false, orderingMustOpenCard: false,
canRefundDaysAfterDelivery: 15,//发货后多少天之内可显示申请退款按钮 canRefundDaysAfterDelivery: 15,//发货后多少天之内可显示申请退款按钮
isOpenSelfMention: true, // 是否开启门店自提 isOpenSelfMention: false, // 是否开启门店自提
hasLiveVideo : false,//是否有直播功能 hasLiveVideo : false,//是否有直播功能
guiderCanScanQrcode: true,//导购是否有扫一扫功能 guiderCanScanQrcode: true,//导购是否有扫一扫功能
isNeedGetLocation: true,//是否开启小程序获取位置(提交订单时获取门店信息) isNeedGetLocation: true,//是否开启小程序获取位置(提交订单时获取门店信息)
......
...@@ -42,6 +42,7 @@ wxService.page({ ...@@ -42,6 +42,7 @@ wxService.page({
currentTab:'recommend', currentTab:'recommend',
proStyle:false, proStyle:false,
tagId : null, tagId : null,
pageFrom : '',
}, },
/** /**
...@@ -49,8 +50,9 @@ wxService.page({ ...@@ -49,8 +50,9 @@ wxService.page({
*/ */
onLoad: function (options) { onLoad: function (options) {
let type = options.type; let type = options.type;
this.data.pageFrom = type;
//说明是从分类中过来的 //说明是从分类中过来的
if(!type){ if(!type || type == 'category'){
if (options && options.id) { if (options && options.id) {
this.setData({ this.setData({
'form.mallCategoryId': options.id 'form.mallCategoryId': options.id
...@@ -149,7 +151,12 @@ wxService.page({ ...@@ -149,7 +151,12 @@ wxService.page({
this.data.form.order = 'desc'; this.data.form.order = 'desc';
} }
wxService.post(`/sale/product/mallCategory/listPageProductByMallCategoryIdAndItsSons?pageNo=${pageNo}&pageSize=${pageSize}`, this.data.form).then(res => { let url = `/sale/product/mallCategory/listPageProductByMallCategoryIdAndItsSons?pageNo=${pageNo}&pageSize=${pageSize}`;
if(this.data.pageFrom == 'category'){
url = `/sale/product/buyer/listPageByCategoryId?pageNo=${pageNo}&pageSize=${pageSize}`
}
wxService.post(url, this.data.form).then(res => {
const { result, data } = res.data const { result, data } = res.data
if (result == 0 && data.content) { if (result == 0 && data.content) {
wx.hideLoading() wx.hideLoading()
......
...@@ -55,7 +55,7 @@ function currentLinkRouter(event, _this) { ...@@ -55,7 +55,7 @@ function currentLinkRouter(event, _this) {
} else if (curItemType.link.type == 8) { } else if (curItemType.link.type == 8) {
wxService.router(`/pages/productDetail/productDetail?id=${currentClickType}`) wxService.router(`/pages/productDetail/productDetail?id=${currentClickType}`)
} else if (curItemType.link.type == 9) { } else if (curItemType.link.type == 9) {
wxService.router(`/subPackage/page/pages/categoryPro/categoryPro?id=${currentClickType}`) wxService.router(`/subPackage/page/pages/categoryPro/categoryPro?id=${currentClickType}&type=category`)
} else if (curItemType.link.type == 10) { } else if (curItemType.link.type == 10) {
wxService.router(`/subPackage/page/pages/categoryPro/categoryPro?id=${currentClickType}&type=pTag`) wxService.router(`/subPackage/page/pages/categoryPro/categoryPro?id=${currentClickType}&type=pTag`)
} }
...@@ -80,7 +80,7 @@ function currentLinkRouter(event, _this) { ...@@ -80,7 +80,7 @@ function currentLinkRouter(event, _this) {
} }
else if (rowObj.type == 9) { else if (rowObj.type == 9) {
// 分类 // 分类
wxService.router(`/subPackage/page/pages/categoryPro/categoryPro?id=${currentClickRow}`) wxService.router(`/subPackage/page/pages/categoryPro/categoryPro?id=${currentClickRow}&type=category`)
} else if (rowObj.type == 10) { } else if (rowObj.type == 10) {
wxService.router(`/subPackage/page/pages/categoryPro/categoryPro?id=${currentClickRow}&type=pTag`) wxService.router(`/subPackage/page/pages/categoryPro/categoryPro?id=${currentClickRow}&type=pTag`)
} }
...@@ -102,7 +102,7 @@ function currentLinkRouter(event, _this) { ...@@ -102,7 +102,7 @@ function currentLinkRouter(event, _this) {
} }
else if (rowObj.type == 9) { else if (rowObj.type == 9) {
// 分类 // 分类
wxService.router(`/subPackage/page/pages/categoryPro/categoryPro?id=${currentClickRow}`) wxService.router(`/subPackage/page/pages/categoryPro/categoryPro?id=${currentClickRow}&type=category`)
} else if (rowObj.type == 10) { } else if (rowObj.type == 10) {
wxService.router(`/subPackage/page/pages/categoryPro/categoryPro?id=${currentClickRow}&type=pTag`) wxService.router(`/subPackage/page/pages/categoryPro/categoryPro?id=${currentClickRow}&type=pTag`)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment