|
|
@@ -280,7 +280,7 @@ export default {
|
|
|
}
|
|
|
|
|
|
//查看分享的路径,不要删除 shish 20210517
|
|
|
- console.log('share',`pagesPurchase/ghsProduct?hdShopAdminId=${this.loginInfo.shopAdminId}&ghsShopAdminId=${ghsShopAdminId}&shopId=${this.shopId}&id=0`)
|
|
|
+ console.log(`pagesPurchase/ghsProduct?hdShopAdminId=${this.loginInfo.shopAdminId}&ghsShopAdminId=${ghsShopAdminId}&shopId=${this.shopId}&id=0`)
|
|
|
|
|
|
return {
|
|
|
title: this.ghsInfo.name,
|
|
|
@@ -345,6 +345,11 @@ export default {
|
|
|
if(sceneArray.id){
|
|
|
this.option.id = sceneArray.id
|
|
|
}
|
|
|
+ }else{
|
|
|
+ if(this.option.hdShopAdminId || this.option.ghsShopAdminId){
|
|
|
+ this.ghsShopAdminId = this.option.ghsShopAdminId
|
|
|
+ this.hdShopAdminId = this.option.hdShopAdminId
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
const { shopId,id} = this.option;
|
|
|
@@ -354,18 +359,19 @@ export default {
|
|
|
this.ghsInfo = res.data
|
|
|
let id = res.data.id
|
|
|
this.ghsId = id
|
|
|
- this.visitMall(id)
|
|
|
//获取供货商花材
|
|
|
- this.initGhsData(id,shopId);
|
|
|
- this.createShareDiscount()
|
|
|
+ if(id>0){
|
|
|
+ this.visitMall(id)
|
|
|
+ this.initGhsData(id,shopId)
|
|
|
+ //不是新人或者已经下过单的或者活动没有开启不显示新人红包
|
|
|
+ if(this.ghsInfo.hasCg == 1 || this.ghsInfo.new == 0 || this.ghsInfo.xrFl == 0 || this.ghsInfo.sendNewGift == 1){
|
|
|
+ this.isNewCustom = false
|
|
|
+ }else{
|
|
|
+ this.isNewCustom = true
|
|
|
+ }
|
|
|
+ }
|
|
|
uni.setNavigationBarTitle({title: this.ghsInfo.name})
|
|
|
this.option.id = res.data.id;
|
|
|
- //不是新人或者已经下过单的或者活动没有开启不显示新人红包
|
|
|
- if(this.ghsInfo.hasCg == 1 || this.ghsInfo.new == 0 || this.ghsInfo.xrFl == 0 || this.ghsInfo.sendNewGift == 1){
|
|
|
- this.isNewCustom = false
|
|
|
- }else{
|
|
|
- this.isNewCustom = true
|
|
|
- }
|
|
|
}).catch(err => {})
|
|
|
} else {
|
|
|
this.ghsId = this.option.id
|
|
|
@@ -375,7 +381,6 @@ export default {
|
|
|
this.ghsInfo = res.data
|
|
|
this.shopId = res.data.shopId
|
|
|
this.visitMall(this.option.id)
|
|
|
- this.createShareDiscount()
|
|
|
uni.setNavigationBarTitle({title: this.ghsInfo.name})
|
|
|
//不是新人或者已经下过单的或者活动没有开启不显示新人红
|
|
|
if(this.ghsInfo.hasCg == 1 || this.ghsInfo.new == 0 || this.ghsInfo.xrFl == 0 || this.ghsInfo.sendNewGift == 1){
|
|
|
@@ -385,16 +390,11 @@ export default {
|
|
|
}
|
|
|
}).catch(err => {})
|
|
|
}
|
|
|
-
|
|
|
},
|
|
|
visitMall(ghsId){
|
|
|
- //访问商城
|
|
|
+ //访客记录
|
|
|
visitMall({id:ghsId})
|
|
|
},
|
|
|
- createShareDiscount(){
|
|
|
- let shareDiscount = this.ghsInfo.giveDiscount*100
|
|
|
- this.shareDiscount = shareDiscount
|
|
|
- },
|
|
|
scroll_detail(options){
|
|
|
if(options.detail.scrollTop > 20) {
|
|
|
this.myClass = 'fadeOut'
|