提交bug

tooth/index.html

@@ -183,7 +183,9 @@
 					<img width="100%" src="images/index-tit-3.jpg" />
 				</div>
 				<div>
-					<img width="100%" src="images/index-1.jpg" />
+					<a class="color_a" href="pro-details.html?colorId=44">
+						<img width="100%" src="images/index-1.jpg" />
+					</a>
 				</div>
 				<div class="mui-text-center mui-content-padded">
 					<span style="color: #f16071;">¥399.00</span>

tooth/logistics-massage.html

@@ -187,6 +187,8 @@
 								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);
 						}
 					},
@@ -199,6 +201,13 @@
 		console.log("页面加载完毕");
 		$(".loading").hide().css("opacity", "0");//隐藏（正在加载...）
 	});	
+	
+	
+	
+	/*订单按钮触发事件*/
+	$(document).on('tap', '.order_operate', function() {
+		window.history.back();
+	});
 	</script>
 	</body>
 </html>

tooth/order-details.html

@@ -240,7 +240,7 @@
 							if(statusHtml == null || statusHtml == "" || typeof(statusHtml) == "undefined") {
 								statusHtml = '';
 							}
-							if(status != 1 && status != 3) {
+							if(status == 5 &&  status == 12 &&  status == 6 &&  status == 11) {  //状态为取消，待支付，代发货，退货，换货都没有物流信息
 								if(order.salesPostFirm != null && order.salesPostFirm != "" && typeof(order.salesPostFirm) != "undefined" && order.salesPostNum != null && order.salesPostNum != "" && typeof(order.salesPostNum) != "undefined"){
 									statusHtml += '<button type="button" class="my-btn-black order_operate order_logistics" fixedStatus="logistics" orderId>查询物流</button>';
 								}

tooth/order-list.html

@@ -98,8 +98,9 @@
 			var orderStatus = {
 				1: '<button type="button" class="my-order-btn order_operate pay_order" fixedStatus="pay" orderId>立即支付</button><button type="button" class="my-btn-black my-btn order_operate order_desc" fixedStatus="desc" orderId>订单详情</button>',
 				3: '<button type="button" class="my-order-btn order_operate cancel_apply_refund" fixedStatus="3" orderId>取消申请</button>', //退款申请中
-				7: '<button type="button" class="my-order-btn order_operate cancel_product_return" fixedStatus="1" orderId>取消退货</button>', //退货中
-				11: '<button type="button" class="my-order-btn order_operate cancel_apply_exchange" fixedStatus="1" orderId>取消申请</button>' //申请换货中
+				6: '<button type="button" class="my-order-btn order_operate cancel_product_return" fixedStatus="5" orderId>取消退货</button>', //申请退货中
+				7: '<button type="button" class="my-order-btn order_operate cancel_product_return" fixedStatus="6" orderId>取消退货</button>', //退货中
+				11: '<button type="button" class="my-order-btn order_operate cancel_apply_exchange" fixedStatus="8" orderId>取消申请</button>' //申请换货中
 			};
 
 			mui.init({