首页 发现 帮助
登录
liujiankang
/
static
关注 1
点赞 0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

xxxxx

qihanjiao 7 年之前
父节点
37f514cc6f
当前提交
5343be514b
共有 12 个文件被更改，包括 78 次插入 和 55 次删除
合并视图 显示文件统计
  1. 3 6
      aiberle/clearing.html
  2. 3 3
      aiberle/coupon_list.html
  3. 5 3
      aiberle/css/main.css
  4. 1 7
      aiberle/index.html
  5. 4 4
      aiberle/js/wechat-utils-1.0.js
  6. 3 3
      aiberle/my-center.html
  7. 3 3
      aiberle/order-details.html
  8. 3 3
      aiberle/order-list.html
  9. 3 3
      aiberle/pay-win.html
  10. 35 11
      aiberle/pro-details.html
  11. 5 7
      aiberle/pro-list.html
  12. 10 2
      aiberle/shopping-cart.html

+ 3 - 6
aiberle/clearing.html
查看文件 

@@ -15,12 +15,9 @@
 
 				/*pointer-events: none;*/
 
 				/*pointer-events: none;*/
 
 			}
 
 			}
 
 		</style>
 
 		</style>
 
-		<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.1.0.js"></script>
 
-		<script>
 
-			//屏蔽分享
 
-			//			document.addEventListener('WeixinJSBridgeReady', function onBridgeReady() {
 
-			//				WeixinJSBridge.call('hideOptionMenu');
 
-			//			});
 
+		<script type="text/javascript">
 
+			// 屏蔽分享
 
+			window.hiddenAllWechatMenu = true;
 
 		</script>
 
 		</script>
 
 	</head>
 
 	</head>

+ 3 - 3
aiberle/coupon_list.html
查看文件 

@@ -66,9 +66,9 @@
 
 		<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.1.0.js"></script>
 
 		<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.1.0.js"></script>
 
 		<script>
 
 		<script>
 
 			//屏蔽分享
 
 			//屏蔽分享
 
-//			document.addEventListener('WeixinJSBridgeReady', function onBridgeReady() {
 
-//				WeixinJSBridge.call('hideOptionMenu');
 
-//			});
 
+			document.addEventListener('WeixinJSBridgeReady', function onBridgeReady() {
 
+				WeixinJSBridge.call('hideOptionMenu');
 
+			});
 
 		</script>
 
 		</script>
 
 	</head>
 
 	</head>
 
 	<body>
 
 	<body>

+ 5 - 3
aiberle/css/main.css
查看文件 

@@ -23,7 +23,7 @@ abbr,acronym { border: 0; }
 
 100%{transform: rotate(360deg)}
 
 100%{transform: rotate(360deg)}
 
 }
 
 }
 
 body{background-color: #fff;font-size: 14px;}
 
 body{background-color: #fff;font-size: 14px;}
 
-p{color: #999;}
 
+p{color: #999;font-size: 12px;}
 
 .loading-bg{width: 100%;min-width:100%;height: 100%;min-height:100%; background-color:#F0F0F0;position: fixed;left: 0;top: 0;z-index: 999;}
 
 .loading-bg{width: 100%;min-width:100%;height: 100%;min-height:100%; background-color:#F0F0F0;position: fixed;left: 0;top: 0;z-index: 999;}
 
 .loading-bg .mui-loading{margin-top: 50%;text-align: center;color: #aaa;}
 
 .loading-bg .mui-loading{margin-top: 50%;text-align: center;color: #aaa;}
 
 .mui-content{background-color: #fff;}
 
 .mui-content{background-color: #fff;}
 
@@ -53,7 +53,7 @@ p{color: #999;}
 
 .mui-slider-indicator .mui-active.mui-indicator{background-color: #727171;width: 16px;}
 
 .mui-slider-indicator .mui-active.mui-indicator{background-color: #727171;width: 16px;}
 
 .mui-slider-indicator{bottom: 4px;}
 
 .mui-slider-indicator{bottom: 4px;}
 
 .mui-slider .mui-slider-group .mui-slider-item img{border-radius: 10px;}
 
 .mui-slider .mui-slider-group .mui-slider-item img{border-radius: 10px;}
 
-.index-title{padding: 14px 14px 0 14px;}
 
+.index-title{padding: 14px 14px 5px 14px;}
 
 .index-title .mui-pull-right{color: #727171;}
 
 .index-title .mui-pull-right{color: #727171;}
 
 .index-title font{display: inline-block;-webkit-transform: translateY(-3px);transform: translateY(-3px);}
 
 .index-title font{display: inline-block;-webkit-transform: translateY(-3px);transform: translateY(-3px);}
 
 .index-pro-tit{text-align: left;font-size: 14px;}
 
 .index-pro-tit{text-align: left;font-size: 14px;}
 
@@ -93,7 +93,9 @@ p{color: #999;}
 
 .my-view-no:after,.my-view-no:before{display: none;}
 
 .my-view-no:after,.my-view-no:before{display: none;}
 
 .add-cart{border: 1px solid rgba(0,0,0,.1);padding: 5px 5px 0 5px;float: left;border-radius: 5px;color: #bbb;}
 
 .add-cart{border: 1px solid rgba(0,0,0,.1);padding: 5px 5px 0 5px;float: left;border-radius: 5px;color: #bbb;}
 
 .btn-buy-now{color: #727171;width: 60% !important;border: 1px solid rgba(0,0,0,.1);font-weight: 600;border-radius: 5px;}
 
 .btn-buy-now{color: #727171;width: 60% !important;border: 1px solid rgba(0,0,0,.1);font-weight: 600;border-radius: 5px;}
 
-.index-title .icon-liwu{font-size: 16px;margin-right: 10px;color: #ff4b4b;}
 
+.index-title .icon-liwu{font-size: 16px;margin-right: 5px;color: #ff4b4b;}
 
+.details-title{padding: 14px 0 0 0;text-align: left;}
 
+.details-title .icon-liwu{font-size: 16px;margin-right: 5px;color: #ff4b4b;}
 
 .pro-price{color: #ff3b3b;text-align: left;padding: 0 0 5px 0;}
 
 .pro-price{color: #ff3b3b;text-align: left;padding: 0 0 5px 0;}
 
 .mui-table-view.mui-grid-view .mui-col-xs-5 .mui-media-object{width: 90%;padding-top: 3%;}
 
 .mui-table-view.mui-grid-view .mui-col-xs-5 .mui-media-object{width: 90%;padding-top: 3%;}
 
 .my-picker{position: fixed;bottom: 0;padding-top: 0;max-height: 500px; left: 0;width: 100%;z-index: 999; background-color: #fff; -webkit-transform: translateY(100%);transform: translateY(100%); -webkit-transition: .5s;transition: .5s;}
 
 .my-picker{position: fixed;bottom: 0;padding-top: 0;max-height: 500px; left: 0;width: 100%;z-index: 999; background-color: #fff; -webkit-transform: translateY(100%);transform: translateY(100%); -webkit-transition: .5s;transition: .5s;}

+ 1 - 7
aiberle/index.html
查看文件 

@@ -10,13 +10,6 @@
 
 		<link rel="stylesheet" type="text/css" href="css/mui.min.css" />

 		<link rel="stylesheet" type="text/css" href="css/mui.min.css" />

 		<link rel="stylesheet" type="text/css" href="css/iconfont.css" />

 		<link rel="stylesheet" type="text/css" href="css/iconfont.css" />

 		<link rel="stylesheet" type="text/css" href="css/main.css" />

 		<link rel="stylesheet" type="text/css" href="css/main.css" />

-		<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.1.0.js"></script>

-		<script>

-			//屏蔽分享

-//			document.addEventListener('WeixinJSBridgeReady', function onBridgeReady() {

-//				WeixinJSBridge.call('hideOptionMenu');

-//			});

-		</script>

 	</head>

 	</head>

 

 

 	<body>

 	<body>

@@ -137,6 +130,7 @@
 
 		<script src="js/jquery-2.1.1.min.js"></script>

 		<script src="js/jquery-2.1.1.min.js"></script>

 		<script src="js/jquery.autocompleter.js"></script>

 		<script src="js/jquery.autocompleter.js"></script>

 		<script src="js/main.js"></script>

 		<script src="js/main.js"></script>

+		<script src="js/wechat-utils-1.0.js"></script>

 		<script>

 		<script>

 			// 读取值

 			// 读取值

 			var colors = [];

 			var colors = [];

+ 4 - 4
aiberle/js/wechat-utils-1.0.js
查看文件 

@@ -14,10 +14,10 @@ if (window.hiddenAllWechatMenu == null) {
 
 	// 使用全局默认
 
 	// 使用全局默认
 
 	window.wxFriend = {
 
 	window.wxFriend = {
 
 	    "appId": "",
 
 	    "appId": "",
 
-	    "imgUrl":'http://s.iamberry.com/soodo/wechat/images/indexShare.jpg',
 
-	    "link":"http://s.iamberry.com/soodo/wechat/index.html",
 
-	    "desc":"让你的“笑容停留在18岁”",
 
-	    "title":"【soodo上朵】柔性声波电动牙刷，赠送您60元现金券",
 
+	    "imgUrl":'https://s.iamberry.com/aiberle/wechat/images/indexShare.jpg',
 
+	    "link":"https://s.iamberry.com/aiberle/wechat/index.html",
 
+	    "desc":"联合国授权官方合作品牌，5+品质标准，专注创新生活家电",
 
+	    "title":"Aiberle，源于美国，高端家电品质典范",
 
 	    "netError":"您的网络异常，请刷新重试!如多次刷新无效，请向我们反应 ~",
 
 	    "netError":"您的网络异常，请刷新重试!如多次刷新无效，请向我们反应 ~",
 
 	    "shareTimeSuccess":"这里是分享朋友圈后调用的文字",
 
 	    "shareTimeSuccess":"这里是分享朋友圈后调用的文字",
 
 	    "shareTimeCancel":"这里是取消分享给朋友圈后调用的文字",
 
 	    "shareTimeCancel":"这里是取消分享给朋友圈后调用的文字",

+ 3 - 3
aiberle/my-center.html
查看文件 

@@ -13,9 +13,9 @@
 
 		<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.1.0.js"></script>
 
 		<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.1.0.js"></script>
 
 		<script>
 
 		<script>
 
 			//屏蔽分享
 
 			//屏蔽分享
 
-			//			document.addEventListener('WeixinJSBridgeReady', function onBridgeReady() {
 
-			//				WeixinJSBridge.call('hideOptionMenu');
 
-			//			});
 
+			document.addEventListener('WeixinJSBridgeReady', function onBridgeReady() {
 
+				WeixinJSBridge.call('hideOptionMenu');
 
+			});
 
 		</script>
 
 		</script>
 
 	</head>
 
 	</head>

+ 3 - 3
aiberle/order-details.html
查看文件 

@@ -13,9 +13,9 @@
 
 		<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.1.0.js"></script>
 
 		<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.1.0.js"></script>
 
 		<script>
 
 		<script>
 
 			//屏蔽分享
 
 			//屏蔽分享
 
-			//			document.addEventListener('WeixinJSBridgeReady', function onBridgeReady() {
 
-			//				WeixinJSBridge.call('hideOptionMenu');
 
-			//			});
 
+			document.addEventListener('WeixinJSBridgeReady', function onBridgeReady() {
 
+				WeixinJSBridge.call('hideOptionMenu');
 
+			});
 
 		</script>
 
 		</script>
 
 	</head>
 
 	</head>

+ 3 - 3
aiberle/order-list.html
查看文件 

@@ -13,9 +13,9 @@
 
 	<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.1.0.js"></script>
 
 	<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.1.0.js"></script>
 
 	<script>
 
 	<script>
 
         //屏蔽分享
 
         //屏蔽分享
 
-        //			document.addEventListener('WeixinJSBridgeReady', function onBridgeReady() {
 
-        //				WeixinJSBridge.call('hideOptionMenu');
 
-        //			});
 
+         document.addEventListener('WeixinJSBridgeReady', function onBridgeReady() {
 
+          	WeixinJSBridge.call('hideOptionMenu');
 
+         });
 
 	</script>
 
 	</script>
 
 </head>
 
 </head>

+ 3 - 3
aiberle/pay-win.html
查看文件 

@@ -12,9 +12,9 @@
 
 		<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.1.0.js"></script>
 
 		<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.1.0.js"></script>
 
 		<script>
 
 		<script>
 
 			//屏蔽分享
 
 			//屏蔽分享
 
-//			document.addEventListener('WeixinJSBridgeReady', function onBridgeReady() {
 
-//				WeixinJSBridge.call('hideOptionMenu');
 
-//			});
 
+			document.addEventListener('WeixinJSBridgeReady', function onBridgeReady() {
 
+				WeixinJSBridge.call('hideOptionMenu');
 
+			});
 
 		</script>
 
 		</script>
 
 	</head>
 
 	</head>
 
 	<body style="background: #fff;">
 
 	<body style="background: #fff;">

+ 35 - 11
aiberle/pro-details.html
查看文件 

@@ -10,13 +10,6 @@
 
 		<link rel="stylesheet" type="text/css" href="css/mui.min.css" />
 
 		<link rel="stylesheet" type="text/css" href="css/mui.min.css" />
 
 		<link rel="stylesheet" type="text/css" href="css/iconfont.css" />
 
 		<link rel="stylesheet" type="text/css" href="css/iconfont.css" />
 
 		<link rel="stylesheet" type="text/css" href="css/main.css" />
 
 		<link rel="stylesheet" type="text/css" href="css/main.css" />
 
-		<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.1.0.js"></script>
 
-		<script>
 
-			//屏蔽分享
 
-//			document.addEventListener('WeixinJSBridgeReady', function onBridgeReady() {
 
-//				WeixinJSBridge.call('hideOptionMenu');
 
-//			});
 
-		</script>
 
 	</head>
 
 	</head>
 
 
 
 	<body>
 
 	<body>
 
@@ -96,8 +89,9 @@
 
 		<script src="js/mui.min.js"></script>
 
 		<script src="js/mui.min.js"></script>
 
 		<script src="js/jquery-2.1.1.min.js"></script>
 
 		<script src="js/jquery-2.1.1.min.js"></script>
 
 		<script src="js/main.js"></script>
 
 		<script src="js/main.js"></script>
 
+		<script src="js/wechat-utils-1.0.js"></script>
 
 		<script>
 
 		<script>
 
-			var productId = getParam("productId");
 
+			var productId = getParam("productId"),productName='',productRemark='';
 
 			console.log(productId);
 
 			console.log(productId);
 
 			
 			
 			mui.ready(function() {
 
 			mui.ready(function() {
 
@@ -156,11 +150,23 @@
 
 								
 								
 								var li = document.createElement('li');
 
 								var li = document.createElement('li');
 
 								li.className = 'mui-table-view-cell mui-media mui-col-xs-12';
 
 								li.className = 'mui-table-view-cell mui-media mui-col-xs-12';
 
-								li.innerHTML = '<a href="#"><div class="index-pro-tit">'+productInfo.productName+'</div>'
 
+								var zen='';
 
+								if(productInfo.productColorList.length>0){
 
+										$.each(productInfo.productColorList[0].salesUserGiftList, function() {
 
+											zen += this.giftName + "、"
 
+										});
 
+									}	
+									if(zen != '') {
 
+										zen = '<div class="details-title"><p><span class="iconfont icon-liwu"></span>' + zen.substring(0, zen.length - 1) + '</p></div>';
 
+									}
 
+									productName=productInfo.productName;
 
+									productRemark=productInfo.productRemark;
 
+								li.innerHTML = '<a><div class="index-pro-tit">'+productInfo.productName+'</div>'
 
 		                						+'<p class="mui-text-left">'+productInfo.productRemark+'<span style="float: right;color: #ff3b3b;">¥'+(productInfo.productDiscount/ 100).toFixed(2)+'</span></p></a>'
 
 		                						+'<p class="mui-text-left">'+productInfo.productRemark+'<span style="float: right;color: #ff3b3b;">¥'+(productInfo.productDiscount/ 100).toFixed(2)+'</span></p></a>'
 
-		                						+'<div class="index-title"><p><span class="iconfont icon-liwu"></span>美国aiberle咖啡杯、美国aiberle加湿器</p></div></br>'	
-		                						+'<a href="#"><img class="mui-media-object" src="'+productInfo.productIntroduceImg+'"></a>';
 
+		                						+zen+'</br>'	
+		                						+'<a><img class="mui-media-object" src="'+productInfo.productIntroduceImg+'"></a>';
 
 								table.appendChild(li);
 
 								table.appendChild(li);
 
+								fenxiang();
 
 							} else {
 
 							} else {
 
 								mui.alert("获取数据失败！");
 
 								mui.alert("获取数据失败！");
 
 							}
 
 							}
 
@@ -362,6 +368,24 @@
 
 					}
 
 					}
 
 				}
 
 				}
 
 			});
 
 			});
 
+			//分享			
+			function fenxiang(){
 
+				var src = location.href;
 
+					src = "https://s.iamberry.com/aiberle/wechat/pro-details.html?productId="+productId;
 
+						window.wxFriend = {
 
+							"appId": "",
 
+							"imgUrl": 'https://s.iamberry.com/aiberle/wechat/images/indexShare.jpg',
 
+							"link": src,
 
+							"desc": productRemark,
 
+							"title": 'Aiberle爱贝源-'+productName,
 
+							"netError": "您的网络异常，请刷新重试!如多次刷新无效，请向我们反应 ~",
 
+							"shareTimeSuccess": "分享成功",
 
+							"shareTimeCancel": "已取消分享",
 
+							"shareAppSuccess": "分享成功!",
 
+							"shareAppCancel": "已取消分享"
 
+						};
 
+				getConfig();
 
+			}
 
 		</script>
 
 		</script>
 
 	</body>
 
 	</body>

+ 5 - 7
aiberle/pro-list.html
查看文件 

@@ -10,13 +10,6 @@
 
 		<link rel="stylesheet" type="text/css" href="css/mui.min.css" />

 		<link rel="stylesheet" type="text/css" href="css/mui.min.css" />

 		<link rel="stylesheet" type="text/css" href="css/iconfont.css" />

 		<link rel="stylesheet" type="text/css" href="css/iconfont.css" />

 		<link rel="stylesheet" type="text/css" href="css/main.css" />

 		<link rel="stylesheet" type="text/css" href="css/main.css" />

-		<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.1.0.js"></script>

-		<script>

-			//屏蔽分享

-//			document.addEventListener('WeixinJSBridgeReady', function onBridgeReady() {

-//				WeixinJSBridge.call('hideOptionMenu');

-//			});

-		</script>

 	</head>

 	</head>

 

 

 	<body>

 	<body>

@@ -127,6 +120,7 @@
 
 		<script src="js/mui.min.js"></script>

 		<script src="js/mui.min.js"></script>

 		<script src="js/jquery-2.1.1.min.js"></script>

 		<script src="js/jquery-2.1.1.min.js"></script>

 		<script src="js/main.js"></script>

 		<script src="js/main.js"></script>

+		<script src="js/wechat-utils-1.0.js"></script>

 		<script>

 		<script>

 			var search_data = null,

 			var search_data = null,

 				typeId = '';

 				typeId = '';

@@ -479,6 +473,10 @@ window.addEventListener("popstate", function() {
 
 					}

 					}

 				}

 				}

 			});

 			});

+		//产品详情

+			$(document).on('tap', '.pro-table-pull>li', function() {

+				location.href = 'pro-details.html?productId=' + $(this).attr("name")

+			});	

 		</script>

 		</script>

 	</body>

 	</body>

文件差异内容过多而无法显示
+ 10 - 2
aiberle/shopping-cart.html