Skip to content

J
jd-vx-app
Commit fe4fd3c2 authored by 肖健's avatar 肖健
Browse files
Options

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

parents 7e693a36 fd3c1d0e
Show whitespace changes
Inline Side-by-side
Showing with 679 additions and 468 deletions
pages/personal.vue
View file @ fe4fd3c2
......@@ -141,6 +141,12 @@ export default {
url: '/pages/main'
});
});
}else{
uni.showToast({
title: res.data.msg,
icon: 'none',
duration: 2000
});
}
})
......@@ -228,7 +234,6 @@ export default {
if(this.userInfo.avatar){
this.avatar = this.userInfo.avatar
}
}
})
},
......
pages/shop.vue
View file @ fe4fd3c2
......@@ -145,6 +145,11 @@ export default {
// this.$refs.list.loadFail()
} else {
this.$refs.list.refreshFail()
uni.showToast({
title: res.data.msg,
icon: 'none',
duration: 2000
});
}
})
}, this.$u.random(100, 1000));
......@@ -197,6 +202,12 @@ export default {
}).then(res => {
if (res.data.code == 200) {
this.mallList = res.data.data.rows || []
}else{
uni.showToast({
title: res.data.msg,
icon: 'none',
duration: 2000
});
}
})
},
......@@ -222,6 +233,12 @@ export default {
uni.setStorageSync('refresh',0)
this.loading = "loadmore"
}
}else{
uni.showToast({
title: res.data.msg,
icon: 'none',
duration: 2000
});
}
})
},
......@@ -241,6 +258,12 @@ export default {
imgList.push(e)
})
this.list3 = imgList
}else{
uni.showToast({
title: res.data.msg,
icon: 'none',
duration: 2000
});
}
})
},
......
pagesB/pages/move-car/callDetail.vue
View file @ fe4fd3c2
......@@ -3,8 +3,8 @@
* @Description: 呼叫记录详情
-->
<template>
<view class="appCotent">
<div class="callDetail">
<view class="appCotent">
<div class="callDetail">
<div class="view__content">
<div class="view__item" v-for="(vo,inx) in items" :key="inx">
<div class="view__title">
......@@ -18,12 +18,12 @@
<div class="view__btn view__back" @click="goBack">
返回
</div>
</div>
</view>
</div>
</view>
</template>
<script>
export default {
export default {
data() {
return {
items: [{
......@@ -65,33 +65,66 @@ export default {
};
},
methods: {
goBack(){
goBack() {
uni.navigateBack({
delta: 1
})
},
getApplyMoveLog(){
let opts = { url: '/app/moveLog/apply/' + this.id, method: 'get' };
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.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.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: "请求他人挪车"})
moveLogInfo.push({
title: "通知类型:",
value: "请求他人挪车"
})
this.items = moveLogInfo
}
})
......@@ -103,11 +136,11 @@ export default {
onLoad(option) {
this.id = option.id
},
}
}
</script>
<style lang="scss" scoped>
.callDetail {
.callDetail {
padding: 40rpx 0rpx;
.view__content {
......@@ -161,10 +194,11 @@ export default {
background-size: contain;
color: rgba(255, 255, 255, 1);
}
.view__back{
.view__back {
background: url('@/static/move-car/move-car-view1.png') no-repeat;
background-size: contain;
color:rgba(153, 153, 153, 1);
color: rgba(153, 153, 153, 1);
}
}
}
</style>
pagesB/pages/move-car/myCall.vue
View file @ fe4fd3c2
......@@ -3,8 +3,8 @@
* @Description: 我的呼叫记录
-->
<template>
<view class="appCotent">
<div class="myRecord">
<view class="appCotent">
<div class="myRecord">
<scroll-list ref="list" :option="option" @load="load" @refresh="refresh">
<div class="record__item" v-for="(vo,inx) in items" :key="inx">
<div class="item__top">
......@@ -33,12 +33,12 @@
</div>
</div>
</scroll-list>
</div>
</view>
</div>
</view>
</template>
<script>
export default {
export default {
data() {
return {
option: {
......@@ -54,7 +54,10 @@ export default {
load(paging) {
setTimeout(() => {
let list = [];
let opts = { url: '/app/moveLog/apply/list?pageSize='+paging.size+'&pageNum='+paging.page, method: 'get' };
let opts = {
url: '/app/moveLog/apply/list?pageSize=' + paging.size + '&pageNum=' + paging.page,
method: 'get'
};
this.http.httpTokenRequest(opts, {}).then(res => {
if (res.data.code == 200) {
list = res.data.rows || []
......@@ -68,6 +71,11 @@ export default {
} else {
// 加载失败
this.$refs.list.loadFail()
uni.showToast({
title: res.data.msg,
icon: 'none',
duration: 2000
});
}
})
}, this.$u.random(100, 1000));
......@@ -76,7 +84,10 @@ export default {
refresh(paging) {
setTimeout(() => {
let list = [];
let opts = { url: '/app/moveLog/apply/list?pageSize='+paging.size+'&pageNum='+paging.page, method: 'get' };
let opts = {
url: '/app/moveLog/apply/list?pageSize=' + paging.size + '&pageNum=' + paging.page,
method: 'get'
};
this.http.httpTokenRequest(opts, {}).then(res => {
if (res.data.code == 200) {
list = res.data.rows || []
......@@ -90,20 +101,34 @@ export default {
} else {
// 加载失败
this.$refs.list.refreshFail()
uni.showToast({
title: res.data.msg,
icon: 'none',
duration: 2000
});
}
})
}, this.$u.random(100, 1000));
},
goDetail(id){
goDetail(id) {
uni.navigateTo({
url: '/pagesB/pages/move-car/callDetail?id=' + id
})
},
getApplyMoveLogList(){
let opts = { url: '/app/moveLog/apply/list', method: 'get' };
getApplyMoveLogList() {
let opts = {
url: '/app/moveLog/apply/list',
method: 'get'
};
this.http.httpTokenRequest(opts, {}).then(res => {
if (res.data.code == 200) {
this.items = res.data.rows
}else{
uni.showToast({
title: res.data.msg,
icon: 'none',
duration: 2000
});
}
})
},
......@@ -111,11 +136,11 @@ export default {
created() {
//this.getApplyMoveLogList()
},
}
}
</script>
<style lang="scss" scoped>
.myRecord {
.myRecord {
padding: 40rpx 0rpx;
.record__item {
......@@ -206,5 +231,5 @@ export default {
}
}
}
}
}
</style>
pagesB/pages/move-car/myMoveCar.vue
View file @ fe4fd3c2
......@@ -96,6 +96,11 @@ export default {
this.http.httpTokenRequest(opts, {}).then(res => {
if (res.data.code == 200) {
this.items = res.data.rows || []
} else {
uni.showToast({
title: res.data.msg,
icon: "none",
});
}
})
},
......@@ -112,6 +117,11 @@ export default {
icon: "success",
});
this.getMyMoveCodeList()
}else {
uni.showToast({
title: res.data.msg,
icon: "none",
});
}
})
this.unbindShow = false
......
pagesB/pages/move-car/myRecord.vue
View file @ fe4fd3c2
......@@ -70,6 +70,11 @@ export default {
} else {
// 加载失败
this.$refs.list.loadFail()
uni.showToast({
title: res.data.msg,
icon: 'none',
duration: 2000
});
}
})
}, this.$u.random(100, 1000));
......@@ -95,6 +100,11 @@ export default {
} else {
// 加载失败
this.$refs.list.refreshFail()
uni.showToast({
title: res.data.msg,
icon: 'none',
duration: 2000
});
}
})
}, this.$u.random(100, 1000));
......@@ -113,6 +123,12 @@ export default {
this.http.httpTokenRequest(opts, {}).then(res => {
if (res.data.code == 200) {
this.items = res.data.rows
}else{
uni.showToast({
title: res.data.msg,
icon: 'none',
duration: 2000
});
}
})
},
......
pagesB/pages/move-car/oneMoveCar.vue
View file @ fe4fd3c2
......@@ -137,6 +137,10 @@
let that = this
if (e.detail.errMsg == "getPhoneNumber:ok") {
that.appBo.code = e.detail.code
uni.showLoading({
title: '加载中',
mask:true
});
that.call()
} else {
uni.hideLoading()
......@@ -152,6 +156,7 @@
if (res.data.code == 200) {
//请求成功逻辑，修改
this.noticeResult = res.data.data
uni.hideLoading()
if (this.noticeResult.allowPhone) {
// this.list[0].name = this.noticeResult.secretPhone
// this.show = true;
......@@ -161,10 +166,17 @@
}
} else {
this.noticeResult = res.data.data
uni.hideLoading()
if (this.noticeResult) {
uni.showModal({
content: this.noticeResult.notAllowPhoneReason,
})
}else{
uni.showToast({
title: res.data.msg,
icon: 'none',
duration: 2000
});
}
}
})
......@@ -187,6 +199,12 @@
uni.showModal({
content: this.noticeResult.notAllowWechatReason,
})
}else{
uni.showToast({
title: res.data.msg,
icon: 'none',
duration: 2000
});
}
}
})
......@@ -221,6 +239,12 @@
this.http.httpTokenRequest(opts, {}).then(res => {
if (res.data.code == 200) {
this.wxMaxNum = res.data.data.wxMaxNum
} else{
uni.showToast({
title: res.data.msg,
icon: 'none',
duration: 2000
});
}
})
},
......@@ -260,6 +284,12 @@
if (res.data.code == 200) {
//添加逻辑判断
this.appBo.logCode = res.data.data
}else{
uni.showToast({
title: res.data.msg,
icon: 'none',
duration: 2000
});
}
})
},
......@@ -360,6 +390,11 @@
}
} else {
//console.log('获取信息失败，请重试！')
uni.showToast({
title: res.data.msg,
icon: 'none',
duration: 2000
});
}
},
})
......
pagesB/pages/move-car/recordDetail.vue
View file @ fe4fd3c2
......@@ -3,8 +3,8 @@
* @Description: 挪车记录详情
-->
<template>
<view class="appCotent">
<div class="callDetail">
<view class="appCotent">
<div class="callDetail">
<div class="view__content">
<div class="view__item" v-for="(vo,inx) in items" :key="inx">
<div class="view__title">
......@@ -18,12 +18,12 @@
<div class="view__btn view__back" @click="goBack">
返回
</div>
</div>
</view>
</div>
</view>
</template>
<script>
export default {
export default {
data() {
return {
items: [],
......@@ -32,34 +32,73 @@ export default {
};
},
methods: {
goBack(){
goBack() {
uni.navigateBack({
delta: 1
})
},
getMyMoveLog(){
let opts = { url: '/app/moveLog/my/' + this.id, method: 'get' };
getMyMoveLog() {
let opts = {
url: '/app/moveLog/my/' + 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.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.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: "他人请求挪车"})
moveLogInfo.push({
title: "通知类型:",
value: "他人请求挪车"
})
this.items = moveLogInfo
}else{
uni.showToast({
title: res.data.msg,
icon: 'none',
duration: 2000
});
}
})
},
......@@ -67,14 +106,14 @@ export default {
onLoad(option) {
this.id = option.id
},
onShow(){
onShow() {
this.getMyMoveLog()
},
}
}
</script>
<style lang="scss" scoped>
.callDetail {
.callDetail {
padding: 40rpx 0rpx;
.view__content {
......@@ -128,10 +167,11 @@ export default {
background-size: contain;
color: rgba(255, 255, 255, 1);
}
.view__back{
.view__back {
background: url('@/static/move-car/move-car-view1.png') no-repeat;
background-size: contain;
color:rgba(153, 153, 153, 1);
color: rgba(153, 153, 153, 1);
}
}
}
</style>
pagesB/pages/move-car/scan.vue
View file @ fe4fd3c2
......@@ -430,7 +430,7 @@ export default {
uni.hideLoading()
uni.showToast({
title: res.data.msg,
icon: "error",
icon: "none",
});
}
})
......@@ -454,6 +454,11 @@ export default {
uni.navigateTo({
url: '/pages/binding/article'
});
}else {
uni.showToast({
title: res.data.msg,
icon: "none",
});
}
})
}
......
pagesC/pages/shop/detail.vue
View file @ fe4fd3c2
......@@ -63,6 +63,12 @@ export default {
if (res.data.code == 200) {
this.mallInfo = res.data.data
this.list6 = this.mallInfo.imageUrls
}else{
uni.showToast({
title: res.data.msg,
icon: 'none',
duration: 2000
});
}
})
},
......
pagesC/pages/shop/search.vue
View file @ fe4fd3c2
......@@ -58,8 +58,14 @@ export default {
console.log(searchCondition,222222222)
let opts = { url: '/app/index/mall/list', method: 'get' };
this.http.httpRequest(opts, searchCondition).then(res => {
if(res.data.code == 200){
if (res.data.code == 200) {
this.items = res.data.data.rows
}else{
uni.showToast({
title: res.data.msg,
icon: 'none',
duration: 2000
});
}
})
}, 300)
......
pagesD/pages/personal/userInfo.vue
View file @ fe4fd3c2
......@@ -363,6 +363,12 @@ export default {
// element.rules.label = this.userInfo.birthday
// }
})
}else{
uni.showToast({
title: res.data.msg,
icon: 'none',
duration: 2000
});
}
})
},
......
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