Merge branch 'master' of ssh://106.55.174.214:222/weixiari-124/agent-app

# Conflicts:
#	agentApp/pages/allpages/index.vue

agentApp/pages.json

@@ -99,7 +99,7 @@
 			"path" : "pages/user-orders/user-orders",
 			"style" : 
 			{
-				"navigationBarTitleText" : "",
+				"navigationBarTitleText" : "主页",
 				"enablePullDownRefresh" : false
 			}
 		},

agentApp/pages/allpages/index.vue

@@ -9,11 +9,12 @@
 		<button @click="goPage(9)">提现详情</button>
 		<button @click="goPage(10)">提现历史</button>
 		<text>用户相关</text>
-		<button @click="goPage(3)">用户支付页面</button>
-		<button @click="goPage(3)">用户支付页面2</button>
+		<button @click="goPage(20)">用户订单/主页</button>
+		<button @click="goPage(21)">用户排队信息</button>
 		<text>代理商相关</text>
 		<button @click="goPage(1)">代理商登录</button>
 		<button @click="goPage(2)">代理商主页</button>
+
 		<button @click="goPage(11)">代理商提现</button>
 		<button @click="goPage(12)">代理商提现详情</button>
 		<button @click="goPage(13)">代理商提现历史</button>
@@ -55,6 +56,19 @@
 						url: '/pages/merchant-index/index'
 					});
 					break;
+					
+					case 17:
+					uni.navigateTo({
+						url: '/pages/history/history'
+					});
+					break;
+					case 20:
+					uni.navigateTo({
+						url: '/pages/user-orders/user-orders'
+					});
+					break;
+					case 21:
+
 					case 6:
 					uni.navigateTo({
 						url: '/pages/user-orders/user-orders'
@@ -65,6 +79,7 @@
 						url: '/pages/queuing-information/queuing-information'
 					});
 					break;
+
 					case 8:
 					uni.navigateTo({
 						url: '/pages/withdrawal-management/withdrawal-management'