From b2fb58243b9d8893ae29726d6ab95b59c3adf11c Mon Sep 17 00:00:00 2001
From: wangxiaoping <809126545@qq.com>
Date: Fri, 13 Aug 2021 13:09:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../packageBuy/pages/buyMember/buyMember.vue  |   4 +-
 .../buyMemberSuccess/buyMemberSuccess.vue     |   3 +-
 .../packageOrder/pages/myOrder/myOrder.vue    |  99 ++++++++++--------
 .../packageOrder/static/icon_dianpu@2x.png    | Bin 0 -> 463 bytes
 packages/packageOrder/static/icon_dizhi.png   | Bin 0 -> 1156 bytes
 .../packageOrder/static/icon_shijian@2x.png   | Bin 0 -> 724 bytes
 pages/home/home.vue                           |  10 +-
 pages/login/index.vue                         |   2 +-
 pages/member/member.vue                       |   6 +-
 pages/my/my.vue                               |  75 ++++++-------
 static/icon_bulid@2x.png                      | Bin 0 -> 694 bytes
 static/icon_chanqi@2x.png                     | Bin 0 -> 928 bytes
 12 files changed, 103 insertions(+), 96 deletions(-)
 create mode 100644 packages/packageOrder/static/icon_dianpu@2x.png
 create mode 100644 packages/packageOrder/static/icon_dizhi.png
 create mode 100644 packages/packageOrder/static/icon_shijian@2x.png
 create mode 100644 static/icon_bulid@2x.png
 create mode 100644 static/icon_chanqi@2x.png

diff --git a/packages/packageBuy/pages/buyMember/buyMember.vue b/packages/packageBuy/pages/buyMember/buyMember.vue
index 625d105..04bc04e 100644
--- a/packages/packageBuy/pages/buyMember/buyMember.vue
+++ b/packages/packageBuy/pages/buyMember/buyMember.vue
@@ -53,7 +53,7 @@
 				},
 				token: '',
 				openid: '',
-				package_id: '',
+				package_id: ''
 			}
 		},
 		onLoad(options) {
@@ -62,7 +62,7 @@
 			this.token = phone_token.token
 			let user_info = weixin.getUserInfoCache()
 			this.openid = user_info.openid
-			this.package_id = options.package_id
+			this.info.productId = options.package_id
 		},
 		methods: {
 			pay() {
diff --git a/packages/packageBuy/pages/buyMemberSuccess/buyMemberSuccess.vue b/packages/packageBuy/pages/buyMemberSuccess/buyMemberSuccess.vue
index dc79fd3..911de97 100644
--- a/packages/packageBuy/pages/buyMemberSuccess/buyMemberSuccess.vue
+++ b/packages/packageBuy/pages/buyMemberSuccess/buyMemberSuccess.vue
@@ -5,7 +5,8 @@
 			<view class="h3">您已经购买成功</view>
 			<view class="p">请等待客户人员联系您</view>
 		</view>
-		<navigator url="../active/active" open-type="switchTab"><view class="pinkBtn">返回首页</view></navigator>
+		<navigator url="../../../packageOrder/pages/myOrder/myOrder" open-type="switchTab"><view class="pinkBtn">我的订单</view></navigator>
+		<navigator url="../../../../pages/home/home" open-type="switchTab"><view class="pinkBtn">返回首页</view></navigator>
 	</view>
 </template>
 
diff --git a/packages/packageOrder/pages/myOrder/myOrder.vue b/packages/packageOrder/pages/myOrder/myOrder.vue
index d589f89..62743e5 100644
--- a/packages/packageOrder/pages/myOrder/myOrder.vue
+++ b/packages/packageOrder/pages/myOrder/myOrder.vue
@@ -1,52 +1,27 @@
 <template>
 	<view class="content">
-		<view class="end-title">
+		<view class="end-title" style="display:none;">
 			 <view v-for="(item,index) in items" :key="index" :class="{btna:count == index}" @tap="change(index)">
 				{{item}}<view class="line"></view>
 			</view>
 		</view>
 		<view class="end-cont" :class="{dis:btnnum == 0}">
 			<view class="statusBox">
-				<text>待付款</text>
-				<text class="cur">待服务</text>
-				<text>已服务</text>
-				<text>待评价</text>
+				<text v-for="(item,index) in statusLabels" :key="index" @click="changeStatus(index)" :class="{cur: index == status}">{{item}}</text>
 			</view>
-		　　<view class="orderCol">
+		　　<view class="orderCol"  v-for="(item, index) in list" :key="item.id" @click="goDetail(item.id)">
 				<view class="title">
-					<view>孕期保健Q&A<text class="free">免费</text></view>
-					<view class="status">待参加</view>
+					<view>{{item.order_name || '暂无'}}<!-- <text class="free">免费</text> --></view>
+					<!-- <view class="status">待参加</view> -->
 				</view>
 				<view class="infoList">
-					<view class="infoCol"><view class="date"><image mode="heightFix" src="../../static/icon_shijian@2x.png"></image>2021-02-10 14:00</view></view>
-					<view class="infoCol"><view class="address"><image mode="heightFix" src="../../static/icon_dizhi.png"></image>苏州·园区星海街188号苏州万怡大酒店南栋大酒店南栋</view></view>
-				</view>
-				<view class="btn"><text>预约服务</text></view>
-			</view>	
-		　　<view class="orderCol">
-				<view class="title">
-					<view>时光印记孕妈妈摄影套餐</view>
-					<view class="status">待参加</view>
+					<view class="infoCol"><view class="date"><image mode="heightFix" src="../../static/icon_shijian@2x.png"></image>{{item.created_at}}</view><view class="price"><text>¥</text>{{item.total}}</view></view>
+					<!--<view class="infoCol"><view class="address"><image mode="heightFix" src="../../static/icon_dizhi.png"></image>苏州·园区星海街188号苏州万怡大酒店南栋大酒店南栋</view></view>-->
 				</view>
-				<view class="infoList">
-					<view class="infoCol"><view class="date"><image mode="heightFix" src="../../static/icon_shijian@2x.png"></image>2有效期至:2018年11月25日</view><view class="price"><text>¥</text>100</view></view>
-					<view class="infoCol"><view class="bulid"><image mode="heightFix" src="../../static/icon_dianpu@2x.png"></image>时光印记孕妈妈摄影机构</view></view>
-				</view>
-				<view class="btn"><text>预约服务</text></view>
-			</view>	
-		　　<view class="orderCol">
-				<view class="title">
-					<view>时光印记孕妈妈摄影套餐</view>
-					<view class="status">待评价</view>
-				</view>
-				<view class="infoList">
-					<view class="infoCol"><view class="date"><image mode="heightFix" src="../../static/icon_shijian@2x.png"></image>2有效期至:2018年11月25日</view><view class="price"><text>¥</text>100</view></view>
-					<view class="infoCol"><view class="bulid"><image mode="heightFix" src="../../static/icon_dianpu@2x.png"></image>时光印记孕妈妈摄影机构</view></view>
-				</view>
-				<view class="btn"><text>预约服务</text></view>
+				<view class="btn"><!--<text> 预约服务 </text>--></view>
 			</view>							
 		</view>
-		<view class="end-cont" :class="{dis:btnnum == 1}">
+		<view class="end-cont" :class="{dis:btnnum == 1}" >
 			<view class="statusBox">
 				<text>待付款</text>
 				<text class="cur">待服务</text>
@@ -69,23 +44,63 @@
 </template>
 
 <script>
+	//{"0":"待确认","10":"待支付","20":"进行中","100":"已完成"}
 	export default {
 		data() {
 			return {
-			  btnnum: 0,
-			  items:["活动订单","商品订单"],
-			  count:""				
+				info: {
+					token: ''
+				},				
+				btnnum: 0,
+				items:["活动订单","商品订单"],
+				count:"",
+				token: '',
+				page: 1,
+				list: [],
+				status: 0,
+				statusLabels: {0: "待确认", 10:"待支付", 20:"进行中", 100:"已完成"},
 			}
 		},
-		onLoad() {
-
+		onLoad(options) {
+			const phone_token = uni.getStorageSync('phone_token')
+			this.info.phone = phone_token.phone
+			this.token = phone_token.token
+			this.status = options.status || 0
+			this.getOrderList()
+		},
+		onShow() {
+        },
+		onReachBottom() {
+			this.getOrderList()
 		},
 		methods: {
-		  change(e) {
+			changeStatus(i) {
+				this.status = i
+				this.page = 1
+				this.list = []
+				this.getOrderList()
+			},
+			change(e) {
 			 this.count = e
 			 this.btnnum = e
 			 console.log(this.count)
-		  }
+			},
+			getOrderList() {
+				const phone_token = uni.getStorageSync('phone_token')
+				uni.request({
+					url: this.baseUrl + '/api/member/get-orders',
+					method: 'GET',
+					data: {
+						state: this.status,
+						page: this.page,
+						token: phone_token.token
+					},
+					success: r => {
+						this.list = this.list.concat(r.data.data)
+						this.page++
+					}
+				})
+			}	
 		}
 	}
 </script>
@@ -120,7 +135,7 @@
     }	
     .end-cont{
         display: none;
-		padding-top:88rpx;
+		// padding-top:88rpx;
     }
     .btna{
         color: #FF578A;
diff --git a/packages/packageOrder/static/icon_dianpu@2x.png b/packages/packageOrder/static/icon_dianpu@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..9dbb53471cf063c237724cf41ce7f784d6dd8508
GIT binary patch
literal 463
zcmeAS@N?(olHy`uVBq!ia0vp^Qa~)m!3HGnb@XfnQjEnx?oJHr&dIz4a$Hg)JkxxA
z8MJ_G4hF{dOa>N^5+DZYV_;xjz{tQ1q!~eC3z!hH3z*?-F_6Me%V=((GD}Yv#}E(R
zw^Q!&HW>&s=o&EQt64Q`e@MH+`9)SptbjvYq0#b6cz6N3@clUr^6x$RO_qjFFtPDu
z%6-55er$Dngob~h$m&(A^c1>gEsNAzbuWbDBiqBn-~SfN9A7`LQB7dWv<d1APLp~i
z8GkU|NaGN@kT#>U<xaDLN1Ke{hD|!fA8wuuwzwF#>|$_>;JM=t7x<VRqvsqJ-Wq>;
zIrGK2JgJM`xo&&1`qh_8_DiDcu5WJKm2|=Q#OFU;?whVZ-O=W?Th+73;H8Bm_am7A
zK1P#WcBeOm9s4TI{mV3o>GUBBr<3^$S$F*_Ds#`A#Z|NL$#sUk%m!2bUOo1J$3?R6
z?^Br;hv52+<xh6KQcF!)Wo2cRmts6Cs#GQ;$n8#=*-!ZtYuVL)H%{Gnr8%`UHu|j1
i`Rw{bo9_s2J1m~<)7`i==AaKKFg;!UT-G@yGywpO3aF+4

literal 0
HcmV?d00001

diff --git a/packages/packageOrder/static/icon_dizhi.png b/packages/packageOrder/static/icon_dizhi.png
new file mode 100644
index 0000000000000000000000000000000000000000..6cb8182d3cd92da3c8ffd4cd913e361d92b8b511
GIT binary patch
literal 1156
zcmV-~1bh35P)<h;3K|Lk000e1NJLTq000>P000^Y1^@s6LVfqm00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR918K46I1ONa40RR918UO$Q03TEBjsO4y?ny*JR7ee-mP<%fVHC%k>-Yc*
z$2MYVEkq)M3JO|921QSUglsXSNHa={7NtQL6=@GGH%1BSs8rBmB8V)Za1llnVM~i>
z5maiMbS8o^9cTLeZ+Gn8aVE15KELz$pY#77=bq8EWP#D$-Mu~@j~`&}bh%u`zzdNh
ztmEkKko$9TavoJzSAR>F%9YMR@=YYTqU7l?HhToZ>zSFEEj2YYA)DP4=aG=q6$k{*
zv7VO<DolbP>qFL&yu7@xGcz+ekw|3a?Ck7TY!%>kSc%6C!>I84{jV(DTpT2Tjjpb)
zyLb*0j2dsx$jE5+`Fs=hpk%qTvvUi!cBa;!#CmIMYwss;4idm^IO>@{Ea1ZgaG{mh
zOfVfxAF)%MXd9b*t++W7POzVy_XC*4zK@+e5n!={Jh#bngt*W7`T1)qD=Q<0k_3an
z43?{s0bKZB0>u{<75Uld2x9T%<m5@&%#(1`L&!m#U#O5$Dr8Dd`=Hvk#$vHk*fv}C
zVXovFkNn(@lT5ySERV<+@_0N2=1EX0EMP|(f<_3QfhlJeTC-d>5}rYKjJmqI#~9vo
zE1pm&wA~~@*(DTY4;*L|odEwud{O3UOe-`c%ZA(}469?{GjkEU+uhUCvn(2o=7WfE
z^mh&<igiWAxX$rbtu}uvk1Vyt!Z@yt<Zt98ZnaLLooS5yUgrHZ-+-Xo$sU_6@lJNg
zxTO>te6?;VFwT2yd&FX8ibDNO)#^4#9<~%Uzf@ybMsQWhPMgidB>9Uh{ga!oa*T(Y
zfN?pMvWm+1WCzn$+BmIBvPo}{xFU<7342VXY>%<zb=Eqflf+QWN<j7|gW1FoHZ@E)
zvjtgiHzrv&2+pSZR`BWD(+vz665MY0C6*|TdcOXpve^fxyF{`wZ2e3<sAj)x5L`xf
z41J8`+K6$OiX5ElT{t>1*23I_!{>-vgwog7=b4_K)*F>D_v^znPof;0rh(-xJ2=YS
z`(<0~AlBfw<`!`!Y_`Mt^8a*UC1e++fYhFs5l{t4zb*eX)MRNPw}{ibzN7<}(SfHG
zJa-Z)^sNu<U=P6WsCT%*W3n$a)HNWuF9PCUWo2dUO%Nz{?oI58C~5uk@RV7AJwVX$
zRE<+HT&+s=9@w=I4AONELhwVr#7IdZXK!zBF;{mFQ9r3~siZ0@$?Qk+>w3cB@Jaes
zGio*jS0QMGKtFnpk(NX#5@qqjbBzSYQDf}(CS;dMT#9~!xq+#2_9q@0dEWRdNdnFF
zm614ruCg=-#Bqea+}zv-uh%<inNu$RM54%nfr0GN(b0OyPC)RH6P=(Nyhxcf$@mKn
WMby%C%gQhS0000<MNUMnLSTYP$O_c}

literal 0
HcmV?d00001

diff --git a/packages/packageOrder/static/icon_shijian@2x.png b/packages/packageOrder/static/icon_shijian@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..7366277592c2754ba51dfe1231a1c55a28a57fad
GIT binary patch
literal 724
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjjKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDq2jfyvI(#WBQ#
zck8s>S<;RoZCjPsTQyq=KRhS!hoP=ZB57s0a?29E2~KLU1?i8JCin?C`Bt4~e6IP2
zLG6Lw4iD8Eey7*{`TKhA(R)2_KDsiuZ?=9u=ly)yv#yR$Cz{FiZ@+9}d*EBM!i`A1
z>AXun*Bt)5)$kdU_4~5j_2G$3;R!}FO~ks78ZIzfuuA**w~3P{7_YsW6>mNFT<_cM
z|LhwtW_+0__<u>p<VQ1(NXC^#uD@=4pvEp=;QrxRM`r(+P;unC%(tq&@nU-a9TF^L
z>X`n`t#dvoY4+m#@9W>WPo2M#@yc(b*hZ0w=db+PP}$nxHc#c`OeU3D#g|vqepa-w
z@w{`{c{OWm>V6gB3v-Sa)*RI^Yn0#lfaihJQIU72cSq@c^1UqD_HbRD@M4$03!1W{
zVhWxL{8zaAdDXHg!y`h$m2Tb>&zXrOH-{eG_c!Uunr%1QDy<y?y$g?V$o+M!btyXL
z<Fiq9!dcB##_|pReW{&mpYB+!^k=F6Mi3|W$CRAkw|$>5S7;sIbmU%z)=rspO}*2#
zJzu{6eJbr5xN*OU>(Oue;?wT^pL(x5-0hdc6yD!{jvLK8GN0}_{{G>AjR#q4`gFth
zuhvh`eE;Hz=}o?;uI$%mo17MkW_n)Z#k6x}^Xsi#mWwr)-Ef=E+7+yGWM1ikoovc(
z=Vo=yo$I<wC!mL8OG&~`uG(KA+HDa@tJH)~_}S`l-@94!@}##*$l@r&8MB<LcZ<Fb
y%~DzW{?NpRTT$!JSa*7*uARP5bYgw?e%<ZNH``*kzH5eoQk18wpUXO@geCx<X*(7G

literal 0
HcmV?d00001

diff --git a/pages/home/home.vue b/pages/home/home.vue
index 4f8f9ea..2e23763 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -1,7 +1,8 @@
 <template>
 	<view class="content">
 		<image class="banner" mode="widthFix" src="../../static/member_01.jpg"></image>
-		<view class="joinBTn"  @tap="joinUs">加入我们</view>
+		<view class="joinBTn"  @tap="joinUs">会员福利</view>
+		
 	</view>
 </template>
 
@@ -16,7 +17,12 @@
 				uni.navigateTo({
 					url:"../member/member"
 				});		
-			}			
+			},
+			myOrder(){
+				uni.navigateTo({
+					url:"../../packages/packageOrder/pages/myOrder/myOrder"
+				});		
+			}							
 		}
 	}
 </script>
diff --git a/pages/login/index.vue b/pages/login/index.vue
index 2d07c85..5c2f0b2 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		<image class="logo" src="../../static/logo@3x.png"></image>
+		<image class="logo" src="../../static/logo.jpg"></image>
 		
 		<button v-show="showProfile" @click="getUserProfile">微信用户一键登录</button>
 		<button v-show="!showProfile" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">授权手机号</button>
diff --git a/pages/member/member.vue b/pages/member/member.vue
index d262919..e44f0ea 100644
--- a/pages/member/member.vue
+++ b/pages/member/member.vue
@@ -130,13 +130,13 @@
 									// 设置颜色
 									ctx.fillStyle = "#fff";
 									// 绘制文字（参数：要写的字，x坐标，y坐标）
-									ctx.fillText("会员福利孕产礼包", SCREEN_WIDTH * 0.26, SCREEN_WIDTH * 0.695/ 1.4 );
+									ctx.fillText("会员福利孕产礼包", SCREEN_WIDTH * 0.15, (SCREEN_HEIGHT-SCREEN_WIDTH * 0.8 * 1.5)/2);
 									
 									ctx.font = "16px bold";
 									// 设置颜色
-									ctx.fillStyle = "#333";
+									ctx.fillStyle = "#000";
 									// 绘制文字（参数：要写的字，x坐标，y坐标）
-									ctx.fillText("专享大礼包", SCREEN_WIDTH * 0.2, SCREEN_WIDTH * 0.695/ 0.63 );									
+									ctx.fillText("专享大礼包", SCREEN_WIDTH * 0.2, (SCREEN_HEIGHT-SCREEN_WIDTH * 0.8 * 1.5)/2+SCREEN_WIDTH * 0.695/ 1.6*1.5);									
 									// ctx.beginPath();
 									// ctx.arc(SCREEN_WIDTH * 0.62+SCREEN_WIDTH * 0.2*0.5, (SCREEN_HEIGHT -
 									// 		50 - SCREEN_WIDTH * 0.8 * 1.5) / 2 + SCREEN_WIDTH *
diff --git a/pages/my/my.vue b/pages/my/my.vue
index a81b71d..59cb1e6 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -16,54 +16,27 @@
 				<view class="title">{{userProfile.nickName || '匿名用户'}}</view>
 			</view>
 			<view class="myOrder">
-				<view class="orderTab">
-					<uni-segmented-control :current="current" :values="items.map(v=>v.title)" @clickItem="onClickItem" styleType="text" activeColor="#FF578A"></uni-segmented-control>
-				</view>	
+				<view class="orderTab">我的订单</view>	
 				<view class="content">
-					<view class="tabCol" v-show="current === 0">
+					<view class="tabCol">
 						<view class="orderMenu">
-							<view class="menuCol" @tap="nodata()">
+							<view class="menuCol" @tap="goOrderCol(0)">
 								<image src="../../static/icon_daifukuan@2x.png"></image>
-								<text>待付款</text>
+								<text>待确认</text>
 							</view>
-							<view class="menuCol" @tap="nodata()">
+							<view class="menuCol" @tap="goOrderCol(10)">
 								<image src="../../static/icon_daifuwu@2x.png"></image>
-								<text>待服务</text>
+								<text>待支付</text>
 							</view>
-							<view class="menuCol" @tap="nodata()">
+							<view class="menuCol" @tap="goOrderCol(20)">
 								<image src="../../static/icon_yifuwu@2x.png"></image>
-								<text>已服务</text>
+								<text>进行中</text>
 							</view>
-							<view class="menuCol" @tap="nodata()">
+							<view class="menuCol" @tap="goOrderCol(100)">
 								<image src="../../static/icon_daipingjia@2x.png"></image>
-								<text>待评价</text>
+								<text>已完成</text>
 							</view>
-							<view class="menuCol allOrder" @tap="nodata()">
-								<image src="../../static/icon_dingdan@2x.png"></image>
-								<text>全部订单</text>
-								<image class="line" src="../../static/bg_yinying@2x.png"></image>
-							</view>																												
-						</view>
-					</view>
-					<view class="tabCol" v-show="current === 1">
-						<view class="orderMenu">
-							<view class="menuCol" @tap="nodata()">
-								<image src="../../static/icon_daifukuan@2x.png"></image>
-								<text>待付款</text>
-							</view>
-							<view class="menuCol" @tap="nodata()">
-								<image src="../../static/icon_daifahuo@2x.png"></image>
-								<text>待发货</text>
-							</view>
-							<view class="menuCol" @tap="nodata()">
-								<image src="../../static/icon_yishouhuo@2x.png"></image>
-								<text>待收货</text>
-							</view>
-							<view class="menuCol" @tap="nodata()">
-								<image src="../../static/icon_daipingjia@2x.png"></image>
-								<text>待评价</text>
-							</view>
-							<view class="menuCol allOrder" @tap="nodata()">
+							<view class="menuCol allOrder" @tap="toMyOrder()">
 								<image src="../../static/icon_dingdan@2x.png"></image>
 								<text>全部订单</text>
 								<image class="line" src="../../static/bg_yinying@2x.png"></image>
@@ -176,11 +149,13 @@
 			this.stytemInfo();
 		},
 		onShow() {
-			let userProfile = uni.getStorageSync('user_profile')
-			if (userProfile) {
-				this.userProfile = userProfile
-			} else {
-				uni.navigateTo({ url: '../login/index?showProfile=1'})
+			if (this.checkLogin()) {
+				let userProfile = uni.getStorageSync('user_profile')
+				if (userProfile) {
+					this.userProfile = userProfile
+				} else {
+					uni.navigateTo({ url: '../login/index?showProfile=1'})
+				}				
 			}
 		},
 		onPageScroll(e) {
@@ -207,6 +182,16 @@
 					url:"../../packages/packagePromotion/pages/speadApply/speadApply"
 				})
 			},
+			toMyOrder(){
+				uni.navigateTo({
+					url:"../../packages/packageOrder/pages/myOrder/myOrder"
+				})
+			},
+			goOrderCol(v){
+				uni.navigateTo({
+					url:"../../packages/packageOrder/pages/myOrder/myOrder?status=" + v
+				})
+			},			
 			nodata(){
 				uni.showToast({
 				title: '正在建设中',
@@ -270,9 +255,9 @@
 	image{width:112rpx;height:112rpx;border-radius: 50%;margin-right:30rpx;}
 	.title{font-size: 36rpx;font-weight: 500;color: #FFFFFF;line-height: 36px;}
 }
-.myOrder{width:710rpx;background:rgba(255,255,255,0.92);border-radius: 16rpx;margin:30rpx auto 0 auto;}
+.myOrder{width:710rpx;background:rgba(255,255,255,1);border-radius: 16rpx;margin:30rpx auto 0 auto;}
 .orderTab{
-	font-size: 32rpx;font-weight: 400;width:60%;margin-left:10rpx;padding-top:15rpx;
+	font-size: 32rpx;font-weight: 400;width:60%;margin-left:10rpx;padding:30rpx 30rpx 0 30rpx;
 }
 .segmented-control__item--text{border-color: rgba(255,255,255,0)!important;}
 .segmented-control__text{color:#666666;}
diff --git a/static/icon_bulid@2x.png b/static/icon_bulid@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..a440dfa6a558deef6ef68bd5061ec94552d4a7d3
GIT binary patch
literal 694
zcmV;n0!jUeP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0007gNkl<Zc%1E<
zy^GXP6vZF9AP5$2CCgf=g^iWvmis3NvIv&v-20foWRR3vS&XIi3L+@O6k=iFCn+qn
zUJ#otS42czooQroV>1>G0h7rjd0Fm-(<O87`OO<9=R%yb`hTTqx)MdvdcWVl*n|dy
z!PzuTSK9XNy!U4SJOJ<$K-RFPBJwDTqV-nHle_}pYYWEbweP*Z)~NYjuXkBQ4gxTr
z0mww;H-L>s%tujlLPXxTZ8}H008Z8pV0QG|Hk&Jw*P8%vH>dfb_dWrz(UAJHWB<<_
zs=8e}0085h-{9NY8_$)9yw3R|o;K0=aSniIwKooB4g+8S41fVJ00y8~<MDWWTvcz2
z$R2=SWh5dK5qUxKLe)8zT4fr0@8g_@m9qMfW!bS#0wDQn2>>$h{rOG;0C2ymc@a4n
z4u_|@3gDcGe5wH8kmQZ3b1b#WHdfWs-utWG`(7ETDpd7SnK=MFFS47gv{MZEZ;)h}
zE!AQ>#gG9ksB$~SBM6|}PB9<=PnHE>reZtAPyhgUw`2gtc8UQ3*v&CfbT_&9PBD}$
zKyoh!!1tm67v3p`k_7;K%(?bU2>^?o<WRCeCjg+vEYKAIwPk@$0C29pEYKMMb(H}y
z00zJS7=X|L)R_f30l>0=WdX|qmIW*e)Kmt*02lxRU;qq&0WbgtzyJgQ0Kl83-WmKW
zlAq`2Ao;E6{QzDT0uaaXD#?+EOmd7LNr}jW<S35gRY!8v_CRfk<j9H0kG2PCQTq<S
zP5^_nr5&fLn*gQ(4AZoxs=Dc%b1q4eHIiGZ3X(TT-f3H^x((probFZmOaQlL9=DPt
cS#!?0KOl-eCmN~%4FCWD07*qoM6N<$f{0@=kpKVy

literal 0
HcmV?d00001

diff --git a/static/icon_chanqi@2x.png b/static/icon_chanqi@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..efd8599c79aee25523a997eb53de2ab6800a78e3
GIT binary patch
literal 928
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}E~ycoX}-P;
zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyz07Sip>6gA}f5OZp5{&gJRi7!twx
zcKYe;;6Q=);(R5=jk+A$R3bU9zSHj7QJ5&!G|kDeB(b}zDKly_&kBwpR{_yog3i$_
z++iUfT0_mb!Ze}^?*3!6yY%3YtJJMo&mNjjx1KJ&rSn2dPSt}a=ILqY&fJ;#x$EJ|
zi;q73cv`e`&VqhFAD=tx7QX8|n)Lf(rN@7%P8YuZo}MSG&l;}gbPdy*s`t<)MdDa%
z)Gj6W_c|N8<<6!U1wIVTZj0_vPA(|ez<;l>%KX@^hov2S5oW%hr(d`#m8E;)@1nzh
zR28`Od2N|(E$!^~F<71DRG8>d^6c|Zb&qeBmwpMm`rKQpuK9e{jO|Pka&qsqM7ZWl
z=8LB-mcCgb%h&!pLSA*U{N@N9yQ3?g$|N%W5_@SUz{9qEXH#Tuc6Rp4s~79n6z_?9
z&rrhhhVj0}{7GMyU4GeZWESz1S!au8^bVjse9MAX`mZ{(O7Hd;txRr>dfOCU--iw|
z)jv9tf#7_I_)XE2@V6g@<aZoC@{=?4!R!28b8r7~mCn|4h}K{GZ9}YK`<8h3Z%3zX
z*VEVke!}d|VquO4J1^<ku>WVxw0Zkzt@omG_P@WsWT(7ojt<N^_had&3pZaUC*&F@
zwmB`V6xB*{$$Eap|L1E($v<sA=bGxx=9~*=n_B9@w#RB!Y1YbnZWBr$+DYyeatMyT
z%sj#Lfywo0#T8%GEQ;3%2fQ^?W{$qHGr^c?#R&&j&KpJNo<8Z@H1ErW3l{`WeF)11
zO24{&=q!Vo@rId<CmV{bRVSZZD_XsTk@*}$rD=3;wxvE}%A1Yq(@(z*+tqmE?WVmN
zjAyi(JCeN2ncnhz-<@-Q)}8>hsg4ZGD=dzc#`r&3#+$bJX7!CXTi(`v|NZy<+RgII
zFI&71ZD;w~_pj?CQ$%6qigW*!_%Da$cxRr!u)9RA?Dx;<Ury}mVQM^Za_ZEnk|Jw=
zHMB2TU9?y5x%rWuH@4nuE-o%!eKF$;WBu7%4?VZ=TFMvv5x)I=XQ{j6>c6Fbi(=oY
z<hoDvGE-U5%l3J8&c6dc-RHfzyk}PNwDjN4`MWOjZSKFr&;ZIEp00i_>zopr0AN^~
A82|tP

literal 0
HcmV?d00001