From 340f4c5cf7a759d2c71a053870919f9290d0ac45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=B5=A9?= <15830956848@163.com>
Date: Fri, 23 May 2025 18:56:25 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TUIGroup/create-group/index.vue           |   3 +-
 TUIKit/components/TUIGroup/index.vue          |   1 +
 TUIKit/components/common/Transfer/index.vue   |   8 ++--
 TUIKit/locales/en/TUIContact.ts               |   2 +-
 TUIKit/locales/en/TUIGroup.ts                 |   2 +-
 TUIKit/locales/zh_cn/TUIContact.ts            |   2 +-
 TUIKit/locales/zh_cn/TUIGroup.ts              |   2 +-
 TUIKit/locales/zh_tw/TUIContact.ts            |   2 +-
 TUIKit/locales/zh_tw/TUIGroup.ts              |   2 +-
 package.json                                  |   3 +-
 pages.json                                    |   6 +++
 pages/mine/share.vue                          |  43 ++++++++++++++++++
 pages/tabbar/im/index.vue                     |   6 +--
 pages/tabbar/user/utils/tool.vue              |  34 +++++++++++++-
 static/mine/share.png                         | Bin 0 -> 825 bytes
 15 files changed, 99 insertions(+), 17 deletions(-)
 create mode 100644 pages/mine/share.vue
 create mode 100644 static/mine/share.png

diff --git a/TUIKit/components/TUIGroup/create-group/index.vue b/TUIKit/components/TUIGroup/create-group/index.vue
index e5a5b427..75777596 100644
--- a/TUIKit/components/TUIGroup/create-group/index.vue
+++ b/TUIKit/components/TUIGroup/create-group/index.vue
@@ -183,7 +183,7 @@ const groupTypeDetail = computed(() => {
 });
 
 const headerTitle = computed(() => {
-  let name = '添加群聊';
+  let name = '群设置';
   if (groupInfo.isEdit) {
     name = groupInfo.groupConfig.title;
   }
@@ -264,6 +264,7 @@ const submit = () => {
 };
 
 const closeCreated = () => {
+  emit('con',1)
   if (groupInfo.isEdit) {
     return groupInfo.isEdit = !groupInfo.isEdit;
   }
diff --git a/TUIKit/components/TUIGroup/index.vue b/TUIKit/components/TUIGroup/index.vue
index fbc8396c..d6d39f15 100644
--- a/TUIKit/components/TUIGroup/index.vue
+++ b/TUIKit/components/TUIGroup/index.vue
@@ -1,5 +1,6 @@
 <template>
   <div :class="[(isShowCreateGroup || isShowManageGroup || isShowSelectMember) && 'tui-group']">
+    
     <CreateGroup v-if="isShowCreateGroup" @con="iscon"/>
     <ManageGroup v-if="isShowManageGroup" />
     <SelectMember v-if="isShowSelectMember" />
diff --git a/TUIKit/components/common/Transfer/index.vue b/TUIKit/components/common/Transfer/index.vue
index a9e3d096..2b2c6ade 100644
--- a/TUIKit/components/common/Transfer/index.vue
+++ b/TUIKit/components/common/Transfer/index.vue
@@ -14,7 +14,7 @@
       <div class="left">
         <header class="transfer-header">
           <!-- PC triggers @keyup.enter -->
-          <input
+          <!-- <input
             v-if="isPC && isTransferSearch"
             type="text"
             :value="searchValue"
@@ -22,9 +22,9 @@
             enterkeyhint="search"
             :class="[isUniFrameWork ? 'left-uniapp-input' : '']"
             @keyup.enter="handleInput"
-          />
+          /> -->
           <!-- not PC triggers blur -->
-          <input
+          <!-- <input
             v-if="!isPC && isTransferSearch"
             type="text"
             :placeholder="TUITranslateService.t('component.请输入userID')"
@@ -33,7 +33,7 @@
             :class="[isUniFrameWork ? 'left-uniapp-input' : '']"
             @blur="handleInput"
             @confirm="handleInput"
-          />
+          /> -->
         </header>
         <main class="transfer-left-main">
           <ul class="transfer-list">
diff --git a/TUIKit/locales/en/TUIContact.ts b/TUIKit/locales/en/TUIContact.ts
index 18e62ab3..18bc8541 100644
--- a/TUIKit/locales/en/TUIContact.ts
+++ b/TUIKit/locales/en/TUIContact.ts
@@ -16,7 +16,7 @@ const TUIContact = {
   "接受": "Accept",
   "拒绝": "Refuse",
   "已处理": "Handled",
-  "添加群聊": "add group chat",
+  "群设置": "add group chat",
   "已加入": "joined",
   "该群组不存在": "The group does not exist",
   "加群": "join",
diff --git a/TUIKit/locales/en/TUIGroup.ts b/TUIKit/locales/en/TUIGroup.ts
index d08a2c9f..e03c169e 100644
--- a/TUIKit/locales/en/TUIGroup.ts
+++ b/TUIKit/locales/en/TUIGroup.ts
@@ -50,7 +50,7 @@ const TUIGroup = {
   "请先注册 TUIGroup 模块": "Please register the TUIGroup module first",
   "该用户不存在": "The user does not exist",
   "该用户不在群组内": "The user is not in the group",
-  "添加群聊": "Add a group chat",
+  "群设置": "Add a group chat",
   "该群组不存在": "The group does not exist",
   "创建群聊，请注册 TUIGroup 模块": "To create a group chat, please register the TUIGroup module",
   "创建成功": "Creation successful",
diff --git a/TUIKit/locales/zh_cn/TUIContact.ts b/TUIKit/locales/zh_cn/TUIContact.ts
index 15113258..5ede982a 100644
--- a/TUIKit/locales/zh_cn/TUIContact.ts
+++ b/TUIKit/locales/zh_cn/TUIContact.ts
@@ -18,7 +18,7 @@ const TUIContact = {
   "接受": "接受",
   "拒绝": "拒绝",
   "已处理": "已处理",
-  "添加群聊": "添加群聊",
+  "群设置": "群设置",
   "已加入": "已加入",
   "该群组不存在": "该群组不存在",
   "加群": "加群",
diff --git a/TUIKit/locales/zh_cn/TUIGroup.ts b/TUIKit/locales/zh_cn/TUIGroup.ts
index f6cabd0d..046e4360 100644
--- a/TUIKit/locales/zh_cn/TUIGroup.ts
+++ b/TUIKit/locales/zh_cn/TUIGroup.ts
@@ -51,7 +51,7 @@ const TUIGroup = {
   "请先注册 TUIGroup 模块": "请先注册 TUIGroup 模块",
   "该用户不存在": "该用户不存在",
   "该用户不在群组内": "该用户不在群组内",
-  "添加群聊": "添加群聊",
+  "群设置": "群设置",
   "该群组不存在": "该群组不存在",
   "创建群聊，请注册 TUIGroup 模块": "创建群聊，请注册 TUIGroup 模块",
   "创建成功": "创建成功",
diff --git a/TUIKit/locales/zh_tw/TUIContact.ts b/TUIKit/locales/zh_tw/TUIContact.ts
index 8afff559..99abeb86 100644
--- a/TUIKit/locales/zh_tw/TUIContact.ts
+++ b/TUIKit/locales/zh_tw/TUIContact.ts
@@ -16,7 +16,7 @@ const TUIContact = {
   "接受": "接受",
   "拒绝": "拒絕",
   "已处理": "已處理",
-  "添加群聊": "添加群聊",
+  "群设置": "群设置",
   "已加入": "已加入",
   "该群组不存在": "該群組不存在",
   "加群": "加群",
diff --git a/TUIKit/locales/zh_tw/TUIGroup.ts b/TUIKit/locales/zh_tw/TUIGroup.ts
index 1db14eda..407965ac 100644
--- a/TUIKit/locales/zh_tw/TUIGroup.ts
+++ b/TUIKit/locales/zh_tw/TUIGroup.ts
@@ -51,7 +51,7 @@ const TUIGroup = {
   "请先注册 TUIGroup 模块": "請先註冊 TUIGroup 模塊",
   "该用户不存在": "該用戶不存在",
   "该用户不在群组内": "該用戶不在群組內",
-  "添加群聊": "添加群聊",
+  "群设置": "群设置",
   "该群组不存在": "該群組不存在",
   "创建群聊，请注册 TUIGroup 模块": "創建群聊，請註冊 TUIGroup 模塊",
   "创建成功": "創建成功",
diff --git a/package.json b/package.json
index 5d30eb54..08876aa4 100644
--- a/package.json
+++ b/package.json
@@ -3,8 +3,9 @@
 		"@dcloudio/uni-app": "^2.0.2-4050720250324001",
 		"@tencentcloud/chat-uikit-uniapp": "^2.4.3",
 		"@vue/runtime-core": "^3.5.13",
+		"qrcodejs2": "0.0.2",
 		"unplugin-vue2-script-setup": "^0.11.4",
 		"vue": "^3.2.0",
 		"ws": "^8.18.1"
 	}
-}
\ No newline at end of file
+}
diff --git a/pages.json b/pages.json
index f96a3254..cdfafdc4 100644
--- a/pages.json
+++ b/pages.json
@@ -513,6 +513,12 @@
 						"navigationBarTitleText": "用户"
 					}
 				},
+				{
+					"path": "share",
+					"style": {
+						"navigationBarTitleText": "分享"
+					}
+				},
 				{
 					"path": "mydistribution/my/income",
 					"style": {
diff --git a/pages/mine/share.vue b/pages/mine/share.vue
new file mode 100644
index 00000000..b9feb866
--- /dev/null
+++ b/pages/mine/share.vue
@@ -0,0 +1,43 @@
+<template>
+    <view class="container">
+      <!-- 用于显示二维码的容器 -->
+      <view id="qrcode"></view>
+    </view>
+  </template>
+  
+  <script>
+  import QRCode from 'qrcodejs2';
+  import config from "@/config/config.js";
+  
+  export default {
+    data() {
+      return {
+        // ... existing code ...
+      };
+    },
+    onReady() {
+      this.generateQRCode();
+    },
+    methods: {
+      generateQRCode() {
+        if (config.downloadLink) {
+          new QRCode(document.getElementById('qrcode'), {
+            text: config.downloadLink,
+            width: 200,
+            height: 200,
+            colorDark : "#000000",
+            colorLight : "#ffffff",
+            correctLevel : QRCode.CorrectLevel.H
+          });
+        }
+      }
+    }
+  };
+  </script>
+  
+  <style scoped>
+  #qrcode {
+    margin: 20px auto;
+    text-align: center;
+  }
+  </style>
\ No newline at end of file
diff --git a/pages/tabbar/im/index.vue b/pages/tabbar/im/index.vue
index 9d4681eb..ed5dc1cb 100644
--- a/pages/tabbar/im/index.vue
+++ b/pages/tabbar/im/index.vue
@@ -29,7 +29,7 @@
       <!-- 弹出框 -->
       <view v-if="isPopupVisible" class="popup" ref="popup">
         <ul>
-          <li @click.stop="handleAddFriend">添加好友/群聊</li>
+          <li @click.stop="handleAddFriend">添加好友</li>
           <li @click.stop="handleMenu()">发起群聊</li>
           <li @click.stop="handleScan">扫一扫</li>
         </ul>
@@ -50,8 +50,8 @@
     />
     <!-- 群类型 -->
     <CreateGroup v-else-if="statue == 10" @con="confn" />
-    <SelectFriendqlioa v-else-if="statue == 4" @concen="concen" />
-    <ContactInfo v-else-if="statue == 7" @concen="concen" />
+    <SelectFriendqlioa v-else-if="statue == 4" @con="confn"/>
+    <ContactInfo v-else-if="statue == 7" @con="confn" />
     <!-- 站内信数据 -->
     <!-- <div > -->
     <scroll-view
diff --git a/pages/tabbar/user/utils/tool.vue b/pages/tabbar/user/utils/tool.vue
index eb1b1812..645fe60c 100644
--- a/pages/tabbar/user/utils/tool.vue
+++ b/pages/tabbar/user/utils/tool.vue
@@ -4,6 +4,14 @@
     <view class="interact-tools" style="margin-bottom: 15px">
       <div class="paddingBox">
         <view class="interact-container">
+          <!-- <view
+            class="interact-item"
+            @click="navigateTo('/pages/mine/share')"
+          > -->
+          <view class="interact-item" @click="shareApp">
+            <image src="/static/mine/share.png" mode=""></image>
+            <view>分享</view>
+          </view>
           <view
             class="interact-item"
             @click="navigateTo('/pages/mine/invite')"
@@ -140,7 +148,7 @@
             v-if="userInfonew.storeId != ''"
           >
             <image src="/static/mine/somp.png" mode=""></image>
-            <view>核销</view>
+            <view>扫码核销</view>
           </view>
         </view>
       </div>
@@ -151,6 +159,7 @@
 <script>
 import { distribution, getGoodstake } from "@/api/goods";
 import { getUserInfo } from "@/api/members";
+import config from "@/config/config.js";
 export default {
   props: {
     userInfo: {
@@ -196,7 +205,28 @@ export default {
         },
       });
     },
-
+    shareApp() {
+      uni.share({
+        provider: "weixin",
+        scene: "WXSceneSession", // 分享到聊天会话
+        type: 2, // 分享纯文本
+        content: `快来访问这个链接吧：${config.downloadLink}`, // 纯文本内容，可以根据需求修改
+        success: function () {
+          console.log("分享成功");
+          uni.showToast({
+            title: '分享成功',
+            icon: 'success'
+          });
+        },
+        fail: function (err) {
+          console.log("分享失败", err);
+          uni.showToast({
+            title: '分享失败，请稍后重试',
+            icon: 'none'
+          });
+        },
+      });
+    },
     navigateTo(url) {
       uni.navigateTo({
         url,
diff --git a/static/mine/share.png b/static/mine/share.png
new file mode 100644
index 0000000000000000000000000000000000000000..e1364f0321de99e377a508074427f6c00c4bc942
GIT binary patch
literal 825
zcmV-91IGM`P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%^GQTOR9HvtmrqDkQ543%^HhW)(wR3&l8egPlw%YXEyQ<6p^O;Qr3q1l5LAnb
zHU^GRfs1TWi<E>2qLnd|m0`@>2X1uHVn$m;)T%$!+%a1eNX|R)EMfjSGt8hHAH3B)
z_xpbL%sKbGA*}I3YwVA8fUFsCxI4FLmQ|nYCsMP1Gc_hE#2^vX{iv+$-ZehHu#!eb
z0KL&W1g4%`=1c1YzX}IB5@Vx=;Ul6x240jicUPO{d^W8#0Nw3<2~ZorBLF_-gkWt<
z&G_G>#wj7L0T=+Y<aqp)YjW~yCaoj@*M4t3FVcG^JdA|{XL6e72vCM`0YrBJOqXj~
zS5+|hF?CB4fWG&n0gWZV{VMXzS1f?NKPJRk2JCFkR#sHBY?_$(o~T<=fL~2bTNld8
z4luCvf~b~&Y73|#U?Vg8T&CGya)6(PQU8bN5`c>-S^Ev<7y*k+v|S^*=Lm(8Vv5ed
z|BAOo9bg`VroD~>??4o;2?oE#4C5GU+9;SeSj=r(O!HOAG7uADh=Cs4SObO~rujUn
z9ffEnU=)B8z-e8|M<pvlB?Q}I%-ruX&9s75&CLg4pB$*uh|W7gq5C=8FyAgvLfFEc
z+00`??6H8S1ng$uic8ADye^`A0Oo|~vVg|~M4VDKW)hAXhCxIU%-40(yqWh^oDYB!
zVhVtpnUA|nGi?qmo7oVF>yCzwBO1kzrrs|Fb%7G%Fn}on?l`5qT*yVGyS+Yu`e2br
z9AE_j%y~RFEaqNj7Au`T6Ie+Aln`HRab3#VLQcQ5r`Qb4wYF}y;_-QV#JZ$BvFZTx
zEiF41E$agTBTgyLtvZ16cn*Pi8o(`G%HCB6unm<EQX?96ghEf&1fWpU#Q405@L#pI
zGZ?0t35a40Q}^l(?Ggk-MFL5!pZ-nQ=p6u){XO><jA%(92vq>~f#|9V`)_9*$IA=4
z+v^3$9w0kQ0swpl;8T&ngB8bdiOdR;S^sOc<{9`4C8?`0o8$hD00000NkvXXu0mjf
DDo$^a

literal 0
HcmV?d00001