Strona główna Odkrywaj Pomoc
Zaloguj się
liujiankang
/
static
Obserwuj 1
Polub 0
Forkuj 0
Pliki Problemy 0 Oczekujące zmiany 0 Wiki
Przeglądaj źródła

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

qihanjiao 7 lat temu
rodzic
96df233e01 e37ff5f84f
commit
a1838bb9a4
5 zmienionych plików z 36 dodań i 40 usunięć
Widok podzielony Pokaż statystyki zmian
  1. 1 1
      aiberle/exchange-goods.html
  2. 13 4
      aiberle/logistics-massage.html
  3. 10 26
      aiberle/order-details.html
  4. 7 5
      aiberle/order-list.html
  5. 5 4
      aiberle/pro-details.html

+ 1 - 1
aiberle/exchange-goods.html
Wyświetl plik 

@@ -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
Wyświetl plik 

@@ -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) {

+ 10 - 26
aiberle/order-details.html
Wyświetl plik 

@@ -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 = "";

@@ -208,7 +191,7 @@
 
 										operationHtml += cancelHtml + logisticsHtml;

 										break;

 									case 7 : 

-										statusName = "退货中";

+										statusName = "退货中（请尽快寄回产品）";

 										operationHtml += cancelHtml;

 										break;

 									case 8 : 

@@ -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);

 							}

+ 7 - 5
aiberle/order-list.html
Wyświetl plik 

@@ -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{

+ 5 - 4
aiberle/pro-details.html
Wyświetl plik 

@@ -99,7 +99,7 @@
 
 		<script src="js/main.js"></script>

 		<script src="js/wechat-utils-1.0.js"></script>

 		<script>

-			var productId = getParam("productId"),productName='',productRemark='';

+			var productId = getParam("productId"),productName='',productRemark='',productIntroduceImg='';

 			

 			console.log(productId);

 			

@@ -165,10 +165,11 @@
 
 									}

 									productName=productInfo.productName;

 									productRemark=productInfo.productRemark;

+									productIntroduceImg=productInfo.productIntroduceImg;

 								li.innerHTML = '<a><div class="index-pro-tit">'+productInfo.productName+'</div>'

 		                						+'<p class="mui-text-left">'+productInfo.productRemark+'<span style="float: right;color: #ff3b3b;">¥'+(productInfo.productDiscount/ 100).toFixed(2)+'</span></p></a>'

 		                						+zen+'</br>'	

-		                						+'<a><img class="mui-media-object" src="'+productInfo.productIntroduceImg+'"></a>';

+		                						+'<a><img class="mui-media-object" src="'+ productInfo.productIntroduceImg +'"></a>';

 								table.appendChild(li);

 								getCartNumber();//获取购物车数量

 								fenxiang();

@@ -424,10 +425,10 @@
 
 					src = "//s.iamberry.com/aiberle/wechat/pro-details.html?productId="+productId;

 						window.wxFriend = {

 							"appId": "",

-							"imgUrl": '//s.iamberry.com/aiberle/wechat/images/indexShare.jpg',

+							"imgUrl": productIntroduceImg,

 							"link": src,

 							"desc": productRemark,

-							"title": 'Aiberle爱贝源-'+productName,

+							"title": 'Aiberle | '+ productName,

 							"netError": "您的网络异常，请刷新重试!如多次刷新无效，请向我们反应 ~",

 							"shareTimeSuccess": "分享成功",

 							"shareTimeCancel": "已取消分享",