浏览代码

Merge remote-tracking branch 'origin/dev-4.9.3' into uat

heyang 3 年之前
父节点
当前提交
721b0f2dcd

+ 5 - 2
microserviceUserH5/static/js/vender/move.js

@@ -7,8 +7,8 @@ var sliderData = (function(cb){
   var leftEarDom = document.getElementsByClassName('left-ear')[0];
   var scheduleChildLine = document.getElementsByClassName('schedule-child-line')[0];
   
-  var width = 651;
-  var startX =0;
+  var width = 650;
+  var startX = 0;
   var translateX = 0;
   var startTime;
   var newTranslateX;
@@ -61,6 +61,9 @@ var sliderData = (function(cb){
         cb();
       }
     } else {
+      if(pageNum + 1 == sliderNumber){
+        width = 651
+      }
       // 向右划
       if (Math.abs(distance) > width / 3 || (Math.abs(distance) > 40 && duration < 600)) {
         newTranslateX = startTranslate - width;

+ 2 - 2
microserviceUserH5/static/js/vender/vue/config.js

@@ -11,8 +11,8 @@ var base_url = baseUrl; //测试服务器
 //var base_url = 'http://**********'; //正式服务器
 
 
-//const fileCenterApi = 'https://wjzx.androidscloud.com:9091'
-const fileCenterApi = 'https://per.cs.se.androidscloud.com/'
+const fileCenterApi = 'https://wjzx.androidscloud.com:9091'
+//const fileCenterApi = 'https://per.cs.se.androidscloud.com/'
 // https://per.cs.se.androidscloud.com/
 // https://per.cs.se.androidscloud.com/
 axios.defaults.headers['Content-Type'] = 'application/json';

+ 3 - 2
microserviceUserH5/vcloud/actFissionShare.html

@@ -393,11 +393,12 @@
                                 });
                                 setTimeout(() => {
                                     this.$dialog.close();
+                                    this.download();
                                 }, 2000)
                             }
 
                         }).catch((error) => {
-                            this.download();
+                           
                             console.log(error)
                             this.$toast('复制失败');
                             this.download()
@@ -464,7 +465,7 @@
                         this.selectText(oInput, 0, oInput.value.length);
                         document.execCommand("Copy"); // 执行浏览器复制命令
                         this.$dialog.alert({
-                            message: `复制成功`
+                            message: `复制成功${this.code}`
                         })
                         oInput.style.display = 'none'; // 将input隐藏
                         oInput.blur();