Home Explore Help
Sign In
liujiankang
/
static
Watch 1
Star 0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

疫情主题更换，包含首页，主图，背景色

wangxiaoming 5 years ago
parent
b06fe85f2e
commit
5c74948687
11 changed files with 24 additions and 25 deletions
Unified View Show Diff Stats
  1. 9 11
      aiberle/ia_air_purifier_01.html
  2. 1 1
      aiberle/index.html
  3. 1 1
      aiberle/order-list.html
  4. 1 1
      aiberle/pro-details.html
  5. 2 2
      aiberle/pro-list.html
  6. 1 1
      aiberle/shopping-cart.html
  7. 3 2
      watero/index.html
  8. 1 1
      watero/js/page/chanpin_details.js
  9. 2 2
      watero/js/page/chanpin_list.js
  10. 1 1
      watero/js/page/order_list.js
  11. 2 2
      watero/js/page/shopping_cart.js

+ 9 - 11
aiberle/ia_air_purifier_01.html
View File 

@@ -20,13 +20,11 @@
 
 	</head>
 
 	</head>
 
 	
 	
 	<body>
 
 	<body>
 
-		<div class="back" style="width: 100%; height: 100%;">
 
+		<!-- <div class="back" style="width: 100%; height: 100%;">
 
 			<div style="height: 107px;"></div>
 
 			<div style="height: 107px;"></div>
 
 			<div class="receive"><img src="images/ia_air_receive.png" alt="" style="width: 66%;display: block;margin-left: 19%;margin-top: 20px;margin-bottom: 35px;"></div>
 
 			<div class="receive"><img src="images/ia_air_receive.png" alt="" style="width: 66%;display: block;margin-left: 19%;margin-top: 20px;margin-bottom: 35px;"></div>
 
 			<div class="product_to"><img src="images/ia_air_purifier_product.jpg" alt="" style="width: 66%;display: block;margin-left: 18%;    margin-bottom: 85px;"></div>
 
 			<div class="product_to"><img src="images/ia_air_purifier_product.jpg" alt="" style="width: 66%;display: block;margin-left: 18%;    margin-bottom: 85px;"></div>
 
-			<!-- <div><img src="images/ia_air_purifier.jpg" alt="" style="width: 20%;display: block;margin-left: 40%;margin-top: 9px;"></div> -->
 
-			<!-- <div style="height: 20px; text-align: center; font-size: 13px; color: #ffffff; margin-bottom: 0px;">扫码领券购买</div> -->
 
-		</div>
 
+		</div> -->
 
 		
 		
 		<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>
 
@@ -47,6 +45,7 @@
 
 					if(dt.isRedirect) {
 
 					if(dt.isRedirect) {
 
 						location.href = dt.redirectURL;
 
 						location.href = dt.redirectURL;
 
 					} else {
 
 					} else {
 
+						receiveCoupon();
 
 						console.log("用户信息刷新成功或今日已经刷新");
 
 						console.log("用户信息刷新成功或今日已经刷新");
 
 					}
 
 					}
 
 				},
 
 				},
 
@@ -56,8 +55,7 @@
 
 			});
 
 			});
 
 		});
 
 		});
 
 		
 		
-		
-		$(document).on('tap', '.receive', function() {
 
+		function receiveCoupon(){
 
 			$.ajax(base_path + '/wechat/coupon/receive_coupon_end?dates=' + new Date().getTime(), {
 
 			$.ajax(base_path + '/wechat/coupon/receive_coupon_end?dates=' + new Date().getTime(), {
 
 				data: {
 
 				data: {
 
 					"couponId": 50001
 
 					"couponId": 50001
 
@@ -78,11 +76,11 @@
 
 						// } else {
 
 						// } else {
 
 						// 	mui.toast(dt.message);
 
 						// 	mui.toast(dt.message);
 
 						// }
 
 						// }
 
-						mui.alert(dt.message, function() {
 
-							mui.openWindow({
 
-								url: 'pro-details.html?productId=53'
 
-							});
 
+						mui.openWindow({
 
+							url: 'pro-details.html?productId=53'
 
 						});
 
 						});
 
+						// mui.alert(dt.message, function() {
 
+						// });
 
 					}
 
 					}
 
 				},
 
 				},
 
 				error: function(xhr, type, errorThrown) {
 
 				error: function(xhr, type, errorThrown) {
 
@@ -91,7 +89,7 @@
 
 					});
 
 					});
 
 				}
 
 				}
 
 			});
 
 			});
 
-		});
 
+		}
 
 		
 		
 		$(document).on('tap', '.product_to', function() {
 
 		$(document).on('tap', '.product_to', function() {
 
 			mui.openWindow({
 
 			mui.openWindow({

+ 1 - 1
aiberle/index.html
View File 

@@ -248,7 +248,7 @@
 
 									li.className = 'mui-table-view-cell mui-media mui-col-xs-6';

 									li.className = 'mui-table-view-cell mui-media mui-col-xs-6';

 									if (this.productColorList != null && this.productColorList.length > 0) {

 									if (this.productColorList != null && this.productColorList.length > 0) {

 										li.innerHTML = '<a name="' + this.productId +

 										li.innerHTML = '<a name="' + this.productId +

-											'"><img class="mui-media-object" style="background-color: #f9f7f8;border-radius: 5px;" src="' + this.productChoicenessIm +

+											'"><img class="mui-media-object" style="background-color: #eff6f6;border-radius: 5px;" src="' + this.productChoicenessIm +

 											'"><div class="index-pro-tit" style="margin-top: 10px;">' + this.productName +

 											'"><div class="index-pro-tit" style="margin-top: 10px;">' + this.productName +

 											'</div><p class="mui-text-left">' + this.productColorDes +

 											'</div><p class="mui-text-left">' + this.productColorDes +

 											'</p><p class="l-price" style="margin-top: 5px;">¥' + accDiv(this.productColorList[0].colorDiscount,

 											'</p><p class="l-price" style="margin-top: 5px;">¥' + accDiv(this.productColorList[0].colorDiscount,

+ 1 - 1
aiberle/order-list.html
View File 

@@ -224,7 +224,7 @@
 
                                 var txt_item = this;

                                 var txt_item = this;

                                 color_num += txt_item.itemNum;

                                 color_num += txt_item.itemNum;

                                 a += '<li class="mui-table-view-cell mui-media mui-col-xs-4 mui-text-left">'

                                 a += '<li class="mui-table-view-cell mui-media mui-col-xs-4 mui-text-left">'

-                                    + '<a href="javascript:void(0)"><img class="mui-media-object go_order_sesc" val="'+ txt_order.salesOrderid +'" src="' + txt_item.itemProductPic + '"></a>'

+                                    + '<a href="javascript:void(0)"><img class="mui-media-object go_order_sesc" style="background-color: #eff6f6;" val="'+ txt_order.salesOrderid +'" src="' + txt_item.itemProductPic + '"></a>'

                                     + '</li>'

                                     + '</li>'

                                     + '<li class="mui-table-view-cell mui-media mui-col-xs-8 mui-text-left">'

                                     + '<li class="mui-table-view-cell mui-media mui-col-xs-8 mui-text-left">'

                                     + '<a>'

                                     + '<a>'

File diff suppressed because it is too large
+ 1 - 1
aiberle/pro-details.html


File diff suppressed because it is too large
+ 2 - 2
aiberle/pro-list.html


File diff suppressed because it is too large
+ 1 - 1
aiberle/shopping-cart.html


+ 3 - 2
watero/index.html
View File 

@@ -32,7 +32,7 @@
 
 			.index-title strong { font-size: 17px; } 
 			.index-title strong { font-size: 17px; } 
 			.index-title .mui-pull-right { color: #333; } 
 			.index-title .mui-pull-right { color: #333; } 
 			.index-title font { display: inline-block; -webkit-transform: translateY(-1px); transform: translateY(-1px); }
 
 			.index-title font { display: inline-block; -webkit-transform: translateY(-1px); transform: translateY(-1px); }
 
- 			.pro-list .mui-media-object { background: #f2f2f2; border-radius: 5px; display: block; }
 
+ 			.pro-list .mui-media-object { background: #eff5f7; border-radius: 5px; display: block; }
 
 			.pro-list:before,.pro-list:after {display: none;} 
 			.pro-list:before,.pro-list:after {display: none;} 
 			.pro-list.mui-table-view.mui-grid-view>li:nth-child(odd) {padding: 10px 8px 0 14px;}
 
 			.pro-list.mui-table-view.mui-grid-view>li:nth-child(odd) {padding: 10px 8px 0 14px;}
 
 			.pro-list.mui-table-view.mui-grid-view>li:nth-child(even) {padding: 10px 0 0 22px;}
 
 			.pro-list.mui-table-view.mui-grid-view>li:nth-child(even) {padding: 10px 0 0 22px;}
 
@@ -152,7 +152,7 @@
 
 			</div>
 
 			</div>
 
 			<!--list开始-->
 
 			<!--list开始-->
 
 			<div class="chanpin-box">
 
 			<div class="chanpin-box">
 
-				<ul class="mui-table-view mui-grid-view pro-list">
 
+				<ul class="mui-table-view mui-grid-view pro-list" style="padding: 0px;">
 
 					<!--<li class="mui-table-view-cell mui-media mui-col-xs-6">
 
 					<!--<li class="mui-table-view-cell mui-media mui-col-xs-6">
 
 						<a proid="34" colorid="1" class="go_chanpin_details"><img class="mui-media-object" src="http://s.iamberry.com/watero/images/shop/cp-blue.png">
 
 						<a proid="34" colorid="1" class="go_chanpin_details"><img class="mui-media-object" src="http://s.iamberry.com/watero/images/shop/cp-blue.png">
 
 							<div class="mui-text-left">
 
 							<div class="mui-text-left">
 
@@ -357,6 +357,7 @@
 
 							mui(chanpin_data).each(function(index) {
 
 							mui(chanpin_data).each(function(index) {
 
 								var pro_color = this.colorName;
 
 								var pro_color = this.colorName;
 
 								var li = document.createElement('li');
 
 								var li = document.createElement('li');
 
+								li.style.padding = '0% 1% 1% 5%';  
 								li.className = 'mui-table-view-cell mui-media mui-col-xs-6';
 
 								li.className = 'mui-table-view-cell mui-media mui-col-xs-6';
 
 								var yuanjia = '<s>¥' + accDiv(this.colorPrice, 100) + '</s>';
 
 								var yuanjia = '<s>¥' + accDiv(this.colorPrice, 100) + '</s>';
 
 								if(marquee != '' && this.colorDiscount == '328000') {
 
 								if(marquee != '' && this.colorDiscount == '328000') {

File diff suppressed because it is too large
+ 1 - 1
watero/js/page/chanpin_details.js


File diff suppressed because it is too large
+ 2 - 2
watero/js/page/chanpin_list.js


File diff suppressed because it is too large
+ 1 - 1
watero/js/page/order_list.js


File diff suppressed because it is too large
+ 2 - 2
watero/js/page/shopping_cart.js