heyang лет назад: 3
Родитель
Сommit
90131bcad6

+ 8 - 11
microserviceUserH5/static/js/vender/verify.js

@@ -136,9 +136,8 @@
 					_this.$element.find(".mask").css("display","none");
 					_this.refresh();
 				});
-				console.log(this.options.containerId)
+				
 				var clickBtn = document.getElementById(this.options.containerId);
-				console.log(clickBtn)
 				clickBtn && (clickBtn.onclick = function(){
 					if (_this.options.beforeCheck()) {
 						_this.$element.find(".mask").css("display","block");
@@ -194,11 +193,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">'+
@@ -461,8 +456,8 @@
 					_this.secretKey = res.repData.secretKey
 					_this.backToken = res.repData.token
 				} else {
-					_this.$element.find(".backImg")[0].src = 'img/default.png'
-					_this.$element.find(".bock-backImg")[0].src = 'img/itemLeft.png'
+					_this.$element.find(".backImg")[0].src = 'images/default.jpg'
+					_this.$element.find(".bock-backImg")[0].src = ''
 					_this.htmlDoms.tips.addClass('err-bg').removeClass('suc-bg')
 					_this.htmlDoms.tips.animate({"bottom":"0px"});
 					_this.htmlDoms.tips.text(res.repMsg)
@@ -523,6 +518,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()) {
@@ -681,10 +677,11 @@
 					var text = '请依次点击【' + res.repData.wordList.join(",") + '】';
 					_this.$element.find('.verify-msg').text(text);
 				} else {
-					_this.htmlDoms.back_img[0].src = 'img/default.png';
+					_this.htmlDoms.back_img[0].src = 'images/default.jpg';
 					_this.$element.find('.verify-msg').text(res.repMsg);
 				}
 			})
+        
 		},
 		pointTransfrom:function(pointArr,imgSize){
 			var newPointArr = pointArr.map(function(p){
@@ -715,4 +712,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 - 55
microserviceUserH5/vcloud/actFissionShare.html

@@ -9,19 +9,6 @@
     <link rel="stylesheet" href="../static/css/index.css">
     <link rel="stylesheet" href="../static/css/vant.css" />
     <script src="../static/js/vender/jquery-3.4.1.min.js"></script>
-    <link rel="stylesheet" href="../static/css/verify.css">
-	<link rel="stylesheet" href="../static/js/vender/toastr/toastr.min.css">
-	<script>
-		(function () {
-			if (!window.Promise) {
-				document.writeln('<script src="https://cdnjs.cloudflare.com/ajax/libs/es6-promise/4.1.1/es6-promise.min.js"><' + '/' + 'script>');
-			}
-		})();
-	</script>
-	<script src="../static/js/vender/toastr/toastr.min.js"></script>
-	<script src="../static/js/vender/config.js"></script>
-	<script src="../static/js/vender/crypto-js.js"></script>
-	<script src="../static/js/vender/ase.js"></script>
     <!-- <script src="../static/js/vender/vue/vue.min.js"></script>
     <script src="../static/js/vender/vue/vant.min.js"></script>
     <script src="../static/js/vender/config.js"></script>
@@ -266,7 +253,6 @@
 </head>
 
 <body>
-    <div id="mpanel2"></div>
     <div class="ipt"></div>
     <div id="app" v-cloak class="container ">
 
@@ -277,8 +263,7 @@
                         <p>激活码:</p>
                         <p>AS4*********SD3</p>
                     </div>
-                    <!-- @click='createCopy()' -->
-                    <div class="button-download " id="form-btn">点击复制并下载</div>
+                    <div class="button-download " @click='createCopy()'>点击复制并下载</div>
                 </div>
             </div>
             <div class="top-banner">
@@ -307,7 +292,6 @@
             </div>
         </div>
     </div>
-	<script src="../static/js/vender/verify.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,17 +305,13 @@
         // 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
         var isIOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/); //ios终端
         var clipboard = new ClipboardJS('.copybtn') //此处为点击的dom的类名
-        var html = document.documentElement;
-		var imgWidth = html.getBoundingClientRect().width / 750 * 400 + 'px';
-		var imgHeight = html.getBoundingClientRect().width / 750 * 200 + 'px';
-		var barHeight = html.getBoundingClientRect().width / 750 * 70 + 'px';
         new Vue({
             el: '#app',
             data: {
@@ -352,9 +332,6 @@
             },
             created() {
                 // window.location.href = 'investigate.html'
-                setTimeout(() => {
-                    this.validate(); // 生成验证码
-                },500)
             },
             mounted() {
                 // this.$dialog.alert({
@@ -396,7 +373,7 @@
                         console.log(res)
                     })
                 },
-                createCopy(captchaVerification) {
+                createCopy() {
                     // this.$toast.loading({
                     //     duration: 0,
                     //     message: '加载中...',
@@ -408,14 +385,13 @@
                         }).then(res => {
 
                         })
-                        getActivationCode(this.username, this.tagId, this.uuid, captchaVerification).then(res => {
+                        getActivationCode(this.username, this.tagId, this.uuid).then(res => {
                             this.$toast.clear();
                             if (res.status === 0) {
                                 //此处为点击的dom的类名
                                 this.code = res.data;
-                                setTimeout(() => {
-                                    this.copyUrl();
-                                },500)
+                                console.log(this.code);
+                                this.copyUrl(this.code);
                             } else {
                                 this.$dialog.alert({
                                     message: res.msg
@@ -438,6 +414,8 @@
                 },
                 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 {
@@ -491,30 +469,7 @@
                         this.$toast('网络异常');
                     });
                 },
-                validate() {
-                    $('#mpanel2').slideVerify({
-                        baseUrl: baseUrl + '/api/user',  //服务器请求地址, 默认地址为安吉服务器;
-                        mode: 'pop',     //展示模式
-                        containerId: 'form-btn', //pop模式 必填 被点击之后出现行为验证码的元素id
-                        imgSize: { //图片的大小对象,有默认值{ width: '310px',height: '155px'},可省略
-                            width: imgWidth,
-                            height: imgHeight
-                        },
-                        barSize: {//下方滑块的大小对象,有默认值{ width: '310px',height: '50px'},可省略
-                            width: imgWidth,
-                            height: barHeight
-                        },
-                        beforeCheck: function () {
-                            return true
-                        },
-                        ready: function () { },  //加载完毕的回调
-                        success: (params) => { //成功的回调
-                            this.createCopy(params.captchaVerification);
-                        },
-                        error: function () {}
-                    });
-                },
-                copyUrl() {
+                copyUrl(actStatus) {
                     var oInput = document.createElement('input'); //创建一个input
                     oInput.setAttribute("readonly", "readonly"); //设置只读,否则移动端使用复制功能时可能会造成软件盘弹出
                     setTimeout(() => {
@@ -536,6 +491,7 @@
                         }, 2000)
                     }, 400)
 
+
                 },
                 selectText(textbox, startIndex, stopIndex) {
                     if (textbox.createTextRange) { //ie