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

更新

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
App.vue
View File

@ -76,14 +76,15 @@
onLaunch: function(option) {
this.globalData.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
this.globalData.uid = this.$store.state.app.uid;
let appkey = uni.getStorage({
key: 'launchFlag'
})
if (appkey) {
setTimeout(() => {
this.$store.dispatch('INIT_CONFIG');
}, 6000)
}
// let appkey = uni.getStorage({
// key: 'launchFlag'
// })
// if (appkey) {
// setTimeout(() => {
// this.$store.dispatch('INIT_CONFIG');
// }, 6000)
// }
this.$store.dispatch('INIT_CONFIG');
// #ifdef APP-PLUS
//初始化uniMP小程序发送的事件以及其他操作

4
manifest.json
View File

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

4
pages/gather/gather.vue
View File

@ -17,8 +17,8 @@
<view class="place_wrapper flex_a_c" @click="changeMap">
<view class="iconfont icon-weizhi"></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="town_name rotate-box" @click.stop="getPositionFn()"><uni-icons type="loop"
color="#fff"></uni-icons></view> -->
</view>
<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
<view class="iconfont icon-xiaoxi" style="color: #fff"> </view>

20
pages/index/index.vue
View File

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

3
pages/nongKe/cloud_entrepot/indexh.vue
View File

@ -11,7 +11,7 @@
<view style="display: flex;align-items: center;">
<i class="iconfont icon-xiangzuo" style="font-size: 31.54rpx;text-align: left;" @click='backjJump'></i>
<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;">
里海云仓
</view>
@ -755,6 +755,7 @@
}
else if(!this.merchantTow.pid) query.cate_pid = this.storeParam.category_id; // 全部是查询一级分类pid
else query.cate_id = this.storeParam.category_id; // 否则查询二级分类
console.log('参数', {...query});
cloudWarehouse(query).then(res => {
// res.data.list = res.data.list.map(item=>{
// item.product = item;