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

Merge branch 'master' of http://git.excellentkk.cn/C.C/nk-shop2.0

Browse Source
This commit is contained in:
luofei 2023-06-07 13:33:07 +08:00
commit bf99b5d8ac
7 changed files with 44 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/zbpSwiper.vue
View File

@ -107,6 +107,9 @@
this.street = e.value[1].name
this.showPicker = false
this.$emit('selectPlce', e)
let adress = Cache.get('LOCATION_DATA',true)
adress.address_component.street=e.value[1].name
Cache.set('LOCATION_DATA',adress)
},
changeHandler(e) {
const {

1
manifest.json
View File

@ -35,6 +35,7 @@
"distribute": {
/* android打包配置 */
"android": {
"resizeableActivity": true,
"permissions": [
"<uses-permission android:name=\"android.permission.ACCESS_LOCATION_EXTRA_COMMANDS\"/>",
"<uses-permission android:name=\"android.permission.BATTERY_STATS\"/>",

12
pages/gather/gather.vue
View File

@ -3,7 +3,7 @@
<zbpSwiper></zbpSwiper>
<u-empty :show="jurisdiction" marginTop="260" mode="permission" :text="emptyText"
icon="http://cdn.uviewui.com/uview/empty/permission.png"></u-empty>
<block v-if="isLogin">
<block v-if="isShow">
<!-- <view class="special_work com" v-if="userInfoData.mer_info.type_id === 12"> -->
<view class="special_work com" v-if="true">
<view class="title">市级供应链</view>
@ -103,7 +103,7 @@
</view>
</view>
<gatherBusiness :userInfoData="userInfoData" />
<!-- <gatherBusiness :userInfoData="userInfoData" /> -->
</view>
<!-- <view class="business com" v-if="userInfoData.mer_info.type_id === 11"> -->
@ -197,6 +197,7 @@
mer_id: '',
userInfoData: { mer_info: { type_id: 0 } },
prefix: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/11/',
isShow:false
};
},
computed: {
@ -228,7 +229,14 @@
let that = this;
getUserInfo().then(res => {
that.userInfoData = res.data;
console.log(res.data.service);
if(res.data.service == null){
// console.log('123');
this.isShow=false
}else{
this.isShow=true
this.mer_id = res.data.service.mer_id
}
if (!res.data.mer_info) {
that.$set(this, 'jurisdiction', false);
}

1
pages/index/index.vue
View File

@ -184,6 +184,7 @@
})
},
getGoods: function(item) {
console.log(item);
graphicLstApi(this.where).then(res => {
this.cateGoods.push(...res.data.list)
if (res.data.list.length < this.where.limit) this.status = 'nomore'

5
pages/product/addGoods/index.vue
View File

@ -84,7 +84,7 @@
</view>
</view>
<view class="popup_group_item" @click="selectBrand">
<!-- <view class="popup_group_item" @click="selectBrand">
<view class="popup_group_item_label">商品品牌</view>
<view class="popup_group_item_value">
<view class="popup_group_item_message">
@ -94,7 +94,7 @@
</view>
<view><text class="iconfont">&#xe6bd;</text></view>
</view>
</view>
</view> -->
<view class="popup_group_item">
<view class="popup_group_item_label">商品单位</view>
@ -407,7 +407,6 @@
}
},
onShow() {
this.setFormData.store_name = ''
this.setFormData.setSpecificaValue = '';
this.setFormData.setSpecificaValue2 = '';
if (getStorage('singleSpecification')) {

1
store/modules/app.js
View File

@ -20,6 +20,7 @@ const state = {
const mutations = {
setLocation(state, data) {
console.log(data);
state.location = data
Cache.set('LOCATION_DATA', data);
},