mzb

share/Invitation.html

@@ -224,14 +224,14 @@
 	}
 	
 	$("#share").click(function () {
-//		if(navigator.userAgent.toLowerCase().match(/MicroMessenger/i) == "micromessenger"){
+		if(navigator.userAgent.toLowerCase().match(/MicroMessenger/i) == "micromessenger"){
 			//微信
 			$(".shareWechat").css('display','block')
 			shareFriend ();
-//		}else{
-////			//app端
-//			$(".shareMask").css('display','block')
-//		}
+		}else{
+//			//app端
+			$(".shareMask").css('display','block')
+		}
 		share();
 	})
 	$(".cancel").click(function () {

share/index.html

@@ -14,9 +14,9 @@
 		.red_packet .click{font-size:0.18rem;color:#FB3D38;text-align: center;padding-top: 0.2rem;padding-bottom: 0.2rem;}
 		.red_packet .copy{width:0.94rem;height:0.26rem;margin:auto;color:#FFF;font-size:0.15rem;line-height: 0.26rem;text-align:center;background:#FB3D38;border-radius:0.075rem;box-shadow:0.02rem 0.045rem 0.05rem rgba(143,141,141,0.22);}
 		.red_packet .con{font-size:0.14rem;color:#666666;padding-top: 0.2rem;padding-bottom: 0.345rem;text-align: center;}
-		.already{height: 2rem;padding-left: 0.16rem;padding-right: 0.15rem;}
+		.already{height: 1.8rem;padding-left: 0.16rem;padding-right: 0.15rem;}
 		.already .num{font-size:0.15rem;color:#FB3D38;padding-bottom: 0.175rem;}
-		.already ul{height: 1.305rem;overflow-x:hidden;overflow-y: scroll;}
+		.already ul{}
 		.already ul li{float: left;padding-bottom: 0.08rem;color: #666666;line-height: 0.355rem;}
 		.already ul li img{float: left;display: block;width: 0.355rem;height: 0.355rem;border:0;}
 		.already ul li .username{ display: inline-block; float: left;padding-left: 0.075rem;width: 1.1rem;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;}
@@ -28,7 +28,7 @@
 		.cooperation img{float:left;width: 0.46rem;margin-right: 0.57rem;}
 		.cooperation img:nth-child(3){margin-right: 0rem;}
 		.bottom{margin: auto;color: #FB3D38;text-align: center;font-size: 0.14rem;}
-		.bottom p:nth-child(1){padding-top: 0.185rem;padding-bottom: 0.205rem;font-size: 0.15rem;} 
+		.bottom p:nth-child(1){padding-top: 0.185rem;padding-bottom: 0.15rem;font-size: 0.15rem;} 
 		#copy_1,#copy_2,#taokouling{position: absolute;left: -1000rem;}
 		.alert-info {position: absolute;top: 1.74rem;right: 0;left: 0;bottom: 0;text-align: center;}
 		.alert-info p {display: inline-block;color: #fff;font-size: 0.14rem;line-height: 0.38rem;padding: 0 0.10rem;background-color: rgba(0, 0, 0, 0.7);border-radius: 5px;}
@@ -91,7 +91,6 @@
 	for(var i = 0 ; i<brr.length; i++){
     	if(brr[i].indexOf('userId') != -1){
     		userId = brr[i].split('=')[1];//用户id
-    		localStorage.setItem('userId', userId);
     	}
     }
 		//页面加载，显示数据
@@ -114,7 +113,8 @@
 				}else if(data.code == 4003){
 					showMsg("领取失败")
 				}else if(data.code == 4002){
-					showMsg(data.message)
+//					showMsg(data.message)
+					copyPassword();//不限制新老用户
 				}
 			}
 		})
@@ -181,14 +181,14 @@
 	function scrollTxt(){
 	    var controls={},
 	        values={},
-	        t1=200, /*播放动画的时间*/
+	        t1=800, /*播放动画的时间*/
 	        t2=1500, /*播放时间间隔*/
 	        si;
 	    controls.rollWrap=$("#roll-wrap");
 	    controls.rollWrapUl=controls.rollWrap.children();
 	    controls.rollWrapLIs=controls.rollWrapUl.children();
 	    values.liNums=controls.rollWrapLIs.length;
-	    values.liHeight=controls.rollWrapLIs.eq(0).height();
+	    values.liHeight=45;
 	    values.ulHeight=controls.rollWrap.height();
 	    this.init=function(){
 	        autoPlay();
@@ -196,7 +196,7 @@
 	    }
 	    /*滚动*/
 	    function play(){
-	        controls.rollWrapUl.animate({"margin-top" : "-"+values.liHeight}, t1, function(){
+	        controls.rollWrapUl.animate({"margin-top" : "-"+values.liHeight}, t1, 'linear',function(){
 	            $(this).css("margin-top" , "0").children().eq(0).appendTo($(this));
 	        });
 	    }

share/weChatShare.js

@@ -15,12 +15,15 @@ let wexinPay = (shareUrl,shareImgUrl,payData,cb,errorCb) => {
 //let rawString = data.rawString;
 //let packages = data.package;
 //let paySign = data.paySign;
+<<<<<<< HEAD
 //alert('appId,' + appId)
 //alert('timestamp,' + timestamp)
 //alert('nonceStr,' + nonceStr)
 //alert('signature,' + signature)
 //alert('url,' + data.url)
 
+=======
+>>>>>>> 82b201c6a2648a0ff4a7bbabea6e8d9ded02bcf1
   wx.config({
     debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
     appId: appId, // 必填，公众号的唯一标识
@@ -33,7 +36,7 @@ let wexinPay = (shareUrl,shareImgUrl,payData,cb,errorCb) => {
     ] // 必填，需要使用的JS接口列表，所有JS接口列表见附录2
   });
   wx.ready(function(){
-//		let imgUrl = shareImgUrl;
+		let imgUrl = shareImgUrl;
 //			if(imgUrl.indexOf("https") == -1){
 //				imgUrl = imgUrl.replace('http', 'https');
 //			}
@@ -69,11 +72,14 @@ let wexinPay = (shareUrl,shareImgUrl,payData,cb,errorCb) => {
   wx.error(function(res) {
     // config信息验证失败会执行error函数，如签名过期导致验证失败，具体错误信息可以打开config的debug模式查看，也可以在返回的res参数中查看，对于SPA可以在这里更新签名。
     alert(res.errMsg)
+<<<<<<< HEAD
 	showMsg(res)
 //  Toast({
 //		  message:res,
 //		  duration: 15000
 //		});
+=======
+>>>>>>> 82b201c6a2648a0ff4a7bbabea6e8d9ded02bcf1
   });
 }
 //export default wexinPay;