diff --git a/src/components/order_list/stored_value_card/stored_value_card.vue b/src/components/order_list/stored_value_card/stored_value_card.vue new file mode 100644 index 0000000..7f0d8e9 --- /dev/null +++ b/src/components/order_list/stored_value_card/stored_value_card.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/src/components/order_list/value_card/value_card.vue b/src/components/order_list/value_card/value_card.vue index ac9995b..f5d281f 100644 --- a/src/components/order_list/value_card/value_card.vue +++ b/src/components/order_list/value_card/value_card.vue @@ -11,6 +11,9 @@ 手机号码： + + 备注： + 余额： diff --git a/src/js/api.js b/src/js/api.js index 095333b..a531af7 100644 --- a/src/js/api.js +++ b/src/js/api.js @@ -69,6 +69,9 @@ export const API = { messageList:`${ORIGIN}/admin/brand/message/list`, // 系统消息列表 messageRead:`${ORIGIN}/brand/message/read`, // 查看系统消息 + // 20220725 + userValueOrderLs:`${ORIGIN}/admin/userValueOrder/list`, // 用户储值卡订单 + } // 员工管理 diff --git a/src/pages.json b/src/pages.json index a20f254..9943efe 100644 --- a/src/pages.json +++ b/src/pages.json @@ -450,6 +450,12 @@ "root": "subpackage/order", "pages": [ { + "path": "pages/stored_value_card/detail/detail", + "style" : { + "navigationBarTitleText": "储值卡订单详情" + } + }, + { "path": "pages/retail/detail/detail", "style" : { "navigationBarTitleText": "零售订单详情" diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index b76f74b..0b40e63 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -131,7 +131,13 @@ name: '课程管理', path: '/subpackage/course/pages/index/index', serverKey: 1013 // 后端对应权限编号 1013 - } + }, + { + id: 9, + name: '储值卡管理', + path: '/pages/order_list/order_list?order_type=18', + serverKey: 1014 // 后端对应权限编号 1014 + }, ]; const app = getApp(); diff --git a/src/pages/order_list/order_list.vue b/src/pages/order_list/order_list.vue index a39bdaa..2e8a699 100644 --- a/src/pages/order_list/order_list.vue +++ b/src/pages/order_list/order_list.vue @@ -64,6 +64,7 @@ + @@ -123,7 +124,7 @@ import timing_order from '../../components/timing_order/timing_order.vue'; import organize_order from '../../components/organize_order/organize_order.vue'; // 20210910 新增订单模块 - import value_card from '../../components/order_list/value_card/value_card.vue'; + import value_card from '../../components/order_list/value_card/value_card.vue'; // 储值卡管理 （20220725 由储值卡订单直接改接口） import curriculum from '../../components/order_list/curriculum/curriculum.vue'; import spectacular_monent from '../../components/order_list/spectacular_monent/spectacular_monent.vue'; import club_rental from '../../components/order_list/club_rental/club_rental.vue'; @@ -134,6 +135,7 @@ import competition from '../../components/order_list/competition/competition.vue'; // 赛事 import retail from '../../components/order_list/retail/retail.vue'; // 零售 import ym_card from '../../components/order_list/ym_card/ym_card.vue'; // 年月卡 + import stored_value_card from '../../components/order_list/stored_value_card/stored_value_card.vue'; // 储值卡订单 import util from '../../utils/util'; import { servers } from '../../js/server'; @@ -160,6 +162,7 @@ 'competition': competition, 'retail': retail, 'ym-card': ym_card, + 'stored-value-card': stored_value_card, }, computed:{ isStoreInfo(){ @@ -174,7 +177,7 @@ orderType == 8 || orderType == 7 || orderType == 11 || orderType == 6 || orderType == 9 || orderType == 19 || - orderType == 20 + orderType == 20 || orderType == 21 ) }, // 分类列表 @@ -384,9 +387,11 @@ page_size=15, }){ let { orderType } = this; + let _url = this.getApiUrl(orderType); + if(!_url)return; util.showLoad(); return servers.post({ - url: this.getApiUrl(orderType), + url: _url, data: { ...this.getQueryForList(), page, page_size }, failMsg: '加载失败！' }) @@ -423,6 +428,7 @@ if(type == 2)return API.shop2OrderList; // 商城订单 if(type == 19)return API.retailOrderList; // 零售订单 if(type == 20)return API.userMonthlyCardLs; // 列表用户年月卡-后台 + if(type == 21)return API.userValueOrderLs; // 列表用户年月卡-后台 }, // 是否为设备，统一接口 isDevice(){ @@ -524,7 +530,7 @@ case 12: return '课程订单'; case 18: - return '储值卡订单'; + return '储值卡管理'; case 15: return '高光时刻订单'; case 16: @@ -547,6 +553,8 @@ return '零售订单'; case 20: return '年月卡订单'; + case 21: + return '储值卡订单'; default: return '订单' } @@ -568,7 +576,7 @@ return [ {id: '', name: '全部'}, {id: 1, name: '已付款'}, {id: 2, name: '已完成'}, {id: 4, name: '已退款'}, ]; case 12: // 约玩tab 全部/计费中/已完成/已退款 [空字符/0/1/4] return [ {id: -1, name: '全部'}, {id: 0, name: '待付款'}, {id: 1, name: '进行中'}, {id: 2, name: '已结束'}, {id: 3, name: '已退款'}, ]; - case 18: // 储值卡 （0待激活1使用中2已失效3已退卡全部空字符） + case 18: // 储值卡 （0待激活1使用中2已失效3已退卡全部空字符） ---> 20220725 改为储值卡管理 return [ {id: '', name: '全部'}, {id: 0, name: '待激活'}, {id: 1, name: '使用中'}, {id: 2, name: '已失效'}, {id: 3, name: '已退卡'},]; case 15: // 高光时刻订单 (全部 1,2,4 生效中 1 已失效3 已退款 4 对应返回的pay_status) return [ {id: '1,2,4', name: '全部'}, {id: 1, name: '生效中'}, {id: 3, name: '已失效'}, {id: 4, name: '已退款'}]; @@ -590,6 +598,8 @@ return [ {id: 1, name: '交易成功'} ]; case 20: // 年月卡 筛选的 status 全部 0,1,2,3 待激活 0 使用中 1 已失效 2 已退卡 3 return [ {id: '', name: '全部'}, {id: 0, name: '待激活'}, {id: 1, name: '使用中'}, {id: 2, name: '已失效'},{id: 3, name: '已退卡'}]; + case 21: // 储值卡订单 筛选的 status 全部-> '' 已付款-> 1 已退款-> 4 + return [ {id: '', name: '全部'}, {id: 1, name: '已付款'}, {id: 4, name: '已退款'} ]; default: return [] } diff --git a/src/store/index.js b/src/store/index.js index 9cc9b2d..cdd2e82 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -41,6 +41,7 @@ export default new Vuex.Store({ '1010': '设备管理', '1011': '商品零售', '1013': '课程管理', + '1014': '储值卡管理', }, // 场地占用提交页面信息 occupyInfo: { diff --git a/src/subpackage/order/js/api.js b/src/subpackage/order/js/api.js index b177948..74ca1f4 100644 --- a/src/subpackage/order/js/api.js +++ b/src/subpackage/order/js/api.js @@ -28,6 +28,8 @@ export const ORDER_API = { ymCardInfoFace:`${ORIGIN}/upload/file/ym_card_face`, // 年月卡用户头像上传 ymCardInfoFaceSave:`${ORIGIN}/admin/userMonthlyCard/updateFace`, // 年月卡用户头像保存 ymCardUsage:`${ORIGIN}/admin/userMonthlyCard/usages`, // 用户年月卡使用记录-后台 + // 20220725 + userValueOrderGet:`${ORIGIN}/admin/userValueOrder/get`, // 储值卡订单详情 } diff --git a/src/subpackage/order/pages/stored_value_card/detail/detail.vue b/src/subpackage/order/pages/stored_value_card/detail/detail.vue new file mode 100644 index 0000000..6ef8b8c --- /dev/null +++ b/src/subpackage/order/pages/stored_value_card/detail/detail.vue @@ -0,0 +1,215 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/order/pages/value_card/detail/detail.vue b/src/subpackage/order/pages/value_card/detail/detail.vue index 843c3f1..45c0100 100644 --- a/src/subpackage/order/pages/value_card/detail/detail.vue +++ b/src/subpackage/order/pages/value_card/detail/detail.vue @@ -34,9 +34,12 @@ 卡类型： - + 有效期： + + 备注： + 购卡记录 @@ -360,12 +363,14 @@ export default { util.routeTo(`/subpackage/order/pages/value_card/xpense_tracker/xpense_tracker?card_no=${orderInfo.card_no}`, 'nT'); }, getInfo(card_no){ + util.showLoad(); server.get({ url: ORDER_API.userValueCardInfo, data: { card_no }, failMsg: '加载失败！' }) .then(res=>{ + util.hideLoad(); this.orderInfo = res || {}; }) },