From 24cc3ab4bbb38a54e23a5b224b9c60f9b741f66b Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Mon, 12 Jun 2023 17:02:33 +0800 Subject: [PATCH 01/14] v1.1.36 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 555181e..daecf1c 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 ORIGIN = `http://192.168.1.135:9090`; // 20210927 测试 diff --git a/src/manifest.json b/src/manifest.json index 01fc516..f4c24c3 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -55,7 +55,7 @@ /* 快应用特有相关 */ "mp-weixin" : { /* 微信小程序特有相关 */ - "appid" : "wx7106e84614cf0060", + "appid" : "wxf1294b279ad1b845", "setting" : { "urlCheck" : false, "minified" : true From e7814ec9881741de1b5ba300bb6ce0efbe74539e Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Thu, 15 Jun 2023 16:31:06 +0800 Subject: [PATCH 02/14] v1.1.37 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 555181e..daecf1c 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 ORIGIN = `http://192.168.1.135:9090`; // 20210927 测试 diff --git a/src/manifest.json b/src/manifest.json index 01fc516..f4c24c3 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -55,7 +55,7 @@ /* 快应用特有相关 */ "mp-weixin" : { /* 微信小程序特有相关 */ - "appid" : "wx7106e84614cf0060", + "appid" : "wxf1294b279ad1b845", "setting" : { "urlCheck" : false, "minified" : true From 5ac6f6f46e600dad208b6e8f00070bf7c29823fe Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Mon, 10 Jul 2023 11:39:12 +0800 Subject: [PATCH 03/14] v1.1.38 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 555181e..daecf1c 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 ORIGIN = `http://192.168.1.135:9090`; // 20210927 测试 diff --git a/src/manifest.json b/src/manifest.json index 01fc516..f4c24c3 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -55,7 +55,7 @@ /* 快应用特有相关 */ "mp-weixin" : { /* 微信小程序特有相关 */ - "appid" : "wx7106e84614cf0060", + "appid" : "wxf1294b279ad1b845", "setting" : { "urlCheck" : false, "minified" : true From a76e538c66631eb812b30d4785795bdd23793353 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=AE=B6=E5=8D=8E?= <3599164049@qq.com> Date: Fri, 28 Jul 2023 14:19:56 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E5=9C=BA=E5=9C=B0=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=8D=A0=E7=94=A8=E5=BC=82=E5=B8=B8=E5=BC=B9?= =?UTF-8?q?=E6=A1=86=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/site/order_modal/order_modal.vue | 73 ++++++++++++++++++++++++- src/js/api.js | 7 ++- src/manifest.json | 2 +- 3 files changed, 76 insertions(+), 6 deletions(-) diff --git a/src/components/site/order_modal/order_modal.vue b/src/components/site/order_modal/order_modal.vue index af290dd..c1a178e 100644 --- a/src/components/site/order_modal/order_modal.vue +++ b/src/components/site/order_modal/order_modal.vue @@ -135,6 +135,16 @@ 已收款 + + + + + + 场地已释放,退款交易正在处理中,退款结果请在后台管理交易订单对应订单详情查看~ + + 知道了 + + @@ -173,13 +183,19 @@ export default { }, data(){ return { - orderInfo: {} + orderInfo: {}, + isShowFail: false } }, mounted(){ this.getOrderInfo(); }, methods: { + okChange() { + this.isShowFail = false; + this.$emit('refresh'); + }, + moveHandle(){}, toCollections(){ this.$emit('btn:toCollections', this.orderInfo); }, @@ -332,7 +348,27 @@ export default { }) .then(res=>{ if(res.data.code == 0){ - setTimeout(_=>this.$emit('refresh'), 1200); + if (orderInfo.stadium_order && orderInfo.stadium_order.pay_type_text === '付款码支付') { + servers.get({ + url: API.venue.refundOrderCheck, + data: { + transNo: orderInfo.order_no + // transNo: 'ZY20230720170701856196' + }, + isDefaultGet: false, + }) + .then(res => { + if (!(res.data.code == 0 && res.data.data.success)) { + this.isShowFail = true; + } else { + this.$emit('refresh'); + } + }).catch(() => { + this.$emit('refresh'); + }) + } else { + setTimeout(_=>this.$emit('refresh'), 1200); + } util.showNone(res.data.message || '操作成功!'); }else{ util.showNone(res.data.message || '操作失败!'); @@ -506,4 +542,37 @@ export default { } } } + .odm-select-modal{ + position: absolute; + left: 65rpx; + top: 16%; + background-color: #fff; + width: 620rpx; + padding: 80rpx 0rpx 80rpx; + border-radius: 10rpx; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + .osm-btn{ + width: 240rpx; + height: 88rpx; + margin-top: 44rpx; + border-radius: 10rpx; + background-color: #009874; + color: #FFFFFF; + font-size: 32rpx; + line-height: 88rpx; + text-align: center; + } + .osm-line{ + width: 504rpx; + margin-bottom: 26rpx; + >view{ + color: #333333; + font-size: 28rpx; + line-height: 48rpx; + } + } + } \ No newline at end of file diff --git a/src/js/api.js b/src/js/api.js index daecf1c..fdb12eb 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 ORIGIN = `http://192.168.1.135:9090`; // 20210927 测试 @@ -108,7 +108,8 @@ API['venue'] = { // 20220921 releaseVenue: `${ORIGIN}/admin/stadium/order/releaseVenue`, // 【1000995】释放场地 - + // 20230728 + refundOrderCheck: `${ORIGIN}/pay/huishouqian/refundOrderCheck`, // 惠收钱退款-查询订单 } // 2.1 核销 diff --git a/src/manifest.json b/src/manifest.json index f4c24c3..01fc516 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -55,7 +55,7 @@ /* 快应用特有相关 */ "mp-weixin" : { /* 微信小程序特有相关 */ - "appid" : "wxf1294b279ad1b845", + "appid" : "wx7106e84614cf0060", "setting" : { "urlCheck" : false, "minified" : true From 11384c914ace4cc7742ded189d7e4596b9f08f2b Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Fri, 28 Jul 2023 17:53:18 +0800 Subject: [PATCH 05/14] change style id1350 --- src/pages/index/index.vue | 29 +- src/store/actions.js | 1 + src/store/device.js | 10 +- .../device/components/store_name/store_name.vue | 2 +- .../device/pages/air_conditioner/detail/detail.vue | 14 +- .../device/pages/audio_manage/audio_manage.vue | 531 +++++++++++---------- .../device/pages/device_manage/device_manage.vue | 28 +- src/subpackage/device/pages/index/index.vue | 246 ++++++---- .../device/pages/switch_manage/switch_manage.vue | 103 ++-- .../static/images/air_conditioner/nw_close.png | Bin 0 -> 2553 bytes .../static/images/air_conditioner/nw_open.png | Bin 0 -> 2347 bytes src/subpackage/device/static/images/arrow_1a.png | Bin 0 -> 225 bytes src/subpackage/device/static/images/close.png | Bin 816 -> 2553 bytes src/subpackage/device/static/images/electrify.png | Bin 0 -> 2612 bytes src/subpackage/device/static/images/i_txt.png | Bin 11208 -> 2572 bytes src/subpackage/device/static/images/i_voice_1.png | Bin 2479 -> 2551 bytes src/subpackage/device/static/images/in.png | Bin 950 -> 2252 bytes src/subpackage/device/static/images/longOpen.png | Bin 6449 -> 2864 bytes src/subpackage/device/static/images/open.png | Bin 924 -> 2347 bytes src/subpackage/device/static/images/out.png | Bin 1033 -> 2489 bytes src/subpackage/device/static/images/outage.png | Bin 0 -> 2563 bytes src/subpackage/device/static/images/page_bg.jpg | Bin 0 -> 10607 bytes src/subpackage/device/static/images/timing.png | Bin 1345 -> 2788 bytes 23 files changed, 536 insertions(+), 428 deletions(-) create mode 100644 src/subpackage/device/static/images/air_conditioner/nw_close.png create mode 100644 src/subpackage/device/static/images/air_conditioner/nw_open.png create mode 100644 src/subpackage/device/static/images/arrow_1a.png create mode 100644 src/subpackage/device/static/images/electrify.png create mode 100644 src/subpackage/device/static/images/outage.png create mode 100644 src/subpackage/device/static/images/page_bg.jpg diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index bc4a991..64f6c73 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -7,18 +7,20 @@ 点击登陆 - 今日总收入 - {{loginStatus?'¥':''}}{{loginStatus?(indexData.amount || '0'):'***'}} - - - 收款笔数 - {{loginStatus?(indexData.in_count || '0'):'**'}} - - - 退款笔数 - {{loginStatus?(indexData.out_count || '0'):'**'}} + + 今日总收入 + {{loginStatus?'¥':''}}{{loginStatus?(indexData.amount || '0'):'***'}} + + + 收款笔数 + {{loginStatus?(indexData.in_count || '0'):'**'}} + + + 退款笔数 + {{loginStatus?(indexData.out_count || '0'):'**'}} + - + @@ -375,11 +377,12 @@ } .ic-header{ position: relative; - height: 476upx; + height: auto; margin-bottom: 24upx; - padding: 38upx 24upx 0; + padding: 38upx 24upx 30upx; border-radius: 14upx; background-color: $themeColor; + overflow: hidden; .ih-address{ margin-bottom: 26upx; @include centerFlex(center); diff --git a/src/store/actions.js b/src/store/actions.js index 73e1a6d..e195e2a 100644 --- a/src/store/actions.js +++ b/src/store/actions.js @@ -3,6 +3,7 @@ import { servers } from '../js/server'; import { API } from '../js/api'; export default { getBrandInfo({commit, state}){ + if(state?.brandInfo?.brand?.id)return Promise.resolve(state.brandInfo); return servers.get({ url: API.calc, data: {}, diff --git a/src/store/device.js b/src/store/device.js index 298c35a..9b8c841 100644 --- a/src/store/device.js +++ b/src/store/device.js @@ -17,7 +17,7 @@ export default { } }, actions: { // 小程序模块化访问失败 this.$store.dispatch('device/getStoreList') - getStoreList({ commit, state , rootState}){ + getStoreList({ commit, state , rootState}, { stadium_id = '' } = {}){ return deviceServer.get({ url: deviceApi.stadiumList, data: { brand_id: rootState.brandInfo.brand.id }, @@ -26,7 +26,13 @@ export default { .then(res=>{ let _list = res.list || []; commit('setStoreList', _list); - if(JSON.stringify(state.curStoreInfo) == '{}'&&_list.length)commit('setStoreInfo', _list[0]); + if(Object.keys(state.curStoreInfo)?.length ===0&&_list?.length){ + if(stadium_id&&_list.some(item=>item.id===stadium_id)){ + commit('setStoreInfo', _list.find(item=>item.id===stadium_id)); + }else{ + commit('setStoreInfo', _list[0]); + } + } return res; }) } diff --git a/src/subpackage/device/components/store_name/store_name.vue b/src/subpackage/device/components/store_name/store_name.vue index 4dfc364..764c308 100644 --- a/src/subpackage/device/components/store_name/store_name.vue +++ b/src/subpackage/device/components/store_name/store_name.vue @@ -17,7 +17,7 @@ export default { curStoreInfo: state => state.device.curStoreInfo, }), getThemeIcon(){ - return ()=> {return (this.theme=='light')?'../../static/images/arrow_b2_light.png':'../../static/images/arrow_b2.png';} + return ()=> {return (this.theme=='light')?'../../static/images/arrow_b2_light.png':'../../static/images/arrow_1a.png';} }, getThemeColor(){ return ()=> {return (this.theme=='light')?'#FFFFFF':'#1a1a1a';} diff --git a/src/subpackage/device/pages/air_conditioner/detail/detail.vue b/src/subpackage/device/pages/air_conditioner/detail/detail.vue index 1bbe9f6..bfea9a7 100644 --- a/src/subpackage/device/pages/air_conditioner/detail/detail.vue +++ b/src/subpackage/device/pages/air_conditioner/detail/detail.vue @@ -26,11 +26,11 @@ - + - + @@ -315,6 +315,11 @@ export default { + diff --git a/src/subpackage/device/pages/device_manage/device_manage.vue b/src/subpackage/device/pages/device_manage/device_manage.vue index 4362f90..26553ba 100644 --- a/src/subpackage/device/pages/device_manage/device_manage.vue +++ b/src/subpackage/device/pages/device_manage/device_manage.vue @@ -109,7 +109,10 @@ export default { curStoreInfo(newVal, oldVal){ let { pageInfo } = this; this.deviceList = []; - this.getDeviceList(pageInfo) + this.getDeviceList({ + stadium_id: newVal.id, + hardware_type: pageInfo.deviceType, + }) } }, components: { @@ -126,7 +129,10 @@ export default { let _pageInfo = dmObj[`d${options.sid}`] || {}; this.pageInfo = _pageInfo; uni.setNavigationBarTitle({ title: _pageInfo.name }); - this.getDeviceList(_pageInfo) + this.getDeviceList({ + stadium_id: options.stadium_id, + hardware_type: _pageInfo.deviceType, + }) }, methods: { refreshBtn: util.debounce(function({deviceInfo, index}){ @@ -228,14 +234,13 @@ export default { } }) }, - getDeviceList(pageInfo){ - let { curStoreInfo } = this; + getDeviceList({ stadium_id, hardware_type }){ util.showLoad(); deviceServer.get({ url: deviceApi.hardwareList, data: { - 'filter[stadium_id]': curStoreInfo.id, - 'filter[hardware_type]': pageInfo.deviceType, + 'filter[stadium_id]': stadium_id, + 'filter[hardware_type]': hardware_type, }, failMsg: '加载设备失败!' }) @@ -284,6 +289,11 @@ export default {