Merge branch 'master' of http://121.40.237.253:3000/lijie/zhxy-desk

common/js/http.js

@@ -57,11 +57,11 @@ export default {
 		}else{
 			//开发环境读配置
 			if(Config.isLocal==2){
-				Config.baseUrl='http://125.124.170.221:8000'
-				// Config.baseUrl='http://zhxy.com'
+				// Config.baseUrl='http://125.124.170.221:8000'
+				Config.baseUrl='http://zhxy.com'
 			}else{
-				// Config.baseUrl='http://zhxy.com'
-				Config.baseUrl='http://125.124.170.221:8000'
+				Config.baseUrl='http://zhxy.com'
+				// Config.baseUrl='http://125.124.170.221:8000'
 			}
 		}
 		

pages.json

@@ -73,6 +73,12 @@
 				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false
 			}
+		},{
+			"path": "pages/error/400",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
 		}
     ],
 

pages/error/400.vue

@@ -0,0 +1,40 @@
+<template>
+    <view>
+        <view>
+			<h1 style="color: aqua;" id="myButton">22222</h1>
+            <text style="font-size: 25px;color: #333;">
+                400 
+            </text>
+        </view>
+        <view>
+            <text style="font-size: 18px;color: #999;">
+                {{errMsg}}
+            </text>
+        </view>
+    </view>
+</template>
+
+<script>
+    export default {
+        data() {
+            return {
+
+            }
+        },
+        onLoad(query) {
+            this.errMsg = query.errMsg || ''
+        },
+        methods: {
+			show(){
+				
+			},
+			triggerPopup(){
+				window.location.href = "#popup";
+			}
+        }
+    }
+</script>
+
+<style>
+
+</style>

pages/error/404.vue

@@ -1,6 +1,7 @@
 <template>
     <view>
         <view>
+			<h1 style="color: aqua;" id="myButton" @click="triggerPopup()">11111111111</h1>
             <text style="font-size: 25px;color: #333;">
                 404 Page Not Found
             </text>
@@ -24,7 +25,12 @@
             this.errMsg = query.errMsg || ''
         },
         methods: {
-
+			show(){
+				
+			},
+			triggerPopup(){
+				window.location.href = "#/pages/error/400";
+			}
         }
     }
 </script>