diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json new file mode 100644 index 0000000..501e01c --- /dev/null +++ b/.hbuilderx/launch.json @@ -0,0 +1,11 @@ +{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/ + // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数 + "version": "0.0", + "configurations": [{ + "type": "uniCloud", + "default": { + "launchtype": "remote" + } + } + ] +} diff --git a/package-lock.json b/package-lock.json index bb6cb28..f9e1fdf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2403,16 +2403,6 @@ "integrity": "sha512-Jus9s4CDbqwocc5pOAnh8ShfrnMcPHuJYzVcSUU7lrh8Ni5HuIqX3oilL86p3dlTrk0LzHRCgA/GQ7uNCw6l2Q==", "dev": true }, - "@types/mini-css-extract-plugin": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/@types/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.1.tgz", - "integrity": "sha512-+mN04Oszdz9tGjUP/c1ReVwJXxSniLd7lF++sv+8dkABxVNthg6uccei+4ssKxRHGoMmPxdn7uBdJWONSJGTGQ==", - "dev": true, - "optional": true, - "requires": { - "@types/webpack": "*" - } - }, "@types/minimatch": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz", @@ -2783,25 +2773,45 @@ "webpack-merge": "^4.2.2" }, "dependencies": { + "chalk": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz", + "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==", + "dev": true, + "optional": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, "hash-sum": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz", "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==", "dev": true }, + "loader-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", + "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", + "dev": true, + "optional": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, "vue-loader-v16": { - "version": "npm:vue-loader@16.0.0-beta.5", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.0.0-beta.5.tgz", - "integrity": "sha512-ciWfzNefqWlmzKznCWY9hl+fPP4KlQ0A9MtHbJ/8DpyY+dAM8gDrjufIdxwTgC4szE4EZC3A6ip/BbrqM84GqA==", + "version": "npm:vue-loader@16.2.0", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.2.0.tgz", + "integrity": "sha512-TitGhqSQ61RJljMmhIGvfWzJ2zk9m1Qug049Ugml6QP3t0e95o0XJjk29roNEiPKJQBEi8Ord5hFuSuELzSp8Q==", "dev": true, "optional": true, "requires": { - "@types/mini-css-extract-plugin": "^0.9.1", - "chalk": "^3.0.0", + "chalk": "^4.1.0", "hash-sum": "^2.0.0", - "loader-utils": "^1.2.3", - "merge-source-map": "^1.1.0", - "source-map": "^0.6.1" + "loader-utils": "^2.0.0" } } } diff --git a/src/components/organize_order/organize_order.vue b/src/components/organize_order/organize_order.vue new file mode 100644 index 0000000..69dac42 --- /dev/null +++ b/src/components/organize_order/organize_order.vue @@ -0,0 +1,218 @@ + + + + + diff --git a/src/components/reservation_order/reservation_order.vue b/src/components/reservation_order/reservation_order.vue index 275b1bb..acaf26a 100644 --- a/src/components/reservation_order/reservation_order.vue +++ b/src/components/reservation_order/reservation_order.vue @@ -1,8 +1,10 @@ @@ -127,6 +183,9 @@ export default { .rh-active{ color: $themeColor; } + .rh-red{ + color: #EA5061; + } } .ro-section{ padding-bottom: 20upx; @@ -136,6 +195,9 @@ export default { line-height: 40upx; font-size: 24upx; color: #9c9c9f; + >text{ + color: #333; + } } .rl-view{ &:first-child{ @@ -179,6 +241,7 @@ export default { color: #9c9c9f; .rt-txt{ color: #1A1A1A; + margin-left: 10rpx; } } } diff --git a/src/components/timing_order/timing_order.vue b/src/components/timing_order/timing_order.vue new file mode 100644 index 0000000..7d1b965 --- /dev/null +++ b/src/components/timing_order/timing_order.vue @@ -0,0 +1,151 @@ + + + + + diff --git a/src/js/api.js b/src/js/api.js index 5c95009..af3f6eb 100644 --- a/src/js/api.js +++ b/src/js/api.js @@ -19,11 +19,17 @@ export const API = { collectionDetails: `${ORIGIN}/admin/assistant/collection/details`, // 收款记录-收款明细 - reservationOrder: `${ORIGIN}/admin/stadium/order/list`, // 预约订单 + // reservationOrder: `${ORIGIN}/admin/stadium/order/list`, // 预约订单 + reservationOrder:`${ORIGIN}/admin/assistant/stadiumOrder/list`, //k-订单管理-预约订单列表 PM:2021/4/19 + timeOrder:`${ORIGIN}/admin/assistant/timeOrder/list`, //k-订单管理-计时订单列表 PM:2021/4/19 + membershipOrder: `${ORIGIN}/admin/member_card/order/list`, // 会员卡订单 integralOrder: `${ORIGIN}/admin/shop/order/list`, // 积分商城订单 integralOrderSend: `${ORIGIN}/admin/shop/order/ship`, // 积分商城订单-发货 + organizeOrderList: `${ORIGIN}/assistant/gaPlayTogetherOrder/list`, // 约玩订单列表 + amountIssued: `${ORIGIN}/assistant/gaPlayTogetherOrder/amountIssued`, // 发放金额 + // 营业额统计 turnoverBrand: `${ORIGIN}/admin/assistant/turnover/brand/calc`, // 营业额记录-品牌 @@ -60,6 +66,13 @@ API['venue'] = { setStatus: `${ORIGIN}/admin/timeSelect/setStatus`, // 商家助手-占用场地列表 } +// 2.1 核销 + +API['writeOff'] = { + listVerifyRecord: `${ORIGIN}/admin/stadium/order/listVerifyRecord`, // 核销记录 + enterVerifyOrder: `${ORIGIN}/admin/stadium/order/enterVerifyOrder`, // 商家助手-核销查询-输入验证码 + assistantVerify: `${ORIGIN}/admin/stadium/order/assistantVerify`, // 商家助手-核销查询-核销 +} export default { ORIGIN, API }; diff --git a/src/js/once_name.js b/src/js/once_name.js new file mode 100644 index 0000000..d32a5a4 --- /dev/null +++ b/src/js/once_name.js @@ -0,0 +1,10 @@ +// 监听器命名 +// 避免命名冲突，误触监听器 + +export const WRITE_OFF_STORE_INFO = 'stadium_list'; +export const WRITE_OFF_ORDER_INFO = 'order_info'; + +export default { + WRITE_OFF_STORE_INFO, + WRITE_OFF_ORDER_INFO, +} \ No newline at end of file diff --git a/src/pages.json b/src/pages.json index 47f829f..48ed0e8 100644 --- a/src/pages.json +++ b/src/pages.json @@ -13,7 +13,7 @@ { "path": "pages/site/order_list/order_list", "style": { - "navigationBarTitleText": "我的预约订单列表" + "navigationBarTitleText": "占用场地" } }, { @@ -133,6 +133,30 @@ } }, { + "path": "pages/write_off/search_result/search_result", + "style": { + "navigationBarTitleText": "核销查询" + } + }, + { + "path": "pages/write_off/operate/operate", + "style": { + "navigationBarTitleText": "核销订单" + } + }, + { + "path": "pages/write_off/confirm_order/confirm_order", + "style": { + "navigationBarTitleText": "核销订单" + } + }, + { + "path": "pages/write_off/null/null", + "style": { + "navigationBarTitleText": "确认订单信息" + } + }, + { "path": "pages/employee/review_list/review_list", "style": { "navigationBarTitleText": "员工管理" @@ -184,7 +208,7 @@ } } - ], + ], "subpackages": [ { "root": "subpackage/device", @@ -248,9 +272,38 @@ "style" : { "navigationBarTitleText": "售货柜管理" } + }, + { + "path": "pages/order_details/order_details", + "style": { + "navigationBarTitleText": "" + } + } + ] + }, + { + "root": "subpackage/retail", + "pages": [ + { + "path": "pages/index/index", + "style" : { + "navigationBarTitleText": "商品零售" + } + }, + { + "path": "pages/confirm_goods/confirm_goods", + "style" : { + "navigationBarTitleText": "确定商品" + } + }, + { + "path": "pages/search/search", + "style" : { + "navigationBarTitleText": "搜索" + } } ] - } + } ], "globalStyle": { "navigationBarTextStyle": "white", diff --git a/src/pages/admin_bind/admin_bind.vue b/src/pages/admin_bind/admin_bind.vue index bf720d3..fd6ce65 100644 --- a/src/pages/admin_bind/admin_bind.vue +++ b/src/pages/admin_bind/admin_bind.vue @@ -6,11 +6,19 @@ 请点击“确认绑定”按钮成为超级管理员； 绑定后您将可以添加员工并查看品牌订单数据 + + @getuserinfo="getuserinfo" + >确认绑定 @@ -20,12 +28,15 @@ import { servers } from '../../js/server'; import util from '../../utils/util'; const uniLogin = util.promisify(uni.login); export default { + computed: { + isProfile: _=> util.isProfile(), + }, data(){ return { brandInfo: {}, sceneQuery: { - b:'37', - r:'1' + b:'', + r:'' }, } }, @@ -44,6 +55,18 @@ export default { }, methods: { + getUserInfoProfile(){ + uni.getUserProfile({ + lang: 'zh_CN', desc: '用户绑定', + success: res => { + this.getuserinfo({detail: {...res}}); + }, + fail: function(err) { + util.showNone('获取用户信息失败！请重试'); + console.warn('getUserProfile Err', err) + } + }) + }, async getuserinfo(userRes){ if(!userRes.detail.userInfo){ return util.showNone('获取用户信息失败！请稍后重试'); diff --git a/src/pages/employee/manage/manage.vue b/src/pages/employee/manage/manage.vue index d685dfa..a215fc9 100644 --- a/src/pages/employee/manage/manage.vue +++ b/src/pages/employee/manage/manage.vue @@ -59,7 +59,7 @@ 权限： - 全部权限 + 全部权限 {{permissionObj[e] || ''}} @@ -83,10 +83,11 @@ import { API } from '../../../js/api'; import { servers } from '../../../js/server'; import util from '../../../utils/util' -import { mapState } from 'vuex'; +import { mapState, mapGetters } from 'vuex'; export default { computed: { - ...mapState([ 'permissionObj', 'brandInfo' ]), + ...mapGetters([ 'permissionArr' ]), + ...mapState([ 'permissionObj', 'brandInfo', ]), isFilter(){ let { filterInfo } = this; return !!filterInfo.meun || !!filterInfo.store diff --git a/src/pages/employee/perfect_info/perfect_info.vue b/src/pages/employee/perfect_info/perfect_info.vue index 4daf1e6..7eb1c3f 100644 --- a/src/pages/employee/perfect_info/perfect_info.vue +++ b/src/pages/employee/perfect_info/perfect_info.vue @@ -19,7 +19,15 @@ + + + + + + 提示：请联系管理员添加您为员工账号 成为商家 @@ -31,6 +39,9 @@ const uniGetSetting = util.promisify(uni.getSetting); const uniLogin = util.promisify(uni.login); const APPID = uni.getAccountInfoSync().miniProgram.appId; export default { + computed: { + isProfile: _=> util.isProfile(), + }, data(){ return { formData: { @@ -41,6 +52,18 @@ export default { } }, methods: { + profileSubmit(){ + uni.getUserProfile({ + lang: 'zh_CN', desc: '用户绑定', + success: res => { + this.submitBtn({detail: {...res}}); + }, + fail: function(err) { + util.showNone('获取用户信息失败！请重试'); + console.warn('getUserProfile Err', err) + } + }) + }, async submitBtn(userRes){ try{ util.showLoad(); diff --git a/src/pages/order_list/order_list.vue b/src/pages/order_list/order_list.vue index 6dfa18c..ec2121a 100644 --- a/src/pages/order_list/order_list.vue +++ b/src/pages/order_list/order_list.vue @@ -1,7 +1,7 @@