diff --git a/components.d.ts b/components.d.ts
index ea47d18..2a14798 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -3,7 +3,7 @@
// Generated by unplugin-vue-components
// Read more: https://github.com/vuejs/core/pull/3399
// biome-ignore lint: disable
-export {}
+export {};
/* prettier-ignore */
declare module 'vue' {
@@ -12,41 +12,6 @@ declare module 'vue' {
Back: typeof import('./src/components/Back.vue')['default']
Cart: typeof import('./src/components/Cart.vue')['default']
MerList: typeof import('./src/components/MerList.vue')['default']
- NutAvatar: typeof import('@nutui/nutui-taro')['Avatar']
- NutBacktop: typeof import('@nutui/nutui-taro')['Backtop']
- NutButton: typeof import('@nutui/nutui-taro')['Button']
- NutCalendar: typeof import('@nutui/nutui-taro')['Calendar']
- NutCell: typeof import('@nutui/nutui-taro')['Cell']
- NutCellGroup: typeof import('@nutui/nutui-taro')['CellGroup']
- NutCheckbox: typeof import('@nutui/nutui-taro')['Checkbox']
- NutCheckboxGroup: typeof import('@nutui/nutui-taro')['CheckboxGroup']
- NutDialog: typeof import('@nutui/nutui-taro')['Dialog']
- NutEllipsis: typeof import('@nutui/nutui-taro')['Ellipsis']
- NutEmpty: typeof import('@nutui/nutui-taro')['Empty']
- NutForm: typeof import('@nutui/nutui-taro')['Form']
- NutFormItem: typeof import('@nutui/nutui-taro')['FormItem']
- NutGrid: typeof import('@nutui/nutui-taro')['Grid']
- NutGridItem: typeof import('@nutui/nutui-taro')['GridItem']
- NutImagePreview: typeof import('@nutui/nutui-taro')['ImagePreview']
- NutInput: typeof import('@nutui/nutui-taro')['Input']
- NutInputNumber: typeof import('@nutui/nutui-taro')['InputNumber']
- NutOverlay: typeof import('@nutui/nutui-taro')['Overlay']
- NutPagination: typeof import('@nutui/nutui-taro')['Pagination']
- NutPicker: typeof import('@nutui/nutui-taro')['Picker']
- NutPopover: typeof import('@nutui/nutui-taro')['Popover']
- NutPopup: typeof import('@nutui/nutui-taro')['Popup']
- NutPrice: typeof import('@nutui/nutui-taro')['Price']
- NutRadio: typeof import('@nutui/nutui-taro')['Radio']
- NutRadioGroup: typeof import('@nutui/nutui-taro')['RadioGroup']
- NutRate: typeof import('@nutui/nutui-taro')['Rate']
- NutSwiper: typeof import('@nutui/nutui-taro')['Swiper']
- NutSwiperItem: typeof import('@nutui/nutui-taro')['SwiperItem']
- NutSwitch: typeof import('@nutui/nutui-taro')['Switch']
- NutTable: typeof import('@nutui/nutui-taro')['Table']
- NutTabPane: typeof import('@nutui/nutui-taro')['TabPane']
- NutTabs: typeof import('@nutui/nutui-taro')['Tabs']
- NutTextarea: typeof import('@nutui/nutui-taro')['Textarea']
- NutUploader: typeof import('@nutui/nutui-taro')['Uploader']
Pay: typeof import('./src/components/Pay.vue')['default']
Popup: typeof import('./src/components/Popup.vue')['default']
RichEditor: typeof import('./src/components/RichEditor.vue')['default']
diff --git a/package.json b/package.json
index 51521dd..8d5c444 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "jdt-user",
- "version": "4.0.10",
+ "version": "4.0.11",
"private": true,
"description": "",
"templateInfo": {
@@ -9,7 +9,7 @@
"css": "sass"
},
"taroConfig": {
- "version": "4.0.10"
+ "version": "4.0.11"
},
"scripts": {
"build:weapp": "taro build --type weapp",
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 2629d00..4ffbc16 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -123,21 +123,36 @@ const getUserLocal = async () => {
Taro.getLocation({
type: 'wgs84',
success: res => {
+ // Taro.request({
+ // url: `https://apis.map.qq.com/ws/geocoder/v1/?location=${res.latitude},${res.longitude}&key=4EJBZ-TZXCV-IHUPX-UMI2L-MK3N3-37FSQ&get_poi=1`,
+ // method: 'GET',
+ // success: res => {
+ // switch (res.data.status) {
+ // case 121:
+ // Taro.showToast({
+ // title: res.data.message,
+ // icon: 'none',
+ // });
+ // break;
+ // default:
+ // const data = res.data.result.address_component;
+ // address.value = `${data.district}${data.street_number}`;
+ // break;
+ // }
+ // },
+ // });
Taro.request({
- url: `https://apis.map.qq.com/ws/geocoder/v1/?location=${res.latitude},${res.longitude}&key=4EJBZ-TZXCV-IHUPX-UMI2L-MK3N3-37FSQ&get_poi=1`,
+ url: `https://api.tianditu.gov.cn/geocoder?postStr={'lon':${res.longitude},'lat':${res.latitude},'ver':1}&type=geocode&tk=42db4f3dfd1a18d31e73ee90aa2ce054`,
method: 'GET',
success: res => {
- switch (res.data.status) {
- case 121:
- Taro.showToast({
- title: res.data.message,
- icon: 'none',
- });
- break;
- default:
- const data = res.data.result.address_component;
- address.value = `${data.district}${data.street_number}`;
- break;
+ const { msg, result } = res.data;
+ if (msg === 'ok') {
+ address.value = `${result.addressComponent.county}${result.addressComponent.town}${result.addressComponent.address}`;
+ } else {
+ Taro.showToast({
+ title: msg,
+ icon: 'none',
+ });
}
},
});
diff --git a/src/pages/mer/mer_detail/index.vue b/src/pages/mer/mer_detail/index.vue
index 8b554d2..1fae9b5 100644
--- a/src/pages/mer/mer_detail/index.vue
+++ b/src/pages/mer/mer_detail/index.vue
@@ -27,7 +27,7 @@
spacing="1"
active-color="rgba(252, 207, 10, 1)"
v-model="mer_info.rate" />
- 销量:10000
+ 销量:1000+
营业时间:{{ mer_info.week_start }}-{{ mer_info.week_end }}