From 23eda9c505b33660841d533dbdc46082130c0c54 Mon Sep 17 00:00:00 2001
From: ctw <example@email.com>
Date: Wed, 10 Dec 2025 16:39:57 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E9=A6=96=E9=A1=B5=E9=9A=90=E8=BA=AB?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=EF=BC=9B=E4=BD=8D=E7=BD=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                     | 19 -------
 src/pages.json                  |  4 ++
 src/pages/home/detail.vue       |  5 +-
 src/pages/profile/apply-vip.vue | 15 +++--
 src/pages/profile/recharge.vue  | 11 +++-
 src/pages/profile/setting.vue   | 52 ++++++++++++++----
 src/pages/tabbar/home.vue       | 97 +++++++++++++++++++++++++++++++--
 7 files changed, 158 insertions(+), 45 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 81edd7ad..5a528eaa 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,7 +1,6 @@
 <script>
   import { onLaunch, onShow, onError } from '@dcloudio/uni-app';
   import { ShoproInit } from './sheep';
-  import RecentApi from './sheep/api/member/recent';
 
   // 与聊天相关的导入
   import http from './common/request';
@@ -493,24 +492,6 @@
       // });
       // 加载Shopro底层依赖
       ShoproInit();
-      // app启动时更新用户位置
-      uni.getLocation({
-        geocode: true,
-        success: (res) => {
-          const params = {
-            lat: String(res.latitude),
-            lon: String(res.longitude),
-            province: res.address?.province ?? '',
-            city: res.address?.city ?? '',
-            district: res.address?.district ?? '',
-            address: res.address?.street ?? '',
-          };
-          RecentApi.updateUserLocation(params);
-        },
-        fail: (err) => {
-          // uni.showToast({ title: '位置信息获取失败，请打开系统定位', icon: 'none' });
-        },
-      });
 
       // #ifndef MP-WEIXIN
       this.$mountStore();
diff --git a/src/pages.json b/src/pages.json
index d58e5fe5..95166eed 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -89,6 +89,7 @@
     //     "group": "商城"
     //   }
     // },
+    // #ifdef MP-WEIXIN
     {
       "path": "pages/wechat-tabbar/index",
       "style": {
@@ -103,6 +104,8 @@
         "navigationStyle": "custom"
       }
     },
+    // #endif
+    // #ifndef MP-WEIXIN
     {
       "path": "pages/tabbar/home",
       "style": {
@@ -131,6 +134,7 @@
         "navigationStyle": "custom"
       }
     }
+    // #endif
   ],
   "subPackages": [
     {
diff --git a/src/pages/home/detail.vue b/src/pages/home/detail.vue
index 01abbc23..8c1119d9 100644
--- a/src/pages/home/detail.vue
+++ b/src/pages/home/detail.vue
@@ -14,7 +14,10 @@
       </template>
       <template #right>
         <view class="flex items-center">
-          <view class="py-1 px-2 text-xs bg-color-theme-dark rounded-full mr-3">
+          <view
+            v-if="userDetail?.member?.memberId"
+            class="py-1 px-2 text-xs bg-color-theme-dark rounded-full mr-3"
+          >
             {{ userDetail.member?.memberCity ? userDetail.member?.memberCity + ' · ' : '' }}
             {{ userDetail.distance?.toFixed(2) }}km
           </view>
diff --git a/src/pages/profile/apply-vip.vue b/src/pages/profile/apply-vip.vue
index 2b29f822..fea008cd 100644
--- a/src/pages/profile/apply-vip.vue
+++ b/src/pages/profile/apply-vip.vue
@@ -120,7 +120,9 @@
   import { useMessage } from '@/uni_modules/wot-design-uni';
   // @ts-ignore
   import $store from '@/sheep/store';
-  // import PayOrderApi from '@/sheep/api/pay/order';
+  // @ts-ignore
+  import PayOrderApi from '@/sheep/api/pay/order';
+  // @ts-ignore
   import sheep from '@/sheep';
 
   const messageBox = useMessage();
@@ -174,12 +176,13 @@
         const { code, data } = await RecentApi.memberOpenTypePay({
           openTypeId: curOpenTypeId.value,
         });
-        if (code !== 0) return uni.showToast({ title: '开通失败', icon: 'fail' });
-        uni.showToast({ title: '开通成功', icon: 'success' });
-        $store('user').getInfo();
+        if (code !== 0) return uni.showToast({ title: '创建订单失败', icon: 'fail' });
 
-        // const { data: a } = await PayOrderApi.getOrder(data, true);
-        sheep.$platform.pay('alipay', 'recharge', data);
+        // const { data } = await PayOrderApi.getOrder(data, true);
+        sheep.$platform.pay(payMethod.value, 'recharge', data.payOrderId);
+
+        // uni.showToast({ title: '开通成功', icon: 'success' });
+        $store('user').getInfo();
 
         // setTimeout(() => {
         //   uni.navigateBack();
diff --git a/src/pages/profile/recharge.vue b/src/pages/profile/recharge.vue
index 8a7ea7f9..2cfe3f52 100644
--- a/src/pages/profile/recharge.vue
+++ b/src/pages/profile/recharge.vue
@@ -105,6 +105,8 @@
   import { onLoad } from '@dcloudio/uni-app';
   // @ts-ignore
   import sheep from '@/sheep';
+  // @ts-ignore
+  import PayOrderApi from '@/sheep/api/pay/order';
 
   const messageBox = useMessage();
 
@@ -132,9 +134,12 @@
         title: '提示',
       })
       .then(async () => {
-        const { code } = await RecentApi.walletRecharge({ packageId: item.id });
-        if (code !== 0) return uni.showToast({ title: '购买失败', icon: 'fail' });
-        uni.showToast({ title: '购买成功', icon: 'success' });
+        const { code, data } = await RecentApi.walletRecharge({ packageId: item.id });
+        if (code !== 0) return uni.showToast({ title: '创建订单失败', icon: 'fail' });
+        // const { data } = await PayOrderApi.getOrder(data.payOrderId, true);
+        sheep.$platform.pay(payMethod.value, 'recharge', data.payOrderId);
+
+        // uni.showToast({ title: '购买成功', icon: 'success' });
         getWallet();
       })
       .catch(() => {});
diff --git a/src/pages/profile/setting.vue b/src/pages/profile/setting.vue
index 0b081044..d57a90c4 100644
--- a/src/pages/profile/setting.vue
+++ b/src/pages/profile/setting.vue
@@ -8,8 +8,8 @@
       </template>
     </wd-navbar>
 
-    <wd-cell-group>
-      <wd-cell title="手机号" :value="mobile" />
+    <wd-cell-group v-if="!loading">
+      <wd-cell title="手机号" :value="userInfo?.mobile" />
       <wd-cell title="设置微信" is-link ellipsis to="/pages/profile/set-wechat" />
       <wd-cell title="黑名单" is-link ellipsis to="/pages/profile/black-list" />
       <wd-cell title="客服邮箱" value="1@1.com" is-link ellipsis />
@@ -21,13 +21,17 @@
           size="20"
         />
       </wd-cell>
-      <wd-cell title="首页隐身" value="首页隐身" ellipsis>
-        <wd-switch
-          v-model="params.homeHide"
-          inactive-color="#777"
-          @change="settingChange"
-          size="20"
-        />
+      <wd-cell title="首页隐身" value="首页隐身" ellipsis title-width="120rpx">
+        <view class="flex justify-end">
+          <view class="text-18rpx mr-2">打开后用户将无法在首页列表中看到你</view>
+          <wd-switch
+            v-model="params.homeHide"
+            inactive-color="#777"
+            @change="settingChange"
+            :beforeChange="beforeChange"
+            size="20"
+          />
+        </view>
       </wd-cell>
       <wd-cell title="隐私保护" value="隐私保护" ellipsis>
         <wd-switch
@@ -49,6 +53,7 @@
     </wd-cell-group>
 
     <view
+      v-if="!loading"
       class="mt-40rpx rounded-full bg-color-theme-dark text-base text-center py-2 mx-8 active:bg-color-theme"
       @click="handleLogout"
     >
@@ -61,7 +66,7 @@
 <script setup lang="ts">
   import RecentApi from '@/sheep/api/member/recent';
   import { onLoad } from '@dcloudio/uni-app';
-  import { computed, reactive } from 'vue';
+  import { computed, reactive, ref } from 'vue';
   import { useMessage } from '@/uni_modules/wot-design-uni';
   // @ts-ignore
   import sheep from '@/sheep';
@@ -74,21 +79,46 @@
     privacySecure: true,
     shortNote: true,
   });
-  const mobile = computed(() => sheep.$store('user').userInfo?.mobile);
+  const loading = ref(false);
+  const userInfo = computed(() => sheep.$store('user').userInfo);
 
   onLoad(async () => {
+    loading.value = true;
     const { code, data } = await RecentApi.getSetting();
     if (code !== 0) return;
     params.isPush = data.isPush;
     params.homeHide = data.homeHide;
     params.privacySecure = data.privacySecure;
     params.shortNote = data.shortNote;
+
+    loading.value = false;
   });
 
   const settingChange = async () => {
     await RecentApi.updateSetting(params);
   };
 
+  const beforeChange = ({ value, resolve }: any) => {
+    if (value && !userInfo.value.memberVip?.vip) {
+      resolve(false);
+
+      message
+        .confirm({
+          title: '获取VIP特权',
+          msg: '请先开通VIP会员',
+          confirmButtonText: '获取会员',
+        })
+        .then(() => {
+          uni.navigateTo({
+            url: '/pages/profile/apply-vip',
+          });
+        })
+        .catch(() => {});
+      return;
+    }
+    resolve(true);
+  };
+
   // 退出登录
   const handleLogout = () => {
     message
diff --git a/src/pages/tabbar/home.vue b/src/pages/tabbar/home.vue
index db80aedc..8e0b74ca 100644
--- a/src/pages/tabbar/home.vue
+++ b/src/pages/tabbar/home.vue
@@ -29,12 +29,34 @@
 
   <navigator url="/pages/wechat-tabbar/index" open-type="navigate" hover-class="navigator-hover">
     <image
-      class="size-120rpx fixed right-0 bottom-160"
+      class="size-120rpx fixed right-0 bottom-260"
       src="@/static/invitation-activity.png"
       mode="aspectFit"
     />
   </navigator>
 
+  <!-- #ifdef H5 -->
+  <view
+    v-if="!isOpenGPS"
+    class="w-full h-100rpx bg-color-theme-dark fixed bottom-100 left-0 right-0 c-#222 flex items-center px-2"
+    @click="openSystemGPS"
+  >
+    <uni-icons type="location-filled" color="black" size="24" />
+    <text>点击开启位置权限，匹配您附近的那个Ta~</text>
+  </view>
+  <!-- #endif -->
+
+  <!-- #ifndef H5 -->
+  <view
+    v-if="!isOpenGPS"
+    class="w-full h-100rpx bg-color-theme-dark fixed bottom-0 left-0 right-0 c-#222 flex items-center px-2"
+    @click="openSystemGPS"
+  >
+    <uni-icons type="location-filled" color="black" size="24" />
+    <text>点击开启位置权限，匹配您附近的那个Ta~</text>
+  </view>
+  <!-- #endif -->
+
   <s-auth-modal />
 </template>
 
@@ -45,10 +67,11 @@
   import ScrollUser from './components/scroll-user.vue';
   // @ts-ignore
   import sheep from '@/sheep';
-  import { onLoad } from '@dcloudio/uni-app';
+  import { onLoad, onShow } from '@dcloudio/uni-app';
 
   const current = ref(0);
   const segmentedItems = ref([]);
+  const isOpenGPS = ref(true);
   const userCity = computed(() => sheep.$store('user').userCity);
 
   onLoad(async () => {
@@ -57,15 +80,79 @@
     if (data && data.length > 0) {
       segmentedItems.value = data;
     }
+    getLocation();
   });
 
+  onShow(() => {
+    getLocation();
+  });
+
+  const getLocation = () => {
+    uni.getLocation({
+      geocode: true,
+      success: (res) => {
+        const params = {
+          lat: String(res.latitude),
+          lon: String(res.longitude),
+          province: res.address?.province ?? '',
+          city: res.address?.city ?? '',
+          district: res.address?.district ?? '',
+          address: res.address?.street ?? '',
+        };
+        RecentApi.updateUserLocation(params);
+        isOpenGPS.value = true;
+      },
+      fail: (err) => {
+        isOpenGPS.value = false;
+      },
+    });
+  };
+
+  const openSystemGPS = () => {
+    // #ifdef APP-PLUS || MP-WEIXIN
+    const system = uni.getSystemInfoSync();
+    if (system.platform === 'android') {
+      // 安卓手机授权之后还需打开定位服务功能GPS
+      const context: any = plus.android.importClass('android.content.Context');
+      const locationManager: any = plus.android.importClass('android.location.LocationManager');
+      const main: any = plus.android.runtimeMainActivity();
+      const mainSvr = main.getSystemService(context.LOCATION_SERVICE);
+      if (!mainSvr.isProviderEnabled(locationManager.GPS_PROVIDER)) {
+        if (!mainSvr.isProviderEnabled(locationManager.GPS_PROVIDER)) {
+          const Intent: any = plus.android.importClass('android.content.Intent');
+          const Settings: any = plus.android.importClass('android.provider.Settings');
+          const intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
+          main.startActivity(intent); // 打开系统设置GPS服务页面
+        }
+      }
+    } else if (system.platform == 'ios') {
+      // ios打开对应的通知栏
+      uni.showModal({
+        title: '定位权限开启提醒',
+        content: '未开启定位，请前往设置！',
+        confirmText: '去设置',
+        success: function (res) {
+          if (res.confirm) {
+            var app = plus.ios.invoke('UIApplication', 'sharedApplication');
+            var setting = plus.ios.invoke('NSURL', 'URLWithString:', 'app-settings:');
+            plus.ios.invoke(app, 'openURL:', setting);
+            plus.ios.deleteObject(setting);
+            plus.ios.deleteObject(app);
+          }
+        },
+      });
+    }
+    // #endif
+    // #ifdef H5
+    uni.showToast({ title: '不支持', icon: 'none' });
+    // #endif
+  };
+
   const goSelectAddress = () => {
     uni.navigateTo({
       url: '/pages/home/city',
       events: {
-        changeCity: async () => {
-          // await refreshList();
-        },
+        changeCity: async () => {},
       },
     });
   };