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

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

agentApp/pages/allpages/index.vue

@@ -3,14 +3,21 @@
 		<text>商户相关</text>
 		<button @click="goPage(4)">商户登录</button>
 		<button @click="goPage(5)">商户主页</button>
+		<button @click="goPage(6)">用户订单</button>
+		<button @click="goPage(7)">排队信息列表</button>
+		<button @click="goPage(8)">提现管理</button>
+		<button @click="goPage(9)">提现详情</button>
+		<button @click="goPage(10)">提现历史</button>
 		<text>用户相关</text>
 		<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(6)">代理商提现</button>
-		<button @click="goPage(17)">代理商提现历史</button>
+
+		<button @click="goPage(11)">代理商提现</button>
+		<button @click="goPage(12)">代理商提现详情</button>
+		<button @click="goPage(13)">代理商提现历史</button>
 	</view>
 </template>
 
@@ -50,12 +57,6 @@
 					});
 					break;
 					
-					case 6:
-					uni.navigateTo({
-						url: '/pages/cash/cash'
-					});
-					break;
-					
 					case 17:
 					uni.navigateTo({
 						url: '/pages/history/history'
@@ -67,12 +68,48 @@
 					});
 					break;
 					case 21:
+
+					case 6:
+					uni.navigateTo({
+						url: '/pages/user-orders/user-orders'
+					});
+					break;
+					case 7:
 					uni.navigateTo({
 						url: '/pages/queuing-information/queuing-information'
 					});
 					break;
 
-					
+					case 8:
+					uni.navigateTo({
+						url: '/pages/withdrawal-management/withdrawal-management'
+					});
+					break;
+					case 9:
+					uni.navigateTo({
+						url: '/pages/account-opened/account-opened'
+					});
+					break;
+					case 10:
+					uni.navigateTo({
+						url: '/pages/withdrawal-history/withdrawal-history'
+					});
+					break;
+					case 11:
+					uni.navigateTo({
+						url: '/pages/cash/cash'
+					});
+					break;
+					case 12:
+					uni.navigateTo({
+						url: '/pages/cashdetail/cashdetail'
+					});
+					break;
+					case 13:
+					uni.navigateTo({
+						url: '/pages/history/history'
+					});
+					break;
 					default: 
 					uni.navigateTo({
 						url: '/pages/login/index'