更新
This commit is contained in:
weipengfei
parent
15265e8f87
commit
b0e2e385d0
@ -11,8 +11,8 @@ let httpApiFive
|
||||
let wsApi
|
||||
|
||||
// 在打包之前请检查当前环境是否正确
|
||||
// const env = 'dev'; // 开发
|
||||
const env = 'prod'; // 生产
|
||||
const env = 'dev'; // 开发
|
||||
// const env = 'prod'; // 生产
|
||||
// const env = 'prew'; // 预上线
|
||||
|
||||
switch (env) {
|
||||
|
||||
@ -642,8 +642,8 @@
|
||||
this.longitude = e.longitude;
|
||||
this.latitude = e.latitude;
|
||||
this.$store.commit('setLocation', {
|
||||
lat: e.longitude,
|
||||
long: e.latitude,
|
||||
lat: e.latitude,
|
||||
long: e.longitude,
|
||||
});
|
||||
}
|
||||
this.$bus.$emit('value-updated', e.street.name + ',' + e.street.code);
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -96,7 +96,7 @@
|
||||
<view class='pictrue' style="margin: 0 auto;">
|
||||
<!-- <image src='../../../static/images/noCart.png'></image> -->
|
||||
<image src='@/static/images/no_short.png'></image>
|
||||
<text>暂无商品，切换其他分类或地区试试</text>
|
||||
<text>暂无商品, 试试其他分类/位置</text>
|
||||
</view>
|
||||
</view>
|
||||
<block>
|
||||
@ -398,6 +398,12 @@
|
||||
type: 2
|
||||
})
|
||||
this.cloudList = data;
|
||||
this.cloudList.unshift({
|
||||
cate_name: '全部',
|
||||
children: [],
|
||||
pic: "https://lihai001.oss-cn-chengdu.aliyuncs.com/def/de2be202312151001024597.png",
|
||||
store_category_id: -1
|
||||
})
|
||||
this.cloudList.forEach((item)=>{
|
||||
item.children.unshift({
|
||||
cate_name: '全部',
|
||||
@ -732,7 +738,8 @@
|
||||
page: this.storeParam.page,
|
||||
location: this.latitude+','+this.longitude,
|
||||
}
|
||||
if(!this.merchantTow.pid) query.cate_pid = this.storeParam.category_id; // 全部是查询一级分类pid
|
||||
if(this.storeParam.category_id==-1) null;
|
||||
else if(!this.merchantTow.pid) query.cate_pid = this.storeParam.category_id; // 全部是查询一级分类pid
|
||||
else query.category_id = this.storeParam.category_id; // 否则查询二级分类
|
||||
townCloud(query).then(res => {
|
||||
this.goodsList = [...this.goodsList, ...res.data.list]
|
||||
@ -821,8 +828,8 @@
|
||||
this.longitude = e.longitude;
|
||||
this.latitude = e.latitude;
|
||||
this.$store.commit('setLocation', {
|
||||
lat: e.longitude,
|
||||
long: e.latitude,
|
||||
lat: e.latitude,
|
||||
long: e.longitude,
|
||||
});
|
||||
}
|
||||
this.getStoreList(true);
|
||||
|
||||
@ -92,7 +92,7 @@
|
||||
<view class='pictrue' style="margin: 0 auto;">
|
||||
<!-- <image src='../../../static/images/noCart.png'></image> -->
|
||||
<image src='@/static/images/no_short.png'></image>
|
||||
<text>暂无商品，切换其他分类或地区试试</text>
|
||||
<text>暂无商品, 试试其他分类/位置</text>
|
||||
</view>
|
||||
</view>
|
||||
<block>
|
||||
@ -395,6 +395,18 @@
|
||||
type: 2
|
||||
})
|
||||
this.cloudList = data;
|
||||
this.cloudList.unshift({
|
||||
cate_name: '全部',
|
||||
children: [],
|
||||
pic: "https://lihai001.oss-cn-chengdu.aliyuncs.com/def/de2be202312151001024597.png",
|
||||
store_category_id: -1
|
||||
})
|
||||
this.cloudList.forEach((item)=>{
|
||||
item.children.unshift({
|
||||
cate_name: '全部',
|
||||
store_category_id: item.store_category_id,
|
||||
});
|
||||
})
|
||||
this.merchant = this.cloudList[0];
|
||||
this.merchantTow = this.merchant?.children[0];
|
||||
this.storeParam.category_id = this.merchantTow.store_category_id;
|
||||
@ -716,14 +728,20 @@
|
||||
this.storeParam.page = 1;
|
||||
this.goodsList = [];
|
||||
}
|
||||
cloudWarehouse({
|
||||
let query = {
|
||||
street_code: this.street_id,
|
||||
category_id: this.storeParam.category_id,
|
||||
// category_id: this.storeParam.category_id,
|
||||
order: this.storeParam.order,
|
||||
keyword: this.storeParam.keyword,
|
||||
page: this.storeParam.page,
|
||||
location: this.latitude+','+this.longitude,
|
||||
}).then(res => {
|
||||
}
|
||||
if(this.storeParam.category_id==-1){
|
||||
delete query.category_id;
|
||||
}
|
||||
else if(!this.merchantTow.pid) query.cate_pid = this.storeParam.category_id; // 全部是查询一级分类pid
|
||||
else query.category_id = this.storeParam.category_id; // 否则查询二级分类
|
||||
cloudWarehouse(query).then(res => {
|
||||
// res.data.list = res.data.list.map(item=>{
|
||||
// item.product = item;
|
||||
// return item;
|
||||
@ -815,8 +833,8 @@
|
||||
this.longitude = e.longitude;
|
||||
this.latitude = e.latitude;
|
||||
this.$store.commit('setLocation', {
|
||||
lat: e.longitude,
|
||||
long: e.latitude,
|
||||
lat: e.latitude,
|
||||
long: e.longitude,
|
||||
});
|
||||
}
|
||||
this.getStoreList(true);
|
||||
|
||||
@ -102,7 +102,7 @@
|
||||
<view class='pictrue' style="margin: 0 auto;background-color: #F5F5F5;">
|
||||
<!-- <image src='../../../static/images/noCart.png'></image> -->
|
||||
<image src='@/static/images/no_short.png'></image>
|
||||
<text>暂无店铺，切换其他位置试试</text>
|
||||
<text>暂无店铺，试试其他分类/位置</text>
|
||||
</view>
|
||||
</view>
|
||||
<block v-if="storeParam.is_recommend">
|
||||
@ -354,6 +354,11 @@
|
||||
this.storeList = [];
|
||||
merClassifly().then(res => {
|
||||
this.menuList = res.data;
|
||||
this.menuList.unshift({
|
||||
merchant_category_id: -1,
|
||||
category_name: '全部',
|
||||
background: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/def/de2be202312151001024597.png'
|
||||
})
|
||||
this.merchant_category_id = this.menuList[0].merchant_category_id;
|
||||
this.storeParam.merchant_category_id = this.merchant_category_id;
|
||||
if (this.mer_location == 1) {
|
||||
@ -713,7 +718,8 @@
|
||||
type_id: this.storeParam.type_id,
|
||||
credit_buy: this.credit_buy,
|
||||
}
|
||||
rqData.street_id = this.storeParam.street_id
|
||||
rqData.street_id = this.storeParam.street_id;
|
||||
if(rqData.merchant_category_id==-1) delete rqData.merchant_category_id;
|
||||
if (this.latitude) {
|
||||
rqData.location = this.latitude + ',' + this.longitude
|
||||
}
|
||||
@ -877,8 +883,8 @@
|
||||
this.longitude = e.longitude;
|
||||
this.latitude = e.latitude;
|
||||
this.$store.commit('setLocation', {
|
||||
lat: e.longitude,
|
||||
long: e.latitude,
|
||||
lat: e.latitude,
|
||||
long: e.longitude,
|
||||
});
|
||||
}
|
||||
this.storeMerchantList();
|
||||
|
||||
@ -248,6 +248,7 @@
|
||||
latitude: this.latitude,
|
||||
longitude: this.longitude
|
||||
}
|
||||
console.log({...obj});
|
||||
uni.navigateBack({
|
||||
success: () => {
|
||||
uni.$emit('changeAddress', obj)
|
||||
|
||||
@ -132,7 +132,7 @@
|
||||
<block v-else>
|
||||
<view style="display: flex;flex-direction: column;align-items: center;">
|
||||
<image src='@/static/images/no_short.png' style="width: 500rpx; height: 180rpx;"></image>
|
||||
<text class="pictrue_tips">暂无商品，切换其他位置试试</text>
|
||||
<text class="pictrue_tips">暂无商品，试试其他位置</text>
|
||||
</view>
|
||||
<view class="common-hd">
|
||||
<view class="title">为你推荐</view>
|
||||
@ -708,8 +708,8 @@ import { data } from '../../uni_modules/uview-ui/libs/mixin/mixin';
|
||||
this.longitude = e.longitude;
|
||||
this.latitude = e.latitude;
|
||||
this.$store.commit('setLocation', {
|
||||
lat: e.longitude,
|
||||
long: e.latitude,
|
||||
lat: e.latitude,
|
||||
long: e.longitude,
|
||||
});
|
||||
}
|
||||
this.loadend = false;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user