From 7bb20f12c00fff9df60224ad7e203d0cd9bfc643 Mon Sep 17 00:00:00 2001
From: taiyuan <taiyuan@yolipai.com>
Date: Mon, 26 Apr 2021 15:24:06 +0800
Subject: [PATCH] 服务项目

---
 pages/user/my_service/i_service.wxml | 18 +++++++++---------
 pages/user/my_service/i_service.wxss | 23 ++++++++++++-----------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/pages/user/my_service/i_service.wxml b/pages/user/my_service/i_service.wxml
index 3e904fd..c528692 100644
--- a/pages/user/my_service/i_service.wxml
+++ b/pages/user/my_service/i_service.wxml
@@ -1,17 +1,17 @@
 <!-- 背景图片 -->
 <view catchtap="close">
-  <image class="backimage" src="{{iurl}}/miniapp/images/yyservice/backimage.png" lazy-load="true"></image>
-	<!-- <view> -->
-		<navigator class="History fs26" url="/packageA/pages/service_record/service_record" style="left:10px;right:auto;">服务记录</navigator>
-		<navigator class="History fs26" url="/pages/user/my_service/hist_service">历史预约</navigator>
-	<!-- </view> -->
-  <!-- <navigator class="History fs26" url="/pages/user/my_service/hist_service">历史预约</navigator> -->
+  <image class="backimage" src="{{iurl}}/miniapp/images/yyservice/backimage.png" lazy-load="true"/>
+	<view class="flex jc_sb pd20">
+		<navigator class="fs26 white" url="/packageA/pages/service_record/service_record">服务记录</navigator>
+		<navigator class="fs26 white" url="/pages/user/my_service/hist_service">历史预约</navigator>
+	</view>
+	
 </view>
 
 <!-- 预约内容 -->
 <!-- 项目框架 -->
 <view class="Serviceitems" catchtap="close">
-	<view>
+	<view class="flex jc_sb flex-wrap">
 		<!-- 单个项目 -->
 		<view class="rel" wx:for="{{service_List}}">
 		  <view class="abs">
@@ -62,12 +62,12 @@
 	</view>
   
 	
-<view class="After_all flex-center fs26">选择更多服务卡项，<text class="ctb" data-url="/packageA/pages/cardList/cardList" bindtap="goto">立即购买！</text></view>
+<view class="fs26 t-c" style="line-height: 80rpx;">选择更多服务卡项，<text class="ctb" data-url="/packageA/pages/cardList/cardList" bindtap="goto">立即购买！</text></view>
   <!-- 没有数据 -->
   <!-- 加载完毕并且数据大于=页大小 -->
   <view class="After_all flex-center" wx:if="{{ismore && service_List.length>=6}}">
     <view class="Line"></view>
-    <view class="end fs26 xc-black">到底了</view>
+    <view class="end fs24 xc-black">到底了</view>
     <view class="Line"></view>
   </view>
 	<!-- <view class="After_all flex-center" wx:if="{{ismore && service_List.length>=6}}">选择更多服务卡项，</view> -->
diff --git a/pages/user/my_service/i_service.wxss b/pages/user/my_service/i_service.wxss
index 846440b..b9364d4 100644
--- a/pages/user/my_service/i_service.wxss
+++ b/pages/user/my_service/i_service.wxss
@@ -8,9 +8,8 @@ page {
   position: absolute;
   top: 0rpx;
   left: 0rpx;
-  z-index: 0;
+  z-index: -1;
   width: 100%;
-  /* height: 100%; */
 }
 
 /* 历史服务定位 */
@@ -25,11 +24,11 @@ page {
 
 .rel {
   background-color: rgb(255, 255, 255);
-  width: 350rpx;
+  width: 346rpx;
   height: 430rpx;
   border-radius: 20rpx;
   display: inline-block;
-  margin-right: 15rpx;
+  /* margin-right: 15rpx; */
   margin-bottom: 20rpx;
   box-shadow: 0rpx 3rpx 3rpx 3rpx rgb(233, 233, 233);
 }
@@ -45,12 +44,13 @@ page {
 }
 
 .Serviceitems {
-  position: absolute;
-  top: 370rpx;
-  left: 0rpx;
+  /* position: absolute; */
+  /* top: 370rpx;
+  left: 0rpx; */
+	padding: 300rpx 20rpx 0;
   z-index: 2;
-  padding-left: 18rpx;
-  padding-bottom: 20rpx;
+  /* padding-left: 18rpx;
+  padding-bottom: 20rpx; */
 }
 
 .itemimage {
@@ -158,10 +158,11 @@ page {
 }
 
 .After_all .Line {
-  border-top: 3rpx solid rgb(0, 0, 0);
-  width: 130rpx;
+  border-top: 3rpx solid #ccc;
+  width: 50rpx;
 }
 
 .After_all .end {
   margin: 0rpx 15rpx;
+	color: #ccc;
 }
--
libgit2 0.21.4