Merge branch 'master' of http://git.iamberry.com/liujiankang/static

tooth/pro-list.html

@@ -104,7 +104,7 @@
 				$.ajax(base_path + '/wechat/product/listProductColorByTypeId?dates=' + new Date().getTime(), {
 							data: {
 								"typeId":typeId,//产品类型id
-								"pageNo":pageNumber,//pageNo第几页
+								"pageNO":pageNumber,//pageNo第几页
 								"pageSize":pagesize//pageSize每页条数
 							},
 							dataType: 'json',
@@ -195,7 +195,8 @@
 				typeId=$(this).attr("name");//当前点击的类型id
 				pageNumber=0;//页数归零
 				$('.my-table-pull').empty();//清空产品列表
-				mui('#pullrefresh_pro_list').pullRefresh().pullupLoading();//重新加载数据
+				mui('#pullrefresh_pro_list').pullRefresh().refresh(true);
+//				mui('#pullrefresh_pro_list').pullRefresh().pullupLoading();//重新加载数据
 				mui('.mui-scroll-wrapper').scroll().scrollTo(0,0,500);//500毫秒滚动到顶
 			});
 			//跳转产品详情

tooth/register-vip.html

@@ -328,11 +328,15 @@
 									if(dt.status) {//判断接口返回状态status
 										if(dt.data.isActivation){
 											//已激活
-											
 											mui.alert('该产品已被激活！', '提醒', function() {  
 												location.href="my-center.html";
 							               }); 
 										}
+										if(dt.data.memberInfo.userStatus != 2){
+											//未关注
+											mui.alert('请先关注公众号再激活！', '提醒', function() {  
+												location.href="follow-me-tooth.html";
+							               }); 
 										//填充用户数据
 										$("#ipt-name").val(dt.data.memberInfo.userName);
 										if(dt.data.memberInfo.userSex != null){
@@ -418,14 +422,14 @@
 											if(userIdentity == 1){//会员
 												if(isFocusOn == 1 || isFocusOn == 0){//未关注
 													location.href="member-follow-me.html";
-												}else{//以关注
-													location.href="my-center.html";
+												}else{//已关注
+													location.href="welfare-service.html";
 												}
 											}else{//非会员
 												if(isFocusOn == 1 || isFocusOn == 0){//未关注
 													location.href="follow-me.html";
-												}else{//以关注
-													location.href="my-center.html";
+												}else{//已关注
+													location.href="welfare-service.html";
 												}
 											}