Merge branch 'dev_v3_lqw' into dev_v3

pages/index/index.vue

@@ -273,6 +273,7 @@ const calculatedProducts = computed(() => {
   });
 });
 onLoad(async (options) => {
+  console.log('onLOAD')
   const params = await getSceneInfo(options,'index');
   // 2. 设置商户ID
   const isLogin = appStore.isLogin;
@@ -311,6 +312,9 @@ onShow(async () => {
     }
   } else if (appStore?.userInfo?.merchant?.id) {
     merchantId.value = appStore.userInfo.merchant.id;
+    if(!merchantInfo.merchantName){
+      getSbmerchantInfoFn()
+    }
   } else {
     merchantId.value = '';
   }
@@ -334,7 +338,6 @@ const initPageData = async () => {
     };
     // 并行执行不依赖的数据获取
     const promises = [];
-
     if (merchantId.value && merchantId.value !== '') {
       promises.push(getSbmerchantInfoFn());
       promises.push(getMerchantBannerListFn());

pages/merchantCenter/index.vue

@@ -148,7 +148,7 @@ const commonFunctions = computed(() => {
     { src: `${HTTP_REQUEST_URL_IMG}setting/shangpin.png`, name: '商品管理',pageUrl:'/pages/merchantCenters/productManagement',show:true },
     { src: `${HTTP_REQUEST_URL_IMG}setting/kucun.png`, name: '库存管理',pageUrl:'/pages/users/user_asset/asset_info/asset_info' ,show:!kcglShow.value},
     { src: `${HTTP_REQUEST_URL_IMG}setting/jinqian.png`, name: '我的收益',pageUrl: '/pages/users/my_merchant/index' ,show:wdsyShow.value},
-    { src: `${HTTP_REQUEST_URL_IMG}setting/kabao.png`, name: '卡包管理',pageUrl: '/pages/users/card_page/index' ,show:!kcglShow.value},
+    { src: `${HTTP_REQUEST_URL_IMG}setting/kabao.png`, name: '卡包管理',pageUrl: '/pages/users/card_page/indexWX' ,show:!kcglShow.value},
     { src: `${HTTP_REQUEST_URL_IMG}setting/mendian.png`, name: '门店推广',pageUrl: '/pages/users/my_merchant/index',show:true },
     { src: `${HTTP_REQUEST_URL_IMG}setting/dianpu.png`, name: '我的商城',pageUrl: `/pages/index/index` ,show:true},
   ];

pages/user/index.vue

@@ -470,22 +470,23 @@ const openVip = () => {
 // 查看会员权益
 const goVIP = () => {
   // uni.navigateTo({ url: "/pages/users/VIP/VIP" });
-  goDetail("/pages/VIP/VIP")
+  goDetail("/pages/users/VIP/VIP")
 };
 
 // 查看交易明细
 const viewTransactionDetail = () => {
-  if (!isLogin) {
+  console.log(isLogin)
+  if (!appStore.isLogin) {
     toLogin();
   } else {
     // uni.navigateTo({ url: "/pages/users/vault/index" });
-    goDetail("/pages/users/vault/index1")
+    goDetail("/pages/users/vault/indexWX")
   }
 };
 
 // 充值
 const recharge = () => {
-  if (!isLogin) {
+  if (!appStore.isLogin) {
     toLogin();
   } else {
     uni.navigateTo({
@@ -496,7 +497,7 @@ const recharge = () => {
 
 // 提现
 const withdraw = () => {
-  if (!isLogin) {
+  if (!appStore.isLogin) {
     toLogin();
   } else {
     uni.navigateTo({
@@ -765,11 +766,13 @@ const getHistoryList = async () => {
     .open-vip {
       width: 144rpx;
       height: 60rpx;
-      line-height: 60rpx;
       font-size: 24rpx;
       color: #5d3d03;
       background: linear-gradient(270deg, #fee2a3 0%, #fdebcc 100%);
       border-radius: 16rpx 16rpx 16rpx 16rpx;
+      display: flex;
+      justify-content: center;
+      align-items: center;
       .bofang {
         width: 24rpx;
         height: 24rpx;

pages/users/my_merchant/index.vue

@@ -29,7 +29,7 @@
       <!-- 二维码区域 -->
       <view class="qrcode-container">
         <image class="qrcode-img" :src="merchantInfo.merchantCodeUrl" mode="aspectFit"></image>
-        <view class="qrcode-tip">扫码添加微信好友</view>
+        <view class="qrcode-tip">扫码进入商家店铺</view>
       </view>
 
       <!-- 客服按钮 -->

pages/users/share/index.vue

@@ -289,8 +289,6 @@ const saveToAlbum = async () => {
 onLoad((options) => {
   if (options.merchantInfo) {
     merchantInfo.value = JSON.parse(decodeURIComponent(options.merchantInfo))
-    merchantInfo.value.merchantName="一号商家一号商家一号商家一号商家一号商家一号商家一号商家一号商家一号商家一号商家一号商家一号商家"
-    merchantInfo.value.merchantDescribe="一号商家一号商家一号商家一号商家一号商家一号商家一号商家一号商家一号商家一号商家一号商家一号商家"
     // 修正语法错误
     merchantInfo.value.merchantNameNew = truncateText(merchantInfo.value.merchantName, 10) || ''
     merchantInfo.value.merchantDescribeNew = truncateText(merchantInfo.value.merchantDescribe, 10) || ''

pages/webview/index.vue

@@ -66,7 +66,7 @@ onLoad((query) => {
     };
 
     const queryString = buildQueryString(params);
-
+    console.log(H5_BASE_URL)
     h5Url.value = `${H5_BASE_URL}/#${normalizedPath}${
       queryString ? `?${queryString}` : ""
     }`;