diff --git a/.env b/.env
index 62323b3..91212d1 100644
--- a/.env
+++ b/.env
@@ -2,10 +2,10 @@
SHOPRO_VERSION=v2.4.1
# 后端接口 - 正式环境(通过 process.env.NODE_ENV 非 development)
-SHOPRO_BASE_URL=http://api-dashboard.yudao.iocoder.cn
+SHOPRO_BASE_URL=https://puton.huimeimeta.com
# 后端接口 - 测试环境(通过 process.env.NODE_ENV = development)
-SHOPRO_DEV_BASE_URL=http://114.215.197.144:8080
+SHOPRO_DEV_BASE_URL=https://puton.huimeimeta.com
# SHOPRO_DEV_BASE_URL=http://127.0.0.1:48080
### SHOPRO_DEV_BASE_URL=http://10.171.1.188:48080
### SHOPRO_DEV_BASE_URL = http://yunai.natapp1.cc
diff --git a/manifest.json b/manifest.json
index c670544..7cc7200 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
{
- "name": "商城",
- "appid": "__UNI__460BC4C",
+ "name": "美搭",
+ "appid": "__UNI__085F6F7",
"description": "基于 uni-app + Vue3 技术驱动的在线商城系统,内含诸多功能与丰富的活动,期待您的使用和反馈。",
"versionName": "2025.09",
"versionCode": "183",
@@ -182,7 +182,7 @@
"versionCode": 100
},
"mp-weixin": {
- "appid": "wx66186af0759f47c9",
+ "appid": "wx736793c30c956243",
"setting": {
"urlCheck": false,
"minified": true,
diff --git a/pages.json b/pages.json
index 7acd702..a10cd06 100644
--- a/pages.json
+++ b/pages.json
@@ -55,13 +55,13 @@
}
},
{
- "path": "pages/index/chat",
+ "path": "pages/index/cart",
"style": {
- "navigationBarTitleText": "聊天"
+ "navigationBarTitleText": "购物车"
},
"meta": {
"sync": true,
- "title": "聊天",
+ "title": "购物车",
"group": "商城"
}
},
@@ -76,17 +76,6 @@
"group": "商城"
}
},
- {
- "path": "pages/index/cart",
- "style": {
- "navigationBarTitleText": "购物车"
- },
- "meta": {
- "sync": true,
- "title": "购物车",
- "group": "商城"
- }
- },
{
"path": "pages/index/login",
"style": {
@@ -739,7 +728,7 @@
"pagePath": "pages/index/room"
},
{
- "pagePath": "pages/index/chat"
+ "pagePath": "pages/index/cart"
},
{
"pagePath": "pages/index/user"
diff --git a/pages/chat/components/messageInput.vue b/pages/chat/components/messageInput.vue
index 1c7be68..c538c06 100644
--- a/pages/chat/components/messageInput.vue
+++ b/pages/chat/components/messageInput.vue
@@ -54,10 +54,9 @@
},
set(newValue) {
emits(`update:modelValue`, newValue);
- }
+ },
});
-
// 打开工具菜单
function onTools(mode) {
emits('onTools', mode);
diff --git a/pages/index/chat.vue b/pages/index/chat.vue
deleted file mode 100644
index fbe2767..0000000
--- a/pages/index/chat.vue
+++ /dev/null
@@ -1,223 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/pages/index/components/cover-view-tabbar.vue b/pages/index/components/cover-view-tabbar.vue
new file mode 100644
index 0000000..132941e
--- /dev/null
+++ b/pages/index/components/cover-view-tabbar.vue
@@ -0,0 +1,75 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 46eb676..200661a 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,94 +1,58 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/index/list.vue b/pages/index/list.vue
index ac26dfb..e6c5792 100644
--- a/pages/index/list.vue
+++ b/pages/index/list.vue
@@ -27,7 +27,7 @@
>
{{ sortState.sortList[0].name }}
@@ -130,6 +130,8 @@
onLoad(async (params) => {
await getCategoryList();
getList();
+
+ // await CategoryApi.getCategoryTree();
});
const categoryState = reactive({
@@ -155,6 +157,7 @@
sort: 0,
order: false,
});
+ console.log(categoryState.categoryList, 'categoryState.categoryList');
}
const sortState = reactive({
diff --git a/pages/index/user.vue b/pages/index/user.vue
index b3852ca..91c4a41 100644
--- a/pages/index/user.vue
+++ b/pages/index/user.vue
@@ -17,9 +17,14 @@
+
+
+
+
+
-
-
+
+
@@ -30,6 +35,7 @@
import sheep from '@/sheep';
import userAvatarCard from './components/user-avatar-card.vue';
import userTryOn from './components/user-tryOn.vue';
+ import AuthUtil from '@/sheep/api/member/auth';
// 隐藏原生tabBar
uni.hideTabBar({
@@ -37,6 +43,7 @@
});
const template = computed(() => sheep.$store('app').template.user);
+ const isLogin = computed(() => sheep.$store('user').isLogin);
onShow(() => {
sheep.$store('user').updateUserData();
@@ -54,18 +61,51 @@
const pattern = reactive({
icon: 'uni-icons-heart',
});
+
+ const handleLayout = () => {
+ uni.showModal({
+ title: '提示',
+ content: '确认注销账号?',
+ success: async function (res) {
+ if (!res.confirm) {
+ return;
+ }
+ const { code } = await AuthUtil.logout();
+ if (code !== 0) {
+ return;
+ }
+ sheep.$store('user').logout();
+ sheep.$router.go('/pages/login/index');
+ },
+ });
+ };
diff --git a/pages/login/index.vue b/pages/login/index.vue
index 1034631..1a5580d 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -2,7 +2,7 @@
-
+
+86
@@ -106,7 +106,7 @@
width: 100%;
height: 100%;
box-sizing: border-box;
- background-image: url('/static/imgs/login-bg.jpg');
+ background-image: url('https://puton.huimeimeta.com/imgs/login-bg.jpg');
background-size: cover;
background-position: center;
position: relative;
diff --git a/sheep/api/product/category.js b/sheep/api/product/category.js
index 3b6f8f0..64fd688 100644
--- a/sheep/api/product/category.js
+++ b/sheep/api/product/category.js
@@ -16,6 +16,21 @@ const CategoryApi = {
params: { ids },
});
},
+ // 查询可用分类 --- 新加的接口
+ getCategoryTree: () => {
+ return request({
+ url: '/product/category/tree',
+ method: 'GET',
+ });
+ },
+ // 测试
+ test: (data) => {
+ return request({
+ url: '/cloth/list',
+ method: 'POST',
+ data,
+ });
+ },
};
export default CategoryApi;
diff --git a/sheep/components/s-custom-navbar/s-custom-navbar.vue b/sheep/components/s-custom-navbar/s-custom-navbar.vue
index 62f6e21..e0b36d2 100644
--- a/sheep/components/s-custom-navbar/s-custom-navbar.vue
+++ b/sheep/components/s-custom-navbar/s-custom-navbar.vue
@@ -163,7 +163,8 @@
.icon-box {
background: #ffffff;
- box-shadow: 0px 0px 4rpx rgba(51, 51, 51, 0.08), 0px 4rpx 6rpx 2rpx rgba(102, 102, 102, 0.12);
+ box-shadow: 0px 0px 4rpx rgba(51, 51, 51, 0.08),
+ 0px 4rpx 6rpx 2rpx rgba(102, 102, 102, 0.12);
border-radius: 30rpx;
width: 134rpx;
height: 56rpx;
diff --git a/sheep/components/s-live-card/s-live-card.vue b/sheep/components/s-live-card/s-live-card.vue
index 9cefee0..8e1dd29 100644
--- a/sheep/components/s-live-card/s-live-card.vue
+++ b/sheep/components/s-live-card/s-live-card.vue
@@ -6,7 +6,7 @@
{{ state.liveStatus[data.status].title }}
-
+
{{ data.name }}
@@ -22,7 +22,7 @@
{{ state.liveStatus[data.status].title }}
-
+
{{ data.name }}
diff --git a/sheep/router/utils/uni-read-pages-v3.js b/sheep/router/utils/uni-read-pages-v3.js
index 303f10a..94aac8f 100644
--- a/sheep/router/utils/uni-read-pages-v3.js
+++ b/sheep/router/utils/uni-read-pages-v3.js
@@ -87,6 +87,7 @@ function uniReadPagesV3Plugin({ pagesJsonDir, includes }) {
pagesJsonDir,
includes,
});
+
return {
name: 'uni-read-pages-v3',
config(config) {
diff --git a/sheep/store/app.js b/sheep/store/app.js
index 4b11d1b..77bf8a0 100644
--- a/sheep/store/app.js
+++ b/sheep/store/app.js
@@ -199,32 +199,32 @@ const adaptTemplate = async (appTemplate, templateId) => {
appTemplate.basic.tabbar.items = [
{
- activeIconUrl: "https://3d.aidigitalfield.com/imgs/home.png",
- iconUrl: "https://3d.aidigitalfield.com/imgs/home.png",
+ activeIconUrl: "https://puton.huimeimeta.com/imgs/home.png",
+ iconUrl: "https://puton.huimeimeta.com/imgs/home.png",
text: "首页",
url: "/pages/index/index",
},
{
- activeIconUrl: "https://3d.aidigitalfield.com/imgs/list.png",
- iconUrl: "https://3d.aidigitalfield.com/imgs/list.png",
+ activeIconUrl: "https://puton.huimeimeta.com/imgs/list.png",
+ iconUrl: "https://puton.huimeimeta.com/imgs/list.png",
text: "商品列表",
url: "/pages/index/list",
},
{
- activeIconUrl: "https://3d.aidigitalfield.com/imgs/room.png",
- iconUrl: "https://3d.aidigitalfield.com/imgs/room.png",
+ activeIconUrl: "https://puton.huimeimeta.com/imgs/room.png",
+ iconUrl: "https://puton.huimeimeta.com/imgs/room.png",
text: "试衣间",
url: "/pages/index/room",
},
{
- activeIconUrl: "https://3d.aidigitalfield.com/imgs/chat.png",
- iconUrl: "https://3d.aidigitalfield.com/imgs/chat.png",
- text: "聊天",
- url: "/pages/index/chat",
+ activeIconUrl: "https://puton.huimeimeta.com/imgs/cart.png",
+ iconUrl: "https://puton.huimeimeta.com/imgs/cart.png",
+ text: "购物车",
+ url: "/pages/index/cart",
},
{
- activeIconUrl: "https://3d.aidigitalfield.com/imgs/my.png",
- iconUrl: "https://3d.aidigitalfield.com/imgs/my.png",
+ activeIconUrl: "https://puton.huimeimeta.com/imgs/my.png",
+ iconUrl: "https://puton.huimeimeta.com/imgs/my.png",
text: "我的",
url: "/pages/index/user",
},
diff --git a/sheep/ui/su-tabbar-item/su-tabbar-item.vue b/sheep/ui/su-tabbar-item/su-tabbar-item.vue
index a876629..55af687 100644
--- a/sheep/ui/su-tabbar-item/su-tabbar-item.vue
+++ b/sheep/ui/su-tabbar-item/su-tabbar-item.vue
@@ -26,17 +26,7 @@
-
+