Merge branch 'develop' of http://192.168.32.253:3000/Software/android-cloud-H5 into develop

pages/activity/doubleEleven/index.vue

@@ -213,9 +213,9 @@ export default {
         {
           this.login = true
           const _this = this
-          // setTimeout(() => {window.location.href='https://client.phone.androidscloud.com/cloud/phone/web/#/pages/login/index';_this.login = false},1000);
+          setTimeout(() => {window.location.href='https://client.phone.androidscloud.com/cloud/phone/web/#/pages/login/index';_this.login = false},1000);
 
-          setTimeout(() => {window.location.href='https://prese.phone.androidscloud.com/cloud/phone/web/#/pages/index/index';_this.login = false},1000);
+          // setTimeout(() => {window.location.href='https://prese.phone.androidscloud.com/cloud/phone/web/#/pages/index/index';_this.login = false},1000);
           
           return
         }

pages/activity/doubleEleven/pc.vue

@@ -180,8 +180,8 @@
           {
             this.login = true
             const _this = this
-            // setTimeout(() => {window.location.href='http://client.phone.androidscloud.com/cloud/phone/web/#/pages/login/index';_this.login = false},1000);
-            setTimeout(() => {window.location.href='https://prese.phone.androidscloud.com/cloud/phone/web/#/pages/index/index';_this.login = false},1000);
+            setTimeout(() => {window.location.href='https://client.phone.androidscloud.com/cloud/phone/web/#/pages/login/index';_this.login = false},1000);
+            // setTimeout(() => {window.location.href='https://prese.phone.androidscloud.com/cloud/phone/web/#/pages/index/index';_this.login = false},1000);
             return
           }