Commit 7ada66f9 authored by Facius's avatar Facius

第一轮bug修复

parent 09e50ec4
...@@ -31,7 +31,13 @@ ...@@ -31,7 +31,13 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.settle-view {
::-webkit-scrollbar {
width: 0;
}
}
.introduction { .introduction {
border-radius: 12rpx; border-radius: 12rpx;
overflow: auto; overflow: auto;
......
...@@ -106,7 +106,8 @@ ...@@ -106,7 +106,8 @@
"path": "pages/settle/select", "path": "pages/settle/select",
"style": { "style": {
"navigationBarTitleText": "选择可服务的城市", "navigationBarTitleText": "选择可服务的城市",
"navigationBarBackgroundColor": "#FFFFFF" "navigationBarBackgroundColor": "#FFFFFF",
"disableScroll": true
} }
}, },
{ {
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
</view> </view>
<view class="bottomRightView"> <view class="bottomRightView">
<view :class="isSelect ? 'nextBtn selectBackColor' : 'nextBtn defaultBackColor' " <view :class="isSelect ? 'nextBtn selectBackColor' : 'nextBtn defaultBackColor' "
@click="nextClick()"> @click="handleClick()">
<text class="bottomTitle">{{bottomTitle}}</text> <text class="bottomTitle">{{bottomTitle}}</text>
</view> </view>
</view> </view>
...@@ -300,7 +300,7 @@ ...@@ -300,7 +300,7 @@
that.vuex_token + that.vuex_token +
'?userExamId=' + this.userExamId + '?userExamId=' + this.userExamId +
'&questionId=' + questionId + '&questionId=' + questionId +
'&userAnswerIds=' + this.userAnswerIds, '&userAnswerIds=' + (this.userAnswerIds || '9999'), // 9999超时自动下一题
method: 'POST', method: 'POST',
data: { data: {
// userExamId:this.userExamId, // userExamId:this.userExamId,
...@@ -372,7 +372,6 @@ ...@@ -372,7 +372,6 @@
}, },
startCounting: function() { startCounting: function() {
if (this.isStop) { if (this.isStop) {
return return
} }
...@@ -441,16 +440,18 @@ ...@@ -441,16 +440,18 @@
},
// 点击下一步
handleClick() {
// 判断有没有选
if (!this.isSelect) {
return
}
this.nextClick()
}, },
//下一题 //下一题
nextClick: function() { nextClick: function() {
//判断有没有选
if (!this.isSelect) {
return
}
clearTimeout(this.timer) clearTimeout(this.timer)
this.currentNumber = this.currentNumber + 1 this.currentNumber = this.currentNumber + 1
......
...@@ -235,7 +235,7 @@ ...@@ -235,7 +235,7 @@
} }
this.baseInfo = res.data this.baseInfo = res.data
uni.showToast({ uni.showToast({
title: '入驻基本信息提交成功', title: '提交成功',
icon: 'success' icon: 'success'
}); });
}, },
...@@ -326,7 +326,9 @@ ...@@ -326,7 +326,9 @@
*/ */
async submitBaseInfo() { async submitBaseInfo() {
if (!this.submitStatus) {
return
}
// this.newSubmitBaseInfo() // this.newSubmitBaseInfo()
// return // return
const baseInfo = this.baseInfo; const baseInfo = this.baseInfo;
......
...@@ -321,7 +321,7 @@ export default { ...@@ -321,7 +321,7 @@ export default {
break; break;
} }
await self.chooseImage("qiniu", attr) await self.chooseImage("qiniu", {...attr, options: {count: 1}})
if(self.uploadType && self.imgList && self.imgList.length > 0) { if(self.uploadType && self.imgList && self.imgList.length > 0) {
// 设置图片对象 // 设置图片对象
self.imgObj[self.uploadType] = self.imgList self.imgObj[self.uploadType] = self.imgList
...@@ -460,7 +460,10 @@ export default { ...@@ -460,7 +460,10 @@ export default {
return formFlag; return formFlag;
}, },
async submitFileInfo() { async submitFileInfo() {
if (!this.submitBtnStatus) {
return
}
if (!this.checkFileInfo()) { if (!this.checkFileInfo()) {
return; return;
} }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<view class="content"> <view class="content">
<Settle :index="5"> <Settle :index="5">
<view class="base-list"> <view class="base-list">
<view class="title">充电桩安装需缴纳配件押金</view> <view class="title">您还需缴纳配件押金</view>
<view class="price"><text>¥ </text>{{settledInfo.record.deposit}}</view> <view class="price"><text>¥ </text>{{settledInfo.record.deposit}}</view>
<view class="list"> <view class="list">
<view class="item u-flex u-row-between"> <view class="item u-flex u-row-between">
...@@ -146,7 +146,8 @@ ...@@ -146,7 +146,8 @@
this.saving = true this.saving = true
uni.showLoading({ uni.showLoading({
title: '支付中……' title: '支付中……'
}) })
// 提交支付订单 // 提交支付订单
const code = await this.getCode() const code = await this.getCode()
const params = { const params = {
...@@ -158,31 +159,14 @@ ...@@ -158,31 +159,14 @@
} }
const response = await this.$u.api.paySettleDeposit(params) const response = await this.$u.api.paySettleDeposit(params)
console.log(response) console.log(response)
if (response.code !== 200) { if (response.code !== 200) {
this.saving = false
uni.showToast({ uni.showToast({
title: response.message, title: response.message,
icon: 'none' icon: 'none'
}) })
return return
} }
let timer = setTimeout(res => {
clearTimeout(timer)
uni.showModal({
title: '提示',
content: '支付结果',
confirmText: '成功',
cancelText: '失败',
success: function(res) {
if (res.confirm) {
// console.log(res.confirm,'res.confirm')
self.pending()
} else if (res.cancel) {
self.saving = false
console.log('用户点击取消');
}
}
});
}, 1000)
const { const {
charge, charge,
...@@ -193,16 +177,19 @@ ...@@ -193,16 +177,19 @@
pingpp.createPayment(charge, (result, err) => { pingpp.createPayment(charge, (result, err) => {
if (result == "success") { if (result == "success") {
// 只有微信公众账号 (wx_pub)、微信小程序 (wx_lite)、QQ 公众号 (qpay_pub)、支付宝口碑 (alipay_qr) // 只有微信公众账号 (wx_pub)、微信小程序 (wx_lite)、QQ 公众号 (qpay_pub)、支付宝口碑 (alipay_qr)
// 支付成功的结果会在这里返回,其他的支付结果都会跳转到 extra 中对应的 URL。 // 支付成功的结果会在这里返回,其他的支付结果都会跳转到 extra 中对应的 URL。
this.showPopView()
uni.showToast({ uni.showToast({
title: '支付成功', title: '支付成功',
icon: 'none' icon: 'none'
}) })
} else if (result == "fail") { } else if (result == "fail") {
// charge 不正确或者微信公众账号/QQ 公众号/支付宝口碑支付失败时会在此处返回 // charge 不正确或者微信公众账号/QQ 公众号/支付宝口碑支付失败时会在此处返回
// console.log(err.msg) // console.log(err.msg)
this.showPopView()
} else if (result == "cancel") { } else if (result == "cancel") {
// 微信公众账号、QQ 公众号、支付宝口碑支付取消支付 // 微信公众账号、QQ 公众号、支付宝口碑支付取消支付
this.saving = false
uni.showToast({ uni.showToast({
title: '您已经取消了支付', title: '您已经取消了支付',
icon: 'none' icon: 'none'
...@@ -210,6 +197,26 @@ ...@@ -210,6 +197,26 @@
} }
}); });
}, },
showPopView() {
// let timer = setTimeout(res => {
// clearTimeout(timer)
uni.showModal({
title: '提示',
content: '支付结果',
confirmText: '成功',
cancelText: '失败',
success: ((res) => {
if (res.confirm) {
// console.log(res.confirm,'res.confirm')
this.pending()
} else if (res.cancel) {
this.pending()
console.log('用户点击取消');
}
})
});
// }, 1000)
}
}, },
} }
</script> </script>
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
<view class="container u-row-between" v-if="info"> <view class="container u-row-between" v-if="info">
<Settle :index="pageIndex"> <Settle :index="pageIndex">
<view class="content-view"> <view class="content-view">
<view style="min-height: 120rpx;" v-if="status == 8"></view> <!-- <view style="min-height: 120rpx;" v-if="status == 8"></view> -->
<view class="u-flex u-row-center"> <view class="u-flex u-row-center">
<image :class="['icon', {active: status != 1}]" <image :class="['icon', {active: status != 1, h: [1, 2, 3, 4].indexOf(status) != -1}]"
:src="imageUrl"> :src="imageUrl">
</image> </image>
</view> </view>
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
v-for="(txt,index) in info.tipsArr" :key="index">{{txt}}</text> v-for="(txt,index) in info.tipsArr" :key="index">{{txt}}</text>
</view> </view>
<view class="services-view"> <view class="services-view">
<view v-if="status != 8"> <view v-if="[1, 2, 3, 4].indexOf(status) != -1">
<image class="service-info-image" :src="erweimaImage"></image> <image class="service-info-image" :src="erweimaImage"></image>
<view class="content-info-tip">长按二维码添加官方客服微信</view> <view class="content-info-tip">长按二维码添加官方客服微信</view>
<view class="content-info-tip">及时了解审核进度</view> <view class="content-info-tip">及时了解审核进度</view>
...@@ -45,14 +45,14 @@ ...@@ -45,14 +45,14 @@
promptList: [{ promptList: [{
status: 1, status: 1,
statusName: '待审核', statusName: '待审核',
txtArr: ['已提交,等待审核', '正在审核中'], txtArr: ['入驻资料提交成功', '您的申请入驻资料已成功提交,工作人员正在审核中'],
btnTxt: '去首页', btnTxt: '去首页',
url: '/pages/index/index' url: '/pages/index/index'
}, { }, {
status: 2, status: 2,
statusName: '已通过', statusName: '已通过',
txtArr: ['恭喜,审核通过', '“充电桩安装入驻审核”'], txtArr: ['入驻资料审核成功', '您的申请入驻资料已审核提交,可进行在线学习考试'],
btnTxt: '去考试', btnTxt: '下一步',
url: '/pages/learn/exam' url: '/pages/learn/exam'
}, { }, {
status: 3, status: 3,
...@@ -64,28 +64,26 @@ ...@@ -64,28 +64,26 @@
}, { }, {
status: 4, status: 4,
statusName: '已驳回', statusName: '已驳回',
txtArr: ['您的入驻资料已被驳回!', '可重新提交资料!'], txtArr: ['入驻资料审核失败'],
tipsArr: ['原因:', '图片不够清楚'], tipsArr: ['原因:', '图片不够清楚'],
btnTxt: '重新提交', btnTxt: '重新提交',
url: '/pages/settle/file' url: '/pages/settle/file'
}, { }, {
status: 8, status: 8,
statusName: 'step4', statusName: 'step4',
txtArr: ['您已通过', '“充电桩安装入驻考试”'], txtArr: ['您已通过接单在线考试', '通过在线考试后,可以前往签约'],
tipsArr: ['可以正式签约了'], btnTxt: '下一步',
btnTxt: '去签约',
url: '/pages/settle/sign-contract' url: '/pages/settle/sign-contract'
}, { }, {
status: [5, 6], status: [5, 6],
statusName: '未支付保证金', statusName: '未支付保证金',
txtArr: ['您已成为', "充电桩安装的签约服务商"], txtArr: ['您已成功完成签约', "完成签约后,缴纳配件押金即可完成入驻"],
tipsArr: ['请缴纳1000元质保金'], btnTxt: '下一步',
btnTxt: '去缴纳保证金',
url: '/pages/settle/pay-ensure' url: '/pages/settle/pay-ensure'
}, { }, {
status: 7, status: 7,
statusName: '已支付保证金', statusName: '已支付保证金',
txtArr: ['您已成为', "充电桩安装的正式服务商"], txtArr: ['您已成功缴纳配件押金', " 成功缴纳配件押金后即前往接单"],
btnTxt: '去首页', btnTxt: '去首页',
url: '/pages/index/index' url: '/pages/index/index'
}], }],
...@@ -177,9 +175,10 @@ ...@@ -177,9 +175,10 @@
this.info = this.promptList[0] this.info = this.promptList[0]
return return
} }
if (status === 6) { // if (status === 6) {
info.tipsArr[0] = '请缴纳' + this.settledInfo.record.deposit + '元质保金' // info.tipsArr[0] = '请缴纳' + this.settledInfo.record.deposit + '元质保金'
} else if (status === 4) { // } else
if (status === 4) {
info.tipsArr[1] = this.settledInfo.record.reason || '' info.tipsArr[1] = this.settledInfo.record.reason || ''
} }
this.info = info this.info = info
...@@ -218,9 +217,15 @@ ...@@ -218,9 +217,15 @@
height: 224rpx; height: 224rpx;
&.active { &.active {
margin-top: 38rpx; margin-top: 150rpx;
width: 234rpx; width: 234rpx;
height: 222rpx; height: 222rpx;
}
&.h {
margin-top: 38rpx;
width: 234rpx;
height: 222rpx;
} }
} }
......
...@@ -366,7 +366,7 @@ ...@@ -366,7 +366,7 @@
// } // }
uni.hideLoading() uni.hideLoading()
uni.showToast({ uni.showToast({
title: '入驻基本信息提交成功', title: '提交成功',
icon: 'success' icon: 'success'
}); });
// let timer = setTimeout(() => { // let timer = setTimeout(() => {
......
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