18577375184
/
jimei-hudong-h5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

调整

master
梁欣 1 year ago
parent
2820f3e2c3
commit
03ad470b44
2 changed files with 615 additions and 573 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      pages/goods/detail.vue
  2. 60
      pages/user/shop/order.vue

10
pages/goods/detail.vue
View File

@ -6,7 +6,7 @@
style="position: fixed;z-index: 98;width: 100%;background-color: #fff;padding: 10rpx 0;" style="position: fixed;z-index: 98;width: 100%;background-color: #fff;padding: 10rpx 0;"
:style="{opacity : !headerClass? 0 : 1}"> :style="{opacity : !headerClass? 0 : 1}">
<gui-switch-navigation <gui-switch-navigation
:items="[{id:1,name:'商品'},{id:2,name:'购买须知'},{id:4,name:'详情'},{id:5,name:'推荐'}]"
:items="[{id:1,name:'商品'},{id:2,name:'购买须知'},{id:3,name:'评论'},{id:4,name:'详情'},{id:5,name:'推荐'}]"
@change="navchange" :currentIndex="navIndex" textAlign="center" :isCenter="true" @change="navchange" :currentIndex="navIndex" textAlign="center" :isCenter="true"
activeLineBg="linear-gradient(to right, #9E1A91, #4D0868)" activeDirection="center" :size="0" activeLineBg="linear-gradient(to right, #9E1A91, #4D0868)" activeDirection="center" :size="0"
:margin="10" padding="30rpx" :margin="10" padding="30rpx"
@ -121,7 +121,7 @@
</view> </view>
<view style="height: 20rpx;"></view> <view style="height: 20rpx;"></view>
</view> </view>
<view class="mainitems">
<view class="mainitems" id="comment">
<view style="border-radius: 10rpx;background-color: #fff;"> <view style="border-radius: 10rpx;background-color: #fff;">
<Comment v-if="!isLoading" :goods-id="goodsId" :limit="2"/> <Comment v-if="!isLoading" :goods-id="goodsId" :limit="2"/>
</view> </view>
@ -394,10 +394,14 @@ export default {
} }
break; break;
case 2 : { case 2 : {
which = 'detail'
which = 'comment'
} }
break; break;
case 3 : { case 3 : {
which = 'detail'
}
break;
case 4 : {
which = 'recommended' which = 'recommended'
} }
break; break;

60
pages/user/shop/order.vue
View File

@ -17,10 +17,11 @@
<view class="item-top-left"> <view class="item-top-left">
<!-- <text class="order-time">{{ item.create_time }}</text> --> <!-- <text class="order-time">{{ item.create_time }}</text> -->
<text class="order-time" <text class="order-time"
style="font-weight: bold;">{{item.goods[0].goods_name}}</text>
style="font-weight: bold;">{{ item.goods[0].goods_name }}
</text>
</view> </view>
<view class="item-top-right" style="display: flex;"> <view class="item-top-right" style="display: flex;">
<text class="state-texts">{{ item.state_text }} </text>
<text class="state-texts">{{ item.state_text === '已取消' ? '客户已申请退款' : item.state_text }}</text>
</view> </view>
</view> </view>
<!-- 商品列表 --> <!-- 商品列表 -->
@ -32,12 +33,24 @@
</view> </view>
<!-- 商品信息 --> <!-- 商品信息 -->
<view class="goods-content"> <view class="goods-content">
<view class="goods-title"><text
class="oneline-hide">下单时间：{{ item.create_time }}</text></view>
<view class="goods-title"><text
class="oneline-hide">数量：{{ goods.total_num }}</text></view>
<view class="goods-title"><text class="oneline-hide">需付款：<text
class="unit">￥</text>{{ item.pay_price }}</text></view>
<view class="goods-title">
<text
class="oneline-hide">下单时间：{{ item.create_time }}
</text>
</view>
<view class="goods-title">
<text
class="oneline-hide">数量：{{ goods.total_num }}
</text>
</view>
<view class="goods-title">
<text class="oneline-hide">需付款：
<text
class="unit">￥
</text>
{{ item.pay_price }}
</text>
</view>
</view> </view>
<!-- 交易信息 --> <!-- 交易信息 -->
<!-- <view class="goods-trade"> <!-- <view class="goods-trade">
@ -57,14 +70,18 @@
<view class="btn-group clearfix"> <view class="btn-group clearfix">
<view class="f-28 col-8" style="font-size: 25rpx;line-height: 50rpx;"> <view class="f-28 col-8" style="font-size: 25rpx;line-height: 50rpx;">
下单用户:{{item.extract.linkman}}({{item.extract.phone}})</view>
下单用户:{{ item.extract.linkman }}({{ item.extract.phone }})
</view>
</view> </view>
<view class="btn-group clearfix"> <view class="btn-group clearfix">
<!-- 订单评价 --> <!-- 订单评价 -->
<block v-if="item.order_status == 21">
<view class="refund-view" v-if="item.order_status == 21">
<text class="refund-tips">客户已发起申请退款</text>
<view class="refund-view-btns">
<view class="btn-item" @click="onCancel(item.order_id)">同意</view> <view class="btn-item" @click="onCancel(item.order_id)">同意</view>
<view class="btn-item" @click="showReject(item.order_id)">拒绝</view> <view class="btn-item" @click="showReject(item.order_id)">拒绝</view>
</block>
</view>
</view>
</view> </view>
</view> </view>
@ -575,4 +592,25 @@
} }
} }
.refund-view {
display: flex;
align-items: center;
justify-content: space-between;
.refund-tips{
font-size: 28rpx;
color: #4D0868;
}
.refund-view-btns {
display: flex;
align-items: flex-end;
justify-content: center;
:last-child{
margin-left: 15rpx;
}
}
}
</style> </style>
Write Preview
Loading…
Cancel
Save