|
| xqd
@@ -3,14 +3,14 @@
|
|
|
<!-- #ifdef H5 -->
|
|
|
<bd-h5-back :iconStyle="2" height="88" width="100"></bd-h5-back>
|
|
|
<!-- #endif -->
|
|
|
- <view class="search-area">
|
|
|
+ <view class="search-area" style="background-color: #fff;">
|
|
|
<view v-if="search.keyword || search.dateArr[0] || search.dateArr[1]" class="search be-search dir-left-nowrap" @click="toSearch">
|
|
|
<image class="icon-search" src="https://shop.9026.com/web/statics/image/mall/static/icon/icon-search.png"></image>
|
|
|
<view v-if="search.dateArr[0]">{{search.dateArr[0]}}</view>
|
|
|
<view v-if="search.dateArr[1]"><text v-if="search.dateArr[0]">至</text>{{search.dateArr[1]}}</view>
|
|
|
<view v-if="search.keyword"><text v-if="search.dateArr[0] || search.dateArr[1]">,</text>{{search.keyword}}</view>
|
|
|
</view>
|
|
|
- <view v-else class="search main-center" @click="toSearch">
|
|
|
+ <view v-else class="search main-left" @click="toSearch">
|
|
|
<image class="icon-search" src="https://shop.9026.com/web/statics/image/mall/static/icon/icon-search.png"></image>
|
|
|
<text>搜索</text>
|
|
|
</view>
|
|
| xqd
@@ -23,14 +23,16 @@
|
|
|
<view hover-class="u-hover-class" v-for='(item, index) in orders' :key='item.id' :style="{'margin-top': index == 0 ? '24rpx' : '0'}" class='order-item-box dir-top-wrap'>
|
|
|
<app-jump-button :url="getPageUrl(item.id, item.sign)">
|
|
|
<view class="dir-top-nowrap" style="width: 100%">
|
|
|
- <view class='dir-left-nowrap view-1'>
|
|
|
- <view class='box-grow-1'>订单号：{{item.order_no}}</view>
|
|
|
- <template v-if='item.status == 0'>
|
|
|
- <text v-if='item.sign == "pintuan"'>{{item.is_pay == 1 ? '拼团中' : '待付款'}}</text>
|
|
|
- </template>
|
|
|
- <template v-else>
|
|
|
- <view>{{item.status_text}}</view>
|
|
|
- </template>
|
|
|
+ <view class='main-between dir-left-nowrap view-1' style="color: #838584;font-size: 22rpx;">
|
|
|
+ <view class='hxj-order-status'>
|
|
|
+ <template v-if='item.status == 0'>
|
|
|
+ <text v-if='item.sign == "pintuan"'>{{item.is_pay == 1 ? '拼团中' : '待付款'}}</text>
|
|
|
+ </template>
|
|
|
+ <template v-else>
|
|
|
+ <view>{{item.status_text}}</view>
|
|
|
+ </template>
|
|
|
+ </view>
|
|
|
+ <view>订单号：{{item.order_no}}</view>
|
|
|
</view>
|
|
|
<view v-for='(dItem, dIndex) in item.detail' :key='dIndex' class='view-2'>
|
|
|
<app-order-goods-info :goods='dItem.goods_info' :plugin-data="item.plugin_data" :plugin-index="dIndex"></app-order-goods-info>
|
|
| xqd
@@ -46,10 +48,10 @@
|
|
|
</template>
|
|
|
<template v-else>
|
|
|
<view class='box-grow-1 main-right cross-center price-count-box'>
|
|
|
- <text class="price-label">合计 </text>
|
|
|
+ <text class="price-label">合计 </text>
|
|
|
<span class='price-color'>
|
|
|
<text v-if="item.plugin_data.exchange_count">{{item.plugin_data.exchange_count}}{{item.plugin_data.price_name}}+</text>
|
|
|
- <text>￥{{item.total_pay_price}}</text>
|
|
|
+ <text><text class="price-rmb">￥</text>{{item.total_pay_price}}</text>
|
|
|
</span>
|
|
|
<text v-if="item.express_price > 0" class="price-express">(含运费￥{{item.express_price}})</text>
|
|
|
</view>
|
|
| xqd
@@ -162,7 +164,7 @@ export default {
|
|
|
is_qrcode: false,
|
|
|
is_show: false,
|
|
|
is_load_show: false,
|
|
|
- bgColor: '#f7f7f7',
|
|
|
+ bgColor: '#fff',
|
|
|
isRequest: true, //防止数据重复加载
|
|
|
template_message: [],
|
|
|
recommend_list: []
|
|
| xqd
@@ -487,10 +489,10 @@ export default {
|
|
|
height: #{64rpx};
|
|
|
line-height: #{64rpx};
|
|
|
border-radius: #{32rpx};
|
|
|
- background-color: #fff;
|
|
|
+ background-color: #F8F8F8;
|
|
|
color: #b2b2b2;
|
|
|
font-size:#{26rpx};
|
|
|
-
|
|
|
+ padding-left: 28rpx;
|
|
|
&.be-search {
|
|
|
color: #353535;
|
|
|
padding-left: 32rpx;
|
|
| xqd
@@ -559,7 +561,21 @@ export default {
|
|
|
margin: 32#{rpx} 0;
|
|
|
}
|
|
|
|
|
|
-.order-item-box .view-2 {}
|
|
|
+.order-item-box .view-2 {
|
|
|
+
|
|
|
+}
|
|
|
+
|
|
|
+.hxj-order-status{
|
|
|
+ width: 113rpx;
|
|
|
+ height: 44rpx;
|
|
|
+ background: #F8F8F8;
|
|
|
+ border-radius: 4rpx;
|
|
|
+ font-size: 22rpx;
|
|
|
+ font-weight: 500;
|
|
|
+ color: #838584;
|
|
|
+ line-height: 44rpx;
|
|
|
+ text-align: center;
|
|
|
+}
|
|
|
|
|
|
.order-item-box .view-3 {
|
|
|
font-size: $uni-font-size-import-two;
|
|
| xqd
@@ -575,12 +591,15 @@ export default {
|
|
|
|
|
|
.price-label {
|
|
|
margin-right: 5#{rpx};
|
|
|
- font-size: $uni-font-size-weak-one;
|
|
|
- color: $uni-general-color-two;
|
|
|
+ font-size: 24rpx;
|
|
|
+ color: #222222;
|
|
|
}
|
|
|
|
|
|
.price-color {
|
|
|
color: $uni-important-color-black;
|
|
|
+ .price-rmb{
|
|
|
+ font-size: 20rpx;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
.price-express {
|
