drew 5 years ago
parent
commit
29e6050eae
5 changed files with 46 additions and 13 deletions
  1. 1 1
      src/pages/dealer.vue
  2. 14 4
      src/pages/home.vue
  3. 7 0
      src/pages/login.vue
  4. 20 2
      src/pages/my.vue
  5. 4 6
      src/pages/register.vue

+ 1 - 1
src/pages/dealer.vue

@@ -49,7 +49,7 @@
                 :columns="pickerColumns"
                 value-key="name"
                 show-toolbar
-                title="选择省份"
+                title="选择城市"
                 @cancel="showProvinceDialog = false"
                 @confirm="confirmProvince"
                 id="provincePicker"

+ 14 - 4
src/pages/home.vue

@@ -18,19 +18,19 @@
             </swiper-item>
         </swiper>
         <div class="menus">
-            <div class="menu-item">
+            <div class="menu-item" @click="call">
                 <img class="icon" src="../static/imgs/home_tool_ico_1.png" />
                 <div class="name">电话咨询</div>
             </div>
-            <div class="menu-item">
+            <div class="menu-item" @click="navigate('/pages/dealer')">
                 <img class="icon" src="../static/imgs/home_tool_ico_2.png" />
                 <div class="name">经销商查询</div>
             </div>
-            <div class="menu-item">
+            <div class="menu-item" @click="navigate('/pages/testDrive')">
                 <img class="icon" src="../static/imgs/home_tool_ico_3.png" />
                 <div class="name">预约试驾</div>
             </div>
-            <div class="menu-item">
+            <div class="menu-item" @click="navigate('/pages/calculator')">
                 <img class="icon" src="../static/imgs/home_tool_ico_4.png" />
                 <div class="name">金融计算器</div>
             </div>
@@ -153,6 +153,16 @@ export default {
             wx.navigateTo({
                 url: '/pages/detail?id=' + item.skuId
             });
+        },
+        call() {
+            wx.makePhoneCall({
+                phoneNumber: '4000868888'
+            });
+        },
+        navigate(url) {
+            wx.navigateTo({
+                url
+            });
         }
     }
 };

+ 7 - 0
src/pages/login.vue

@@ -58,6 +58,13 @@ export default {
                         return Promise.reject(res.message);
                     }
                 })
+                .then(() => {
+                    wx.hideLoading();
+                    this.$store.commit('setLoginInfo', {
+                        hasUnionId: true,
+                        link: true
+                    });
+                })
                 .catch(e => {
                     wx.hideLoading();
                     wx.showToast({

+ 20 - 2
src/pages/my.vue

@@ -1,6 +1,14 @@
 <template>
     <div>
-        <div @click="login" class="top">
+        <div class="top" v-if="userInfo" key="1">
+            <img
+                :src="userInfo.image ? userInfo.image : require('../static/imgs/user.png')"
+                class="avatar"
+                mode="aspectFill"
+            />
+            <div class="name">{{ userInfo.userName }}</div>
+        </div>
+        <div @click="login" class="top" v-else key="2">
             <img src="../static/imgs/user.png" class="avatar" />
             <div class="name">点击登录</div>
         </div>
@@ -25,7 +33,16 @@
 <script>
 export default {
     data() {
-        return {};
+        return {
+            userInfo: null
+        };
+    },
+    onShow() {
+        this.$http.get('/applets/customerdetail').then(res => {
+            if (res.data) {
+                this.userInfo = res.data;
+            }
+        });
     },
     methods: {
         call() {
@@ -62,6 +79,7 @@ button {
     .avatar {
         width: 75px;
         height: 75px;
+        border-radius: 50%;
     }
     .name {
         font-size: 14px;

+ 4 - 6
src/pages/register.vue

@@ -104,18 +104,14 @@ export default {
                     if (this.$store.state.loginInfo && this.$store.state.loginInfo.hasUnionId) {
                         return Promise.resolve();
                     } else {
-                        this.$http.post('/applets/dealuserinfo', {
+                        return this.$http.post('/applets/dealuserinfo', {
                             ...e.detail,
                             userInfo: JSON.stringify(e.detail.userInfo)
                         });
                     }
                 })
                 .then(res => {
-                    if (res.code === 200) {
-                        return this.$http.get('/applets/checkmobileexist');
-                    } else {
-                        return Promise.reject(res.message);
-                    }
+                    return this.$http.get('/applets/checkmobileexist');
                 })
                 .then(res => {
                     if (res.code === 200) {
@@ -151,8 +147,10 @@ export default {
                 })
                 .then(() => {
                     wx.hideLoading();
+                    wx.navigateBack();
                 })
                 .catch(e => {
+                    console.log(e);
                     wx.hideLoading();
                     wx.showToast({
                         icon: 'none',