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..c2187ad 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",
@@ -2788,21 +2778,6 @@
"resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz",
"integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==",
"dev": true
- },
- "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==",
- "dev": true,
- "optional": true,
- "requires": {
- "@types/mini-css-extract-plugin": "^0.9.1",
- "chalk": "^3.0.0",
- "hash-sum": "^2.0.0",
- "loader-utils": "^1.2.3",
- "merge-source-map": "^1.1.0",
- "source-map": "^0.6.1"
- }
}
}
},
@@ -14096,6 +14071,50 @@
"vue-style-loader": "^4.1.0"
}
},
+ "vue-loader-v16": {
+ "version": "npm:vue-loader@16.1.2",
+ "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.1.2.tgz",
+ "integrity": "sha512-8QTxh+Fd+HB6fiL52iEVLKqE9N1JSlMXLR92Ijm6g8PZrwIxckgpqjPDWRP5TWxdiPaHR+alUWsnu1ShQOwt+Q==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "chalk": "^4.1.0",
+ "hash-sum": "^2.0.0",
+ "loader-utils": "^2.0.0"
+ },
+ "dependencies": {
+ "chalk": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+ "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+ "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,
+ "optional": 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-style-loader": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz",
diff --git a/src/components/organize_order/organize_order.vue b/src/components/organize_order/organize_order.vue
new file mode 100644
index 0000000..e112bb8
--- /dev/null
+++ b/src/components/organize_order/organize_order.vue
@@ -0,0 +1,218 @@
+
+
+
+
+
+ 订单编号：
+
+ {{orderInfo.order_no || '-'}}
+
+
+
+
+ 约玩主题：
+
+ {{orderInfo.theme || '-'}}
+
+
+
+ 约玩人数：
+
+ {{orderInfo.person_applicants || '-'}}
+
+
+
+ 约玩时间：
+
+ {{orderInfo.label.Date+" "+ orderInfo.label.StartTime+" "+orderInfo.label.EndTime || '-'}}
+
+
+
+ 未发放：
+
+ {{orderInfo.un_amount_already_amount || '-'}}
+
+
+
+
+
+
+ 发放金额
+ 实付款 ¥{{orderInfo.original_order.pay_amount || 0}}
+
+
+
+
+
+
+
diff --git a/src/components/reservation_order/reservation_order.vue b/src/components/reservation_order/reservation_order.vue
index 275b1bb..e3fdf65 100644
--- a/src/components/reservation_order/reservation_order.vue
+++ b/src/components/reservation_order/reservation_order.vue
@@ -1,8 +1,8 @@
-
+
@@ -12,49 +12,72 @@
- 用户昵称：
+ 预订项目：
- {{orderInfo.nickname || '-'}}
-
-
-
- 支付时间：
-
- {{orderInfo.pay_time || '-'}}
-
-
-
- 预定日期：
-
- {{orderInfo.date || '-'}}
-
-
-
- 预定场次：
-
- {{e.venue_name}} {{e.duration}}
+ {{ zh_type_name(orderInfo.order_type) }}
+
+
+
+ 预订场数：
+
+ {{ orderInfo.number || '-'}}
+
+
+
+ 预订时间：
+
+ {{e.date}} {{e.duration}}{{orderInfo.sessions.length>1?'等':''}}
+
+
+
+
+
+
+ 数量：
+
+ {{ orderInfo.number || '-'}}
+
+
+
+ 类型：
+
+
+ {{ zh_spec_names || '-'}}
+
+
+
+
+ 有效期至：
+
+ {{orderInfo.end_time || '-'}}
+
+
+
+
+ 使用日期：
+
+ {{orderInfo.date || '-'}}
+
+
+
-
-
- 支付方式：{{zh_pay_type(orderInfo.pay_type)}}
- 共{{orderInfo.sessions.length || '-'}}场次 合计：¥{{orderInfo.amount || '0'}}
-
- 实付款 ¥{{orderInfo.pay_amount || '0'}}(折扣{{orderInfo.discount_amount || '0'}})
-
- 核销方式：{{zh_verify_type(orderInfo.verify_type)}} {{orderInfo.verify_time || '-'}}
- 退款时间：{{orderInfo.refund_time || '-'}}
-
+ 实付款 ¥{{orderInfo.pay_amount || '0'}}
+
+
+
@@ -127,6 +180,9 @@ export default {
.rh-active{
color: $themeColor;
}
+ .rh-red{
+ color: #EA5061;
+ }
}
.ro-section{
padding-bottom: 20upx;
@@ -136,6 +192,9 @@ export default {
line-height: 40upx;
font-size: 24upx;
color: #9c9c9f;
+ >text{
+ color: #333;
+ }
}
.rl-view{
&:first-child{
@@ -179,6 +238,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 @@
+
+
+
+
+
+ 订单编号：
+
+ {{orderInfo.order_no || '-'}}
+
+
+
+
+
+ 项目：
+
+ {{orderInfo.project_name || '-'}}
+
+
+
+ 时长：
+
+ {{ orderInfo.extension.duration || '-'}}
+
+
+
+
+ 实付款 ¥{{orderInfo.pay_amount || 0}}
+
+
+
+
+
+
+
diff --git a/src/js/api.js b/src/js/api.js
index 5c95009..a33a439 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`, // 营业额记录-品牌
diff --git a/src/pages.json b/src/pages.json
index 47f829f..1e85383 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -184,7 +184,7 @@
}
}
- ],
+ ],
"subpackages": [
{
"root": "subpackage/device",
@@ -248,9 +248,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/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/index/index.vue b/src/pages/index/index.vue
index a72b954..314ff13 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -33,11 +33,14 @@
-
-
+
+
+
+
{{e.name}}
+
@@ -80,53 +83,40 @@
},
{
id: 2,
- name: '经营分析',
- path: '',
- serverKey: 1003 // 后端对应权限编号
+ name: '订单管理',
+ path: '/subpackage/device/pages/order_manage/order_manage',
+ serverKey: 1012 // 后端对应权限编号
},
{
id: 3,
- name: '场馆订单',
- path: '/pages/order_list/order_list',
- serverKey: 1004 // 后端对应权限编号
- },
- {
- id: 4,
- name: '会员卡订单',
- path: '/pages/order_list/order_list',
- serverKey: 1005 // 后端对应权限编号
- },
- {
- id: 5,
- name: '积分订单',
- // path: '/pages/order_list/order_list',
- path: '',
- serverKey: 1006 // 后端对应权限编号
- },
- {
- id: 6,
name: '员工管理',
path: '/pages/employee/manage/manage',
serverKey: 1007 // 后端对应权限编号
},
{
- id: 7,
+ id: 4,
name: '核销查询',
path: '/pages/write_off/list/list',
serverKey: 1008 // 后端对应权限编号
},
{
- id: 8,
+ id: 5,
name: '场地管理',
path: '/pages/site/order_list/order_list',
serverKey: 1009 // 后端对应权限编号
},
{
- id: 9,
+ id: 6,
name: '设备管理',
path: '/subpackage/device/pages/index/index',
serverKey: 1010 // 后端对应权限编号
},
+ {
+ id: 7,
+ name: '商品零售',
+ path: '/subpackage/retail/pages/index/index',
+ serverKey: 1011 // 后端对应权限编号
+ }
];
const app = getApp();
@@ -185,14 +175,12 @@
let _permission = indexData.permission || {};
if(!app.isLogin())return this.showAuthor();
if(!tabInfo.path)return util.showNone('暂未开放！');
+ //if(tabInfo.id == 2)return util.routeTo(tabInfo.path,'nT'); //测试
if(!_permission[tabInfo.serverKey])return util.showNone('暂无权限，请联系管理员开启！')
- if(this.isOrderTab(tabInfo.id))return util.routeTo(tabInfo.path + `?order_type=${tabInfo.id}`,'nT');
util.routeTo(tabInfo.path,'nT');
},
- isOrderTab(ID){
- return ID == 3 || ID == 4 || ID == 5
- },
- getIndexInfo(){
+
+ getIndexInfo(){
servers.get({
url: API.calc,
data: {},
@@ -335,7 +323,7 @@
.ic-header{
position: relative;
height: 476upx;
- margin-bottom: 48upx;
+ margin-bottom: 24upx;
padding: 38upx 24upx 0;
border-radius: 14upx;
background-color: $themeColor;
@@ -423,7 +411,6 @@
}
}
.ic-notice{
- margin-bottom: 24upx;
padding: 0 24upx;
height: 108upx;
border-radius: 10upx;
@@ -468,29 +455,34 @@
}
.ic-tabs{
display: flex;
- justify-content: space-between;
flex-wrap: wrap;
+ padding: 0upx 14upx 12upx;
+ margin-top: -12upx;
.it-item{
- padding-top: 54upx;
- margin-bottom: 24upx;
flex-shrink: 0;
- flex-grow: 0;
- width: 218upx;
- height: 218upx;
- border-radius: 10upx;
- background-color: #fff;
- >image{
- display: block;
- margin: 0 auto 20upx;
- width: 52upx;
- height: 52upx;
- }
+ width: 33.33%;
+ padding: 12upx;
>view{
- text-align: center;
- line-height: 40upx;
- font-size: 28upx;
- color: #1a1a1a;
+ padding: 40upx 10upx 0;
+ height: 218upx;
+ border-radius: 10upx;
+ background-color: #fff;
+ >image{
+ display: block;
+ margin: 0 auto 20upx;
+ width: 52upx;
+ height: 52upx;
+ }
+ >view{
+ text-align: center;
+ line-height: 40upx;
+ font-size: 28upx;
+ color: #1a1a1a;
+ @include textHide(1);
+ }
+
}
+
}
}
.ic-author-modal{
diff --git a/src/pages/order_list/order_list.vue b/src/pages/order_list/order_list.vue
index 6dfa18c..33cd4f7 100644
--- a/src/pages/order_list/order_list.vue
+++ b/src/pages/order_list/order_list.vue
@@ -1,7 +1,7 @@
@@ -27,6 +29,8 @@
import reservation_order from '../../components/reservation_order/reservation_order';
import integral_order from '../../components/integral_order/integral_order';
import membership_order from '../../components/membership_order/membership_order';
+import timing_order from '../../components/timing_order/timing_order.vue'
+import organize_order from '../../components/organize_order/organize_order.vue'
import { API } from '../../js/api';
import { servers } from '../../js/server';
@@ -38,6 +42,8 @@ export default {
'reservation-order': reservation_order,
'membership-order': membership_order,
'integral-order': integral_order,
+ 'timing-order': timing_order,
+ 'organize-order': organize_order,
},
computed: {
...mapState(['brandInfo']),
@@ -88,6 +94,8 @@ export default {
if(type == 3)return API.reservationOrder;
if(type == 4)return API.membershipOrder;
if(type == 5)return API.integralOrder;
+ if(type == 1)return API.timeOrder;
+ if(type == 10)return API.organizeOrderList;
},
getOrderList({
key = "",
diff --git a/src/static/images/icon/index/tab_10.png b/src/static/images/icon/index/tab_10.png
new file mode 100644
index 0000000..247c058
Binary files /dev/null and b/src/static/images/icon/index/tab_10.png differ
diff --git a/src/static/images/icon/index/tab_2.png b/src/static/images/icon/index/tab_2.png
index f90fae4..2e3a6eb 100644
Binary files a/src/static/images/icon/index/tab_2.png and b/src/static/images/icon/index/tab_2.png differ
diff --git a/src/static/images/icon/index/tab_3.png b/src/static/images/icon/index/tab_3.png
index 2e3a6eb..b640584 100644
Binary files a/src/static/images/icon/index/tab_3.png and b/src/static/images/icon/index/tab_3.png differ
diff --git a/src/static/images/icon/index/tab_4.png b/src/static/images/icon/index/tab_4.png
index d9c13e3..5cc189a 100644
Binary files a/src/static/images/icon/index/tab_4.png and b/src/static/images/icon/index/tab_4.png differ
diff --git a/src/static/images/icon/index/tab_5.png b/src/static/images/icon/index/tab_5.png
index 247c058..5916649 100644
Binary files a/src/static/images/icon/index/tab_5.png and b/src/static/images/icon/index/tab_5.png differ
diff --git a/src/static/images/icon/index/tab_6.png b/src/static/images/icon/index/tab_6.png
index b640584..b0a28cc 100644
Binary files a/src/static/images/icon/index/tab_6.png and b/src/static/images/icon/index/tab_6.png differ
diff --git a/src/static/images/icon/index/tab_7.png b/src/static/images/icon/index/tab_7.png
index 5cc189a..a48dc60 100644
Binary files a/src/static/images/icon/index/tab_7.png and b/src/static/images/icon/index/tab_7.png differ
diff --git a/src/static/images/icon/index/tab_8.png b/src/static/images/icon/index/tab_8.png
index 5916649..f90fae4 100644
Binary files a/src/static/images/icon/index/tab_8.png and b/src/static/images/icon/index/tab_8.png differ
diff --git a/src/static/images/icon/index/tab_9.png b/src/static/images/icon/index/tab_9.png
index b0a28cc..d9c13e3 100644
Binary files a/src/static/images/icon/index/tab_9.png and b/src/static/images/icon/index/tab_9.png differ
diff --git a/src/static/images/icon/retail/add.png b/src/static/images/icon/retail/add.png
new file mode 100644
index 0000000..c5b462d
Binary files /dev/null and b/src/static/images/icon/retail/add.png differ
diff --git a/src/static/images/icon/retail/back.png b/src/static/images/icon/retail/back.png
new file mode 100644
index 0000000..ecdd14d
Binary files /dev/null and b/src/static/images/icon/retail/back.png differ
diff --git a/src/static/images/icon/retail/cart.png b/src/static/images/icon/retail/cart.png
new file mode 100644
index 0000000..8427cfe
Binary files /dev/null and b/src/static/images/icon/retail/cart.png differ
diff --git a/src/static/images/icon/retail/dropDown.png b/src/static/images/icon/retail/dropDown.png
new file mode 100644
index 0000000..c736fc9
Binary files /dev/null and b/src/static/images/icon/retail/dropDown.png differ
diff --git a/src/static/images/icon/retail/historySearchDelete.png b/src/static/images/icon/retail/historySearchDelete.png
new file mode 100644
index 0000000..b358e0b
Binary files /dev/null and b/src/static/images/icon/retail/historySearchDelete.png differ
diff --git a/src/static/images/icon/retail/home.png b/src/static/images/icon/retail/home.png
new file mode 100644
index 0000000..d627dd1
Binary files /dev/null and b/src/static/images/icon/retail/home.png differ
diff --git a/src/static/images/icon/retail/search.png b/src/static/images/icon/retail/search.png
new file mode 100644
index 0000000..8d03fca
Binary files /dev/null and b/src/static/images/icon/retail/search.png differ
diff --git a/src/static/images/icon/retail/searchClear.png b/src/static/images/icon/retail/searchClear.png
new file mode 100644
index 0000000..4c9dbe0
Binary files /dev/null and b/src/static/images/icon/retail/searchClear.png differ
diff --git a/src/static/images/icon/retail/sub.png b/src/static/images/icon/retail/sub.png
new file mode 100644
index 0000000..66784d2
Binary files /dev/null and b/src/static/images/icon/retail/sub.png differ
diff --git a/src/static/images/icon/x_close.png b/src/static/images/icon/x_close.png
new file mode 100644
index 0000000..d4f8de0
Binary files /dev/null and b/src/static/images/icon/x_close.png differ
diff --git a/src/store/index.js b/src/store/index.js
index a776071..a97ca4c 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -27,6 +27,8 @@ export default new Vuex.Store({
'1008': '查询核销',
'1009': '场地管理',
'1010': '设备管理',
+ '1011': '商品零售',
+ '1012': '订单管理',
},
// 场地占用提交页面信息
@@ -48,6 +50,7 @@ export default new Vuex.Store({
name: _obj[key],
})
}
+ console.warn(_arr.length)
return _arr;
}
}
diff --git a/src/subpackage/device/components/order/organize_detail/organize_detail.vue b/src/subpackage/device/components/order/organize_detail/organize_detail.vue
new file mode 100644
index 0000000..e69de29
diff --git a/src/subpackage/device/components/order/reservation_people_detail/reservation_people_detail.vue b/src/subpackage/device/components/order/reservation_people_detail/reservation_people_detail.vue
new file mode 100644
index 0000000..31588ad
--- /dev/null
+++ b/src/subpackage/device/components/order/reservation_people_detail/reservation_people_detail.vue
@@ -0,0 +1,837 @@
+
+
+
+
+
+ {{orderInfo.stadium_name || '-'}}
+
+
+ 订单编号：{{orderInfo.order_no || ''}}
+ {{zh_pay_status(orderInfo.pay_status)}}
+
+
+ 创建时间：{{orderInfo.created_at || '-'}}
+
+
+ 用户昵称：{{orderInfo.nickname || '-'}}
+
+
+
+
+
+
+ 已绑定IC卡：{{orderInfo.bind_iccard_info.erp_iccard_no || '-'}}
+
+
+ 绑定时间：{{orderInfo.bind_iccard_info.bind_order_at || '-'}}
+
+
+
+ {{ orderInfo.bind_iccard_info.id > 0?'解绑IC卡':'绑定IC卡' }}
+
+
+
+ 验证信息({{orderInfo.available_num || 0}}张可用)
+
+
+ 有效期至：
+ {{orderInfo.end_time || '-'}}
+
+
+
+ 使用日期：
+ {{orderInfo.date || '-'}}
+
+
+
+ 验证码{{i+1}}：
+
+ {{e.verify_code || '-'}} ({{zh_verify_status(e.status)}})
+
+ 核销方式：{{zh_verify_type(e.verify_type)}}
+ 核销时间：{{e.verify_time || '-'}}
+
+
+
+
+
+
+ 预订信息
+
+ {{orderInfo.person_number_rule_name || ''}} {{orderInfo.person_number_rule.order_method==1?'（可随时使用）':'（固定日期）'}}
+
+
+ 数量：{{orderInfo.number || 0}}
+
+
+ 类型：{{ zh_spec_names || '-'}}
+
+
+
+ 金额小计
+ ¥{{orderInfo.amount || 0}}
+
+
+ 积分抵扣
+ -¥{{orderInfo.deduction_amount || 0}}
+
+
+ 折扣金额
+ -¥{{orderInfo.discount_amount || 0}}
+
+
+ 优惠券优惠
+ -¥{{orderInfo.coupons_amount || 0}}
+
+
+
+ 合计支付：￥{{orderInfo.pay_amount || 0}}
+
+
+
+ 支付信息
+
+ 支付方式：{{zh_pay_type(orderInfo.pay_type)}}
+
+
+ 支付时间：{{orderInfo.pay_time || '-'}}
+
+
+ 微信交易号：{{orderInfo.trade_no || ''}}
+
+
+
+
+
+
+
+
+
+ 绑定IC卡
+
+ *
+ 仓
+
+
+
+ 可直接输入卡号、扫描条码或在已选择仓库下选择卡号
+
+
+
+
+
+
+
+
+
+ 确认
+
+
+
+
+
+
+
+
+ 筛选卡号
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询卡号
+
+ 确认
+
+
+
+
+
+
+ 绑定成功
+
+ 卡号：{{sucInfo.iccard.erp_iccard_no || '-'}}
+ 关联订单号：{{sucInfo.order_no || ''}}
+ 门店名称：{{sucInfo.stadium_name || '-'}}
+
+
+ 订单类型：{{zh_order_type(sucInfo.order_type)}}
+ 项目名称：{{sucInfo.project || '-'}}
+ 购买者昵称：{{sucInfo.nickname || '-'}}
+
+ 好的
+
+
+
+
+
+
+
+
diff --git a/src/subpackage/device/components/order/reservation_site_detail/reservation_site_detail.vue b/src/subpackage/device/components/order/reservation_site_detail/reservation_site_detail.vue
new file mode 100644
index 0000000..c1f990f
--- /dev/null
+++ b/src/subpackage/device/components/order/reservation_site_detail/reservation_site_detail.vue
@@ -0,0 +1,312 @@
+
+
+
+
+
+ {{orderInfo.stadium_name || '-'}}
+
+
+ 订单编号：{{orderInfo.order_no || ''}}
+ {{zh_pay_status(orderInfo.pay_status)}}
+
+
+ 创建时间：{{orderInfo.created_at || '-'}}
+
+
+ 用户昵称：{{orderInfo.nickname || '-'}}
+
+
+
+ 验证信息
+
+ 验证码：
+ {{orderInfo.verify_code || '-'}}({{zh_pay_status(orderInfo.pay_status)}})
+
+
+
+
+ 核销方式：
+ {{zh_verify_type(orderInfo.verify_type)}}
+
+
+ 核销时间：
+ {{orderInfo.verify_time || '-'}}
+
+
+
+
+ 预订信息
+
+ 预订项目：
+ {{orderInfo.venue_type_name || '-'}}
+
+
+ 预订日期：
+ {{orderInfo.date || '-'}}
+
+
+ 预订场次：
+
+
+ {{e.venue_name||'-'}} {{e.duration||'-'}}（¥{{e.price||0}}）
+
+
+
+
+
+
+ 金额小计
+ ¥{{orderInfo.amount || 0}}
+
+
+ 积分抵扣
+ -¥{{orderInfo.deduction_amount || 0}}
+
+
+ 折扣金额
+ -¥{{orderInfo.discount_amount || 0}}
+
+
+ 优惠券优惠
+ -¥{{orderInfo.coupons_amount || 0}}
+
+
+
+ 合计支付：￥{{orderInfo.pay_amount || 0}}
+
+
+
+ 支付信息
+
+ 支付方式：
+ {{zh_pay_type(orderInfo.pay_type)}}
+
+
+ 支付时间：
+ {{orderInfo.pay_time || '-'}}
+
+
+ 微信交易号：
+ {{orderInfo.trade_no || ''}}
+
+
+
+
+ 退款时间：
+ {{orderInfo.refund_time || '-'}}
+
+
+ 退款单号：
+ {{orderInfo.refund_no || '-'}}
+
+
+
+
+ 失效时间：
+ {{orderInfo.end_time || '-'}}
+
+
+
+
+
+
+
+
diff --git a/src/subpackage/device/components/order/timing_detail/timing_detail.vue b/src/subpackage/device/components/order/timing_detail/timing_detail.vue
new file mode 100644
index 0000000..a8136f4
--- /dev/null
+++ b/src/subpackage/device/components/order/timing_detail/timing_detail.vue
@@ -0,0 +1,341 @@
+
+
+
+
+
+ {{orderInfo.stadium_name || '-'}}
+
+
+ 订单编号：{{orderInfo.order_no || '-'}}
+ {{zh_order_status(orderInfo.pay_status)}}
+
+
+ 创建时间：{{orderInfo.model.created_at || '-'}}
+
+
+ 用户昵称：{{orderInfo.nickname || '-'}}
+
+
+
+ 计时信息
+
+
+ 项目：{{orderInfo.project_name || '-'}}({{orderInfo.venue_name || '-'}})
+ 进场时间：{{orderInfo.start_time || '-'}}
+
+ 离场时间：{{orderInfo.end_time || '-'}}
+ 时长合计：{{orderInfo.extension.duration || '-'}}
+
+
+
+ 金额小计
+ ¥{{orderInfo.amount || 0}}
+
+
+ 积分抵扣
+ -¥{{orderInfo.deduction_amount ||0}}
+
+
+ 折扣金额
+ -¥{{orderInfo.discount_amount||0}}
+
+
+ 优惠券优惠
+ -¥{{orderInfo.coupons_amount || 0}}
+
+
+ 合计支付：￥{{orderInfo.pay_amount ||0}}
+
+
+
+
+ 支付信息
+
+ 支付方式：{{zh_pay_type(orderInfo.pay_type)}}
+ 支付时间：{{orderInfo.pay_time || '-'}}
+ 微信交易号：{{orderInfo.trade_no || ''}}
+
+
+ 结束计费
+
+
+
+
+
+
+
+ 结束计费
+ 操作人：{{orderInfo.end_bill_operator_name || '-'}}
+ 时长合计：{{orderInfo.extension.duration || '-'}}
+ 金额合计：¥{{orderInfo.amount || '-'}}
+ *请输入金额
+
+ 确认
+
+
+
+
+
+
+
+
diff --git a/src/subpackage/device/js/device_api.js b/src/subpackage/device/js/device_api.js
index fed9954..103a00d 100644
--- a/src/subpackage/device/js/device_api.js
+++ b/src/subpackage/device/js/device_api.js
@@ -17,9 +17,6 @@ export const DEVICE_API = {
leaseTest:`${ORIGIN}/admin/stadium/lease/cabinet/test`, // 储物柜打开
leaseReset:`${ORIGIN}/admin/stadium/lease/cabinet/reset`, // 储物柜补货
-
-
-
hardwareInfo:`${ORIGIN}/admin/stadium/hardware/get/`, // 设备信息
@@ -27,7 +24,16 @@ export const DEVICE_API = {
ouxuanac:`${ORIGIN}/ouxuanac/sendPacket`, // 中控控制
// ouxuanac--> http://api.ouxuan.net/project/233/interface/api/10012 接口文档
// ouxuanac--> http://git.ouxuan.net/ouxuanac/ouxuanac-common/src/branch/master/cmd.ts // 接口参数结构 || ouxuanac.md
-
+
+ // PM:2021/4/19
+ reservationDetail:`${ORIGIN}/admin/assistant/stadiumOrder/detail`, //k-订单管理-场馆预约订单-预约场馆订单详情
+ unbindIccard:`${ORIGIN}/admin/assistant/unbindIccard`, //k-订单管理-解绑订单的ic卡
+ bindIcCard:`${ORIGIN}/admin/assiatant/bindIcCard`, //k-订单管理-绑定ic卡
+ checkIccard:`${ORIGIN}/admin/assistant/checkIccard`, //k-订单管理-校验ic卡
+ storeHouseList:`${ORIGIN}/admin/assistant/storeHouse/list`, //k-仓库列表
+ iccardList:`${ORIGIN}/admin/assistant/iccard/list`, //k-ic卡列表
+ timeOrderDetail:`${ORIGIN}/admin/assistant/timeOrder/detail`, //k-订单管理-计时订单详情
+ timeOrderEnd:`${ORIGIN}/admin/assistant/timeOrder/end`, //k-订单管理-订单计时结束
}
export default DEVICE_API;
\ No newline at end of file
diff --git a/src/subpackage/device/pages/order_details/order_details.vue b/src/subpackage/device/pages/order_details/order_details.vue
new file mode 100644
index 0000000..d9fed51
--- /dev/null
+++ b/src/subpackage/device/pages/order_details/order_details.vue
@@ -0,0 +1,99 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/subpackage/device/pages/order_manage/order_manage.vue b/src/subpackage/device/pages/order_manage/order_manage.vue
index 930e672..7d933ec 100644
--- a/src/subpackage/device/pages/order_manage/order_manage.vue
+++ b/src/subpackage/device/pages/order_manage/order_manage.vue
@@ -1,11 +1,11 @@
-
- 订单管理
+
+ {{e.name}}
-
-
- 预约订单
+
+
+ {{j.name}}
@@ -15,10 +15,107 @@
@@ -33,7 +130,7 @@ export default {
margin-bottom: 54upx;
padding: 0 40upx;
font-size: 32upx;
- font-weight: 500;
+ font-weight: 700;
line-height: 44upx;
color: #333;
}
@@ -50,7 +147,6 @@ export default {
display: block;
width: 60upx;
height: 60upx;
- background-color: skyblue;
}
>view{
padding: 0 20upx;
diff --git a/src/subpackage/device/static/images/order/tab_0_0.png b/src/subpackage/device/static/images/order/tab_0_0.png
new file mode 100644
index 0000000..688670e
Binary files /dev/null and b/src/subpackage/device/static/images/order/tab_0_0.png differ
diff --git a/src/subpackage/device/static/images/order/tab_0_1.png b/src/subpackage/device/static/images/order/tab_0_1.png
new file mode 100644
index 0000000..3f9b23e
Binary files /dev/null and b/src/subpackage/device/static/images/order/tab_0_1.png differ
diff --git a/src/subpackage/device/static/images/order/tab_0_10.png b/src/subpackage/device/static/images/order/tab_0_10.png
new file mode 100644
index 0000000..d8f3b0a
Binary files /dev/null and b/src/subpackage/device/static/images/order/tab_0_10.png differ
diff --git a/src/subpackage/device/static/images/order/tab_0_11.png b/src/subpackage/device/static/images/order/tab_0_11.png
new file mode 100644
index 0000000..60ac701
Binary files /dev/null and b/src/subpackage/device/static/images/order/tab_0_11.png differ
diff --git a/src/subpackage/device/static/images/order/tab_0_2.png b/src/subpackage/device/static/images/order/tab_0_2.png
new file mode 100644
index 0000000..44f1565
Binary files /dev/null and b/src/subpackage/device/static/images/order/tab_0_2.png differ
diff --git a/src/subpackage/device/static/images/order/tab_0_3.png b/src/subpackage/device/static/images/order/tab_0_3.png
new file mode 100644
index 0000000..3f2bad0
Binary files /dev/null and b/src/subpackage/device/static/images/order/tab_0_3.png differ
diff --git a/src/subpackage/device/static/images/order/tab_0_4.png b/src/subpackage/device/static/images/order/tab_0_4.png
new file mode 100644
index 0000000..b8c568a
Binary files /dev/null and b/src/subpackage/device/static/images/order/tab_0_4.png differ
diff --git a/src/subpackage/device/static/images/order/tab_0_5.png b/src/subpackage/device/static/images/order/tab_0_5.png
new file mode 100644
index 0000000..752c5a3
Binary files /dev/null and b/src/subpackage/device/static/images/order/tab_0_5.png differ
diff --git a/src/subpackage/device/static/images/order/tab_0_6.png b/src/subpackage/device/static/images/order/tab_0_6.png
new file mode 100644
index 0000000..a5164f7
Binary files /dev/null and b/src/subpackage/device/static/images/order/tab_0_6.png differ
diff --git a/src/subpackage/device/static/images/order/tab_0_7.png b/src/subpackage/device/static/images/order/tab_0_7.png
new file mode 100644
index 0000000..36f1ae3
Binary files /dev/null and b/src/subpackage/device/static/images/order/tab_0_7.png differ
diff --git a/src/subpackage/device/static/images/order/tab_0_8.png b/src/subpackage/device/static/images/order/tab_0_8.png
new file mode 100644
index 0000000..768ba95
Binary files /dev/null and b/src/subpackage/device/static/images/order/tab_0_8.png differ
diff --git a/src/subpackage/device/static/images/order/tab_0_9.png b/src/subpackage/device/static/images/order/tab_0_9.png
new file mode 100644
index 0000000..e8a15a0
Binary files /dev/null and b/src/subpackage/device/static/images/order/tab_0_9.png differ
diff --git a/src/subpackage/device/static/images/order/tab_1_0.png b/src/subpackage/device/static/images/order/tab_1_0.png
new file mode 100644
index 0000000..ad8274c
Binary files /dev/null and b/src/subpackage/device/static/images/order/tab_1_0.png differ
diff --git a/src/subpackage/device/static/images/scan_code.png b/src/subpackage/device/static/images/scan_code.png
new file mode 100644
index 0000000..06424ed
Binary files /dev/null and b/src/subpackage/device/static/images/scan_code.png differ
diff --git a/src/subpackage/retail/components/hover_cart_list/hover_cart_list.vue b/src/subpackage/retail/components/hover_cart_list/hover_cart_list.vue
new file mode 100644
index 0000000..bd864ae
--- /dev/null
+++ b/src/subpackage/retail/components/hover_cart_list/hover_cart_list.vue
@@ -0,0 +1,243 @@
+
+
+
+
+
+ 商品名称
+ 售价
+ 数量
+
+
+
+
+ {{ item.erp_goods_name }}
+ {{ item.erp_goods_specs }}
+
+
+
+ 元
+
+
+
+ {{ item.count }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/subpackage/retail/js/retail_api.js b/src/subpackage/retail/js/retail_api.js
new file mode 100644
index 0000000..846c7fc
--- /dev/null
+++ b/src/subpackage/retail/js/retail_api.js
@@ -0,0 +1,11 @@
+import { ORIGIN } from '../../../js/api';
+
+export const RETAIL_API = {
+ assistantRetail:`${ORIGIN}/admin/assistant/retail`, // 收款出库
+ assistantListErpGoods:`${ORIGIN}/admin/assistant/listErpGoods`, // 物品管理
+ assistantListErpGoodsCate:`${ORIGIN}/admin/assistant/listErpGoodsCate`, // 物品分类管理
+ assistantGetAssistantStadiums:`${ORIGIN}/admin/assistant/getAssistantStadiums`, // 店铺列表
+ assistantListErpGoodsCateAndGoods:`${ORIGIN}/admin/assistant/listErpGoodsCateAndGoods`, // 物品分类物品列表
+}
+
+export default RETAIL_API;
\ No newline at end of file
diff --git a/src/subpackage/retail/js/retail_server.js b/src/subpackage/retail/js/retail_server.js
new file mode 100644
index 0000000..9e01c73
--- /dev/null
+++ b/src/subpackage/retail/js/retail_server.js
@@ -0,0 +1,10 @@
+import { Server } from '../../../js/server';
+
+class RetailServer extends Server {
+ constructor(props){
+ super(props)
+ }
+}
+
+
+export default new RetailServer();
\ No newline at end of file
diff --git a/src/subpackage/retail/js/tools.js b/src/subpackage/retail/js/tools.js
new file mode 100644
index 0000000..c3c668a
--- /dev/null
+++ b/src/subpackage/retail/js/tools.js
@@ -0,0 +1,20 @@
+
+export const tools = {
+ // px转rpx
+ px2rpx: function(px) {
+ return (px / (uni.upx2px(px) / px));
+ },
+
+ // 获取新的数据对象
+ getNewObj: function(old) {
+ let newObj = {};
+
+ for (let key in old) {
+ newObj[key] = old[key];
+ }
+
+ return newObj;
+ },
+}
+
+export default tools;
\ No newline at end of file
diff --git a/src/subpackage/retail/pages/confirm_goods/confirm_goods.vue b/src/subpackage/retail/pages/confirm_goods/confirm_goods.vue
new file mode 100644
index 0000000..28f69a9
--- /dev/null
+++ b/src/subpackage/retail/pages/confirm_goods/confirm_goods.vue
@@ -0,0 +1,502 @@
+
+
+
+
+ 商品名称
+ 售价
+ 数量
+
+
+
+
+ {{ item.erp_goods_name }}
+ {{ item.erp_goods_specs }}
+
+
+
+ {{item.erp_goods_price}}
+ 元
+
+
+
+ {{ item.count }}
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/subpackage/retail/pages/index/index.vue b/src/subpackage/retail/pages/index/index.vue
new file mode 100644
index 0000000..13e358e
--- /dev/null
+++ b/src/subpackage/retail/pages/index/index.vue
@@ -0,0 +1,1026 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.erp_goods_name }}
+ {{ item.erp_goods_specs }}
+
+
+
+ ￥{{ item.erp_goods_price }}
+
+
+
+
+ {{ item.count }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/subpackage/retail/pages/search/search.vue b/src/subpackage/retail/pages/search/search.vue
new file mode 100644
index 0000000..d9ec3cc
--- /dev/null
+++ b/src/subpackage/retail/pages/search/search.vue
@@ -0,0 +1,295 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 历史搜索
+
+
+
+ {{ item }}
+
+
+
+
+
+
+
+
diff --git a/src/subpackage/retail/static/images/add.png b/src/subpackage/retail/static/images/add.png
new file mode 100644
index 0000000..c5b462d
Binary files /dev/null and b/src/subpackage/retail/static/images/add.png differ
diff --git a/src/subpackage/retail/static/images/back.png b/src/subpackage/retail/static/images/back.png
new file mode 100644
index 0000000..ecdd14d
Binary files /dev/null and b/src/subpackage/retail/static/images/back.png differ
diff --git a/src/subpackage/retail/static/images/cart.png b/src/subpackage/retail/static/images/cart.png
new file mode 100644
index 0000000..8427cfe
Binary files /dev/null and b/src/subpackage/retail/static/images/cart.png differ
diff --git a/src/subpackage/retail/static/images/dropDown.png b/src/subpackage/retail/static/images/dropDown.png
new file mode 100644
index 0000000..c736fc9
Binary files /dev/null and b/src/subpackage/retail/static/images/dropDown.png differ
diff --git a/src/subpackage/retail/static/images/historySearchDelete.png b/src/subpackage/retail/static/images/historySearchDelete.png
new file mode 100644
index 0000000..b358e0b
Binary files /dev/null and b/src/subpackage/retail/static/images/historySearchDelete.png differ
diff --git a/src/subpackage/retail/static/images/home.png b/src/subpackage/retail/static/images/home.png
new file mode 100644
index 0000000..d627dd1
Binary files /dev/null and b/src/subpackage/retail/static/images/home.png differ
diff --git a/src/subpackage/retail/static/images/search.png b/src/subpackage/retail/static/images/search.png
new file mode 100644
index 0000000..8d03fca
Binary files /dev/null and b/src/subpackage/retail/static/images/search.png differ
diff --git a/src/subpackage/retail/static/images/searchClear.png b/src/subpackage/retail/static/images/searchClear.png
new file mode 100644
index 0000000..4c9dbe0
Binary files /dev/null and b/src/subpackage/retail/static/images/searchClear.png differ