From 715ffa70eb71ca36ccb414af14156bde867ffc59 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Fri, 9 Jul 2021 13:29:46 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=A7=9F=E5=94=AE&=E5=82=A8=E7=89=A9?= =?UTF-8?q?=E6=89=93=E5=BC=80=E6=9F=9C=E5=AD=90=20api=20=E5=8C=BA=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/subpackage/device/js/device_api.js | 3 ++- src/subpackage/device/pages/locker_manage/locker_manage.vue | 11 ++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/subpackage/device/js/device_api.js b/src/subpackage/device/js/device_api.js index 11cf6c6..0ba97ab 100644 --- a/src/subpackage/device/js/device_api.js +++ b/src/subpackage/device/js/device_api.js @@ -14,7 +14,8 @@ export const DEVICE_API = { leaseList:`${ORIGIN}/admin/stadium/lease/cabinet/list`, // 租售柜列表 lockerList:`${ORIGIN}/admin/stadium/locker/cabinet/list`, // 储物柜列表 - leaseTest:`${ORIGIN}/admin/stadium/locker/cabinet/test`, // 储物柜打开 + leaseTest:`${ORIGIN}/admin/stadium/lease/cabinet/test`, // 租售柜打开 + lockerTest:`${ORIGIN}/admin/stadium/locker/cabinet/test`, // 储物柜打开 leaseReset:`${ORIGIN}/admin/stadium/locker/cabinet/reset`, // 储物柜补货 diff --git a/src/subpackage/device/pages/locker_manage/locker_manage.vue b/src/subpackage/device/pages/locker_manage/locker_manage.vue index c409031..8a5bbf3 100644 --- a/src/subpackage/device/pages/locker_manage/locker_manage.vue +++ b/src/subpackage/device/pages/locker_manage/locker_manage.vue @@ -212,11 +212,20 @@ export default { }) .catch(util.hideLoad) }, + // 打开柜子分接口 + // e.page_id == 8 ||　 // 租售柜 + // e.page_id == 9 ||　 // 储物柜 + getOpenApi(){ + let { optionsQuery } = this; + if(optionsQuery.page_id == 8)return deviceApi.leaseTest; + if(optionsQuery.page_id == 9)return deviceApi.lockerTest; + }, openLockerReq(cabinet_ids){ let { curStoreInfo } = this; util.showLoad(); + return deviceServer.get({ - url: deviceApi.leaseTest, + url: this.getOpenApi(), data: { brand_id: curStoreInfo.brand_id, cabinet_ids: cabinet_ids, From 32558b0e7064f4620e9db87581531ec01c9927c6 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Fri, 9 Jul 2021 14:08:55 +0800 Subject: [PATCH 2/3] vtest 1.1.2 --- src/subpackage/device/js/device_api.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/subpackage/device/js/device_api.js b/src/subpackage/device/js/device_api.js index 0ba97ab..9fc611f 100644 --- a/src/subpackage/device/js/device_api.js +++ b/src/subpackage/device/js/device_api.js @@ -16,7 +16,7 @@ export const DEVICE_API = { lockerList:`${ORIGIN}/admin/stadium/locker/cabinet/list`, // 储物柜列表 leaseTest:`${ORIGIN}/admin/stadium/lease/cabinet/test`, // 租售柜打开 lockerTest:`${ORIGIN}/admin/stadium/locker/cabinet/test`, // 储物柜打开 - leaseReset:`${ORIGIN}/admin/stadium/locker/cabinet/reset`, // 储物柜补货 + leaseReset:`${ORIGIN}/admin/stadium/lease/cabinet/reset`, // 储物柜补货 From 6b67662797ae88ce20019c525b9a2e04d1d61b43 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Fri, 9 Jul 2021 14:10:27 +0800 Subject: [PATCH 3/3] v1.1.2 formal --- src/js/api.js | 4 ++-- src/manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/js/api.js b/src/js/api.js index 90f0a4b..af3f6eb 100644 --- a/src/js/api.js +++ b/src/js/api.js @@ -1,5 +1,5 @@ -export const ORIGIN = `https://testmanager.ouxuanzhineng.cn`; // 测试 -// export const ORIGIN = `https://minimanage.ouxuanzhineng.cn`; // 正式 +// export const ORIGIN = `https://testmanager.ouxuanzhineng.cn`; // 测试 +export const ORIGIN = `https://minimanage.ouxuanzhineng.cn`; // 正式 export const API = { wechatMiniAppLoginAndSync: `${ORIGIN}/assistant/WechatMiniAppGetToken`, // 小程序授权获取token，为空就登录 diff --git a/src/manifest.json b/src/manifest.json index 32b6894..25d192e 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -54,7 +54,7 @@ }, "mp-weixin": { /* 微信小程序特有相关 */ - "appid": "wx7106e84614cf0060", + "appid": "wxf1294b279ad1b845", "setting": { "urlCheck": false },