Merge branch 'master' of http://172.16.90.201:3000/veterans/veterans_H5

h5_web/manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "退役军人服务",
-    "appid" : "__UNI__EB85FC7",
+    "appid" : "__UNI__A65B10D",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",

h5_web/pages/index/index.vue

@@ -97,10 +97,21 @@
 				</view>
 			</view>
 		</u-card>
+    
+    <!-- ########################## -- 底部导航栏 -- ################################ -->
+    <u-tabbar
+      :list="tabbarConfig.tabbarList"
+      :mid-button="tabbarConfig.midButton"
+      :inactive-color="tabbarConfig.inactiveColor"
+      :active-color="tabbarConfig.activeColor"
+      :mid-button-size="tabbarConfig.midButtonSize"
+    ></u-tabbar>
 	</view>
 </template>
 
 <script>
+  import tabbarconfig from 'tabbarconfig.js';
+  
 	export default {
 		data() {
 			return {
@@ -112,6 +123,7 @@
 				bannerList: [],
 				newsList:[],
 				noticeList:['贵州轮胎股份有限公司对您感兴趣，为您提供了职位。','您有一个面试邀请'],
+        tabbarConfig: tabbarconfig
 			}
 		},
 		onLoad() {

h5_web/pages/mine/mine.vue

@@ -88,10 +88,21 @@
 				</u-grid>
 			</view>
 		</u-card>
+    
+    <!-- ########################## -- 底部导航栏 -- ################################ -->
+    <u-tabbar
+      :list="tabbarConfig.tabbarList"
+      :mid-button="tabbarConfig.midButton"
+      :inactive-color="tabbarConfig.inactiveColor"
+      :active-color="tabbarConfig.activeColor"
+      :mid-button-size="tabbarConfig.midButtonSize"
+    ></u-tabbar>
 	</view>
 </template>
 
 <script>
+  import tabbarconfig from 'tabbarconfig.js';
+  
 	export default {
 		name: 'Mine',
 		data() {
@@ -100,7 +111,8 @@
 					avatar: require('@/static/img/avatar.jpg'),
 					nickName: '李明',
 					integral: '688'
-				}
+				},
+        tabbarConfig: tabbarconfig
 			}
 		},
 		methods: {

h5_web/pages/mycode/mycode.vue

@@ -45,17 +45,29 @@
 				很抱歉，您提交的退役军人身份信息未通过审核，请审查后重新提交。
 			</view>
 		</view>
+    
+    <!-- ########################## -- 底部导航栏 -- ################################ -->
+    <u-tabbar
+      :list="tabbarConfig.tabbarList"
+      :mid-button="tabbarConfig.midButton"
+      :inactive-color="tabbarConfig.inactiveColor"
+      :active-color="tabbarConfig.activeColor"
+      :mid-button-size="tabbarConfig.midButtonSize"
+    ></u-tabbar>
 	</view>
 </template>
 
 <script>
-	import tkiQrcode from "@/components/tki-qrcode/tki-qrcode.vue"
+	import tkiQrcode from "@/components/tki-qrcode/tki-qrcode.vue";
+  import tabbarconfig from 'tabbarconfig.js';
+  
 	export default{
 		components: {tkiQrcode},
 		data(){
 			return{
 				memberinfo:[],
-				icon:'/static/icons/index.png'
+				icon:'/static/icons/index.png',
+        tabbarConfig: tabbarconfig
 			}
 		},
 		onLoad(page){

h5_web/tabbarconfig.js

@@ -0,0 +1,30 @@
+module.exports = {
+  // 底部导航栏列表数据
+  tabbarList: [{
+      pagePath: "/pages/index/index",
+      iconPath: "/static/icons/index-gray.png",
+      selectedIconPath: "/static/icons/index.png",
+      text: '首页',
+      customIcon: false,
+    },
+    {
+      pagePath: "/pages/mycode/mycode",
+      iconPath: "/static/icons/midbutton-gray.png",
+      selectedIconPath: "/static/icons/midbutton.png",
+      text: '退役军人码',
+      midButton: true,
+      customIcon: false,
+    },
+    {
+      pagePath: "/pages/mine/mine",
+      iconPath: "/static/icons/mine-gray.png",
+      selectedIconPath: "/static/icons/mine.png",
+      text: '我的',
+      customIcon: false,
+    }
+  ],
+  midButton: true,
+  inactiveColor: '#909399',
+  activeColor: '#303133',
+  midButtonSize: 90
+}