Leadfyy.co
/
uniapp-shikongwang
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://8.134.10.79:3000/Leadfyy.co/uniapp-shikongwang

master
邓平艺 4 years ago
parent
bbc88bf110 087af17baf
commit
8b1f1ece8c
7 changed files with 41 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      colorui/main.css
  2. 11
      pages/order/apply-details.vue
  3. 11
      pages/order/apply-refund.vue
  4. 16
      pages/order/confirm-order.vue
  5. 7
      pages/order/index.vue
  6. 12
      pages/order/order-details.vue
  7. 5
      pages/order/unpay-details.vue

6
colorui/main.css
View File

@ -3887,6 +3887,12 @@ scroll-view.cu-steps .cu-item {
color: #FF0000;
}
.text-price1::before {
content: "¥";
font-size: 28rpx!important;
margin-right: 4rpx;
}
.text-cut {
text-overflow: ellipsis;
white-space: nowrap;

11
pages/order/apply-details.vue
View File

@ -14,9 +14,10 @@
<text class="block text-gray lf-font-28" style="margin-top: 20rpx;line-height: 40rpx;">数量 <text class="margin-left margin-right-xs text-gray">x</text>{{orderDetails.order.number}}</text>
<view class="flex justify-between" style="margin-top: 28rpx;">
<view class="text-red text-price lf-font-42 lf-font-bold" style="margin-top: 16rpx;">
<lf-price :price="orderDetails.order.selling_price" style="margin-top: 8rpx;" />
<!-- <view class="text-red text-price lf-font-42 lf-font-bold" style="margin-top: 16rpx;">
{{orderDetails.order.selling_price}}
</view>
</view> -->
<view>
<button class="cu-btn line-gray bg-white border round margin-left-sm lf-font-28">等待审核</button>
</view>
@ -31,7 +32,7 @@
<view class="bg-white">
<view class="cu-bar padding-lr solid-bottom flex justify-between align-center text-center">
<text class="text-gray lf-font-32">订单金额</text>
<view class="text-price lf-font-32 text-black">
<view class="text-price1 lf-font-32 text-black">
{{orderDetails.order.amount}}
</view>
</view>
@ -43,7 +44,7 @@
</view>
<view class="cu-bar padding-lr solid-bottom flex justify-between align-center text-center">
<text class="text-gray lf-font-32">扣费金额</text>
<view class="text-price lf-font-32 text-black">
<view class="text-price1 lf-font-32 text-black">
{{orderDetails.refund_rate_amount}}
</view>
</view>
@ -54,7 +55,7 @@
<view class="bg-white">
<view class="cu-bar padding-lr solid-bottom flex justify-between align-center text-center">
<text class="text-gray lf-font-32">可退金额</text>
<view class="text-price lf-font-32 text-black">
<view class="text-price1 lf-font-32 text-black">
{{orderDetails.refund_amount}}
</view>
</view>

11
pages/order/apply-refund.vue
View File

@ -14,9 +14,10 @@
<text class="block text-gray lf-font-28" style="margin-top: 20rpx;line-height: 40rpx;">数量 <text class="margin-left margin-right-xs text-gray">x</text>{{applyDetails.order.number}}</text>
<view class="flex justify-between" style="margin-top: 44rpx;">
<view class="text-red text-price lf-font-42 lf-font-bold">
<lf-price :price="applyDetails.order.selling_price" />
<!-- <view class="text-red text-price lf-font-42 lf-font-bold">
{{applyDetails.order.selling_price}}
</view>
</view> -->
</view>
</view>
</view>
@ -29,7 +30,7 @@
<view class="bg-white">
<view class="cu-bar padding-lr solid-bottom flex justify-between align-center text-center">
<text class="text-gray lf-font-32">订单金额</text>
<view class="text-price lf-font-32 text-black">
<view class="text-price1 lf-font-32 text-black">
{{applyDetails.order.amount}}
</view>
</view>
@ -41,7 +42,7 @@
</view>
<view class="cu-bar padding-lr solid-bottom flex justify-between align-center text-center">
<text class="text-gray lf-font-32">扣费金额</text>
<view class="text-price lf-font-32 text-black">
<view class="text-price1 lf-font-32 text-black">
{{applyDetails.order.refund_rate_amount}}
</view>
</view>
@ -54,7 +55,7 @@
<view class="bg-white">
<view class="cu-bar padding-lr solid-bottom flex justify-between align-center text-center">
<text class="text-gray lf-font-32">可退金额</text>
<view class="text-price lf-font-32 text-black">
<view class="text-price1 lf-font-32 text-black">
{{applyDetails.order.refund_amount}}
</view>
</view>

16
pages/order/confirm-order.vue
View File

@ -21,12 +21,11 @@
</view>
<view class="flex justify-between margin-top-sm">
<view class="text-red text-price lf-font-42 lf-font-bold" style="margin-top: 12rpx;">
<lf-price :price="orderDetails.goods.specs[0].selling_price" />
<!-- <view class="text-red text-price lf-font-42 lf-font-bold" style="margin-top: 12rpx;">
{{Number(orderDetails.goods.specs[0].selling_price || 0)}}
</view>
<!-- <view>
<button v-if="true" class="cu-btn line-orange round margin-left-sm text-sm">申请退款</button>
<button v-else class="cu-btn line-gray bg-gray round margin-left-sm text-sm">退款中</button>
</view> -->
</view>
</view>
@ -61,10 +60,11 @@
<view class="padding-lr padding-tb-sm bg-white flex justify-between align-center shadow">
<view class="flex align-center">
<text class="lf-font-28 text-gray">应付款：</text>
<view class="text-red text-price lf-font-42 lf-font-bold">
<!-- {{Number(orderDetails.goods.specs[0].selling_price*num || 0)}} -->
<lf-price :price="total(num, orderDetails.goods.specs[0].selling_price)" />
<!-- <view class="text-red text-price lf-font-42 lf-font-bold">
{{ total(num, orderDetails.goods.specs[0].selling_price) }}
</view>
</view> -->
</view>
<button class="cu-btn block bg-orange round shadow" @tap="submit">
<text class="cuIcon-loading2 cuIconfont-spin margin-right-xs text-white" v-if="loading"></text>

7
pages/order/index.vue
View File

@ -13,16 +13,17 @@
<view class="cu-tag badge tag-self lf-font-28 font-400" :style="{'background-color':item.state_text.bg_color,'color':item.state_text.color}">{{item.state_text.text}}</view>
</view>
<view class="right">
<view class="lf-line-2 title" style="line-height: 40rpx;">网红辣椒棒 魔鬼辣椒挑战全网第一辣 网红优惠季 </view>
<view class="lf-line-2 title" style="line-height: 40rpx;">{{item.goods.name}}</view>
<view class="lf-flex tips" style="margin: 0!important;">
<text class="progress margin-right-xs">数量</text>
<text class="bought">x {{item.number}}</text>
</view>
<view class="lf-row-between price" style="padding-right: 6rpx;">
<text class="lf-font-bold">
<!-- <text class="lf-font-bold">
<text class="lf-font-24">￥</text>
<text class="lf-font-42">{{item.selling_price}}</text>
</text>
</text> -->
<lf-price :price="item.selling_price" style="margin-top: 10rpx;" />
<button v-if="item.state==1" @tap.stop="$routerGo('/pages/order/confirm-order?type=1&goods_id='+item.goods_id+'&goods_specs_id='+item.goods_specs_id +'&order_id='+ item.id)">立即付款</button>
<button v-if="item.state==2" class="cu-btn bg-green round margin-left-sm" @tap="$routerGo('/pages/order/order-details?order_id='+item.id)">立即使用</button>
<button v-if="item.state==4" class="cu-btn1 border round margin-left-sm">等待审核</button>

12
pages/order/order-details.vue
View File

@ -14,9 +14,10 @@
<text class="block text-gray lf-font-28" style="margin-top: 20rpx;line-height: 40rpx;">数量 <text class="margin-left margin-right-xs text-gray">x</text>{{orderDetails.number}}</text>
<view class="flex justify-between" style="margin-top: 28rpx;">
<view class="text-red text-price lf-font-42 lf-font-bold" style="margin-top: 16rpx;">
<lf-price :price="orderDetails.selling_price" style="margin-top: 8rpx;" />
<!-- <view class="text-red text-price lf-font-42 lf-font-bold" style="margin-top: 16rpx;">
{{Number(orderDetails.selling_price || 0)}}
</view>
</view> -->
<view>
<button v-if="orderDetails.state == 2" class="cu-btn line-orange text-orange round margin-left-sm lf-font-28" @tap="$routerGo('/pages/order/apply-refund?order_id='+orderDetails.id)">申请退款</button>
<button v-else class="cu-btn line-gray bg-white border round margin-left-sm lf-font-28">{{orderDetails.state_text.text}}</button>
@ -85,9 +86,12 @@
<view class="padding-lr padding-tb-sm bg-white flex justify-between align-center solid-top1 btn-bottom">
<view class="flex align-center">
<text class="text-gray lf-font-28" style="margin-right: 20rpx;">实付款</text>
<view class="text-red text-price lf-font-42 lf-font-bold">
<lf-price :price="orderDetails.amount" />
<!-- <view class="text-red text-price lf-font-42 lf-font-bold">
{{Number(orderDetails.amount || 0)}}
</view>
</view> -->
</view>
<view class="lf-font-32 text-black1">
{{orderDetails.state_text.text}}

5
pages/order/unpay-details.vue
View File

@ -15,9 +15,10 @@
<text class="block text-gray lf-font-28" style="margin-top: 20rpx;line-height: 40rpx;">数量 <text class="margin-left margin-right-xs text-gray">x</text>{{orderDetails.number}}</text>
<view class="flex justify-between" style="margin-top: 28rpx;">
<view class="text-red text-price lf-font-42 lf-font-bold" style="margin-top: 16rpx;">
<lf-price :price="orderDetails.selling_price" />
<!-- <view class="text-red text-price lf-font-42 lf-font-bold" style="margin-top: 16rpx;">
{{Number(orderDetails.selling_price || 0)}}
</view>
</view> -->
<view>
<button v-if="orderDetails.state == 2" class="cu-btn line-orange text-orange round margin-left-sm lf-font-28" @tap="$routerGo('/pages/order/apply-refund?order_id='+orderDetails.id)">申请退款</button>
<button v-if="orderDetails.state == 5" class="cu-btn line-gray bg-white border round margin-left-sm lf-font-28">{{orderDetails.state_text.text}}</button>

Write Preview
Loading…
Cancel
Save