Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/pages/order/complete.vue

src/App.vue

@@ -163,8 +163,8 @@ export default {
     setUserData(userInfo) {
       if (userInfo && userInfo.token) {
         // 如果已经登录则直接获取相关信息
-		this.$u.vuex('vuex_token',userInfo.token);
-		this.$u.vuex('vuex_token',"RTOKEN7493e6defc2f1a77782f105dc297a9366763fec5");
+		this.$u.vuex('vuex_token',userInfo.token);
+		this.$u.vuex('vuex_token',"RTOKEN7493e6defc2f1a77782f105dc297a9366763fec5");
 		this.$u.vuex('vuex_user', userInfo);
 		this.$u.vuex('vuex_wx_uid', userInfo.wxopenid);
       } else {