样式修改

components/timeSelect/timeSelect.vue

@@ -103,7 +103,7 @@ export default {
 	}
 	.timeBOx{
 		width: 750rpx;
-		height: 50vh;
+		height: 55vh;
 		background: #fff;
 		position: fixed;
 		bottom: 0;
@@ -177,7 +177,7 @@ export default {
 	    flex-wrap: wrap;
 	    align-items:baseline;
 	    background-color: rgb(255, 255, 255);
-	    height:calc(50vh - 80rpx);
+	    height:calc(50vh - 100rpx);
 		    overflow-y: auto;
 	    .time-select-popup-body-time-ltem{
 	      width: 33.3% ;

pages.json

@@ -67,7 +67,25 @@
                 "enablePullDownRefresh": false
             }
             
-        }
+        },
+		{
+		    "path" : "pages/shop/shop",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "商城",
+		        "enablePullDownRefresh": false
+		    }
+		    
+		},
+		{
+		    "path" : "pages/activity/activity",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "活动",
+		        "enablePullDownRefresh": false
+		    }
+		    
+		}
     ],
 	"tabBar": {
 		"color": "#8a8a8a",
@@ -76,16 +94,26 @@
 		"backgroundColor": "#ffffff",
 		"list": [{
 				"pagePath": "pages/index/index",
-				// "iconPath": "static/img/table_icon_homepage1.png",
-				// "selectedIconPath": "static/img/table_icon_homepage2.png",
+				"iconPath": "./static/tabimg/index2.png",
+				"selectedIconPath": "./static/tabimg/index1.png",
 				"text": "首页"
 			},
-	
-	
+	        {
+	        	"pagePath": "pages/shop/shop",
+	        	"iconPath": "./static/tabimg/shop2.png",
+	        	"selectedIconPath": "./static/tabimg/shop1.png",
+	        	"text": "商城"
+	        },
+	        {
+	        	"pagePath": "pages/activity/activity",
+	        	"iconPath": "./static/tabimg/activity2.png",
+	        	"selectedIconPath": "./static/tabimg/activity1.png",
+	        	"text": "活动"
+	        },
 			{
 				"pagePath": "pages/user/user",
-				// "iconPath": "static/img/tabme1.png",
-				// "selectedIconPath": "static/img/tabme2.png",
+				"iconPath": "./static/tabimg/me2.png",
+				"selectedIconPath": "./static/tabimg/me1.png",
 				"text": "我的"
 			}
 	

pages/activity/activity.vue

@@ -0,0 +1,38 @@
+<template>
+<view class="box">
+	<view>集客活动</view>
+</view>
+</template>
+
+<script>
+	
+	export default {
+		components: {
+			
+		},
+		
+		data() {
+			return {
+				userInfo:'',
+			}
+		},
+		onLoad() {
+			
+			this.userInfo = uni.getStorageSync("userInfo");
+			//this.getOrderTimes()
+		},
+		
+		methods: {
+			
+			
+		}
+	}
+</script>
+
+<style scoped lang="less">
+.box{
+	background: #F4F5F7;
+	min-height: 100vh;
+}
+
+</style>

pages/index/index.vue

@@ -1,8 +1,7 @@
 <template>
 	<view class="content">
-		<image class="logo" src="/static/logo.png"  @click="wxgologin"></image>
 		
-		<view >shopId:{{shopId}}</view>
+		<view @getphonenumber="decryptPhoneNumber" >shopId:{{shopId}}</view>
 		<view>
 			url:{{url}}
 		</view>

pages/shop/shop.vue

@@ -0,0 +1,38 @@
+<template>
+<view class="box">
+	<view>商城</view>
+</view>
+</template>
+
+<script>
+	
+	export default {
+		components: {
+			
+		},
+		
+		data() {
+			return {
+				userInfo:'',
+			}
+		},
+		onLoad() {
+			
+			this.userInfo = uni.getStorageSync("userInfo");
+			//this.getOrderTimes()
+		},
+		
+		methods: {
+			
+			
+		}
+	}
+</script>
+
+<style scoped lang="less">
+.box{
+	background: #F4F5F7;
+	min-height: 100vh;
+}
+
+</style>