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

修复bug

wangxiaoming 7 年之前
父节点
8a64e06caa
当前提交
c36cfc983e
共有 4 个文件被更改，包括 29 次插入 和 34 次删除
分列视图 显示文件统计
  1. 1 1
      aiberle/exchange-goods.html
  2. 13 4
      aiberle/logistics-massage.html
  3. 9 25
      aiberle/order-details.html
  4. 6 4
      aiberle/order-list.html

+ 1 - 1
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>

+ 13 - 4
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) {

+ 9 - 25
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>

+						订单备注：<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 = "";

@@ -235,6 +218,7 @@
 
 								$("#orderId").html(order.salesOrderid);

 								$("#salesCreateDate").html(order.salesCreateDate);

 								$("#salesYetAmount").html(accDiv(order.salesYetAmount,100));

+								$("#salesUserRemark").html(order.salesUserRemark);

 								$("#num").html(num);

 								$("#operation").html(operationHtml);

 							}

+ 6 - 4
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">