diff --git a/.env b/.env
index 03dd89b..2518203 100644
--- a/.env
+++ b/.env
@@ -5,7 +5,8 @@ SHOPRO_VERSION=v2.4.1
SHOPRO_BASE_URL=http://api-dashboard.yudao.iocoder.cn
# 后端接口 - 测试环境(通过 process.env.NODE_ENV = development)
-SHOPRO_DEV_BASE_URL=http://127.0.0.1:48080
+#SHOPRO_DEV_BASE_URL=http://127.0.0.1:48080
+SHOPRO_DEV_BASE_URL=http://1.12.53.43:9999
### SHOPRO_DEV_BASE_URL=http://10.171.1.188:48080
### SHOPRO_DEV_BASE_URL = http://yunai.natapp1.cc
@@ -32,4 +33,4 @@ SHOPRO_H5_URL=http://127.0.0.1:3000
SHOPRO_MPLIVE_ON=0
# 租户ID 默认 1
-SHOPRO_TENANT_ID=1
+SHOPRO_TENANT_ID=162
diff --git a/pages.json b/pages.json
index dc3120c..d13d3a8 100644
--- a/pages.json
+++ b/pages.json
@@ -116,6 +116,18 @@
"group": "物业管理"
}
},
+ {
+ "path": "pages/index/switch-house",
+ "style": {
+ "navigationBarTitleText": ""
+ },
+ "meta": {
+ "auth": false,
+ "sync": true,
+ "title": "切换房号",
+ "group": "物业管理"
+ }
+ },
{
"path": "pages/index/auth-form",
"style": {
@@ -636,7 +648,18 @@
"group": "物业管理"
}
},
- {
+ {
+ "path": "income/index",
+ "style": {
+ "navigationBarTitleText": "收益公示"
+ },
+ "meta": {
+ "sync": true,
+ "title": "收益公示",
+ "group": "物业管理"
+ }
+ },
+ {
"path": "knowledge/classroom",
"style": {
"navigationBarTitleText": "知识课堂"
diff --git a/pages/commission/message.vue b/pages/commission/message.vue
new file mode 100644
index 0000000..3827a5f
--- /dev/null
+++ b/pages/commission/message.vue
@@ -0,0 +1,160 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.content }}
+
+
+
+
+
+
+
+
+ 暂无消息
+
+
+
+
+
+
+
+
diff --git a/pages/community/dynamics.vue b/pages/community/dynamics.vue
new file mode 100644
index 0000000..899840e
--- /dev/null
+++ b/pages/community/dynamics.vue
@@ -0,0 +1,290 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/index/auth-form.vue b/pages/index/auth-form.vue
index 6f8558c..46572d5 100644
--- a/pages/index/auth-form.vue
+++ b/pages/index/auth-form.vue
@@ -6,26 +6,26 @@
小区名称
-
- 融侨馨苑
+
+ {{ state.form.communityName || '请选择小区' }}
-
+
序号
-
+
号楼
-
+
单元
-
+
号
@@ -54,7 +54,7 @@
与产权人关系
- {{ state.form.relation || '请输入' }}
+ {{ state.form.relationType || '请输入' }}
@@ -79,7 +79,7 @@
手机号
性别
- {{ state.form.gender || '请选择' }}
+ {{ state.form.sex === 1 ? '男' : state.form.sex === 2 ? '女' : '请选择' }}
@@ -145,13 +145,32 @@
上传附件
-
+
+
+
+
📁
选择文件
+
+
+
+ 上传人脸照片
+
+
+
+
+
+
+
+ 📁
+
+ 选择照片
+
+
@@ -163,33 +182,152 @@
@@ -513,6 +704,18 @@ const handleSubmit = () => {
color: #999999;
}
}
+
+ .upload-preview {
+ width: 180rpx;
+ height: 180rpx;
+ border-radius: 16rpx;
+ overflow: hidden;
+
+ .preview-img {
+ width: 100%;
+ height: 100%;
+ }
+ }
}
/* 底部按钮 */
diff --git a/pages/index/cart.vue b/pages/index/cart.vue
index 8f02d5d..bc88036 100644
--- a/pages/index/cart.vue
+++ b/pages/index/cart.vue
@@ -246,13 +246,6 @@
cart.delete(state.selectedIds);
}
- function getCartList() {
- cart.getList();
- }
-
- onShow(() => {
- getCartList();
- });
diff --git a/pages/index/switch-house.vue b/pages/index/switch-house.vue
new file mode 100644
index 0000000..ea149cb
--- /dev/null
+++ b/pages/index/switch-house.vue
@@ -0,0 +1,260 @@
+
+
+
+
+
+ 小区名称
+
+
+
+
+
+ 房号
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+ 房屋不存在,去认证
+
+
+
+
+
+
+
+
diff --git a/pages/index/user.vue b/pages/index/user.vue
index a85750e..4709b6e 100644
--- a/pages/index/user.vue
+++ b/pages/index/user.vue
@@ -95,6 +95,7 @@
import { ref, onMounted } from 'vue';
import { onShow } from '@dcloudio/uni-app';
import sheep from '@/sheep';
+import AuthUtil from '@/sheep/api/member/auth';
// 用户信息
const userInfo = ref({
@@ -131,10 +132,15 @@ const handleLogout = () => {
uni.showModal({
title: '提示',
content: '确定要退出登录吗?',
- success: (res) => {
+ success: async (res) => {
if (res.confirm) {
- sheep.$store('user').logout();
- sheep.$router.go('/pages/index/login-page');
+ const { code } = await AuthUtil.logout();
+ if (code === 0) {
+ sheep.$store('user').logout();
+ sheep.$router.go('/pages/index/login-page');
+ } else {
+ uni.showToast({ title: '退出登录失败', icon: 'none' });
+ }
}
}
});
diff --git a/pages/notice/detail.vue b/pages/notice/detail.vue
new file mode 100644
index 0000000..657c4f5
--- /dev/null
+++ b/pages/notice/detail.vue
@@ -0,0 +1,411 @@
+
+
+
+
+
+
+
+ paddi n g n
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/sub/income/index.vue b/pages/sub/income/index.vue
new file mode 100644
index 0000000..dd72182
--- /dev/null
+++ b/pages/sub/income/index.vue
@@ -0,0 +1,549 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ sub.name }}
+ {{ sub.value }}
+
+
+
+
+
+
+ 暂无数据
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/sub/staff/index.vue b/pages/sub/staff/index.vue
index 0887046..15287db 100644
--- a/pages/sub/staff/index.vue
+++ b/pages/sub/staff/index.vue
@@ -9,34 +9,49 @@