校验表情

tooth/exchange-goods.html

@@ -132,6 +132,15 @@
 				if(remark !=null && remark != "" && typeof(remark)!="undefined"){
 					//if(remark){
 					//}
+					
+//					var remark = $("#textarea").val();
+				var ch_en_num = /^[A-Za-z0-9~!@#$%^&*()_+={}|<>?:;'"！@￥…（）｛｝【】《》/`、；‘’：—“”，。,.？·_\-\u4e00-\u9fa5]{0,100}$/; //简体中文英文数字，符号(0-100位)
+				if(ch_en_num.test(remark)) {
+					console.log("退款验证通过")
+				} else {
+					mui.alert("退款格式错误！仅支持中/英文,数字,普通符号");
+					return false;
+				}
 					updateOrderStatus(orderId,newStatus,remark);
 				}else{
 					var info = "";

tooth/order-list.html

@@ -77,8 +77,9 @@
 			var pageNumber = 0,
 				pagesize = 10; //pageNumber第几页，pagesize每页条数
 
+//			var orderDesc = '<button type="button" class="my-order-btn order_operate order_desc" fixedStatus="desc" orderId>订单详情</button>';
 			var orderStatus = {
-				1:'<button type="button" class="my-order-btn order_operate pay_order" fixedStatus="pay" orderId>立即支付</button><button type="button" class="my-order-btn order_operate order_desc" fixedStatus="desc" orderId>订单详情</button>',
+				1: '<button type="button" class="my-order-btn order_operate pay_order" fixedStatus="pay" orderId>立即支付</button><button type="button" class="my-order-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>' //申请换货中
@@ -289,7 +290,7 @@
 										statusHtml = '';
 									}
 									if(status != 1) {
-										statusHtml += orderDesc;
+										statusHtml += '<button type="button" class="my-order-btn order_operate order_desc" fixedStatus="desc" orderId>订单详情</button>';
 									} 
 									statusHtml  = statusHtml.replace(/\orderId/g,'orderId="'+ this.salesOrderid +'"');