fe / YOHOBUYPC · Commits

Go to a project

Authored by 王洪广
Commit b2d6a4219da6b48065fe2dc7d9321c8d6f46d67e 1 parent b0b5f689

增加修改订单，取消订单操作

Inline Side-by-side
Showing 3 changed files with 30 additions and 26 deletions
@@ -24,7 +24,6 @@ @@ -24,7 +24,6 @@
24 {{#if operation.cancelOrder}} 24 {{#if operation.cancelOrder}}
25 <span class="cancel-order oo-btn">取消订单</span> 25 <span class="cancel-order oo-btn">取消订单</span>
26 {{/if}} 26 {{/if}}
27 -  
28 </p> 27 </p>
29 {{#if complete}} 28 {{#if complete}}
30 <p class="complete-tip">订单已经完成，感谢你在YOHO商城购物，欢迎您对本次交易及所购商品进行评价。</p> 29 <p class="complete-tip">订单已经完成，感谢你在YOHO商城购物，欢迎您对本次交易及所购商品进行评价。</p>
@@ -288,9 +287,8 @@ @@ -288,9 +287,8 @@
288 </div> 287 </div>
289 </div> 288 </div>
290 </div> 289 </div>
291 - {{/ meOrderDetail}}  
292 {{> home/order-cancel-tpl}} 290 {{> home/order-cancel-tpl}}
  291 + {{> home/order-edit-tpl}}
  292 + {{/ meOrderDetail}}
293 </div> 293 </div>
294 -{{> home/order-cancel-tpl}}  
295 -{{> home/order-edit-tpl}}  
296 {{> layout/footer}} 294 {{> layout/footer}}
1 <script id="edit-dialog-tpl" type="text/html"> 1 <script id="edit-dialog-tpl" type="text/html">
2 <header>订单修改</header> 2 <header>订单修改</header>
3 <p class="tip">修改收货信息：</p> 3 <p class="tip">修改收货信息：</p>
4 - {{# orderInfo}}  
5 <ul class="edit-order-info"> 4 <ul class="edit-order-info">
6 <li> 5 <li>
7 <label><i class="form-required">*</i>收 货 人：</label> 6 <label><i class="form-required">*</i>收 货 人：</label>
8 - <input type="text" class="inp" name="name" value="{{userName}}"> 7 + <input type="text" class="inp" name="name" value="{{editInfo.userName}}">
9 <span class="error"><i class="order-icon icon-error"></i><b>收货人不能为空</b></span> 8 <span class="error"><i class="order-icon icon-error"></i><b>收货人不能为空</b></span>
10 </li> 9 </li>
11 <li> 10 <li>
12 <label><i class="form-required">*</i>所在区域：</label> 11 <label><i class="form-required">*</i>所在区域：</label>
13 - <select name="province" class="ml10" data-areacode="{{areaCode}}"> 12 + <select name="province" class="ml10" data-areacode="{{editInfo.areaCode}}">
14 </select> 13 </select>
15 <select name="city"> 14 <select name="city">
16 </select> 15 </select>
@@ -20,20 +19,19 @@ @@ -20,20 +19,19 @@
20 </li> 19 </li>
21 <li> 20 <li>
22 <label><i class="form-required">*</i>详细地址：</label> 21 <label><i class="form-required">*</i>详细地址：</label>
23 - <input type="text" class="inp w271" placeholder="街道名称或小区名称" name="address" value="{{address}}"> 22 + <input type="text" class="inp w271" placeholder="街道名称或小区名称" name="address" value="{{editInfo.address}}">
24 <span class="error"><i class="order-icon icon-error"></i><b>请填写详细地址</b></span> 23 <span class="error"><i class="order-icon icon-error"></i><b>请填写详细地址</b></span>
25 </li> 24 </li>
26 <li> 25 <li>
27 <label><i class="form-required">*</i>手机号码：</label> 26 <label><i class="form-required">*</i>手机号码：</label>
28 - <input type="text" class="inp" placeholder="请输入手机号码" name="phone" maxlength="11" value="{{mobile}}"> 27 + <input type="text" class="inp" placeholder="请输入手机号码" name="phone" maxlength="11" value="{{editInfo.mobile}}">
29 <span class="error"><i class="order-icon icon-error"></i><b>请输入手机号码</b></span> 28 <span class="error"><i class="order-icon icon-error"></i><b>请输入手机号码</b></span>
30 </li> 29 </li>
31 <li> 30 <li>
32 <label>电话号码：</label> 31 <label>电话号码：</label>
33 - <input type="text" class="inp w40" placeholder="区号" name="tel-code" value="{{phoneCode}}"> -  
34 - <input type="text" class="inp" placeholder="请输入电话号码（选填）" name="tel" value="{{phoneNum}}"> 32 + <input type="text" class="inp w40" placeholder="区号" name="tel-code" value="{{editInfo.phoneCode}}"> -
  33 + <input type="text" class="inp" placeholder="请输入电话号码（选填）" name="tel" value="{{editInfo.phoneNum}}">
35 <span class="error"><i class="order-icon icon-error"></i><b></b></span> 34 <span class="error"><i class="order-icon icon-error"></i><b></b></span>
36 </li> 35 </li>
37 </ul> 36 </ul>
38 - {{/ orderInfo}}  
39 </script> 37 </script>
@@ -113,7 +113,7 @@ function editOrder(id) { @@ -113,7 +113,7 @@ function editOrder(id) {
113 name: '确定', 113 name: '确定',
114 btnClass: ['edit-sure'], 114 btnClass: ['edit-sure'],
115 cb: function() { 115 cb: function() {
116 - saveAddress(); 116 + saveAddress(id);
117 } 117 }
118 }, 118 },
119 { 119 {
@@ -198,7 +198,7 @@ function newAddress(id) { @@ -198,7 +198,7 @@ function newAddress(id) {
198 $telCode = $addressManage.find('.inp[name="tel-code"]'); 198 $telCode = $addressManage.find('.inp[name="tel-code"]');
199 $tel = $addressManage.find('.inp[name="tel"]'); 199 $tel = $addressManage.find('.inp[name="tel"]');
200 200
201 - code = $province.data("areacode"); 201 + code = $province.data("areacode") + '';
202 codeId = !!code && code.match(addressCodeReg); 202 codeId = !!code && code.match(addressCodeReg);
203 203
204 //获取省 204 //获取省
@@ -360,11 +360,11 @@ function saveAddress(id) { @@ -360,11 +360,11 @@ function saveAddress(id) {
360 telCode = $telCode.val(), 360 telCode = $telCode.val(),
361 tel = $tel.val(); 361 tel = $tel.val();
362 362
363 - var $err_name = $name.siblings('.error').find('b'),  
364 - $err_province = $province.siblings('.error').find('b'),  
365 - $err_address = $address.siblings('.error').find('b'),  
366 - $err_phone = $phone.siblings('.error').find('b'),  
367 - $err_tel = $tel.siblings('.error').find('b'); 363 + var $err_name = $name.siblings('.error'),
  364 + $err_province = $province.siblings('.error'),
  365 + $err_address = $address.siblings('.error'),
  366 + $err_phone = $phone.siblings('.error'),
  367 + $err_tel = $tel.siblings('.error');
368 368
369 var postData = { 369 var postData = {
370 orderCode: id, 370 orderCode: id,
@@ -383,25 +383,28 @@ function saveAddress(id) { @@ -383,25 +383,28 @@ function saveAddress(id) {
383 var telReg = /^[0-9]{5,10}$/; 383 var telReg = /^[0-9]{5,10}$/;
384 384
385 if (!nameReg.test(name)) { 385 if (!nameReg.test(name)) {
386 - $err_name.html('真实姓名至少2个中文,最多5个中文').show(); 386 + $err_name.find('b').html('真实姓名至少2个中文,最多5个中文');
  387 + $err_name.show();
387 return; 388 return;
388 } else { 389 } else {
389 $err_name.hide(); 390 $err_name.hide();
390 } 391 }
391 - if (!!province || !!city || !!county) { 392 + if (province === '0' || city === '0' || county === '0') {
392 $err_province.show(); 393 $err_province.show();
393 return; 394 return;
394 } else { 395 } else {
395 $err_province.hide(); 396 $err_province.hide();
396 } 397 }
397 if (!addressReg.test(address)) { 398 if (!addressReg.test(address)) {
398 - $err_address.html('你输入的地址格式不正确').show(); 399 + $err_address.find('b').html('你输入的地址格式不正确');
  400 + $err_address.show();
399 return; 401 return;
400 } else { 402 } else {
401 $err_address.hide(); 403 $err_address.hide();
402 } 404 }
403 if (!phoneReg.test(phone)) { 405 if (!phoneReg.test(phone)) {
404 - $err_phone.html('你输入的联系电话格式不正确').show(); 406 + $err_phone.find('b').html('你输入的联系电话格式不正确');
  407 + $err_phone.show();
405 return; 408 return;
406 } else { 409 } else {
407 $err_phone.hide(); 410 $err_phone.hide();
@@ -410,18 +413,23 @@ function saveAddress(id) { @@ -410,18 +413,23 @@ function saveAddress(id) {
410 if ((!!telCode && !telCodeReg.test(telCode)) || (!!tel && !telReg.test(tel)) || 413 if ((!!telCode && !telCodeReg.test(telCode)) || (!!tel && !telReg.test(tel)) ||
411 (telCodeReg.test(telCode) && !telReg.test(tel)) || 414 (telCodeReg.test(telCode) && !telReg.test(tel)) ||
412 (!telCodeReg.test(telCode) && telReg.test(tel))) { 415 (!telCodeReg.test(telCode) && telReg.test(tel))) {
413 - $err_tel.html('你输入的电话格式不正确').show(); 416 + $err_tel.find('b').html('你输入的电话格式不正确');
  417 + $err_tel.show();
414 return; 418 return;
415 } else { 419 } else {
416 - $err_tel.html('你输入的电话格式不正确').hide(); 420 + $err_tel.hide();
417 } 421 }
  422 +
418 $.ajax({ 423 $.ajax({
419 type: 'post', 424 type: 'post',
420 url: '/home/orders/modifyAddress', 425 url: '/home/orders/modifyAddress',
421 data: postData 426 data: postData
422 }).then(function(d) { 427 }).then(function(d) {
423 if (d.code === 200) { 428 if (d.code === 200) {
424 - 429 + active = showMessgaeDialog('icon-waiting', '订单修改', '您的订单正在尝试修改,请耐心等待。稍后可在订单详情页查看修改情况!', function() {
  430 + location.reload(true);
  431 + });
  432 + active.show();
425 } else { 433 } else {
426 new dialog.Alert(d.message).show(); 434 new dialog.Alert(d.message).show();
427 } 435 }