Explorar el Código

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

qihanjiao hace 7 años
padre
commit
b2c77be40e
Se han modificado 52 ficheros con 12 adiciones y 7 borrados
  1. BIN
      aiberle/images/banner_new_1.jpg
  2. BIN
      aiberle/images/product/lv_ban_1.jpg
  3. BIN
      aiberle/images/product/lv_ban_2.jpg
  4. BIN
      aiberle/images/product/lv_img_1.jpg
  5. BIN
      aiberle/images/product/lv_img_2.jpg
  6. BIN
      aiberle/images/product/lv_img_3.jpg
  7. BIN
      aiberle/images/product/lv_img_4.jpg
  8. BIN
      aiberle/images/product/t1.jpg
  9. BIN
      aiberle/images/product/t2.jpg
  10. BIN
      aiberle/images/product/t3.jpg
  11. BIN
      aiberle/images/product/t4.jpg
  12. BIN
      aiberle/images/product/t_set.jpg
  13. BIN
      aiberle/images/product/w5_bai.jpg
  14. BIN
      aiberle/images/product/w5_ban_1.jpg
  15. BIN
      aiberle/images/product/w5_ban_2.jpg
  16. BIN
      aiberle/images/product/w5_img_01.jpg
  17. BIN
      aiberle/images/product/w5_img_02.jpg
  18. BIN
      aiberle/images/product/w5_img_03.jpg
  19. BIN
      aiberle/images/product/w5_img_04.jpg
  20. BIN
      aiberle/images/product/w5_img_05.jpg
  21. BIN
      aiberle/images/product/w5_img_06.jpg
  22. BIN
      aiberle/images/product/w5_img_07.jpg
  23. BIN
      aiberle/images/product/w5_img_08.jpg
  24. BIN
      aiberle/images/product/w5_top.jpg
  25. BIN
      aiberle/images/product/w6_ban_1.jpg
  26. BIN
      aiberle/images/product/w6_ban_2.jpg
  27. BIN
      aiberle/images/product/w6_fen.jpg
  28. BIN
      aiberle/images/product/w6_img_01.jpg
  29. BIN
      aiberle/images/product/w6_img_02.jpg
  30. BIN
      aiberle/images/product/w6_img_03.jpg
  31. BIN
      aiberle/images/product/w6_img_04.jpg
  32. BIN
      aiberle/images/product/w6_img_05.jpg
  33. BIN
      aiberle/images/product/w6_img_06.jpg
  34. BIN
      aiberle/images/product/w6_img_07.jpg
  35. BIN
      aiberle/images/product/w6_img_08.jpg
  36. BIN
      aiberle/images/product/w6_jin.jpg
  37. BIN
      aiberle/images/product/w6_lv.jpg
  38. BIN
      aiberle/images/product/w6_top.jpg
  39. BIN
      tooth/images/pro-hui.png
  40. BIN
      tooth/images/pro-lv.png
  41. BIN
      tooth/images/pro-qwfen.png
  42. BIN
      tooth/images/pro-zi.png
  43. BIN
      tooth/images/product/d_hui.png
  44. BIN
      tooth/images/product/d_lv.png
  45. BIN
      tooth/images/product/d_qwfen.png
  46. BIN
      tooth/images/product/d_zi.png
  47. BIN
      tooth/images/product/r_hui.png
  48. BIN
      tooth/images/product/r_lv.png
  49. BIN
      tooth/images/product/r_qwfen.png
  50. BIN
      tooth/images/product/r_zi.png
  51. 3 2
      tooth/pro-list.html
  52. 9 5
      tooth/register-vip.html

BIN
aiberle/images/banner_new_1.jpg


BIN
aiberle/images/product/lv_ban_1.jpg


BIN
aiberle/images/product/lv_ban_2.jpg


BIN
aiberle/images/product/lv_img_1.jpg


BIN
aiberle/images/product/lv_img_2.jpg


BIN
aiberle/images/product/lv_img_3.jpg


BIN
aiberle/images/product/lv_img_4.jpg


BIN
aiberle/images/product/t1.jpg


BIN
aiberle/images/product/t2.jpg


BIN
aiberle/images/product/t3.jpg


BIN
aiberle/images/product/t4.jpg


BIN
aiberle/images/product/t_set.jpg


BIN
aiberle/images/product/w5_bai.jpg


BIN
aiberle/images/product/w5_ban_1.jpg


BIN
aiberle/images/product/w5_ban_2.jpg


BIN
aiberle/images/product/w5_img_01.jpg


BIN
aiberle/images/product/w5_img_02.jpg


BIN
aiberle/images/product/w5_img_03.jpg


BIN
aiberle/images/product/w5_img_04.jpg


BIN
aiberle/images/product/w5_img_05.jpg


BIN
aiberle/images/product/w5_img_06.jpg


BIN
aiberle/images/product/w5_img_07.jpg


BIN
aiberle/images/product/w5_img_08.jpg


BIN
aiberle/images/product/w5_top.jpg


BIN
aiberle/images/product/w6_ban_1.jpg


BIN
aiberle/images/product/w6_ban_2.jpg


BIN
aiberle/images/product/w6_fen.jpg


BIN
aiberle/images/product/w6_img_01.jpg


BIN
aiberle/images/product/w6_img_02.jpg


BIN
aiberle/images/product/w6_img_03.jpg


BIN
aiberle/images/product/w6_img_04.jpg


BIN
aiberle/images/product/w6_img_05.jpg


BIN
aiberle/images/product/w6_img_06.jpg


BIN
aiberle/images/product/w6_img_07.jpg


BIN
aiberle/images/product/w6_img_08.jpg


BIN
aiberle/images/product/w6_jin.jpg


BIN
aiberle/images/product/w6_lv.jpg


BIN
aiberle/images/product/w6_top.jpg


BIN
tooth/images/pro-hui.png


BIN
tooth/images/pro-lv.png


BIN
tooth/images/pro-qwfen.png


BIN
tooth/images/pro-zi.png


BIN
tooth/images/product/d_hui.png


BIN
tooth/images/product/d_lv.png


BIN
tooth/images/product/d_qwfen.png


BIN
tooth/images/product/d_zi.png


BIN
tooth/images/product/r_hui.png


BIN
tooth/images/product/r_lv.png


BIN
tooth/images/product/r_qwfen.png


BIN
tooth/images/product/r_zi.png


+ 3 - 2
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毫秒滚动到顶
 			});
 			//跳转产品详情

+ 9 - 5
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";
 												}
 											}