diff --git a/api/draw.js b/api/draw.js index d2ffb29..015af5f 100644 --- a/api/draw.js +++ b/api/draw.js @@ -1,7 +1,8 @@ import request from "@/utils/request"; +import requestOther from "@/utils/requestOther"; export function drawList(){ - return request({ + return requestOther({ url:'draw/drawgoods-list', method:'post', }) diff --git a/api/order.js b/api/order.js index d3c01f7..2c02eed 100644 --- a/api/order.js +++ b/api/order.js @@ -132,7 +132,7 @@ export function orderStart(data){ }) } /** - * 开始服务 + * 结束服务 */ export function orderEnd(data){ return request({ @@ -140,4 +140,24 @@ export function orderEnd(data){ method: 'post', data:data }) +} +/** + * 保存订单信息 + */ +export function orderSave(data){ + return request({ + url:"order/save", + method: 'post', + data:data + }) +} +/** + * 获取订单信息 + */ +export function orderGet(data){ + return request({ + url:"order/getsave", + method: 'get', + data:data + }) } \ No newline at end of file diff --git a/api/user.js b/api/user.js index db73316..0824da0 100644 --- a/api/user.js +++ b/api/user.js @@ -79,4 +79,15 @@ export function userChatCount(data){ method:'get', data:data }) +} +/** + * 通过手机号获取token + * @param data + */ +export function tokenByPhone(data){ + return request({ + url:"user/gettokenbyphone", + method:'get', + data:data + }) } \ No newline at end of file diff --git a/pages/CardDetail/index.vue b/pages/CardDetail/index.vue index 370edbb..279ff8f 100644 --- a/pages/CardDetail/index.vue +++ b/pages/CardDetail/index.vue @@ -305,6 +305,7 @@ export default { PayCardPolicy: '', address: {}, petChecked: [], + isPay : false } }, onLoad(options) { @@ -334,6 +335,10 @@ export default { api.error('请选择宠物'); return; } + if(this.isPay){ + return; + } + this.isPay = true; let petIds = this.petChecked.map((item) => { return item.id; }).join(','); @@ -346,8 +351,10 @@ export default { }).then(data => { api.payment(data.data).then(res => { // api.success('支付成功'); + this.isPay = false; uni.redirectTo({url: '/pages/Order/done?type=card'}); }).catch(err => { + this.isPay = false; api.error('支付失败') }) }); diff --git a/pages/Coupons/index.vue b/pages/Coupons/index.vue index bb70c89..8ca5bd6 100644 --- a/pages/Coupons/index.vue +++ b/pages/Coupons/index.vue @@ -157,11 +157,13 @@ methods: { getDrawList(){ drawList().then(data => { - if(data.data.goodslists.length > 0){ - this.types = [ - {title:'省点银子', value: 2}, - {title:'宝藏挖掘机', value: 1}, - ]; + if(data.code === 200){ + if(data.data.goodslists.length > 0){ + this.types = [ + {title:'省点银子', value: 2}, + {title:'宝藏挖掘机', value: 1}, + ]; + } } }); }, diff --git a/pages/FeedLog/index.vue b/pages/FeedLog/index.vue index 9c48e91..5e7df3f 100644 --- a/pages/FeedLog/index.vue +++ b/pages/FeedLog/index.vue @@ -348,7 +348,7 @@ onLoad(options) { this.pet_id = options.pet_id; this.type = options.type || 'detail'; - this.feedLog(options.pet_id) + this.getFeedLog(options.pet_id); }, methods: { redirtTo(url){ @@ -405,7 +405,7 @@ url:url }) }, - feedLog(pet_id) { + getFeedLog(pet_id) { let that = this; feedLog(pet_id).then(data => { let feedlist = this.detail.feedlist; diff --git a/pages/Help/index.vue b/pages/Help/index.vue index 35452aa..1f7786f 100644 --- a/pages/Help/index.vue +++ b/pages/Help/index.vue @@ -25,7 +25,7 @@ :custom-style="{padding:'34rpx 0'}" > { + tokenByPhone(this.model).then((res) => { if(res.code === 200){ - uni.$u.toast('反馈成功') - let user = uni.getStorageSync('user'); - uni.setStorageSync('workerToken',user); - api.logout(); - uni.setStorageSync('token',res.data); - this.model = { - connect:'', - remark:'', - file:[] - } - this.fileList = []; + uni.$u.toast('获取成功'); + let user = uni.getStorageSync('token'); + api.logout(true,false).then(() => { + uni.setStorageSync('workerToken',user); + uni.setStorageSync('token',res.data.token); + }); }else{ uni.$u.toast(res.msg) } diff --git a/pages/Index/components/OrderPage/index.vue b/pages/Index/components/OrderPage/index.vue index 273702d..8b9aeef 100644 --- a/pages/Index/components/OrderPage/index.vue +++ b/pages/Index/components/OrderPage/index.vue @@ -213,8 +213,8 @@ let minDate = now.setMonth(now.getMonth()-6); this.minDate = this.formatDate(minDate); - this.start_time = ''; - this.end_time = ''; + // this.start_time = ''; + // this.end_time = ''; console.log(this.minDate) console.log(this.maxDate) }, diff --git a/pages/Index/components/UserPage/index.vue b/pages/Index/components/UserPage/index.vue index 8302f2c..70cf200 100644 --- a/pages/Index/components/UserPage/index.vue +++ b/pages/Index/components/UserPage/index.vue @@ -194,13 +194,13 @@ 我的奖品 - + - + 进入帮填 - + @@ -280,12 +280,16 @@ pagePadding:100, userInfo:{}, userExtends:{}, + workerToken:{} } }, methods: { clearWorkerUser(){ - uni.removeStorageSync('workerUser'); + let token = uni.getStorageSync('workerToken'); + uni.removeStorageSync('workerToken'); + uni.setStorageSync('token',token) uni.showToast({title:'退出成功'}); + uni.reLaunch({url:'/pages/Index/index'}) }, openPrivacyContract() { uni.openPrivacyContract({}); @@ -323,6 +327,7 @@ } }, showUserInfo(){ + this.workerToken = uni.getStorageSync('workerToken'); userDetail().then(res => { this.$store.commit('userInfo', UserCache.setAndReturn(res.data)); }) diff --git a/pages/Index/index.vue b/pages/Index/index.vue index 8c3e36f..6a6b626 100644 --- a/pages/Index/index.vue +++ b/pages/Index/index.vue @@ -101,12 +101,15 @@ }, // store. showUserInfo(){ - userDetail().then(res => { - this.$store.commit('userInfo', UserCache.setAndReturn(res.data)); - }) - userExtends().then(res => { - this.$store.commit('userExtends', UserCache.extSetAndReturn(res.data)); - }) + let token = uni.getStorageSync('token'); + if(token){ + userDetail().then(res => { + this.$store.commit('userInfo', UserCache.setAndReturn(res.data)); + }) + userExtends().then(res => { + this.$store.commit('userExtends', UserCache.extSetAndReturn(res.data)); + }) + } } }, onReachBottom() { diff --git a/pages/OrderConfirm/end.vue b/pages/OrderConfirm/end.vue index 5ccace1..3c0ded3 100644 --- a/pages/OrderConfirm/end.vue +++ b/pages/OrderConfirm/end.vue @@ -1414,8 +1414,8 @@ export default { sick:{option:'',remark:'',upload:[]}, excrement:{option:'',remark:'',upload:[]}, other :{option:'',remark:'',upload:[]}, - food_bowl :{option:'',remark:'',upload:[]}, - basin :{option:'',remark:'',upload:[]}, + food_bowl :{value:'',remark:'',upload:[]}, + basin :{value:'',remark:'',upload:[]}, staple_food :{option:'',type_option:'',remark:'',upload:[]}, water :{option:'',remark:'',upload:[]}, snacks :{option:'',remark:'',upload:[]}, @@ -1604,7 +1604,7 @@ export default { orderEnd(this.model).then((res) => { if (res.code === 200) { api.success('保存成功').then(() => { - // uni.navigateBack(); + uni.navigateBack(); }) } else { uni.$u.toast(res.msg) diff --git a/pages/OrderDetail/index.vue b/pages/OrderDetail/index.vue index eb9c8d6..ee3098e 100644 --- a/pages/OrderDetail/index.vue +++ b/pages/OrderDetail/index.vue @@ -1,7 +1,7 @@