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

aiberle/clearing.html

@@ -132,7 +132,7 @@ var yhq_id='';			mui.ready(function() {
 											console.log("有优惠券" + dt.data.couponItems.length + "张")
 											var str='';
 											mui.each(dt.data.couponItems,function(){
-												str+= '<li class="my-table-view-cell" style="opacity:.5"><div class="mui-table"><div class="mui-table-cell table-middle mui-col-xs-11">优惠券：¥'+ ((this.couponConsumeEnough)/100).toFixed(2)+'<h6>有效期至：'+this.couponUseEndDate+'</h6></div><div class="mui-table-cell table-middle mui-col-xs-1"><input name="checkbox" val="'+(this.couponConsumeEnough/100).toFixed(2)+'" type="checkbox" class="mui-pull-left" id="'+this.couponId+'"/></div></div></li>';
+												str+= '<li class="my-table-view-cell" style="opacity:.5"><div class="mui-table"><div class="mui-table-cell table-middle mui-col-xs-11">优惠券：¥'+ ((this.couponReduce)/100).toFixed(2)+'<h6>有效期至：'+this.couponUseEndDate+'</h6></div><div class="mui-table-cell table-middle mui-col-xs-1"><input name="checkbox" val="'+(this.couponReduce/100).toFixed(2)+'" type="checkbox" class="mui-pull-left" id="'+this.couponItemId+'"/></div></div></li>';
 											});
 											$("body").append('<div class="my-picker"><ul class="mui-table-view mui-table-view-striped mui-table-view-condensed my-grid-view-no" style="padding: 20px 0 30px 0;overflow: scroll;max-height: 400px;">' + str + '</ul><button class="mui-btn my-btn-block my-btn-buy-know" disabled="disabled">确认使用</button></div>');
 										}
@@ -218,6 +218,14 @@ var yhq_id='';			mui.ready(function() {
 				$(".my-picker").removeClass("active");
 				$(".mui-backdrop").css("opacity",0).remove();
 				$(".btn-youhuiquan>span").text("-¥"+$("input[name=checkbox]:checked").attr("val")).show();
+				
+				var cout = $("input[name=checkbox]:checked").attr("val");
+				var count_price = payTotal - cout*100;
+				
+				if(count_price <= 0) {
+					count_price = 0.0; //判断商品价格减去现金券价格若<0 则显示0
+				}
+				$(".count_price").text((count_price/100).toFixed(2));
 			});
 	// 获取微信共享地址
 	$(document).on('tap', '#user-address-div', function() {

aiberle/css/main.css

@@ -97,7 +97,7 @@ p{color: #999;font-size: 12px;}
 .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: right;padding: 5px 0 10px 0;font-size: 16px;}
 .fixed-cart{position: fixed;right: 10px;bottom:80px;line-height: 50px;text-align: center; border-radius: 50%;background-color:rgba(0,0,0,.1);width: 50px;height:50px;}
 .my-badge-danger{position: absolute;top: 6px;right: 4px;background-color: #f00;color: #fff;display: none;}
 .mui-table-view.mui-grid-view .mui-col-xs-5 .mui-media-object{width: 90%;padding-top: 3%;}

aiberle/exchange-goods.html

@@ -57,7 +57,7 @@
 				<p id="msg"></p>
 				<br />
 				<div class="mui-content-padded mui-text-center">
-					<button type="button" class="my-btn-black" id="orderUpdateStatus">提交</button>
+					<button type="button" class=" mui-btn my-btn-request" id="orderUpdateStatus">提交</button>
 				</div>
 			</div>
 		</div>

aiberle/logistics-massage.html

@@ -76,6 +76,7 @@
 							</aside>
 						</section>-->
 					</article>
+					
 				</div>
 			</div>
 			<!-- 加载ing begin-->
@@ -168,11 +169,19 @@
 						} else {
 							console.log(dt);
 							var html = "";
+							if(dt.data.data == null || dt.data.data == "" || typeof(dt.data.data) == "undefined" || dt.data.data.length < 1){
+								$(".content").html('<div class="mui-text-center">暂无物流信息</div>');
+								return;
+							}
 							mui.each(dt.data.data, function(index) {
 								var logisticsDate = this.time.substring(0,10);
-								html += '<section style="opacity: .5;">'
+								if(index == 0){
+									html += '<section>'
+								}else{
+									html += '<section style="opacity: .5;">'
+								}
 								html += '<span class="point-time"></span>'
-								html += '<time datetime="2014-07"><span>'+ logisticsDate +'</span></time>'
+								html += '<time><span>'+ logisticsDate +'</span></time>'
 								html += '<aside>'
 								html += '<div class="things">'+ this.context +'</div>'
 								html += '<div class="brief">'+ this.time +'</div>'
@@ -180,9 +189,9 @@
 								html += '</section>'
 							});
 							
-							html += '<button type="button" class="my-btn-black order_operate" style="margin: 0 auto;width: 100px;display: block;" fixedStatus="aftermarket" orderId>返回</button>'
-							
 							$("#logistic").html(html);
+							
+							$(".content").append('<button type="button" class="my-btn-black order_operate" style="margin: 0 auto;width: 100px;display: block;" fixedStatus="aftermarket" orderId>返回</button>')
 						}
 					},
 					error: function(xhr, type, errorThrown) {

aiberle/my-center.html

@@ -102,7 +102,8 @@
 						</div>
 					</div>
 				</li>
-				<li class="mui-table-view-cell" href="coupon_list.html">
+				<li class="mui-table-view-cell" >
+					<!--href="coupon_list.html"-->
 					<div class="mui-table">
 						<div class="mui-table-cell mui-col-xs-5 table-middle">
 							<span class="iconfont icon-quanbao"></span>券包

aiberle/order-details.html

@@ -18,26 +18,6 @@
 
 	<body>
 		
-		<footer class="mui-bar mui-bar-tab" id="footer-bar-tab">
-			<a class="mui-tab-item">
-				<span class="iconfont icon-shouye"></span>
-				<span class="mui-tab-label">首页</span>
-			</a>
-			<a class="mui-tab-item">
-				<span class="iconfont icon-gouwuche"></span>
-				<span class="mui-tab-label">购物车</span>
-			</a>
-			<a class="mui-tab-item mui-active">
-				<span class="iconfont icon-dingdan"></span>
-				<span class="mui-tab-label">订单</span>
-			</a>
-			<a class="mui-tab-item ">
-				<span class="iconfont icon-wode"></span>
-				<span class="mui-tab-label">我的</span>
-			</a>
-		</footer>
-		
-		
 		<div class="loading-bg">
 			<div class="mui-loading">
 				<div class="mui-spinner">
@@ -90,6 +70,9 @@
 					<li>
 						下单时间：<span id="salesCreateDate"></span>
 					</li>
+					<li id="salesUserRemarkShow" style="display: none;">
+						订单备注：<span id="salesUserRemark"></span>
+					</li>
 				</ul>
 				<!--<textarea id="textarea" rows="1" placeholder="如您选择退款，请先输入退款原因！" style="background-color: #f9f9f9;border: 0;margin:0;padding: 15px;font-size: 14px;"></textarea>-->
 				<div class="mui-content-padded mui-text-center" id="operation">
@@ -172,11 +155,11 @@
 										logisticsHtml = '<button type="button" class="mui-btn my-btn-request logistics" style="margin-right: 20px;">查看物流</button>';
 									}
 								} 
-								var payHtml = '<button type="button" class="mui-btn my-btn-request go_pay"  style="margin-right: 20px;">立即支付</button>';
-								var cancelOrderHtml = '<button type="button" class="mui-btn my-btn-request go_cancel"  style="margin-right: 20px;">取消订单</button>';
-								var aftermarketHtml = '<button type="button" class="mui-btn my-btn-request go_aftermarket" style="margin-right: 20px;">我要售后</button>';
-								var cancelHtml = '<button type="button" class="mui-btn my-btn-request go_cancel" style="margin-right: 20px;">取消申请</button>';
-								var confirmHtml = '<button type="button" class="mui-btn my-btn-request go_confirm" style="margin-right: 20px;">确认收货</button>';
+								var payHtml = '<button type="button" class="mui-btn my-btn-request go_pay"  style="margin-left: 10px;">立即支付</button>';
+								var cancelOrderHtml = '<button type="button" class="mui-btn my-btn-request go_cancel"  style="margin-left: 10px;">取消订单</button>';
+								var aftermarketHtml = '<button type="button" class="mui-btn my-btn-request go_aftermarket" style="margin-left: 10px;">我要售后</button>';
+								var cancelHtml = '<button type="button" class="mui-btn my-btn-request go_cancel" style="margin-left: 10px;">取消申请</button>';
+								var confirmHtml = '<button type="button" class="mui-btn my-btn-request go_confirm" style="margin-left: 10px;">确认收货</button>';
 								/*订单状态*/
 								var statusName = "";
 								var operationHtml = "";
@@ -208,7 +191,7 @@
 										operationHtml += cancelHtml + logisticsHtml;
 										break;
 									case 7 : 
-										statusName = "退货中";
+										statusName = "退货中（请尽快寄回产品）";
 										operationHtml += cancelHtml;
 										break;
 									case 8 : 
@@ -235,6 +218,10 @@
 								$("#orderId").html(order.salesOrderid);
 								$("#salesCreateDate").html(order.salesCreateDate);
 								$("#salesYetAmount").html(accDiv(order.salesYetAmount,100));
+								$("#salesUserRemark").html(order.salesUserRemark);
+								if(order.salesUserRemark != null && order.salesUserRemark != "" && typeof(order.salesUserRemark) != 'undefined'){
+									$("#salesUserRemarkShow").show();
+								}
 								$("#num").html(num);
 								$("#operation").html(operationHtml);
 							}

aiberle/order-list.html

@@ -20,11 +20,12 @@
 	<div id="pro-menu" class="mui-segmented-control tab-with-orderlist">
 		<a class="mui-control-item icon-topay" tabindex="0" href="#item1">待支付</a>
 		<a class="mui-control-item icon-todelivery" href="#item2" tabindex="1">待发货</a>
-		<a class="mui-control-item icon-delivery" href="#item3" tabindex="2">待收货</a>
+		<a class="mui-control-item icon-delivery" href="#item3" tabindex="2">已发货</a>
 		<a class="mui-control-item icon-allorder" href="#item4" tabindex="3">全部</a>
 	</div>
 </header>
-<!--<footer class="mui-bar mui-bar-tab" id="footer-bar-tab">
+
+		<footer class="mui-bar mui-bar-tab" id="footer-bar-tab">
 			<a class="mui-tab-item">
 				<span class="iconfont icon-shouye"></span>
 				<span class="mui-tab-label">首页</span>
@@ -37,11 +38,12 @@
 				<span class="iconfont icon-dingdan"></span>
 				<span class="mui-tab-label">订单</span>
 			</a>
-			<a class="mui-tab-item">
+			<a class="mui-tab-item ">
 				<span class="iconfont icon-wode"></span>
 				<span class="mui-tab-label">我的</span>
 			</a>
-		</footer>-->
+		</footer>
+		
 <!-- 上拉加载数据 -->
 <div id="pullrefresh_order_list" class="mui-content mui-scroll-wrapper">
 	<div class="mui-scroll">
@@ -262,7 +264,7 @@
                             	a += ali2;
                             } else if (txt_order.salesStatus == 5) {
                             	a += ali;
-                                a += '<button type="button" class="my-order-btn" onclick="confirm_receipt(\'' + txt_order.salesOrderid + '\',\'' + txt_order.salesStatus + '\')">确认收货</button>';
+                                //a += '<button type="button" class="my-order-btn" onclick="confirm_receipt(\'' + txt_order.salesOrderid + '\',\'' + txt_order.salesStatus + '\')">确认收货</button>';
                             	a += orderDesc;
                             	a += ali2;
                             }else{

aiberle/pay-win.html

@@ -34,11 +34,11 @@
 				<p>感谢您的购买</p>
 				</div>
 				<div style="margin:-40px auto 0 auto;width:240px;text-align: center;">
-					<img width="160px" src="images/qrcode.png" />
-					<p>
-					长按识别，关注aiberle公众号<br /> 随时查看订单信息
-				</p>
-				<div style="padding: 20px 0;">
+					<img width="160px" src="images/qrcode.png" class="code_show"  style="display: none;"/>
+					<p style="padding-bottom: 20px;display: none;" class="code_show" >
+						长按识别，关注aiberle公众号<br /> 随时查看订单信息
+					</p>
+				<div style="">
 					<button type="button" class="mui-btn my-btn go-pro-list">继续逛逛</button>&nbsp;&nbsp;&nbsp;&nbsp;
 					<button type="button" class="mui-btn my-btn go_order_details">查看订单</button>
 				</div>
@@ -51,6 +51,33 @@
 	var orderId=getParam("orderId");		
 	mui.ready(function(){
 		console.log("页面加载完毕")
+		
+		$.ajax(base_path + '/wechat/agent/member?dates=' + new Date().getTime(), {
+					dataType: 'json',
+					type: 'post',
+					xhrFields: {
+						withCredentials: true
+					},
+					crossDomain: true,
+					timeout: 15000,
+					success: function(dt) {
+						var data = dt.data;
+						if(dt.status) {
+							console.log(data);
+							if(data.userStatus == null || data.userStatus == "" || typeof(data.userStatus) == "undefined" || data.userStatus !=2){
+								$(".code_show").show();
+							}
+						} else {
+							$(".code_show").show();
+						}
+					},
+					error: function(xhr, type, errorThrown) {
+						//异常处理；
+						console.log(xhr);
+					}
+				});
+		
+		
 		document.querySelector('.loading-bg').style.display='none';
 	});
 	//跳转订单详情
@@ -65,6 +92,8 @@
 			url: 'pro-list.html'
 		});
 	});
+	
+	
 	</script>
 	</body>
 </html>

aiberle/water-faq.html

@@ -20,6 +20,9 @@
 			.mui-segmented-control .mui-control-item.mui-active {background-color: #727171;border-color: #727171;color: #fff;}			
 			.my-table {width: 100%;text-align: center;border-collapse: collapse;color: #999;}			
 			.my-table td,.my-table th {border: 1px solid #999;}
+			.mui-table-view-cell:after{right: 15px;}
+			#item1>.mui-table-view:before{display: none;}
+			#item1>.mui-table-view:after{left: 15px;right: 15px;}
 			p{font-size: 12px;}
 		</style>
 		<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.1.0.js"></script>
@@ -43,7 +46,7 @@
 		<div class="mui-content" style="background: #fff;">
 
 			<div id="item1" class="mui-control-content mui-active">
-				<ul class="mui-table-view my-grid-view-no">
+				<ul class="mui-table-view">
 					<li class="mui-table-view-cell mui-collapse">
 						<a class="mui-navigate-right" href="#">1、制水时为什么会有声音？</a>
 						<div class="mui-collapse-content">
@@ -66,7 +69,7 @@
 						<a class="mui-navigate-right" href="#">3、过滤后的水为什么会有气泡？</a>
 						<div class="mui-collapse-content">
 							<p>
-								①净水机中的过滤介质采用活性炭材料,活性炭中具有丰富的微小孔隙结构.在净水器开始通水时,孔隙中的空气会从活性炭中析出进入到水中,在水中形成很多细小的气泡,随着水从龙头流出.观察到的现象是水中有很多气泡,但静置一段时间以后,就会消失.在净水器通水使用一段时间以后,气泡会逐渐消失,这是正常现象,不影响净水器的使用。
+								答：①净水机中的过滤介质采用活性炭材料,活性炭中具有丰富的微小孔隙结构.在净水器开始通水时,孔隙中的空气会从活性炭中析出进入到水中,在水中形成很多细小的气泡,随着水从龙头流出.观察到的现象是水中有很多气泡,但静置一段时间以后,就会消失.在净水器通水使用一段时间以后,气泡会逐渐消失,这是正常现象,不影响净水器的使用。
 								<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;②因为净水机出的水是小分子水，通过RO膜后加压改变，含氧量高，气泡就是水中的氧气，放出来会在水面或者是杯壁吸附，随温度升高或合并就会挥发到空气中，这个不用担心，都是这样的。
 							</p>
 						</div>
@@ -104,15 +107,15 @@
 						<a class="mui-navigate-right" href="#">7、日常保养细节</a>
 						<div class="mui-collapse-content">
 							<p>
-								①	水箱及水箱外部的清洁
+								答：①	水箱及水箱外部的清洁
 								<br/>&nbsp;&nbsp;&nbsp;&nbsp;原水箱可定期进行清洗消毒，确保水箱卫生，水箱的底座需要经常擦拭，大约每周做一次清洁
 							</p>
 							<p>
-								②	接水台的清洁
+								&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;②	接水台的清洁
 								<br/>&nbsp;&nbsp;&nbsp;&nbsp;只需将接水台卸下，倒掉余水。并打开条形盖，擦拭清洗内部，重新安装会机身即可。
 							</p>
 							<p>
-								③	出差等状况长时间不使用需要准备什么
+								&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;③	出差等状况长时间不使用需要准备什么
 								<br/>&nbsp;&nbsp;&nbsp;&nbsp;如您出差、旅游或其他原因，将长时间不使用机器时。需要打开机器背部的排水管塞排出机器内部水箱的水。下次使用前，参照首次使用冲洗滤芯的方法冲洗一次即可继续使用。
 							</p>
 						</div>