diff --git a/public/components/admin/deleteMerchant/deleteMerchant.js b/public/components/admin/deleteMerchant/deleteMerchant.js index 98b571ecc..9fcc0290b 100644 --- a/public/components/admin/deleteMerchant/deleteMerchant.js +++ b/public/components/admin/deleteMerchant/deleteMerchant.js @@ -7,7 +7,7 @@ }, _initEvent: function () { vc.on('deleteMerchant', 'openDeleteMerchantModal', function (_params) { - vc.component.deleteMerchantInfo = _params; + $that.deleteMerchantInfo = _params; $('#deleteMerchantModel').modal('show'); }); }, @@ -15,7 +15,7 @@ deleteMerchant: function () { vc.http.apiPost( '/property.deleteProperty', - JSON.stringify(vc.component.deleteMerchantInfo), { + JSON.stringify($that.deleteMerchantInfo), { emulateJSON: true }, function (json, res) { @@ -41,4 +41,4 @@ } } }); -})(window.vc, window.vc.component); \ No newline at end of file +})(window.vc, window.$that); \ No newline at end of file diff --git a/public/components/frame/nav2/nav2.js b/public/components/frame/nav2/nav2.js index 11d49f3ec..d40e75c74 100644 --- a/public/components/frame/nav2/nav2.js +++ b/public/components/frame/nav2/nav2.js @@ -253,6 +253,11 @@ vm._navJumpToIot(); return; } + if (_catalog.url == 'MALL') { + //获取用户名 + vc.jumpToMall('/'); + return; + } if (_catalog.url != '#') { vm._settingActiveCatalog(_catalog); vc.jumpToPage(_catalog.url); diff --git a/public/pages/property/parkingBoxManage/parkingBoxManage.js b/public/pages/property/parkingBoxManage/parkingBoxManage.js index 178b8def1..19c9a3a63 100644 --- a/public/pages/property/parkingBoxManage/parkingBoxManage.js +++ b/public/pages/property/parkingBoxManage/parkingBoxManage.js @@ -91,7 +91,7 @@ vc.jumpToPage('/#/pages/property/parkingBoxAreaManage?boxId=' + _parkingBox.boxId + "&boxName=" + _parkingBox.boxName); }, _openParkingAreaControl: function (_parkingBox) { - vc.jumpToIot('/#/pages/property/parkingAreaControl?boxId=' + _parkingBox.boxId + "&paId=" + _parkingBox.paId); + vc.jumpToIot('/#/pages/car/parkingAreaControl?boxId=' + _parkingBox.boxId + "&paId=" + _parkingBox.paId); } } }); diff --git a/public/vcCore/vcFramework.js b/public/vcCore/vcFramework.js index b784725c4..a015ea734 100644 --- a/public/vcCore/vcFramework.js +++ b/public/vcCore/vcFramework.js @@ -1319,6 +1319,32 @@ //vcFramework.reBuilderVcTree(); }; + //跳转至商城 + vcFramework.jumpToMall = function (url) { + let param = { + params: { + targetUrl: encodeURIComponent(url), + communityId: vc.getCurrentCommunity().communityId + } + }; + //发送get请求 + vc.http.apiGet('/mall.getMallToken', + param, + function (json, res) { + let _json = JSON.parse(json); + if (_json.code != 0) { + vc.toast(_json.msg); + return; + } + let _url = _json.data.url; + window.open(_url); + }, + function () { + console.log('请求失败处理'); + } + ); + }; + //跳转至物联网 vcFramework.jumpToIot = function (url) { let param = { @@ -2102,7 +2128,7 @@ return _newDate.getFullYear() + '-' + add0(_newDate.getMonth() + 1) + '-' + add0(_newDate.getDate()); }; - vcFramework.addPersonMonth = function(_date,_month){ + vcFramework.addPersonMonth = function (_date, _month) { // 设置日期为下个月 _date.setMonth(_date.getMonth() + 1); // 如果日期是31号,并且下个月没有31号(例如2月),则日期会自动调整为下个月的最后一天 @@ -2111,10 +2137,10 @@ if (_date.getDate() > daysInNextMonth) { _date.setDate(daysInNextMonth); } - + // 减去一天 _date.setDate(_date.getDate() - 1); - + // 输出结果 console.log(_date); return _date.getFullYear() + '-' + add0(_date.getMonth() + 1) + '-' + add0(_date.getDate()); @@ -3246,7 +3272,7 @@ ret += (150.0 * Math.sin(lng / 12.0 * PI) + 300.0 * Math.sin(lng / 30.0 * PI)) * 2.0 / 3.0; return ret } - vcFramework.wgs84togcj02=function(lng, lat) { + vcFramework.wgs84togcj02 = function (lng, lat) { var lat = +lat; var lng = +lng; if (out_of_china(lng, lat)) {