diff --git a/api/applicationKey/applicationKeyApi.js b/api/applicationKey/applicationKeyApi.js index 9ca3a79..13d9282 100644 --- a/api/applicationKey/applicationKeyApi.js +++ b/api/applicationKey/applicationKeyApi.js @@ -135,3 +135,24 @@ export function getQrCode(_obj){ }); }) } + +export function getOwnerAcVideoUrl(_obj){ + return new Promise((resolve, reject) => { + request({ + url: url.queryOwnerAcVideoUrl, + method: "GET", + data: _obj, //动态数据 + success: function(res) { + let _json = res.data; + if (_json.code == 0) { + resolve(_json); + return; + } + reject(_json.msg); + }, + fail: function(e) { + reject(e); + } + }); + }) +} diff --git a/conf/config.js b/conf/config.js index 3043454..6a08e2f 100644 --- a/conf/config.js +++ b/conf/config.js @@ -18,7 +18,7 @@ const baseUrl = '/'; const baseUrl = 'http://127.0.0.1:8008/'; // #endif -let commonBaseUrl = 'http://demo.homecommunity.cn/'; +let commonBaseUrl = 'http://127.0.0.1:3000/'; //商城的url let mallUrl = 'http://mallapp.homecommunity.cn/'; @@ -43,7 +43,7 @@ let systemName="业主版"; if(_systemConfig){ mallUrl = _systemConfig.mallUrl; - commonBaseUrl = _systemConfig.imgUrl; + //commonBaseUrl = _systemConfig.imgUrl; systemName = _systemConfig.ownerTitle; DEFAULT_COMMUNITY_ID = _systemConfig.defaultCommunityId; } diff --git a/constant/url.js b/constant/url.js index 7f530c5..d0c321b 100644 --- a/constant/url.js +++ b/constant/url.js @@ -247,7 +247,7 @@ export default { appSaveMemberCar: baseUrl+"app/owner.appSaveMemberCar", appDeleteMemberCar: baseUrl+"app/owner.appDeleteMemberCar", queryAppUserIntegral: baseUrl+"app/integral.queryAppUserIntegral", - + queryOwnerAcVideoUrl:baseUrl+"app/owner.queryOwnerAcVideoUrl", diff --git a/pages.json b/pages.json index 34af151..2b6a99b 100644 --- a/pages.json +++ b/pages.json @@ -1050,6 +1050,13 @@ { "navigationBarTitleText" : "车辆详情" } + }, + { + "path" : "pages/machine/openDoorVideo", + "style" : + { + "navigationBarTitleText" : "" + } } ], "tabBar": { diff --git a/pages/machine/openDoor.vue b/pages/machine/openDoor.vue index 7cf5270..ac47d0c 100644 --- a/pages/machine/openDoor.vue +++ b/pages/machine/openDoor.vue @@ -10,19 +10,20 @@ - - + + - 温馨提示 + {{curMachine.machineName}} - 您确认{{curMachine.machineName}}开门? 开门次数有限,请勿频繁操作! + 您确认开门? 开门次数有限,请勿频繁操作! 取消 + 视频 确认开门 @@ -34,8 +35,9 @@ import noDataPage from '@/components/no-data-page/no-data-page.vue'; import { listOwnerMachines, - openDoor - } from '../../api/applicationKey/applicationKeyApi.js' + openDoor, + getOwnerAcVideoUrl + } from '@/api/applicationKey/applicationKeyApi.js' import { getCurOwner } from '../../api/owner/ownerApi.js'; @@ -51,6 +53,7 @@ openDoorFlag: false, curMachine: {}, memberId: '', + videoUrl:'', topImg: this.imgUrl + '/h5/images/openDoorTop.png' }; }, @@ -92,6 +95,7 @@ }) }, showOpenDoor: function(_machine) { + //调用视频播放地址 this.openDoorFlag = true; this.curMachine = _machine; }, @@ -99,6 +103,17 @@ this.openDoorFlag = false; this.curMachine = {}; }, + _viewDoorVideo:function(){ + + uni.navigateTo({ + url:'/pages/machine/openDoorVideo?machineId=' + +this.curMachine.machineId + +"&machineName="+this.curMachine.machineName + +"&memberId="+this.memberId + +"&machineCode="+this.curMachine.machineCode + }); + this._cancleOpenDoor(); + }, _doOpenDoor: function() { let _that = this; wx.showLoading({ diff --git a/pages/machine/openDoorVideo.vue b/pages/machine/openDoorVideo.vue new file mode 100644 index 0000000..cd50582 --- /dev/null +++ b/pages/machine/openDoorVideo.vue @@ -0,0 +1,126 @@ + + + + + \ No newline at end of file