From 100744cfaf41a52561b1a08ea9e0f2189fe78154 Mon Sep 17 00:00:00 2001
From: Waiting <waitinghc@foxmail.com>
Date: Fri, 10 May 2024 21:33:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=94=E7=B3=BB=E5=95=86=E5=AE=B6=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/mine/index.vue              | 10 +++++++++-
 src/pages/mine/subs/contact/index.vue |  8 ++++----
 src/store/modules/user/index.ts       |  4 +++-
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/pages/mine/index.vue b/src/pages/mine/index.vue
index f46f616..6d8b3cd 100644
--- a/src/pages/mine/index.vue
+++ b/src/pages/mine/index.vue
@@ -149,8 +149,16 @@ onShow(async () => {
 
 const openCard = () => {
   // const url = 'https://mp.weixin.qq.com/bizmall/activatemembercard?action=preshow&&encrypt_card_id=LI%2FNyDp0x3z8XXorvvrHzSR4VUPa2vlioBg2xkDT3HqybiAFNsNgjH7pBpyKGrSA&outer_str=1702887425732870145&biz=MzU2MTg5MjgxMg%3D%3D#wechat_redirect';
-  goPath(`/pages/common/webview/index?url=${decodeURIComponent(cardLink.value)}`);
+  goPath(`/pages/common/webview/index?url=${encodeURIComponent(cardLink.value)}`);
   // uni.navigateToMiniProgram({ appId: 'wxeb490c6f9b154ef9' });
+  // uni.addCard({
+  //   cardList: [
+  //     {
+  //       cardId: 'pzCtO1NU8FDcF3v09_Q76-7ZuN8I',
+  //       cardExt: JSON.stringify({ 'code': '12345', openId: 'wxc480826360455685', 'timestamp': Date.now(), 'signature': '' })
+  //     }
+  //   ]
+  // });
 };
 
 const gotoPath = (path: string) => {
diff --git a/src/pages/mine/subs/contact/index.vue b/src/pages/mine/subs/contact/index.vue
index 9b136b4..ba5e08a 100644
--- a/src/pages/mine/subs/contact/index.vue
+++ b/src/pages/mine/subs/contact/index.vue
@@ -2,12 +2,12 @@
   <view class='card-view'>
     <view class='c-flex-row'>
       <text class='key'>姓名</text>
-      <text class='value'>{{companyInfo.master||companyInfo.companyName}}</text>
+      <text class='value'>{{ companyConfigInfo.contactname}}</text>
     </view>
     <view class='divider' />
     <view class='c-flex-row'>
       <text class='key'>手机号</text>
-      <text class='value'>{{companyInfo.telphone}}</text>
+      <text class='value'>{{companyConfigInfo.contacttelephone}}</text>
       <image :src='assetsUrl("ic_contact_merchant.png")' @click.stop='call' />
     </view>
   </view>
@@ -17,10 +17,10 @@
 import { useUserStore } from '@/store';
 import { assetsUrl } from '@/utils/assets';
 
-const { companyInfo } = storeToRefs(useUserStore());
+const { companyConfigInfo } = storeToRefs(useUserStore());
 const call = () => {
   uni.makePhoneCall({
-    phoneNumber: companyInfo.value.telphone
+    phoneNumber: companyConfigInfo.value.contacttelephone
   });
 };
 </script>
diff --git a/src/store/modules/user/index.ts b/src/store/modules/user/index.ts
index dea942e..b6e5058 100644
--- a/src/store/modules/user/index.ts
+++ b/src/store/modules/user/index.ts
@@ -18,7 +18,9 @@ const useUserStore = defineStore('user', {
       mallopen: 0,
       regqrcode: undefined,
       userbgcover: undefined,
-      groupqrcode: undefined
+      groupqrcode: undefined,
+      contactname: '',
+      contacttelephone: ''
     },
     deliveryAddress: {
       addrid: '',