mkm/nk-shop2.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复bug

Browse Source
This commit is contained in:
weipengfei 2023-11-06 16:00:12 +08:00
parent ed7686a99c
commit 55f27158dc
6 changed files with 250 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/app.js
View File

@ -10,8 +10,8 @@ let httpApiFour
let httpApiFive let httpApiFive
// 在打包之前请检查当前环境是否正确 // 在打包之前请检查当前环境是否正确
// const env = 'dev'; // 开发 const env = 'dev'; // 开发
const env = 'prod'; // 生产 // const env = 'prod'; // 生产
// const env = 'prew'; // 预上线 // const env = 'prew'; // 预上线
switch (env) { switch (env) {

139
pages/gather/gather.vue
View File

@ -16,7 +16,8 @@
<view class="site-box1 flex_a_c_j_sb"> <view class="site-box1 flex_a_c_j_sb">
<view class="place_wrapper flex_a_c" @click="selectLocation"> <view class="place_wrapper flex_a_c" @click="selectLocation">
<view class="iconfont icon-weizhi"></view> <view class="iconfont icon-weizhi"></view>
<view class="town_name">{{ street }}</view> <view class="town_name">{{street||'定位中' }}</view>
<view class="town_name rotate-box" @click.stop="getPositionFn()"><uni-icons type="loop" color="#fff"></uni-icons></view>
</view> </view>
<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none"> <navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
<view class="iconfont icon-xiaoxi" style="color: #fff"> </view> <view class="iconfont icon-xiaoxi" style="color: #fff"> </view>
@ -65,7 +66,11 @@
</u-transition> </u-transition>
</view> </view>
</view> </view>
<view class="location" v-if="isshow">
<view class="locationa"> 位置权限使用说明 </view>
<view class="locationb"> 用于向你推荐最近门店 </view>
<view class="locationx" @click.stop="isshow=false">x</view>
</view>
<u-picker :defaultIndex="[0, 0]" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm" <u-picker :defaultIndex="[0, 0]" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
@cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker> @cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker>
<!-- <m-tabbar native> <!-- <m-tabbar native>
@ -121,6 +126,7 @@
data() { data() {
return { return {
locationArr: ({}), locationArr: ({}),
isshow: false,
emptyText: '暂无可用应用', emptyText: '暂无可用应用',
jurisdiction: false, // 是否有权限 jurisdiction: false, // 是否有权限
mer_id: '', mer_id: '',
@ -273,7 +279,7 @@
}, },
mounted() { mounted() {
if (this.street.length <= 0) { if (this.street.length <= 0) {
this.appLocation() this.selfLocation()
} }
// #ifdef H5 // #ifdef H5
// 监听页面滚动事件 // 监听页面滚动事件
@ -303,6 +309,13 @@
// #endif // #endif
methods: { methods: {
getPositionFn() {
this.street = '定位中'
this.$store.commit('setLocation', {lat: null, long: null})
uni.removeStorageSync('RejectTarget')
this.selfLocation()
},
scrolling() { scrolling() {
// 滚动条距文档顶部的距离 // 滚动条距文档顶部的距离
let scrollTop = let scrollTop =
@ -350,7 +363,7 @@
if (typeof this.$store.state.app.userInfo == 'string') { if (typeof this.$store.state.app.userInfo == 'string') {
user = JSON.parse(this.$store.state.app.userInfo) user = JSON.parse(this.$store.state.app.userInfo)
} else user = JSON.parse(JSON.stringify(this.$store.state.app.userInfo)) } else user = JSON.parse(JSON.stringify(this.$store.state.app.userInfo))
if (user.show_controller_applet) { if (user?.show_controller_applet) {
this.AllMenuList.push({ this.AllMenuList.push({
name: '大屏控制', name: '大屏控制',
icon: '/static/applet/dp.png', icon: '/static/applet/dp.png',
@ -420,14 +433,18 @@
return; return;
// #endif // #endif
// #ifdef H5 // #ifdef H5
if (type == 2) { // if (type == 2) {
this.navigator(`/pages/moreProject/moreProject`); // this.navigator(`/pages/moreProject/moreProject`);
} else { // } else {
// uni.showToast({
// icon: 'none',
// title: 'H5不支持打开小程序'
// })
// }
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
title: 'H5不支持打开小程序' title: 'H5不支持打开小程序'
}) })
}
// #endif // #endif
}, },
@ -475,23 +492,23 @@
}) })
this.showPicker = false this.showPicker = false
}, },
appLocation() { selfLocation() {
uni.getLocation({ if (uni.getStorageSync('RejectTarget')) return;
type: 'wgs84', if (uni.getStorageSync('loction') == true) {
timeout: '10', this.isshow = false
success: (res) => { } else {
// console.log(res) this.isshow = true
uni.setStorageSync('loction', true);
}
if(this.$store?.state?.storage?.location?.lat){
this.isshow = false this.isshow = false
let latitude, longitude;
latitude = res.latitude.toString();
longitude = res.longitude.toString();
getGeocoder({ getGeocoder({
lat: latitude, lat: this.$store.state.storage.location.lat,
long: longitude long: this.$store.state.storage.location.long
}).then(res => { }).then(res => {
let town = res.data.address_reference.town.title let town = res.data.address_reference.town.title
let street_id = res.data.address_reference.town.id let street_id = res.data.address_reference.town.id
this.street = res.data.address_component.street this.street = res.data.address_reference.town.title;
this.$nextTick(() => { this.$nextTick(() => {
this.$bus.$emit('value-updated', this.street + ',' + this.$bus.$emit('value-updated', this.street + ',' +
street_id); street_id);
@ -505,10 +522,47 @@
icon: 'none' icon: 'none'
}) })
}) })
}
else uni.getLocation({
type: 'wgs84',
timeout: '10',
success: (res) => {
// console.log(res)
this.isshow = false
let latitude, longitude;
latitude = res.latitude.toString();
longitude = res.longitude.toString();
this.$store.commit('setLocation', {
lat: res.latitude.toFixed(6),
long: res.longitude.toFixed(6),
});
getGeocoder({
lat: latitude,
long: longitude
}).then(res => {
let town = res.data.address_reference.town.title
let street_id = res.data.address_reference.town.id
this.street = res.data.address_reference.town.title;
this.$nextTick(() => {
this.$bus.$emit('value-updated', this.street + ',' +
street_id);
})
}).catch(err => {
this.isshow = false
uni.showToast({
title: err,
icon: 'none'
})
this.street = '定位失败'
})
}, },
fail: (err) => { fail: (err) => {
this.isshow = false this.isshow = false
uni.setStorageSync("RejectTarget", true)
Toast('定位失败,请检查定位权限是否开启')
this.street = '定位失败'
} }
}); });
}, },
@ -753,4 +807,47 @@
background-color: #fff; background-color: #fff;
padding-top: 28rpx; padding-top: 28rpx;
} }
.rotate-box {
transform: rotate(0deg);
transition: transform .5s ease-out;
}
.rotate-box:active {
transform: rotate(360deg);
}
.location {
background-color: #f6f6f6;
width: 680rpx;
height: 150rpx;
position: absolute;
top: 0;
z-index: 9999;
border-radius: 20rpx;
left: 50%;
margin-left: -340rpx;
margin-top: 80rpx;
padding-left: 20rpx;
.locationa {
font-size: 28rpx;
color: #000;
font-weight: 500;
margin-top: 30rpx;
margin-bottom: 15rpx;
}
.locationb {
font-size: 20rpx;
color: #5a5a5a;
}
.locationx{
color: #000;
position: absolute;
top: 10rpx;
right: 20rpx;
}
}
</style> </style>

69
pages/index/index.vue
View File

@ -12,7 +12,6 @@
style="margin-left: 20rpx" style="margin-left: 20rpx"
> >
</view> </view>
<view class="town_name">{{ street }}</view>
</view> </view>
<navigator <navigator
url="/pages/chat/customer_list/index?type=0" url="/pages/chat/customer_list/index?type=0"
@ -33,7 +32,8 @@
<view class="site-box1 flex_a_c_j_sb"> <view class="site-box1 flex_a_c_j_sb">
<view class="place_wrapper flex_a_c" @click="selectLocation"> <view class="place_wrapper flex_a_c" @click="selectLocation">
<view class="iconfont icon-weizhi"></view> <view class="iconfont icon-weizhi"></view>
<view class="town_name">{{ street }}</view> <view class="town_name">{{ street||'定位中' }}</view>
<view class="town_name rotate-box" @click.stop="getPositionFn()"><uni-icons type="loop" color="#fff"></uni-icons></view>
<!-- <view class="" v-if="!street"> <!-- <view class="" v-if="!street">
获取定位失败,请手动选择 获取定位失败,请手动选择
</view> --> </view> -->
@ -162,6 +162,7 @@
<view class="location" v-if="isshow"> <view class="location" v-if="isshow">
<view class="locationa"> 位置权限使用说明 </view> <view class="locationa"> 位置权限使用说明 </view>
<view class="locationb"> 用于向你推荐最近门店 </view> <view class="locationb"> 用于向你推荐最近门店 </view>
<view class="locationx" @click.stop="isshow=false">x</view>
</view> </view>
</view> </view>
</template> </template>
@ -369,6 +370,8 @@ export default {
}, },
methods: { methods: {
getPositionFn() { getPositionFn() {
this.street = '定位中'
this.$store.commit('setLocation', {lat: null, long: null})
uni.removeStorageSync('RejectTarget') uni.removeStorageSync('RejectTarget')
this.selfLocation() this.selfLocation()
@ -673,6 +676,8 @@ export default {
}, },
selfLocation() { selfLocation() {
console.log(uni.getStorageSync('RejectTarget'), 6666, uni.getStorageSync('RejectTarget'));
if (uni.getStorageSync('RejectTarget')) return;
if (uni.getStorageSync('loction') == true) { if (uni.getStorageSync('loction') == true) {
this.isshow = false this.isshow = false
@ -680,18 +685,47 @@ export default {
this.isshow = true this.isshow = true
uni.setStorageSync('loction', true); uni.setStorageSync('loction', true);
} }
console.log(uni.getStorageSync('RejectTarget'), 6666) if(this.$store.state.storage.location.lat){
console.log('定位失败');
this.isshow = false
let latitude, longitude;
latitude = this.$store.state.storage.location.lat.toString();
longitude = this.$store.state.storage.location.long.toString();
getGeocoder({
lat: latitude,
long: longitude
}).then(res => {
console.log(res);
let town = res.data.address_reference.town.title
let street_id = res.data.address_reference.town.id
this.street = res.data.address_reference.town.title
this.$nextTick(() => {
this.$bus.$emit('value-updated', this.street + ',' +
street_id);
if (uni.getStorageSync('RejectTarget')) return })
uni.getLocation({ }).catch(err => {
console.log(err);
this.isshow = false
uni.showToast({
title: err,
icon: 'none'
})
})
}
else uni.getLocation({
type: 'wgs84', type: 'wgs84',
timeout: '1000', timeout: '1000',
success: (res) => { success: (res) => {
console.log('定位成功', res);
this.isshow = false this.isshow = false
let latitude, longitude; let latitude, longitude;
latitude = res.latitude.toString(); latitude = res.latitude.toString();
longitude = res.longitude.toString(); longitude = res.longitude.toString();
this.$store.commit('setLocation', {
lat: res.latitude.toFixed(6),
long: res.longitude.toFixed(6),
});
getGeocoder({ getGeocoder({
lat: latitude, lat: latitude,
long: longitude long: longitude
@ -699,8 +733,7 @@ export default {
let town = res.data.address_reference.town.title let town = res.data.address_reference.town.title
let street_id = res.data.address_reference.town.id let street_id = res.data.address_reference.town.id
this.street = res.data.address_component.street this.street = res.data.address_reference.town.title
this.$nextTick(() => { this.$nextTick(() => {
this.$bus.$emit('value-updated', this.street + ',' + this.$bus.$emit('value-updated', this.street + ',' +
street_id); street_id);
@ -712,12 +745,15 @@ export default {
title: err, title: err,
icon: 'none' icon: 'none'
}) })
this.street = '定位失败'
}) })
}, },
fail: (err) => { fail: (err) => {
// console.log("决绝") console.log(err);
uni.setStorageSync("RejectTarget", true) uni.setStorageSync("RejectTarget", true)
this.isshow = false this.isshow = false
this.street = '定位失败'
Toast('定位失败,请检查定位权限是否开启')
} }
}); });
@ -857,6 +893,13 @@ page {
font-size: 20rpx; font-size: 20rpx;
color: #5a5a5a; color: #5a5a5a;
} }
.locationx{
color: #000;
position: absolute;
top: 10rpx;
right: 20rpx;
}
} }
.Circle_friends { .Circle_friends {
@ -1386,4 +1429,12 @@ page {
} }
} }
} }
.rotate-box {
transform: rotate(0deg);
transition: transform .5s ease-out;
}
.rotate-box:active {
transform: rotate(360deg);
}
</style> </style>

67
pages/supply_chains/supply_chains.vue
View File

@ -22,7 +22,8 @@
<view class="place_wrapper flex_a_c" @click="selectLocation"> <view class="place_wrapper flex_a_c" @click="selectLocation">
<view class="iconfont icon-weizhi"></view> <view class="iconfont icon-weizhi"></view>
<view class="town_name">{{street}}</view> <view class="town_name">{{street||'定位中' }}</view>
<view class="town_name rotate-box" @click.stop="getPositionFn()"><uni-icons type="loop" color="#fff"></uni-icons></view>
</view> </view>
<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none"> <navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
<view class="iconfont icon-xiaoxi" style="color:#fff;"> </view> <view class="iconfont icon-xiaoxi" style="color:#fff;"> </view>
@ -155,6 +156,7 @@
<view class="location" v-if="isshow"> <view class="location" v-if="isshow">
<view class="locationa"> 位置权限使用说明 </view> <view class="locationa"> 位置权限使用说明 </view>
<view class="locationb"> 用于向你推荐最近门店 </view> <view class="locationb"> 用于向你推荐最近门店 </view>
<view class="locationx" @click.stop="isshow=false">x</view>
</view> </view>
<!-- <m-tabbar native> <!-- <m-tabbar native>
<template v-slot:tabbar_index_2> <template v-slot:tabbar_index_2>
@ -276,7 +278,7 @@
}, },
onLoad() { onLoad() {
this.Area() this.Area()
this.selfLocation() // this.selfLocation()
// this.openTongZhi() // this.openTongZhi()
uni.$on('connectstatusChange', (connectstatus) => { uni.$on('connectstatusChange', (connectstatus) => {
var connectstr = '' var connectstr = ''
@ -350,6 +352,13 @@
url: '/pages/nongKe/supply_chain/suppliers?id=' + val url: '/pages/nongKe/supply_chain/suppliers?id=' + val
}) })
},
getPositionFn() {
this.street = '定位中'
this.$store.commit('setLocation', {lat: null, long: null})
uni.removeStorageSync('RejectTarget')
this.selfLocation()
}, },
//获取商品列表 //获取商品列表
list(isPage, id) { list(isPage, id) {
@ -589,6 +598,7 @@
this.list(true, this.street_id) this.list(true, this.street_id)
}, },
selfLocation() { selfLocation() {
if (uni.getStorageSync('RejectTarget')) return;
if (uni.getStorageSync('loction') == true) { if (uni.getStorageSync('loction') == true) {
this.isshow = false this.isshow = false
this.list2(true,'') this.list2(true,'')
@ -596,17 +606,47 @@
this.isshow = true this.isshow = true
uni.setStorageSync('loction', true); uni.setStorageSync('loction', true);
} }
uni.getLocation({ if(this.$store?.state?.storage?.location?.lat){
this.isshow = false
this.latitude = this.$store.state.storage.location.lat;
this.longitude = this.$store.state.storage.location.long;
getGeocoder({
lat: this.latitude,
long: this.longitude
}).then(res => {
this.isshow = false
this.town = res.data.address_reference.town.title
this.street_id = res.data.address_reference.town.id
this.street = res.data.address_reference.town.title;
this.list(true,this.street_id)
this.$nextTick(() => {
this.$bus.$emit('value-updated', this.street + ',' + this
.street_id);
})
}).catch(err => {
this.isshow = false
this.list2(true,'')
uni.showToast({
title: err,
icon: 'none'
})
})
}
else uni.getLocation({
type: 'wgs84', type: 'wgs84',
timeout: '10', timeout: '10',
success: (res) => { success: (res) => {
this.isshow = false this.isshow = false
let latitude, longitude; let latitude, longitude;
latitude = res.latitude.toString(); latitude = res.latitude.toString();
longitude = res.longitude.toString(); longitude = res.longitude.toString();
this.latitude = res.latitude.toFixed(6); this.latitude = res.latitude.toFixed(6);
this.longitude = res.longitude.toFixed(6); this.longitude = res.longitude.toFixed(6);
this.$store.commit('setLocation', {
lat: res.latitude.toFixed(6),
long: res.longitude.toFixed(6),
});
getGeocoder({ getGeocoder({
lat: latitude, lat: latitude,
long: longitude long: longitude
@ -628,11 +668,16 @@
title: err, title: err,
icon: 'none' icon: 'none'
}) })
this.street = '定位失败'
}) })
}, },
fail: (err) => { fail: (err) => {
console.log('定位失败'); console.log('定位失败');
this.isshow = false this.isshow = false
uni.setStorageSync("RejectTarget", true)
Toast('定位失败,请检查定位权限是否开启')
this.street = '定位失败'
// uni.showToast({ // uni.showToast({
// title: "获取定位超时", // title: "获取定位超时",
// icon: 'none', // icon: 'none',
@ -717,6 +762,12 @@
font-size: 20rpx; font-size: 20rpx;
color: #5a5a5a; color: #5a5a5a;
} }
.locationx{
color: #000;
position: absolute;
top: 10rpx;
right: 20rpx;
}
} }
.Circle_friends { .Circle_friends {
@ -1117,4 +1168,12 @@
} }
} }
} }
.rotate-box {
transform: rotate(0deg);
transition: transform .5s ease-out;
}
.rotate-box:active {
transform: rotate(360deg);
}
</style> </style>

BIN
static/wgt/__UNI__9620511.wgt
View File

Binary file not shown.

8
store/modules/storage.js
View File

@ -11,12 +11,20 @@ import Cache from '../../utils/cache';
const state = { const state = {
storage: {}, storage: {},
location:{
lat: null,
long: null,
}
}; };
const mutations = { const mutations = {
setStorage(state, data) { setStorage(state, data) {
state.storage = data; state.storage = data;
}, },
setLocation(state, data){
state.location.lat = data.lat;
state.location.long = data.long;
}
}; };
const actions = { const actions = {