|
@@ -28,14 +28,14 @@
|
|
|
</view>
|
|
</view>
|
|
|
<view class="fs-26">充电启动中</view>
|
|
<view class="fs-26">充电启动中</view>
|
|
|
</block>
|
|
</block>
|
|
|
- <block v-if="step === 2">
|
|
|
|
|
|
|
+ <block v-else- if="step === 2">
|
|
|
<image
|
|
<image
|
|
|
class="icon"
|
|
class="icon"
|
|
|
src="/pages-charge/static/charge-ordering-icon.png"
|
|
src="/pages-charge/static/charge-ordering-icon.png"
|
|
|
/>
|
|
/>
|
|
|
<view class="fs-26 mt-10">充电中...</view>
|
|
<view class="fs-26 mt-10">充电中...</view>
|
|
|
</block>
|
|
</block>
|
|
|
- <block v-if="step === 3">
|
|
|
|
|
|
|
+ <block v-else-if="step === 3">
|
|
|
<image
|
|
<image
|
|
|
class="icon"
|
|
class="icon"
|
|
|
src="/pages-charge/static/charge-ordering-finish.png"
|
|
src="/pages-charge/static/charge-ordering-finish.png"
|
|
@@ -257,8 +257,8 @@ const finish = () => {
|
|
|
chargeInfo.value = _chargeInfo;
|
|
chargeInfo.value = _chargeInfo;
|
|
|
cancelCharge(options.value && options.value.sn ? options.value.sn : "")
|
|
cancelCharge(options.value && options.value.sn ? options.value.sn : "")
|
|
|
.then(() => {
|
|
.then(() => {
|
|
|
- uni.hideLoading();
|
|
|
|
|
if (res.failReason) {
|
|
if (res.failReason) {
|
|
|
|
|
+ uni.hideLoading();
|
|
|
uni.showModal({
|
|
uni.showModal({
|
|
|
content: res.failReason,
|
|
content: res.failReason,
|
|
|
showCancel: false,
|
|
showCancel: false,
|
|
@@ -267,10 +267,13 @@ const finish = () => {
|
|
|
},
|
|
},
|
|
|
});
|
|
});
|
|
|
return;
|
|
return;
|
|
|
- }
|
|
|
|
|
- setTimeout(() => {
|
|
|
|
|
|
|
+ }else{
|
|
|
step.value = 3;
|
|
step.value = 3;
|
|
|
- }, 3000);
|
|
|
|
|
|
|
+ }
|
|
|
|
|
+ uni.hideLoading();
|
|
|
|
|
+/* setTimeout(() => {
|
|
|
|
|
+
|
|
|
|
|
+ }, 3000);*/
|
|
|
})
|
|
})
|
|
|
.catch((err) => {
|
|
.catch((err) => {
|
|
|
console.log(err);
|
|
console.log(err);
|