From 476301b8f9f41f8943d4fc293beceb4dc5e6be12 Mon Sep 17 00:00:00 2001
From: unknown <331404948@qq.com>
Date: Thu, 30 Nov 2023 18:48:29 +0800
Subject: [PATCH] 00

---
 manifest.json                          |  4 ++--
 package.json                           |  1 +
 pages/tabbar/mine/index.vue            |  4 ++--
 pages/userCenter/scanCode/scanCode.vue | 30 +++++++++++++++++++++++++++++-
 4 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/manifest.json b/manifest.json
index 0cb253b..e220a70 100644
--- a/manifest.json
+++ b/manifest.json
@@ -78,11 +78,11 @@
     "vueVersion" : "2",
     "h5" : {
         "devServer" : {
-            "port" : 8000,
+            "port" : 91,
             "disableHostCheck" : true,
             "proxy" : {
                 "/api" : {
-                    "target" : "http://192.168.1.39:48080/",
+                    "target" : "http://192.168.1.36:48080/",
                     "changeOrigin" : true,
                     "secure" : true,
                     "pathRewrite" : {
diff --git a/package.json b/package.json
index 6b8150f..a6b1b42 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "uqrcodejs": "^4.0.7",
     "uview-ui": "^2.0.36"
   }
 }
diff --git a/pages/tabbar/mine/index.vue b/pages/tabbar/mine/index.vue
index a3121c3..de3958c 100644
--- a/pages/tabbar/mine/index.vue
+++ b/pages/tabbar/mine/index.vue
@@ -27,7 +27,7 @@
 			</view>
 		</view>
 		
-		<u-action-sheet :actions="list" title="请选择您要登录的角色" :show="showRole" @select="selectClick" ></u-action-sheet>
+		<u-action-sheet :actions="list" title="请选择您要登录的角色" :show="showRole" @select="selectClick" @close="showRole=false" ></u-action-sheet>
 		
 		<UserTab name ='我的'></UserTab>
 	</view>
@@ -105,7 +105,7 @@
 					this.list.push(obj)
 				})
 			},
-			goPage() {},
+
 			
 			 getIpAddress() {
 			  // 使用第三方API服务获取IP地址，例如ipinfo.io
diff --git a/pages/userCenter/scanCode/scanCode.vue b/pages/userCenter/scanCode/scanCode.vue
index bb57272..0f467d2 100644
--- a/pages/userCenter/scanCode/scanCode.vue
+++ b/pages/userCenter/scanCode/scanCode.vue
@@ -4,7 +4,7 @@
 		<view class="pad">
 			<view class="card">
 				<view class="qcode">
-					
+					<canvas id="qrcode" canvas-id="qrcode" style="width: 200px;height: 200px;"></canvas>
 				</view>
 			</view>
 			
@@ -16,12 +16,40 @@
 </template>
 
 <script>
+	import UQRCode from 'uqrcodejs';
+	export default {
+		onReady() {
+		  // 获取uQRCode实例
+		  var qr = new UQRCode();
+		  let {coachId, nickname, schoolId, tenantId} =  this.vuex_userInfo.user
+		  // 设置二维码内容
+		  qr.data = JSON.stringify({
+			  coachId,
+			  schoolId,
+			  nickname: encodeURIComponent(nickname)
+		  })
+		  // 设置二维码大小，必须与canvas设置的宽高一致
+		  qr.size = 200;
+		  qr.margin = 20;
+		  // 调用制作二维码方法
+		  qr.make();
+		  // 获取canvas上下文
+		  var canvasContext = uni.createCanvasContext('qrcode', this); // 如果是组件，this必须传入
+		  // 设置uQRCode实例的canvas上下文
+		  qr.canvasContext = canvasContext;
+		  // 调用绘制方法将二维码图案绘制到canvas上
+		  qr.drawCanvas();
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
 	.qcode {
 		width: 100%;
 		height: 600rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
 	}
 	.card {
 		padding: 28rpx;