Merge branch 'master' of ssh://gogs.zfire.top:2222/zfire-front/recycle-mobile

src/pages.json

@@ -169,35 +169,35 @@
     "backgroundColor": "#f4f2f2",
     "onReachBottomDistance": 100
   },
-  "tabBar": {
-    "color": "#515151",
-    "selectedColor": "#78c6ff",
-    "borderStyle": "black",
-    "backgroundColor": "#ffffff",
-    "list": [{
-        "pagePath": "pages/index/index",
-        "iconPath": "static/tabBar/icon_learn01.png",
-        "selectedIconPath": "static/tabBar/icon_learn02.png",
-        "text": "首页"
-      },
-      {
-        "pagePath": "pages/issue/index",
-        "iconPath": "static/tabBar/icon_wiki01.png",
-        "selectedIconPath": "static/tabBar/icon_wiki02.png",
-        "text": "发布"
-      },
-      {
-        "pagePath": "pages/message/index",
-        "iconPath": "static/tabBar/icon_exam01.png",
-        "selectedIconPath": "static/tabBar/icon_exam02.png",
-        "text": "消息"
-      },
-      {
-        "pagePath": "pages/mine/index",
-        "iconPath": "static/tabBar/icon_profile01.png",
-        "selectedIconPath": "static/tabBar/icon_profile02.png",
-        "text": "我的"
-      }
-    ]
+  "tabBar": {
+    "color": "#515151",
+    "selectedColor": "#01C30B",
+    "borderStyle": "black",
+    "backgroundColor": "#ffffff",
+    "list": [{
+        "pagePath": "pages/index/index",
+        "iconPath": "static/tabBar/icon_home01.png",
+        "selectedIconPath": "static/tabBar/icon_home02.png",
+        "text": "首页"
+      },
+      {
+        "pagePath": "pages/issue/index",
+        "iconPath": "static/tabBar/icon_issue01.png",
+        "selectedIconPath": "static/tabBar/icon_issue02.png",
+        "text": "发布"
+      },
+      {
+        "pagePath": "pages/message/index",
+        "iconPath": "static/tabBar/icon_message01.png",
+        "selectedIconPath": "static/tabBar/icon_message02.png",
+        "text": "消息"
+      },
+      {
+        "pagePath": "pages/mine/index",
+        "iconPath": "static/tabBar/icon_mine01.png",
+        "selectedIconPath": "static/tabBar/icon_mine02.png",
+        "text": "我的"
+      }
+    ]
   }
 }

src/pages/mine/index.vue

@@ -62,7 +62,7 @@
 
         <view class="menu-container card">
           <block v-for="(item, index) in pageList" :key="index">
-            <view class="item" v-if="item.url != 'contact'" @tap="$navPage(item.url)">
+            <view class="item" v-if="item.url != 'contact'" @tap="navToPage(item.url)">
               <view class="name">{{item.name}}</view>
               <text class="iconfont icon-jinru"></text>
             </view>
@@ -132,6 +132,12 @@ export default {
     	this.refresherTriggered = true;
 
     },
+    
+    navToPage(url) {
+      this.$navToPage({
+        url
+      })
+    }
   }
 }
 </script>

src/pages/mine/parse.vue

@@ -1,4 +1,5 @@
 <template>
+  <!-- #ifdef H5 -->
   <zj-page-layout
   	:bgColor="'#FFFFFF'"
   	:hasFooter="false"
@@ -7,10 +8,15 @@
   		<u-parse :content="content" :tagStyle="style"></u-parse>
   	</view>
   </zj-page-layout>
+  <!-- #endif -->
+  <!-- #ifndef H5 -->
+  <web-view :src="webViewHref('/pages/mine/parse')"></web-view>
+  <!-- #endif -->
 </template>
 
 <script>
 	export default {
+    // #ifdef H5
 		data() {
 			return {
 				type: 1,
@@ -35,7 +41,7 @@
         　　title: '用户协议'
         })
       }
-			
+
 			this.getDetail();
 		},
 		methods: {
@@ -46,7 +52,11 @@
 					this.content = res.data ? res.data.content : '';
 				})
 			},
-		}
+		},
+    // #endif
+    // #ifndef H5
+
+    // #endif
 	}
 </script>