From e622c0b7633c51d146bdbae6a9934e93ce5bff78 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Fri, 29 Mar 2024 18:08:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/cloud_warehouse/market/market.vue | 4 +++-
 store/modules/permission.js             | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pages/cloud_warehouse/market/market.vue b/pages/cloud_warehouse/market/market.vue
index 2b2e39b..1fa0feb 100644
--- a/pages/cloud_warehouse/market/market.vue
+++ b/pages/cloud_warehouse/market/market.vue
@@ -542,7 +542,9 @@ import { Toast } from '../../../libs/uniApi';
       						long: e.longitude,
       					});
                 this.$nextTick(()=>{
-                  this.storeMerchantList();
+                  setTimeout(()=>{
+                    this.storeMerchantList(true);
+                  }, 200)
                 })
       				}
       			})
diff --git a/store/modules/permission.js b/store/modules/permission.js
index 8886a03..22b39c2 100644
--- a/store/modules/permission.js
+++ b/store/modules/permission.js
@@ -22,7 +22,7 @@ const state = {
         },
         'CAMERA': {
             title: "相机/存储空间/照片权限说明",
-            content: "便于您使用该功能上传您的照片/图片/视频及用于更换头像、发布评论/分享、下载、与客服沟通等场景中读取和写入相册和文件内容。",
+            content: "便于您使用该功能上传您的照片/图片/视频及用于更换头像、发布评论/分享、下载、扫描二维码、与客服沟通等场景中读取和写入相册和文件内容。",
             methods: 'SET_CAMERA'
         },
         'CALL_PHONE': {