commit -m 维沙

pages.json

@@ -1,6 +1,13 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
+			"path": "pages/tabBar/user/user",
+			"style": {
+				"navigationBarTitleText": "我的",
+				"enablePullDownRefresh" : true,
+				"navigationStyle":"custom"
+			}
+		},{
 			"path": "pages/authorization/authorization",
 			"style": {
 				"navigationBarTitleText": "微信授权",
@@ -25,13 +32,6 @@
 				"navigationBarTitleText": "购物车",
 				"enablePullDownRefresh":true
 			}
-		},{
-			"path": "pages/tabBar/user/user",
-			"style": {
-				"navigationBarTitleText": "我的",
-				"enablePullDownRefresh" : true,
-				"navigationStyle":"custom"
-			}
 		}
     ],
 	"subPackages": [
@@ -374,7 +374,20 @@
 		"selectedColor": "#E15616",
 		"borderStyle": "black",
 		"backgroundColor": "#ffffff",
-		"list": []
+		"list": [
+				{
+					"pagePath": "pages/tabBar/home/index",
+					"iconPath": "static/icon-home@3x.png",
+					"selectedIconPath": "static/icon-home-active@3x.png",
+					"text": "商城"
+				},
+				{
+					"pagePath": "pages/tabBar/cart/cart",
+					"iconPath": "static/icon-cart@3x.png",
+					"selectedIconPath": "static/icon-cart-active@3x.png",
+					"text": "购物车"
+				}
+		]
 	},
 	"easycom": {
 		"autoscan": true,

pages/tabBar/user/user.vue

@@ -100,9 +100,6 @@
 			</view>
 			<!-- 底部跳转 -->
 			<view class="foot-list">
-				<view class="list-cell-avtiv" @click="navigator('/pages/user/coupon/coupon')">
-					<image src="http://static.caimei365.com/app/meibohui/meibo_coupon_03.png" mode=""></image>
-				</view>
 				<view class="list-cell-item" v-show="hasLogin">
 					<view class="list-cell" v-show="userIdentity == 4" @click="navigator(`/pages/login/apply?clubStatus=${clubStatus}`)" hover-class="cell-hover" :hover-stay-time="50">
 						<text class="cell-icon"><text class="iconfont icon-shengjihuiyuanjigou"></text></text>
@@ -609,16 +606,6 @@
 		padding: 0 24rpx;
 		padding-top: 160rpx;
 	}	
-	.list-cell-avtiv{
-		width: 702rpx;
-		height: 240rpx;
-		margin-bottom: 24rpx;
-		image{
-			width: 100%;
-			height: 100%;
-			display: block;
-		}
-	}
 	.list-cell-item{
 		width: 654rpx;
 		height: auto;