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 @@ + + + + + + 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 @@ + + + + + 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 @@ + + + + + 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 @@ 我的订单› - + 服务地址› - + 优惠券› - + 消息中心› diff --git a/server/application/admin/view/index/login.html b/server/application/admin/view/index/login.html old mode 100755 new mode 100644 index a21d420..f56b2ac --- a/server/application/admin/view/index/login.html +++ b/server/application/admin/view/index/login.html @@ -4,139 +4,148 @@ {include file="common/meta" /} {if $background} - + {/if} -
-