From c4d508bb4f315c5759c8cc8538014f4283acefe0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E9=B9=8F?= <yangpeng01@agree.com.cn>
Date: Sun, 28 Sep 2025 17:36:37 +0800
Subject: [PATCH] .

---
 pages/index/index.vue         |  2 +-
 pages/index/list.vue          |  2 --
 pages/index/room.vue          | 38 +++++++++++++++++++++++++++++++----
 sheep/api/product/category.js | 10 +--------
 sheep/request/index.js        |  4 ++--
 sheep/router/index.js         |  2 +-
 6 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index 200661a..6fec9d2 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -52,7 +52,7 @@
     }
   });
 
-  const url = ref('https://www.baidu.com');
+  const url = ref('https://fitting-room.huimeimeta.com/pages/report/index');
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/pages/index/list.vue b/pages/index/list.vue
index e6c5792..6758a8d 100644
--- a/pages/index/list.vue
+++ b/pages/index/list.vue
@@ -130,8 +130,6 @@
   onLoad(async (params) => {
     await getCategoryList();
     getList();
-
-    // await CategoryApi.getCategoryTree();
   });
 
   const categoryState = reactive({
diff --git a/pages/index/room.vue b/pages/index/room.vue
index 720bbbb..6516282 100644
--- a/pages/index/room.vue
+++ b/pages/index/room.vue
@@ -1,9 +1,39 @@
 <template>
-  <s-layout title="试衣间" tabbar="/pages/index/room" navbar="custom" :bgStyle="{ color: '#fff' }">
-    试衣间
-  </s-layout>
+  <view>
+    <s-layout title="试衣间" navbar="custom" tabbar="" :bgStyle="{ color: '#fff' }">
+      <web-view :src="url">
+        <cover-view-tabbar activeUrl="/pages/index/room" />
+      </web-view>
+    </s-layout>
+  </view>
 </template>
 
-<script setup></script>
+<script setup>
+  import { computed, ref } from 'vue';
+  import { onLoad, onUnload, onPageScroll, onPullDownRefresh, onShow } from '@dcloudio/uni-app';
+  import sheep from '@/sheep';
+  import $share from '@/sheep/platform/share';
+  import CoverViewTabbar from '@/pages/index/components/cover-view-tabbar.vue';
+  import { getAccessToken } from '@/sheep/request';
+
+  // 隐藏原生tabBar
+  uni.hideTabBar({
+    fail: () => {},
+  });
+
+  onShow(async () => {
+    if (!sheep.$store('user').isLogin) {
+      uni.redirectTo({ url: '/pages/login/index' });
+    }
+  });
+
+  onLoad(() => {});
+
+  onUnload(() => {});
+
+  const url = ref(
+    `https://fitting-room.huimeimeta.com/pages/fittingRoom/index?token=${getAccessToken()}`,
+  );
+</script>
 
 <style lang="scss" scoped></style>
diff --git a/sheep/api/product/category.js b/sheep/api/product/category.js
index 64fd688..3d0f547 100644
--- a/sheep/api/product/category.js
+++ b/sheep/api/product/category.js
@@ -22,15 +22,7 @@ const CategoryApi = {
       url: '/product/category/tree',
       method: 'GET',
     });
-  },
-  // 测试
-  test: (data) => {
-    return request({
-      url: '/cloth/list',
-      method: 'POST',
-      data,
-    });
-  },
+  }
 };
 
 export default CategoryApi;
diff --git a/sheep/request/index.js b/sheep/request/index.js
index f9f3948..ae95716 100644
--- a/sheep/request/index.js
+++ b/sheep/request/index.js
@@ -75,7 +75,7 @@ http.interceptors.request.use(
     // 自定义处理【auth 授权】：必须登录的接口，则跳出 AuthModal 登录弹窗
     if (config.custom.auth && !$store('user').isLogin) {
       // showAuthModal();
-      sheep.$router.go('/pages/login/index', {}, { redirect: true });
+      uni.redirectTo({ url: "/pages/login/index" });
       return Promise.reject();
     }
 
@@ -282,7 +282,7 @@ const refreshToken = async (config) => {
 const handleAuthorized = () => {
   const userStore = $store('user');
   userStore.logout(true);
-  sheep.$router.go('/pages/login/index', {}, { redirect: true });
+  uni.redirectTo({ url: "/pages/login/index" });
   // 登录超时
   return Promise.reject({
     code: 401,
diff --git a/sheep/router/index.js b/sheep/router/index.js
index f5174bb..ed1cc5f 100644
--- a/sheep/router/index.js
+++ b/sheep/router/index.js
@@ -60,7 +60,7 @@ const _go = (
   // 页面登录拦截
   if (nextRoute.meta?.auth && !$store('user').isLogin) {
     // showAuthModal();
-    sheep.$router.go('/pages/login/index', {}, { redirect: true });
+    uni.redirectTo({ url: "/pages/login/index" });
     return;
   }