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

static/screenAndroid/WXdraw.js

@@ -107,9 +107,9 @@ function doConnectDirectives() {
 
     if (result.type === 'cutting') {
       if (result.data.status === 0) {
-        $.toast('复制成功', 'text');
+        $.toast('复制成功', 'text', 1000);
       } else {
-        $.toast(result.msg, 'text');
+        $.toast(result.msg, 'text', 1000);
       }
       return;
     }
@@ -229,9 +229,9 @@ function doConnectDirectives() {
       return;
     }
     if (result.type === 'payInitiateEvent') {
-      var url = window.location.href;
-      url = url.split('/');
-      var baseUrl = url[0] + '//' + url[2];
+      // var url = window.location.href;
+      // url = url.split('/');
+      // var baseUrl = url[0] + '//' + url[2];
       $.ajax({
         url: baseUrl + '/api/pay/third/order',
         data: JSON.stringify({

static/screenAndroid/WXtrialInterface.html

@@ -130,11 +130,11 @@
           <div class="menu-btn PictureQuality avit" data-id="3">标清</div>
           <div class="menu-btn PictureQuality" data-id="2">极速</div>
         </div>
-        <div class="open-set-phone-size-dialog-btn-wrap">
+        <!-- <div class="open-set-phone-size-dialog-btn-wrap">
           <div class="menu-btn" id="open-set-phone-size-dialog-btn">
             <span>分辨率</span>
           </div>
-        </div>
+        </div> -->
         <div class="operation">
           <div class="upload" id="showsuss" data-text="uploads">
             <img src="../static/img/wx/shangchuan_icon.png" />

static/screenIos/WXdraw.js

@@ -115,9 +115,9 @@ function doConnectDirectives() {
 
     if (result.type === 'cutting') {
       if (result.data.status === 0) {
-        $.toast('复制成功', 'text');
+        $.toast('复制成功', 'text', 1000);
       } else {
-        $.toast(result.msg, 'text');
+        $.toast(result.msg, 'text', 1000);
       }
       return;
     }
@@ -237,9 +237,9 @@ function doConnectDirectives() {
       return;
     }
     if (result.type === 'payInitiateEvent') {
-      var url = window.location.href;
-      url = url.split('/');
-      var baseUrl = url[0] + '//' + url[2];
+      // var url = window.location.href;
+      // url = url.split('/');
+      // var baseUrl = url[0] + '//' + url[2];
       $.ajax({
         url: baseUrl + '/api/pay/third/order',
         data: JSON.stringify({

static/screenIos/WXtrialInterface.html

@@ -109,11 +109,11 @@
           <div class="menu-btn PictureQuality avit" data-id="3">标清</div>
           <div class="menu-btn PictureQuality" data-id="2">极速</div>
         </div>
-        <div class="open-set-phone-size-dialog-btn-wrap">
+        <!-- <div class="open-set-phone-size-dialog-btn-wrap">
           <div class="menu-btn" id="open-set-phone-size-dialog-btn">
             <span>分辨率</span>
           </div>
-        </div>
+        </div> -->
         <div class="operation">
           <div class="upload" id="showsuss" data-text="uploads">
             <img src="../static/img/wx/shangchuan_icon.png" />