diff --git a/config/app.js b/config/app.js
index 9bfd4f2..de0c7f8 100644
--- a/config/app.js
+++ b/config/app.js
@@ -10,8 +10,8 @@ let httpApiFour
let httpApiFive
// 在打包之前请检查当前环境是否正确
-const env = 'dev'; // 开发
-// const env = 'prod'; // 生产
+// const env = 'dev'; // 开发
+const env = 'prod'; // 生产
// const env = 'prew'; // 预上线
switch (env) {
diff --git a/manifest.json b/manifest.json
index 3fdc175..9fdeb7d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -161,7 +161,8 @@
}
},
"splashscreen" : {
- "useOriginalMsgbox" : true
+ "useOriginalMsgbox" : true,
+ "androidStyle" : "common"
}
},
"nativePlugins" : {
diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index 4853fa3..827e325 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -403,7 +403,7 @@
case 1:
uniMP.loadMP(data);
break;
- case 2: uniMP.loadMPx(data); break;
+ case 2: uniMP.loadMPx(data); break;
// case 2:
// // this.navigator(data);
// // uniMP.loadMPx(data);
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 8e2156d..a0d6b95 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -30,9 +30,9 @@
获取定位失败,请手动选择
-->
-
+
diff --git a/pages/nongKe/cloud_entrepot/index.vue b/pages/nongKe/cloud_entrepot/index.vue
index 60998d3..d922d3e 100644
--- a/pages/nongKe/cloud_entrepot/index.vue
+++ b/pages/nongKe/cloud_entrepot/index.vue
@@ -355,6 +355,7 @@
let src = 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13';
return {
skuform: {},
+ location: null,
defaInd: [0, 0],
showPicker: false,
columnData: [],
@@ -417,6 +418,7 @@
// ...mapGetters(['isLogin', 'viewColor', 'uid']),
onLoad(e) {
// this.cartFn()
+ this.location = e.location;
this.appInfo = this.$appInfo.safeAreaInsets
this.winHeight = this.$appInfo.windowHeight
this.street_code = e.street
@@ -462,8 +464,8 @@
category_id: this.cloudList[this.current]?.category_id || "",
order: this.type,
keyword: this.keyword,
- page_num: this.page_num
-
+ page_num: this.page_num,
+ location: this.location
}).then(res => {
if (res.data.list.length == 0) {
this.status = "nomore"
@@ -744,7 +746,8 @@
category_id: this.cloudList[this.current]?.category_id || "",
order: this.type,
keyword: this.keyword,
- page_num: this.page_num
+ page_num: this.page_num,
+ location: this.location
}).then(res => {
this.goodsList = res.data.list;
this.showLoading = false;
@@ -842,7 +845,8 @@
this.cloudList = data
cloudWarehouse({
street_code: this.street_code,
- category_id: this.cloudList[this.current].category_id
+ category_id: this.cloudList[this.current].category_id,
+ location: this.location
}).then(res => {
this.trnList = []
this.goodsList = res.data.list
diff --git a/pages/nongKe/cloud_entrepot/indexa.vue b/pages/nongKe/cloud_entrepot/indexa.vue
index 83aa4c7..16b6bbc 100644
--- a/pages/nongKe/cloud_entrepot/indexa.vue
+++ b/pages/nongKe/cloud_entrepot/indexa.vue
@@ -447,6 +447,7 @@
let src = 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13';
return {
skuform: {},
+ location: null,
defaInd: [0, 0],
showPicker: false,
columnData: [],
@@ -511,6 +512,7 @@
// ...mapGetters(['isLogin', 'viewColor', 'uid']),
onLoad(e) {
// this.cartFn()
+ this.location = e.location
this.appInfo = this.$appInfo.safeAreaInsets
this.winHeight = this.$appInfo.windowHeight
this.street_code = e.street
@@ -552,8 +554,8 @@
category_id: this.cloudList[this.current]?.category_id || "",
order: this.type,
keyword: this.keyword,
- page_num: this.page_num
-
+ page_num: this.page_num,
+ location: this.location
}).then(res => {
if (res.data.list.length == 0) {
this.status = "nomore"
@@ -834,7 +836,8 @@
category_id: this.cloudList[this.current]?.category_id || "",
order: this.type,
keyword: this.keyword,
- page_num: this.page_num
+ page_num: this.page_num,
+ location: this.location
}).then(res => {
this.goodsList = res.data.list
@@ -932,7 +935,8 @@
this.cloudList = data
cloudWarehouse({
street_code: this.street_code,
- category_id: this.cloudList[this.current].category_id
+ category_id: this.cloudList[this.current].category_id,
+ location: this.location
}).then(res => {
this.trnList = []
this.goodsList = res.data.list
diff --git a/pages/nongKe/supply_chain/supplier.vue b/pages/nongKe/supply_chain/supplier.vue
index 178274e..93fc8a7 100644
--- a/pages/nongKe/supply_chain/supplier.vue
+++ b/pages/nongKe/supply_chain/supplier.vue
@@ -17,7 +17,7 @@
供销综合云市场
供销综合云商品
diff --git a/pages/supply_chains/supply_chains.vue b/pages/supply_chains/supply_chains.vue
index 41f84cd..4346ef4 100644
--- a/pages/supply_chains/supply_chains.vue
+++ b/pages/supply_chains/supply_chains.vue
@@ -219,7 +219,8 @@
},
isshow: false,
locationArr: ({}),
-
+ latitude: null,
+ longitude: null,
bgColor: '',
showPicker: false,
columnData: [],
@@ -373,7 +374,8 @@
page: that.where.page,
limit: that.where.limit,
street_code: id,
- category_id: 0
+ category_id: 0,
+ location: this.latitude + ',' + this.longitude
}).then(res => {
// console.log(222)
let list = res.data.list;
@@ -416,7 +418,8 @@
page: that.where2.page,
limit: that.where2.limit,
street_code: id,
- category_id: 0
+ category_id: 0,
+ location: this.latitude + ',' + this.longitude
}).then(res => {
// console.log(222)
let list = res.data.list;
@@ -568,7 +571,7 @@
return Toast('当前区域没有云仓库')
}
uni.navigateTo({
- url: `/pages/nongKe/cloud_entrepot/index?street=${this.street_id}&town=${this.town}`
+ url: `/pages/nongKe/cloud_entrepot/index?street=${this.street_id}&town=${this.town}&location=${this.latitude},${this.longitude}`
})
},
@@ -602,6 +605,8 @@
let latitude, longitude;
latitude = res.latitude.toString();
longitude = res.longitude.toString();
+ this.latitude = latitude;
+ this.longitude = longitude;
getGeocoder({
lat: latitude,
long: longitude