diff --git a/common/enum.js b/common/enum.js index 07db382..1576560 100644 --- a/common/enum.js +++ b/common/enum.js @@ -9,6 +9,7 @@ const ordStatusList = [ { title: '待付款', val: ordStaEnum.unpay } ] + const payTypeEnum = { postNow: 1, toNow: 2, @@ -84,6 +85,18 @@ const sendTypeList = [ { title: '整柜提货', val: sendTypeEnum.container } ] +const payStatusEnum = { + todo: 1, + done: 2, + other: 3, +} + +const payStatusList = [ + { title: '待付款', val: payStatusEnum.todo }, + { title: '已付款', val: payStatusEnum.done }, + { title: '其他', val: payStatusEnum.other } +] + export { ordStaEnum, ordStatusList, @@ -94,5 +107,7 @@ export { dateTypeEnum, dateTypeList, sendTypeEnum, - sendTypeList + sendTypeList, + payStatusEnum, + payStatusList } \ No newline at end of file diff --git a/common/untool.js b/common/untool.js index 31038d7..d7927f6 100644 --- a/common/untool.js +++ b/common/untool.js @@ -1,7 +1,7 @@ const tabBarUrls = [ - 'tabBar/sending/sending', - 'tabBar/search/search', - 'tabBar/mine/mine' + '/pages/tabBar/sending/sending', + '/pages/tabBar/search/search', + '/pages/tabBar/mine/mine' ] const goto = (url, type = 1)=> { @@ -35,7 +35,7 @@ const setClipboardData = (val)=> { uni.setClipboardData({ data: val, success: () => { - showToast({ title: "复制成功", icon: 'none' }) + showToast('复制成功') }, }) } diff --git a/pages.json b/pages.json index 348ab23..2a7f67b 100644 --- a/pages.json +++ b/pages.json @@ -91,6 +91,18 @@ "style": { "navigationBarTitleText": "实名认证" } + }, + { + "path": "pages/bill/list", + "style": { + "navigationBarTitleText": "我的账单" + } + }, + { + "path": "pages/bill/detail", + "style": { + "navigationBarTitleText": "账单明细" + } } ], diff --git a/pages/bill/detail.vue b/pages/bill/detail.vue new file mode 100644 index 0000000..072c624 --- /dev/null +++ b/pages/bill/detail.vue @@ -0,0 +1,177 @@ + + + + + + \ No newline at end of file diff --git a/pages/bill/list.vue b/pages/bill/list.vue new file mode 100644 index 0000000..917b0db --- /dev/null +++ b/pages/bill/list.vue @@ -0,0 +1,325 @@ + + + + + \ No newline at end of file diff --git a/pages/tabBar/mine/mine.vue b/pages/tabBar/mine/mine.vue index b863d85..b188a42 100644 --- a/pages/tabBar/mine/mine.vue +++ b/pages/tabBar/mine/mine.vue @@ -73,10 +73,10 @@ { title: '186单', subTitle: "收件", icon: getCdnUrl(`mine/shjian.png`), url: '' } ], toolBtnlist: [ - { title: '运单列表', subTitle: "", icon: getCdnUrl(`mine/ydlib.png`), url: '' }, + { title: '运单列表', subTitle: "", icon: getCdnUrl(`mine/ydlib.png`), url: 'tabBar/search/search' }, { title: '进仓单', subTitle: "", icon: getCdnUrl(`mine/jcdan.png`), url: '' }, { title: '协议', subTitle: "", icon: getCdnUrl(`mine/xieyi.png`), url: '' }, - { title: '账单查询', subTitle: "", icon: getCdnUrl(`mine/zhdancha.png`), url: '' }, + { title: '账单查询', subTitle: "", icon: getCdnUrl(`mine/zhdancha.png`), url: 'bill/list' }, { title: '地址簿', subTitle: "", icon: getCdnUrl(`mine/dizhi.png`), url: 'address/list' }, { title: '快件查询', subTitle: "", icon: getCdnUrl(`mine/kjcha.png`), url: '' }, { title: '投诉建议', subTitle: "", icon: getCdnUrl(`mine/tousu.png`), url: 'complaint/complaint' }, @@ -93,7 +93,7 @@ methods: { getCdnUrl, handlePageRedirect(item) { - goto(item.url) + item.url && goto(item.url) } } }