|
@@ -1008,14 +1008,24 @@
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 关店(businessStatus=99)更多推荐:POST …/ai/multimodal-services/api/v1/search/global/store-recommend
|
|
* 关店(businessStatus=99)更多推荐:POST …/ai/multimodal-services/api/v1/search/global/store-recommend
|
|
|
- * 与 shareCheckInUndefined.html 一致;请求体 page、pageSize、storeId、userCity、userLat、userLng 可由 URL 覆盖。
|
|
|
|
|
|
|
+ * 与 shareCheckInUndefined.html 一致;请求体 userCity/userLat/userLng 优先取 URL:userCity、lat、lon(兼认 userLat/userLng、weidu/jingdu 等)。
|
|
|
*/
|
|
*/
|
|
|
var API_LIFE_AI_BASE = 'http://183.252.196.135:9100';
|
|
var API_LIFE_AI_BASE = 'http://183.252.196.135:9100';
|
|
|
var STORE_GLOBAL_RECOMMEND_PATH =
|
|
var STORE_GLOBAL_RECOMMEND_PATH =
|
|
|
'/ai/multimodal-services/api/v1/search/global/store-recommend';
|
|
'/ai/multimodal-services/api/v1/search/global/store-recommend';
|
|
|
- var DEFAULT_REC_USER_LAT = 38.925747;
|
|
|
|
|
- var DEFAULT_REC_USER_LNG = 121.662531;
|
|
|
|
|
- var DEFAULT_REC_USER_CITY = '大连市';
|
|
|
|
|
|
|
+ /** 关店推荐用户位置:优先 URL 的 lat、lon、userCity;缺省再用大连默认值 */
|
|
|
|
|
+ function getClosedRecommendUserLocation() {
|
|
|
|
|
+ var latRaw = (q('lat') || q('userLat') || q('latitude') || q('weidu') || '').trim();
|
|
|
|
|
+ var lonRaw = (q('lon') || q('userLng') || q('longitude') || q('lng') || q('jingdu') || '').trim();
|
|
|
|
|
+ var cityRaw = (q('userCity') || q('city') || '').trim();
|
|
|
|
|
+ return {
|
|
|
|
|
+ userLat:
|
|
|
|
|
+ latRaw !== '' && !isNaN(Number(latRaw)) ? Number(latRaw) : 38.925747,
|
|
|
|
|
+ userLng:
|
|
|
|
|
+ lonRaw !== '' && !isNaN(Number(lonRaw)) ? Number(lonRaw) : 121.662531,
|
|
|
|
|
+ userCity: cityRaw !== '' ? cityRaw : '大连市'
|
|
|
|
|
+ };
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 与 group_user 一致:
|
|
* 与 group_user 一致:
|
|
@@ -1928,28 +1938,20 @@
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
function fetchShareClosedStoreRecommend(storeIdStr) {
|
|
function fetchShareClosedStoreRecommend(storeIdStr) {
|
|
|
- var latRaw = (q('userLat') || q('latitude') || q('lat') || q('weidu')).trim();
|
|
|
|
|
- var lngRaw = (q('userLng') || q('longitude') || q('lon') || q('jingdu')).trim();
|
|
|
|
|
- var userLat =
|
|
|
|
|
- latRaw !== '' && !isNaN(Number(latRaw)) ? Number(latRaw) : DEFAULT_REC_USER_LAT;
|
|
|
|
|
- var userLng =
|
|
|
|
|
- lngRaw !== '' && !isNaN(Number(lngRaw)) ? Number(lngRaw) : DEFAULT_REC_USER_LNG;
|
|
|
|
|
|
|
+ var loc = getClosedRecommendUserLocation();
|
|
|
|
|
|
|
|
var page = parseInt(q('page') || '1', 10);
|
|
var page = parseInt(q('page') || '1', 10);
|
|
|
var pageSize = parseInt(q('pageSize') || '10', 10);
|
|
var pageSize = parseInt(q('pageSize') || '10', 10);
|
|
|
if (isNaN(page) || page < 1) page = 1;
|
|
if (isNaN(page) || page < 1) page = 1;
|
|
|
if (isNaN(pageSize) || pageSize < 1) pageSize = 10;
|
|
if (isNaN(pageSize) || pageSize < 1) pageSize = 10;
|
|
|
|
|
|
|
|
- var userCityRaw = (q('userCity') || q('city') || '').trim();
|
|
|
|
|
- var userCity = userCityRaw !== '' ? userCityRaw : DEFAULT_REC_USER_CITY;
|
|
|
|
|
-
|
|
|
|
|
var body = {
|
|
var body = {
|
|
|
page: page,
|
|
page: page,
|
|
|
pageSize: pageSize,
|
|
pageSize: pageSize,
|
|
|
storeId: String(storeIdStr || ''),
|
|
storeId: String(storeIdStr || ''),
|
|
|
- userCity: userCity,
|
|
|
|
|
- userLat: userLat,
|
|
|
|
|
- userLng: userLng
|
|
|
|
|
|
|
+ userCity: loc.userCity,
|
|
|
|
|
+ userLat: loc.userLat,
|
|
|
|
|
+ userLng: loc.userLng
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
return fetch(API_LIFE_AI_BASE + STORE_GLOBAL_RECOMMEND_PATH, {
|
|
return fetch(API_LIFE_AI_BASE + STORE_GLOBAL_RECOMMEND_PATH, {
|