Merge branch 'edit' into live

src/views/address/index.vue

@@ -17,8 +17,15 @@
       @select="onSelect"
       @edit="onEdit"
     />
+<<<<<<< HEAD
     <div class="addr-null" v-show="isShowAddrNull">
       <img src="@/assets/images/home/addr-null.png" alt="" />
+=======
+    <div class="addr-null"
+    v-if="isShowAddrNull"
+    >
+      <img src="@/assets/images/home/addr-null.png" alt="">
+>>>>>>> edit
       <div class="addr-null-title">暂无地址~</div>
     </div>
     <div
@@ -234,7 +241,6 @@ export default {
   width: 100%;
   height: 15px;
   font-size: 15px;
-  font-family: Source Han Sans CN;
   font-weight: 500;
   color: #333333;
   line-height: 6px;
@@ -244,7 +250,6 @@ export default {
   width: 247px;
   height: 13px;
   font-size: 13px;
-  font-family: Source Han Sans CN;
   font-weight: 400;
   color: #999999;
   line-height: 13px;
@@ -254,7 +259,6 @@ export default {
   width: 100%;
   height: 22px;
   font-size: 15px;
-  font-family: DIN;
   font-weight: 500;
   color: #333333;
   line-height: 12px;
@@ -282,7 +286,6 @@ export default {
   border-radius: 15px;
   text-align: center;
   font-size: 10px;
-  font-family: Source Han Sans CN;
   font-weight: 400;
   color: #333333;
   line-height: 15px;
@@ -302,7 +305,6 @@ export default {
   width: 107px;
   height: 17px;
   font-size: 18px;
-  font-family: Source Han Sans CN;
   font-weight: 500;
   color: #1a1a1a;
   line-height: 26px;
@@ -313,8 +315,9 @@ export default {
   height: 102px;
   box-sizing: border-box;
   position: fixed;
-  left: 130px;
+  left: 50%;
   top: 150px;
+  transform: translateX(-50%);
   text-align: center;
   font-size: 12px;
   font-weight: 400;

src/views/login/index.vue

@@ -241,7 +241,6 @@ export default {
         width: 81px;
         height: 37px;
         font-size: 20px;
-        // font-family: MF ShangHei (Noncommercial);
         font-weight: bold;
         color: #FFFFFF;
         line-height: 20px;
@@ -256,7 +255,6 @@ export default {
         width: 97px;
         height: 12px;
         font-size: 12px;
-        font-family: Source Han Sans CN;
         font-weight: 150;
         color: #FFFFFF;
         line-height: 3px;

src/views/my/index.vue

@@ -348,7 +348,6 @@ export default {
   width: 110px;
   height: 26px;
   font-size: 14px;
-  font-family: Source Han Sans CN;
   font-weight: 600;
   color: #333333;
   line-height: 26px;