上朵

tooth/js/wechat-utils-1.0.js

@@ -15,9 +15,9 @@ if (window.hiddenAllWechatMenu == null) {
 	window.wxFriend = {
 	    "appId": "",
 	    "imgUrl":'https://s.iamberry.com/soodo/wechat/images/product_fenxiang.jpg',
-	    "link":"http://s.iamberry.com/soodo/wechat/index.html",
+	    "link":"https://s.iamberry.com/soodo/wechat/index.html",
 	    "desc":"让你的“笑容停留在18岁”",
-	    "title":"【soodo上朵】柔性声波牙刷，智柔刷牙.新体验",
+	    "title":"【Soodo上朵】柔性声波牙刷，智柔刷牙.新体验",
 	    "netError":"您的网络异常，请刷新重试!如多次刷新无效，请向我们反应 ~",
 	    "shareTimeSuccess":"这里是分享朋友圈后调用的文字",
 	    "shareTimeCancel":"这里是取消分享给朋友圈后调用的文字",

tooth/pro-details.html

@@ -230,6 +230,10 @@
 				$(".select-color span").text(th.text());
 				getColorNumber();//重新获取单个购物项id数量
 				$(".dalog-proPic").attr("src", th.attr("src"));//替换当前选择颜色的图片
+				
+				var price = '¥' + (Number(th.attr("price")) / 100).toFixed(2);
+				$(".dalog-proPrice").text(price);//替换价格
+				
 				$(".dalog-colorPresent").text(th.attr("colorPresent")); //替换产品简介
 				if(colorId == 310){
 					$(".dalog-colorPresent").css("color","red");

watero/js/page/order_details.js

@@ -319,7 +319,7 @@ function operation(num) {
 			mui.alert("备注必填！请输入1-99个字!");
 			return false
 		} else {
-			if(!checkRemark(returnReason)) {
+			if(checkRemark(returnReason)) {
 				mui.alert("您输入的格式有误,请重新输入!");
 				return false
 			}

watero/js/page/vip_center.js

@@ -153,22 +153,22 @@ mui.ready(function() {
 });
 mui('body').on('tap', '#rent_wait_deliver', function() {
 	mui.openWindow({
-		url: 'lease_order_details.html?rentStatus=-1'
+		url: '/watero/view/rent/lease_order_details.html?rentStatus=-1'
 	})
 });
 mui('body').on('tap', '#rent_already_deliver', function() {
 	mui.openWindow({
-		url: 'lease_order_details.html?rentStatus=5'
+		url: '/watero/view/rent/lease_order_details.html?rentStatus=5'
 	})
 });
 mui('body').on('tap', '.icon-shebeiliebiao', function() {
 	mui.openWindow({
-		url: 'my_equipment.html'
+		url: '/watero/view/rent/my_equipment.html'
 	})
 });
 mui('body').on('tap', '#xieyi-dalog', function() {
 	mui.openWindow({
-		url: 'try_xieyi.html'
+		url: '/watero/view/rent/try_xieyi.html'
 	});
 });
 mui('body').on('tap', '.go_try_order', function() {

watero/js/validate.js

@@ -5,7 +5,7 @@
  * @returns {Boolean}
  */
 function checkPhoneNum(obj) {
-	if (/^((\d{3}-\d{8}|\d{4}-\d{7,8})|(1[0-9]{10}))$/.test(obj)) {
+	if (/^((\d{3}-\d{8}|\d{4}-\d{7,8})|(1[3|5|7|8][0-9]{9}))$/.test(obj)) {
 		return true;
 	}
 	return false;
@@ -209,8 +209,8 @@ function checkRemark(remark) {
 	if (remark != "") {
 		$.trim(remark);
 		// if (!/^[\u4e00-\u9fa5_a-zA-Z0-9]+$/.test(remark)) {
-		if (!/^[A-Za-z0-9_\[\]\【\】\｛\｝\{\}\(\)\（\）\《\》\<\>\,\，\.\。\、\！\!\~\·\@\#\￥\$\%\^\…\&\—\：\:\；\;\‘\’\'\'\"\"\“\”\？\?\-\=\|\*\+\-\u4e00-\u9fa5]{1,100}$/.test(remark)) {
-			mui.alert("请务输入特殊字符!");
+		if (!/^[\u4e00-\u9fa5_a-zA-Z0-9]+$/.test(remark)||pattern.test(remark)) {
+			mui.alert("请不要输入中文、字母、数字以外的特殊字符!");
 			return;
 		}
 		if (!(remark.length >= 0 && remark.length <= 100)) {