线上线下订单

后端研发-倪永富
1 parent a2bac41d
Showing 2 changed files with 74 additions and 46 deletions
pages/user/order_list/order_list.wxml
pages/user/order_list/order_list.wxss
 <wxs module="filters" src="../../../utils/filter.wxs"></wxs>
 <view class="container">
 		<view class="tab-container" bindtap="onClickTab">
-			<view class="tab {{currentIndex == 0 ? 'active':''}}" data-index="0">线上订单</view>
-			<view class="tab {{currentIndex == 1 ? 'active':''}}" data-index="1">线下订单</view>
+			<view class="tab {{currentIndex == 0 ? 'active':''}}" data-index="0"><text class="iconfont icon-cloud"></text>线上订单</view>
+			<view class="tab {{currentIndex == 1 ? 'active':''}}" data-index="1"><text class="iconfont icon-shop"></text>线下订单</view>
 		</view>
 		<view class="search-container flex" wx:if="{{currentIndex == 0}}">
-			<input class="search-input" type="text" placeholder="请输入您所搜索的商品" bindinput="bindInput" bindconfirm="bindInput"/>
+			<input class="search-input" type="text" placeholder="请输入您所搜索的商品" bindinput="bindInput" bindconfirm="bindInput" placeholder-style="color:#ccc;"/>
 			<view class="search-btn" bindtap="searchOnline">搜索</view>
 		</view>
 		<view class="type-navbar fs28" wx:if="{{currentIndex == 0}}">
@@ -35,11 +35,11 @@
 <view class="list-container" wx:if="{{currentIndex == 0}}">
 	<view class="stay_evaluate" data-id="{{item.order_id}}" wx:for="{{orderList}}" wx:key="{{index}}">
 	  <!-- 商品编号和状态 -->
-	  <view class="Commodity_number flex-vertical-between fs26 padding border_bottom">
+	  <view class="Commodity_number flex-vertical-between fs24 padding border_bottom">
 	    <!--商品编号 -->
 	    <text selectable='true'>订单编号：{{item.order_sn}}</text>
 	    <!-- 商品评价状态 -->
-	    <view class="flex-center xc-wc">
+	    <view class="flex-center c-r">
 	      <!-- 订单状态 -->
 	      <view wx:if="{{item.pt_status==1}}">组团中</view>
 	      <view wx:if="{{(item.order_status==0&&item.pay_status==0)}}">未支付</view>
@@ -81,7 +81,7 @@
 	        <view class="Commodity_content">
 	          <view class="Commodity_goods">
 	            <!-- 商品名称 -->
-	            <view class="goods_name ellipsis-2 fs30">{{goods.goods_name}}</view>
+	            <view class="goods_name ellipsis-2 fs26">{{goods.goods_name}}</view>
 	            <view class="flex-space-between">
 	              <!-- 商品规格 -->
 	              <view class="Commodity_spec fs28 flex-center">
@@ -104,9 +104,9 @@
 	          <!-- 商品价格数量 -->
 	          <view class="Commodity_money flex-vertical-between baseline">
 	            <!-- 商品价格 -->
-	            <view class="flex-vertical xc-wc baseline">
+	            <view class="flex-vertical c-tb baseline">
 	              <view class="fs24">￥</view>
-	              <view class="fs32">{{filters.toFix(goods.member_goods_price,2)}}</view>
+	              <view class="fs26">{{filters.toFix(goods.member_goods_price,2)}}</view>
 	            </view>
 	            <view class="fs26 c-a9">x{{goods.goods_num}}</view>
 	          </view>
@@ -115,7 +115,7 @@
 	      <!-- 去评价 -->
 	      <view class="commodity_evaluate jc_sb baseline fs26">
 	        <!-- 商品数量 -->
-	        <view class="commodity_smy fs26">
+	        <view class="commodity_smy fs24">
 	          <view class="order-total">
 	            <view>
 	              共{{item.g_num}}件商品
@@ -124,8 +124,8 @@
 	              <block wx:if="{{item.pt_status==4 || item.pt_status==5}}">
 	                <view class="commodity_money flex baseline">
 	                  <view>合计<text wx:if="{{item.discount!=underdefine && item.discount!=null && item.discount!=0}}" style="color:#d60021;">(改)</text>:</view>
-	                  <view class="fs24 xc-wc">￥</view>
-	                  <view class="xc-wc">{{filters.toFix(item.order_amount+item.user_money+item.pt_tail_money,2)}}
+	                  <view class="fs24 c-r">￥</view>
+	                  <view class="c-r">{{filters.toFix(item.order_amount+item.user_money+item.pt_tail_money,2)}}
 	                  </view>
 	                </view>
@@ -133,22 +133,22 @@
 	              <block wx:else>
 	                <view wx:if="{{item.is_zsorder==4}}" class="commodity_money flex baseline">
 	                  <view>定金<text wx:if="{{item.discount!=underdefine && item.discount!=null && item.discount!=0}}" style="color:#d60021;">(改)</text>:</view>
-	                  <view class="fs24 xc-wc">￥</view>
-	                  <view class="xc-wc">{{filters.toFix(item.order_amount+item.user_money,2)}}
+	                  <view class="fs24 c-r">￥</view>
+	                  <view class="c-r">{{filters.toFix(item.order_amount+item.user_money,2)}}
 	                  </view>
 	                </view>
 	                <view class="commodity_money flex baseline" wx:else>
 	                  <view>合计<text wx:if="{{item.discount!=underdefine && item.discount!=null && item.discount!=0}}" style="color:#d60021;">(改)</text>:</view>
-	                  <view class="fs24 xc-wc">￥</view>
-	                     <view class="xc-wc">{{filters.toFix(item.order_amount+item.user_money,2)}}
+	                  <view class="fs24 c-r">￥</view>
+	                     <view class="c-r">{{filters.toFix(item.order_amount+item.user_money,2)}}
 	                     <text wx:if="{{item.coupon_price}}">+{{item.coupon_price}}元优惠券</text>
 	                     <text wx:if="{{item.integral}}">+{{item.integral}}积分</text>
 	                  </view>
 	                </view>
 	                <view wx:if="{{item.pt_tail_money>0}}" class="commodity_money flex baseline">
 	                  <view>待支付尾款:</view>
-	                  <view class="fs24 xc-wc">￥</view>
-	                  <view class="xc-wc">{{filters.toFix(item.pt_tail_money-item.shipping_price,2)}}
+	                  <view class="fs24 c-r">￥</view>
+	                  <view class="c-r">{{filters.toFix(item.pt_tail_money-item.shipping_price,2)}}
 	                  </view>
 	                </view>
@@ -157,7 +157,7 @@
 	            </view>
 	          </view>
 	        </view>
-	        <view class="links flex-right-vertical fs26 padding" style="flex-wrap: wrap;">
+	        <view class="links flex-right-vertical fs24 padding">
 	          <image wx:if="{{(item.order_status==1&&item.pay_status==1 && item.shipping_status==0 && item.exp_type==1)}}" class="code" src="{{iurl}}miniapp/images/order/code.png" bindtap="code_show" data-order_sn="{{item.order_sn}}"></image>
 	          <view bindtap="cancelOrder" class="commodity_To_evaluate flex-level View_evaluation" data-id="{{item.order_id}}" data-zsorder="{{item.is_zsorder}}" data-orderindex="{{index}}" wx:if="{{(item.order_status==0 &&item.pay_status==0)}}">取消订单</view>
 	          <view class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.pt_status==3}}">拼团失败</view>
@@ -182,7 +182,7 @@
 	          <block wx:if="{{item.order_status==2 && item.is_zsorder!=4}}">
-	            <navigator wx:if="{{item.order_goods.length>1}}"  class="order-btn white red-b"
+	            <navigator wx:if="{{item.order_goods.length>1}}"  class="order-btn white"
 	                       url="/pages/user/comment/comment?status=0&order_id={{item.order_id}}">评价</navigator>
 	            <navigator wx:else  class="order-btn white red-b"
 	                       url="/pages/user/add_comment/add_comment?goods_id={{item.order_goods[0].goods_id}}&order_id={{item.order_id}}&price={{item.order_goods[0].member_goods_price}}">评价</navigator>
@@ -208,10 +208,10 @@
 <view class="offline-container" wx:else>
 		<view class="offline-list">
 			<view class="item" wx:for="{{list2}}">
-				<view class="title">单号：{{item.No}}</view>
+				<view class="title"><text class="iconfont icon-order"></text>单号：{{item.No}}</view>
 				<view class="subtitle">
 					<text>{{item.BillDate}}</text>
-					<view>消费总额：<text class="co-red">￥{{item.Sum}}</text></view>
+					<view>消费总额：<text class="co-red fs28">￥{{item.Sum}}</text></view>
 				</view>
 				<view wx:for="{{item.list}}" wx:for-item="i">
 					<view class="ellipsis-2 name">{{i.BarCode}} - {{i.WareName}}</view>
@@ -21,6 +21,14 @@ mgt12 {
 	color: #999;
 }
+.c-tb {
+	color: #ff5000;
+}
+
+.c-r {
+	color: #FF3B3D;
+}
+
 /* 内边距 */
 .pdt20 {
 	padding-top: 20rpx;
@@ -52,7 +60,7 @@ page {
   height: 88rpx;
   background-color: #fff;
   justify-content: space-between;
-  border-top: 2rpx solid #f6f6f6;  
+  /* border-top: 2rpx solid #f6f6f6;  */
 }
 .type-box {
@@ -69,37 +77,37 @@ page {
 }
 .type-item-on {
-	background-color: #FF3B3D;
-	color: white;
+	/* background-color: #FF3B3D; */
+	color: #FF3B3D;
 	font-weight: bold;
   /* border-bottom: 4rpx solid #ED3036; */
 	position: relative;
 }
 .type-item-on:after {
-	/* content: '';
+	content: '';
 	position: absolute;
 	left: 0;
 	right: 0;
 	bottom: 0;
-	width: 50%;
+	width: 40%;
 	height: 4rpx;
-	background-color: #ED3036;
-	margin: 0 auto; */
+	background-color: #FF3B3D;
+	margin: 0 auto;
 }
 .container {
 	position: fixed;
 	width: 100%;
 	top: 0;
-	z-index: 999;
+	z-index: 4;
 	/* position: -webkit-sticky;
 	position:sticky;
 	top: 0; */
 }
 .list-container {
-	padding-left: 18rpx;
-	padding-right: 18rpx;
+	padding-left: 20rpx;
+	padding-right: 20rpx;
 	overflow: hidden;
 	/* height: calc(100% - 282rpx); */
 	padding-top: 282rpx;
@@ -107,7 +115,7 @@ page {
 .stay_evaluate {
 	background-color: white;
-	margin-top: 18rpx;
+	margin-top: 20rpx;
 	border-radius: 8rpx;
 }
@@ -210,10 +218,12 @@ page {
   height: 50rpx;
   line-height: 50rpx;
   text-align: center;
-  border: 1px solid #eee;
+  /* border: 1px solid #eee; */
   margin-left: 10rpx;
-  float: right;
-  border-radius: 15rpx;
+  /* float: right; */
+  border-radius: 6rpx;
+	overflow: hidden;
+	background-color: #FF3B3D;
 }
 .order-btn-pay {
@@ -282,6 +292,7 @@ page {
   width: 485rpx;
   /* height: 75rpx; */
   line-height: 37rpx;
+	text-align: justify;
 }
 .Commodity_content {
@@ -309,7 +320,8 @@ page {
 .commodity_evaluate .commodity_smy .commodity_money {
   margin-left: 29rpx;
   letter-spacing: 1rpx;
-	font-weight: bold;
+	/* font-weight: bold; */
+	
 }
 .commodity_evaluate .links {
@@ -318,6 +330,8 @@ page {
 	padding-top: 20rpx;
 	padding-bottom: 20rpx;
 	border-top: 2rpx solid #F6F6F6;
+	display: flex;
+	align-items: center;
 }
 .commodity_evaluate .commodity_To_evaluate {
@@ -448,8 +462,8 @@ page {
 .rel {
 	box-sizing: border-box;
-  width: 184rpx;
-  height: 184rpx;
+  width: 180rpx;
+  height: 180rpx;
   overflow: hidden;
   /* border: 2rpx solid rgb(236, 236, 236); */
 }
@@ -465,8 +479,8 @@ page {
   line-height: 40rpx;
 }
 .code{
-  width: 55rpx;
-  height: 55rpx;
+  width: 44rpx;
+  height: 44rpx;
 }
 .refund{
   margin-top: 20rpx;
@@ -479,6 +493,9 @@ page {
 	font-size: 28rpx;
 	border-bottom: 2rpx solid #f2f2f2;
 }
+.tab-container .iconfont {
+	margin-right: 10rpx;
+}
 .tab {
 	flex: 1;
 	line-height: 80rpx;
@@ -487,6 +504,7 @@ page {
 }
 .tab.active {
 	color: #FF3B3D;
+	font-weight: bold;
 }
 .tab.active::after {
 	content: '';
@@ -531,10 +549,10 @@ page {
 	border-radius: 10rpx;
 }
 .picker {
-	color: #999;
+	color: #ccc;
 	text-align: center;
 	line-height: 70rpx;
-	font-size: 28rpx;
+	font-size: 26rpx;
 }
 .list2 {
@@ -543,11 +561,18 @@ page {
 }
 .title {
 	padding: 20rpx;
-	font-size: 28rpx;
+	font-size: 26rpx;
+	display: flex;
+	align-items: center;
+}
+.icon-order {
+	font-size: 26rpx;
+	color: #FF3B3D;
+	margin-right: 10rpx;
 }
 .subtitle {
 	display: flex;
-	font-size: 26rpx;
+	font-size: 24rpx;
 	justify-content: space-between;
 	background-color: #f0f0f0;
 	line-height: 60rpx;
@@ -561,12 +586,12 @@ page {
 .subitem {
 	width: calc(100% / 3);
 	text-align: center;
-	font-size: 28rpx;
+	font-size: 26rpx;
 }
 .name {
 	padding: 0 20rpx;
 	margin: 20rpx 0;
-	font-size: 30rpx;
+	font-size: 26rpx;
 	word-break: break-all;
 	text-align: justify;
 }
@@ -587,3 +612,6 @@ page {
 	border-top-left-radius: 8rpx;
 	border-bottom-left-radius: 8rpx;
 }
+
+
+