merge:合并主干

components/BsAddress.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-   收货地址
+    <div class="address"></div>
   </div>
 </template>
 <script>
@@ -8,11 +8,13 @@ export default {
   data() {
     return {};
   },
-  methods: {
+  methods: {},
-   
-  },
 };
 </script>
 <style lang="scss" scoped>
-
+.address {
+  width: 1200px;
+  height: 189px;
+  border: 1px solid #dddddd;
+}
 </style>