Browse Source

修改取消订单报错的问题

master
gaoxs 5 years ago
parent
commit
b908a4855e
  1. 14
      pages/order/OrderDetails/index.vue
  2. 62
      pages/orderAdmin/Statistics/index.vue

14
pages/order/OrderDetails/index.vue

@ -542,15 +542,21 @@ export default {
} }
}, },
goBack() { goBack() {
if (last.name === "MyOrder") return this.$yrouter.back(); if (this.name === "MyOrder") {
else this.$yrouter.back();
return this.$yrouter.replace({ return;
path: "/order/list/" } else {
console.log(this)
this.$yrouter.replace({
path: "/pages/order/MyOrder/index"
}); });
return;
}
}, },
cancelOrder() { cancelOrder() {
cancelOrderHandle(this.orderInfo.orderId) cancelOrderHandle(this.orderInfo.orderId)
.then(() => { .then(() => {
setTimeout(() => this.goBack(), 300); setTimeout(() => this.goBack(), 300);
}) })
.catch(() => { .catch(() => {

62
pages/orderAdmin/Statistics/index.vue

@ -15,7 +15,7 @@
<!-- <view class="chart"> <!-- <view class="chart">
<view class="company">{{ where.type === 1 ? "单位(元)" : "单位(份)" }}</view> <view class="company">{{ where.type === 1 ? "单位(元)" : "单位(份)" }}</view>
<ECharts :options="polar"></ECharts> <ECharts :options="polar"></ECharts>
</view> --> </view>-->
<view class="public-wrapper"> <view class="public-wrapper">
<view class="title"> <view class="title">
<text class="iconfont icon-xiangxishuju"></text>详细数据 <text class="iconfont icon-xiangxishuju"></text>详细数据
@ -58,7 +58,7 @@
:end="[2049, 5, 20]" :end="[2049, 5, 20]"
/> />
</view> </view>
</view> --> </view>-->
<view class="mask" @touchmove.prevent v-show="current === true" @click="close"></view> <view class="mask" @touchmove.prevent v-show="current === true" @click="close"></view>
<Loading :loaded="loaded" :loading="loading"></Loading> <Loading :loaded="loaded" :loading="loading"></Loading>
</view> </view>
@ -161,7 +161,10 @@ export default {
}, },
animationDuration: 2000 animationDuration: 2000
}, },
value: [[year, month, day - 1], [year, month, day]], value: [
[year, month, day - 1],
[year, month, day]
],
isrange: true, isrange: true,
weekSwitch: false, weekSwitch: false,
ismulti: false, ismulti: false,
@ -238,11 +241,11 @@ export default {
that.time_price = res.data.time; that.time_price = res.data.time;
}, },
error => { error => {
uni.showToast({ uni.showToast({
title: error.msg, title: error.msg,
icon: "none", icon: "none",
duration: 2000 duration: 2000
});; });
} }
); );
}, },
@ -285,7 +288,10 @@ export default {
} }
}, },
clickSomeThing(data) { clickSomeThing(data) {
this.value = [[2019, 4, 1], [2019, 4, 8]]; this.value = [
[2019, 4, 1],
[2019, 4, 8]
];
}, },
setMonthRange() { setMonthRange() {
this.monthRange = this.monthRange.length ? [] : ["2019-4", "2020-1"]; this.monthRange = this.monthRange.length ? [] : ["2019-4", "2020-1"];
@ -316,14 +322,20 @@ export default {
multiMode() { multiMode() {
this.ismulti = true; this.ismulti = true;
this.isrange = false; this.isrange = false;
this.value = [[year, month, 16], [year, month, 18]]; this.value = [
[year, month, 16],
[year, month, 18]
];
this.handelRenderValues(); this.handelRenderValues();
// this.$refs.calendar.renderer(year, month); // this.$refs.calendar.renderer(year, month);
}, },
rangeMode() { rangeMode() {
this.ismulti = false; this.ismulti = false;
this.isrange = true; this.isrange = true;
this.value = [[year, month, 16], [year, month, 22]]; this.value = [
[year, month, 16],
[year, month, 22]
];
this.handelRenderValues(); this.handelRenderValues();
// this.$refs.calendar.renderer(year, month); // this.$refs.calendar.renderer(year, month);
}, },
@ -334,14 +346,10 @@ export default {
this.handelRenderValues(); this.handelRenderValues();
// this.$refs.calendar.renderer(year, month); // this.$refs.calendar.renderer(year, month);
}, },
selectMonth(month, year) { selectMonth(month, year) {},
}, prev(y, m, w) {},
prev(y, m, w) { next(year, month, week) {},
}, selectYear(year) {},
next(year, month, week) {
},
selectYear(year) {
},
setToday() { setToday() {
// this.$refs.calendar.setToday(); // this.$refs.calendar.setToday();
}, },
@ -395,15 +403,17 @@ export default {
res => { res => {
that.loading = false; that.loading = false;
that.loaded = res.data.length < that.filter.limit; that.loaded = res.data.length < that.filter.limit;
that.list.push.apply(that.list, res.data); // that.list.push.apply(that.list, res.data);
that.list = res.data;
that.filter.page = that.filter.page + 1; that.filter.page = that.filter.page + 1;
}, },
err => { err => {
uni.showToast({ uni.showToast({
title: err.msg || err.response.data.msg|| err.response.data.message, title:
icon: 'none', err.msg || err.response.data.msg || err.response.data.message,
duration: 2000 icon: "none",
}); duration: 2000
});
} }
); );
} }
@ -413,7 +423,7 @@ export default {
<style scoped lang="less"> <style scoped lang="less">
.echarts { .echarts {
width: 100%; width: 100%;
height: 5.5*100rpx; height: 5.5 * 100rpx;
} }
.calendar-wrapper { .calendar-wrapper {
position: fixed; position: fixed;
@ -428,7 +438,7 @@ export default {
transform: translate3d(0, 0, 0); transform: translate3d(0, 0, 0);
} }
.statistical-page .wrapper .increase { .statistical-page .wrapper .increase {
font-size: 0.26*100rpx; font-size: 0.26 * 100rpx;
} }
.statistical-page .wrapper .increase .iconfont { .statistical-page .wrapper .increase .iconfont {
margin-left: 0; margin-left: 0;

Loading…
Cancel
Save