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,14 @@
 		<text>商户相关</text>
 		<button @click="goPage(4)">商户登录</button>
 		<button @click="goPage(5)">商户主页</button>
-		<button @click="goPage(6)">用户订单</button>
+	
+		<text>用户相关</text>
+		<button @click="goPage(21)">用户扫码</button>
+		<button @click="goPage(20)">用户订单/主页</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>
@@ -68,6 +68,10 @@
 					});
 					break;
 					case 21:
+					uni.navigateTo({
+						url: '/pages/payment/payment'
+					});
+					break;
 
 					case 6:
 					uni.navigateTo({