上朵分销系统

tooth/clearing.html

@@ -120,6 +120,9 @@
 				channelType = 0;
 				channelId=0;
 			}
+			if(channelType > 0 || channelId>0){
+				location.href = 'channel-clearing.html?channelType='+channelType+'&channelId='+channelId; //跳转结算页面
+			}
 			
 			//var wechatAddr = new Object();
 			

tooth/order-details.html

@@ -52,7 +52,7 @@
 							</div>
 							<div class="mui-table-cell mui-col-xs-10 mui-text-left table-middle">
 								<div>收货人：<span id="receiver"></span> <span class="mui-pull-right" id="salesAddressTel">16899996678</span></div>
-								<p>收货地址：<span id="salesAddressInfo"></span></p>
+								<p id="salesAddressInfo"></p>
 							</div>
 							<!--<div class="mui-table-cell mui-col-xs-1 mui-text-right table-middle">
 								<p><span class="mui-icon mui-icon-arrowright"></span></p>
@@ -107,7 +107,7 @@
 		<script src="js/mui.min.js"></script>
 		<script src="js/jquery-2.1.1.min.js"></script>
 		<script src="js/main.js"></script>
-		<!-- <script src="js/wechat-utils-1.0.js"></script> -->
+		 <script src="js/wechat-utils-1.0.js"></script> 
 		<script>
 			window.addEventListener('pageshow', function(e) {
 				// 通过persisted属性判断是否存在 BF Cache
@@ -149,8 +149,12 @@
 							var order = dt.data
 							$("#receiver").html(order.salesAddressName);
 							$("#salesAddressTel").html(order.salesAddressTel);
-							$("#salesAddressInfo").html(order.salesAddressInfo);
 							$("#salesAmount").html(accDiv(order.salesAmount,100));
+							if(order.salesTransportationType == 1){	//订单运输类型  1:邮寄  2:自提
+								$("#salesAddressInfo").html('收货地址：<span>'+ order.salesAddressInfo +'</span>');
+							}else{
+								$("#salesAddressInfo").html('自提地点：<span>'+ order.salesChannelAddress +'</span>');
+							}
 							
 							if(order.salesPostFirm != null && order.salesPostFirm != "" && typeof(order.salesPostFirm) != "undefined"){
 								$("#salesPostFirm").val(order.salesPostFirm);

tooth/order-list.html

@@ -80,7 +80,7 @@
 		<script src="js/jquery-2.1.1.min.js"></script>
 		<script src="js/jquery.autocompleter.js"></script>
 		<script src="js/main.js"></script>
-		<!-- <script src="js/wechat-utils-1.0.js"></script> -->
+		 <script src="js/wechat-utils-1.0.js"></script> 
 
 		<script>
 			window.addEventListener('pageshow', function(e) {

tooth/pro-details.html

@@ -197,6 +197,7 @@
 			var btnTap = '';
 			var cartStatus="";
 			$(document).on('tap', '.mui-bar-tab .div-btn-buy-cart,.mui-bar-tab .div-btn-buy-know,.select-color', function() {
+				
 				if($(".my-picker").length > 0) { //判断是否已有弹窗
 					var th = $(this);
 					mask.show(); //显示遮罩层
@@ -290,6 +291,7 @@
 									};
 									//json格式化插入    购物项id集合
 									sessionStorage.setItem('pay_data', JSON.stringify(obj));
+									
 									if(channelId > 0 && channelType >0){
 										location.href = 'channel-clearing.html?channelType='+channelType+'&channelId='+channelId; //跳转结算页面
 									}else{
@@ -387,7 +389,7 @@
 								}else{
 									$(".mui-numbox").removeAttr("cartid");
 									$(".mui-numbox").attr("name", "0");
-									$(".mui-input-numbox").val(0);
+									$(".mui-input-numbox").val(1);
 									$(".mui-btn-numbox-minus").attr("disabled", "disabled");
 								}
 							} else {

tooth/shopping-cart.html

@@ -356,7 +356,7 @@
 						if(channelType > 0 && channelType > 0){
 							location.href = 'channel-clearing.html?channelType='+channelType+'&channelId='+channelId; //跳转结算页面
 						}else{
-							location.href = 'clearing.html'; //跳转结算页面
+							location.href = 'clearing.html?channelType='+channelType+'&channelId='+channelId; //跳转结算页面
 						}
 					}
 				} else {