Merge remote-tracking branch 'origin/feature/codebetter' into release/5.4.1

@@ -7,9 +7,9 @@
         data() {
         data() {
             return {
             return {
                 msg: 'app'
                 msg: 'app'
+            };
         }
         }
-        }
-    }
+    };
 </script>
 </script>
 
 
 <style>
 <style>

-<template>
-    <header class="yoho-header">
-        <a :href="headerBack" class="iconfont nav-back">&#xe610;</a>
-        <span v-if="showBtn" class="iconfont nav-home">&#xe638;</span>
-        <p class="nav-title">{{headerText}}</p>
-    </header>
-</template>
-
-<script>
-    module.exports = {
-        props: {
-            headerBack: String,
-            headerText: String,
-            showBtn: Boolean
-        },
-        data() {
-            return {};
-        }
-    };
-</script>

@@ -13,22 +13,22 @@
                     <ul v-if="province.showList" class="address-ul">
                     <ul v-if="province.showList" class="address-ul">
                         <li v-for="pprovince in provinces"
                         <li v-for="pprovince in provinces"
                             @click="switchAddress(pprovince.id, pprovince.caption)">{{pprovince.caption}}
                             @click="switchAddress(pprovince.id, pprovince.caption)">{{pprovince.caption}}
-                            <span v-if="pprovince.id === province.id" class="iconfont icon-V"></span></li>
+                            <span v-if="pprovince.id === province.id" class="iconfont icon-v"></span></li>
                     </ul>
                     </ul>
                     <ul v-if="city.showList" class="address-ul">
                     <ul v-if="city.showList" class="address-ul">
                         <li v-for="pcity in citys"
                         <li v-for="pcity in citys"
                             @click="switchAddress(pcity.id, pcity.caption)">{{pcity.caption}}
                             @click="switchAddress(pcity.id, pcity.caption)">{{pcity.caption}}
-                            <span v-if="pcity.id === city.id" class="iconfont icon-V"></span></li>
+                            <span v-if="pcity.id === city.id" class="iconfont icon-v"></span></li>
                     </ul>
                     </ul>
                     <ul v-if="area.showList" class="address-ul">
                     <ul v-if="area.showList" class="address-ul">
                         <li v-for="parea in areas"
                         <li v-for="parea in areas"
                             @click="switchAddress(parea.id, parea.caption)">{{parea.caption}}
                             @click="switchAddress(parea.id, parea.caption)">{{parea.caption}}
-                            <span v-if="parea.id === area.id" class="iconfont icon-V"></span></li>
+                            <span v-if="parea.id === area.id" class="iconfont icon-v"></span></li>
                     </ul>
                     </ul>
                     <ul v-if="street.showList" class="address-ul">
                     <ul v-if="street.showList" class="address-ul">
                         <li v-for="pstreet in streets"
                         <li v-for="pstreet in streets"
                             @click="switchAddress(pstreet.id, pstreet.caption, true)">{{pstreet.caption}}
                             @click="switchAddress(pstreet.id, pstreet.caption, true)">{{pstreet.caption}}
-                            <span v-if="pstreet.id === street.id" class="iconfont icon-V"></span></li>
+                            <span v-if="pstreet.id === street.id" class="iconfont icon-v"></span></li>
                     </ul>
                     </ul>
                 </div>
                 </div>
             </div>
             </div>
@@ -36,7 +36,9 @@
     </div>
     </div>
 </template>
 </template>
 <style>
 <style>
-.icon-V:before { content: "\e6ea"; }
+.icon-v:before {
+    content: "\e6ea";
+}
 
 
 .address-select-component {
 .address-select-component {
     position: fixed;
     position: fixed;
@@ -120,6 +122,8 @@
             .address-content {
             .address-content {
                 transform: translate(0, 0) translateZ(0);
                 transform: translate(0, 0) translateZ(0);
                 height: 620px;
                 height: 620px;
+            }
+        }
 
 
         .address-ul {
         .address-ul {
             padding: 0;
             padding: 0;
@@ -155,8 +159,6 @@
             }
             }
         }
         }
     }
     }
-        }
-    }
 }
 }
 </style>
 </style>
 <script>
 <script>
@@ -246,7 +248,8 @@
                         this.city.title = '请选择';
                         this.city.title = '请选择';
                         this.city.showList = this.province.titleActive = true;
                         this.city.showList = this.province.titleActive = true;
                         this.province.showList = this.area.showList = this.street.showList = false;
                         this.province.showList = this.area.showList = this.street.showList = false;
-                        this.common.titleActive = this.city.titleActive = this.area.titleActive = this.street.titleActive = false;
+                        this.common.titleActive = this.city.titleActive =
+                            this.area.titleActive = this.street.titleActive = false;
                         break;
                         break;
                     case 4:
                     case 4:
                         this.city.id = id;
                         this.city.id = id;
@@ -376,7 +379,7 @@
                         this.street.title = '';
                         this.street.title = '';
                         break;
                         break;
                     default:
                     default:
-                        break
+                        break;
                 }
                 }
             },
             },
         },
         },