添加图标及目录页面

pages.json

@@ -32,12 +32,51 @@
                 "enablePullDownRefresh": false
             }
             
-        }		
+        },
+		{
+		    "path" : "pages/index/activity/activity",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "活动记录",
+		        "enablePullDownRefresh": false
+		    }
+		    
+		},
+		{
+		    "path" : "pages/index/honor/honor",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "荣誉殿堂",
+		        "enablePullDownRefresh": false
+		    }
+		    
+		}
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "农工笔记",
 		"navigationBarBackgroundColor": "#F8F8F8",
 		"backgroundColor": "#F8F8F8"
+	},
+	"tabBar": {
+		"list": [{
+				"pagePath": "pages/index/activity/activity",
+				"iconPath": "/static/tabbar/activity.png",
+				"selectedIconPath": "/static/tabbar/activty-ed.png",
+				"text": "活动记录"
+			},
+			{
+				"pagePath": "pages/index/honor/honor",
+				"iconPath": "/static/tabbar/honer.png",
+				"selectedIconPath": "/static/tabbar/honer-ed.png",
+				"text": "荣誉殿堂"
+			},
+			{
+				"pagePath": "pages/index/index",
+				"iconPath": "/static/tabbar/self.png",
+				"selectedIconPath": "/static/tabbar/self-ed.png",
+				"text": "个人中心"
+			}
+		]
 	}
 }

pages/index/activity/activity.vue

@@ -0,0 +1,94 @@
+<template>
+  <view class="content">
+     活动记录
+  </view>
+</template>
+
+
+<script>
+import md5 from "@/common/md5.js";
+export default {
+  data() {
+    return {
+      id: "",
+      details: "",
+      imageList: [],
+      time: "",
+	  globalUrl:getApp().globalData.shareUrl,
+	  pageList:[
+
+	  ]
+    };
+  },
+  onLoad() {
+   
+  },
+  methods: {
+
+
+  },
+};
+</script>
+<style lang="scss" scoped>
+.flex-box {
+  display: flex;
+  flex-wrap: wrap;
+  width: 100%;
+}
+.view {
+  display: flex;
+}
+.content {
+  font-size: 32rpx;
+  .title {
+    margin: 4% 5%;
+  }
+  .details {
+    font-size: 28rpx;
+    width: 90%;
+    margin: 0 2%;
+    padding: 2% 3%;
+	border-bottom: 3px solid #f2f2f2;
+    // border-radius: 50rpx;
+    // box-shadow: rgba(100, 100, 111, 0.2) 0rpx 14rpx 50rpx 14rpx;
+    image {
+      width: 180rpx;
+      height: 150rpx;
+      border-radius: 30rpx;
+      margin: 0 2%;
+    }
+    .view {
+      margin: 3% 0;
+    }
+    .label {
+      display: inline-block;
+      width:150rpx;
+      vertical-align: middle;
+      margin-right: 10rpx;
+    }
+  }
+  .info {
+    font-size: 28rpx;
+    width: 90%;
+    margin: 4% 2%;
+    padding: 2% 3%;
+    border-radius: 40rpx;
+    box-shadow: rgba(100, 100, 111, 0.2) 0rpx 14rpx 50rpx 14rpx;
+    .title {
+      margin: 4% 0;
+      font-size: 32rpx;
+    }
+    .view {
+      display: flex;
+      align-items: center;
+      margin: 5% 0;
+    }
+    .label {
+      display: inline-block;
+      width: 150rpx;
+      vertical-align: middle;
+      margin-right: 10rpx;
+    }
+  }
+}
+</style>

pages/index/honor/honor.vue

@@ -0,0 +1,94 @@
+<template>
+  <view class="content">
+     荣誉殿堂
+  </view>
+</template>
+
+
+<script>
+import md5 from "@/common/md5.js";
+export default {
+  data() {
+    return {
+      id: "",
+      details: "",
+      imageList: [],
+      time: "",
+	  globalUrl:getApp().globalData.shareUrl,
+	  pageList:[
+
+	  ]
+    };
+  },
+  onLoad() {
+   
+  },
+  methods: {
+
+
+  },
+};
+</script>
+<style lang="scss" scoped>
+.flex-box {
+  display: flex;
+  flex-wrap: wrap;
+  width: 100%;
+}
+.view {
+  display: flex;
+}
+.content {
+  font-size: 32rpx;
+  .title {
+    margin: 4% 5%;
+  }
+  .details {
+    font-size: 28rpx;
+    width: 90%;
+    margin: 0 2%;
+    padding: 2% 3%;
+	border-bottom: 3px solid #f2f2f2;
+    // border-radius: 50rpx;
+    // box-shadow: rgba(100, 100, 111, 0.2) 0rpx 14rpx 50rpx 14rpx;
+    image {
+      width: 180rpx;
+      height: 150rpx;
+      border-radius: 30rpx;
+      margin: 0 2%;
+    }
+    .view {
+      margin: 3% 0;
+    }
+    .label {
+      display: inline-block;
+      width:150rpx;
+      vertical-align: middle;
+      margin-right: 10rpx;
+    }
+  }
+  .info {
+    font-size: 28rpx;
+    width: 90%;
+    margin: 4% 2%;
+    padding: 2% 3%;
+    border-radius: 40rpx;
+    box-shadow: rgba(100, 100, 111, 0.2) 0rpx 14rpx 50rpx 14rpx;
+    .title {
+      margin: 4% 0;
+      font-size: 32rpx;
+    }
+    .view {
+      display: flex;
+      align-items: center;
+      margin: 5% 0;
+    }
+    .label {
+      display: inline-block;
+      width: 150rpx;
+      vertical-align: middle;
+      margin-right: 10rpx;
+    }
+  }
+}
+</style>

pages/index/index.vue

@@ -21,7 +21,7 @@
         </div>
       </div>
     </div>
-     <button class="submit-btn" @click="goUpload()">上传</button>
+     <!-- <button class="submit-btn" @click="goUpload()">上传</button> -->
   </view>
 </template>
 
@@ -41,17 +41,41 @@ export default {
 		 icon: "/static/upload.png",
 		 name: "内容上传" ,
 		 url: "/pages/index/upload/upload",
-		 isShow:true,
+		 isShow:false,
 		 },
         { 
 		  icon: "/static/sign.png", 
 		  name: "发布记录" ,
 		  url: "/pages/index/record/record",
-		  isShow:true,
+		  isShow:false,
 		 },
 		 {
 		   icon: "/static/scan.png", 
-		   name: "扫一扫" ,
+		   name: "扫码" ,
+		   // url: "/pages/index/scanCode/index",
+		   isShow:true,
+		  },
+		{
+		  icon: "/static/self-icon.png", 
+		  name: "个人信息" ,
+		 // url: "/pages/",
+		  isShow:true,
+		 },
+		 {
+		   icon: "/static/org-icon.png", 
+		   name: "组织成员" ,
+		   // url: "/pages/index/scanCode/index",
+		   isShow:true,
+		  },
+		{
+		  icon: "/static/explain-icon.png", 
+		  name: "后台说明" ,
+		 // url: "/pages/index/record/record",
+		  isShow:true,
+		 },
+		 {
+		   icon: "/static/back.png",
+		   name: "退出登录" ,
 		   // url: "/pages/index/scanCode/index",
 		   isShow:true,
 		  },
@@ -260,7 +284,7 @@ export default {
     height: 360rpx;
     width: 100%;
     display: flex;
-    margin-bottom: 80rpx;
+    // margin-bottom: 80rpx;
 	background-color: #c2e3e6;
     // border-radius: 0rpx 0rpx 100% 100%;
     .img-name-box {
@@ -301,17 +325,17 @@ export default {
     }
   }
   .options {
-    padding: 70rpx;
+    padding: 0 70rpx 0 70rpx;
     z-index: 99;
     position: relative;
-    top: -270rpx;
+    top: -100rpx;
     .options-item {
       background-color: #fff;
       display: flex;
       box-shadow: 0px 4rpx 32rpx rgba(0, 0, 0, 0.1);
       border-radius: 32rpx;
-      margin-top: 20px;
-      height: 150rpx;
+      margin-top: 30rpx;
+      height: 75px;
       align-items: center;
       .img-box {
         margin-left: 40rpx;