1:爱贝源增加新产品

2:上朵618活动过期

aiberle/index.html

@@ -63,8 +63,8 @@
 				<!--banner位置-->
 				<div class="index-banner" style="display: none;"></div>
 			</div>
-			<div class="index-title">
-				<strong>精选产品</strong><span class="mui-pull-right go_pro_list"><font>More</font><span class="mui-icon mui-icon-arrowright"></span></span>
+			<div class="index-title" style="margin-top: 20px;">
+				<strong style="font-size: 16px;">精选产品</strong><span class="mui-pull-right go_pro_list"><font>More</font><span class="mui-icon mui-icon-arrowright"></span></span>
 			</div>
 			<ul class="mui-table-view mui-grid-view my-view-no" id="index-pro-list" style="padding-bottom: 0;">
 				<!--<li class="mui-table-view-cell mui-media mui-col-xs-12">
@@ -97,8 +97,8 @@
 		            </a>
 		        </li>-->
 			</ul>
-			<div class="index-title">
-				<strong>产品配件</strong><span class="mui-pull-right go_pro_list" pos="bottom"><font>More</font><span class="mui-icon mui-icon-arrowright"></span></span>
+			<div class="index-title" style="margin-top: 20px;">
+				<strong style="font-size: 16px;">产品配件</strong><span class="mui-pull-right go_pro_list" pos="bottom"><font>More</font><span class="mui-icon mui-icon-arrowright"></span></span>
 			</div>
 			<div style="margin:8px 14px 30px 14px;">
 				<div id="index-pro-items" class="mui-segmented-control">
@@ -228,9 +228,10 @@
 								mui(jingxuan1).each(function(index) {
 									var li = document.createElement('li');
 									li.className = 'mui-table-view-cell mui-media mui-col-xs-12';
+									li.style.margin='0px 0px 7px 0px';
 									//console.log(this.productColorList[0].colorDiscount)
 									if(this.productColorList != null && this.productColorList.length > 0){
-										li.innerHTML = '<a name="' + this.productId + '"><img class="mui-media-object" src="' + this.productChoicenessIm + '"><div class="index-pro-tit">' + this.productName + '</div><p class="mui-text-left">' + this.productColorDes + '<span class="f-price">¥' + accDiv(this.productColorList[0].colorDiscount , 100) + '</span></p></a>';
+										li.innerHTML = '<a name="' + this.productId + '"><img class="mui-media-object" src="' + this.productChoicenessIm + '"><div class="index-pro-tit" style="margin-top: 10px;" >' + this.productName + '</div><p class="mui-text-left">' + this.productColorDes + '<span class="f-price">¥' + accDiv(this.productColorList[0].colorDiscount , 100) + '</span></p></a>';
 										table.appendChild(li);
 									}
 								});
@@ -241,7 +242,7 @@
 									var li = document.createElement('li');
 									li.className = 'mui-table-view-cell mui-media mui-col-xs-6';
 									if(this.productColorList != null && this.productColorList.length > 0){
-										li.innerHTML = '<a name="' + this.productId + '"><img class="mui-media-object" src="' + this.productChoicenessIm + '"><div class="index-pro-tit">' + this.productName + '</div><p class="mui-text-left">' + this.productColorDes + '</p><p class="l-price">¥' + accDiv(this.productColorList[0].colorDiscount , 100) + '</p></a>';
+										li.innerHTML = '<a name="' + this.productId + '"><img class="mui-media-object" style="background-color: #f9f7f8;border-radius: 5px;" src="' + this.productChoicenessIm + '"><div class="index-pro-tit" style="margin-top: 10px;">' + this.productName + '</div><p class="mui-text-left">' + this.productColorDes + '</p><p class="l-price" style="margin-top: 5px;">¥' + accDiv(this.productColorList[0].colorDiscount , 100) + '</p></a>';
 										table.appendChild(li);
 									}
 								});

aiberle/pro-details.html

@@ -73,7 +73,7 @@
 				</div>
 			</div>-->
 			</div>
-			<ul class="mui-table-view mui-grid-view my-view-no" style="padding-bottom: 0;">
+			<ul class="mui-table-view mui-grid-view my-view-no" style="padding-bottom: 0;padding: 0px;">
 				<!--<li class="mui-table-view-cell mui-media mui-col-xs-12" style="padding-right: 2px;">
 		            <a href="#">
 		                <div class="index-pro-tit">[精选] Aiberle美国智能净饮水一体机</div>
@@ -167,6 +167,7 @@
 
 								var li = document.createElement('li');
 								li.className = 'mui-table-view-cell mui-media mui-col-xs-12';
+								li.style.padding="10px 10px 0px 10px";
 								var zen = '';
 								if(productInfo.productColorList.length > 0) {
 									$.each(productInfo.productColorList[0].salesUserGiftList, function() {
@@ -179,9 +180,9 @@
 								productName = productInfo.productName;
 								productRemark = productInfo.productColorDes;
 								productIntroduceImg = productInfo.productParameterImg;
-								li.innerHTML = '<a><div class="index-pro-tit">' + productInfo.productName + '</div>' +
+								li.innerHTML = '<a><div class="index-pro-tit" style="margin-top: 5px;">' + productInfo.productName + '</div>' +
 									'<p class="mui-text-left" >' + productInfo.productColorDes + '</p></a>' +
-									'<p class="mui-text-left"><span style="color: #ff3b3b;font-size: 15px;">¥' + (productInfo.productDiscount / 100).toFixed(2) + '</span>  <span style="float: right;">' + productInfo.productSalesnum + '已售</span></p></a>' +
+									'<p class="mui-text-left" style="margin-top: 5px;"><span style="color: #ff3b3b;font-size: 15px;">¥' + (productInfo.productDiscount / 100).toFixed(2) + '</span>  <span style="float: right;">' + productInfo.productSalesnum + '已售</span></p></a>' +
 									zen + '</br>' +
 									productInfo.imagetextContext +
 									'';

tooth/index-2018-618-list.html

@@ -117,6 +117,12 @@
 			});
 			
 			mui.ready(function() {
+				
+					mui.alert("活动已过期!", function() {
+						location.href = "index.html?dates=" + new Date().getTime(); // 前往首页
+					});
+					return false;
+				
 				$.ajax(base_path + '/wechat/activity/to_activity?dates=' + new Date().getTime(), {
 					data: {},// ajax参数 没有则不写
 					dataType: 'json',

tooth/index-2018-618.html

@@ -47,6 +47,14 @@
 			});
 			
 			mui.ready(function() {
+				
+
+				mui.alert("活动已过期!", function() {
+					location.href = "index.html?dates=" + new Date().getTime(); // 前往首页
+				});
+				return false;
+				
+				
 				$.ajax(base_path + '/wechat/activity/get_activity?dates=' + new Date().getTime(), {
 					data: {},// ajax参数 没有则不写
 					dataType: 'json',