Commit fe4fd3c2 authored by 肖健's avatar 肖健

Merge remote-tracking branch 'origin/dev_cd' into dev_jd

parents 7e693a36 fd3c1d0e
...@@ -141,7 +141,13 @@ export default { ...@@ -141,7 +141,13 @@ export default {
url: '/pages/main' url: '/pages/main'
}); });
}); });
} }else{
uni.showToast({
title: res.data.msg,
icon: 'none',
duration: 2000
});
}
}) })
}, },
...@@ -228,7 +234,6 @@ export default { ...@@ -228,7 +234,6 @@ export default {
if(this.userInfo.avatar){ if(this.userInfo.avatar){
this.avatar = this.userInfo.avatar this.avatar = this.userInfo.avatar
} }
} }
}) })
}, },
......
...@@ -145,6 +145,11 @@ export default { ...@@ -145,6 +145,11 @@ export default {
// this.$refs.list.loadFail() // this.$refs.list.loadFail()
} else { } else {
this.$refs.list.refreshFail() this.$refs.list.refreshFail()
uni.showToast({
title: res.data.msg,
icon: 'none',
duration: 2000
});
} }
}) })
}, this.$u.random(100, 1000)); }, this.$u.random(100, 1000));
...@@ -197,7 +202,13 @@ export default { ...@@ -197,7 +202,13 @@ export default {
}).then(res => { }).then(res => {
if (res.data.code == 200) { if (res.data.code == 200) {
this.mallList = res.data.data.rows || [] this.mallList = res.data.data.rows || []
} }else{
uni.showToast({
title: res.data.msg,
icon: 'none',
duration: 2000
});
}
}) })
}, },
getBoutiqueMallList() { getBoutiqueMallList() {
...@@ -222,7 +233,13 @@ export default { ...@@ -222,7 +233,13 @@ export default {
uni.setStorageSync('refresh',0) uni.setStorageSync('refresh',0)
this.loading = "loadmore" this.loading = "loadmore"
} }
} }else{
uni.showToast({
title: res.data.msg,
icon: 'none',
duration: 2000
});
}
}) })
}, },
getImage(imageUrl) { getImage(imageUrl) {
...@@ -241,7 +258,13 @@ export default { ...@@ -241,7 +258,13 @@ export default {
imgList.push(e) imgList.push(e)
}) })
this.list3 = imgList this.list3 = imgList
} }else{
uni.showToast({
title: res.data.msg,
icon: 'none',
duration: 2000
});
}
}) })
}, },
// 轮播跳转其他页面 // 轮播跳转其他页面
......
...@@ -3,168 +3,202 @@ ...@@ -3,168 +3,202 @@
* @Description: 呼叫记录详情 * @Description: 呼叫记录详情
--> -->
<template> <template>
<view class="appCotent"> <view class="appCotent">
<div class="callDetail"> <div class="callDetail">
<div class="view__content"> <div class="view__content">
<div class="view__item" v-for="(vo,inx) in items" :key="inx"> <div class="view__item" v-for="(vo,inx) in items" :key="inx">
<div class="view__title"> <div class="view__title">
{{vo.title}} {{vo.title}}
</div> </div>
<div class="view__value"> <div class="view__value">
{{vo.value}} {{vo.value}}
</div> </div>
</div> </div>
</div> </div>
<div class="view__btn view__back" @click="goBack"> <div class="view__btn view__back" @click="goBack">
返回 返回
</div> </div>
</div> </div>
</view> </view>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
items: [{ items: [{
title: "车主车牌号:", title: "车主车牌号:",
value: "" value: ""
}, },
{ {
title: "品牌:", title: "品牌:",
value: "" value: ""
}, },
{ {
title: "车型:", title: "车型:",
value: "" value: ""
}, },
{ {
title: "车主手机号:", title: "车主手机号:",
value: "" value: ""
}, { }, {
title: "时间:", title: "时间:",
value: "" value: ""
}, },
{ {
title: "地点:", title: "地点:",
value: "" value: ""
}, { }, {
title: "申请手机号:", title: "申请手机号:",
value: "" value: ""
}, },
{ {
title: "通知方式:", title: "通知方式:",
value: "" value: ""
}, { }, {
title: "通知类型:", title: "通知类型:",
value: "" value: ""
}
],
id: '',
moveLog: '',
};
},
methods: {
goBack(){
uni.navigateBack({
delta: 1
})
},
getApplyMoveLog(){
let opts = { url: '/app/moveLog/apply/' + this.id, method: 'get' };
let that = this
this.http.httpTokenRequest(opts, {}).then(res => {
if (res.data.code == 200) {
this.moveLog = res.data.data
let moveLogInfo = []
moveLogInfo.push({title: "车主车牌号:", value: this.moveLog.carNo})
moveLogInfo.push({title: "品牌:", value: this.moveLog.brand || ''})
moveLogInfo.push({title: "车型:", value: this.moveLog.carModel || ''})
if(this.moveLog.confirmType == '1'){
moveLogInfo.push({title: "车主手机号:", value: this.moveLog.userMobile || ''})
}
moveLogInfo.push({title: "时间:", value: this.moveLog.applyDate})
moveLogInfo.push({title: "地点:", value: this.moveLog.detailInfo})
if(this.moveLog.confirmType == '1'){
moveLogInfo.push({title: "申请手机号:", value: this.moveLog.applyUserMobile|| ''})
moveLogInfo.push({title: "通知方式:", value: "拨打电话"})
}else{
moveLogInfo.push({title: "通知方式:", value: "微信通知"})
} }
moveLogInfo.push({title: "通知类型:", value: "请求他人挪车"}) ],
this.items = moveLogInfo id: '',
} moveLog: '',
}) };
},
methods: {
goBack() {
uni.navigateBack({
delta: 1
})
},
getApplyMoveLog() {
let opts = {
url: '/app/moveLog/apply/' + this.id,
method: 'get'
};
let that = this
this.http.httpTokenRequest(opts, {}).then(res => {
if (res.data.code == 200) {
this.moveLog = res.data.data
let moveLogInfo = []
moveLogInfo.push({
title: "车主车牌号:",
value: this.moveLog.carNo
})
moveLogInfo.push({
title: "品牌:",
value: this.moveLog.brand || ''
})
moveLogInfo.push({
title: "车型:",
value: this.moveLog.carModel || ''
})
if (this.moveLog.confirmType == '1') {
moveLogInfo.push({
title: "车主手机号:",
value: this.moveLog.userMobile || ''
})
}
moveLogInfo.push({
title: "时间:",
value: this.moveLog.applyDate
})
moveLogInfo.push({
title: "地点:",
value: this.moveLog.detailInfo
})
if (this.moveLog.confirmType == '1') {
moveLogInfo.push({
title: "申请手机号:",
value: this.moveLog.applyUserMobile || ''
})
moveLogInfo.push({
title: "通知方式:",
value: "拨打电话"
})
} else {
moveLogInfo.push({
title: "通知方式:",
value: "微信通知"
})
}
moveLogInfo.push({
title: "通知类型:",
value: "请求他人挪车"
})
this.items = moveLogInfo
}
})
},
},
onShow() {
this.getApplyMoveLog()
}, },
}, onLoad(option) {
onShow() { this.id = option.id
this.getApplyMoveLog() },
}, }
onLoad(option) {
this.id = option.id
},
}
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.callDetail { .callDetail {
padding: 40rpx 0rpx; padding: 40rpx 0rpx;
.view__content {
background: #FFFFFF;
box-shadow: 0rpx 0rpx 28rpx 1rpx rgba(232, 232, 232, 0.2);
border-radius: 20rpx;
margin-bottom: 60rpx;
.view__content { .view__item {
background: #FFFFFF; padding: 34rpx 0rpx;
box-shadow: 0rpx 0rpx 28rpx 1rpx rgba(232, 232, 232, 0.2); margin: 0 40rpx;
border-radius: 20rpx; display: flex;
margin-bottom: 60rpx; align-items: center;
justify-content: space-between;
border-bottom: 1rpx solid rgba(0, 0, 0, .1);
.view__item { .view__title {
padding: 34rpx 0rpx;
margin: 0 40rpx;
display: flex;
align-items: center;
justify-content: space-between;
border-bottom: 1rpx solid rgba(0, 0, 0, .1);
.view__title { font-size: 32rpx;
font-family: PingFang SC;
font-weight: 500;
color: #333333;
}
font-size: 32rpx; .view__value {
font-family: PingFang SC;
font-weight: 500;
color: #333333;
}
.view__value { font-size: 28rpx;
font-family: DIN;
font-weight: 500;
color: #666666;
}
}
font-size: 28rpx; .view__item:nth-last-child(1) {
font-family: DIN; border-bottom: none;
font-weight: 500; }
color: #666666; }
}
}
.view__item:nth-last-child(1) { .view__btn {
border-bottom: none; width: 670rpx;
} height: 76rpx;
} text-align: center;
line-height: 76rpx;
margin: 0 auto;
font-size: 32rpx;
}
.view__btn { .view__no__bind {
width: 670rpx; background: url('@/static/move-car/move-car-view2.png') no-repeat;
height: 76rpx; margin-bottom: 30rpx;
text-align: center; background-size: contain;
line-height: 76rpx; color: rgba(255, 255, 255, 1);
margin: 0 auto; }
font-size: 32rpx;
}
.view__no__bind { .view__back {
background: url('@/static/move-car/move-car-view2.png') no-repeat; background: url('@/static/move-car/move-car-view1.png') no-repeat;
margin-bottom: 30rpx; background-size: contain;
background-size: contain; color: rgba(153, 153, 153, 1);
color: rgba(255, 255, 255, 1); }
} }
.view__back{
background: url('@/static/move-car/move-car-view1.png') no-repeat;
background-size: contain;
color:rgba(153, 153, 153, 1);
}
}
</style> </style>
This diff is collapsed.
...@@ -96,6 +96,11 @@ export default { ...@@ -96,6 +96,11 @@ export default {
this.http.httpTokenRequest(opts, {}).then(res => { this.http.httpTokenRequest(opts, {}).then(res => {
if (res.data.code == 200) { if (res.data.code == 200) {
this.items = res.data.rows || [] this.items = res.data.rows || []
} else {
uni.showToast({
title: res.data.msg,
icon: "none",
});
} }
}) })
}, },
...@@ -112,6 +117,11 @@ export default { ...@@ -112,6 +117,11 @@ export default {
icon: "success", icon: "success",
}); });
this.getMyMoveCodeList() this.getMyMoveCodeList()
}else {
uni.showToast({
title: res.data.msg,
icon: "none",
});
} }
}) })
this.unbindShow = false this.unbindShow = false
......
...@@ -70,6 +70,11 @@ export default { ...@@ -70,6 +70,11 @@ export default {
} else { } else {
// 加载失败 // 加载失败
this.$refs.list.loadFail() this.$refs.list.loadFail()
uni.showToast({
title: res.data.msg,
icon: 'none',
duration: 2000
});
} }
}) })
}, this.$u.random(100, 1000)); }, this.$u.random(100, 1000));
...@@ -95,6 +100,11 @@ export default { ...@@ -95,6 +100,11 @@ export default {
} else { } else {
// 加载失败 // 加载失败
this.$refs.list.refreshFail() this.$refs.list.refreshFail()
uni.showToast({
title: res.data.msg,
icon: 'none',
duration: 2000
});
} }
}) })
}, this.$u.random(100, 1000)); }, this.$u.random(100, 1000));
...@@ -113,7 +123,13 @@ export default { ...@@ -113,7 +123,13 @@ export default {
this.http.httpTokenRequest(opts, {}).then(res => { this.http.httpTokenRequest(opts, {}).then(res => {
if (res.data.code == 200) { if (res.data.code == 200) {
this.items = res.data.rows this.items = res.data.rows
} }else{
uni.showToast({
title: res.data.msg,
icon: 'none',
duration: 2000
});
}
}) })
}, },
}, },
......
...@@ -137,6 +137,10 @@ ...@@ -137,6 +137,10 @@
let that = this let that = this
if (e.detail.errMsg == "getPhoneNumber:ok") { if (e.detail.errMsg == "getPhoneNumber:ok") {
that.appBo.code = e.detail.code that.appBo.code = e.detail.code
uni.showLoading({
title: '加载中',
mask:true
});
that.call() that.call()
} else { } else {
uni.hideLoading() uni.hideLoading()
...@@ -152,6 +156,7 @@ ...@@ -152,6 +156,7 @@
if (res.data.code == 200) { if (res.data.code == 200) {
//请求成功逻辑,修改 //请求成功逻辑,修改
this.noticeResult = res.data.data this.noticeResult = res.data.data
uni.hideLoading()
if (this.noticeResult.allowPhone) { if (this.noticeResult.allowPhone) {
// this.list[0].name = this.noticeResult.secretPhone // this.list[0].name = this.noticeResult.secretPhone
// this.show = true; // this.show = true;
...@@ -161,10 +166,17 @@ ...@@ -161,10 +166,17 @@
} }
} else { } else {
this.noticeResult = res.data.data this.noticeResult = res.data.data
uni.hideLoading()
if (this.noticeResult) { if (this.noticeResult) {
uni.showModal({ uni.showModal({
content: this.noticeResult.notAllowPhoneReason, content: this.noticeResult.notAllowPhoneReason,
}) })
}else{
uni.showToast({
title: res.data.msg,
icon: 'none',
duration: 2000
});
} }
} }
}) })
...@@ -187,6 +199,12 @@ ...@@ -187,6 +199,12 @@
uni.showModal({ uni.showModal({
content: this.noticeResult.notAllowWechatReason, content: this.noticeResult.notAllowWechatReason,
}) })
}else{
uni.showToast({
title: res.data.msg,
icon: 'none',
duration: 2000
});
} }
} }
}) })
...@@ -221,7 +239,13 @@ ...@@ -221,7 +239,13 @@
this.http.httpTokenRequest(opts, {}).then(res => { this.http.httpTokenRequest(opts, {}).then(res => {
if (res.data.code == 200) { if (res.data.code == 200) {
this.wxMaxNum = res.data.data.wxMaxNum this.wxMaxNum = res.data.data.wxMaxNum
} } else{
uni.showToast({
title: res.data.msg,
icon: 'none',
duration: 2000
});
}
}) })
}, },
getCarNumber() { getCarNumber() {
...@@ -260,6 +284,12 @@ ...@@ -260,6 +284,12 @@
if (res.data.code == 200) { if (res.data.code == 200) {
//添加逻辑判断 //添加逻辑判断
this.appBo.logCode = res.data.data this.appBo.logCode = res.data.data
}else{
uni.showToast({
title: res.data.msg,
icon: 'none',
duration: 2000
});
} }
}) })
}, },
...@@ -360,6 +390,11 @@ ...@@ -360,6 +390,11 @@
} }
} else { } else {
//console.log('获取信息失败,请重试!') //console.log('获取信息失败,请重试!')
uni.showToast({
title: res.data.msg,
icon: 'none',
duration: 2000
});
} }
}, },
}) })
......
...@@ -3,135 +3,175 @@ ...@@ -3,135 +3,175 @@
* @Description: 挪车记录详情 * @Description: 挪车记录详情
--> -->
<template> <template>
<view class="appCotent"> <view class="appCotent">
<div class="callDetail"> <div class="callDetail">
<div class="view__content"> <div class="view__content">
<div class="view__item" v-for="(vo,inx) in items" :key="inx"> <div class="view__item" v-for="(vo,inx) in items" :key="inx">
<div class="view__title"> <div class="view__title">
{{vo.title}} {{vo.title}}
</div> </div>
<div class="view__value"> <div class="view__value">
{{vo.value}} {{vo.value}}
</div> </div>
</div> </div>
</div> </div>
<div class="view__btn view__back" @click="goBack"> <div class="view__btn view__back" @click="goBack">
返回 返回
</div> </div>
</div> </div>
</view> </view>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
items: [], items: [],
id: '', id: '',
moveLog: {}, moveLog: {},
}; };
}, },
methods: { methods: {
goBack(){ goBack() {
uni.navigateBack({ uni.navigateBack({
delta: 1 delta: 1
}) })
}, },
getMyMoveLog(){ getMyMoveLog() {
let opts = { url: '/app/moveLog/my/' + this.id, method: 'get' }; let opts = {
let that = this url: '/app/moveLog/my/' + this.id,
this.http.httpTokenRequest(opts, {}).then(res => { method: 'get'
if (res.data.code == 200) { };
this.moveLog = res.data.data let that = this
let moveLogInfo = [] this.http.httpTokenRequest(opts, {}).then(res => {
moveLogInfo.push({title: "车主车牌号:", value: this.moveLog.carNo}) if (res.data.code == 200) {
moveLogInfo.push({title: "品牌:", value: this.moveLog.brand || ''}) this.moveLog = res.data.data
moveLogInfo.push({title: "车型:", value: this.moveLog.carModel || ''}) let moveLogInfo = []
if(this.moveLog.confirmType == '1'){ moveLogInfo.push({
moveLogInfo.push({title: "车主手机号:", value: this.moveLog.userMobile}) title: "车主车牌号:",
} value: this.moveLog.carNo
moveLogInfo.push({title: "时间:", value: this.moveLog.applyDate}) })
moveLogInfo.push({title: "地点:", value: this.moveLog.detailInfo}) moveLogInfo.push({
if(this.moveLog.confirmType == '1'){ title: "品牌:",
moveLogInfo.push({title: "申请手机号:", value: this.moveLog.applyUserMobile}) value: this.moveLog.brand || ''
moveLogInfo.push({title: "通知方式:", value: "拨打电话"}) })
moveLogInfo.push({
title: "车型:",
value: this.moveLog.carModel || ''
})
if (this.moveLog.confirmType == '1') {
moveLogInfo.push({
title: "车主手机号:",
value: this.moveLog.userMobile
})
}
moveLogInfo.push({
title: "时间:",
value: this.moveLog.applyDate
})
moveLogInfo.push({
title: "地点:",
value: this.moveLog.detailInfo
})
if (this.moveLog.confirmType == '1') {
moveLogInfo.push({
title: "申请手机号:",
value: this.moveLog.applyUserMobile
})
moveLogInfo.push({
title: "通知方式:",
value: "拨打电话"
})
} else {
moveLogInfo.push({
title: "通知方式:",
value: "微信通知"
})
}
moveLogInfo.push({
title: "通知类型:",
value: "他人请求挪车"
})
this.items = moveLogInfo
}else{ }else{
moveLogInfo.push({title: "通知方式:", value: "微信通知"}) uni.showToast({
title: res.data.msg,
icon: 'none',
duration: 2000
});
} }
moveLogInfo.push({title: "通知类型:", value: "他人请求挪车"}) })
this.items = moveLogInfo },
} },
}) onLoad(option) {
this.id = option.id
},
onShow() {
this.getMyMoveLog()
}, },
}, }
onLoad(option) {
this.id = option.id
},
onShow(){
this.getMyMoveLog()
},
}
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.callDetail { .callDetail {
padding: 40rpx 0rpx; padding: 40rpx 0rpx;
.view__content { .view__content {
background: #FFFFFF; background: #FFFFFF;
box-shadow: 0rpx 0rpx 28rpx 1rpx rgba(232, 232, 232, 0.2); box-shadow: 0rpx 0rpx 28rpx 1rpx rgba(232, 232, 232, 0.2);
border-radius: 20rpx; border-radius: 20rpx;
margin-bottom: 60rpx; margin-bottom: 60rpx;
.view__item { .view__item {
padding: 34rpx 0rpx; padding: 34rpx 0rpx;
margin: 0 40rpx; margin: 0 40rpx;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
border-bottom: 1rpx solid rgba(0, 0, 0, .1); border-bottom: 1rpx solid rgba(0, 0, 0, .1);
.view__title { .view__title {
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #333333; color: #333333;
} }
.view__value {
.view__value { font-size: 28rpx;
font-family: DIN;
font-weight: 500;
color: #666666;
}
}
font-size: 28rpx; .view__item:nth-last-child(1) {
font-family: DIN; border-bottom: none;
font-weight: 500; }
color: #666666; }
}
}
.view__item:nth-last-child(1) { .view__btn {
border-bottom: none; width: 670rpx;
} height: 76rpx;
} text-align: center;
line-height: 76rpx;
margin: 0 auto;
font-size: 32rpx;
}
.view__btn { .view__no__bind {
width: 670rpx; background: url('@/static/move-car/move-car-view2.png') no-repeat;
height: 76rpx; margin-bottom: 30rpx;
text-align: center; background-size: contain;
line-height: 76rpx; color: rgba(255, 255, 255, 1);
margin: 0 auto; }
font-size: 32rpx;
}
.view__no__bind { .view__back {
background: url('@/static/move-car/move-car-view2.png') no-repeat; background: url('@/static/move-car/move-car-view1.png') no-repeat;
margin-bottom: 30rpx; background-size: contain;
background-size: contain; color: rgba(153, 153, 153, 1);
color: rgba(255, 255, 255, 1); }
} }
.view__back{
background: url('@/static/move-car/move-car-view1.png') no-repeat;
background-size: contain;
color:rgba(153, 153, 153, 1);
}
}
</style> </style>
...@@ -430,7 +430,7 @@ export default { ...@@ -430,7 +430,7 @@ export default {
uni.hideLoading() uni.hideLoading()
uni.showToast({ uni.showToast({
title: res.data.msg, title: res.data.msg,
icon: "error", icon: "none",
}); });
} }
}) })
...@@ -454,6 +454,11 @@ export default { ...@@ -454,6 +454,11 @@ export default {
uni.navigateTo({ uni.navigateTo({
url: '/pages/binding/article' url: '/pages/binding/article'
}); });
}else {
uni.showToast({
title: res.data.msg,
icon: "none",
});
} }
}) })
} }
......
...@@ -63,6 +63,12 @@ export default { ...@@ -63,6 +63,12 @@ export default {
if (res.data.code == 200) { if (res.data.code == 200) {
this.mallInfo = res.data.data this.mallInfo = res.data.data
this.list6 = this.mallInfo.imageUrls this.list6 = this.mallInfo.imageUrls
}else{
uni.showToast({
title: res.data.msg,
icon: 'none',
duration: 2000
});
} }
}) })
}, },
......
...@@ -58,9 +58,15 @@ export default { ...@@ -58,9 +58,15 @@ export default {
console.log(searchCondition,222222222) console.log(searchCondition,222222222)
let opts = { url: '/app/index/mall/list', method: 'get' }; let opts = { url: '/app/index/mall/list', method: 'get' };
this.http.httpRequest(opts, searchCondition).then(res => { this.http.httpRequest(opts, searchCondition).then(res => {
if(res.data.code == 200){ if (res.data.code == 200) {
this.items = res.data.data.rows this.items = res.data.data.rows
} }else{
uni.showToast({
title: res.data.msg,
icon: 'none',
duration: 2000
});
}
}) })
}, 300) }, 300)
}, },
......
...@@ -363,7 +363,13 @@ export default { ...@@ -363,7 +363,13 @@ export default {
// element.rules.label = this.userInfo.birthday // element.rules.label = this.userInfo.birthday
// } // }
}) })
} }else{
uni.showToast({
title: res.data.msg,
icon: 'none',
duration: 2000
});
}
}) })
}, },
editUserInfo() { editUserInfo() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment