wangyifang
/
xietaitai-shop-wx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交

Browse Source
main
lion 2 years ago
parent 072caa24c8
commit c1a65a733c
6 changed files with 202 additions and 180 deletions
Show Stats Download Patch File Download Diff File

1
common/config.js
Unescape View File

@ -1,6 +1,7 @@
const mode = 'production'; //devLocal：本地测试、devOnline：线上测试、production：生产环境
let ROOTPATH = ''; //域名
let base = "https://agent.xfgshop.com"
// let base = "https://agenttest.xfgshop.com"
switch (mode) {
// https://agenttest.xfgshop.com
// https://agent.xfgshop.com

39
common/http.interceptor.js
Unescape View File

@ -38,16 +38,20 @@ const install = (Vue, vm) => {
if (res.statusCode === 200) {
if (res.data.hasOwnProperty("errcode")) {
if (res.data?.errcode === 40001) {
console.log("调用用户信息失效")
uni.showModal({
title: '用户信息已失效',
confirmText: '重新获取',
success: function(res) {
if (res.confirm) {
console.log("调用用户信息失效code",res)
uni.removeStorageSync()
uni.login({
provider: 'weixin',
success: (res) => {
let url = baseUrl + '​/api/mobile/user/login'
console.log("调用用户信息失效code12",res)
let url = `${baseUrl}/api/mobile/user/login`
console.log("调用用户信息失效url",url)
uni.request({
url: url,
data:{
@ -60,33 +64,14 @@ const install = (Vue, vm) => {
uni.reLaunch({
url: '/pages/home/home'
});
// const currentPage =
// getCurrentPages()[
// getCurrentPages()
// .length - 1];
// const currentPagePath =
// "/" + currentPage.route;
// const currentPageOptions =
// currentPage.options;
// const queryString = Object
// .keys(
// currentPageOptions)
// .map(key =>
// `${key}=${currentPageOptions[key]}`
// )
// .join('&');
// // 使用uni.reLaunch方法刷新当前页面
// uni.reLaunch({
// url: `${currentPagePath}?${queryString}`
// });
// console.log("reLaunch",
// `${currentPagePath}?${queryString}`
// )
}
},
fail:function(err2){
console.log("err2",err2)
},
});
},
fail:function(err){
console.log("err",err)
}
});
// login end

3
components/date-picker/date-picker.vue
Unescape View File

@ -28,7 +28,8 @@
<view class="date-list-right">
<view class="lunarData" v-if="dateObj.lunarData">
{{dateObj.lunarData?dateObj.lunarData:''}}
<view>今日剩余可提货量：{{dateObj.canUse.quantity - dateObj.canUse.booked}}</view>
<!-- <view>今日剩余可提货量：{{dateObj.canUse.quantity - dateObj.canUse.booked}}</view> -->
<view>余量充足</view>
</view>
<!-- <view class="hh">
<view @click="chooseHh(index,item)"

44
packages/order/order.vue
Unescape View File

@ -383,9 +383,9 @@
} else {
toast("未查询到卡券信息")
uni.removeStorageSync("vuex_card")
uni.redirectTo({
url: '/packages/change/change'
})
// uni.redirectTo({
// url: '/packages/change/change'
// })
}
},
methods: {
@ -421,6 +421,18 @@
_this.form.city_id = res1.city_id ? res1.city_id.id : ''
_this.form.district_id = res1.district_id ? res1
.district_id.id : ''
if (isNull(_this.form.province_id) || isNull(_this.form
.city_id) ||
isNull(_this.form.district_id)) {
uni.showToast({
title: '未能匹配到所在地区，请手动选择',
icon: 'none'
})
_this.form.area = ""
_this.form.province_id = ''
_this.form.city_id = ''
_this.form.district_id = ''
}
})
console.log("_this", _this.form)
},
@ -613,7 +625,6 @@
scope: 'scope.userLocation',
success: (res) => {
console.log("authorize", res)
uni.chooseLocation({
success(res) {
console.log("res", res)
@ -621,6 +632,7 @@
_this.form.address = res.name
// 根据地址匹配 省市区
let pca = parseAddress(res.address)
console.log("pca",pca)
if (pca.length > 0) {
_this.form.area = pca.join('')
_this.$u.api.matchRegion({
@ -633,16 +645,30 @@
_this.form.city_id = res.city_id ? res.city_id.id : ''
_this.form.district_id = res.district_id ? res
.district_id.id : ''
if (isNull(_this.form.province_id) || isNull(_this.form
.city_id) ||
isNull(_this.form.district_id)) {
uni.showToast({
title: '未能匹配到所在省市区，请手动选择',
icon: 'none'
})
_this.form.area = ""
_this.form.province_id = ''
_this.form.city_id = ''
_this.form.district_id = ''
}
})
} else {
uni.showToast({
title: '未获取到地址，重新获取',
title: '未能匹配到所在省市区，请手动选择',
icon: 'none'
})
}
_this.form.area = ""
_this.form.province_id = ''
_this.form.city_id = ''
_this.form.district_id = ''
}
},
fail(res) {
console.log("fail", res)
@ -789,6 +815,8 @@
})
} else {
console.log("this.form", this.form)
// return
this.$u.api.addUserOrder(this.form).then(res => {
console.log("res", res)
uni.removeStorageSync('vuex_card')

47
pages/home/home.vue
Unescape View File

@ -7,7 +7,7 @@
<view>
<view class="myswiper">
<u-swiper mode="none" border-radius="0" :list="list" height="440"></u-swiper>
<u-swiper mode="none" @click="clickTop" border-radius="0" :list="list" height="440"></u-swiper>
</view>
<view class="tags">
<view v-for="item in tags">
@ -150,6 +150,29 @@
// wx.exitMiniProgram();
console.log('User rejected the privacy policy');
},
// 点击轮播图
clickTop(e) {
console.log("e", e, this.list[e])
const appid = this.list[e].appid
const path = this.list[e].url
if (!isNull(appid)) {
uni.navigateToMiniProgram({
appId: appid, // 小程序appid
path: path?path:'', // 打开的页面路径，若为空则打开首页
extraData: {
// 需要传递给小程序的数据
},
success(res) {
// 打开成功的回调
},
fail(err) {
// 打开失败的回调
}
})
return
}
},
async getBanner() {
const res = await this.$u.api.getConfig()
// 顶部图banner1
@ -157,7 +180,8 @@
if (res.banner1.length > 0) {
res.banner1.map(item => {
arr.push({
image:item.upfile_url
image: item.upfile_url,
...item
})
})
this.list = arr
@ -194,7 +218,6 @@
await uni.login({
provider: 'weixin',
success: (res) => {
this.$u.api.login({
code: res.code
}).then(res1 => {
@ -202,23 +225,6 @@
uni.setStorageSync("xtt_lifeData3", {
'vuex_token': res1.token
})
// uni.request({
// url: baseUrl + '/api/mobile/user/show',
// header: {
// Authorization: `Bearer ${res1.token}`
// },
// method: "GET",
// success(res2) {
// uni.setStorageSync("xtt_lifeData3", {
// 'vuex_token': res1.token,
// "vuex_user": res2.user
// })
// },
// fail(err) {
// console.log("err", err)
// }
// })
}).catch(err => {
toast(JSON.stringify(err))
console.log('login-error:', JSON.stringify(err))
@ -300,6 +306,7 @@
width: 100vw;
overflow: scroll;
padding-bottom: 160rpx;
.myswiper {
// padding: 40rpx;
}

2
pages/me/me.vue
Unescape View File

@ -163,7 +163,7 @@
onLoad() {
const MenuButton = uni.getMenuButtonBoundingClientRect()
this.navBarTop = MenuButton.top //左侧文字与右侧胶囊对齐
this.myToken = uni.getStorageSync('xtt_lifeData3').vuex_token
this.myToken = uni.getStorageSync('xtt_lifeData3')?uni.getStorageSync('xtt_lifeData3').vuex_token:''
},
onShow() {
this.getInitUser()

Write Preview
Loading…
Cancel
Save