diff --git a/src/js/api.js b/src/js/api.js
index 6a0a6ee..9e91b77 100644
--- a/src/js/api.js
+++ b/src/js/api.js
@@ -3,7 +3,6 @@ export const ORIGIN = `https://testmanager.ouxuanzhineng.cn`; // 测试
// export const ORIGIN = `http://192.168.1.135:9090`; // 20210927 测试
-
export const API = {
wechatMiniAppLoginAndSync: `${ORIGIN}/assistant/WechatMiniAppGetToken`, // 小程序授权获取token，为空就登录
WechatMiniApplogin: `${ORIGIN}/assistant/WechatMiniApplogin`, // 小程序登录获取token
@@ -102,6 +101,15 @@ API['writeOff'] = {
assistantVerify: `${ORIGIN}/admin/stadium/order/assistantVerify`, // 商家助手-核销查询-核销
userMonthlyCardVerify: `${ORIGIN}/admin/userMonthlyCard/verify`, // 年月卡核销-后台
userMonthlyCardOpenGate: `${ORIGIN}/admin/userMonthlyCard/openGate`, // 年月卡开门-后台
+
+ // 20211228 新增商城核销
+ shop2WriteoffList: `${ORIGIN}/admin/assistant/shop2/writeoffList`, // 商城订单核销 - 列表
+ shop2WriteoffGet: `${ORIGIN}/admin/assistant/shop2/writeoffGet`, // 商城订单核销 - 获取订单信息
+ shop2WriteoffSet: `${ORIGIN}/admin/assistant/shop2/writeoffSet`, // 商城订单核销 - 确认核销
+ timingNumber: `${ORIGIN}/stadium/person/timing/number`, // 现场人数
+ setStadiumPresentNumber: `${ORIGIN}/admin/stadium/setStadiumPresentNumber`, // 商家助手散客人数校正
+
+
}
export default { ORIGIN, API };
diff --git a/src/js/once_name.js b/src/js/once_name.js
index 4ffcda7..4847771 100644
--- a/src/js/once_name.js
+++ b/src/js/once_name.js
@@ -4,9 +4,15 @@
export const WRITE_OFF_STORE_INFO = 'stadium_list';
export const WRITE_OFF_ORDER_INFO = 'order_info';
export const WRITE_OFF_YM_ORDER_INFO = 'ym_order_info'; // 年月卡订单核销
+export const WRITE_OFF_MALL_ORDER_INFO = 'mall_order_info'; // 商城订单核销
+export const WRITE_OFF_MALL_ORDER_SUCCESS = 'mall_order_success'; // 商城订单核销成功！
+
+
export default {
WRITE_OFF_STORE_INFO,
WRITE_OFF_ORDER_INFO,
- WRITE_OFF_YM_ORDER_INFO
+ WRITE_OFF_YM_ORDER_INFO,
+ WRITE_OFF_MALL_ORDER_INFO,
+ WRITE_OFF_MALL_ORDER_SUCCESS
}
\ No newline at end of file
diff --git a/src/pages.json b/src/pages.json
index 5e7b981..4c5beba 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -134,6 +134,36 @@
}
},
{
+ "path": "pages/write_off/mall/success/success",
+ "style": {
+ "navigationBarTitleText": "核销订单"
+ }
+ },
+ {
+ "path": "pages/write_off/mall/confirm/confirm",
+ "style": {
+ "navigationBarTitleText": "核销订单"
+ }
+ },
+ {
+ "path": "pages/write_off/mall/list/list",
+ "style": {
+ "navigationBarTitleText": "商城订单核销"
+ }
+ },
+ {
+ "path": "pages/write_off/number_of_people/number_of_people",
+ "style": {
+ "navigationBarTitleText": "查询"
+ }
+ },
+ {
+ "path": "pages/write_off/menu/menu",
+ "style": {
+ "navigationBarTitleText": "核销订单"
+ }
+ },
+ {
"path": "pages/write_off/ym_card_gated/ym_card_gated",
"style": {
"navigationBarTitleText": "核销订单"
diff --git a/src/pages/employee/manage/manage.vue b/src/pages/employee/manage/manage.vue
index a215fc9..8d94b6b 100644
--- a/src/pages/employee/manage/manage.vue
+++ b/src/pages/employee/manage/manage.vue
@@ -59,8 +59,19 @@
权限：
- 全部权限
- {{permissionObj[e] || ''}}
+ 全部权限
+
+
+ {{permissionObj[e] || ''}}
+
+
+
@@ -114,11 +125,21 @@ export default {
}
},
onLoad(){
+
},
onShow(){
this.refreshEmployList();
},
methods: {
+ // 是否全部权限
+ isAllAuthor({
+ adminLs = [],
+ localLs = []
+ }){
+ if(!localLs || !adminLs || !adminLs.length || !localLs.length)return false;
+ let _unAuthorLs = localLs.filter(ele=>!adminLs.includes(+ele.key))
+ return !_unAuthorLs.length
+ },
// 移除员工
employeeDelete: util.debounce(function(){
let _employeeList = this.employeeInfo.employee || [];
diff --git a/src/pages/employee/review_list/review_list.vue b/src/pages/employee/review_list/review_list.vue
index 282d888..27553b5 100644
--- a/src/pages/employee/review_list/review_list.vue
+++ b/src/pages/employee/review_list/review_list.vue
@@ -4,13 +4,13 @@
审核 {{reviewInfo.total || 0}} 人
全选
-
+
-
+
{{e.actual_name || '-'}}
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 1015c4a..917757a 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -104,7 +104,7 @@
{
id: 4,
name: '核销查询',
- path: '/pages/write_off/search_result/search_result',
+ path: '/pages/write_off/menu/menu',
serverKey: 1008 // 后端对应权限编号
},
{
diff --git a/src/pages/site/manage/manage.vue b/src/pages/site/manage/manage.vue
index cd08bfc..a19af18 100644
--- a/src/pages/site/manage/manage.vue
+++ b/src/pages/site/manage/manage.vue
@@ -1,81 +1,100 @@
-
diff --git a/src/subpackage/device/pages/switch_manage/switch_manage.vue b/src/subpackage/device/pages/switch_manage/switch_manage.vue
index 4ee252e..3018526 100644
--- a/src/subpackage/device/pages/switch_manage/switch_manage.vue
+++ b/src/subpackage/device/pages/switch_manage/switch_manage.vue
@@ -199,6 +199,7 @@ export default {
if(switchInfo.hardware_type === 'AccessControl'&&status == 1){
+ //针对门禁没有关按钮发两条命令->开&关 20201224 后端： 直接发两条 关的那条这里填5 然后你那边不用管返回
this.operateReq({data: this.getOperateReqData({ switchInfo, status: 0 }), isTip: false, isLoad: false});
}
@@ -272,7 +273,7 @@ export default {
}
let _data = this.getSwitchStatusQuery(switchInfo);
- _data = DEVICE_FUN.AC_filterCloudACData(data,switchInfo);
+ _data = DEVICE_FUN.AC_filterCloudACData(_data,switchInfo);
this.getStatusReq({
data: _data,
@@ -292,10 +293,10 @@ export default {
util.hideLoad();
let _data = res.data || {};
console.log(this.changeLowerCase(_data.data))
- if(_data.code == 504 || this.changeLowerCase(_data.data).indexOf('timeout')!=-1){
+ if(_data.code == 504 || this.changeLowerCase(_data.data).indexOf('timeout')!=-1){ // 不在线
_deviceList[index]['defineStatusCode'] = 0;
- }else if(_data.code == 0&&this.changeLowerCase(_data.data).indexOf('timeout')==-1){
+ }else if(_data.code == 0&&this.changeLowerCase(_data.data).indexOf('timeout')==-1){ // 在线
_deviceList[index]['defineStatusCode'] = 1;
}else{
util.showNone(_data.message || '操作失败！');