登录，服务，我的页面调整

manifest.json

@@ -68,5 +68,14 @@
     "uniStatistics" : {
         "enable" : false
     },
-    "vueVersion" : "2"
+    "vueVersion" : "2",
+    "h5" : {
+        "router" : {
+            "mode" : "hash",
+            "base" : "./"
+        },
+        "devServer" : {
+            "https" : false
+        }
+    }
 }

pages.json

@@ -4,25 +4,20 @@
 	},
 
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
-
 		{
-			"path": "pages/index/index",
+			"path": "pages/login/login",
 			"style": {
 				"navigationStyle": "custom",
 				"enablePullDownRefresh": false
 			}
 		},
-
 		{
-			"path": "pages/login/login",
+			"path": "pages/index/index",
 			"style": {
 				"navigationStyle": "custom",
 				"enablePullDownRefresh": false
 			}
 		},
-
-
-
 		{
 			"path": "pages/my/my",
 			"style": {

pages/index/index.rpx.css

@@ -1,24 +1,14 @@
 .page{
-    background: #f7f7f7;
-    position: relative;
-    display: flex;
-}
-.bgImage{
-    width: 750rpx;
-    height: 520rpx;
-}
-.page1{
-    width: 750rpx;
-    position: absolute;
-    left: 0;
-    top: 0;
+    background-image:url('/static/index/bgImg.png');
+    background-repeat:no-repeat;
+    background-size:100% ;
+    background-color: #f7f7f7;
+    padding: 32rpx;
 }
 .tuni{
-    width: 686rpx;
     height: 160rpx;
     border-radius: 24rpx;
     background: #ffffff;
-    margin-top: 184rpx;
 }
 .profile{
     width: 112rpx;
@@ -53,22 +43,17 @@
     background: #ffffff;
     margin-top: 30rpx;
 }
-.serviceing{
-    height: 1100rpx;
-    margin-top: 8rpx;
-    margin-bottom: 60rpx;
-}
+
 .serviceMsg{
     width: 686rpx;
     padding-bottom: 100rpx;
     background: #FFFFFF;
     border-radius: 24rpx;
     margin-top: 60rpx;
+    margin-bottom: 80rpx;
     position: relative;
 }
-.backColor{
-    background: #f7f7f7;
-}
+
 .dakaIcon{
     margin-top: 30rpx;
 }
@@ -113,7 +98,7 @@
     margin-bottom: 20rpx;
 }
 .tag{
-    width: 136rpx;
+    width: 140rpx;
     height: 64rpx;
     background: #FFF6CE;
     border-radius: 32rpx;
@@ -121,6 +106,9 @@
     margin-bottom: 20rpx;
     margin-left: 20rpx;
 }
+.tag text{
+    margin-right: 10rpx;
+}
 .hint{
      width: 24rpx;
      height: 24rpx;
@@ -195,6 +183,9 @@
     color: #333333;
     line-height: 80rpx;
 }
+.tag1 text{
+    margin-left: 10rpx;
+}
 .itemView{
     width: 592rpx;
     margin-top: 24rpx;
@@ -249,10 +240,7 @@
     margin-top: 24rpx;
 }
 
-.list{
-    width: 750rpx;
-    background: #f7f7f7;
-}
+
 .listItem{
     width: 686rpx;
     height: 160rpx;

pages/index/index.vue

@@ -1,11 +1,7 @@
 <template>
 	<view class="page">
-		<view>
-			<image class="bgImage" src="/static/index/bgImg.png"></image>
-		</view>
-		<view class="page1">
-				<view class="flex-row justify-center">
-					<view class="flex-row  tuni">
+
+					<view class="flex-row tuni">
 						<image class="profile" src="/static/my/fuwuNmber.png"></image>
 						<view class="tuniMsg flex-col">
 							<text class="name">托老师</text>
@@ -16,14 +12,13 @@
 						</view>
 						<view class="flex-col ">
 							<view class="flex-row justify-center dakaIcon">
-								<u-icon name="/static/index/dizi.png" size="25"></u-icon>
+								<u-icon name="/static/index/saoma.png" size="25"></u-icon>
 							</view>
 							<view class="flex-row justify-center dakaText">
 								<text>报道打卡</text>
 							</view>
 						</view>
 					</view>
-				</view>
 
 				<view class="flex-row justify-center">
 					<view class="tab flex-row">
@@ -36,17 +31,16 @@
 					</view>
 				</view>
 
-				<view v-if="tabIndex === 0" class="flex-row justify-center backColor ">
-					<view class="serviceing" v-if="true">
-						<view class="serviceMsg" >
-							<view class="flex-row serviceInfo">
+				<view v-if="tabIndex === 0" class="flex-row justify-center">
+						<view class="serviceMsg " v-if="true">
+							<view class="flex-row serviceInfo ">
 								<image class="serviceProfile" src="/static/my/fuwuNmber.png"></image>
 								<view class="flex-col justify-end">
 									<view class="flex-row" >
 										<text class="servicename">张某某</text>
 										<view class="flex-row justify-center tag">
 											<text>切换</text>
-											<u-icon name="/static/index/dizi.png" size="18"></u-icon>
+											<u-icon name="/static/index/qiehuan.png" size="18"></u-icon>
 										</view>
 									</view>
 								</view>
@@ -63,7 +57,7 @@
 									</view>
 								</view>
 							</view>
-							<view class="flex-row justify-center">
+							<view class="flex-row justify-center ">
 								<view class="flex-col itemView">
 									<view class="flex-row item">
 										<u-icon name="/static/index/jiandao.png" size="20"></u-icon>
@@ -113,7 +107,7 @@
 											</view>
 										</view>
 										<view class="flex-row justify-center tag1">
-											<u-icon name="/static/index/dizi.png" size="18"></u-icon>
+											<u-icon name="/static/index/qianbao.png" size="18"></u-icon>
 											<text>去结算</text>
 										</view>
 									</view>
@@ -145,9 +139,8 @@
 								<text>开始服务</text>
 							</view>
 					</view>
-				</view>
 
-					<view  :style="{'height':sysHeight}" v-else>
+					<view class="flex-col" :style="{'height':sysHeight}" v-else>
 						<view class="flex-row justify-center">
 							<image class="dataNull" src="/static/index/dataNull.png"></image>
 						</view>
@@ -155,15 +148,12 @@
 							<text>暂无服务项目</text>
 						</view>
 					</view>
-
-
-		</view>
-			<view v-if="tabIndex === 1" class="list" :style="{'height':sysHeight}">
-				<view v-if="true">
-					<mescroll-uni ref="mescrollRef" @init="mescrollInit" :height="sysHeight" :down="downOption" @down="downCallback"
+		       </view>
+			<view v-if="tabIndex === 1" :style="{'height':sysHeight}">
+					<mescroll-uni v-if="true" ref="mescrollRef" @init="mescrollInit" :height="sysHeight" :down="downOption" @down="downCallback"
 								  :up="upOption" @up="upCallback" @emptyclick="emptyClick">
-						<view class="flex-row justify-center">
-							<view class="listItem flex-row justify-between">
+
+							<view class="listItem flex-row justify-between ">
 								<view class="flex-row">
 									<image class="listItemProfile" src="/static/my/fuwuNmber.png"></image>
 									<text class="listItemName">张某某</text>
@@ -174,10 +164,10 @@
 									<text class="listItemValue">11:45</text>
 								</view>
 							</view>
-						</view>
+
+
 					</mescroll-uni>
-				</view>
-				<view  :style="{'height':sysHeight}" v-else>
+				<view :style="{'height':sysHeight}" v-else>
 					<view class="flex-row justify-center">
 						<image class="dataNull" src="/static/index/dataNull.png"></image>
 					</view>
@@ -186,11 +176,6 @@
 					</view>
 				</view>
 			</view>
-
-
-
-
-	</view>
 	</view>
 </template>
 
@@ -227,8 +212,14 @@
 		},
 		onLoad(){
 			let sysInfo = uni.getSystemInfoSync()
-			this.sysHeight = sysInfo.windowHeight - (sysInfo.windowWidth/750) *454 + 'px'
+			this.sysHeight = sysInfo.windowHeight - (sysInfo.windowWidth/750) * 354  + 'px'
 			console.log(this.sysHeight)
+
+			 uni.getLocation({
+				 success:(e)=>{
+					 console.log(e)
+				 }
+			 })
 		},
 		methods: {
 			clickTab(e){

pages/login/index.rpx.css

@@ -2,7 +2,7 @@
 	padding: 0 56rpx;
 }
 .logTitle{
-	margin-top: 146rpx;
+	margin-top: 34rpx;
 }
 .log {
 	width: 320rpx;

pages/my/index.rpx.css

@@ -1,22 +1,13 @@
 .page{
-    background: #F9F9F9;
-    position: relative;
-}
-.bgImage{
-    width: 750rpx;
-    height: 520rpx;
-}
-.page1{
-    width: 750rpx;
-    position: absolute;
-    left: 0;
-    top: 0;
+    background-image:url('/static/my/bg1.png');
+    background-repeat:no-repeat;
+    background-size:100% 30%;
+    background-color: #f7f7f7;
+    padding: 32rpx;
 }
 .useInfo{
     width: 686rpx;
     height: 152rpx;
-    margin-left: 32rpx;
-    margin-top: 186rpx;
 }
 
 .profileView{
@@ -55,7 +46,6 @@
     background: #FFFFFF;
     box-shadow: 0rpx 8rpx 16rpx 0rpx rgba(255,224,92,0.05);
     border-radius: 24rpx;
-    margin-left: 32rpx;
     margin-top: 40rpx;
 }
 .statisticsTitle{
@@ -88,5 +78,4 @@
     border-radius: 24rpx;
     padding: 20rpx 24rpx;
     margin-top: 40rpx;
-    margin-left: 32rpx;
 }

pages/my/my.vue

@@ -1,9 +1,5 @@
 <template>
 	<view class="page" :style="{'height':sysHeight}">
-		<view>
-			<image class="bgImage" src="/static/my/bg1.png"></image>
-		</view>
-		<view class="page1" :style="{'height':sysHeight}">
 
 			<view class="useInfo  flex-row">
 				<view class="profileView">
@@ -50,11 +46,10 @@
 			</view>
 			<view class="list">
 				<uni-list>
-					<uni-list-item :to="item.to" :title="item.title" showArrow :thumb="item.thumb" thumb-size="sm" :rightText="item.rightText" v-for="(item,index) in group1" :key="index"/>
+					<uni-list-item :to="item.to" :title="item.title" showArrow :thumb="item.thumb" thumb-size="medium" :rightText="item.rightText" v-for="(item,index) in group1" :key="index"/>
 				</uni-list>
 			</view>
 
-		</view>
 	</view>
 </template>