积分商城

tooth/cash-coupon-log.html

@@ -62,7 +62,7 @@
 				++pageNumber; //每次上拉页数+1
 				$.ajax(base_path + '/wechat/integral_order/list_order?dates=' + new Date().getTime(), {
 					data: {
-						"pageNo": pageNumber, //pageNo第几页
+						"pageNO": pageNumber, //pageNo第几页
 						"pageSize": pagesize //pageSize每页条数
 					},
 					dataType: 'json',

tooth/clearing.html

@@ -323,7 +323,7 @@
 					if(price <= 0) {
 						price = 0.0; //判断商品价格减去现金券价格若<0 则显示0
 					}
-					$(".pay_price").text(price.toFixed(2));
+					$(".pay_price").text(price);
 				} else {
 					yhq_id = '';
 					$(".btn-youhuiquan").removeAttr("couponid");

tooth/coupon_list.html

@@ -90,12 +90,17 @@
 									if(this.couponType == 1) { //减免金额
 										couponReduceHtml += '<span>' + (this.couponReduce / 100).toFixed(0) + '</span>元';
 									} else if(this.couponType == 2) { //减免率
-										couponReduceHtml += '<span>' + (this.couponReduce / 100).toFixed(1) + '</span>折';
+										couponReduceHtml += '<span>' + (this.couponReduce / 10).toFixed(1) + '</span>折';
 									}
 									
 
 									/*使用条件*/
-									var couponConsumeEnoughHtml = '满'+(this.couponConsumeEnough / 100).toFixed(0)+'元可用'
+									var couponConsumeEnoughHtml = "";
+									if(this.couponToothbrushEnough != 0){
+										couponConsumeEnoughHtml += '牙刷满'+(this.couponToothbrushEnough / 100).toFixed(0)+'元可用';
+									}else{
+										couponConsumeEnoughHtml = '满'+(this.couponConsumeEnough / 100).toFixed(0)+'元可用'
+									}
 									if(this.couponId == 20000){
 										couponConsumeEnoughHtml = '购买刷头使用<br>可兑换“柔羽呵护”或“温和洁净”刷头1支';
 									}else if(this.couponId == 30000){

tooth/js/main.js

@@ -1,5 +1,5 @@
 var domanUrl = "//" + window.location.host;
-var base_path = "//w.iamberry.com/tooth";
+var base_path = "//test.iamberry.com/tooth";
 //var base_path = domanUrl+"/tooth";
 
 //ajax loading