首页、已订阅产品

pages.json

@@ -1,5 +1,13 @@
 {
 	"pages": [
+		{
+            "path" : "pages/clients/clients",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "客户列表",
+                "enablePullDownRefresh": true
+            }
+        },
 		{
 			"path": "pages/index/index",
 			"style": {
@@ -13,14 +21,6 @@
                 "navigationBarTitleText": "登录",
                 "enablePullDownRefresh": false
             }
-        },
-		{
-            "path" : "pages/clients/clients",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "客户列表",
-                "enablePullDownRefresh": true
-            }
         },
         {
             "path" : "pages/invite/invite",

pages/index/index.vue

@@ -1,9 +1,24 @@
 <template>
-	<view class="container">
+	<view class="page">
-		<button class="confirm-btn" @click="login1">微信授权登录</button>
+		<image class="banner" src="../../static/image/index/index1.png" mode="widthFix"></image>
-		<view class="v">
+		<ul class="entry">
-			{{text}}
+			<li @click="$util.to('../clients/clients')">
-		</view>	
+				<image class="icon" src="../../static/image/index/index3.png" mode="widthFix"></image>
+				<view class="text">客户</view>
+			</li>
+			<li @click="$util.to('../plans/plans')">
+				<image class="icon" src="../../static/image/index/index4.png" mode="widthFix"></image>
+				<view class="text">方案</view>
+			</li>
+			<li @click="$util.to('../orders/orders')">
+				<image class="icon" src="../../static/image/index/index5.png" mode="widthFix"></image>
+				<view class="text">订单</view>
+			</li>
+			<li>
+				<image class="icon" src="../../static/image/index/index6.png" mode="widthFix"></image>
+				<view class="text">产品</view>
+			</li>
+		</ul>
 	</view>
 </template>
 
@@ -37,9 +52,27 @@
 	}
 </script>
 
-<style>
+<style scoped lang="scss">
-.v {
+.page {
-	white-space: normal;
+	min-height: 100%;
-	word-wrap: break-word;
+	padding: 30rpx 22rpx;
+	background: url(../../static/image/index/index2.png) 0 0/100% 100% no-repeat;
+}
+.banner {
+	width: 100%;
+}
+.entry {
+	display: flex;
+	justify-content: space-around;
+	align-items: center;
+	margin-top: 10rpx;
+	text-align: center;
+	.icon {
+		width: 78rpx;
+	}
+	.text {
+		font-size: 28rpx;
+		color: #333;
+	}
 }
 </style>

pages/ordered/ordered.vue

@@ -14,17 +14,23 @@
 		
 		<ul class="list">
 			<li v-for="item in list" @click="toDetail">
-				<view class="line thead">
+				<view class="pro-name">
-					<view class="text">产品名称</view>
+					<image class="icon" src="../../static/image/course1.png" mode="widthFix"></image>
-					<view class="text">起止日期</view>
+					{{ item.productName }}
-					<view class="text">订阅状态</view>
-					<view class="text">产品状态</view>
 				</view>
-				<view class="line tbody">
+				<view class="info">
-					<view class="text">{{ item.productName }}</view>
+					<view class="line">
-					<view class="text">{{ item.startAndEndTime }}</view>
+						<text class="name">起止日期：</text>
-					<view class="text uni-success">{{ item.status }}</view>
+						<text class="val">{{ item.startAndEndTime }}</text>
-					<view class="text uni-error">{{ item.isEnable }}</view>
+					</view>
+					<view class="line">
+						<text class="name">订阅状态：</text>
+						<text class="val">{{ item.status }}</text>
+					</view>
+					<view class="line">
+						<text class="name">产品状态：</text>
+						<text class="val">{{ item.isEnable }}</text>
+					</view>
 				</view>
 			</li>
 		</ul>
@@ -225,31 +231,39 @@
 	margin-bottom: 10px;
 }
 .list {
-	background-color: #fff;
 	li {
-		padding: 20px;
+		padding: 0 24rpx;
-		border-bottom: 2px solid #f8f8f8;
+		margin: 16rpx 24rpx;
+		background-color: #fff;
+		border-radius: 16rpx;
+	}
+	.pro-name {
+		display: flex;
+		align-items: center;
+		padding: 18rpx 0;
+		font-size: 30rpx;
+		color: #333;
+		border-bottom: 1px solid #E6E8ED;
+		.icon {
+			width: 52rpx;
+			margin-right: 20rpx;
+		}
+	}
+	.info {
+		padding: 12rpx 0;
 	}
 	.line {
 		display: flex;
-		justify-content: space-between;
+		padding: 12rpx 0;
-		margin-bottom: 10px;
 	}
-	.text {
+	.name {
-		width: 30%;
+		margin-right: 10rpx;
-		font-size: 14px;
+		font-size: 28rpx;
-		&:first-child {
+		color: #999;
-			margin-right: 10px;
-		}
-		&:nth-child(3), &:last-child {
-			width: 20%;
-			text-align: center;
-		}
 	}
-	.thead {
+	.val {
-		.text {
+		font-size: 28rpx;
-			color: #767676;
+		color: #333;
-		}
 	}
 }
 </style>

styles/common.scss

@@ -66,13 +66,12 @@ page {
 .tab {
 	display: flex;
 	justify-content: space-around;
-	padding: 10px;
 	margin-bottom: 10px;
 	background-color: #fff;
 	li {
-		padding: 0 4px;
+		padding: 0 10px;
 		font-size: 14px;
-		line-height: 30px;
+		line-height: 50px;
 		border-bottom: 3px solid transparent;
 	}
 	.active {