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

Merge pull request 'store article 8.13' (#177) from zhy into master

Browse Source 
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/177
This commit is contained in:
hansu 2020-08-13 16:07:43 +08:00
commit f1fbeb65a1
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,7 +25,8 @@
</view> </view>
</view> </view>
<view class="order-btn" v-if="[1, 2, 3, 4, 8].indexOf(order.view_type) >= 0"> <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) && order.is_refund == 1" @click="toOtherPage('RefundOrder')">申请退款</view> <!-- || order.view_type == 2 -->
<view class="cancel" v-if="(order.view_type == 3) && order.is_refund == 1" @click="toOtherPage('RefundOrder')">申请退款</view>
<view class="cancel" v-if="order.view_type == 3" @click="toOtherPage('Logistics')">查看物流</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="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="comment" v-if="order.view_type == 4" @click="toOtherPage('Comment')">立即评价</view>

12
pageE/tool/SendWash.vue
View File

@ -324,18 +324,18 @@ export default {
.btn { .btn {
box-sizing: border-box; box-sizing: border-box;
width: 154rpx; width: 154rpx;
height: 54rpx; // height: 54rpx;
border-radius: 49rpx; border-radius: 49rpx;
// transform: translate(-50%, 0); // transform: translate(-50%, 0);
font-size: 26rpx; font-size: 26rpx;
border: 1rpx solid rgba(255,120,15,1); border: 1rpx solid rgba(255,120,15,1);
color:rgba(255,120,15,1); color:rgba(255,120,15,1);
// text-align: center; text-align: center;
// line-height: 54rpx; line-height: 54rpx;
// margin-right: -80rpx; // margin-right: -80rpx;
display: flex; // display: flex;
align-items: center; // align-items: center;
justify-content: center; // justify-content: center;
} }
} }
} }