diff --git a/common/http.api.js b/common/http.api.js index 2fd3c6e..996822e 100644 --- a/common/http.api.js +++ b/common/http.api.js @@ -1,19 +1,31 @@ // 如果没有通过拦截器配置域名的话,可以在这里写上完整的URL(加上域名部分) -let LoginUrl = 'app-api/auth/checkerLogin'; +let LoginUrl = 'open-api/pingXiang/login'; +let SendVerifyCodeUrl = 'open-api/pingXiang/sendLoginVerifyCode'; let VenueListUrl = 'mp-api/hhrs/venue/list'; let VenueDetailUrl = 'mp-api/hhrs/venue/detail'; let MerchantListUrl = 'mp-api/hhrs/merchant/list'; let MerchantDetailUrl = 'mp-api/hhrs/merchant/detail'; -let WinnerListUrl = 'mp-api/hhrs/winner/list'; let RightsInfoUrl = 'mp-api/hhrs/rights/info'; -let RightsDetailUrl = 'mp-api/hhrs/rights/detail'; +let RightsDetailUrl = 'mp-api/hhrsRights/detail'; let RightsAuthUrl = 'mp-api/hhrs/rights/auth'; +let EligibilityUrl = 'mp-api/hhrsRights/eligibility'; let RightsBookUrl = 'mp-api/hhrs/rights/book'; +let InitFaceVerifyUrl = 'open-api/aliyun/face/initFaceVerify'; +let DescribeFaceVerifyUrl = 'open-api/aliyun/face/describeFaceVerify'; +let RightsListUrl = 'mp-api/hhrsRights/list'; +let AppointmentListUrl = 'mp-api/hhrsRights/appointment/list'; +let CheckListUrl = 'mp-api/hhrsRights/check/list'; +let StoreListUrl = 'mp-api/hhrsStore/list'; +let StoreDetailUrl = 'mp-api/hhrsStore/detail'; +let WinnerDatesUrl = 'mp-api/hhrsWinner/dates'; +let WinnerListUrl = 'mp-api/hhrsWinner/list'; +let AppointUrl = 'zhy-api/cardBag/appoint'; // 此处第二个参数vm,就是我们在页面使用的this const install = (Vue, vm) => { let checkerLogin = (params = {}) => vm.$u.post(LoginUrl, params); + let sendLoginVerifyCode = (params = {}) => vm.$u.post(SendVerifyCodeUrl, params); // 文旅场馆 let getVenueList = (params = {}) => vm.$u.get(VenueListUrl, params); @@ -24,16 +36,27 @@ const install = (Vue, vm) => { let getMerchantDetail = (params = {}) => vm.$u.post(MerchantDetailUrl, params); // 中奖名单 - let getWinnerList = (params = {}) => vm.$u.get(WinnerListUrl, params); + let getWinnerDates = (params = {}) => vm.$u.get(WinnerDatesUrl, params); + let getWinnerList = (params = {}) => vm.$u.post(WinnerListUrl, params); + let doAppoint = (params = {}) => vm.$u.post(AppointUrl, params); // 权益包 let getRightsInfo = (params = {}) => vm.$u.get(RightsInfoUrl, params); let getRightsDetail = (params = {}) => vm.$u.post(RightsDetailUrl, params); let doRightsAuth = (params = {}) => vm.$u.post(RightsAuthUrl, params); let doRightsBook = (params = {}) => vm.$u.post(RightsBookUrl, params); + let getEligibility = (params = {}) => vm.$u.post(EligibilityUrl, params); + let initFaceVerify = (params = {}) => vm.$u.post(InitFaceVerifyUrl, params); + let describeFaceVerify = (params = {}) => vm.$u.post(DescribeFaceVerifyUrl, params); + let getRightsList = (params = {}) => vm.$u.post(RightsListUrl, params); + let getAppointmentList = (params = {}) => vm.$u.post(AppointmentListUrl, params); + let getCheckList = (params = {}) => vm.$u.post(CheckListUrl, params); + let getStoreList = (params = {}) => vm.$u.post(StoreListUrl, params); + let getStoreDetail = (params = {}) => vm.$u.post(StoreDetailUrl, params); vm.$u.api = { checkerLogin, + sendLoginVerifyCode, getVenueList, getVenueDetail, getMerchantList, @@ -43,6 +66,17 @@ const install = (Vue, vm) => { getRightsDetail, doRightsAuth, doRightsBook, + getEligibility, + initFaceVerify, + describeFaceVerify, + getRightsList, + getAppointmentList, + getCheckList, + getStoreList, + getStoreDetail, + getWinnerDates, + getWinnerList, + doAppoint, }; } diff --git a/common/http.interceptor.js b/common/http.interceptor.js index 0f824c3..11bac9e 100644 --- a/common/http.interceptor.js +++ b/common/http.interceptor.js @@ -2,7 +2,7 @@ // 同时,我们也可以在此使用getApp().globalData,如果你把token放在getApp().globalData的话,也是可以使用的 const install = (Vue, vm) => { Vue.prototype.$u.http.setConfig({ - baseUrl: 'https://dscp-uat.hn12301.net', + baseUrl: 'https://dscp-dev.hn12301.net', // loadingText: '努力加载中~', // loadingTime: 18800, // 如果将此值设置为true,拦截回调中将会返回服务端返回的所有数据response,而不是response.data diff --git a/common/location.js b/common/location.js new file mode 100644 index 0000000..b039d93 --- /dev/null +++ b/common/location.js @@ -0,0 +1,30 @@ +export default { + getLocation() { + return new Promise((resolve, reject) => { + if (navigator.geolocation) { + navigator.geolocation.getCurrentPosition( + (pos) => { + const lng = pos.coords.longitude + const lat = pos.coords.latitude + uni.setStorageSync('lng', lng) + uni.setStorageSync('lat', lat) + resolve({ lng, lat }) + }, + (err) => { + console.log('定位失败:', err.message) + reject(err) + }, + { timeout: 10000, enableHighAccuracy: false } + ) + } else { + reject(new Error('浏览器不支持定位')) + } + }) + }, + getCachedLocation() { + return { + lng: uni.getStorageSync('lng') || '', + lat: uni.getStorageSync('lat') || '' + } + } +} diff --git a/index.html b/index.html index b5d330d..750e6f5 100644 --- a/index.html +++ b/index.html @@ -15,6 +15,6 @@
- +