diff --git a/pages.json b/pages.json index 8a4ae0e..2b1374a 100644 --- a/pages.json +++ b/pages.json @@ -303,7 +303,7 @@ { "path": "user_spread_code/index", "style": { - "navigationBarTitleText": "分销海报" + "navigationBarTitleText": "分享海报" } }, { diff --git a/pages/activity/combination_details/index.vue b/pages/activity/combination_details/index.vue index be32a96..a75e928 100644 --- a/pages/activity/combination_details/index.vue +++ b/pages/activity/combination_details/index.vue @@ -194,9 +194,9 @@ {{storeInfo.merchant.type_name}} 自营 - + 进店 diff --git a/pages/activity/goods_seckill_details/index.vue b/pages/activity/goods_seckill_details/index.vue index 8fe9b9c..4fd1a65 100644 --- a/pages/activity/goods_seckill_details/index.vue +++ b/pages/activity/goods_seckill_details/index.vue @@ -117,9 +117,9 @@ {{storeInfo.merchant.type_name}} 自营 - + 进店 diff --git a/pages/activity/lifeService/index.vue b/pages/activity/lifeService/index.vue index cd9876f..bfee17d 100644 --- a/pages/activity/lifeService/index.vue +++ b/pages/activity/lifeService/index.vue @@ -43,9 +43,9 @@ 自营 - + diff --git a/pages/activity/presell_details/index.vue b/pages/activity/presell_details/index.vue index 4d1f7a4..b211c2b 100644 --- a/pages/activity/presell_details/index.vue +++ b/pages/activity/presell_details/index.vue @@ -169,9 +169,9 @@ {{storeInfo.merchant.type_name}} 自营 - + 进店 diff --git a/pages/admin/goods_details/index.vue b/pages/admin/goods_details/index.vue index 1fccb8d..411be61 100644 --- a/pages/admin/goods_details/index.vue +++ b/pages/admin/goods_details/index.vue @@ -223,10 +223,10 @@ {{storeInfo.merchant.type_name}} 自营 - + diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue index 23d01c3..8e948af 100644 --- a/pages/order_details/index.vue +++ b/pages/order_details/index.vue @@ -90,7 +90,7 @@ {{orderInfo.take.mer_take_address}} - + {{orderInfo.merchant.mer_name}} diff --git a/pages/shop/shop.vue b/pages/shop/shop.vue index 99571d3..b9fe5d9 100644 --- a/pages/shop/shop.vue +++ b/pages/shop/shop.vue @@ -275,7 +275,7 @@ this.latitude = res.latitude this.longitude = res.longitude console.log(res) - this.storeMerchantList('') + this.searchSubmit() getGeocoder({ lat: latitude, long: longitude @@ -347,10 +347,10 @@ }); }, searchSubmit(){ - console.log("uuuuu",this.where.keyword) + this.sotreParam.page = 1; this.storeList=[] - this.storeMerchantList('') + this.storeMerchantList() }, // 查找店铺 @@ -373,7 +373,12 @@ item.allScore = tempNum.toFixed(2) }) this.storeScroll = res.data.list.length >= this.sotreParam.limit - this.storeList = this.storeList.concat(res.data.list) + if(type){ + this.storeList = this.storeList.concat(res.data.list) + }else{ + this.storeList = res.data.list + } + this.count = res.data.count this.loading = false }) @@ -386,7 +391,7 @@ this.sotreParam.page = 1 this.storeScroll = true this.storeList = [] - this.storeMerchantList() + this.searchSubmit() }, onLoadFun: function(e) { @@ -427,7 +432,7 @@ }); } else { this.sotreParam.page += 1 - this.storeMerchantList() + this.storeMerchantList(true) } } }, diff --git a/pages/shop/shop1.vue b/pages/shop/shop1.vue index 2a66bf1..22d23c1 100644 --- a/pages/shop/shop1.vue +++ b/pages/shop/shop1.vue @@ -275,7 +275,7 @@ this.latitude = res.latitude this.longitude = res.longitude console.log(res) - this.storeMerchantList('') + this.searchSubmit() getGeocoder({ lat: latitude, long: longitude @@ -347,10 +347,10 @@ }); }, searchSubmit(){ - console.log("uuuuu",this.where.keyword) + this.sotreParam.page = 1; this.storeList=[] - this.storeMerchantList('') + this.storeMerchantList() }, // 查找店铺 @@ -373,7 +373,12 @@ item.allScore = tempNum.toFixed(2) }) this.storeScroll = res.data.list.length >= this.sotreParam.limit - this.storeList = this.storeList.concat(res.data.list) + if(type){ + this.storeList = this.storeList.concat(res.data.list) + }else{ + this.storeList = res.data.list + } + this.count = res.data.count this.loading = false }) @@ -386,7 +391,7 @@ this.sotreParam.page = 1 this.storeScroll = true this.storeList = [] - this.storeMerchantList() + this.searchSubmit() }, onLoadFun: function(e) { @@ -427,7 +432,7 @@ }); } else { this.sotreParam.page += 1 - this.storeMerchantList() + this.storeMerchantList(true) } } }, diff --git a/pages/store/detail/index.vue b/pages/store/detail/index.vue index c058ecf..07ea40d 100644 --- a/pages/store/detail/index.vue +++ b/pages/store/detail/index.vue @@ -24,7 +24,7 @@ 自营 - {{ store.care_count}}人关注 + diff --git a/pages/store/shopStreet/index.vue b/pages/store/shopStreet/index.vue index a294bfc..75c4bc3 100644 --- a/pages/store/shopStreet/index.vue +++ b/pages/store/shopStreet/index.vue @@ -54,9 +54,9 @@ 自营 - + @@ -93,9 +93,9 @@ 自营 - + @@ -132,9 +132,9 @@ 自营 - + diff --git a/pages/user/index.vue b/pages/user/index.vue index 6be65ab..5cfe50e 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -150,7 +150,7 @@ - + 我的服务 diff --git a/pages/users/user_address_list/index.vue b/pages/users/user_address_list/index.vue index d2f8f76..69370bd 100644 --- a/pages/users/user_address_list/index.vue +++ b/pages/users/user_address_list/index.vue @@ -483,7 +483,8 @@ .noCommodity{ text-align: center; border-top: none; - margin-top: 15vh; + // margin-top: 15vh; + padding-top:15vh; } .noCommodity .pictrue{ height: 305rpx;