From a67fe5e3757b22c235e94ab3601cd29aadd75a46 Mon Sep 17 00:00:00 2001
From: D <3066417822@qq.com>
Date: Thu, 18 Jan 2024 02:45:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BA=86=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/oauth.js                    | 31 ++++++++++++++++++
 src/config.js                       |  6 ++--
 src/pages/login.vue                 | 15 +++++++++
 src/pages_mine/pages/info/index.vue | 49 ++++++++++++++++-------------
 src/utils/geek.ts                   | 14 +++++----
 vite.config.js                      |  2 +-
 6 files changed, 87 insertions(+), 30 deletions(-)
 create mode 100644 src/api/oauth.js

diff --git a/src/api/oauth.js b/src/api/oauth.js
new file mode 100644
index 0000000..2ab0f91
--- /dev/null
+++ b/src/api/oauth.js
@@ -0,0 +1,31 @@
+import request from '@/utils/request'
+/**
+ * 微信登录
+ * @param {*} source pub miniapp
+ * @param {*} code 
+ * @returns 
+ */
+export function wxLogin(source,code) {
+    return request({
+        url: `/wx/login/${source}/${code}`,
+        headers: {
+            isToken: false
+        },
+        method: 'post',
+    })
+}
+/**
+ * 微信绑定
+ * @param {*} source 微信绑定
+ * @param {*} code 
+ * @returns 
+ */
+export function wxRegister(source,code) {
+    return request({
+        url: `/wx/register/${source}/${code}`,
+        headers: {
+            isToken: true
+        },
+        method: 'post',
+    })
+}
\ No newline at end of file
diff --git a/src/config.js b/src/config.js
index de0850f..903bc2c 100644
--- a/src/config.js
+++ b/src/config.js
@@ -1,8 +1,10 @@
 // 应用全局配置
 const config = {
-   baseUrl: 'https://vue.ruoyi.vip/prod-api',
+  //  baseUrl: 'https://vue.ruoyi.vip/prod-api',
+  // baseUrl: 'http://localhost/prod-api',
+  baseUrl: 'http://localhost:8080',
    //cloud后台网关地址
-   // baseUrl: 'http://192.168.10.3:8080',
+  //  baseUrl: 'http://192.168.10.3:8080',
    // 应用信息
    appInfo: {
      // 应用名称
diff --git a/src/pages/login.vue b/src/pages/login.vue
index d9ec0ad..5040836 100644
--- a/src/pages/login.vue
+++ b/src/pages/login.vue
@@ -40,6 +40,9 @@ import { getCodeImg } from '@/api/login'
 import { ref } from "vue";
 import config from '@/config.js'
 import useUserStore from '@/store/modules/user'
+import { getWxCode } from '@/utils/geek';
+import { wxLogin } from '@/api/oauth';
+import { setToken } from '@/utils/auth';
 const userStore = useUserStore()
 const codeUrl = ref("");
 const captchaEnabled = ref(true);
@@ -50,6 +53,18 @@ const loginForm = ref({
   code: "",
   uuid: ''
 });
+const useWxLogin = ref(true)
+if (useWxLogin.value) {
+  getWxCode().then(res => {
+    console.log(res);
+    wxLogin('miniapp',res).then(res => {
+      if(res.token != null){
+        setToken(res.token);
+        loginSuccess()
+      }
+    });
+  })
+}
 
 
 // 获取图形验证码
diff --git a/src/pages_mine/pages/info/index.vue b/src/pages_mine/pages/info/index.vue
index 74de413..287aa9f 100644
--- a/src/pages_mine/pages/info/index.vue
+++ b/src/pages_mine/pages/info/index.vue
@@ -10,33 +10,40 @@
       <uni-list-item showExtraIcon="true" :extraIcon="{ type: 'calendar-filled' }" title="创建日期"
         :rightText="user.createTime" />
     </uni-list>
+
+    <u-button @click="register()">绑定微信</u-button>
   </view>
 </template>
 
-<script>
+<script setup>
 import { getUserProfile } from "@/api/system/user"
+import { ref } from "vue";
+import modal from "@/plugins/modal"
 
-export default {
-  data() {
-    return {
-      user: {},
-      roleGroup: "",
-      postGroup: ""
-    }
-  },
-  onLoad() {
-    this.getUser()
-  },
-  methods: {
-    getUser() {
-      getUserProfile().then(response => {
-        this.user = response.data
-        this.roleGroup = response.roleGroup
-        this.postGroup = response.postGroup
-      })
-    }
-  }
+const user = ref({})
+const roleGroup = ref("")
+const postGroup = ref("")
+function getUser() {
+  getUserProfile().then(response => {
+    user.value = response.data
+    roleGroup.value = response.roleGroup
+    postGroup.value = response.postGroup
+  })
 }
+getUser()
+
+import { wxRegister } from "@/api/oauth"
+import { getWxCode } from "@/utils/geek"
+function register(){
+  modal.loading('绑定微信中...')
+  getWxCode().then(res=>{
+    wxRegister('miniapp',res).then(res=>{
+      modal.closeLoading()
+    })
+  })
+  
+}
+
 </script>
 
 <style lang="scss">
diff --git a/src/utils/geek.ts b/src/utils/geek.ts
index 323a05c..d21116b 100644
--- a/src/utils/geek.ts
+++ b/src/utils/geek.ts
@@ -81,10 +81,9 @@ export function generateUUID(): string {
  * 获取code
  * @returns 生成的code字符串
  */
-export async function getCode() {
+export async function getWxCode(appid?: string,redirect_uri?:string) {
   // #ifdef H5
-  let appid = "";
-  let url = "";
+  if (appid == undefined || redirect_uri == undefined) return ""
   let code = "";
 
   // 截取url中的code方法
@@ -106,16 +105,19 @@ export async function getCode() {
   if (code == undefined || code == "" || code == null) {
     // 如果没有code，则去请求
     console.log("h5");
-    window.location.href =
-      "https://open.weixin.qq.com/connect/oauth2/authorize?" +
+     let href= "https://open.weixin.qq.com/connect/oauth2/authorize?"+
       tansParams({
         appid: appid,
-        redirect_uri: url,
+        redirect_uri: redirect_uri,
         response_type: "code",
         scope: "snsapi_userinfo",
         state: "STATE",
       }) +
       "#wechat_redirect";
+      console.log(href);
+      setTimeout(() => {
+        window.location.href = href;
+      }, 5000);
   } else {
     return code;
   }
diff --git a/vite.config.js b/vite.config.js
index d609b68..246843c 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -9,7 +9,7 @@ export default defineConfig(() => {
             outDir: 'dist',
         },
         server: {
-            port: '3002'
+            port: '80'
         },
         plugins: [
             uni()