Merge branch 'test'

www/webapp/scg/src/lib/userID.js

@@ -11,7 +11,7 @@ export default function userId() {
       '59e41443fb48a7552f8b459e', // 笨笨_8119619
     ]
   ;
-  return localStorage.getItem('wxUserID1') != null ? localStorage.getItem('wxUserID1') : id[1];
+  return localStorage.getItem('wxUserID1') != null ? localStorage.getItem('wxUserID1') : id[7];
 }
 /*
 card: {

www/webapp/scg/src/views/address/edit.vue

@@ -156,12 +156,13 @@
         this.$router.go(-1);
       },
       focus() {
-        this.isBlur = false;
+        this.isBlur = true;
       },
       blur() {
-        setTimeout(() => {
-          this.isBlur = true;
-        }, 300);
+        this.isBlur = true;
+        // setTimeout(() => {
+        //   this.isBlur = true;
+        // }, 300);
       }
     }
   };

www/webapp/scg/src/views/address/position.vue

@@ -8,13 +8,10 @@
           <cube-button slot="append" :primary="true" @click="search">搜索</cube-button>
         </cube-input>
       </div>
-      <div class="position-wrapper">
-        <div class="position" v-for="item in result" @click="callback(item)">
-          <a>{{item.name}}</a>
-          <p>
-            {{item.city}}
-            {{item.district}}
-          </p>
+      <div class="position-wrapper border-top-1px">
+        <div class="position border-bottom-1px" v-for="item in result" @click="callback(item)">
+          <p>{{item.city}}&nbsp;&nbsp;{{item.district}}</p>
+          <div>{{item.name}}</div>
         </div>
       </div>
     </div>
@@ -54,12 +51,12 @@
           region: this.userLocation,
           query: this.location
         })
-          .then(res => {
-            setTimeout(() => {
-              toast.hide();
-            }, 300);
-            this.result = res.result;
-          });
+        .then(res => {
+          setTimeout(() => {
+            toast.hide();
+          }, 300);
+          this.result = res.result;
+        });
       },
       callback(info) {
         const addressPosition = {
@@ -95,5 +92,8 @@
           margin: 0 5px
       .position-wrapper
         .position
+          padding 5px 0
           margin: 10px
+          div
+            padding-top 5px
 </style>