Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zmr

This commit is contained in:
zmr900709
2020-07-11 15:42:05 +08:00
19 changed files with 466 additions and 183 deletions

View File

@@ -5,10 +5,10 @@
<image :src="order.extend_store.store_avatar"></image>
<view class="store-name">{{ order.extend_store.store_name }}</view>
</view>
<view class="order-status">{{ order.order_state | viewState }}</view>
<view class="order-status">{{ state }}</view>
</view>
<view class="goods-info">
<view class="goods-item" @click="toDetailsPage" v-for="goods in order.extend_order_goods" :key="goods.goods_id">
<view class="goods-item" @click="toOtherPage('Details')" v-for="goods in order.extend_order_goods" :key="goods.goods_id">
<image :src="goods.goods_image"></image>
<view class="goods-text">
<view class="goods-name u-line-2">{{ goods.goods_name }}</view>
@@ -17,72 +17,65 @@
<view class="goods-price u-line-1" v-if="order.order_state == 20 || order.order_state == 40">总价99.00实付款99</view>
<view class="goods-date" v-if="order.order_state == 20 || order.order_state == 40">
<image src="@/pageE/static/mine/26.png"></image>
<view>2020.05.17</view>
<view>{{ order.add_time | date }}</view>
</view>
</view>
</view>
</view>
<view class="order-btn" v-if="[10, 30, 20, 40].indexOf(order.order_state) >= 0">
<view class="logistics" v-if="order.order_state == 30" @click="toLogistics">查看物流</view>
<view class="comment" v-if="order.order_state == 20" @click="toComment">立即评价</view>
<view class="logistics" v-if="order.order_state == 30" @click="toOtherPage('Logistics')">查看物流</view>
<view class="comment" v-if="order.order_state == 40 && order.evaluation_state == 0" @click="toOtherPage('Comment')">立即评价</view>
<view class="calcel" v-if="order.order_state == 10">取消支付</view>
<view class="payment" v-if="order.order_state == 10">立即支付</view>
<view class="service" v-if="order.order_state == 40">联系官方客服</view>
<view class="submit" v-if="order.order_state == 40">提交官方审核</view>
<view class="service" v-if="order.order_state == 20">联系官方客服</view>
<view class="submit" v-if="order.order_state == 20">提交官方审核</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {}
return {
state: '', // 1: 待收货 2: 待评价 3: 交易成功 4: 已取消 5: 已退款 6: 待支付
}
},
props: {
order: Object
},
filters: {
viewState(value) {
created() {
this.viewState();
},
methods: {
viewState() {
let state;
switch (value) {
case 10:
state = '待支付';
break;
case 0:
switch (this.order.order_state) {
case 0: // 已取消
state = '已取消';
break;
case 30:
case 10: // 未付款
state = '待支付';
break;
case 20: // 已付款
state = '交易成功';
break;
case 30: // 已发货
state = '待收货';
break;
case -1:
state = '试穿试送';
break;
case 20:
state = '待评价';
break;
case 40:
state = '售后';
case 40: // 已收货
if(this.order.evaluation_state == 0) state = '待评价';
else state = '交易成功'
break;
default:
break;
}
return state;
if(this.order.refund_state) state = '已退款';
this.state = state;
},
},
methods: {
toDetailsPage() {
uni.navigateTo({
url: '/pageE/order/Details?order.order_state=' + this.order.order_state
toOtherPage(url) {
this.$u.route('/pageE/order/' + url, {
oid: this.order.order_id,
});
},
toLogistics() {
uni.navigateTo({
url: '/pageE/order/Logistics'
});
},
toComment() {
uni.navigateTo({
url: '/pageE/order/Comment'
});
}
},
};
</script>
@@ -184,6 +177,9 @@ export default {
.logistics, .comment, .payment {
@include btn-class($width: 160rpx, $color: rgba(255,119,15,1));
}
.calcel {
@include btn-class($width: 160rpx, $color: rgba(155,153,153,1));
}
.service {
@include btn-class($width: 216rpx, $color: rgba(155,153,153,1));
}