静态完成50%

pages.json

@@ -26,7 +26,14 @@
 		}, {
 			"path": "pages/order/order",
 			"style": {
-				"navigationBarTitleText": "",
+				"navigationBarTitleText": "订单管理",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/order/back-order",
+			"style": {
+				"navigationBarTitleText": "待发货",
 				"enablePullDownRefresh": false
 			}
 
@@ -58,7 +65,7 @@
 		}, {
 			"path": "pages/shopping-cart/shopping-cart",
 			"style": {
-				"navigationBarTitleText": "",
+				"navigationBarTitleText": "购物车",
 				"enablePullDownRefresh": false
 			}
 
@@ -130,6 +137,70 @@
             }
             
         }
+        ,{
+            "path" : "pages/message/message",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "消息",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/product/product-details",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "订单详情",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/order/order-details",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "订单详情",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/user/notice",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "官方公告",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/user/strategy",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "新手攻略",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/user/problem",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "常见问题",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/user/kefu",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "联系客服",
+				"backgroundColorTop": "#ff5d5b",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "white",
@@ -154,10 +225,10 @@
 			"selectedIconPath": "static/images/home_selected.png",
 			"text": "首页"
 		}, {
-			"pagePath": "pages/order/order",
+			"pagePath": "pages/order/back-order",
 			"iconPath": "static/images/qiang.png",
 			"selectedIconPath": "static/images/qiang_selected.png",
-			"text": "订单"
+			"text": "待发货"
 		}, {
 			"pagePath": "pages/shopping-cart/shopping-cart",
 			"iconPath": "static/images/kan.png",

pages/home/home.vue

@@ -35,14 +35,14 @@
 				<text>最新上线</text>
 			</view>
 			<view class="new-rank">
-					<scroll-view scroll-x="true" :show-scrollbar="false" :enable-flex="true" style="white-space: nowrap;">
-						<product-item type="swiper" image="https://img.alicdn.com/imgextra/i3/2930255252/O1CN0159ouF21ofSiQ3kPq2_!!2930255252.jpg"></product-item>
-						<product-item type="swiper" image="https://img.alicdn.com/imgextra/i3/2930255252/O1CN0159ouF21ofSiQ3kPq2_!!2930255252.jpg"></product-item>
-						<product-item type="swiper" image="https://img.alicdn.com/imgextra/i3/2930255252/O1CN0159ouF21ofSiQ3kPq2_!!2930255252.jpg"></product-item>
-						<product-item type="swiper" image="https://img.alicdn.com/imgextra/i3/2930255252/O1CN0159ouF21ofSiQ3kPq2_!!2930255252.jpg"></product-item>
-					</scroll-view>
-				</view>
-			
+				<scroll-view scroll-x="true" :show-scrollbar="false" :enable-flex="true" style="white-space: nowrap;">
+					<product-item type="swiper" image="https://img.alicdn.com/imgextra/i3/2930255252/O1CN0159ouF21ofSiQ3kPq2_!!2930255252.jpg"></product-item>
+					<product-item type="swiper" image="https://img.alicdn.com/imgextra/i3/2930255252/O1CN0159ouF21ofSiQ3kPq2_!!2930255252.jpg"></product-item>
+					<product-item type="swiper" image="https://img.alicdn.com/imgextra/i3/2930255252/O1CN0159ouF21ofSiQ3kPq2_!!2930255252.jpg"></product-item>
+					<product-item type="swiper" image="https://img.alicdn.com/imgextra/i3/2930255252/O1CN0159ouF21ofSiQ3kPq2_!!2930255252.jpg"></product-item>
+				</scroll-view>
+			</view>
+
 		</view>
 		<view class="section" style="margin-top: 40upx;">
 			<view class="col-img-title">
@@ -69,6 +69,18 @@
 		onLoad() {
 
 		},
+		onNavigationBarButtonTap(e) {
+			// console.log(e)
+			switch (e.index) {
+				case 0:
+					uni.navigateTo({
+						url: '/pages/message/message'
+					});
+					break;
+				default:
+					break;
+			}
+		},
 		methods: {}
 	}
 </script>
@@ -147,7 +159,8 @@
 		line-height: 80upx;
 	}
 
-	.hot-rank .product-item ,.new-rank .product-item{
+	.hot-rank .product-item,
+	.new-rank .product-item {
 		margin: 5rpx;
 
 		&:first-child {
@@ -159,13 +172,14 @@
 		}
 	}
 
-	.like{
+	.like {
 		display: flex;
 		justify-content: space-between;
 		flex-wrap: wrap;
 		padding: 10upx 20upx;
 	}
-	.like .product-item{
+
+	.like .product-item {
 		margin-bottom: 10upx;
 	}
 </style>

pages/message/message.vue

@@ -0,0 +1,96 @@
+<template>
+	<view class="message">
+		<view class="header">
+			<view class="title">
+				消息
+			</view>
+			<view class="tabs">
+				<view class="tab-item active">收益消息</view>
+				<view class="tab-item">其他消息</view>
+			</view>
+		</view>
+		<view class="msg-list">
+			<view>
+				<view class="time">
+					2021-07-02 11:25
+				</view>
+				<view class="msg">
+					<view class="title">收益通知</view>
+					<view class="content">您好，您的粉丝给您贡献了一笔0.00元的收益。请注意查收</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.message{
+		overflow: hidden;
+	}
+	.header {
+		margin: 20upx;
+		background: white;
+		text-align: center;
+		border-radius: 20upx;
+		.title {
+			height: 100upx;
+			font-size: 32upx;
+			line-height: 100upx;
+			font-weight: bold;
+		}
+
+		.tabs {
+			display: flex;
+			justify-content: space-between;
+
+			.tab-item {
+				flex: 1;
+				padding: 10upx 0;
+				font-size: 28upx;
+				color: #999999;
+				&.active {
+					background: $primary-color;
+					color: white;
+					border-radius: 20upx;
+				}
+			}
+		}
+	}
+	
+	
+	.msg-list{
+		.time{
+			text-align: center;
+			font-size: 24upx;
+			color: #999999;
+		}
+		.msg{
+			margin: 20upx;
+			background: white;
+			padding: 20upx;
+			.title{
+				text-align: center;
+				font-size: 28upx;
+				padding-bottom: 20upx;
+				border-bottom: 2upx solid #EEEEEE;
+			}
+			.content{
+				margin-top: 20upx;
+				font-size: 26upx;
+			}
+		}
+	}
+</style>

pages/order/back-order.vue

@@ -0,0 +1,194 @@
+<template>
+	<view class="order">
+		<view class="order-list">
+			<view class="order-item" v-for="order in orders">
+				<view class="order-head">
+					<view class="factory-name">{{order.factory}}</view>
+					<view v-if="order.status === 0" class="order-status">待付款</view>
+					<view v-if="order.status === 2" class="order-status">待收货</view>
+				</view>
+				<view class="order-info" @tap="openDetails()">
+					<view class="product-item" v-for="product in order.products">
+						<view class="product-image">
+							<image class="image" :src="product.image" mode="scaleToFill"></image>
+						</view>
+						<view class="product-info">
+							<view class="row">
+								<view class="name">{{product.name}}</view>
+								<view class="price">￥{{product.price}}</view>
+							</view>
+							<view class="row">
+								<view class="spec">{{product.specs_name}}</view>
+								<view class="num">×{{product.specs_num}}</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="total-price">
+					总价 <text class="warning">￥{{order.total}}</text>
+				</view>
+				<view class="option">
+					<button v-if="order.status === 0" class="pay-btn" type="default">立即支付</button>
+					<button v-if="order.status === 2" class="confirm-btn" type="default">确认收货</button>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				orders: [{
+					factory: '省心一号工厂',
+					products: [{
+						name: '泰国Mistine小黄帽防晒霜',
+						image: 'https://img.alicdn.com/i4/2929053804/O1CN01RSromv1dyHBcuS4I6_!!2929053804.jpg',
+						price: 9.52,
+						specs_name: "白色",
+						specs_num: 5
+					}],
+					status: 2,
+					total: '99.51'
+				}, {
+					factory: '省心二号工厂',
+					products: [{
+							name: '【三只松鼠】元宵送礼坚果礼盒1498g',
+							image: 'https://img.alicdn.com/i4/880734502/O1CN01tA7hal1j7xjnwHQZC_!!880734502.jpg',
+							price: 9.52,
+							specs_name: "白色",
+							specs_num: 5
+						},
+						{
+							name: '泰国Mistine小黄帽防晒霜',
+							image: 'https://img.alicdn.com/i4/2929053804/O1CN01RSromv1dyHBcuS4I6_!!2929053804.jpg',
+							price: 9.52,
+							specs_name: "白色",
+							specs_num: 5
+						}
+					],
+					status: 0,
+					total: '58.51'
+				}]
+			}
+		},
+		methods: {
+			openDetails() {
+				uni.navigateTo({
+					url:"order-details"
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.message {
+		overflow: hidden;
+	}
+
+
+	.order-list {
+		.order-item {
+
+			background: white;
+			margin: 20upx;
+			padding: 20upx;
+			border-radius: 20upx;
+
+			.order-head {
+				display: flex;
+				justify-content: space-between;
+				margin-bottom: 20upx;
+
+				.order-status {
+					color: $primary-color;
+					font-size: 24upx;
+				}
+			}
+
+			.factory-name {
+				font-size: 28upx;
+				font-weight: bold;
+			}
+
+			.product-item {
+				display: flex;
+
+				.product-image {
+					width: 120upx;
+					height: 120upx;
+					margin-right: 20upx;
+					margin-top: 10upx;
+
+					.image {
+						width: 120upx;
+						height: 120upx;
+					}
+				}
+
+				.product-info {
+					flex-grow: 1;
+					font-size: 28upx;
+
+					.name {
+						font-size: 28upx;
+						white-space: normal;
+						display: -webkit-box;
+						-webkit-box-orient: vertical;
+						-webkit-line-clamp: 2;
+						overflow: hidden;
+
+					}
+
+					.num {
+						color: #999999;
+					}
+
+					.spec {
+						font-size: 26upx;
+						background: #CCCCCC;
+						color: white;
+						padding: 0 10upx;
+						border-radius: 10upx;
+					}
+				}
+
+				.row {
+					display: flex;
+					justify-content: space-between;
+					margin-bottom: 10upx;
+				}
+
+			}
+
+			.total-price {
+				text-align: right;
+				font-size: 28upx;
+				padding: 10upx 0;
+				.warning {
+					color: $primary-color;
+					font-weight: bold;
+				}
+				
+			}
+
+			.option {
+				text-align: right;
+
+				.pay-btn,
+				.confirm-btn {
+					background: white;
+					border: 2upx solid $primary-color;
+					display: inline-block;
+					line-height: normal;
+					font-size: 28upx;
+					color: $primary-color;
+					border-radius: 40upx;
+					padding: 5upx 10upx;
+				}
+			}
+		}
+	}
+</style>

pages/order/order-details.vue

@@ -0,0 +1,305 @@
+<template>
+	<view>
+		<view class="location">
+
+			<view class="contacts">
+				<view class="name">
+					刘亦菲
+				</view>
+				<view class="phone">
+					86-18112512562
+				</view>
+			</view>
+			<view class="address">
+				广东省广州市花都区合成村2街5号
+			</view>
+		</view>
+		<view class="order">
+			<view class="order-head">
+				<view class="factory-name">{{order.factory}}</view>
+				<view v-if="order.status === 0" class="order-status">待付款</view>
+				<view v-if="order.status === 2" class="order-status">待收货</view>
+			</view>
+			<view class="order-info">
+				<view class="product-item" v-for="product in order.products">
+					<view class="product-image">
+						<image class="image" :src="product.image" mode="scaleToFill"></image>
+					</view>
+					<view class="product-info">
+						<view class="row">
+							<view class="name">{{product.name}}</view>
+							<view class="price">￥{{product.price}}</view>
+						</view>
+						<view class="row">
+							<view class="spec">{{product.specs_name}}</view>
+							<view class="num">×{{product.specs_num}}</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="total-price">
+				总价 <text class="warning">￥{{order.total}}</text>
+			</view>
+		</view>
+		<view class="info">
+			<view class="title">订单信息</view>
+			<view class="row">
+				<view class="label">订单编号</view>
+				<view>264545121255151212</view>
+			</view>
+			<view class="row">
+				<view class="label">支付宝交易号</view>
+				<view>456451512316545113215645</view>
+			</view>
+			<view class="row">
+				<view class="label">创建时间</view>
+				<view>2021-03-14 01:25:01</view>
+			</view>
+			<view class="row">
+				<view class="label">付款时间</view>
+				<view>2021-03-14 01:25:01</view>
+			</view>
+			<view class="row">
+				<view class="label">发货时间</view>
+				<view>2021-03-15 01:05:01</view>
+			</view>
+			<view v-if="false" class="option">
+				<view class="option-item">
+					<uni-icons class="icon" color="#666666" type="chatboxes-filled"></uni-icons>
+					联系卖家
+				</view>
+				<view class="option-item">
+					<uni-icons class="icon" color="#666666" type="phone-filled"></uni-icons>
+					拨打电话
+				</view>
+			</view>
+		</view>
+
+		<view class="footer">
+			<view class="option">
+				<button v-if="order.status === 0" class="pay-btn" type="default">立即支付</button>
+				<button v-if="order.status === 2" class="confirm-btn" type="default">确认收货</button>
+			</view>
+
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				order: {
+					factory: '省心二号工厂',
+					products: [{
+							name: '【三只松鼠】元宵送礼坚果礼盒1498g',
+							image: 'https://img.alicdn.com/i4/880734502/O1CN01tA7hal1j7xjnwHQZC_!!880734502.jpg',
+							price: 9.52,
+							specs_name: "白色",
+							specs_num: 5
+						},
+						{
+							name: '泰国Mistine小黄帽防晒霜',
+							image: 'https://img.alicdn.com/i4/2929053804/O1CN01RSromv1dyHBcuS4I6_!!2929053804.jpg',
+							price: 9.52,
+							specs_name: "白色",
+							specs_num: 5
+						}
+					],
+					status: 0,
+					total: '58.51'
+				}
+			}
+
+
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.location {
+		padding: 40upx 20upx;
+		background: white url(../../static/images/location.png) no-repeat;
+		// background-color: white;
+		background-size: 75upx 75upx;
+		background-position: 30upx;
+
+		.contacts {
+			display: flex;
+			align-items: center;
+			margin-left: 100upx;
+
+			.name {
+				margin-right: 20upx;
+				font-size: 28upx;
+			}
+
+			.phone {
+				font-size: 24upx;
+				color: #999999;
+			}
+		}
+
+		.address {
+			margin-left: 100upx;
+			font-size: 28upx;
+			margin-top: 10upx;
+		}
+	}
+
+	.order {
+
+		background: white;
+		margin-top: 20upx;
+		padding: 20upx;
+		// border-radius: 20upx;
+
+		.order-head {
+			display: flex;
+			justify-content: space-between;
+			margin-bottom: 20upx;
+
+			.order-status {
+				color: $primary-color;
+				font-size: 24upx;
+			}
+		}
+
+		.factory-name {
+			font-size: 28upx;
+			font-weight: bold;
+		}
+
+		.product-item {
+			display: flex;
+
+			.product-image {
+				width: 120upx;
+				height: 120upx;
+				margin-right: 20upx;
+				margin-top: 10upx;
+
+				.image {
+					width: 120upx;
+					height: 120upx;
+				}
+			}
+
+			.product-info {
+				flex-grow: 1;
+				font-size: 28upx;
+
+				.name {
+					font-size: 28upx;
+					white-space: normal;
+					display: -webkit-box;
+					-webkit-box-orient: vertical;
+					-webkit-line-clamp: 2;
+					overflow: hidden;
+
+				}
+
+				.num {
+					color: #999999;
+				}
+
+				.spec {
+					font-size: 26upx;
+					background: #CCCCCC;
+					color: white;
+					padding: 0 10upx;
+					border-radius: 10upx;
+				}
+			}
+
+			.row {
+				display: flex;
+				justify-content: space-between;
+				margin-bottom: 10upx;
+			}
+		
+		}
+
+		.total-price {
+			text-align: right;
+			font-size: 28upx;
+			padding: 10upx 0;
+
+			.warning {
+				color: $primary-color;
+				font-weight: bold;
+			}
+
+		}
+
+	}
+
+	.info {
+		background: white;
+		margin-top: 20upx;
+		padding: 20upx;
+
+		.title {
+			font-size: 30upx;
+			margin-bottom: 20upx;
+			font-weight: bold;
+		}
+
+		.row {
+			display: flex;
+			font-size: 26upx;
+			margin: 10upx 0;
+
+			& .label {
+				width: 200upx;
+			}
+		}
+		.option{
+			display: flex;
+			justify-content: space-around;
+			text-align: center;
+			padding: 20upx 0 0 0;
+			border-top: 2upx solid #EEEEEE;
+			color: #666666;
+			margin-top: 40upx;
+			.icon{
+				margin-right: 10upx;
+			}
+			.option-item{
+				flex: 1;
+			}
+			.option-item:first-child{
+				border-right: 2upx solid #EEEEEE;
+			}
+		}
+	}
+
+	.footer {
+		height: 80upx;
+		background: white;
+		position: fixed;
+		bottom: 0;
+		width: 100%;
+		box-shadow: 0 0 10upx #EEEEEE;
+
+		.option {
+			text-align: right;
+			margin: 15upx;
+
+			.pay-btn,
+			.confirm-btn {
+				background: white;
+				border: 2upx solid $primary-color;
+				display: inline-block;
+				line-height: normal;
+				font-size: 28upx;
+				color: $primary-color;
+				border-radius: 40upx;
+				padding: 5upx 10upx;
+			}
+		}
+	}
+</style>

pages/order/order.vue

@@ -1,8 +1,48 @@
 <template>
-	<view>
-		<navigator url="/pages/user/login" open-type="navigate">
-			<button type="default">登录</button>
-		</navigator>
+	<view class="order">
+		<view class="header">
+			<view class="title">
+				订单明细
+			</view>
+			<view class="tabs">
+				<view class="tab-item active">全部</view>
+				<view class="tab-item">已付款</view>
+				<view class="tab-item">已完成</view>
+			</view>
+		</view>
+		<view class="order-list">
+			<view class="order-item" v-for="order in orders">
+				<view class="order-head">
+					<view class="factory-name">{{order.factory}}</view>
+					<view v-if="order.status === 0" class="order-status">待付款</view>
+					<view v-if="order.status === 2" class="order-status">待收货</view>
+				</view>
+				<view class="order-info" @tap="openDetails()">
+					<view class="product-item" v-for="product in order.products">
+						<view class="product-image">
+							<image class="image" :src="product.image" mode="scaleToFill"></image>
+						</view>
+						<view class="product-info">
+							<view class="row">
+								<view class="name">{{product.name}}</view>
+								<view class="price">￥{{product.price}}</view>
+							</view>
+							<view class="row">
+								<view class="spec">{{product.specs_name}}</view>
+								<view class="num">×{{product.specs_num}}</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="total-price">
+					总价 <text class="warning">￥{{order.total}}</text>
+				</view>
+				<view class="option">
+					<button v-if="order.status === 0" class="pay-btn" type="default">立即支付</button>
+					<button v-if="order.status === 2" class="confirm-btn" type="default">确认收货</button>
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -10,15 +50,187 @@
 	export default {
 		data() {
 			return {
-				
+				orders: [{
+					factory: '省心一号工厂',
+					products: [{
+						name: '泰国Mistine小黄帽防晒霜',
+						image: 'https://img.alicdn.com/i4/2929053804/O1CN01RSromv1dyHBcuS4I6_!!2929053804.jpg',
+						price: 9.52,
+						specs_name: "白色",
+						specs_num: 5
+					}],
+					status: 2,
+					total: '99.51'
+				}, {
+					factory: '省心二号工厂',
+					products: [{
+							name: '【三只松鼠】元宵送礼坚果礼盒1498g',
+							image: 'https://img.alicdn.com/i4/880734502/O1CN01tA7hal1j7xjnwHQZC_!!880734502.jpg',
+							price: 9.52,
+							specs_name: "白色",
+							specs_num: 5
+						},
+						{
+							name: '泰国Mistine小黄帽防晒霜',
+							image: 'https://img.alicdn.com/i4/2929053804/O1CN01RSromv1dyHBcuS4I6_!!2929053804.jpg',
+							price: 9.52,
+							specs_name: "白色",
+							specs_num: 5
+						}
+					],
+					status: 0,
+					total: '58.51'
+				}]
 			}
 		},
 		methods: {
-			
+			openDetails() {
+				uni.navigateTo({
+					url:"order-details"
+				})
+			}
 		}
 	}
 </script>
 
-<style>
+<style lang="scss">
+	.message {
+		overflow: hidden;
+	}
+
+	.header {
+		margin: 20upx;
+		background: white;
+		text-align: center;
+		border-radius: 20upx;
+
+		.title {
+			height: 100upx;
+			font-size: 30upx;
+			line-height: 100upx;
+			font-weight: bold;
+		}
+
+		.tabs {
+			display: flex;
+			justify-content: space-between;
+
+			.tab-item {
+				flex: 1;
+				padding: 10upx 0;
+				font-size: 28upx;
+				color: #999999;
+
+				&.active {
+					background: $primary-color;
+					color: white;
+					border-radius: 20upx;
+				}
+			}
+		}
+	}
+
+
+	.order-list {
+		.order-item {
+
+			background: white;
+			margin: 20upx;
+			padding: 20upx;
+			border-radius: 20upx;
+
+			.order-head {
+				display: flex;
+				justify-content: space-between;
+				margin-bottom: 20upx;
+
+				.order-status {
+					color: $primary-color;
+					font-size: 24upx;
+				}
+			}
+
+			.factory-name {
+				font-size: 28upx;
+				font-weight: bold;
+			}
+
+			.product-item {
+				display: flex;
+
+				.product-image {
+					width: 120upx;
+					height: 120upx;
+					margin-right: 20upx;
+					margin-top: 10upx;
+
+					.image {
+						width: 120upx;
+						height: 120upx;
+					}
+				}
+
+				.product-info {
+					flex-grow: 1;
+					font-size: 28upx;
+
+					.name {
+						font-size: 28upx;
+						white-space: normal;
+						display: -webkit-box;
+						-webkit-box-orient: vertical;
+						-webkit-line-clamp: 2;
+						overflow: hidden;
+
+					}
+
+					.num {
+						color: #999999;
+					}
+
+					.spec {
+						font-size: 26upx;
+						background: #CCCCCC;
+						color: white;
+						padding: 0 10upx;
+						border-radius: 10upx;
+					}
+				}
+
+				.row {
+					display: flex;
+					justify-content: space-between;
+					margin-bottom: 10upx;
+				}
 
+			}
+
+			.total-price {
+				text-align: right;
+				font-size: 28upx;
+				padding: 10upx 0;
+				.warning {
+					color: $primary-color;
+					font-weight: bold;
+				}
+				
+			}
+
+			.option {
+				text-align: right;
+
+				.pay-btn,
+				.confirm-btn {
+					background: white;
+					border: 2upx solid $primary-color;
+					display: inline-block;
+					line-height: normal;
+					font-size: 28upx;
+					color: $primary-color;
+					border-radius: 40upx;
+					padding: 5upx 10upx;
+				}
+			}
+		}
+	}
 </style>

pages/product/my-product.vue

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

pages/product/product-details.vue

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

pages/product/product-edit.vue

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

pages/shopping-cart/shopping-cart.vue

@@ -1,22 +1,523 @@
 <template>
-	<view>
-		
+	<view class="shopping-cart">
+		<view class="shopping-cart-item">
+			<view class="shopping-cart-item-head">
+				<view class="select"><checkbox class="checkbox" value="cb" checked="true" /></view>
+				<view class="factory-name">省心一号工厂</view>
+			</view>
+			<view class="shopping-cart-info">
+				<view class="product-item">
+									<view class="select"><checkbox class="checkbox" value="cb" checked="true" /></view>
+
+					<view class="product-image">
+						<image class="image" src="https://img.alicdn.com/imgextra/i1/392147177/O1CN01Bh2NP022t7Dv5zazW_!!392147177.jpg"
+						 mode="scaleToFill"></image>
+					</view>
+					<view class="product-info">
+						<view class="row row-1">
+							<text class="title"><text class="sxzg-icon">省心直供</text>白金打开链接分厘卡圣诞节防空雷达数据</text>
+						</view>
+						<view class="row">
+							<view class="spec">白色</view>
+						</view>
+						<view class="row row-2">
+							<text class="org-price">￥2.9</text>
+						</view>
+						<view class="row">
+							<text class="sxj-icon">省心价</text>
+							<text class="price">￥1.99</text>
+						</view>
+					</view>
+					<view class="counter">
+						<view class="sub">－</view>
+						<input class="num" type="text" value="0" />
+						<view class="plus">＋</view>
+					</view>
+				</view>
+				<view class="product-item">
+									<view class="select"><checkbox class="checkbox" value="cb" checked="true" /></view>
+
+					<view class="product-image">
+						<image class="image" src="https://img.alicdn.com/imgextra/i1/392147177/O1CN01Bh2NP022t7Dv5zazW_!!392147177.jpg"
+						 mode="scaleToFill"></image>
+					</view>
+					<view class="product-info">
+						<view class="row row-1">
+							<text class="title"><text class="sxzg-icon">省心直供</text>白金打开链接分厘卡圣诞节防空雷达数据</text>
+						</view>
+						<view class="row">
+							<view class="spec">白色</view>
+						</view>
+						<view class="row row-2">
+							<text class="org-price">￥2.9</text>
+						</view>
+						<view class="row">
+							<text class="sxj-icon">省心价</text>
+							<text class="price">￥1.99</text>
+						</view>
+					</view>
+					<view class="counter">
+						<view class="sub">－</view>
+						<input class="num" type="text" value="0" />
+						<view class="plus">＋</view>
+					</view>
+				</view>
+				<view class="product-item">
+									<view class="select"><checkbox class="checkbox" value="cb" checked="true" /></view>
+
+					<view class="product-image">
+						<image class="image" src="https://img.alicdn.com/imgextra/i1/392147177/O1CN01Bh2NP022t7Dv5zazW_!!392147177.jpg"
+						 mode="scaleToFill"></image>
+					</view>
+					<view class="product-info">
+						<view class="row row-1">
+							<text class="title"><text class="sxzg-icon">省心直供</text>白金打开链接分厘卡圣诞节防空雷达数据</text>
+						</view>
+						<view class="row">
+							<view class="spec">白色</view>
+						</view>
+						<view class="row row-2">
+							<text class="org-price">￥2.9</text>
+						</view>
+						<view class="row">
+							<text class="sxj-icon">省心价</text>
+							<text class="price">￥1.99</text>
+						</view>
+					</view>
+					<view class="counter">
+						<view class="sub">－</view>
+						<input class="num" type="text" value="0" />
+						<view class="plus">＋</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="shopping-cart-item">
+			<view class="shopping-cart-item-head">
+				<view class="checkbox"></view>
+				<view class="factory-name">省心一号工厂</view>
+			</view>
+			<view class="shopping-cart-info">
+				<view class="product-item">
+									<view class="select"><checkbox class="checkbox" value="cb" checked="true" /></view>
+
+					<view class="product-image">
+						<image class="image" src="https://img.alicdn.com/imgextra/i1/392147177/O1CN01Bh2NP022t7Dv5zazW_!!392147177.jpg"
+						 mode="scaleToFill"></image>
+					</view>
+					<view class="product-info">
+						<view class="row row-1">
+							<text class="title"><text class="sxzg-icon">省心直供</text>白金打开链接分厘卡圣诞节防空雷达数据</text>
+						</view>
+						<view class="row">
+							<view class="spec">白色</view>
+						</view>
+						<view class="row row-2">
+							<text class="org-price">￥2.9</text>
+						</view>
+						<view class="row">
+							<text class="sxj-icon">省心价</text>
+							<text class="price">￥1.99</text>
+						</view>
+					</view>
+					<view class="counter">
+						<view class="sub">－</view>
+						<input class="num" type="text" value="0" />
+						<view class="plus">＋</view>
+					</view>
+				</view>
+				<view class="product-item">
+									<view class="select"><checkbox class="checkbox" value="cb" checked="true" /></view>
+
+					<view class="product-image">
+						<image class="image" src="https://img.alicdn.com/imgextra/i1/392147177/O1CN01Bh2NP022t7Dv5zazW_!!392147177.jpg"
+						 mode="scaleToFill"></image>
+					</view>
+					<view class="product-info">
+						<view class="row row-1">
+							<text class="title"><text class="sxzg-icon">省心直供</text>白金打开链接分厘卡圣诞节防空雷达数据</text>
+						</view>
+						<view class="row">
+							<view class="spec">白色</view>
+						</view>
+						<view class="row row-2">
+							<text class="org-price">￥2.9</text>
+						</view>
+						<view class="row">
+							<text class="sxj-icon">省心价</text>
+							<text class="price">￥1.99</text>
+						</view>
+					</view>
+					<view class="counter">
+						<view class="sub">－</view>
+						<input class="num" type="text" value="0" />
+						<view class="plus">＋</view>
+					</view>
+				</view>
+				<view class="product-item">
+									<view class="select"><checkbox class="checkbox" value="cb" checked="true" /></view>
+
+					<view class="product-image">
+						<image class="image" src="https://img.alicdn.com/imgextra/i1/392147177/O1CN01Bh2NP022t7Dv5zazW_!!392147177.jpg"
+						 mode="scaleToFill"></image>
+					</view>
+					<view class="product-info">
+						<view class="row row-1">
+							<text class="title"><text class="sxzg-icon">省心直供</text>白金打开链接分厘卡圣诞节防空雷达数据</text>
+						</view>
+						<view class="row">
+							<view class="spec">白色</view>
+						</view>
+						<view class="row row-2">
+							<text class="org-price">￥2.9</text>
+						</view>
+						<view class="row">
+							<text class="sxj-icon">省心价</text>
+							<text class="price">￥1.99</text>
+						</view>
+					</view>
+					<view class="counter">
+						<view class="sub">－</view>
+						<input class="num" type="text" value="0" />
+						<view class="plus">＋</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="shopping-cart-item">
+			<view class="shopping-cart-item-head">
+				<view class="checkbox"></view>
+				<view class="factory-name">省心一号工厂</view>
+			</view>
+			<view class="shopping-cart-info">
+				<view class="product-item">
+									<view class="select"><checkbox class="checkbox" value="cb" checked="true" /></view>
+
+					<view class="product-image">
+						<image class="image" src="https://img.alicdn.com/imgextra/i1/392147177/O1CN01Bh2NP022t7Dv5zazW_!!392147177.jpg"
+						 mode="scaleToFill"></image>
+					</view>
+					<view class="product-info">
+						<view class="row row-1">
+							<text class="title"><text class="sxzg-icon">省心直供</text>白金打开链接分厘卡圣诞节防空雷达数据</text>
+						</view>
+						<view class="row">
+							<view class="spec">白色</view>
+						</view>
+						<view class="row row-2">
+							<text class="org-price">￥2.9</text>
+						</view>
+						<view class="row">
+							<text class="sxj-icon">省心价</text>
+							<text class="price">￥1.99</text>
+						</view>
+					</view>
+					<view class="counter">
+						<view class="sub">－</view>
+						<input class="num" type="text" value="0" />
+						<view class="plus">＋</view>
+					</view>
+				</view>
+				<view class="product-item">
+									<view class="select"><checkbox class="checkbox" value="cb" checked="true" /></view>
+
+					<view class="product-image">
+						<image class="image" src="https://img.alicdn.com/imgextra/i1/392147177/O1CN01Bh2NP022t7Dv5zazW_!!392147177.jpg"
+						 mode="scaleToFill"></image>
+					</view>
+					<view class="product-info">
+						<view class="row row-1">
+							<text class="title"><text class="sxzg-icon">省心直供</text>白金打开链接分厘卡圣诞节防空雷达数据</text>
+						</view>
+						<view class="row">
+							<view class="spec">白色</view>
+						</view>
+						<view class="row row-2">
+							<text class="org-price">￥2.9</text>
+						</view>
+						<view class="row">
+							<text class="sxj-icon">省心价</text>
+							<text class="price">￥1.99</text>
+						</view>
+					</view>
+					<view class="counter">
+						<view class="sub">－</view>
+						<input class="num" type="text" value="0" />
+						<view class="plus">＋</view>
+					</view>
+				</view>
+				<view class="product-item">
+									<view class="select"><checkbox class="checkbox" value="cb" checked="true" /></view>
+
+					<view class="product-image">
+						<image class="image" src="https://img.alicdn.com/imgextra/i1/392147177/O1CN01Bh2NP022t7Dv5zazW_!!392147177.jpg"
+						 mode="scaleToFill"></image>
+					</view>
+					<view class="product-info">
+						<view class="row row-1">
+							<text class="title"><text class="sxzg-icon">省心直供</text>白金打开链接分厘卡圣诞节防空雷达数据</text>
+						</view>
+						<view class="row">
+							<view class="spec">白色</view>
+						</view>
+						<view class="row row-2">
+							<text class="org-price">￥2.9</text>
+						</view>
+						<view class="row">
+							<text class="sxj-icon">省心价</text>
+							<text class="price">￥1.99</text>
+						</view>
+					</view>
+					<view class="counter">
+						<view class="sub">－</view>
+						<input class="num" type="text" value="0" />
+						<view class="plus">＋</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="footer">
+			<view class="select-all">
+				<label>
+					<checkbox color="#ff5d5b" class="checkbox" value="cb" checked="true" />全选
+				</label>
+			</view>
+			<view class="total">合计 <text>￥26.26</text></view>
+			<view class="settlement"><button class="settlement-btn" type="default">结算</button></view>
+		</view>
 	</view>
+
 </template>
 
 <script>
 	export default {
 		data() {
 			return {
-				
+
 			}
 		},
 		methods: {
-			
+
 		}
 	}
 </script>
 
 <style lang="scss">
+	.shopping-cart {
+		padding-bottom: 80upx;
+		overflow: hidden;
+		position: relative;
+	}
+
+	.shopping-cart-item {
+		padding: 20upx;
+		background: white;
+		// padding-left: 100upx;
+		margin: 20upx;
+		border-radius: 20upx;
+
+		.shopping-cart-item-head {
+			margin-bottom: 20upx;
+			font-size: 28upx;
+			font-weight: bold;
+			position: relative;
+			display: flex;
+		
+
+		}
+		.select{			
+			align-self: center;
+			position: relative;
+			margin-top: -4upx;
+			margin-right: 20upx;
+		}
+		.checkbox {
+			transform: scale(0.7);
+			/deep/ .uni-checkbox-input{
+				border: 2upx solid #CCCCCC;
+				&.uni-checkbox-input-checked{
+					color: $primary-color!important;
+				}
+			}
+
+			/deep/ .uni-checkbox-input:hover{
+				border: 2upx solid #CCCCCC;
+			}
+		}
+
+		.product-item {
+			display: flex;
+			position: relative;
+			margin-bottom: 20upx;
+
+			.checkbox::before {
+				top: 70upx;
+			}
+
+
+			.product-image {
+				margin-right: 20upx;
+
+				.image {
+					width: 180upx;
+					height: 180upx;
+					margin-top: 5upx;
+				}
+			}
+
+			.title {
+				font-size: 24rpx;
+				display: inline-block;
+				white-space: normal;
+				display: -webkit-box;
+				-webkit-box-orient: vertical;
+				-webkit-line-clamp: 2;
+				overflow: hidden;
+				height: 80upx;
+
+			}
 
+			.spec {
+				font-size: 22upx;
+				background: #CCCCCC;
+				color: white;
+				padding: 0 5upx;
+				border-radius: 10upx;
+
+				// display: inline-block;
+
+			}
+
+			.counter {
+				position: absolute;
+				bottom: 10upx;
+				right: 10upx;
+				display: flex;
+
+				border: 2upx solid #CCCCCC;
+				font-size: 28upx;
+				align-items: center;
+				border-radius: 10upx;
+
+				.sub,
+				.plus {
+					// transform: scale(0.5);
+					font-weight: 0;
+					width: 42upx;
+					text-align: center;
+
+					&:active {
+						background: rgba(0, 0, 0, .1);
+					}
+				}
+
+				.num {
+					text-align: center;
+					font-size: 24upx;
+					border-left: 2upx solid #EEEEEE;
+					border-right: 2upx solid #EEEEEE;
+					width: 50upx;
+				}
+			}
+		}
+
+	}
+
+	.sxzg-icon {
+		color: $primary-color;
+		font-size: 16rpx;
+		width: 80rpx;
+		text-align: center;
+		line-height: normal;
+		border: 2rpx solid $primary-color;
+		border-radius: 20rpx;
+		display: inline-block;
+		position: relative;
+		top: -4rpx;
+		margin-right: 10upx;
+		// transform: scale(0.9);
+	}
+
+	.sxj-icon {
+		background: $primary-color;
+		color: white;
+		font-size: 20upx;
+		padding: 0 5upx;
+		border-radius: 5upx;
+		vertical-align: middle;
+	}
+
+	.row {
+		display: flex;
+		align-items: center;
+	}
+
+	.org-price {
+		text-decoration: line-through;
+		font-size: 26rpx;
+		color: #cccccc;
+	}
+
+	.price {
+		font-size: 26rpx;
+		color: $primary-color;
+		font-weight: bold;
+	}
+
+	.footer {
+		display: flex;
+		position: fixed;
+		height: 100upx;
+		background: $primary-color;
+		bottom: 0;
+		width: 100%;
+		box-shadow: 0 0 10upx #999999;
+		align-items: center;
+		/* #ifdef H5 */
+		bottom: 100upx;
+		/* #endif */
+		color: white;
+
+		.select-all {
+			width: 200upx;
+			flex: 0 0 200upx;
+			position: relative;
+			margin-left: 20upx;
+
+			.checkbox {
+				transform: scale(0.7);
+				position: relative;
+				top:-4upx
+			}
+			/deep/ .uni-checkbox-input{
+				border: none;
+			}
+			/deep/ .uni-checkbox-input:hover{
+				border: none;
+			}
+		}
+
+		.total {
+			flex-grow: 1;
+			text-align: right;
+		}
+
+		.settlement {
+			flex-grow: 0;
+			text-align: right;
+			margin: 0 20upx;
+		}
+
+		.settlement-btn {
+			background: #ffa82e;
+			padding: 15upx 60upx;
+			color: white;
+			line-height: normal;
+			font-size: 32upx;
+			border-radius: 50upx;
+		}
+	}
 </style>

pages/user/kefu.vue

@@ -0,0 +1,79 @@
+<template>
+	<view class="kefu">
+		<view class="header-bg">
+			
+		</view>
+		<view class="main">
+			<view class="title">
+				联系客服
+			</view>
+			<view class="qrcode">
+				<image class="image" src="" mode=""></image>
+			</view>
+			<view class="wxgzh" style="margin-top: 60upx;">省心直供官方微信公众号</view>
+			<view class="save" style="margin-top: 50upx;"><button class="save-btn" type="default">保存二维码到手机</button></view>
+			<view class="online-time" style="margin-top: 50upx;">客服在线时间:周一至周六8:30-12:00</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.kefu{
+		position: relative;
+		overflow: hidden;
+	}
+	.header-bg{
+		background: $primary-color;
+		height: 100upx;
+		position: absolute;
+		top: 0;
+		width: 100%;
+	}
+	.main{
+		text-align: center;
+		background: white;
+		position: relative;
+		z-index: 1;
+		margin: 20upx;
+		border-radius: 20upx;
+		height: 90vh;
+	}
+	.title{
+		font-size: 32upx;
+		font-weight: bold;
+		padding: 20upx;
+	}
+	.qrcode{
+		margin-top: 100upx;
+		
+		.image{
+			background: #EEEEEE;
+			width: 240upx;
+			height: 240upx;
+		}
+	}
+	.save-btn{
+		width: 320upx;
+		font-size: 28upx;
+		background: $primary-color;
+		color: white;
+	}
+	.wxgzh,.online-time{
+		font-size: 28upx;
+		color: #999999;
+		
+	}
+</style>

pages/user/notice.vue

@@ -0,0 +1,79 @@
+<template>
+	<view>
+		<view class="header">
+			<view class="title">
+				官方公告
+			</view>
+
+		</view>
+		<view class="notice-list">
+			<view>
+				<view class="time">
+					2021-07-02 11:25
+				</view>
+				<view class="notice-item">
+					<view class="title">省心直供APP公告<uni-icons type="sound-filled" style="margin-left: 10upx;"></uni-icons>
+					</view>
+					<view class="content">亲爱的用户 目前APP还在测试阶段有任何使用问题请联系客服处理，如有不便请见谅！</view>
+				</view>
+			</view>
+		</view>
+	</view>
+
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.header {
+		margin: 20upx;
+		background: white;
+		text-align: center;
+		border-radius: 20upx;
+
+		.title {
+			height: 100upx;
+			font-size: 32upx;
+			line-height: 100upx;
+			font-weight: bold;
+		}
+	}
+
+	.notice-list {
+
+		.time {
+			text-align: center;
+			font-size: 24upx;
+			color: #999999;
+		}
+
+		.notice-item {		
+			border-radius: 10upx;
+			margin: 20upx;
+			background: white;
+			padding: 20upx;
+
+			.title {
+				font-size: 28upx;
+				padding-bottom: 20upx;
+				// border-bottom: 2upx solid #EEEEEE;
+			}
+
+			.content {
+				// margin-top: 20upx;
+				font-size: 26upx;
+			}
+		}
+	}
+</style>

pages/user/problem.vue

@@ -0,0 +1,120 @@
+<template>
+	<view>
+		<view class="header">
+			<view class="title">
+				常见问题解答
+			</view>
+
+		</view>
+		<view class="problem-list">
+
+			<view class="problem-item" v-for="problem in problems">
+				<view class="title">
+					{{problem.title}}
+				</view>
+				<view class="content" v-html="problem.content">
+					
+				</view>
+			</view>
+
+		</view>
+	</view>
+
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				problems: [{
+					title: '1.为什么已确认收货的订单失效了？',
+					content: '答：这个问题是因为维权订单，买家确认收货后去申请了售后退款，订单退款后就属于失效订单了。',
+				}, {
+					title: '2.为什么有些订单有笔数但是没有佣金显示？',
+					content: '答：因为没显示佣金的订单都为失效订单，APP管理系统在统计时是自动统计。统计里面的数据包含了失效订单。',
+				}, {
+					title: '3.什么时候可以提现？',
+					content: '答：每个月的月底已结算的佣金收入，会显示在个人中心的可提现金额中。    可提前金额中的金额都是可以直接提现的。',
+				}, {
+					title: '4.为什么点击领取优惠券提示优惠券已失效？',
+					content: '答：1.优惠券已经被领取完了。2.商家已经取消了宝贝的优惠券。',
+				}, {
+					title: '5.同一商品优惠券可以多次领取吗？',
+					content: '答：优惠券的领取次数是由商家设定，具体次数以自己去点击领取的次数为准。',
+				}, {
+					title: '6.怎么分享推广商品？',
+					content: '答：进入商品详情页后点击宝贝主图下方的“分享”或者是点击最下方菜单栏的“分享”，进入分享的页面。只要是用户购买了你分享',
+				}, {
+					title: '7.怎么邀请注册？',
+					content: '答：进入个人中心找到“邀请”点击进入页面，页面内的推广海报都是您的专    属二维码推广海报包含了你的邀请码。分享给好友扫描，',
+				}, {
+					title: '8.怎么样提现？',
+					content: '答：可提现金额大于1元就可进行提现，提前绑定您的支付宝账号及实名信    息，提交好后即可提交提现申请。500元以下提现金额2小时内到账，500元以上提现金额需要后台人工审核48小时后到账。',
+				}, {
+					title: '9.提现后一直没到账？',
+					content: '答：1.APP后台系统设置的支付宝账号跟实名信息不一致，造成无法正常提现。2.支付宝如果是手机号码，并手机号码绑定了多个支付宝，请确定提交的支付宝是否对应。',
+				}, {
+					title: '10.为什么付款后的订单没有佣金？',
+					content: `答：
+								  1.买家使用了农村淘宝APP，一淘，集分宝 ，返利网。<br>
+								  2.买家使用了收藏夹或加入了购物车后，再购买。<br>
+								  3.买家使用了支付宝红包，淘金币等。<br>
+								  4.买家手机或被安装了一些流氓软件，劫持了PID。<br>
+								  5.买家网络所使用的DNS被污染，劫持了PID。<br>
+								  6.买家所在地区宽带服务运营商劫持了PID。<br>
+								  7.商家联系买家 拍另外一个没佣金链接。<br>
+								  8.买家切换了别的旺旺下单或找别的淘客转化了链接。<br>
+								  9.淘宝数据同步到app系统需要15分钟左右，即可查看到订单和佣金`,
+				}, ]
+			}
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.header {
+		margin: 20upx;
+		background: white;
+		text-align: center;
+		border-radius: 20upx;
+
+		.title {
+			height: 100upx;
+			font-size: 32upx;
+			line-height: 100upx;
+			font-weight: bold;
+		}
+	}
+
+	.problem-list {
+
+
+		.problem-item {
+			border-radius: 10upx;
+			margin: 20upx;
+			background: white;
+			padding: 20upx;
+			overflow: hidden;
+
+			.image {
+				width: 710upx;
+				height: 302upx;
+
+			}
+
+			.title {
+				font-size: 28upx;
+				color: $primary-color;
+			}
+
+			.content {
+				font-size: 28upx;
+				margin-top: 10upx;
+				color: #999999;
+			}
+		}
+	}
+</style>

pages/user/setting.vue

@@ -47,7 +47,9 @@
 		</view>
 		
 		<view class="logout-block">
-			<button class="logout-btn" type="default">退出登录</button>
+			<navigator url="/pages/user/login" open-type="navigate">
+				<button class="logout-btn" type="default">退出登录</button>
+			</navigator>
 		</view>
 	</view>
 </template>

pages/user/strategy.vue

@@ -0,0 +1,76 @@
+<template>
+	<view>
+		<view class="header">
+			<view class="title">
+				新手攻略
+			</view>
+
+		</view>
+		<view class="strategy-list">
+
+			<view class="strategy-item">
+				<view>
+					<image class="image" src="../../static/images/material/s1.jpg" mode="scaleToFill"></image>
+				</view>
+				<view class="title">
+					怎样参加砍价活动？
+				</view>
+			</view>
+
+		</view>
+	</view>
+
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.header {
+		margin: 20upx;
+		background: white;
+		text-align: center;
+		border-radius: 20upx;
+
+		.title {
+			height: 100upx;
+			font-size: 32upx;
+			line-height: 100upx;
+			font-weight: bold;
+		}
+	}
+
+	.strategy-list {
+
+
+		.strategy-item {
+			border-radius: 10upx;
+			margin: 20upx;
+			background: white;
+			// padding: 20upx;
+			overflow: hidden;
+
+			.image {
+				width: 710upx;
+				height: 302upx;
+
+			}
+
+			.title {
+				padding: 20upx;
+				padding-top: 15upx;
+				font-size: 28upx;
+			}
+		}
+	}
+</style>

pages/user/user-center.vue

@@ -46,10 +46,12 @@
 					<view class="name">账单明细</view>
 				</view>
 				<view class="menu-item">
-					<view class="icon">
-						<image class="image" src="../../static/images/menu/b7.png" mode=""></image>
-					</view>
-					<view class="name">订单管理</view>
+					<navigator url="/pages/order/order" open-type="navigate">
+						<view class="icon">
+							<image class="image" src="../../static/images/menu/b7.png" mode=""></image>
+						</view>
+						<view class="name">订单管理</view>
+					</navigator>
 				</view>
 				<view>
 					<view class="icon">
@@ -58,30 +60,38 @@
 					<view class="name">我的商品</view>
 				</view>
 				<view>
-					<view class="icon">
-						<image class="image" src="../../static/images/menu/b1.png" mode=""></image>
-					</view>
-					<view class="name">新手攻略</view>
+					<navigator url="/pages/user/notice" open-type="navigate">
+						<view class="icon">
+							<image class="image" src="../../static/images/menu/b1.png" mode=""></image>
+						</view>
+						<view class="name">新手攻略</view>
+					</navigator>
 				</view>
 			</view>
 			<view class="menu">
 				<view>
+					<navigator url="/pages/user/problem" open-type="navigate">
 					<view class="icon">
 						<image class="image" src="../../static/images/menu/b3.png" mode=""></image>
 					</view>
 					<view class="name">常见问题</view>
+					</navigator>
 				</view>
 				<view>
+					<navigator url="/pages/user/kefu" open-type="navigate">
 					<view class="icon">
 						<image class="image" src="../../static/images/menu/b4.png" mode=""></image>
 					</view>
 					<view class="name">联系客服</view>
+					</navigator>
 				</view>
 				<view>
-					<view class="icon">
-						<image class="image" src="../../static/images/menu/b5.png" mode=""></image>
-					</view>
-					<view class="name">官方公告</view>
+					<navigator url="/pages/user/notice" open-type="navigate">
+						<view class="icon">
+							<image class="image" src="../../static/images/menu/b5.png" mode=""></image>
+						</view>
+						<view class="name">官方公告</view>
+					</navigator>
 				</view>
 				<view>
 					<view class="icon">
@@ -113,6 +123,9 @@
 					});
 					break;
 				case 1:
+					uni.navigateTo({
+						url: '/pages/message/message'
+					});
 					break;
 				default:
 					break;