lilei 3 лет назад
Родитель
Сommit
60adfa140c

+ 11 - 2
pages.json

@@ -94,6 +94,15 @@
             }
             
         }
+        ,{
+            "path" : "pages/morePage/morePage",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "更多功能",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
@@ -113,10 +122,10 @@
 				"text": "首页"
 			},
 			{
-				"pagePath": "pages/personCenter/personCenter",
+				"pagePath": "pages/morePage/morePage",
 				"iconPath": "static/tab/tab_personal_normal.png",
 				"selectedIconPath": "static/tab/tab_personal_pressed.png",
-				"text": "我的"
+				"text": "更多"
 			}
 		]
 	}

+ 13 - 3
pages/index/index.vue

@@ -14,15 +14,20 @@
 				<view><u-icon name="volume" color="#f2a557" :size="28" :margin-right='15'></u-icon> 您有一笔保证金待支付 ¥2,000.00</view> <text>立即支付>></text>
 			</view>
 			<!-- 名片 -->
-			<view class="userCard flex align_center justify_between">
+			<view class="userCard flex align_center justify_between" @click="toUser">
 				<view class="userCard-info flex align_center justify_between">
 					<view>
 						<u-image v-if="!hasLogin" src="/static/def_personal_avatar.png" width="90" height="90"></u-image>
 						<open-data v-else type="userAvatarUrl" class="user-photo"></open-data>
 					</view>
 					<view>
-						<view>王杰</view>
-						<view>宇博极速汽车维修养护中心</view>
+						<view v-if="!hasLogin" style="font-size: 40rpx;">
+							请点击登录/注册
+						</view>
+						<view v-else>
+							<view>王杰</view>
+							<view>宇博极速汽车维修养护中心</view>
+						</view>
 					</view>
 				</view>
 				<view>
@@ -104,6 +109,11 @@
 				uni.navigateTo({
 					url: "/pages/vinRecord/vinRecord"
 				})
+			},
+			toUser(){
+				uni.navigateTo({
+					url: this.hasLogin ? '/pages/personData/personData' : '/pages/login/login'
+				})
 			}
 		}
 	}

+ 3 - 3
pages/login/login.vue

@@ -2,7 +2,7 @@
 	<view class="content">
 		<view class="content-body">
 			<view class="login-logo">
-				<u-image src="/static/logo.png"  width="160" height="160" class="logo"></u-image>
+				<u-image src="/static/logo-s.png"  width="380" height="246" class="logo"></u-image>
 			</view>
 		    <view class="login-btns">
 				<u-button shape="circle" :custom-style="wxButton" class="login-btn" type="success" :hair-line="false" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
@@ -44,7 +44,7 @@
 				hasFocus: false,
 				hasFocus1: false,
 				wxButton:{
-					background: '#1283d4'
+					background: '#00c800'
 				},
 				phoneButton:{
 					background: '#ffffff'
@@ -157,7 +157,7 @@
             },
 			gotoXieyi(url){
 				uni.navigateTo({
-					url: '/pagesMe/xieyi/index?id=0'
+					url: '/pages/xieyi/index?id=0'
 				})
 			}
         },

+ 3 - 3
pages/login/phoneLogin.vue

@@ -2,7 +2,7 @@
 	<view class="phone-login">
 		<view class="login-content">
 			<view class="login-logo">
-				<u-image src="/static/logo.png" width="160" height="160" class="logo"></u-image>
+				<u-image src="/static/logo-s.png" width="380" height="246" class="logo"></u-image>
 			</view>
 			<u-form ref="uForm">
 				<u-form-item>
@@ -62,7 +62,7 @@
 				getCodeing: false,
 				totalTime: 60,
 				yzmBtn: {
-					background: "#EFEFEF"
+					background: "#ffffff"
 				},
 				submitBtn: {
 					background: "#1283d4",
@@ -198,7 +198,7 @@
 			// 用户协议
 			gotoXieyi(url) {
 				uni.navigateTo({
-					url: '/pagesMe/xieyi/index?id=0'
+					url: '/pages/xieyi/index?id=0'
 				})
 			},
 		},

+ 22 - 0
pages/morePage/morePage.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

+ 1 - 5
pages/personCenter/personCenter.vue

@@ -73,11 +73,7 @@
 		onShow() {
 			//检测是否登录
 			if(this.hasLogin) {
-			}else{
-				this.serverCount=0
-				this.count = 0
-				this.pacrkingCount = 0
-			}
+			} 
 		},
 		computed: {
 			...mapState(['hasLogin'])

+ 16 - 14
pages/personData/personData.vue

@@ -8,36 +8,38 @@
 				</view>
                 <view class="list-item-right">
 					<open-data class="user-photo" type="userAvatarUrl"></open-data>
-					<!-- <u-icon class="back-img" name="arrow-right" color="#9DA8B5"></u-icon> -->
                 </view>
 			</view>
 			<view class="list-item border-bottom">
 				<view class="list-item-left">
-					<text>名</text>
+					<text>名</text>
 				</view>
 			    <view class="list-item-right">
-					<open-data type="userNickName"></open-data>
-					<!-- <u-icon class="back-img" name="arrow-right" color="#9DA8B5"></u-icon> -->
+					<text>王杰</text>
 			    </view>
 			</view>
-			
-			<view class="list-item margin-bot">
+			<view class="list-item border-bottom">
 				<view class="list-item-left">
-					<text>性别</text>
+					<text>手机号</text>
 				</view>
 			    <view class="list-item-right">
-			    	<open-data type="userGender" lang="zh_CN"></open-data>
-					<!-- <u-icon class="back-img" name="arrow-right" color="#9DA8B5"></u-icon> -->
+			    	<text>188****1111</text>
 			    </view>
 			</view>
-			
-			<view class="list-item ">
+			<view class="list-item border-bottom">
+				<view class="list-item-left">
+					<text>门店名称</text>
+				</view>
+			    <view class="list-item-right">
+					<text>宇博极速汽车维修养护中心</text>
+			    </view>
+			</view>
+			<view class="list-item margin-bot">
 				<view class="list-item-left">
-					<text>联系电话</text>
+					<text>汽配经销商</text>
 				</view>
 			    <view class="list-item-right">
-			    	<text>{{userInfo.mobile}}</text>
-					<!-- <u-icon class="back-img" name="arrow-right" color="#9DA8B5"></u-icon> -->
+			    	<text>箭冠汽配西安大兴店</text>
 			    </view>
 			</view>
 		</view>

BIN
static/def_imgs.png


BIN
static/def_personal_avatar.png


BIN
static/logo-s.png


BIN
static/logo.png


BIN
static/nodata.png


BIN
static/tab/tab_marketing_normal.png


BIN
static/tab/tab_marketing_pressed.png