diff --git a/YJYF/YJYF.vue b/YJYF/YJYF.vue
index 7bd3086..d4c66fd 100644
--- a/YJYF/YJYF.vue
+++ b/YJYF/YJYF.vue
@@ -290,6 +290,11 @@
uni.navigateTo({ url: '/pages/order/list' })
return
}
+ if (i === 2) {
+ if (!needLogin()) return
+ uni.navigateTo({ url: '/pages/message/message' })
+ return
+ }
if (i === 3) {
onUser()
return
diff --git a/pages.json b/pages.json
index ee7f627..c897d42 100644
--- a/pages.json
+++ b/pages.json
@@ -38,6 +38,22 @@
"path": "pages/order/review",
"style": { "navigationBarTitleText": "服务评价" }
},
+ {
+ "path": "pages/address/list",
+ "style": { "navigationBarTitleText": "服务地址" }
+ },
+ {
+ "path": "pages/coupon/coupon",
+ "style": { "navigationBarTitleText": "优惠券" }
+ },
+ {
+ "path": "pages/message/message",
+ "style": {
+ "navigationBarTitleText": "消息中心",
+ "enablePullDownRefresh": true,
+ "backgroundTextStyle": "dark"
+ }
+ },
{
"path": "pages/master/apply",
"style": { "navigationBarTitleText": "师傅入驻" }
diff --git a/pages/address/list.vue b/pages/address/list.vue
new file mode 100644
index 0000000..8e55f72
--- /dev/null
+++ b/pages/address/list.vue
@@ -0,0 +1,167 @@
+
+
+
+
+
+ {{ a.contact }}
+ {{ a.mobile }}
+ 默认
+
+ {{ a.province }}{{ a.city }}{{ a.district }}{{ a.address }}
+ 楼层 {{ a.floor }} · {{ Number(a.has_elevator) ? '有电梯' : '无电梯' }}
+
+ 设为默认
+ 编辑
+ 删除
+
+
+ 还没有服务地址,先添加一个吧
+
+
+
+ + 新增服务地址
+
+
+
+
+
+ {{ form.id ? '编辑地址' : '新增地址' }}
+ 关闭
+
+ 联系人
+ 手机号
+ 详细地址
+ 楼层
+
+ -
+ {{ form.floor }}
+ +
+
+
+ 有无电梯
+
+ 有
+ 无
+
+
+ 设为默认
+
+ 是
+ 否
+
+
+ {{ saving ? '保存中...' : '保存' }}
+
+
+
+
+
+
+
+
+
diff --git a/pages/coupon/coupon.vue b/pages/coupon/coupon.vue
new file mode 100644
index 0000000..0907cdf
--- /dev/null
+++ b/pages/coupon/coupon.vue
@@ -0,0 +1,132 @@
+
+
+
+ 领券中心
+ 我的券{{ counts.unused ? '(' + counts.unused + ')' : '' }}
+
+
+
+
+
+ {{ c.value_text }}
+ {{ c.rule_text }}
+
+
+ {{ c.name }}
+ {{ c.time_text }}
+
+
+ {{ c.received_by_me ? '已领取' : (c.sold_out ? '已领完' : '领取') }}
+
+
+ 暂无可领取的优惠券
+
+
+
+
+
+ {{ t.name }}{{ counts[t.key] ? ' ' + counts[t.key] : '' }}
+
+
+
+
+ {{ c.value_text }}
+ {{ c.rule_text }}
+
+
+ {{ c.name }}
+ {{ c.time_text }}
+
+ 去使用
+
+ 暂无优惠券
+
+
+
+
+
+
+
diff --git a/pages/merchant/workbench.vue b/pages/merchant/workbench.vue
index d2ac3da..0de5aca 100644
--- a/pages/merchant/workbench.vue
+++ b/pages/merchant/workbench.vue
@@ -73,7 +73,7 @@
{ key: 'orders', name: '企业订单', icon: '单', bg: '#EAF2FF', color: '#4A7CFF', action: () => go('/pages/order/list') },
{ key: 'invoice', name: '开具发票', icon: '票', bg: '#E8F7EE', color: '#2FA84F', action: () => go('/pages/merchant/invoice') },
{ key: 'profile', name: '企业资料', icon: '档', bg: '#F0EBFF', color: '#7A5AF8', action: () => go('/pages/merchant/apply') },
- { key: 'address', name: '服务地址', icon: '址', bg: '#FFF0F0', color: '#E8331B', action: () => uni.showToast({ title: '地址管理开发中', icon: 'none' }) },
+ { key: 'address', name: '服务地址', icon: '址', bg: '#FFF0F0', color: '#E8331B', action: () => go('/pages/address/list') },
{ key: 'service', name: '联系客服', icon: '服', bg: '#EAF6FF', color: '#2A8FD8', action: () => uni.makePhoneCall({ phoneNumber: '4000000000' }) }
];
diff --git a/pages/message/message.vue b/pages/message/message.vue
new file mode 100644
index 0000000..932c2d5
--- /dev/null
+++ b/pages/message/message.vue
@@ -0,0 +1,93 @@
+
+
+
+
+ {{ c.name }}
+
+ 全部已读
+
+
+
+
+
+
+ {{ m.title }}
+ {{ m.time_text }}
+
+ {{ m.content }}
+ 查看订单 ›
+
+ 暂无消息
+
+
+
+
+
+
+
diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue
index 73eeeeb..a8a78c6 100644
--- a/pages/mine/mine.vue
+++ b/pages/mine/mine.vue
@@ -51,13 +51,13 @@
-