Merge branch 'master' of http://gitlab.oytour.com/viitto/million

src/App.vue

@@ -10,7 +10,7 @@ export default {
 };
 </script>
 <style>
-@import url("//at.alicdn.com/t/font_1890699_hdbdh9httvc.css");
+@import url("//at.alicdn.com/t/font_1890699_t3cp3liyfpg.css");
 @font-face {
   font-family: "oswald";
   src: url("https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/smallapp/Oswald-Regular.ttf");

src/components/searchdata/block.vue

 <template>
   <!-- 豆腐块 -->
   <div class="Search_center">
-    <ul class="pd-list" v-for="(item,index) in DataList">
-      <li class="pd-box" :key="index">
+    <ul class="pd-list">
+      <li class="pd-box" v-for="(item,index) in DataList" :key="index">
         <a class="pd-link">
           <div class="pd-img"
             :style="{backgroundImage:`url('${item.newCoverImg}')`}">

src/pages/usercenter/account.vue

@@ -75,6 +75,10 @@
           </div>
         </div>
         <div class="row q-col-gutter-x-xs q-col-gutter-y-lg">
+          <div class="account-group col-6">
+            <div class="account_labelName">手機</div>
+            <q-input outlined v-model="accountMsg.Mobile" class="bg-grey-1" />
+          </div>
           <div class="account-group col-6">
             <div class="account_labelName"><span class="regisStar">*</span>生日</div>
             <q-input filled v-model="accountMsg.Birthday" mask="date">
@@ -87,10 +91,6 @@
               </template>
             </q-input>
           </div>
-          <div class="account-group col-6">
-            <div class="account_labelName">手機</div>
-            <q-input outlined v-model="accountMsg.Mobile" class="bg-grey-1" />
-          </div>
         </div>
         <div class="account-group">
           <div class="account_labelName">地址</div>
@@ -212,13 +212,19 @@
           })
           return;
         }
-
+        this.$q.loading.show()
         this.apipost(
           "b2b_post_SetCustomerAccountService", this.accountMsg,
           res => {
-
+            this.$q.loading.hide()
             if (res.data.resultCode == 1) {
               this.getAccountInfo();
+              this.$q.notify({
+                type: 'positive',
+                message:'保存成功',
+                position:'top',
+                timeout: 2000, // 以毫秒为单位; 0意味着没有超时
+              })
               // var jsonData = JSON.stringify(res.data.data);
               // window.localStorage.setItem("b2bUser", jsonData);
 
@@ -265,12 +271,18 @@
           })
           return;
         }
+        this.$q.loading.show()
         this.apipost(
           "b2b_post_ModifyAccountPassowrd", this.updateMsg,
           res => {
-            console.log("res", res.data);
+            this.$q.loading.hide()
             if (res.data.resultCode == 1) {
-
+              this.$q.notify({
+                type: 'positive',
+                message:'保存成功',
+                position:'top',
+                timeout: 2000, // 以毫秒为单位; 0意味着没有超时
+              })
             }
           },
           err => {}

src/pages/usercenter/register.vue

@@ -69,11 +69,11 @@
         </div>
         <div class="registform-group">
           <div class="login_labelName"><span class="regisStar">*</span>設定密碼</div>
-          <q-input outlined v-model="registerMsg.Password" class="bg-grey-1" />
+          <q-input outlined v-model="registerMsg.Password" type="password" class="bg-grey-1" />
         </div>
         <div class="registform-group">
           <div class="login_labelName"><span class="regisStar">*</span>再輸入一次密碼</div>
-          <q-input outlined v-model="registerMsg.SurePwd" class="bg-grey-1" />
+          <q-input outlined v-model="registerMsg.SurePwd" type="password" class="bg-grey-1" />
         </div>
         <div class="registform-group">
           <div class="login_labelName">性別</div>