信息提交页面搭建完毕

api/login.js

 import request from '@/utils/request'
 
-// 登录方法
-export function login(username, password, code, uuid) {
-  const data = {
-    username,
-    password,
-    code,
-    uuid
-  }
+// 提交用户注册信息
+export function submitUserInfo(data) {
   return request({
-    'url': '/auth/login',
-    headers: {
-      isToken: false
-    },
+    'url': '/user/wechat/core/temporary/enroll',
     'method': 'post',
     'data': data
   })
-}
-
-// 注册方法
-export function register(data) {
-  return request({
-    url: '/auth/register',
-    headers: {
-      isToken: false
-    },
-    method: 'post',
-    data: data
-  })
-}
-
-// 获取用户详细信息
-export function getInfo() {
-  return request({
-    'url': '/system/user/getInfo',
-    'method': 'get'
-  })
-}
-
-// 退出方法
-export function logout() {
-  return request({
-    'url': '/auth/logout',
-    'method': 'DELETE'
-  })
-}
-
-// 获取验证码
-export function getCodeImg() {
-  return request({
-    'url': '/auth/captchaImage',
-    headers: {
-      isToken: false
-    },
-    method: 'get',
-    timeout: 20000
-  })
-}
+}
\ No newline at end of file

config.js

@@ -5,9 +5,9 @@ module.exports = {
   mapKey: 'mryaav7xyp0Z3ItwUT3oMssYAmG8sTSU',
   coordtype: 'gcj02', // 坐标类型（小程序获取和百度地图 API 使用类型要对应上）
   // baseUrl: 'http://localhost:8080',
-  baseUrl: 'http://192.168.140.189:8080', // 局域网请求
-  // baseUrl: 'http://sfa.test.wxl66.cn:85/api', // 上线测试
-  // baseUrl: 'http://111.198.15.68:85/api',
+  baseUrl: 'http://promotion.wxl66.cn:8010', // 云 API 域名
+  wxAppId: 'wx5d89065bb4725557',
+  wxSecret: '7395e91baf6b49ca9b84b1301989f77e',
   // 应用信息
   appInfo: {
     // 应用名称
@@ -20,13 +20,13 @@ module.exports = {
     site_url: "http://ruoyi.vip",
     // 政策协议
     agreements: [{
-        title: "隐私政策",
-        url: "https://ruoyi.vip/protocol.html"
-      },
-      {
-        title: "用户服务协议",
-        url: "https://ruoyi.vip/protocol.html"
-      }
+      title: "隐私政策",
+      url: "https://ruoyi.vip/protocol.html"
+    },
+    {
+      title: "用户服务协议",
+      url: "https://ruoyi.vip/protocol.html"
+    }
     ]
   }
 }

main.js

@@ -4,14 +4,14 @@ import store from './store' // store
 import plugins from './plugins' // plugins
 import './permission' // permission
 import * as auth from './utils/auth.js'
+import config from './config.js'
 Vue.use(plugins)
 
 // 获取 access_token
-const appid = 'wx5d89065bb4725557'
-const secret = '7395e91baf6b49ca9b84b1301989f77e'
+
 // 发起请求
 uni.request({
-  url: `https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=${appid}&secret=${secret}`,
+  url: `https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=${config.wxAppId}&secret=${config.wxSecret}`,
   success: function (res) {
     auth.setAccessToken(res.data.access_token)
   },

pages.json

 {
   "pages": [
+    {
+      "path": "pages/start",
+      "style": {
+        "navigationBarTitleText": "欢迎使用-小卤促销员平台"
+      }
+    },
     {
       "path": "pages/login",
       "style": {
@@ -7,9 +13,9 @@
       }
     },
     {
-      "path": "pages/start",
+      "path": "pages/register",
       "style": {
-        "navigationBarTitleText": "欢迎使用-小卤促销员平台"
+        "navigationBarTitleText": "促销员提交"
       }
     },
 	  {
@@ -30,12 +36,7 @@
         "navigationBarTitleText": "工作台"
       }
     },
-    {
-      "path": "pages/register",
-      "style": {
-        "navigationBarTitleText": "注册"
-      }
-    },
+    
     {
       "path": "pages/mine/index",
       "style": {

pages/login.vue

@@ -48,38 +48,55 @@ export default {
   },
   methods: {
     // 手机号登录
-    getPhoneNumber(e) {
+    async getPhoneNumber(e) {
       this.$modal.loading("登录中，请耐心等待...")
       // 通过微信小程序 API 获取手机号
-      uni.request({
+      const [,phoneRes] = await uni.request({
         url: `https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token=${getAccessToken()}`,
         method: 'POST',
         data: {
           code: e.detail.code
-        },
-        success: (res) => {
-          console.log('后端解密手机号成功，手机号为:', res);
-          storage.set(constant.loginPhone, res.data.phone_info.phoneNumber)
-          this.$modal.closeLoading()
-          this.$tab.reLaunch('/pages/index')
-        },
-        fail: function () {
-          console.log('后端解密手机号失败');
         }
+      })
+
+      // 调用微信登录接口，获取 code
+      const [,loginRes] = await uni.login({
+        provider: 'weixin'
+      })
+
+      // 通过 code 获取 openid
+      const [,openRes] = await uni.request({
+        url: `https://api.weixin.qq.com/sns/jscode2session?appid=${this.globalConfig.wxAppId}&secret=${this.globalConfig.wxSecret}&js_code=${loginRes.code}&grant_type=authorization_code`
       });
+
+      // 获取用户信息-头像等
+      const [,userRes] = await uni.getUserInfo({
+        provider: 'weixin',
+        withCredentials: false
+      })
+
+      storage.set(constant.loginPhone, phoneRes.data.phone_info.phoneNumber)
+      storage.set(constant.loginOpenId, openRes.data.openid)
+      this.$store.commit('SET_USER', userRes.userInfo)
+      this.$modal.closeLoading()
+      this.$tab.reLaunch('/pages/register')
+
     },
-    // // 登录成功后，处理函数
-    // async loginSuccess(result) {
-    //   // 设置用户信息
-    //   await this.$store.dispatch('GetInfo')
-    //   await this.getAuth()
-    //   this.$tab.reLaunch('/pages/index')
-    // },
-    // 登录成功后，开始获取各种权限
-    async getAuth() {
-      // 获取地址位置
-      return this.$store.dispatch('GetLocation')
+    fail: function () {
+      console.log('后端解密手机号失败');
     }
+  },
+  // // 登录成功后，处理函数
+  // async loginSuccess(result) {
+  //   // 设置用户信息
+  //   await this.$store.dispatch('GetInfo')
+  //   await this.getAuth()
+  //   this.$tab.reLaunch('/pages/index')
+  // },
+  // 登录成功后，开始获取各种权限
+  async getAuth() {
+    // 获取地址位置
+    return this.$store.dispatch('GetLocation')
   }
 }
 </script>

pages/start.vue

@@ -10,9 +10,11 @@ export default {
     setTimeout(() => {
       // this.$tab.redirectTo('/page_subject/pages/login')
       console.log(storage.get(constant.loginPhone))
+      // TODO：下面重写：有手机号，判断注册信息填过没有，有就去首页，没有就去注册页
       if (storage.get(constant.loginPhone)) {
-        // 有存储过之前的登录手机号 
-        this.$tab.switchTab('/pages/index')
+        // 有存储过之前的登录手机号+openId 也不对，需要注册成功，再去首页
+        // this.$tab.switchTab('/pages/index')
+        this.$tab.redirectTo('/pages/register')
       } else {
         this.$tab.redirectTo('/pages/login')
       }

store/getters.js

-import store from '@/store'
 const getters = {
   token: state => state.user.token,
   avatar: state => state.user.avatar,

utils/constant.js

@@ -8,6 +8,7 @@ const constant = {
    location: 'vuex_location',
    // 登录使用手机号
    loginPhone: 'vuex_login_phone',
+   loginOpenId: 'vuex_login_openid',
  }
 
  export default constant

utils/storage.js

@@ -4,7 +4,7 @@ import constant from './constant'
 let storageKey = 'storage_data'
 
 // 存储节点变量名
-let storageNodeKeys = [constant.avatar, constant.name, constant.roles, constant.permissions, constant.user, constant.location, constant.loginPhone]
+let storageNodeKeys = [constant.avatar, constant.name, constant.roles, constant.permissions, constant.user, constant.location, constant.loginPhone, constant.loginOpenId]
 
 const storage = {
   set: function(key, value) {