From c197ec9b30ab59c3ff4890235836db97c9e0d1e8 Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Wed, 27 Dec 2023 17:33:11 +0800
Subject: [PATCH] 1

---
 pages.json                            |  52 ++++--
 pages/detailNursing/detailNursing.vue |  68 +++++---
 pages/order/addOrder.vue              | 213 +++++++++++++++++++++++++
 pages/order/order.vue                 | 218 ++++++++++++++++++++++++++
 static/tabbar/order-active.png        | Bin 0 -> 3433 bytes
 static/tabbar/order.png               | Bin 0 -> 3430 bytes
 6 files changed, 517 insertions(+), 34 deletions(-)
 create mode 100644 pages/order/addOrder.vue
 create mode 100644 pages/order/order.vue
 create mode 100644 static/tabbar/order-active.png
 create mode 100644 static/tabbar/order.png

diff --git a/pages.json b/pages.json
index 92a4e5e..9dce92a 100644
--- a/pages.json
+++ b/pages.json
@@ -3,7 +3,8 @@
 		"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue",
 		"^cpn-(.*)": "@/components/cpn-$1.vue"
 	},
-	"pages": [{
+	"pages": [
+		{
 			"path": "pages/enter/enter",
 			"style": {
 				"navigationStyle": "custom"
@@ -64,7 +65,8 @@
 				"navigationBarTitleText": "头像裁剪",
 				"navigationBarBackgroundColor": "#000000"
 			}
-		}, {
+		},
+		{
 			"path": "pages/showimg/showimg",
 			"style": {
 				"navigationBarTextStyle": "white",
@@ -73,17 +75,33 @@
 					"animationDuration": 300
 				}
 			}
-		}
-	],
-	"subPackages": [{
-		"root": "package_sub",
-		"pages": [{
-			"path": "pages/index/index",
+		},
+		{
+			"path": "pages/order/order",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/order/addOrder",
 			"style": {
-				"navigationBarTitleText": "分包页面sub_index"
+				"navigationStyle": "custom"
 			}
-		}]
-	}],
+		}
+	],
+	"subPackages": [
+		{
+			"root": "package_sub",
+			"pages": [
+				{
+					"path": "pages/index/index",
+					"style": {
+						"navigationBarTitleText": "分包页面sub_index"
+					}
+				}
+			]
+		}
+	],
 	"globalStyle": {
 		"navigationBarTextStyle": "white",
 		"navigationBarTitleText": "uni-app",
@@ -93,7 +111,8 @@
 	"tabBar": {
 		"color": "#ABAEBE",
 		"selectedColor": "#1479FF",
-		"list": [{
+		"list": [
+			{
 				"iconPath": "/static/tabbar/notification.png",
 				"selectedIconPath": "/static/tabbar/notification-active.png",
 				"pagePath": "pages/todayNursing/todayNursing",
@@ -111,13 +130,18 @@
 				"pagePath": "pages/list/list",
 				"text": "护理列表"
 			},
+			{
+				"iconPath": "/static/tabbar/order.png",
+				"selectedIconPath": "/static/tabbar/order-active.png",
+				"pagePath": "pages/order/order",
+				"text": "预约护理"
+			},
 			{
 				"iconPath": "/static/tabbar/home.png",
 				"selectedIconPath": "/static/tabbar/home-active.png",
 				"pagePath": "pages/home/home",
 				"text": "我的"
 			}
-
 		]
 	}
-}
+}
diff --git a/pages/detailNursing/detailNursing.vue b/pages/detailNursing/detailNursing.vue
index 86a461c..9f62bc7 100644
--- a/pages/detailNursing/detailNursing.vue
+++ b/pages/detailNursing/detailNursing.vue
@@ -69,21 +69,23 @@
 					<view>实际时长</view>
 				</view>
 				<view class="content">
-					<view class="content-item" v-for="(item,index) in skuList" :key='item.info.id'>
-						<u-checkbox class="checkbox" label-size="34" size="36" :disabled="detail.status === 2"
-							v-model="item.isSelect" shape="square" :name="item.form.name"
-							@change="selectPick($event,item)">
-							{{item.info.name}}
-						</u-checkbox>
-						<view class="input">
-							<u-input :disabled="detail.status === 2 || !item.isSelect" v-model="item.form.time"
-								:custom-style="inputStyle" :placeholder="'需 '+ item.info.time_lenth"
-								placeholder-style="color:#A7AFBC;font-size:28rpx;" input-align="center"
-								:clearable="false" type="number" height="46">
-							</u-input>
-							<view style="font-size: 34rpx;">分钟</view>
-						</view>
-					</view>
+					<u-checkbox-group :max="(detail.product.demand === 1) ? 1 : 999">
+            <view class="content-item" v-for="(item,index) in skuList" :key='item.info.id'>
+              <u-checkbox class="checkbox" label-size="34" size="36" :disabled="detail.status === 2"
+                          v-model="item.isSelect" shape="square" :name="item.form.name"
+                          @change="selectPick($event,item)">
+                {{item.info.name}}
+              </u-checkbox>
+              <view class="input">
+                <u-input :disabled="detail.status === 2 || !item.isSelect || (detail.product.demand === 1)" v-model="item.form.time"
+                         :custom-style="inputStyle" :placeholder="'需 '+ item.info.time_lenth"
+                         placeholder-style="color:#A7AFBC;font-size:28rpx;" input-align="center"
+                         :clearable="false" type="number" height="46">
+                </u-input>
+                <view style="font-size: 34rpx;">分钟</view>
+              </view>
+            </view>
+          </u-checkbox-group>
 				</view>
 			</view>
 
@@ -100,7 +102,7 @@
 				</view>
 				<view class="btn" v-if="detail.status === 1" @click="$u.throttle(checkSignOut,5000)">
 					<view class="text1">签退</view>
-					<view class="text2">{{dateFormat(time,'HH:mm:ss')}}</view>
+					<view class="text2">{{serviceTime}}</view>
 				</view>
 				<view class="btn" v-if="detail.status === 0 && !flag" @click="$u.throttle(refreshLoaction,3000)">
 					<view class="text1">更新定位</view>
@@ -205,6 +207,9 @@
 				detail: {},
 				time: new Date(),
 				timer: null,
+
+        serviceTimer: null,//计时器用来跟新总服务时长
+        serviceTimeFlag: 0,
 			}
 		},
 		methods: {
@@ -249,6 +254,14 @@
 					}
 				})
 				this.form.schedule_list_id = this.id
+        if (res.status === 1) {
+          this.serviceTimer = setInterval(() => {
+            this.serviceTimeFlag++;
+          },1000)
+        }
+        if (res.status === 3) {
+          clearInterval(this.serviceTimer)
+        }
 				console.log(this.skuList);
 			},
 
@@ -395,7 +408,7 @@
 						this.$refs['imgUpload'].clearList()
 						this.isShowImg = false
 						this.getDeatil(this.id)
-						
+
 						if(res1.tip){
 							this.tips = "用户服务次数已达到次数、总服务时长未满"
 							this.isShowModal = true
@@ -449,7 +462,7 @@
 				// 	})
 				// 	return
 				// }
-			
+
 				// this.saveSku().then(res => {
 				// 	this.type = 2
 				// 	this.isShowImg = true
@@ -497,9 +510,9 @@
 					}
 				}
 				let totalTime =  this.$moment(new Date()).diff(this.$moment(this.detail.sign_in), 'minutes')
-				if (useTotalTime <= (totalTime + 10) && useTotalTime > totalTime) {
+				if (useTotalTime <= (totalTime + 10) && useTotalTime > totalTime && this.detail.demand === 2) {
 					this.signOut()
-					
+
 					uni.showToast({
 						icon:'none',
 						title:'请下次补足时间',
@@ -546,6 +559,20 @@
 					}
 				}
 			},
+      serviceTime () {
+        let flag = this.serviceTimeFlag;
+        let totalSec = 0;
+        if (this.detail.sign_out) {
+          totalSec = moment(this.detail.sign_out).diff(moment(this.detail.sign_in),"seconds")
+        } else {
+          totalSec = moment().diff(moment(this.detail.sign_in),"seconds")
+        }
+        let sec = totalSec % 60
+        let min = ((totalSec - sec) / 60) % 60
+        let hour = (totalSec - sec - (min * 60)) / 60 / 60
+
+        return `${hour > 0 ? (hour + '时') : ''}${min > 0 ? (min + '分') : ''}${sec}秒`
+      },
 			typeFormat() {
 				return function(type) {
 					let map = new Map([
@@ -867,6 +894,7 @@
 			}
 
 			.text2 {
+        font-size: 30rpx;
 				@extend .text-class;
 			}
 		}
diff --git a/pages/order/addOrder.vue b/pages/order/addOrder.vue
new file mode 100644
index 0000000..731d896
--- /dev/null
+++ b/pages/order/addOrder.vue
@@ -0,0 +1,213 @@
+<template>
+  <view>
+    <cpn-navbar title="预约护理" :is-back="true"></cpn-navbar>
+
+    <view>
+      <!-- 用户信息 -->
+<!--      <view class="user-info" v-if="detail.customer">-->
+<!--        <view class="top">-->
+<!--          <view class="left">-->
+<!--            <u-image :src="detail.customer.sex === '男' ? vuex_male_img : vuex_female_img" width="104"-->
+<!--                     height="104" shape="circle"></u-image>-->
+<!--          </view>-->
+<!--          <view class="center">-->
+<!--            <view class="name">{{detail.customer.name}}</view>-->
+<!--            <view class="infos">-->
+<!--              <view class="age">{{ageComputed(detail.customer.idcard)}}岁-->
+<!--              </view>-->
+<!--              <view class="sex">{{detail.customer.sex}}</view>-->
+<!--              <view class="organ">机构护理</view>-->
+<!--            </view>-->
+<!--          </view>-->
+<!--          <view class="right">-->
+<!--            <template v-if="detail.status === 0">-->
+<!--              <view class="icon1"></view>-->
+<!--              <view>待护理</view>-->
+<!--            </template>-->
+<!--            <template v-if="detail.status === 1">-->
+<!--              <view class="icon3"></view>-->
+<!--              <view>护理中</view>-->
+<!--            </template>-->
+<!--            <template v-if="detail.status === 2">-->
+<!--              <view class="icon2"></view>-->
+<!--              <view>已护理</view>-->
+<!--            </template>-->
+<!--          </view>-->
+<!--        </view>-->
+
+<!--        <view class="line"></view>-->
+
+<!--        <view class="bottom">-->
+<!--          <view class="client">-->
+<!--            <u-icon name="/static/detail/people.png" width="26" height="26"></u-icon>-->
+<!--            <view>委托人：{{detail.customer.contact_name}}</view>-->
+<!--          </view>-->
+<!--          <view class="address">-->
+<!--            <u-icon name="map" width="28" height="28" color="#1479FF"></u-icon>-->
+<!--            <view>{{ addressFormat(detail.customer.customer_address) }}</view>-->
+<!--          </view>-->
+<!--          <view class="phone">-->
+<!--            <u-icon name="phone" width="28" height="28" color="#1479FF"></u-icon>-->
+<!--            <view>{{detail.customer.phone}}</view>-->
+<!--          </view>-->
+<!--        </view>-->
+<!--      </view>-->
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {};
+  }
+}
+</script>
+
+<style lang="scss">
+.user-info {
+  width: 710rpx;
+  background: #FFFFFF;
+  box-shadow: 0rpx 4rpx 10rpx 0rpx rgba(219, 218, 218, 0.5);
+
+  margin: 40rpx auto 0 auto;
+  position: relative;
+
+  .top {
+    display: flex;
+    justify-content: space-between;
+    align-items: flex-start;
+
+    padding-top: 34rpx;
+    padding-bottom: 30rpx;
+
+    .left {
+      padding-left: 20rpx;
+    }
+
+    .center {
+      flex: 1;
+
+      padding-left: 24rpx;
+
+      .name {
+        height: 48rpx;
+        font-size: 32rpx;
+        font-weight: 500;
+        color: #333333;
+        line-height: 24rpx;
+      }
+
+      .infos {
+        display: flex;
+        align-items: center;
+
+        padding-top: 20rpx;
+
+        .age {
+          height: 34rpx;
+          font-size: 24rpx;
+          font-weight: 500;
+          color: #A7AFBC;
+          line-height: 34rpx;
+        }
+
+        .sex {
+          width: 40rpx;
+          height: 40rpx;
+          background: #FDECEC;
+          opacity: 0.5;
+          font-size: 28rpx;
+          font-weight: 500;
+          color: #36596A;
+          text-align: center;
+          line-height: 40rpx;
+
+          margin-left: 20rpx;
+        }
+
+        .organ {
+          width: 140rpx;
+          height: 40rpx;
+          background: #F9F9F9;
+          font-size: 28rpx;
+          font-weight: 500;
+          color: #36596A;
+          line-height: 40rpx;
+          text-align: center;
+
+          margin-left: 20rpx;
+        }
+      }
+    }
+
+    .right {
+      display: flex;
+      align-items: center;
+
+      padding-right: 20rpx;
+    }
+  }
+
+  .line {
+    width: 670rpx;
+    height: 2rpx;
+    border: 2rpx solid #EEEFF5;
+
+    margin: 30rpx auto 0 auto;
+  }
+
+  .bottom {
+
+    padding: 26rpx 0 34rpx 24rpx;
+    position: relative;
+
+    .bottom-item {
+      display: flex;
+      align-items: center;
+      font-size: 28rpx;
+      font-weight: 500;
+      color: #36596A;
+
+      &>view {
+        padding-left: 16rpx;
+      }
+    }
+
+    .client {
+      @extend .bottom-item;
+    }
+
+    .address {
+      @extend .bottom-item;
+
+      padding-top: 18rpx;
+    }
+
+    .phone {
+      @extend .bottom-item;
+
+      padding-top: 18rpx;
+    }
+  }
+
+  .re-location {
+    display: flex;
+    align-items: center;
+
+    position: absolute;
+    bottom: 36rpx;
+    right: 20rpx;
+
+    .text {
+      height: 34rpx;
+      font-size: 24rpx;
+      font-weight: 500;
+      color: #A7AFBC;
+      line-height: 34rpx;
+
+      padding-right: 8rpx;
+    }
+  }
+}
+</style>
diff --git a/pages/order/order.vue b/pages/order/order.vue
new file mode 100644
index 0000000..30f9382
--- /dev/null
+++ b/pages/order/order.vue
@@ -0,0 +1,218 @@
+<template>
+  <view>
+    <cpn-navbar title="预约护理"></cpn-navbar>
+
+    <view>
+      <!-- 搜索 -->
+      <view class="search">
+        <view class="input-content">
+          <u-input :clearable="false" value="" placeholder="请输入要搜索的内容" height="30" :custom-style="inputStyle"
+                   @input=""></u-input>
+        </view>
+        <view class="icon">
+          <u-icon name="search" size="46" color="#ABAEBE"></u-icon>
+        </view>
+      </view>
+
+      <view class="customer-list">
+        <view class="customer-list__item" v-for="(item, index) in customers" :key="item.id">
+          <view class="top">
+            <view class="avatar">
+              <u-image :src="item.customer.sex === '男' ? vuex_male_img : vuex_female_img" height="104"
+                       width="104" shape="circle"></u-image>
+            </view>
+            <view class="user-info">
+              <view class="name">{{item.customer.name}}</view>
+              <view class="tel">
+                <view>
+                  <u-icon name="phone" size="28" color="#1479FF"></u-icon>
+                </view>
+                <view class="text">{{item.customer.phone || '无'}}</view>
+              </view>
+              <view class="address">
+                <view>
+                  <u-icon name="map" size="28" color="#1479FF"></u-icon>
+                </view>
+                <view class="text">{{item.customer_address.address || '无'}}</view>
+              </view>
+            </view>
+            <view class="sex">
+              <view class="sex-text">
+                {{item.customer.sex || '无'}}
+              </view>
+            </view>
+          </view>
+
+          <view class="line"></view>
+
+          <view class="bottom" @click="toAddOrder">
+            <u-icon color="#1479FF" name="bell-fill"></u-icon>
+            <span>立即预约</span>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      inputStyle: {
+        width: "600rpx",
+        fontSize: "28rpx",
+        fontWeight: "500"
+      },
+      customers: [{"id":11395,"no":"202312250933084cac20335","order_id":892,"admin_id":1,"department_id":null,"customer_id":768,"product_id":24,"date":"2023-12-25","start_time":"2023-12-25 09:31:13","end_time":"2023-12-25 11:31:20","nurse_id":90,"status":2,"address_id":1592,"created_at":"2023-12-25 09:33:08","updated_at":"2023-12-25 10:32:08","deleted_at":null,"sign_in":"2023-12-25 09:39:49","sign_in_address":"江苏省苏州市吴中区太湖东路288号长桥苏州市吴中区人民政府(太湖东路北)","sign_in_loc":"31.26249,120.63212","sign_out":"2023-12-25 10:32:08","sign_out_address":"江苏省苏州市吴中区太湖东路288号长桥苏州市吴中区人民政府(太湖东路北)","sign_out_loc":"31.26249,120.63212","is_error":0,"address":"金坛区直溪镇溪滨村村民委员会","month_count":"1","month_time":"0","distance":12878.6,"status_text":"已护理","customer":{"id":768,"name":"叶华","phone":"18861212210","idcard":"320124197907010227","sex":"女","birthday":"1979-07-01","contact_name":"耿志俊","contact_phone":"18861212210","idcard_address":"直溪镇溪滨村村委会大耿庄85","is_dead":0,"remark":null,"level_id":18,"created_at":"2023-11-20 13:58:47","updated_at":"2023-11-20 13:58:47","deleted_at":null,"city_id":"21","area_id":"15","street_id":"27","level_type":34,"status":1},"customer_address":{"id":1592,"name":null,"customer_id":768,"address":"金坛区直溪镇溪滨村村民委员会","comment":null,"lat":"31.868529","lng":"119.454772","created_at":"2023-11-20 13:58:47","updated_at":"2023-11-20 13:58:47","deleted_at":null,"default":1}},{"id":11396,"no":"20231225111421dc2e75816","order_id":891,"admin_id":1,"department_id":null,"customer_id":768,"product_id":17,"date":"2023-12-25","start_time":"2023-12-25 11:14:00","end_time":"2023-12-25 12:14:02","nurse_id":90,"status":2,"address_id":1592,"created_at":"2023-12-25 11:14:21","updated_at":"2023-12-25 11:19:02","deleted_at":null,"sign_in":"2023-12-25 11:14:51","sign_in_address":"江苏省苏州市吴中区太湖东路288号长桥苏州市吴中区人民政府(太湖东路北)","sign_in_loc":"31.26249,120.63212","sign_out":"2023-12-25 11:19:01","sign_out_address":"江苏省苏州市吴中区太湖东路288号长桥苏州市吴中区人民政府(太湖东路北)","sign_out_loc":"31.26249,120.63212","is_error":0,"address":"金坛区直溪镇溪滨村村民委员会","month_count":"1","month_time":"0","distance":12878.6,"status_text":"已护理","customer":{"id":768,"name":"叶华","phone":"18861212210","idcard":"320124197907010227","sex":"女","birthday":"1979-07-01","contact_name":"耿志俊","contact_phone":"18861212210","idcard_address":"直溪镇溪滨村村委会大耿庄85","is_dead":0,"remark":null,"level_id":18,"created_at":"2023-11-20 13:58:47","updated_at":"2023-11-20 13:58:47","deleted_at":null,"city_id":"21","area_id":"15","street_id":"27","level_type":34,"status":1},"customer_address":{"id":1592,"name":null,"customer_id":768,"address":"金坛区直溪镇溪滨村村民委员会","comment":null,"lat":"31.868529","lng":"119.454772","created_at":"2023-11-20 13:58:47","updated_at":"2023-11-20 13:58:47","deleted_at":null,"default":1}},{"id":11397,"no":"20231225112026a43896149","order_id":893,"admin_id":1,"department_id":null,"customer_id":767,"product_id":24,"date":"2023-12-25","start_time":"2023-12-25 11:20:19","end_time":"2023-12-25 12:20:20","nurse_id":90,"status":1,"address_id":1591,"created_at":"2023-12-25 11:20:26","updated_at":"2023-12-25 11:20:44","deleted_at":null,"sign_in":"2023-12-25 11:20:44","sign_in_address":"江苏省苏州市吴中区太湖东路288号长桥苏州市吴中区人民政府(太湖东路北)","sign_in_loc":"31.26249,120.63212","sign_out":null,"sign_out_address":null,"sign_out_loc":null,"is_error":0,"address":"直溪镇新河村退役军人服务站","month_count":null,"month_time":null,"distance":12878.6,"status_text":"护理中","customer":{"id":767,"name":"吴浩","phone":"13813519467","idcard":"320482199412044619","sex":"男","birthday":"1994-12-04","contact_name":"吴冬兆","contact_phone":"13813519467","idcard_address":"直溪镇新河村村委会上新河村8号","is_dead":0,"remark":null,"level_id":19,"created_at":"2023-11-20 13:51:25","updated_at":"2023-11-20 13:51:25","deleted_at":null,"city_id":"21","area_id":"15","street_id":"27","level_type":35,"status":1},"customer_address":{"id":1591,"name":null,"customer_id":767,"address":"直溪镇新河村退役军人服务站","comment":null,"lat":"31.836242","lng":"119.508225","created_at":"2023-11-20 13:51:25","updated_at":"2023-11-20 13:51:25","deleted_at":null,"default":1}}]
+    };
+  },
+  methods: {
+    toAddOrder () {
+      uni.$u.throttle(() => {
+        uni.navigateTo({
+          url: `/pages/order/addOrder`
+        })
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.search {
+  width: 710rpx;
+  height: 70rpx;
+  background: #FFFFFF;
+  border: 2rpx solid #FAFBFC;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+
+  margin: 24rpx 24rpx 0 24rpx;
+
+  .input-content {
+
+    margin-left: 30rpx;
+  }
+
+  .icon {
+
+
+    margin-right: 30rpx;
+  }
+}
+.customer-list {
+
+  margin-top: 26rpx;
+  &__item {
+    width: 710rpx;
+    background: #FFFFFF;
+    box-shadow: 0rpx 4rpx 10rpx 0rpx rgba(219, 218, 218, 0.5);
+
+    padding: 24rpx 0;
+    margin: 0 20rpx 26rpx 22rpx;
+
+    .top {
+      display: flex;
+      justify-content: space-between;
+
+      padding-bottom: 24rpx;
+      .avatar {
+
+        padding-top: 4rpx;
+        padding-left: 20rpx;
+      }
+
+      .user-info {
+        flex: 1;
+
+        padding-left: 24rpx;
+
+        .name {
+          width: 270rpx;
+          height: 48rpx;
+          font-size: 32rpx;
+          font-weight: 500;
+          color: #333333;
+        }
+
+        .tel {
+          height: 40rpx;
+          font-size: 28rpx;
+          font-weight: 500;
+          color: #36596A;
+          line-height: 40rpx;
+          display: flex;
+
+          margin-top: 18rpx;
+
+          .text {
+
+            margin-left: 10rpx;
+          }
+        }
+
+        .address {
+          font-size: 28rpx;
+          font-weight: 500;
+          color: #36596A;
+          line-height: 40rpx;
+          display: flex;
+
+          margin-top: 14rpx;
+
+          .text {
+
+            margin-left: 10rpx;
+          }
+        }
+      }
+
+      .sex {
+        width: 40rpx;
+        height: 40rpx;
+        background: #FDECEC;
+        opacity: 0.5;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+
+        margin-right: 20rpx;
+
+        .sex-text {
+          width: 28rpx;
+          height: 34rpx;
+          font-size: 28rpx;
+          font-weight: 500;
+          color: #36596A;
+          line-height: 34rpx;
+        }
+      }
+    }
+
+
+    .line {
+      width: 670rpx;
+      height: 2rpx;
+      border: 2rpx solid #EEEFF5;
+
+      margin: 0 auto;
+    }
+
+    .bottom {
+      display: flex;
+      justify-content: center;
+      font-size: 32rpx;
+      color: #1479FF;
+
+      padding-top: 24rpx;
+
+      & > span {
+        letter-spacing: 2rpx;
+        padding: 0 10rpx;
+      }
+    }
+  }
+}
+</style>
diff --git a/static/tabbar/order-active.png b/static/tabbar/order-active.png
new file mode 100644
index 0000000000000000000000000000000000000000..fccd1e1f4352ae91ed1451b3a996e8163ff2db3f
GIT binary patch
literal 3433
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
A?f?J)

literal 0
HcmV?d00001

diff --git a/static/tabbar/order.png b/static/tabbar/order.png
new file mode 100644
index 0000000000000000000000000000000000000000..e5c658fffb99c405680de4245c77cbed04150e4e
GIT binary patch
literal 3430
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
YIX;g(Bzmrkj1w?FX=z$~!Zqsu03C!k-v9sr

literal 0
HcmV?d00001