创建产品追溯页面 进一步完善各项功能

Signed-off-by: YangWork <yang@xixingwl.cn>

pages/tabbar/home/home.vue

@@ -1,36 +1,41 @@
 <template>
 	<view>
 		<view class="warp">
-			<uni-search-bar @confirm="search" v-model="searchValue" @input="input" clearButton="always"
-				cancelButton="none" @clear="scan">
-				<template v-slot:clearIcon>
-					<uni-icons color="#999999" size="18" type="scan" />
-				</template>
-			</uni-search-bar>
+			<uni-nav-bar fixed="true" statusBar="true" leftWidth="10px" right-width="10px">
+				<view style="display: flex; align-items: center; width: 100%; background-color: transparent; ">
+					<uni-search-bar @confirm="search" v-model="searchValue" @input="input" clearButton="always"
+						cancelButton="none" @clear="scan">
+						<template v-slot:clearIcon>
+							<uni-icons color="#999999" size="18" type="scan" />
+						</template>
+					</uni-search-bar>
+				</view>
+			</uni-nav-bar>
+
 			<!-- 个人中心页方格列表数据 -->
 			<view class="Grid">
 				<view class="Grid-Item">
 					<view class="Grid-Item-1">
 						<image class="GSimg" src="../../../static/logo.png"></image>
-						<view class="GStitle">测试功能</view>
+						<view class="GStitle">新闻动态</view>
 					</view>
 				</view>
 				<view class="Grid-Item">
 					<view class="Grid-Item-1">
 						<image class="GSimg" src="../../../static/logo.png"></image>
-						<view class="GStitle">测试功能</view>
+						<view class="GStitle">视频教程</view>
 					</view>
 				</view>
 				<view class="Grid-Item">
 					<view class="Grid-Item-1">
 						<image class="GSimg" src="../../../static/logo.png"></image>
-						<view class="GStitle">测试功能</view>
+						<view class="GStitle">产品追溯</view>
 					</view>
 				</view>
 				<view class="Grid-Item">
 					<view class="Grid-Item-1">
 						<image class="GSimg" src="../../../static/logo.png"></image>
-						<view class="GStitle">测试功能</view>
+						<view class="GStitle">车架查询</view>
 					</view>
 				</view>
 			</view>
@@ -1304,7 +1309,7 @@
 		}
 	}
 
-page {
+	page {
 		display: flex;
 		flex-direction: column;
 		box-sizing: border-box;

pages/tabbar/my/my.vue

@@ -1,10 +1,10 @@
 <template>
-	<view> 
-		<view class="warp warp1" style="">
-			<view class="user" style="">
+	<view>
+		<view class="warp warp1">
+			<view class="user">
 				<view class="user-info">
 					<text class="nickname"> {{userInfo.nickname}} </text>
-					<text> UID {{userInfo.uid}}</text> 
+					<text> UID {{userInfo.uid}}</text>
 					<text> 云深不知归处，爱你不会迷路</text>
 				</view>
 				<image class="user-avatar" mode="aspectFit" :src="userInfo.avatar"
@@ -39,30 +39,24 @@
 			</view>
 
 			<view style="padding: 10rpx;"></view>
-			<uni-list style="">
-				<uni-list-item :showExtraIcon="true" :extraIcon="{color: '#4cd964',size: '25',type: 'gear'}"
-					title="列表左侧带扩展图标" clickable showArrow>
+			<uni-list>
+				<uni-list-item :showExtraIcon="true" link to="/member/profile/profile" :extraIcon="{color: '#4cd964',size: '25',type: 'gear'}"
+					title="个人信息" clickable showArrow>
 				</uni-list-item>
 				<uni-list-item :showExtraIcon="true" :extraIcon="{color: '#4cd964',size: '25',type: 'gear'}"
-					title="列表左侧带扩展图标" clickable showArrow>
-				</uni-list-item>
-				<uni-list-item :showExtraIcon="true" :extraIcon="{color: '#4cd964',size: '25',type: 'gear'}"
-					title="列表左侧带扩展图标" clickable showArrow>
-				</uni-list-item>
+					title="账号与安全" clickable showArrow>
+				</uni-list-item> 
 			</uni-list>
 			<view style="padding: 10rpx;"></view>
-			<uni-list>
-				<uni-list-item title="列表左侧带略缩图"
-					thumb="https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/460d46d0-4fcc-11eb-8ff1-d5dcf8779628.png"
-					thumb-size="sm" rightText="右侧文字" showArrow></uni-list-item>
+			<uni-list> 
 				<uni-list-item :showExtraIcon="true" :extraIcon="{color: '#4cd964',size: '25',type: 'gear'}" title="设置"
 					clickable showArrow>
 				</uni-list-item>
 				<uni-list-item :showExtraIcon="true" :extraIcon="{color: '#4cd964',size: '25',type: 'info'}" title="关于"
 					clickable showArrow>
 				</uni-list-item>
-				<uni-list-item :showExtraIcon="true" :extraIcon="{color: '#ff0000',size: '25',type: 'back'}" title="退出"
-					clickable showArrow>
+				<uni-list-item :showExtraIcon="true" @click="logOut"
+					:extraIcon="{color: '#ff0000',size: '25',type: 'back'}" title="注销登录" clickable showArrow>
 				</uni-list-item>
 			</uni-list>
 		</view>
@@ -88,8 +82,7 @@
 		data() {
 			return {}
 		},
-		onLoad() {
-			console.log(this.isLogin);
+		onLoad() { 
 			if (!this.isLogin) {
 				uni.redirectTo({
 					url: "/pages/login/login"
@@ -97,7 +90,23 @@
 			}
 		},
 		methods: {
-
+			logOut() {
+				let self = this;
+				uni.showModal({
+					content: "确定注销登录嘛？",
+					confirmText: "确定",
+					cancelText: "取消",
+					success(res) {
+						if (res.confirm) {
+							
+							self.$store.dispatch("actionLogout");
+							uni.reLaunch({
+								url:"/pages/tabbar/home/home"
+							})
+						}
+					}
+				})
+			}
 		},
 		onBackPress() {
 			// #ifdef APP-PLUS
@@ -108,24 +117,26 @@
 </script>
 
 <style lang="scss">
-	.warp1{ }
+	.warp1 {}
+
 	.user {
 		box-sizing: border-box;
 		display: flex;
 		flex-wrap: wrap;
 		justify-content: flex-start;
-		align-items: center; 
+		align-items: center;
 		padding: 180rpx 25rpx 25rpx 15rpx;
 		/* #ifdef H5 */
 		padding-top: 80rpx;
-		/* #endif */ 
+
+		/* #endif */
 		// background-image: url(/static/user/back.jpg);
 		// background-size: 100% 100%;
 		// background: linear-gradient(pink,#a900ff7a, pink);
 		.user-avatar {
 			width: 138rpx;
 			height: 138rpx;
-			border-radius: 50%; 
+			border-radius: 50%;
 		}
 
 		.user-info {
@@ -134,8 +145,8 @@
 			flex-direction: column;
 			justify-content: center;
 			padding-left: 25rpx;
-			
-			.nickname{
+
+			.nickname {
 				font-size: 64rpx;
 				font-weight: 48rpx;
 			}