diff --git a/manifest.config.ts b/manifest.config.ts
index a04cef1..c5a2087 100644
--- a/manifest.config.ts
+++ b/manifest.config.ts
@@ -124,7 +124,7 @@ export default defineManifestConfig({
es6: true,
minified: true,
},
- requiredPrivateInfos: ["getLocation" ],
+ requiredPrivateInfos: ["getLocation", "chooseLocation"],
optimization: {
subPackages: true,
},
diff --git a/src/bundle/address/add.vue b/src/bundle/address/add.vue
new file mode 100644
index 0000000..04a774b
--- /dev/null
+++ b/src/bundle/address/add.vue
@@ -0,0 +1,269 @@
+
+{
+ "layout": "default",
+ "style": {
+ "navigationStyle": "custom"
+ }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+ 选择地区
+
+
+
+
+
+
+
+
+
+
+
+
+ 地址
+
+
+
+
+
+
+
+
+
+
+ 确定
+
+
+
+ 删除地址
+ 确定
+
+
+
+
+
+
+
+
+
+
diff --git a/src/bundle/address/list.vue b/src/bundle/address/list.vue
new file mode 100644
index 0000000..49cd37d
--- /dev/null
+++ b/src/bundle/address/list.vue
@@ -0,0 +1,223 @@
+
+{
+ "layout": "default",
+ "style": {
+ "navigationStyle": "custom"
+ }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 还没有地址,请尽快新建地址
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 位置1
+
+
+
+
+ 北京市海淀区恒大新宏福苑西区20号楼2单元301
+
+
+
+ 删除
+ 修改
+
+
+
+
+
+
+
+
+
+
+ 新建地址
+
+ 新建地址
+ 位置更新
+
+
+
+
+
+
+
+
+
diff --git a/src/bundle/finance/finance.vue b/src/bundle/finance/finance.vue
index dde121b..06ec980 100644
--- a/src/bundle/finance/finance.vue
+++ b/src/bundle/finance/finance.vue
@@ -9,43 +9,127 @@
-
+
-
+
+
+
- 经营资产
- {{ userFinance.total_amount }}
+ 本期时间
+
+
+
+
-
+
- 已提现
- {{ userFinance.total_reflect_amount }}
+ 本期业绩(元)
+ 123
- 待提现
- {{ userFinance.balance }}
+ 本期收入(元)
+ 345
+
+
+
+
+
+
+
+
+
+
+ 实际收入
+ 已扣除平台服务费
+
+
+
+
+
+
+
+ 500.00
+ 服务费
+
+
+
+
+
+
+
+
+
+ 500.00
+ 车马费
+
+
+
+
+
+
+
+
+
+ 500.00
+ 茶叶
+
+
+
+
+
+
+
+
+
+ 500.00
+ 打赏
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 日期
+ 业绩
+ 服务费
+ 车马费
+ 茶叶
+ 打赏
+
+
+
+ 2025-12-{{ idx+7 }}
+ 1000
+ 160
+ 30
+ 50
+ 20
+
-
-
-
-
-
-
-
-
- 收入¥{{ allPrice }}
-
-
+
@@ -178,8 +262,14 @@
.datetime-picker {
:deep() {
.wd-cell {
+ padding-left: 0 !important;
background-color: transparent !important;
}
+
+ .wd-datetime-picker__arrow {
+ margin-top: 2rpx !important;
+ color: #fff !important;
+ }
}
}
diff --git a/src/bundle/notice/notice.vue b/src/bundle/notice/notice.vue
new file mode 100644
index 0000000..945bd1d
--- /dev/null
+++ b/src/bundle/notice/notice.vue
@@ -0,0 +1,104 @@
+{
+ "layout": "default",
+ "style": {
+ "navigationBarTitleText": "消息",
+ "navigationBarBackgroundColor": "#fff"
+ }
+}
+
+
+
+
+
+
+
+
+
+
+
+ 上线邀约
+ 今天 08:22
+
+
+
+ [客户昵称]正向您发出上线邀约!要接收订单,请先将状态切换至「上班中」!
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/bundle/store/setting.vue b/src/bundle/store/setting.vue
index ab1ab57..b3e76b1 100644
--- a/src/bundle/store/setting.vue
+++ b/src/bundle/store/setting.vue
@@ -30,7 +30,7 @@
-
+
个人信息
diff --git a/src/bundle/wallet/wallet.vue b/src/bundle/wallet/wallet.vue
index 60ba619..667967f 100644
--- a/src/bundle/wallet/wallet.vue
+++ b/src/bundle/wallet/wallet.vue
@@ -7,6 +7,9 @@
+
+
+
@@ -31,8 +34,14 @@
-
- 余额
+
+
+ 不可提现金额200
+
+
+
+
+ 可提现金额
@@ -118,11 +127,13 @@
import type { IUserResult } from '@/api/types/user'
import { getUserInfo, getUserTransactionDetails } from '@/api/user'
import { router } from '@/utils/tools'
+ import { useMessage } from 'wot-design-uni'
const OSS = inject('OSS')
const userStore = useUserStore()
- // 用户信息相关
+ // 消息提示框
+ const message = useMessage('wd-message-box-slot')
/* mescroll */
const { mescrollInit, downCallback, getMescroll } = useMescroll(onPageScroll, onReachBottom) // 调用mescroll的hook
@@ -219,6 +230,20 @@
4: '团购核销'
}
return typeMap[type] || '其他'
+ },
+
+ /**
+ * 不可提现金额提示
+ */
+ handleShowPrompt: () => {
+ message.alert({
+ title: '温馨提示',
+ msg: '为保障您与平台的合作权益,我们将暂扣200元作为合作押金,感谢您的理解与支持。',
+ confirmButtonText: '我知道了',
+ confirmButtonProps: {
+ customClass: '!bg-[#4C9F44] !text-[#fff] !text-32rpx !leading-44rpx !rounded-8rpx',
+ }
+ })
}
}
diff --git a/src/manifest.json b/src/manifest.json
index 86de833..cae3d7a 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -91,7 +91,8 @@
},
"usingComponents": true,
"requiredPrivateInfos": [
- "getLocation"
+ "getLocation",
+ "chooseLocation"
],
"optimization": {
"subPackages": true
diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
index a97b5a4..3de275b 100644
--- a/src/pages/login/login.vue
+++ b/src/pages/login/login.vue
@@ -7,14 +7,12 @@
-
-
你好,欢迎使用
- 茶址管理平台
- 此小程序仅供企业内部员工登录,请凭管理员账号密码登录
+ 茶艺师平台
+ 此小程序仅供企业内部员工登录,请凭茶艺师账号密码登录
@@ -132,7 +130,7 @@
.login-bg {
background-color: #fff;
- background-image: url(#{$OSS}images/store/login/image1.png);
+ background-image: url(#{$OSS}images/chayishi/login_image1.png);
background-size: 100% 420rpx;
background-repeat: no-repeat;
}
diff --git a/src/pages/my/my.bck.vue b/src/pages/my/my.bck.vue
deleted file mode 100644
index 8f26e95..0000000
--- a/src/pages/my/my.bck.vue
+++ /dev/null
@@ -1,349 +0,0 @@
-{
- "layout": "tabbar",
- "style": {
- "navigationStyle": "custom"
- }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ isLogin ? user.nickname || '暂无昵称' : '立即登录' }}
-
-
-
- 账号: {{ My.handleFormatAccount(user.account || user.mobile) }}
-
-
-
-
-
-
-
-
-
- ¥{{ isLogin ? user.user_money : '0.00' }}
-
-
-
- 钱包余额
-
-
-
-
-
-
-
-
-
- {{ storeInfo.name }}
-
-
- 门店ID:
- {{ storeInfo.id }}
-
-
- 门店地址:
- {{ storeInfo.address || '-' }}
-
-
-
- 营业时间:
- {{ `${storeInfo.start_time }-${storeInfo.end_time }` || '-' }}
-
-
-
- 修改
-
-
-
- 联系电话:
- {{ storeInfo.contact_phone || '-' }}
-
-
-
-
-
-
-
- 门店图片
-
-
-
-
-
-
-
-
-
- +{{ Number(mediaCount - 6) }}
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/my/my.vue b/src/pages/my/my.vue
index 2aae13b..822f59c 100644
--- a/src/pages/my/my.vue
+++ b/src/pages/my/my.vue
@@ -7,36 +7,38 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 消息
-
-
-
-
-
-
- 设置
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ 消息
+
-
-
+
+
+
+
+ 设置
+
+
+
+
+
+
+
+
+
@@ -49,7 +51,7 @@
mode="aspectFill" round />
-
+
Jasmine
@@ -75,7 +77,7 @@
+ @click="router.navigateTo('/bundle/wallet/wallet')">
去提现
@@ -153,6 +155,17 @@
住址:
上海浦东新区新金桥路58号新银东大厦15楼F室
+
+
+
+ 上下班:
+
+
+
+
+ {{ isWork ? '上班中' : '已下班' }}
+
+
@@ -185,7 +198,7 @@
工作时间
-
+
@@ -193,7 +206,7 @@
位置更新
-
+
@@ -246,6 +259,9 @@ const OSS = inject('OSS')
const navbarHeight = inject('navbarHeight')
const rightPadding = inject('capsuleOffset')
+// 上下班切换
+const isWork = ref(true)
+
// 模拟是否有个人信息(静态页面,后续可以替换为实际的API判断)
const hasProfileInfo = ref(true) // 改为 false 可以测试跳转到填写页面
@@ -380,6 +396,7 @@ page {
.wallet-amounts {
position: relative;
z-index: 2;
+ margin-top: 50rpx;
}
.coin-decoration {
diff --git a/src/pages/my/profile-display.vue b/src/pages/my/profile-display.vue
index 284cd79..3d5c4ba 100644
--- a/src/pages/my/profile-display.vue
+++ b/src/pages/my/profile-display.vue
@@ -8,28 +8,16 @@
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -159,6 +147,7 @@
const Profile = {
// 返回
handleBack: () => {
+ console.log("🚀 ~ Profile.handleBack:", 213)
router.navigateBack()
},
@@ -195,55 +184,55 @@ page {
z-index: 1;
}
-.content-wrapper {
- position: relative;
- z-index: 10;
-}
+// .content-wrapper {
+// // position: relative;
+// // z-index: 10;
+// }
-.right-slot {
- padding-right: v-bind(rightPadding);
+// .right-slot {
+// padding-right: v-bind(rightPadding);
- .nav-icon-item {
- position: relative;
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: center;
- min-height: 60rpx;
- }
-}
+// .nav-icon-item {
+// position: relative;
+// display: flex;
+// flex-direction: column;
+// align-items: center;
+// justify-content: center;
+// min-height: 60rpx;
+// }
+// }
-.profile-card {
- // box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
-}
+// .profile-card {
+// // box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
+// }
-.modify-btn {
- box-shadow: 0 4rpx 8rpx rgba(255, 0, 0, 0.2);
-}
+// .modify-btn {
+// box-shadow: 0 4rpx 8rpx rgba(255, 0, 0, 0.2);
+// }
-.info-grid {
- .info-item {
- .label-text {
- display: block;
- }
+// .info-grid {
+// .info-item {
+// .label-text {
+// display: block;
+// }
- .value-text {
- display: block;
- }
- }
-}
+// .value-text {
+// display: block;
+// }
+// }
+// }
-.photo-grid {
- .photo-item {
- cursor: pointer;
- }
-}
+// .photo-grid {
+// .photo-item {
+// cursor: pointer;
+// }
+// }
-.interest-text {
- line-height: 1.6;
-}
+// .interest-text {
+// line-height: 1.6;
+// }
-.cost-item {
- padding: 12rpx 0;
-}
+// .cost-item {
+// padding: 12rpx 0;
+// }
diff --git a/src/pages/my/profile.bck.vue b/src/pages/my/profile.bck.vue
deleted file mode 100644
index 62762cf..0000000
--- a/src/pages/my/profile.bck.vue
+++ /dev/null
@@ -1,331 +0,0 @@
-{
- "layout": "default",
- "style": {
- "navigationStyle": "custom"
- }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 修改昵称
-
-
-
-
-
- 昵称:
-
-
-
-
-
-
- 昵称限制1-10字符,一个汉字为一个字符
-
-
-
-
- 保存
-
-
-
-
-
-
-
diff --git a/src/pages/my/travel-record.vue b/src/pages/my/travel-record.vue
index 3542f4b..56408c7 100644
--- a/src/pages/my/travel-record.vue
+++ b/src/pages/my/travel-record.vue
@@ -1,11 +1,98 @@
-
-{
- "layout": "default",
- "style": {
- "navigationStyle": "custom"
- }
-}
-
+{
+ "layout": "default",
+ "style": {
+ "navigationStyle": "custom"
+ }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ appointment.statusText }}
+
+
+
+
+
+
+ {{
+ appointment.title
+ }}
+
+
+
+
+ {{ appointment.time }}
+
+
+
+
+
+
+ {{ appointment.location }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ appointment.statusText }}
-
-
-
-
-
-
- {{ appointment.title }}
-
-
-
-
- {{ appointment.time }}
-
-
-
-
-
-
- {{ appointment.location }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/my/upload-data.vue b/src/pages/my/upload-data.vue
index 5fa26d4..2e8c0cd 100644
--- a/src/pages/my/upload-data.vue
+++ b/src/pages/my/upload-data.vue
@@ -1,11 +1,203 @@
-
-{
- "layout": "default",
- "style": {
- "navigationStyle": "custom"
- }
-}
-
+{
+ "layout": "default",
+ "style": {
+ "navigationStyle": "custom"
+ }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 您的信息已成功提交
+ 目前正在审核中,请您耐心等待
+
+
+
+
+
+
+
+
+ *请确保信息真实、准确。平台会进行核查,若因信息不实导致任何责任或损失,由提交者自行承担。
+
+
+
+
+
+ 营业执照
+
+
+
+
+
+
+
+
+
+ 暂未提交信息
+
+
+
+
+
+ 资质证书
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 暂未提交信息
+
+
+
+
+
+ 健康证
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 暂未提交信息
+
+
+
+
+
+
+ 修改信息
+
+
+
+
+
+
+
+
+ 营业执照
+
+
+
+
+
+
+
+
+ 营业执照
+
+
+
+
+
+ 资质证书
+
+
+
+
+
+
+
+
+ 茶艺师资格证
+
+
+
+
+
+ 健康证
+
+
+
+
+
+
+
+
+ 健康证
+
+
+
+
+
+
+ *感谢您提交信息表!我们的工作人员将在3个工作日内完成审核,请您耐心等待并通过平台关注审核结果。
+
+
+
+
+
+
+
+
+
+
+
+ 提交
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 您的信息已成功提交
- 目前正在审核中,请您耐心等待
-
-
-
-
-
-
-
-
- *请确保信息真实、准确。平台会进行核查,若因信息不实导致任何责任或损失,由提交者自行承担。
-
-
-
-
-
- 营业执照
-
-
-
-
-
-
-
-
-
- 暂未提交信息
-
-
-
-
-
- 资质证书
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 暂未提交信息
-
-
-
-
-
- 健康证
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 暂未提交信息
-
-
-
-
-
-
- 修改信息
-
-
-
-
-
-
-
-
- 营业执照
-
-
-
-
-
-
-
-
- 营业执照
-
-
-
-
-
- 资质证书
-
-
-
-
-
-
-
-
- 茶艺师资格证
-
-
-
-
-
- 健康证
-
-
-
-
-
-
-
-
- 健康证
-
-
-
-
-
-
- *感谢您提交信息表!我们的工作人员将在3个工作日内完成审核,请您耐心等待并通过平台关注审核结果。
-
-
-
-
-
-
-
-
-
-
-
- 提交
-
-
-
-
-