diff --git a/api/init/initApi.js b/api/init/initApi.js index fd3df3e..9026a76 100644 --- a/api/init/initApi.js +++ b/api/init/initApi.js @@ -4,6 +4,11 @@ * QQ 92825595 * */ +import mapping from '../../constant/MappingConstant.js'; + +import app from '../../constant/AppConstant.js' + +import {_doLoginOwnerByKey} from '../../auth/AppLogin.js' /** * 页面加载方法 @@ -14,15 +19,15 @@ export function onLoad(_option){ let _key = _option.key; if (_key != null && _key != undefined && _key != '') { //根据key 去做登录 - factory.login._doLoginOwnerByKey(_key); + _doLoginOwnerByKey(_key); } let wAppId = _option.wAppId; if (wAppId != null && wAppId != undefined && wAppId != '') { - uni.setStorageSync(constant.mapping.W_APP_ID, _option.wAppId); + uni.setStorageSync(mapping.W_APP_ID, _option.wAppId); }else{ - wAppId = uni.getStorageInfoSync(constant.mapping.W_APP_ID) + wAppId = uni.getStorageInfoSync(mapping.W_APP_ID) if(wAppId != null && wAppId != undefined && wAppId != ''){ - uni.setStorageSync(constant.mapping.W_APP_ID, constant.app.wAppId); + uni.setStorageSync(mapping.W_APP_ID, app.wAppId); } } // #endif diff --git a/constant/url.js b/constant/url.js index e494a93..c1ed779 100644 --- a/constant/url.js +++ b/constant/url.js @@ -89,7 +89,7 @@ export default { listOweFees: baseUrl + 'app/feeApi/listOweFees', //查询房屋欠费 toOweFeePay: baseUrl + "app/payment/toOweFeePay", //欠费缴费 queryRentingPool: baseUrl + 'app/renting/queryRentingPool', - saveRentingAppointment: baseUrl + '/app/rentingAppointment/saveRentingAppointment', //房屋预约 + saveRentingAppointment: baseUrl + 'app/rentingAppointment/saveRentingAppointment', //房屋预约 NEED_NOT_LOGIN_PAGE: [ '/pages/login/login', '/pages/register/register', diff --git a/pages/rentHouse/rentHouse.vue b/pages/rentHouse/rentHouse.vue index 431fd26..6c60a13 100644 --- a/pages/rentHouse/rentHouse.vue +++ b/pages/rentHouse/rentHouse.vue @@ -127,7 +127,12 @@ let _url = default_img; let _item = data[i]; if (_item.hasOwnProperty('photos') && _item.photos.length > 0) { + //#ifndef H5 _url = url.baseUrl + _item.photos[0]; + //#endif + // #ifdef H5 + _url = _item.photos[0]; + //#endif } _item.src = _url; } diff --git a/pages/rentingDetail/rentingDetail.vue b/pages/rentingDetail/rentingDetail.vue index 3d38ceb..61025ea 100644 --- a/pages/rentingDetail/rentingDetail.vue +++ b/pages/rentingDetail/rentingDetail.vue @@ -139,7 +139,13 @@ _that.renting = rentingPool[0]; let _url = default_img; if (_that.renting.hasOwnProperty('photos') && _that.renting.photos.length > 0) { + //_url = url.baseUrl + _that.renting.photos[0]; + //#ifndef H5 _url = url.baseUrl + _that.renting.photos[0]; + //#endif + // #ifdef H5 + _url = _that.renting.photos[0]; + //#endif } _that.rentingPhotos.push(_url); _that._loadAdmin(); diff --git a/static/images/rent-selected.png b/static/images/rent-selected.png index 39008ff..97a488b 100644 Binary files a/static/images/rent-selected.png and b/static/images/rent-selected.png differ diff --git a/static/images/rent.png b/static/images/rent.png index e17a3a2..455b612 100644 Binary files a/static/images/rent.png and b/static/images/rent.png differ