From 5121a32544a3518083b2768c9a8a2e49a2ee61e6 Mon Sep 17 00:00:00 2001
From: taiyuan <taiyuan@yolipai.com>
Date: Tue, 26 Oct 2021 14:29:04 +0800
Subject: [PATCH] 我的、线下订单页增加物流提醒

---
 pages/user/index/index.js             | 29 +++++++++++++++++++++++++++--
 pages/user/index/index.wxml           |  4 +++-
 pages/user/index/index.wxss           |  9 +++++++++
 pages/user/order_list/order_list.wxml |  5 ++++-
 pages/user/order_list/order_list.wxss |  1 +
 5 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/pages/user/index/index.js b/pages/user/index/index.js
index acf121a..92330fc 100644
--- a/pages/user/index/index.js
+++ b/pages/user/index/index.js
@@ -237,8 +237,26 @@ Page({
               });
             }
           }
-        })
-
+        });
+				
+				/*-----物流信息提醒-----*/
+				rq.get('/api/weshop/order/countDadaOrder', {
+				  isShowLoading:0,
+				  data: {
+				    user_id: e.user_id,
+				    store_id: os.stoid,
+				  },
+				  success: function(su) {
+				    if (su.data.code == 0) {
+				      th.setData({
+				        countDadaOrder: su.data.data
+				      });
+				    }
+				  }
+				});
+				
+				
+				
 
         //--初始化是否有打勾--
         getApp().request.get("/api/weshop/users/grade/vip/init/get", {
@@ -395,6 +413,11 @@ Page({
           }
         })
         //th.requestRecommend();
+				
+				
+				
+				
+				
      }
 	   
 	 /*-- 
@@ -817,6 +840,8 @@ Page({
         }
       })   
     },
+		
+	
     
 
 })
diff --git a/pages/user/index/index.wxml b/pages/user/index/index.wxml
index db0563f..1a8e84b 100644
--- a/pages/user/index/index.wxml
+++ b/pages/user/index/index.wxml
@@ -97,11 +97,13 @@
   <view class="xc-after-sale rel">
     <!-- 顶上的一栏 -->
     <view class="xc-equity-title flex-level" bindtap="go_order"  data-url="/pages/user/order_list/order_list">
-      <view class="xc-title-frame flex-space-between">
+      <view class="xc-title-frame flex ai-center">
         <view class="flex-vertical xc-title-content">
           <image class="xc-title-img" src="{{iurl}}/miniapp/images/hdindan.png" style="width: 50rpx; height: 55rpx;margin-right: 5rpx"></image>
           <view class="three-level-word">我的订单</view>
         </view>
+				<!-- 物流信息提醒 -->
+				<view class="fs26 c-5 pdl60" wx:if="{{countDadaOrder != 0}}"><text class="iconfont icon-dingwei"></text>您有<text class="c-red">{{countDadaOrder}}</text>个同城配送订单</view>
       </view>
       <view class="three-level-word  xc-more-frame flex-vertical">
         <view class="three-level-word xc-more">更多</view>
diff --git a/pages/user/index/index.wxss b/pages/user/index/index.wxss
index 79380e9..4c6f698 100644
--- a/pages/user/index/index.wxss
+++ b/pages/user/index/index.wxss
@@ -725,4 +725,13 @@ button::after{ border: 0}
 	width: 132rpx;
 	height: 37rpx;
 	margin-right: 10rpx;
+}
+
+.icon-dingwei {
+	color: #EA4F2B;
+	font-size: 28rpx;
+}
+
+.c-5 {
+	color: #555;
 }
\ No newline at end of file
diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml
index beb97a2..5dd50ce 100644
--- a/pages/user/order_list/order_list.wxml
+++ b/pages/user/order_list/order_list.wxml
@@ -241,7 +241,10 @@
 <view class="offline-container" wx:else>
 		<view class="offline-list">
 			<view class="item" wx:for="{{list2}}">
-				<view class="title"><text class="iconfont icon-order"></text>单号：{{item.No}}</view>
+				<view class="title">
+					<view><text class="iconfont icon-order"></text>单号：{{item.No}}</view>
+					<view>{{item.states}}</view>
+				</view>
 				<view class="subtitle">
 					<text>{{item.BillDate}}</text>
 					<view>消费总额：<text class="co-red fs28">￥{{item.Sum}}</text></view>
diff --git a/pages/user/order_list/order_list.wxss b/pages/user/order_list/order_list.wxss
index 5f2adb4..0fabe65 100644
--- a/pages/user/order_list/order_list.wxss
+++ b/pages/user/order_list/order_list.wxss
@@ -566,6 +566,7 @@ page {
 	padding: 20rpx;
 	font-size: 26rpx;
 	display: flex;
+	justify-content: space-between;
 	align-items: center;
 }
 .icon-order {
--
libgit2 0.21.4