This commit is contained in:
weipengfei 2024-01-22 17:28:31 +08:00
parent 1958afbda0
commit f2940b9c8a
5 changed files with 26 additions and 22 deletions

17
App.vue
View File

@ -76,14 +76,15 @@
onLaunch: function(option) { onLaunch: function(option) {
this.globalData.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px'; this.globalData.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
this.globalData.uid = this.$store.state.app.uid; this.globalData.uid = this.$store.state.app.uid;
let appkey = uni.getStorage({ // let appkey = uni.getStorage({
key: 'launchFlag' // key: 'launchFlag'
}) // })
if (appkey) { // if (appkey) {
setTimeout(() => { // setTimeout(() => {
this.$store.dispatch('INIT_CONFIG'); // this.$store.dispatch('INIT_CONFIG');
}, 6000) // }, 6000)
} // }
this.$store.dispatch('INIT_CONFIG');
// #ifdef APP-PLUS // #ifdef APP-PLUS
//uniMP //uniMP

View File

@ -2,8 +2,8 @@
"name" : "惠农生活", "name" : "惠农生活",
"appid" : "__UNI__3A527D1", "appid" : "__UNI__3A527D1",
"description" : "", "description" : "",
"versionName" : "1.7.5", "versionName" : "1.7.6",
"versionCode" : 175, "versionCode" : 176,
"transformPx" : false, "transformPx" : false,
/* 5+App */ /* 5+App */
"app-plus" : { "app-plus" : {

View File

@ -17,8 +17,8 @@
<view class="place_wrapper flex_a_c" @click="changeMap"> <view class="place_wrapper flex_a_c" @click="changeMap">
<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" <!-- <view class="town_name rotate-box" @click.stop="getPositionFn()"><uni-icons type="loop"
color="#fff"></uni-icons></view> 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>

View File

@ -23,8 +23,8 @@
<view class="place_wrapper flex_a_c" @click="changeMap"> <view class="place_wrapper flex_a_c" @click="changeMap">
<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" <!-- <view class="town_name rotate-box" @click.stop="getPositionFn()"><uni-icons type="loop"
color="#fff"></uni-icons></view> 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>
@ -263,16 +263,15 @@ import activityCard from "@/components/activityCard.vue"
this.loadend = false; this.loadend = false;
this.loading = false; this.loading = false;
this.list(true, this.street_id); this.list(true, this.street_id);
this.Area() // this.Area()
this.$u.sleep(1000).then(()=>{ this.$u.sleep(1000).then(()=>{
uni.stopPullDownRefresh() uni.stopPullDownRefresh()
}) })
}, },
onShow() { onShow() {
this.$store.commit('INIT_CONFIG');
}, },
onLoad() { onLoad() {
this.Area() // this.Area()
// this.selfLocation() // this.selfLocation()
// this.openTongZhi() // this.openTongZhi()
uni.$on('connectstatusChange', (connectstatus) => { uni.$on('connectstatusChange', (connectstatus) => {
@ -619,10 +618,14 @@ import activityCard from "@/components/activityCard.vue"
lat: this.latitude, lat: this.latitude,
long: this.longitude long: this.longitude
}).then(res => { }).then(res => {
this.isshow = false this.isshow = false;
this.town = res.data.address_reference.town.title this.town = res.data.address_reference.town.title;
this.street_id = res.data.address_reference.town.id this.street_id = res.data.address_reference.town.id;
this.street = res.data.address_reference.town.title; this.street = res.data.address_reference.town.title;
this.$store.commit('setAddress', {
street_id: this.street_id,
townName: this.town
});
this.list(true, this.street_id) this.list(true, this.street_id)
this.$nextTick(() => { this.$nextTick(() => {
this.$bus.$emit('value-updated', this.street + ',' + this this.$bus.$emit('value-updated', this.street + ',' + this
@ -639,7 +642,6 @@ import activityCard from "@/components/activityCard.vue"
}) })
} else uni.getLocation({ } else uni.getLocation({
type: 'wgs84', type: 'wgs84',
timeout: '10',
success: (res) => { success: (res) => {
res = wgsToGcj(res); res = wgsToGcj(res);
this.isshow = false this.isshow = false

View File

@ -11,7 +11,7 @@
<view style="display: flex;align-items: center;"> <view style="display: flex;align-items: center;">
<i class="iconfont icon-xiangzuo" style="font-size: 31.54rpx;text-align: left;" @click='backjJump'></i> <i class="iconfont icon-xiangzuo" style="font-size: 31.54rpx;text-align: left;" @click='backjJump'></i>
<view class="" <view class=""
@click="navGoto(`/pages/nongKe/supply_chain/supplierB?type_id=10,17&street_id=${street_id}&townName=${street}&location=${latitude},${longitude}`)" @click='backjJump'
style="font-size: 31.54rpx;font-weight: 700;margin-left: 10rpx;"> style="font-size: 31.54rpx;font-weight: 700;margin-left: 10rpx;">
里海云仓 里海云仓
</view> </view>
@ -755,6 +755,7 @@
} }
else if(!this.merchantTow.pid) query.cate_pid = this.storeParam.category_id; // pid else if(!this.merchantTow.pid) query.cate_pid = this.storeParam.category_id; // pid
else query.cate_id = this.storeParam.category_id; // else query.cate_id = this.storeParam.category_id; //
console.log('参数', {...query});
cloudWarehouse(query).then(res => { cloudWarehouse(query).then(res => {
// res.data.list = res.data.list.map(item=>{ // res.data.list = res.data.list.map(item=>{
// item.product = item; // item.product = item;