瀏覽代碼

Merge branch 'dev-4.9.3-bug' into dev-4.9.4

huangxiaojing 3 年之前
父節點
當前提交
2ea7d7901e

+ 5 - 6
microserviceUserH5/static/js/vender/verify.js

@@ -135,6 +135,7 @@
 					_this.$element.find(".mask").css("display","none");
 					_this.refresh();
 				});
+				
 				var clickBtn = document.getElementById(this.options.containerId);
 				clickBtn && (clickBtn.onclick = function(){
 					if (_this.options.beforeCheck()) {
@@ -191,11 +192,7 @@
         	var panelHtml = '';
         	var wrapHtml = '';
 			this.lengthPercent = (parseInt(this.setSize.img_width)-parseInt(this.setSize.block_width)- parseInt(this.setSize.circle_radius) - parseInt(this.setSize.circle_radius) * 0.8)/(parseInt(this.setSize.img_width)-parseInt(this.setSize.bar_height));
-			if(!/Android|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)){
-				this.setSize.img_width = '220px'
-				this.setSize.img_height = '100px'
-				this.setSize.bar_height = '38px'
-			}
+			
 			wrapStartHtml = '<div class="mask">'+
 								'<div class="verifybox" style="width:'+(parseInt(this.setSize.img_width)+30)+'px">'+
 									'<div class="verifybox-top">'+
@@ -520,6 +517,7 @@
 				_this.$element.find('.verifybox-close').on('click', function() {
 					_this.$element.find(".mask").css("display","none");
 				});
+				
 				var clickBtn = document.getElementById(this.options.containerId);
 				clickBtn && (clickBtn.onclick = function(){
 					if (_this.options.beforeCheck()) {
@@ -682,6 +680,7 @@
 					_this.$element.find('.verify-msg').text(res.repMsg);
 				}
 			})
+        
 		},
 		pointTransfrom:function(pointArr,imgSize){
 			var newPointArr = pointArr.map(function(p){
@@ -712,4 +711,4 @@
 		}
     };
    
-})(jQuery, window, document);
+})(jQuery, window, document);

+ 1 - 0
microserviceUserH5/vcloud/actFission.html

@@ -323,6 +323,7 @@
 					<p>3.分享者每日最多分享给10位好友领取激活码并获得注册奖励,且奖励为当日有效,奖励过期不补发。</p>
 					<p>4.分享者若没有云机,需要先创建星曜云机才可继续领取奖励。</p>
 					<p>5.新用户领取的激活码需在有效期内使用,若超过有效期则激活码失效。</p>
+					<p>6.手机虚拟号段用户暂不支持参与本次活动。</p>
 				</div>
 			</div>
 

+ 11 - 11
microserviceUserH5/vcloud/actFissionShare.html

@@ -267,7 +267,9 @@
 
 <body>
     <div id="mpanel2"></div>
-    <div class="ipt"></div>
+    <!-- <input id="foo" value="hello,clipboard."> -->
+    <button id="wewewe" style="display: none">复制到剪贴板</button>
+    <!-- <div class="ipt"></div> -->
     <div id="app" v-cloak class="container ">
 
         <div v-if='isshow&&topic!=null' style="margin: 0 auto;">
@@ -308,6 +310,7 @@
         </div>
     </div>
 	<script src="../static/js/vender/verify.js"></script>
+	<script src="../static/js/vender/clipboard.min.js"></script>
     <script src="../static/js/vender/vue/vue.min.js"></script>
     <script src="../static/js/vender/vue/vue-clipboard.min.js"></script>
     <script src="../static/js/vender/vue/vant.min.js"></script>
@@ -321,8 +324,8 @@
         // var meta_description = document.getElementsByTagName('meta')['description']
         // document.title = '更新标题'
         // meta_description.content = '更新描述'; // Android iOS
-        var oInput = document.createElement('input'); //创建一个input
-        oInput.setAttribute("readonly", "readonly"); //设置只读,否则移动端使用复制功能时可能会造成软件盘弹出
+        // var oInput = document.createElement('input'); //创建一个input
+        // oInput.setAttribute("readonly", "readonly"); //设置只读,否则移动端使用复制功能时可能会造成软件盘弹出
         var u = navigator.userAgent,
             app = navigator.appVersion;
         var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Linux') > -1; //g
@@ -413,15 +416,14 @@
                             if (res.status === 0) {
                                 //此处为点击的dom的类名
                                 this.code = res.data;
-                                console.log(this.code);
-                                this.copyUrl(this.code);
+                                this.copyUrl();
                             } else {
                                 this.$dialog.alert({
                                     message: res.msg
                                 });
                                 setTimeout(() => {
                                     this.$dialog.close();
-                                    //this.download();
+                                    this.download();
                                 }, 2000)
                             }
 
@@ -437,8 +439,6 @@
                 },
                 download() {
                     if (isAndroid) {
-                        console.log(isAndroid);
-                        console.log(baseUrl)
                         if (baseUrl == 'https://per.cs.se.androidscloud.com') {
                             window.location.href = 'http://per.cs.se.androidscloud.com:8888/suanchou'
                         } else {
@@ -501,6 +501,7 @@
                             width: imgWidth,
                             height: imgHeight
                         },
+                        vm: this,
                         barSize: {//下方滑块的大小对象,有默认值{ width: '310px',height: '50px'},可省略
                             width: imgWidth,
                             height: barHeight
@@ -515,7 +516,7 @@
                         error: function () {}
                     });
                 },
-                copyUrl(actStatus) {
+                copyUrl() {
                     var oInput = document.createElement('input'); //创建一个input
                     oInput.setAttribute("readonly", "readonly"); //设置只读,否则移动端使用复制功能时可能会造成软件盘弹出
                     setTimeout(() => {
@@ -533,11 +534,10 @@
                         oInput.remove(); // 将input销毁
                         setTimeout(() => {
                             this.$dialog.close();
-                            this.download();
+                            // this.download();
                         }, 2000)
                     }, 400)
 
-
                 },
                 selectText(textbox, startIndex, stopIndex) {
                     if (textbox.createTextRange) { //ie