修改注册，修改appid获取

2 years ago · 9c2ed048cb
10 changed files with 210 additions and 55 deletions
--- a/src/api/user.js
+++ b/src/api/user.js
@ -33,7 +33,7 @@ export function register(data) {
  return request({
    url: `/auth/publicuser/register`,
    method: 'post',
-    message: '提交用户信息中...',
+    message: '登录中...',
    data
  })
 }
--- a/src/components/Perfect/index.vue
+++ b/src/components/Perfect/index.vue
@ -1,5 +1,5 @@
 <template>
-  <van-dialog
+<!--  <van-dialog
    v-model="show"
    title="温馨提示"
    confirm-button-text="立即注册"
@ -9,11 +9,11 @@
    show-cancel-button
  >
    <div class="tips">请先填写居民信息，完成注册。</div>
-  </van-dialog>
+  </van-dialog>-->
 </template>

 <script>
-import { checkWxmpRegister } from '@/api/user'
+// import { checkWxmpRegister } from '@/api/user'

 export default {
  name: 'Perfect',
@ -24,12 +24,12 @@ export default {
  },

  mounted() {
-    console.log(this.$store.state.app.userInfo, 'this.$store.state.app')
-    checkWxmpRegister({
+    // console.log(this.$store.state.app.userInfo, 'this.$store.state.app')
+   /* checkWxmpRegister({
      userId: this.$store.state.app.userInfo.userId
    }).then(res => {
      this.show = !res
-    })
+    })*/
  }
 }
 </script>
--- a/src/router/index.js
+++ b/src/router/index.js
@ -2,7 +2,7 @@ import Vue from 'vue'
 import Router from 'vue-router'
 import store from '@/store'
 import { constantRouterMap } from './router.config.js'
-import { login } from '@/api/user'
+import { checkWxmpRegister, login } from '@/api/user'
 import { title } from '@/config'

 const whiteList = ['/login']
@ -50,6 +50,14 @@ function paramsFormat(params) {
 }

 router.beforeEach((to, from, next) => {
+  let urlParams = getQueryParams()
+  if (urlParams.appId) {
+    store.commit('SET_APP_ID', urlParams.appId)
+    localStorage.setItem('appId', urlParams.appId)
+  } else {
+    store.commit('SET_APP_ID', localStorage.getItem('appId'))
+  }
+  console.log(store.state.app.appId, 'store.state.app.appId')
  if (to.params.type) {
    document.title = to.params.type === 'edit' ? '编辑' : '注册'
  } else {
@ -57,7 +65,15 @@ router.beforeEach((to, from, next) => {
  }
  if (localStorage.getItem('token')) {
    store.dispatch('getUserInfo').then(() => {
-      next()
+      checkWxmpRegister({
+        userId: store.state.app.userInfo.userId
+      }).then(res => {
+        if (res) {
+          next()
+        } else {
+          next('/register')
+        }
+      })
    })
  } else {
    if (getQueryStringByName('code')) {
@ -77,7 +93,7 @@ router.beforeEach((to, from, next) => {
          .replace(/:{"}/g, ':{}')
        console.log(state)
        let path = `${location.origin}${location.pathname === '/' ? '' : location.pathname}`
-        if (state) {
+        if (state && state != 'undefined') {
          state = JSON.parse(state)
          console.log(state, 'state')
          console.log(`${path}/#${state.path}?${paramsFormat(state.query)}`, 'sss')
@ -97,4 +113,15 @@ router.beforeEach((to, from, next) => {
  }
 })

+function getQueryParams() {
+  const url = window.location.href
+  const paramArr = url.slice(url.indexOf('?') + 1).split('&')
+  const params = {}
+  paramArr.map(param => {
+    const [key, val] = param.split('=')
+    params[key] = decodeURIComponent(val)
+  })
+  return params
+}
+
 export default router
--- a/src/router/router.config.js
+++ b/src/router/router.config.js
@ -49,5 +49,11 @@ export const constantRouterMap = [
    name: 'appealDetail',
    component: () => import('@/views/appealDetail'),
    meta: { title: '详情', keepAlive: false }
+  },
+  {
+    path: '/register',
+    name: 'register',
+    component: () => import('@/views/register'),
+    meta: { title: '注册', keepAlive: false }
  }
 ]
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@ -1,11 +1,15 @@
-import { getUserWechatByUserId } from '@/api/user'
+import {checkWxmpRegister, getUserWechatByUserId} from '@/api/user'

 const state = {
-  userInfo: {}
+  userInfo: {},
+  appId: ''
 }
 const mutations = {
  SET_USER_INFO(state, userInfo) {
    state.userInfo = userInfo
+  },
+  SET_APP_ID(state, appId) {
+    state.appId = appId
  }
 }
 const actions = {
--- a/src/utils/request.js
+++ b/src/utils/request.js
@ -3,7 +3,7 @@ import { Toast, Dialog } from 'vant'
 // 根据环境不同引入不同api地址
 import { baseApi } from '@/config'
 import router from '@/router'
-import route from '@/router'
+import store from '@/store'
 import { Tips } from '@/utils/index'
 // create an axios instance
 const service = axios.create({
@ -20,17 +20,20 @@ service.interceptors.request.use(
      // loading
      Tips.loading(config.message)
    }
-    config.headers['source'] = 'dev'
+    config.headers['source'] = process.env.NODE_ENV !== 'production' ? 'dev' : 'prod'
    if (localStorage.getItem('token')) {
      config.headers['Token'] = localStorage.getItem('token')
    }
+    if (store.state.app.appId) {
+      config.headers['AppId'] = store.state.app.appId
+    }
+
    config.baseURL = config.baseURL + '/'
    return config
  },
  error => {
    // do something with request error
    console.log(error) // for debug
-
    return Promise.reject(error)
  }
 )
@ -38,7 +41,6 @@ service.interceptors.request.use(
 service.interceptors.response.use(
  response => {
    Toast.clear()
-    console.log(route)
    const res = response.data
    if (res.status && res.status !== 200) {
      Tips.error(res.msg)
@ -48,10 +50,11 @@ service.interceptors.response.use(
        return Promise.resolve(res.data)
      } else {
        let loginCode = [10007, 401, 10001, 10005, 10006]
-        console.log(loginCode, 'loginCode', loginCode.includes(res.code))
        if (loginCode.includes(res.code)) {
          localStorage.removeItem('token')
-          router.replace('/login?redirect=' + route.path + '&params=' + JSON.stringify(route.query))
+          router.replace(
+            '/login?redirect=' + router.currentRoute.path + '&params=' + JSON.stringify(router.currentRoute.query)
+          )
        }
        Tips.error(res.msg)
        return Promise.reject(res || 'error')
@ -63,7 +66,9 @@ service.interceptors.response.use(
    if (error.response.status === 401) {
      Dialog({ message: '登录过期，请重新登录' }).then(() => {
        localStorage.removeItem('token')
-        router.replace('/login?redirect=' + route.path + '&params=' + JSON.stringify(route.query))
+        router.replace(
+          '/login?redirect=' + router.currentRoute.path + '&params=' + JSON.stringify(router.currentRoute.query)
+        )
      })
    } else {
      Tips.error(error.response.data.message)
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@ -3,7 +3,7 @@
 </template>

 <script>
-import { wxId } from '@/config'
+import {wxId} from '@/config'

 export default {
  name: 'login',
@ -21,8 +21,8 @@ export default {
    login() {
      console.log('login')
      let state = {
-        path: this.$route.query.redirect,
-        query: this.$route.query.params
+        path: this.$route.query.redirect ? this.$route.query.redirect : '',
+        query: this.$route.query.params ? this.$route.query.params : ''
      }
      let path = `${location.origin}${location.pathname === '/' ? '' : location.pathname}`
      let url = `//open.weixin.qq.com/connect/oauth2/authorize?appid=${wxId}&redirect_uri=${encodeURI(
@ -35,6 +35,6 @@ export default {
 }
 </script>

-<style scoped lang="less">
+<style lang="less" scoped>
@import './index';
 </style>
--- a/src/views/register/index.less
+++ b/src/views/register/index.less
@ -0,0 +1,14 @@
+.block {
+  border-radius: 8px;
+  overflow: hidden;
+  margin-bottom: 10px;
+}
+
+/deep/ .van-cell__title {
+  width: 6.2em;
+  flex: 0 0 6.2em;
+  margin-right: 12px
+}
+.gender {
+  display: flex;
+}
--- a/src/views/register/index.vue
+++ b/src/views/register/index.vue
@ -0,0 +1,98 @@
+<template>
+  <div class="container">
+    <div class="block">
+      <van-field v-model="phone" label="手机号" placeholder="请输入" required />
+      <van-field v-model="smsCode" label="验证码" placeholder="请输入" required>
+        <template #button>
+          <van-button v-if="time === 60" round size="mini" type="info" @click="getCode">获取验证码</van-button>
+          <van-button v-else disabled round size="mini" type="info">{{ time }}s后重试</van-button>
+        </template>
+      </van-field>
+    </div>
+    <van-button block color="linear-gradient(to right, #81B5FB, #3E92FF)" round @click="submit">注册</van-button>
+  </div>
+</template>
+
+<script>
+import { register, sendsmscode } from '@/api/user'
+
+var leftTime
+export default {
+  name: 'userInfo',
+  data() {
+    return {
+      form: {},
+      time: 60,
+      userInfo: {},
+      phone: '',
+      smsCode: '',
+      surName: '',
+      gender: '',
+      userId: ''
+    }
+  },
+
+  mounted() {
+    this.init()
+  },
+  destroyed() {
+    clearInterval(leftTime)
+  },
+  methods: {
+    init() {
+      this.type = this.$route.params.type ? this.$route.params.type : ''
+      this.userInfo = this.$store.state.app.userInfo
+      this.gender = this.userInfo.gender
+      this.surName = this.userInfo.realName || this.userInfo.nickname
+    },
+    submit() {
+      let params = {
+        phone: this.phone,
+        smsCode: this.smsCode,
+        surName: this.surName,
+        appid: this.$store.state.app.appId
+      }
+      if (!params.phone) {
+        this.$toast.fail('请输入手机号')
+        return
+      }
+      if (!params.smsCode) {
+        this.$toast.fail('请输入验证码')
+        return
+      }
+      register(params).then(res => {
+        localStorage.setItem('token', res.token)
+        this.$toast.success('登录成功')
+        let path = '/'
+        this.$router.replace(path)
+      })
+    },
+    getCode() {
+      if (!this.phone) {
+        this.$toast.fail('请输入手机号')
+        return false
+      }
+      if (!/1[3456789]\d{9}/.test(this.phone)) {
+        this.$toast.fail('手机号格式错误')
+        return false
+      }
+      sendsmscode({
+        phone: this.phone
+      }).then(() => {
+        leftTime = setInterval(() => {
+          if (this.time > 0) {
+            this.time--
+          } else {
+            this.time = 60
+            clearInterval(leftTime)
+          }
+        }, 1000)
+      })
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+@import './index';
+</style>
--- a/src/views/userInfo/index.vue
+++ b/src/views/userInfo/index.vue
@ -335,14 +335,15 @@ export default {
    // 获取街道
    getAllAgencyStreet() {
      getAllAgencyStreet({}).then(res => {
+        console.log(res, 'resresres')
        this.streetOptions = res
          ? res.map(item => {
-              return {
-                label: item.organizationName,
-                value: item.id,
-                customerId: item.customerId
-              }
-            })
+            return {
+              label: item.organizationName,
+              value: item.id,
+              customerId: item.customerId
+            }
+          })
          : []
        this.communityOptions = []
        console.log(this.city)
@ -365,11 +366,11 @@ export default {
      }).then(res => {
        this.communityOptions = res
          ? res.map(item => {
-              return {
-                label: item.organizationName,
-                value: item.id
-              }
-            })
+            return {
+              label: item.organizationName,
+              value: item.id
+            }
+          })
          : []
        // this.quarterOptions = []
      })
@ -381,12 +382,12 @@ export default {
      }).then(res => {
        this.quarterOptions = res
          ? res.map(item => {
-              return {
-                label: item.label,
-                value: item.value,
-                gridId: item.pid
-              }
-            })
+            return {
+              label: item.label,
+              value: item.value,
+              gridId: item.pid
+            }
+          })
          : []
        // this.buildingOptions = []
      })
@ -398,11 +399,11 @@ export default {
      }).then(res => {
        this.buildingOptions = res
          ? res.map(item => {
-              return {
-                label: item.label,
-                value: item.value
-              }
-            })
+            return {
+              label: item.label,
+              value: item.value
+            }
+          })
          : []
        // this.unitOptions = []
      })
@ -414,11 +415,11 @@ export default {
      }).then(res => {
        this.unitOptions = res
          ? res.map(item => {
-              return {
-                label: item.label,
-                value: item.value
-              }
-            })
+            return {
+              label: item.label,
+              value: item.value
+            }
+          })
          : []
        // this.houseOptions = []
      })
@ -430,11 +431,11 @@ export default {
      }).then(res => {
        this.houseOptions = res
          ? res.map(item => {
-              return {
-                label: item.label,
-                value: item.value
-              }
-            })
+            return {
+              label: item.label,
+              value: item.value
+            }
+          })
          : []
      })
    }