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

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



See merge request !78

@@ -59,7 +59,6 @@
              }, {
                  isSelect: true,
                  labelText: '省份：',
-                 tips: '注:标"*"的为支持货到付款的地区',
                  tipsUrl: '/help/?category_id=48',
                  selects: [{
                      key: 'province'
@@ -161,7 +160,7 @@
 
              return {
                  code: 400,
-                 message: '缺失必填项'
+                 message: '请填写完整的省市区信息'
              };
          }
          let respData = yield addressApi.saveAddressData(query);

@@ -63,6 +63,7 @@
                                         <label for="{{key}}">{{labelText}}</label>
                                         <input type="text" name='{{key}}' id="{{key}}" class="input-1 width-150" value="{{value}}">
                                     {{/if}}
+                                    {{#if tips}}
                                     <span class="form-prompt form-info" id="{{key}}-tip">
                                         {{tips}}
                                         {{#isSelect}}
@@ -71,6 +72,7 @@
                                         <!--</a>-->
                                         {{/isSelect}}
                                     </span>
+                                    {{/if}}
                                     </div>
                                 {{/each}}
                             </div>

@@ -43,8 +43,7 @@ var address = {
     loadAreaData: function(pCode, toDomId, defaultValue, allCode) {
         var the = this,
             $toDom = $('#' + toDomId),
-            i = 0,
-            point = '';
+            i = 0;
 
         var active,
             val,
@@ -76,12 +75,11 @@ var address = {
                 $toDom.append('<option value="0">' + defaultValue + '</option>');
                 if (toDomId === the.streetsDomId) {
                     allCode === pCode ? selectAll = 'selected' : selectAll = '';
-                    $toDom.append('<option value="' + pCode + '" ' + selectAll + '>*全部</option>');
+                    $toDom.append('<option value="' + pCode + '" ' + selectAll + '>全部</option>');
                 }
                 for (i in jsonData.options) {
                     if (jsonData.options[i]) {
                         val = jsonData.options[i];
-                        point = (toDomId === the.streetsDomId && val.is_support === 'Y') ? '*' : '';
                         nId = val.value;
                         selecter = '';
 
@@ -89,7 +87,7 @@ var address = {
                             nId === allCode.substr(0, nId.length)) {
                             selecter = 'selected';
                         }
-                        $toDom.append('<option value="' + nId + '" ' + selecter + '>' + point + val.text + '</option>');
+                        $toDom.append('<option value="' + nId + '" ' + selecter + '>' + val.text + '</option>');
                     }
                 }
             }