@smart100/spu-web-plugin 1.0.25-beta.1 → 1.0.25-beta.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/spu-web-plugin.mjs +80 -73
- package/package.json +1 -1
- package/src/map/index.ts +47 -47
- package/src/spuConfig.ts +20 -1
package/dist/spu-web-plugin.mjs
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
var version = "1.0.25-beta.
|
|
1
|
+
var version = "1.0.25-beta.3";
|
|
2
2
|
|
|
3
3
|
/** Detect free variable `global` from Node.js. */
|
|
4
4
|
var freeGlobal$2 = typeof global == 'object' && global && global.Object === Object && global;
|
|
@@ -17740,22 +17740,6 @@ var BMapTransformBD09ToGCJ02Points = function BMapTransformBD09ToGCJ02Points(poi
|
|
|
17740
17740
|
});
|
|
17741
17741
|
});
|
|
17742
17742
|
};
|
|
17743
|
-
var getPoiPhoneNumber = function getPoiPhoneNumber(tel) {
|
|
17744
|
-
if (Array.isArray(tel)) {
|
|
17745
|
-
tel = tel.filter(function (item) {
|
|
17746
|
-
return item;
|
|
17747
|
-
}).join(';');
|
|
17748
|
-
}
|
|
17749
|
-
// tel里面:020-84060333;13570071479 需要优先去除手机号,否则用电话
|
|
17750
|
-
if (tel) {
|
|
17751
|
-
var phoneReg = /1[3456789]\d{9}/;
|
|
17752
|
-
var phone = tel.match(phoneReg);
|
|
17753
|
-
if (phone) {
|
|
17754
|
-
return phone[0];
|
|
17755
|
-
}
|
|
17756
|
-
}
|
|
17757
|
-
return tel;
|
|
17758
|
-
};
|
|
17759
17743
|
|
|
17760
17744
|
var cachetime = 30000; // 缓存时间30秒
|
|
17761
17745
|
var datetime = null;
|
|
@@ -17787,7 +17771,7 @@ var getLocationByNative = /*#__PURE__*/function () {
|
|
|
17787
17771
|
longitude: res.longitude.toString(),
|
|
17788
17772
|
latitude: res.latitude.toString(),
|
|
17789
17773
|
address: res.address || '',
|
|
17790
|
-
poiname: res.poiname || '',
|
|
17774
|
+
// poiname: res.poiname || '',
|
|
17791
17775
|
regionid: res.regionid || '',
|
|
17792
17776
|
country: res.country || '',
|
|
17793
17777
|
province: res.province || '',
|
|
@@ -17795,14 +17779,15 @@ var getLocationByNative = /*#__PURE__*/function () {
|
|
|
17795
17779
|
district: res.district || '',
|
|
17796
17780
|
street: res.street || '',
|
|
17797
17781
|
number: res.number || '',
|
|
17798
|
-
detailaddr: res.detailaddr || ''
|
|
17799
|
-
poiid: res.poiid || '',
|
|
17800
|
-
poitypename: res.poitypename || '',
|
|
17801
|
-
poitypecode: res.poitypecode || '',
|
|
17802
|
-
phonenumber: res.phonenumber || '',
|
|
17803
|
-
signboard: res.signboard || '',
|
|
17804
|
-
maptype: res.maptype || ''
|
|
17782
|
+
detailaddr: res.detailaddr || ''
|
|
17783
|
+
// poiid: res.poiid || '',
|
|
17784
|
+
// poitypename: res.poitypename || '',
|
|
17785
|
+
// poitypecode: res.poitypecode || '',
|
|
17786
|
+
// phonenumber: res.phonenumber || '',
|
|
17787
|
+
// signboard: res.signboard || '',
|
|
17788
|
+
// maptype: res.maptype || '',
|
|
17805
17789
|
};
|
|
17790
|
+
|
|
17806
17791
|
console.log("getLocationByNative success: ".concat(JSON.stringify(result)));
|
|
17807
17792
|
resolve(result);
|
|
17808
17793
|
} else {
|
|
@@ -17901,7 +17886,7 @@ var getLocationByAMap = /*#__PURE__*/function () {
|
|
|
17901
17886
|
longitude: lng.toString(),
|
|
17902
17887
|
latitude: lat.toString(),
|
|
17903
17888
|
address: '',
|
|
17904
|
-
poiname: '',
|
|
17889
|
+
// poiname: '',
|
|
17905
17890
|
regionid: '',
|
|
17906
17891
|
country: '',
|
|
17907
17892
|
province: '',
|
|
@@ -17909,13 +17894,13 @@ var getLocationByAMap = /*#__PURE__*/function () {
|
|
|
17909
17894
|
district: '',
|
|
17910
17895
|
street: '',
|
|
17911
17896
|
number: '',
|
|
17912
|
-
detailaddr: ''
|
|
17913
|
-
poiid: '',
|
|
17914
|
-
poitypename: '',
|
|
17915
|
-
poitypecode: '',
|
|
17916
|
-
phonenumber: '',
|
|
17917
|
-
signboard: '',
|
|
17918
|
-
maptype: "amap"
|
|
17897
|
+
detailaddr: ''
|
|
17898
|
+
// poiid: '', // 图商的id
|
|
17899
|
+
// poitypename: '', // 图商的poi类型名称
|
|
17900
|
+
// poitypecode: '', // 图商的poi类型code
|
|
17901
|
+
// phonenumber: '',
|
|
17902
|
+
// signboard: '',
|
|
17903
|
+
// maptype: "amap"
|
|
17919
17904
|
};
|
|
17920
17905
|
// 通过经纬度获取详细地址信息
|
|
17921
17906
|
getAddressDetailByAMap({
|
|
@@ -17924,7 +17909,7 @@ var getLocationByAMap = /*#__PURE__*/function () {
|
|
|
17924
17909
|
}).then(function (addrssDetail) {
|
|
17925
17910
|
if (addrssDetail) {
|
|
17926
17911
|
result.address = addrssDetail.addressDetail.address;
|
|
17927
|
-
result.poiname = addrssDetail.addressDetail.poiname
|
|
17912
|
+
// result.poiname = addrssDetail.addressDetail.poiname
|
|
17928
17913
|
result.regionid = addrssDetail.addressDetail.regionid;
|
|
17929
17914
|
result.country = addrssDetail.addressDetail.country;
|
|
17930
17915
|
result.province = addrssDetail.addressDetail.province;
|
|
@@ -17933,12 +17918,13 @@ var getLocationByAMap = /*#__PURE__*/function () {
|
|
|
17933
17918
|
result.street = addrssDetail.addressDetail.street;
|
|
17934
17919
|
result.number = addrssDetail.addressDetail.number;
|
|
17935
17920
|
result.detailaddr = addrssDetail.addressDetail.detailaddr;
|
|
17936
|
-
result.poiid = addrssDetail.addressDetail.poiid
|
|
17937
|
-
result.poitypename = addrssDetail.addressDetail.poitypename
|
|
17938
|
-
result.poitypecode = addrssDetail.addressDetail.poitypecode
|
|
17939
|
-
result.phonenumber = addrssDetail.addressDetail.phonenumber
|
|
17940
|
-
result.signboard = addrssDetail.addressDetail.signboard
|
|
17921
|
+
// result.poiid = addrssDetail.addressDetail.poiid
|
|
17922
|
+
// result.poitypename = addrssDetail.addressDetail.poitypename
|
|
17923
|
+
// result.poitypecode = addrssDetail.addressDetail.poitypecode
|
|
17924
|
+
// result.phonenumber = addrssDetail.addressDetail.phonenumber
|
|
17925
|
+
// result.signboard = addrssDetail.addressDetail.signboard
|
|
17941
17926
|
}
|
|
17927
|
+
|
|
17942
17928
|
console.log("getLocationByAMap success: ".concat(JSON.stringify(result)));
|
|
17943
17929
|
resolve(result);
|
|
17944
17930
|
})["catch"](function (err) {
|
|
@@ -17989,7 +17975,7 @@ var getCityLocationByAMap = /*#__PURE__*/function () {
|
|
|
17989
17975
|
longitude: lng.toString(),
|
|
17990
17976
|
latitude: lat.toString(),
|
|
17991
17977
|
address: '',
|
|
17992
|
-
poiname: '',
|
|
17978
|
+
// poiname: '',
|
|
17993
17979
|
regionid: '',
|
|
17994
17980
|
country: '',
|
|
17995
17981
|
province: '',
|
|
@@ -17997,14 +17983,15 @@ var getCityLocationByAMap = /*#__PURE__*/function () {
|
|
|
17997
17983
|
district: '',
|
|
17998
17984
|
street: '',
|
|
17999
17985
|
number: '',
|
|
18000
|
-
detailaddr: ''
|
|
18001
|
-
poiid: '',
|
|
18002
|
-
poitypename: '',
|
|
18003
|
-
poitypecode: '',
|
|
18004
|
-
phonenumber: '',
|
|
18005
|
-
signboard: '',
|
|
18006
|
-
maptype: "amap"
|
|
17986
|
+
detailaddr: ''
|
|
17987
|
+
// poiid: '', // 图商的id
|
|
17988
|
+
// poitypename: '', // 图商的poi类型名称
|
|
17989
|
+
// poitypecode: '', // 图商的poi类型code
|
|
17990
|
+
// phonenumber: '',
|
|
17991
|
+
// signboard: '',
|
|
17992
|
+
// maptype: "amap"
|
|
18007
17993
|
};
|
|
17994
|
+
|
|
18008
17995
|
console.log("getCityLocationByAMap success: ".concat(JSON.stringify(result)));
|
|
18009
17996
|
// 通过经纬度获取详细地址信息
|
|
18010
17997
|
getAddressDetailByAMap({
|
|
@@ -18013,7 +18000,7 @@ var getCityLocationByAMap = /*#__PURE__*/function () {
|
|
|
18013
18000
|
}).then(function (addrssDetail) {
|
|
18014
18001
|
if (addrssDetail) {
|
|
18015
18002
|
result.address = addrssDetail.addressDetail.address;
|
|
18016
|
-
result.poiname = addrssDetail.addressDetail.poiname
|
|
18003
|
+
// result.poiname = addrssDetail.addressDetail.poiname
|
|
18017
18004
|
result.regionid = addrssDetail.addressDetail.regionid;
|
|
18018
18005
|
result.country = addrssDetail.addressDetail.country;
|
|
18019
18006
|
result.province = addrssDetail.addressDetail.province;
|
|
@@ -18022,12 +18009,13 @@ var getCityLocationByAMap = /*#__PURE__*/function () {
|
|
|
18022
18009
|
result.street = addrssDetail.addressDetail.street;
|
|
18023
18010
|
result.number = addrssDetail.addressDetail.number;
|
|
18024
18011
|
result.detailaddr = addrssDetail.addressDetail.detailaddr;
|
|
18025
|
-
result.poiid = addrssDetail.addressDetail.poiid
|
|
18026
|
-
result.poitypename = addrssDetail.addressDetail.poitypename
|
|
18027
|
-
result.poitypecode = addrssDetail.addressDetail.poitypecode
|
|
18028
|
-
result.phonenumber = addrssDetail.addressDetail.phonenumber
|
|
18029
|
-
result.signboard = addrssDetail.addressDetail.signboard
|
|
18012
|
+
// result.poiid = addrssDetail.addressDetail.poiid
|
|
18013
|
+
// result.poitypename = addrssDetail.addressDetail.poitypename
|
|
18014
|
+
// result.poitypecode = addrssDetail.addressDetail.poitypecode
|
|
18015
|
+
// result.phonenumber = addrssDetail.addressDetail.phonenumber
|
|
18016
|
+
// result.signboard = addrssDetail.addressDetail.signboard
|
|
18030
18017
|
}
|
|
18018
|
+
|
|
18031
18019
|
console.log("getLocationByAMap success: ".concat(JSON.stringify(result)));
|
|
18032
18020
|
resolve(result);
|
|
18033
18021
|
})["catch"](function (err) {
|
|
@@ -18147,15 +18135,15 @@ var getAddressDetailByAMap = /*#__PURE__*/function () {
|
|
|
18147
18135
|
if (selectedDetailAddr.startsWith(tmpFullDistrinct)) {
|
|
18148
18136
|
selectedDetailAddr = selectedDetailAddr.slice(tmpFullDistrinct.length);
|
|
18149
18137
|
}
|
|
18150
|
-
|
|
18151
|
-
|
|
18138
|
+
pois && pois[0] && pois[0].id;
|
|
18139
|
+
pois && pois[0] && pois[0].type;
|
|
18152
18140
|
var addressDetail = {
|
|
18153
18141
|
regeocode: result.regeocode,
|
|
18154
18142
|
addressDetail: {
|
|
18155
18143
|
longitude: position.longitude,
|
|
18156
18144
|
latitude: position.latitude,
|
|
18157
18145
|
address: address || '',
|
|
18158
|
-
poiname: poiname || '',
|
|
18146
|
+
// poiname: poiname || '',
|
|
18159
18147
|
regionid: addressComponent.adcode || '',
|
|
18160
18148
|
country: country || '',
|
|
18161
18149
|
province: addressComponent.province || '',
|
|
@@ -18163,15 +18151,16 @@ var getAddressDetailByAMap = /*#__PURE__*/function () {
|
|
|
18163
18151
|
district: addressComponent.district || addressComponent.township || '',
|
|
18164
18152
|
street: street || '',
|
|
18165
18153
|
number: number || '',
|
|
18166
|
-
detailaddr: selectedDetailAddr || ''
|
|
18167
|
-
poiid: poiid || '',
|
|
18168
|
-
poitypename: poitypename || '',
|
|
18169
|
-
poitypecode: '',
|
|
18170
|
-
phonenumber: getPoiPhoneNumber(pois && pois[0] && pois[0].tel),
|
|
18171
|
-
signboard: '',
|
|
18172
|
-
maptype: 'amap'
|
|
18154
|
+
detailaddr: selectedDetailAddr || ''
|
|
18155
|
+
// poiid: poiid || '',
|
|
18156
|
+
// poitypename: poitypename || '',
|
|
18157
|
+
// poitypecode: '',
|
|
18158
|
+
// phonenumber: getPoiPhoneNumber(pois && pois[0] && pois[0].tel),
|
|
18159
|
+
// signboard: '',
|
|
18160
|
+
// maptype: 'amap',
|
|
18173
18161
|
}
|
|
18174
18162
|
};
|
|
18163
|
+
|
|
18175
18164
|
resolve(addressDetail);
|
|
18176
18165
|
} else {
|
|
18177
18166
|
console.error("getAddressByAMap fail: status = ".concat(status, ", result = ").concat(result));
|
|
@@ -18779,6 +18768,8 @@ var getDistance = /*#__PURE__*/function () {
|
|
|
18779
18768
|
}();
|
|
18780
18769
|
|
|
18781
18770
|
var modulekey = '';
|
|
18771
|
+
var customerid = '';
|
|
18772
|
+
var customertype = '';
|
|
18782
18773
|
var SpuConfig = /*#__PURE__*/function () {
|
|
18783
18774
|
function SpuConfig() {
|
|
18784
18775
|
_classCallCheck$1(this, SpuConfig);
|
|
@@ -18790,40 +18781,54 @@ var SpuConfig = /*#__PURE__*/function () {
|
|
|
18790
18781
|
key: "getFun",
|
|
18791
18782
|
value: function () {
|
|
18792
18783
|
var _getFun = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee() {
|
|
18793
|
-
var res, _res$
|
|
18784
|
+
var _res$data, _res$data2, res, _res$data3, _res$data4;
|
|
18794
18785
|
return _regeneratorRuntime$1().wrap(function _callee$(_context) {
|
|
18795
18786
|
while (1) switch (_context.prev = _context.next) {
|
|
18796
18787
|
case 0:
|
|
18797
18788
|
if (this.isload) {
|
|
18798
|
-
_context.next =
|
|
18789
|
+
_context.next = 14;
|
|
18799
18790
|
break;
|
|
18800
18791
|
}
|
|
18801
18792
|
_context.prev = 1;
|
|
18802
18793
|
_context.next = 4;
|
|
18803
18794
|
return spuAxios.post('/lifecycle/getconfigdata', {
|
|
18804
18795
|
// modulekey: 'litheformspu'
|
|
18805
|
-
modulekey: modulekey
|
|
18796
|
+
modulekey: modulekey,
|
|
18797
|
+
customerid: customerid,
|
|
18798
|
+
customertype: customertype
|
|
18806
18799
|
});
|
|
18807
18800
|
case 4:
|
|
18808
18801
|
res = _context.sent;
|
|
18802
|
+
// TODO 9.3.3后 res.data中增加extend字段记录额外的数据,也需要返回,这里需要做一个兼容的数据格式
|
|
18803
|
+
if (!(res !== null && res !== void 0 && (_res$data = res.data) !== null && _res$data !== void 0 && _res$data.configs)) {
|
|
18804
|
+
res.data.configs = [];
|
|
18805
|
+
}
|
|
18806
|
+
if (res !== null && res !== void 0 && (_res$data2 = res.data) !== null && _res$data2 !== void 0 && _res$data2.extend) {
|
|
18807
|
+
res.data.configs.push({
|
|
18808
|
+
descr: 'getconfigdata接口的extend字段信息',
|
|
18809
|
+
dataid: '__system_getconfigdata_extend',
|
|
18810
|
+
type: 'json',
|
|
18811
|
+
context: JSON.stringify((res === null || res === void 0 || (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.extend) || {})
|
|
18812
|
+
});
|
|
18813
|
+
}
|
|
18809
18814
|
// console.log(res)
|
|
18810
18815
|
// debugger
|
|
18811
18816
|
if (res.code === 200) {
|
|
18812
|
-
this.cache = (res === null || res === void 0 || (_res$
|
|
18817
|
+
this.cache = (res === null || res === void 0 || (_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : _res$data4.configs) || [];
|
|
18813
18818
|
}
|
|
18814
|
-
_context.next =
|
|
18819
|
+
_context.next = 13;
|
|
18815
18820
|
break;
|
|
18816
|
-
case
|
|
18817
|
-
_context.prev =
|
|
18821
|
+
case 10:
|
|
18822
|
+
_context.prev = 10;
|
|
18818
18823
|
_context.t0 = _context["catch"](1);
|
|
18819
18824
|
console.error(_context.t0);
|
|
18820
|
-
case
|
|
18825
|
+
case 13:
|
|
18821
18826
|
this.isload = true;
|
|
18822
|
-
case
|
|
18827
|
+
case 14:
|
|
18823
18828
|
case "end":
|
|
18824
18829
|
return _context.stop();
|
|
18825
18830
|
}
|
|
18826
|
-
}, _callee, this, [[1,
|
|
18831
|
+
}, _callee, this, [[1, 10]]);
|
|
18827
18832
|
}));
|
|
18828
18833
|
function getFun() {
|
|
18829
18834
|
return _getFun.apply(this, arguments);
|
|
@@ -18886,6 +18891,8 @@ var SpuConfig = /*#__PURE__*/function () {
|
|
|
18886
18891
|
}();
|
|
18887
18892
|
function installSpuConfig(options) {
|
|
18888
18893
|
modulekey = options.modulekey;
|
|
18894
|
+
customerid = options.customerid;
|
|
18895
|
+
customertype = options.customertype;
|
|
18889
18896
|
}
|
|
18890
18897
|
var spuConfig = new SpuConfig();
|
|
18891
18898
|
|
package/package.json
CHANGED
package/src/map/index.ts
CHANGED
|
@@ -40,7 +40,7 @@ const getLocationByNative = async (): Promise<Location> => {
|
|
|
40
40
|
longitude: res.longitude.toString(),
|
|
41
41
|
latitude: res.latitude.toString(),
|
|
42
42
|
address: res.address || '',
|
|
43
|
-
poiname: res.poiname || '',
|
|
43
|
+
// poiname: res.poiname || '',
|
|
44
44
|
regionid: res.regionid || '',
|
|
45
45
|
country: res.country || '',
|
|
46
46
|
province: res.province || '',
|
|
@@ -49,12 +49,12 @@ const getLocationByNative = async (): Promise<Location> => {
|
|
|
49
49
|
street: res.street || '',
|
|
50
50
|
number: res.number || '',
|
|
51
51
|
detailaddr: res.detailaddr || '',
|
|
52
|
-
poiid: res.poiid || '',
|
|
53
|
-
poitypename: res.poitypename || '',
|
|
54
|
-
poitypecode: res.poitypecode || '',
|
|
55
|
-
phonenumber: res.phonenumber || '',
|
|
56
|
-
signboard: res.signboard || '',
|
|
57
|
-
maptype: res.maptype || '',
|
|
52
|
+
// poiid: res.poiid || '',
|
|
53
|
+
// poitypename: res.poitypename || '',
|
|
54
|
+
// poitypecode: res.poitypecode || '',
|
|
55
|
+
// phonenumber: res.phonenumber || '',
|
|
56
|
+
// signboard: res.signboard || '',
|
|
57
|
+
// maptype: res.maptype || '',
|
|
58
58
|
}
|
|
59
59
|
console.log(`getLocationByNative success: ${JSON.stringify(result)}`)
|
|
60
60
|
resolve(result)
|
|
@@ -214,7 +214,7 @@ const getLocationByAMap = async (): Promise<Location> => {
|
|
|
214
214
|
longitude: lng.toString(),
|
|
215
215
|
latitude: lat.toString(),
|
|
216
216
|
address: '',
|
|
217
|
-
poiname: '',
|
|
217
|
+
// poiname: '',
|
|
218
218
|
regionid: '',
|
|
219
219
|
country: '',
|
|
220
220
|
province: '',
|
|
@@ -223,12 +223,12 @@ const getLocationByAMap = async (): Promise<Location> => {
|
|
|
223
223
|
street: '',
|
|
224
224
|
number: '',
|
|
225
225
|
detailaddr: '',
|
|
226
|
-
poiid: '', // 图商的id
|
|
227
|
-
poitypename: '', // 图商的poi类型名称
|
|
228
|
-
poitypecode: '', // 图商的poi类型code
|
|
229
|
-
phonenumber: '',
|
|
230
|
-
signboard: '',
|
|
231
|
-
maptype: "amap"
|
|
226
|
+
// poiid: '', // 图商的id
|
|
227
|
+
// poitypename: '', // 图商的poi类型名称
|
|
228
|
+
// poitypecode: '', // 图商的poi类型code
|
|
229
|
+
// phonenumber: '',
|
|
230
|
+
// signboard: '',
|
|
231
|
+
// maptype: "amap"
|
|
232
232
|
}
|
|
233
233
|
// 通过经纬度获取详细地址信息
|
|
234
234
|
getAddressDetailByAMap({
|
|
@@ -237,7 +237,7 @@ const getLocationByAMap = async (): Promise<Location> => {
|
|
|
237
237
|
}).then((addrssDetail: IAddressDetail | null) => {
|
|
238
238
|
if (addrssDetail) {
|
|
239
239
|
result.address = addrssDetail.addressDetail.address
|
|
240
|
-
result.poiname = addrssDetail.addressDetail.poiname
|
|
240
|
+
// result.poiname = addrssDetail.addressDetail.poiname
|
|
241
241
|
result.regionid = addrssDetail.addressDetail.regionid
|
|
242
242
|
result.country = addrssDetail.addressDetail.country
|
|
243
243
|
result.province = addrssDetail.addressDetail.province
|
|
@@ -246,11 +246,11 @@ const getLocationByAMap = async (): Promise<Location> => {
|
|
|
246
246
|
result.street = addrssDetail.addressDetail.street
|
|
247
247
|
result.number = addrssDetail.addressDetail.number
|
|
248
248
|
result.detailaddr = addrssDetail.addressDetail.detailaddr
|
|
249
|
-
result.poiid = addrssDetail.addressDetail.poiid
|
|
250
|
-
result.poitypename = addrssDetail.addressDetail.poitypename
|
|
251
|
-
result.poitypecode = addrssDetail.addressDetail.poitypecode
|
|
252
|
-
result.phonenumber = addrssDetail.addressDetail.phonenumber
|
|
253
|
-
result.signboard = addrssDetail.addressDetail.signboard
|
|
249
|
+
// result.poiid = addrssDetail.addressDetail.poiid
|
|
250
|
+
// result.poitypename = addrssDetail.addressDetail.poitypename
|
|
251
|
+
// result.poitypecode = addrssDetail.addressDetail.poitypecode
|
|
252
|
+
// result.phonenumber = addrssDetail.addressDetail.phonenumber
|
|
253
|
+
// result.signboard = addrssDetail.addressDetail.signboard
|
|
254
254
|
}
|
|
255
255
|
console.log(`getLocationByAMap success: ${JSON.stringify(result)}`)
|
|
256
256
|
resolve(result)
|
|
@@ -290,7 +290,7 @@ const getCityLocationByAMap = async (): Promise<Location> => {
|
|
|
290
290
|
longitude: lng.toString(),
|
|
291
291
|
latitude: lat.toString(),
|
|
292
292
|
address: '',
|
|
293
|
-
poiname: '',
|
|
293
|
+
// poiname: '',
|
|
294
294
|
regionid: '',
|
|
295
295
|
country: '',
|
|
296
296
|
province: '',
|
|
@@ -299,12 +299,12 @@ const getCityLocationByAMap = async (): Promise<Location> => {
|
|
|
299
299
|
street: '',
|
|
300
300
|
number: '',
|
|
301
301
|
detailaddr: '',
|
|
302
|
-
poiid: '', // 图商的id
|
|
303
|
-
poitypename: '', // 图商的poi类型名称
|
|
304
|
-
poitypecode: '', // 图商的poi类型code
|
|
305
|
-
phonenumber: '',
|
|
306
|
-
signboard: '',
|
|
307
|
-
maptype: "amap"
|
|
302
|
+
// poiid: '', // 图商的id
|
|
303
|
+
// poitypename: '', // 图商的poi类型名称
|
|
304
|
+
// poitypecode: '', // 图商的poi类型code
|
|
305
|
+
// phonenumber: '',
|
|
306
|
+
// signboard: '',
|
|
307
|
+
// maptype: "amap"
|
|
308
308
|
}
|
|
309
309
|
console.log(`getCityLocationByAMap success: ${JSON.stringify(result)}`)
|
|
310
310
|
|
|
@@ -315,7 +315,7 @@ const getCityLocationByAMap = async (): Promise<Location> => {
|
|
|
315
315
|
}).then((addrssDetail: IAddressDetail | null) => {
|
|
316
316
|
if (addrssDetail) {
|
|
317
317
|
result.address = addrssDetail.addressDetail.address
|
|
318
|
-
result.poiname = addrssDetail.addressDetail.poiname
|
|
318
|
+
// result.poiname = addrssDetail.addressDetail.poiname
|
|
319
319
|
result.regionid = addrssDetail.addressDetail.regionid
|
|
320
320
|
result.country = addrssDetail.addressDetail.country
|
|
321
321
|
result.province = addrssDetail.addressDetail.province
|
|
@@ -324,11 +324,11 @@ const getCityLocationByAMap = async (): Promise<Location> => {
|
|
|
324
324
|
result.street = addrssDetail.addressDetail.street
|
|
325
325
|
result.number = addrssDetail.addressDetail.number
|
|
326
326
|
result.detailaddr = addrssDetail.addressDetail.detailaddr
|
|
327
|
-
result.poiid = addrssDetail.addressDetail.poiid
|
|
328
|
-
result.poitypename = addrssDetail.addressDetail.poitypename
|
|
329
|
-
result.poitypecode = addrssDetail.addressDetail.poitypecode
|
|
330
|
-
result.phonenumber = addrssDetail.addressDetail.phonenumber
|
|
331
|
-
result.signboard = addrssDetail.addressDetail.signboard
|
|
327
|
+
// result.poiid = addrssDetail.addressDetail.poiid
|
|
328
|
+
// result.poitypename = addrssDetail.addressDetail.poitypename
|
|
329
|
+
// result.poitypecode = addrssDetail.addressDetail.poitypecode
|
|
330
|
+
// result.phonenumber = addrssDetail.addressDetail.phonenumber
|
|
331
|
+
// result.signboard = addrssDetail.addressDetail.signboard
|
|
332
332
|
}
|
|
333
333
|
console.log(`getLocationByAMap success: ${JSON.stringify(result)}`)
|
|
334
334
|
resolve(result)
|
|
@@ -381,7 +381,7 @@ interface IAddressDetail {
|
|
|
381
381
|
longitude: string
|
|
382
382
|
latitude: string
|
|
383
383
|
address: string
|
|
384
|
-
poiname: string
|
|
384
|
+
// poiname: string
|
|
385
385
|
regionid: string
|
|
386
386
|
country: string
|
|
387
387
|
province: string
|
|
@@ -390,12 +390,12 @@ interface IAddressDetail {
|
|
|
390
390
|
street: string
|
|
391
391
|
number: string
|
|
392
392
|
detailaddr: string
|
|
393
|
-
poiid: string
|
|
394
|
-
poitypename: string
|
|
395
|
-
poitypecode: string
|
|
396
|
-
phonenumber: string
|
|
397
|
-
signboard: string
|
|
398
|
-
maptype: string
|
|
393
|
+
// poiid: string
|
|
394
|
+
// poitypename: string
|
|
395
|
+
// poitypecode: string
|
|
396
|
+
// phonenumber: string
|
|
397
|
+
// signboard: string
|
|
398
|
+
// maptype: string
|
|
399
399
|
}
|
|
400
400
|
}
|
|
401
401
|
// 高德逆地址解析详细数据
|
|
@@ -467,7 +467,7 @@ const getAddressDetailByAMap = async (position: Location): Promise<IAddressDetai
|
|
|
467
467
|
longitude: position.longitude,
|
|
468
468
|
latitude: position.latitude,
|
|
469
469
|
address: address || '',
|
|
470
|
-
poiname: poiname || '',
|
|
470
|
+
// poiname: poiname || '',
|
|
471
471
|
regionid: addressComponent.adcode || '',
|
|
472
472
|
country: country || '',
|
|
473
473
|
province: addressComponent.province || '',
|
|
@@ -478,12 +478,12 @@ const getAddressDetailByAMap = async (position: Location): Promise<IAddressDetai
|
|
|
478
478
|
street: street || '',
|
|
479
479
|
number: number || '',
|
|
480
480
|
detailaddr: selectedDetailAddr || '',
|
|
481
|
-
poiid: poiid || '',
|
|
482
|
-
poitypename: poitypename || '',
|
|
483
|
-
poitypecode: '',
|
|
484
|
-
phonenumber: getPoiPhoneNumber(pois && pois[0] && pois[0].tel),
|
|
485
|
-
signboard: '',
|
|
486
|
-
maptype: 'amap',
|
|
481
|
+
// poiid: poiid || '',
|
|
482
|
+
// poitypename: poitypename || '',
|
|
483
|
+
// poitypecode: '',
|
|
484
|
+
// phonenumber: getPoiPhoneNumber(pois && pois[0] && pois[0].tel),
|
|
485
|
+
// signboard: '',
|
|
486
|
+
// maptype: 'amap',
|
|
487
487
|
}
|
|
488
488
|
}
|
|
489
489
|
resolve(addressDetail)
|
package/src/spuConfig.ts
CHANGED
|
@@ -2,6 +2,8 @@ import { spuAxios } from './axios'
|
|
|
2
2
|
import { cloneDeep } from 'lodash-es'
|
|
3
3
|
|
|
4
4
|
let modulekey = ''
|
|
5
|
+
let customerid = ''
|
|
6
|
+
let customertype = ''
|
|
5
7
|
|
|
6
8
|
class SpuConfig {
|
|
7
9
|
private isload = false
|
|
@@ -13,8 +15,23 @@ class SpuConfig {
|
|
|
13
15
|
try {
|
|
14
16
|
const res = await spuAxios.post('/lifecycle/getconfigdata', {
|
|
15
17
|
// modulekey: 'litheformspu'
|
|
16
|
-
modulekey: modulekey
|
|
18
|
+
modulekey: modulekey,
|
|
19
|
+
customerid: customerid,
|
|
20
|
+
customertype: customertype
|
|
17
21
|
})
|
|
22
|
+
|
|
23
|
+
// TODO 9.3.3后 res.data中增加extend字段记录额外的数据,也需要返回,这里需要做一个兼容的数据格式
|
|
24
|
+
if (!res?.data?.configs) {
|
|
25
|
+
res.data.configs = []
|
|
26
|
+
}
|
|
27
|
+
if (res?.data?.extend) {
|
|
28
|
+
res.data.configs.push({
|
|
29
|
+
descr: 'getconfigdata接口的extend字段信息',
|
|
30
|
+
dataid: '__system_getconfigdata_extend',
|
|
31
|
+
type: 'json',
|
|
32
|
+
context: JSON.stringify(res?.data?.extend || {})
|
|
33
|
+
})
|
|
34
|
+
}
|
|
18
35
|
// console.log(res)
|
|
19
36
|
// debugger
|
|
20
37
|
if (res.code === 200) {
|
|
@@ -99,6 +116,8 @@ class SpuConfig {
|
|
|
99
116
|
|
|
100
117
|
function installSpuConfig(options: any) {
|
|
101
118
|
modulekey = options.modulekey
|
|
119
|
+
customerid = options.customerid
|
|
120
|
+
customertype = options.customertype
|
|
102
121
|
}
|
|
103
122
|
|
|
104
123
|
const spuConfig = new SpuConfig()
|