fe / yohobuy-node · Commits

Go to a project

Authored by 周少峰
Commit 53d5340fcfa9ec71fd48e5510c9ec7a105fcde1f 2 parents 17cfc884 5f628676

Merge branch 'feature/addressFourth' into 'release/5.4.1' 

去掉货到付款提示，过滤电话为null情况



See merge request !78
Inline Side-by-side
Showing 3 changed files with 6 additions and 7 deletions
@@ -59,7 +59,6 @@ @@ -59,7 +59,6 @@
59 }, { 59 }, {
60 isSelect: true, 60 isSelect: true,
61 labelText: '省份：', 61 labelText: '省份：',
62 - tips: '注:标"*"的为支持货到付款的地区',  
63 tipsUrl: '/help/?category_id=48', 62 tipsUrl: '/help/?category_id=48',
64 selects: [{ 63 selects: [{
65 key: 'province' 64 key: 'province'
@@ -161,7 +160,7 @@ @@ -161,7 +160,7 @@
161 160
162 return { 161 return {
163 code: 400, 162 code: 400,
164 - message: '缺失必填项' 163 + message: '请填写完整的省市区信息'
165 }; 164 };
166 } 165 }
167 let respData = yield addressApi.saveAddressData(query); 166 let respData = yield addressApi.saveAddressData(query);
@@ -63,6 +63,7 @@ @@ -63,6 +63,7 @@
63 <label for="{{key}}">{{labelText}}</label> 63 <label for="{{key}}">{{labelText}}</label>
64 <input type="text" name='{{key}}' id="{{key}}" class="input-1 width-150" value="{{value}}"> 64 <input type="text" name='{{key}}' id="{{key}}" class="input-1 width-150" value="{{value}}">
65 {{/if}} 65 {{/if}}
  66 + {{#if tips}}
66 <span class="form-prompt form-info" id="{{key}}-tip"> 67 <span class="form-prompt form-info" id="{{key}}-tip">
67 {{tips}} 68 {{tips}}
68 {{#isSelect}} 69 {{#isSelect}}
@@ -71,6 +72,7 @@ @@ -71,6 +72,7 @@
71 <!--</a>--> 72 <!--</a>-->
72 {{/isSelect}} 73 {{/isSelect}}
73 </span> 74 </span>
  75 + {{/if}}
74 </div> 76 </div>
75 {{/each}} 77 {{/each}}
76 </div> 78 </div>
@@ -43,8 +43,7 @@ var address = { @@ -43,8 +43,7 @@ var address = {
43 loadAreaData: function(pCode, toDomId, defaultValue, allCode) { 43 loadAreaData: function(pCode, toDomId, defaultValue, allCode) {
44 var the = this, 44 var the = this,
45 $toDom = $('#' + toDomId), 45 $toDom = $('#' + toDomId),
46 - i = 0,  
47 - point = ''; 46 + i = 0;
48 47
49 var active, 48 var active,
50 val, 49 val,
@@ -76,12 +75,11 @@ var address = { @@ -76,12 +75,11 @@ var address = {
76 $toDom.append('<option value="0">' + defaultValue + '</option>'); 75 $toDom.append('<option value="0">' + defaultValue + '</option>');
77 if (toDomId === the.streetsDomId) { 76 if (toDomId === the.streetsDomId) {
78 allCode === pCode ? selectAll = 'selected' : selectAll = ''; 77 allCode === pCode ? selectAll = 'selected' : selectAll = '';
79 - $toDom.append('<option value="' + pCode + '" ' + selectAll + '>*全部</option>'); 78 + $toDom.append('<option value="' + pCode + '" ' + selectAll + '>全部</option>');
80 } 79 }
81 for (i in jsonData.options) { 80 for (i in jsonData.options) {
82 if (jsonData.options[i]) { 81 if (jsonData.options[i]) {
83 val = jsonData.options[i]; 82 val = jsonData.options[i];
84 - point = (toDomId === the.streetsDomId && val.is_support === 'Y') ? '*' : '';  
85 nId = val.value; 83 nId = val.value;
86 selecter = ''; 84 selecter = '';
87 85
@@ -89,7 +87,7 @@ var address = { @@ -89,7 +87,7 @@ var address = {
89 nId === allCode.substr(0, nId.length)) { 87 nId === allCode.substr(0, nId.length)) {
90 selecter = 'selected'; 88 selecter = 'selected';
91 } 89 }
92 - $toDom.append('<option value="' + nId + '" ' + selecter + '>' + point + val.text + '</option>'); 90 + $toDom.append('<option value="' + nId + '" ' + selecter + '>' + val.text + '</option>');
93 } 91 }
94 } 92 }
95 } 93 }