提交bug

aiberle/my-center.html

@@ -44,9 +44,9 @@
 				<img width="100%" src="images/top-1.png" />
 				<div style="position: absolute;left: 0; top: 45%;-webkit-transform: translateY(-50%);width: 100%;text-align: center;">
 					<div class="user-head">
-						<img id="headDiv" src="" />
+						<img id="headDiv" src="images/tx-1.jpg" />
 					</div>
-					<div id="userNickname"></div>
+					<div id="userNickname">微信用户</div>
 				</div>
 			</div>
 			<div style="padding:0;background: #fff;margin-bottom: 8px;">

aiberle/order-details.html

@@ -173,6 +173,7 @@
 									}
 								} 
 								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>';
@@ -185,7 +186,7 @@
 										break;
 									case 1 : 
 										statusName = "待支付";
-										operationHtml += payHtml;
+										operationHtml += payHtml + cancelOrderHtml;
 										break;
 									case 2 : 
 										statusName = "已支付";
@@ -320,14 +321,16 @@
 			 */
 			mui('body').on('tap', '.go_cancel', function() {
 				var newStatus;
-				if(status == 3){  //申请退款的
-					newStatus = 3
+				if(status == 1){//取消订单
+					newStatus = 1;
+				}else if(status == 3){  //申请退款的
+					newStatus = 3;
 				}else if(status == 6){  //申请退货的
-					newStatus = 5
+					newStatus = 5;
 				}else if(status == 7){ //退货中 的
-					newStatus = 6
+					newStatus = 6;
 				}else if(status == 11){
-					newStatus = 8
+					newStatus = 8;
 				}
 				if(status != null){
 					updateOrderStatus(orderId,newStatus,"");

aiberle/order-list.html

@@ -249,8 +249,8 @@
                              var orderDesc = '<button type="button" class="my-order-btn" onclick="order_details(\'' + txt_order.salesOrderid + '\')">订单详情</button>';
                             if (txt_order.salesStatus == 1) {
                                 if(txt_order.salesAdminRemark > 0) {
-                                    SetRemainTime("setName" + index, index, this.salesAdminRemark);
-                                    a += '<h6><span class="my-btn-orange" id="testid' + index + '"></span>分钟后，订单失效</h6>';
+                                    //SetRemainTime("setName" + index, index, this.salesAdminRemark);
+                                    //a += '<h6><span class="my-btn-orange" id="testid' + index + '"></span>分钟后，订单失效</h6>';
                                 }
                                 a += '<li class="mui-table-view-cell mui-media mui-col-xs-7 mui-text-right"><button type="button" class="my-order-btn" onclick="goOrderPay(\'' + txt_order.salesOrderid + '\')">立即支付</button>';
                                 a += orderDesc;

aiberle/shopping-cart.html

@@ -233,6 +233,7 @@
 											$(".gwc_null,#footer-bar-tab").show();
 										}
 										calculator();
+										mui.toast("删除成功");
 									} else {
 										alert(dt.message);
 									}