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

修改home/index为index/index

Browse Source
This commit is contained in:
cc_zbp 2023-05-23 09:31:01 +08:00
parent 6ef97fbed3
commit 559f48a955
5 changed files with 1108 additions and 1033 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pages/gather/gather.vue
View File

@ -4,8 +4,8 @@
<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">
<view class="special_work com" v-if="userInfoData.mer_info.type_id === 12">
<!-- <view class="special_work com" v-if="true"> -->
<!-- <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>
<view class="content">
<view class="examine" @click="navigator(`/pages/nongKe/supply_chain/goods_list?merid=${mer_id}`)">
@ -38,8 +38,8 @@
</view>
</view>
<view class="business com" v-if="userInfoData.mer_info.type_id === 10">
<!-- <view class="business com" v-if="true"> -->
<!-- <view class="business com" v-if="userInfoData.mer_info.type_id === 10"> -->
<view class="business com" v-if="true">
<view class="special_work com">
<view class="title">我的店铺</view>
<view class="content ">
@ -100,8 +100,8 @@
<!-- <gatherBusiness :userInfoData="userInfoData" /> -->
</view>
<view class="business com" v-if="userInfoData.mer_info.type_id === 11">
<!-- <view class="business com" v-if="true"> -->
<!-- <view class="business com" v-if="userInfoData.mer_info.type_id === 11"> -->
<view class="business com" v-if="true">
<view class="special_work com">
<view class="title">里海云仓</view>
<view class="content ">

20
pages/store/home/index.vue
View File

@ -674,12 +674,12 @@
this.getCategory();
break;
case 3:
this.where={
order: '',
keyword: '',
page: 1,
limit: 30
};
this.where = {
order: '',
keyword: '',
page: 1,
limit: 30
};
this.getGoods();
break;
case 4:
@ -1115,14 +1115,14 @@
// 首页
goHome() {
uni.switchTab({
url: '/pages/home/index'
url: '/pages/index/index'
});
},
// 商铺底部切换
tab: function(param) {
if(this.tabActive==param){
return false;
}
if (this.tabActive == param) {
return false;
}
this.goods = []
this.tabActive = param;
this.goodsLoading = this.loadend = this.loading = false

2048
pages/store/settled/index.vue
View File

File diff suppressed because it is too large Load Diff

59
pages/users/login/index.vue
View File

@ -196,35 +196,36 @@
.then(({
data
}) => {
// #ifdef MP
//用户没有绑定openid，授权并绑定
if (data.user.wechat_user_id === 0) {
let that=this
wx.getUserInfo({
success: function (res) {
const encryptedData = res.encryptedData
const iv = res.iv
wx.login({
success (res) {
if (res.code) {
bindMp({code: res.code, iv: iv, encryptedData: encryptedData,phone: that.account}).then(res => {
// console.log(res);
})
} else {
console.log('登录失败！' + res.errMsg)
}
}
})
},
fail(e) {
console.log('登录失败！' + res.errMsg)
}
})
}
// #endif
// #ifdef MP
//用户没有绑定openid，授权并绑定
if (data.user.wechat_user_id === 0) {
let that = this
wx.getUserInfo({
success: function(res) {
const encryptedData = res.encryptedData
const iv = res.iv
wx.login({
success(res) {
if (res.code) {
bindMp({ code: res.code, iv: iv, encryptedData: encryptedData, phone: that
.account }).then(res => {
// console.log(res);
})
} else {
console.log('登录失败！' + res.errMsg)
}
}
})
},
fail(e) {
console.log('登录失败！' + res.errMsg)
}
})
}
// #endif
console.log('验证码登录', data);
let time = data.expires_time - Cache.time();
const backUrl = that.$Cache.get(BACK_URL) || "/pages/home/index";
const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
that.$Cache.clear(BACK_URL);
that.$store.commit("LOGIN", {
'token': data.token,
@ -238,7 +239,7 @@
Cache.set(USER_INFO, data.user, time);
// #endif
let method
let indexPat = ['/pages/home/index', '/pages/order_addcart/order_addcart',
let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
'/pages/goods_cate/goods_cate',
'/pages/user/index'
]
@ -249,7 +250,7 @@
}
if (this.getPath(backUrl) === '/pages/users/login/index') {
uni.switchTab({
url: '/pages/home/index'
url: '/pages/index/index'
});
return
}

2
pages/users/user_info/index.vue
View File

@ -305,7 +305,7 @@
.then(res => {
that.$store.commit("LOGOUT");
uni.reLaunch({
url: '/pages/home/index',
url: '/pages/index/index',
});
})
.catch(err => {