theluyuan/deming
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'comment 8.1' (#94) from zhy into master

Browse Source 
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/94
This commit was merged in pull request #94.
This commit is contained in:
hansu
2020-08-01 16:37:27 +08:00
parent 223dd51db7 854976c8f0
commit 680fa48e85
18 changed files with 356 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/comment/index.vue
View File

@@ -3,7 +3,7 @@
<view class="user">
<u-avatar :src="content.member_avatar" class="avatar" size="60"></u-avatar>
<text class="name">{{ content.geval_frommembername }}</text>
<u-rate v-if="reply" :disabled='true' count="count" v-model="rate" size="23" active-color="#FF780F" inactive-color="#F0EDF1" gutter="10"></u-rate>
<u-rate v-if="reply" :disabled='true' :count="count" v-model="rate" size="23" active-color="#FF780F" inactive-color="#F0EDF1" gutter="10"></u-rate>
</view>
<view class="content">
<view class="text">{{ content.geval_content }}</view>
@@ -30,7 +30,7 @@ export default {
data() {
return {
count: 5,
rate: 2,
rate: 0,
}
},
props: {

12
components/mine/order-item/index.vue
View File

@@ -24,11 +24,12 @@
</view>
</view>
</view>
<view class="order-btn" v-if="[1, 3, 4, 8].indexOf(order.view_type) >= 0">
<view class="calcel" v-if="order.view_type == 3" @click="toOtherPage('Logistics')">查看物流</view>
<view class="order-btn" v-if="[1, 2, 3, 4, 8].indexOf(order.view_type) >= 0">
<view class="cancel" v-if="order.view_type == 3 || order.view_type == 2" @click="applyRefund">申请退款</view>
<view class="cancel" v-if="order.view_type == 3" @click="toOtherPage('Logistics')">查看物流</view>
<view class="logistics" v-if="order.view_type == 3" @click="confirmReceive">确认收货</view>
<view class="comment" v-if="order.view_type == 4" @click="toOtherPage('Comment')">立即评价</view>
<view class="calcel" v-if="order.view_type == 1" @click="cancelOrder">取消支付</view>
<view class="cancel" v-if="order.view_type == 1" @click="cancelOrder">取消支付</view>
<view class="payment" v-if="order.view_type == 1" @click="payNow(order.pay_sn, order.order_amount)">立即支付</view>
<view class="service" v-if="order.view_type == 8">联系官方客服</view>
<view class="submit" v-if="order.view_type == 8">提交官方审核</view>
@@ -79,6 +80,9 @@ export default {
}
this.$u.toast(res.message);
})
},
applyRefund() {
},
confirmReceive() {
this.$u.api.confirmReceive({
@@ -204,7 +208,7 @@ export default {
.logistics, .comment, .payment {
@include btn-class($width: 160rpx, $color: rgba(255,119,15,1));
}
.calcel {
.cancel {
@include btn-class($width: 160rpx, $color: rgba(155,153,153,1));
}
.service {