From d262087ec9d0cd9c08a064ec412765eb5c6aa8d4 Mon Sep 17 00:00:00 2001 From: hot777zz <912275990@qq.com> Date: Thu, 16 Nov 2023 12:30:41 +0800 Subject: [PATCH 01/20] =?UTF-8?q?=E6=A2=81=E8=88=AA=EF=BC=9A=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../publishTransfer/publishTransfer.vue | 93 ++++++++++++++----- 1 file changed, 70 insertions(+), 23 deletions(-) diff --git a/pages/publish/publishTransfer/publishTransfer.vue b/pages/publish/publishTransfer/publishTransfer.vue index de83147..a868970 100644 --- a/pages/publish/publishTransfer/publishTransfer.vue +++ b/pages/publish/publishTransfer/publishTransfer.vue @@ -6,11 +6,10 @@ 发布房源图片({{ShopInfomation.count}}/5) - - + + - + 请选择所属区域 @@ -18,11 +17,11 @@ - + - + 请选择行业类型 @@ -30,7 +29,7 @@ - + 请选择行业业态 @@ -38,22 +37,22 @@ - + - + - + - + - + - + @@ -68,7 +67,7 @@ export default { data() { return { - regionColumns: [JSON.parse(uni.getStorageSync('regionList'))] || [], + // regionColumns: [JSON.parse(uni.getStorageSync('regionList'))] || [], ShopInfomation: { city: '', area: '', @@ -97,17 +96,70 @@ show3: false, rules: { 'title': [{ - type: 'string', - require: true, + required: true, + message: '请输入标题', + trigger: ['change', 'blur'] + }], + 'trade': [{ + required: true, + message: '请选择行业', + trigger: ['change', 'blur'] + }], + 'region': [{ + required: true, + message: '请选择地区', + trigger: ['change', 'blur'] + }], + 'karma': [{ + required: true, + message: '请选择业态', + trigger: ['change', 'blur'] + }], + 'name': [{ + required: true, message: '请输入姓名', trigger: ['change', 'blur'] }], + 'sell': [{ + required: true, + message: '请输入转让金', + trigger: ['change', 'blur'] + }], + 'introduce': [{ + required: true, + message: '请输入介绍', + trigger: ['change', 'blur'] + }], + 'size': [{ + required: true, + message: '请输入面积', + trigger: ['change', 'blur'] + }], + 'rent': [{ + required: true, + message: '请输入租金', + trigger: ['change', 'blur'] + }], 'place': [{ - type: 'string', - require: true, + required: true, message: '请输入地址', trigger: ['change', 'blur'] }], + 'call':[{ + required: true, + message: '请输入电话号码', + }, + { + validator: (rule, value, callback) => { + if(value) { + return this.$u.test.mobile(value); + } else { + return true + } + }, + message: '号码不正确', + trigger: ['change','blur'], + }] }, } @@ -118,11 +170,6 @@ url: '/pages/publish/chooseAddress/chooseAddress' }) }, - confirmArea(e) { - this.ShopInfomation.city = e.value[0] - this.ShopInfomation.area = e.value[1] - this.show1 = false - }, submit() { this.$refs.uForm.validate().then(res => { console.log("提交表单信息:" + JSON.stringify(this.form)) From 126a39edf87b3db6852eee18794c60c6247ed4d0 Mon Sep 17 00:00:00 2001 From: hot777zz <912275990@qq.com> Date: Thu, 16 Nov 2023 12:31:04 +0800 Subject: [PATCH 02/20] =?UTF-8?q?=E6=A2=81=E8=88=AA=EF=BC=9A=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E9=A1=B5=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/published/published.vue | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pages/published/published.vue b/pages/published/published.vue index fa4fba3..b3e75bc 100644 --- a/pages/published/published.vue +++ b/pages/published/published.vue @@ -7,11 +7,14 @@ - - - - - + + + + + + + + @@ -87,4 +90,8 @@ page{ background-color: #F8F8F8; } + + .content{ + margin: 0 10px; + } From 88dfe5760be915283aff6f2cf8ac853e8b37395c Mon Sep 17 00:00:00 2001 From: dengj <209192278@qq.com> Date: Thu, 16 Nov 2023 12:50:58 +0800 Subject: [PATCH 03/20] =?UTF-8?q?=E9=82=93=E6=B4=81=20:=20=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 10 ++++++++ pages/index/index.vue | 52 ++++++++++++++++++++--------------------- pages/index/map/map.vue | 35 +++++++++++++++++++++++++++ service/request.js | 17 ++++++++++---- 4 files changed, 83 insertions(+), 31 deletions(-) diff --git a/pages.json b/pages.json index db52186..31eb97f 100644 --- a/pages.json +++ b/pages.json @@ -125,6 +125,8 @@ "path": "pages/index/NavBarPages/zrxx/zrxx", "style": { "navigationBarTitleText": "转让信息", + "navigationBarTextStyle": "white", + "navigationBarBackgroundColor": "#339967", "enablePullDownRefresh": false } }, @@ -132,6 +134,8 @@ "path": "pages/index/NavBarPages/zdxx/zdxx", "style": { "navigationBarTitleText": "找店信息", + "navigationBarTextStyle": "white", + "navigationBarBackgroundColor": "#339967", "enablePullDownRefresh": false } }, @@ -139,6 +143,8 @@ "path": "pages/index/NavBarPages/czxx/czxx", "style": { "navigationBarTitleText": "出租信息", + "navigationBarTextStyle": "white", + "navigationBarBackgroundColor": "#339967", "enablePullDownRefresh": false } }, @@ -146,6 +152,8 @@ "path": "pages/index/NavBarPages/xmzs/xmzs", "style": { "navigationBarTitleText": "项目招商", + "navigationBarTextStyle": "white", + "navigationBarBackgroundColor": "#339967", "enablePullDownRefresh": false } }, @@ -153,6 +161,8 @@ "path": "pages/index/NavBarPages/cjal/cjal", "style": { "navigationBarTitleText": "成交案例", + "navigationBarTextStyle": "white", + "navigationBarBackgroundColor": "#339967", "enablePullDownRefresh": false } }, diff --git a/pages/index/index.vue b/pages/index/index.vue index f680ff4..fe4fef3 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -3,18 +3,13 @@ - - + + - + 店铺列表 @@ -46,7 +41,7 @@ notice: [], chooseIndex: 0, statNum: {}, - swiperList:[] + swiperList: [] } }, onLoad() { @@ -56,18 +51,18 @@ this.open() }, methods: { - getBanner(){ - this.$api.getBanner().then(res=>{ - this.swiperList = res.data.data.map(item=>this.$api.imgUrl+item.img) + getBanner() { + this.$api.getBanner().then(res => { + this.swiperList = res.data.data.map(item => this.$api.imgUrl + item.img) }) }, - getNotice(){ - this.$api.getHotInfo().then(res=>{ - this.notice = res.data.data.map(item=>item.title) + getNotice() { + this.$api.getHotInfo().then(res => { + this.notice = res.data.data.map(item => item.title) }) }, - getStat(){ - this.$api.getStat().then(res=>{ + getStat() { + this.$api.getStat().then(res => { this.statNum = res.data.data console.log(res.data.data); }) @@ -95,6 +90,8 @@ success(res) { console.log('res.latitude', res.latitude); console.log('res.longitude', res.longitude); + uni.setStorageSync('latitude', res.latitude); + uni.setStorageSync('longitude', res.longitude); qqmapsdk.reverseGeocoder({ location: { latitude: res.latitude, @@ -106,7 +103,7 @@ console.log(re.result.ad_info.district); let city = re.result.ad_info.city let district = re.result.ad_info.district - console.log('city-code',re.result.ad_info.city_code.substring(3)); + console.log('city-code', re.result.ad_info.city_code.substring(3)); uni.setStorageSync('city_code', re.result.ad_info.city_code.substring(3)); uni.setStorageSync('city', city.slice(0, 2)); uni.setStorageSync('district', district); @@ -127,11 +124,11 @@ open() { var that = this uni.getSetting({ - success: function (res) { - if (res.authSetting['scope.userFuzzyLocation']) { - console.log('用户已经授权定位权限'); - } else { - console.log('用户未授权定位权限'); + success: function(res) { + if (res.authSetting['scope.userFuzzyLocation']) { + console.log('用户已经授权定位权限'); + } else { + console.log('用户未授权定位权限'); uni.authorize({ scope: 'scope.userFuzzyLocation', success: function() { @@ -161,8 +158,8 @@ return false; } }) - } - } + } + } }); } } @@ -176,11 +173,13 @@ .home-content { margin: 0 10px; + .service { position: fixed; right: 17rpx; top: 1109rpx; z-index: 1; + .service-btn { position: absolute; top: 0; @@ -189,6 +188,7 @@ width: 108rpx; height: 108rpx; } + .service-btn::after { border: none; diff --git a/pages/index/map/map.vue b/pages/index/map/map.vue index a8f8146..b8e3f80 100644 --- a/pages/index/map/map.vue +++ b/pages/index/map/map.vue @@ -76,7 +76,42 @@ console.log("markerClusterCreate", e); }); }, + created() { + this.getMapList() + }, methods: { + getMapList() { + const realData = { + longitude: uni.getStorageSync('longitude'), + latitude: uni.getStorageSync('latitude'), + radius: 100 + } + const mockData = { + longitude: 23.40, + latitude: 116.38, + radius: 1111111111 + } + this.$api.getMap(mockData).then(res => { + console.log('getMap', res); + let obj = {} + if (res.statusCode === 200) { + // res.data.data.forEach(item => { + // obj = { + // id: parseInt(item.id), + // latitude: item.lat, + // longitude: item.lng, + // // iconPath: '../../../static/map/sp_icon_dw.png', + // width: '58rpx', + // height: '72rpx', + // rotate: 0, + // alpha: 1 + // } + // }) + // this.marker.push(obj) + // console.log('this.marker', this.marker); + } + }) + }, // 图标点击 markerClick(e) { console.log('标记点击', e); diff --git a/service/request.js b/service/request.js index 7686aca..d7d35e4 100644 --- a/service/request.js +++ b/service/request.js @@ -128,8 +128,8 @@ const toast = { } const apiService = { serverHost, - imgUrl:'https://spsp.feashow.com/', - key:'ZRKBZ-Q7FWL-GVZPK-MCRBU-4XFB5-ATBDB', + imgUrl: 'https://spsp.feashow.com/', + key: 'ZRKBZ-Q7FWL-GVZPK-MCRBU-4XFB5-ATBDB', uploadImgUrl: serverHost + `/upload/image/`, //登录接口 login(data) { @@ -145,6 +145,13 @@ const apiService = { resolve(service.post(url, data)) }) }, + //地图 + getMap(data) { + const url = '/home/map' + return new Promise((resolve, reject) => { + resolve(service.post(url, data)) + }) + }, // 获取客服电话 getCsTel() { const url = '/center/cfg?key=kf_phone' @@ -203,10 +210,10 @@ const apiService = { resolve(service.get(url)) }) }, - editPersonInfo(data){ + editPersonInfo(data) { const url = `/center/userupdate` - return new Promise((resolve,reject) => { - resolve(service.post(url,data)) + return new Promise((resolve, reject) => { + resolve(service.post(url, data)) }) } } From 73cb83d1ab5716b5b179427b9a20a82dccaf0fd2 Mon Sep 17 00:00:00 2001 From: dengj <209192278@qq.com> Date: Thu, 16 Nov 2023 15:49:41 +0800 Subject: [PATCH 04/20] =?UTF-8?q?=E9=82=93=E6=B4=81=20:=20=E7=9B=91?= =?UTF-8?q?=E5=90=AC=E5=9C=B0=E5=9B=BE=E7=BC=A9=E6=94=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/index/HomeMainContent/HomeNavCard.vue | 1 - pages/index/map/map.vue | 145 ++++++++++++++++---- 2 files changed, 121 insertions(+), 25 deletions(-) diff --git a/pages/index/HomeMainContent/HomeNavCard.vue b/pages/index/HomeMainContent/HomeNavCard.vue index f448771..d3a1134 100644 --- a/pages/index/HomeMainContent/HomeNavCard.vue +++ b/pages/index/HomeMainContent/HomeNavCard.vue @@ -111,7 +111,6 @@ }, getCsTel() { this.$api.getCsTel().then(res => { - console.log(res.data); if (res.data.data) { this.mobile = res.data.data.kf_phone } diff --git a/pages/index/map/map.vue b/pages/index/map/map.vue index b8e3f80..d77f9d3 100644 --- a/pages/index/map/map.vue +++ b/pages/index/map/map.vue @@ -8,8 +8,8 @@ --> - + + + + + + + + + 提交 - + + + .u-button { + width: 644rpx !important; + height: 86rpx !important; + background: #0EBB5B; + border-radius: 20rpx !important; + } + \ No newline at end of file diff --git a/pages/my/my.vue b/pages/my/my.vue index bbb5e5d..81bd79b 100644 --- a/pages/my/my.vue +++ b/pages/my/my.vue @@ -7,8 +7,10 @@ {{username}} - - + + @@ -43,8 +45,8 @@ data() { return { src: 'https://cdn.uviewui.com/uview/album/2.jpg', - account: '', - username: '', + account: '123', + username: '用户名', isLoad: true } }, @@ -54,8 +56,9 @@ return } this.isLoad = true - this.$data.account = wx.getStorageSync('account') - this.$data.username = wx.getStorageSync('nickname') + // this.$data.account = wx.getStorageSync('account') + // this.$data.username = wx.getStorageSync('nickname') + this.getInfo() }, methods: { reOnLoad() { @@ -86,17 +89,22 @@ url: '/pages/Partnerships/Partnerships' }) }, - toEdit(){ + toEdit() { uni.navigateTo({ - url:'/pages/my/edit/edit' + url: '/pages/my/edit/edit' + }) + }, + //---------页面调用接口示例------------ + getInfo() { + this.$api.getUser().then(res => { + console.log('userInfo', res); + var data = res.data.data + if (data) { + this.src = uni.getStorageSync('img_url') + data.avatar + this.username = data.nickname + } }) } - //---------页面调用接口示例------------ - // getInfo() { - // this.$api.getUserInfo().then(res => { - // console.log('userInfo', res); - // }) - // } } } @@ -134,9 +142,8 @@ font-weight: 1rpx; display: flex; } - .edit-icon{ - - } + + .edit-icon {} } \ No newline at end of file diff --git a/service/request.js b/service/request.js index a83e178..b1d58ab 100644 --- a/service/request.js +++ b/service/request.js @@ -130,7 +130,7 @@ const apiService = { serverHost, imgUrl: 'https://spsp.feashow.com/', key: 'ZRKBZ-Q7FWL-GVZPK-MCRBU-4XFB5-ATBDB', - uploadImgUrl: serverHost + `/upload/image/`, + uploadImgUrl: serverHost + '/upload/image/', //登录接口 login(data) { const url = '/login/mnpLogin' @@ -211,27 +211,34 @@ const apiService = { resolve(service.get(url)) }) }, + //获取个人信息 + getUser() { + const url = '/center/userinfo' + return new Promise((resolve, reject) => { + resolve(service.get(url)) + }) + }, //修改个人信息 - editPersonInfo(data){ + editPersonInfo(data) { const url = `center/userupdate` - return new Promise((resolve,reject) => { - resolve(service.putWithFormData(url,data)) + return new Promise((resolve, reject) => { + resolve(service.post(url, data)) }) }, //获取我的匹配 - getMyMatch(){ + getMyMatch() { const url = `/center/match/` - return new Promise((resolve,reject) => { + return new Promise((resolve, reject) => { resolve(service.get(url)) }) }, //获取行业和业态 - getClassList(pid){ + getClassList(pid) { const url = `/home/classlist/?pid=${pid}` - return new Promise((resolve,reject) => { + return new Promise((resolve, reject) => { resolve(service.post(url)) }) - } + }, } export { apiService, From dc57ab9ade1a8e904b47243258b7f280ca7c279f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=93=E6=B4=81?= <209192278@qq.com> Date: Thu, 16 Nov 2023 21:44:31 +0800 Subject: [PATCH 09/20] =?UTF-8?q?=E9=82=93=E6=B4=81=20:=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=A4=B4=E5=83=8F=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/my/my.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/my/my.vue b/pages/my/my.vue index 81bd79b..32beca2 100644 --- a/pages/my/my.vue +++ b/pages/my/my.vue @@ -4,7 +4,7 @@ - + {{username}} - + @@ -38,19 +39,23 @@ }, data() { return { - position: uni.getStorageSync('city')+uni.getStorageSync('district').slice(0, 2) + position: uni.getStorageSync('city') + uni.getStorageSync('district').slice(0, 2), + currentNum: '' }; }, options: { styleIsolation: 'shared', // 解除样式隔离 }, created() { - if (this.type !== '0') { - // this.open() - } }, methods: { - + //点击轮播图 + handleSwiperList(currentNum, bannerURL) { + const item=bannerURL[currentNum] + uni.navigateTo({ + url: item.link+`?id=${item.param}&type=${item.type}` + }) + }, } } diff --git a/pages/detail/detail.vue b/pages/detail/detail.vue index 0c2aef0..9a909d1 100644 --- a/pages/detail/detail.vue +++ b/pages/detail/detail.vue @@ -94,9 +94,9 @@ }, data() { return { - shopInfo:{ + // shopInfo:{ - } + // } } }, @@ -112,9 +112,17 @@ } }, onLoad: function(options) { - const shopInfomation = JSON.parse(decodeURIComponent(options.shopInfo)) - console.log(shopInfomation); - this.shopInfo = shopInfomation + // const shopInfomation = JSON.parse(decodeURIComponent(options.shopInfo)) + // console.log(shopInfomation); + // this.shopInfo = shopInfomation + console.log('detail',options); + //点击轮播图跳转详情, 传递的参数id, type + if(options.id){ + + } + if(options.type){ + + } } } diff --git a/pages/index/index.vue b/pages/index/index.vue index bb38c7c..4d6255d 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -55,7 +55,11 @@ methods: { getBanner() { this.$api.getBanner().then(res => { - this.swiperList = res.data.data.map(item => this.$api.imgUrl + item.img) + res.data.data.forEach(item=>{ + item.img =this.$api.imgUrl + item.img + }) + this.swiperList = res.data.data + // .map(item => this.$api.imgUrl + item.img) }) }, getNotice() { From 46ea8e4ee9fe4f7fe730d080240f7ca51847d526 Mon Sep 17 00:00:00 2001 From: LuoShijie Date: Fri, 17 Nov 2023 15:17:03 +0800 Subject: [PATCH 14/20] =?UTF-8?q?=E7=BD=97=E4=B8=96=E6=9D=B0=EF=BC=9A?= =?UTF-8?q?=E6=8B=9B=E5=95=86=E3=80=81=E5=87=BA=E7=A7=9F=E6=8E=A8=E5=B9=BF?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/ShowShopList/ShowShopList.vue | 7 ++++ .../ShowShopListItem/ShowShopListItem.vue | 35 +++++++++++++++---- pages/index/NavBarPages/czxx/czxx.vue | 4 +-- pages/index/NavBarPages/xmzs/xmzs.vue | 4 +-- service/request.js | 8 +++++ 5 files changed, 47 insertions(+), 11 deletions(-) diff --git a/components/ShowShopList/ShowShopList.vue b/components/ShowShopList/ShowShopList.vue index 42a1bc4..92b477d 100644 --- a/components/ShowShopList/ShowShopList.vue +++ b/components/ShowShopList/ShowShopList.vue @@ -5,6 +5,7 @@ :key="shopid" :shopInfo="item" :is-adshow="isADshow" + :adlinkPath="adlinkPath" :show-style="showStyle" :is-edit="isEdit" @delItem="handleDel" @@ -39,6 +40,12 @@ return true } }, + adlinkPath: { + type: String, + default() { + return '' + } + }, isEdit: { type: Boolean, default() { diff --git a/components/ShowShopListItem/ShowShopListItem.vue b/components/ShowShopListItem/ShowShopListItem.vue index 575f8de..0ec72ac 100644 --- a/components/ShowShopListItem/ShowShopListItem.vue +++ b/components/ShowShopListItem/ShowShopListItem.vue @@ -67,7 +67,7 @@ v-if="isADShow" class="list-ads bottom-common" style="font-size: 11px;" - @click="handleAD()" + @click="handleAD" > 已将该店推给 @@ -95,7 +95,8 @@ * @property {Object} shopInfo 传入商铺对象数据 * @property {Number} showStyle 展示商铺的样式类型(0为首页默认) * @property {Boolean} isADshow 是否显示推广广告 - * @property {Boolean} isEdit 是否显示编辑和删除 + * @property {Boolean} isEdit 是否显示编辑和删除 + * @property {String} adlinkPath 推广广告链接 */ export default { props: { @@ -107,24 +108,35 @@ } } }, + // 展示商铺的样式类型 showStyle:{ type: Number, default() { return 0 } }, + // 是否展示推广广告 isADShow: { type: Boolean, default() { return true } }, + // 推广广告链接 + adlinkPath: { + type: String, + default() { + return '' + } + }, + // 是否可编辑 isEdit: { type: Boolean, default() { return false } - } + }, + }, data() { @@ -142,6 +154,7 @@ console.log("点击了编辑ID为",shopid); }, handleDel(shopid) { + // 需完善删除请求 this.$emit('delItem', shopid) }, enterDetail(){ @@ -150,11 +163,19 @@ }) }, handleAD(){ - uni.navigateTo({ - url: '/pages/publish/publishTransfer/publishTransfer' - }) + // TODO 完成页面跳转 + if (this.adlinkPath) { + uni.navigateTo({ + url: this.adlinkPath + }) + }else { + uni.navigateTo({ + url: '/pages/publish/publishTransfer/publishTransfer' + }) + } } - } + }, + } diff --git a/pages/index/NavBarPages/czxx/czxx.vue b/pages/index/NavBarPages/czxx/czxx.vue index 686559b..a740948 100644 --- a/pages/index/NavBarPages/czxx/czxx.vue +++ b/pages/index/NavBarPages/czxx/czxx.vue @@ -15,7 +15,7 @@ - + @@ -24,7 +24,7 @@ export default { data() { return { - + adlinkPath: "/pages/publish/publishRent/publishRent" } }, methods: { diff --git a/pages/index/NavBarPages/xmzs/xmzs.vue b/pages/index/NavBarPages/xmzs/xmzs.vue index 686559b..6bd7122 100644 --- a/pages/index/NavBarPages/xmzs/xmzs.vue +++ b/pages/index/NavBarPages/xmzs/xmzs.vue @@ -15,7 +15,7 @@ - + @@ -24,7 +24,7 @@ export default { data() { return { - + adlinkPath: "/pages/publish/publishInvestment/publishInvestment" } }, methods: { diff --git a/service/request.js b/service/request.js index 0e75a9c..1973f88 100644 --- a/service/request.js +++ b/service/request.js @@ -239,6 +239,14 @@ const apiService = { console.log(data); resolve(service.post(url,data)) }) + }, + //获取商铺列表 + getShopList(data){ + const type = data.type + const url = `shop/alllist/?type=${type}` + return new Promise((resolve,reject) => { + resolve(service.get(url)) + }) } } export { From 789dc3c1fbc039dffd02d4ee9ff70ed5b9e47da5 Mon Sep 17 00:00:00 2001 From: dengj <209192278@qq.com> Date: Fri, 17 Nov 2023 17:51:22 +0800 Subject: [PATCH 15/20] =?UTF-8?q?=E9=82=93=E6=B4=81=20:=20=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E7=95=8C=E9=9D=A2=E5=8F=8A=E6=8E=A5=E5=8F=A3=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/detail/detail.vue | 252 ++++++++++++++++++++---------------- service/request.js | 10 +- static/shoplist/service.png | Bin 0 -> 5221 bytes static/shoplist/share.png | Bin 0 -> 4237 bytes 4 files changed, 146 insertions(+), 116 deletions(-) create mode 100644 static/shoplist/service.png create mode 100644 static/shoplist/share.png diff --git a/pages/detail/detail.vue b/pages/detail/detail.vue index 9a909d1..2089b20 100644 --- a/pages/detail/detail.vue +++ b/pages/detail/detail.vue @@ -1,183 +1,215 @@ + \ No newline at end of file diff --git a/pages/publish/publishInvestment/publishInvestment.vue b/pages/publish/publishInvestment/publishInvestment.vue index 81cfadd..6160647 100644 --- a/pages/publish/publishInvestment/publishInvestment.vue +++ b/pages/publish/publishInvestment/publishInvestment.vue @@ -3,50 +3,57 @@ - 发布项目图片({{ShopInfomation.count}}/5) + 发布房源图片({{ShopInfomation.count}}/5) + + + + + + + + {{form.region}} + 请选择所属区域 - - - - - 请选择所属区域 - - - - - - - - - - 请选择行业类型 - - - - - - - 请选择行业业态 - - - - - - - - - - - - - - - - - - 发布 - + + + + + + + {{form.trade}} + 请选择行业 + + + + + + + {{form.karma}} + 请选择业态 + + + + + + + + + + + + + + + + + 发布 + @@ -54,53 +61,202 @@ export default { data() { return { - regionColumns:[JSON.parse(uni.getStorageSync('regionList'))]||[], - ShopInfomation:{ - city:'', - area:'', - count:0, - + regionColumns: [JSON.parse(uni.getStorageSync('regionList'))] || [], + ShopInfomation: { + city: '', + area: '', + count: 0, + }, - - form:{ - title:'' + + form: { + title: '', + region: '', + place: '', + trade: '', + karma: '', + size: '', + rent: '', + sell: '', + name: '', + call: '', + introduce: '' + }, + Classcolumns: [], + ClassCheckId:'', + Karmacolumns: [], + pid:[], + show1: false, + show2: false, + show3: false, + rules: { + 'title': [{ + required: true, + message: '请输入标题', + trigger: ['change', 'blur'] + }], + 'trade': [{ + required: true, + message: '请选择行业', + trigger: ['change', 'blur'] + }], + 'region': [{ + required: true, + message: '请选择地区', + trigger: ['change', 'blur'] + }], + 'karma': [{ + required: true, + message: '请选择业态', + trigger: ['change', 'blur'] + }], + 'name': [{ + required: true, + message: '请输入姓名', + trigger: ['change', 'blur'] + }], + 'sell': [{ + required: true, + message: '请输入转让金', + trigger: ['change', 'blur'] + }], + 'introduce': [{ + required: true, + message: '请输入介绍', + trigger: ['change', 'blur'] + }], + 'size': [{ + required: true, + message: '请输入面积', + trigger: ['change', 'blur'] + }], + 'rent': [{ + required: true, + message: '请输入租金', + trigger: ['change', 'blur'] + }], + 'place': [{ + required: true, + message: '请输入地址', + trigger: ['change', 'blur'] + }], + 'call':[{ + required: true, + message: '请输入电话号码', + }, + { + validator: (rule, value, callback) => { + if(value) { + return this.$u.test.mobile(value); + } else { + return true + } + }, + message: '号码不正确', + trigger: ['change','blur'], + }] + }, - columns:[ - ], - show1:false, - show2:false, - show3:false, } - }, methods: { - confirmArea(e) { - this.ShopInfomation.city = e.value[0] - this.ShopInfomation.area = e.value[1] - this.show1 = false - }, - submit(){ - console.log('提交'); + handleSearchAddress() { + uni.navigateTo({ + url: '/pages/publish/chooseAddress/chooseAddress' + }) + }, + changeAddress(e) { + // console.log('changeAddress', e); + this.getAddressList(e) + }, + getAddressList(value) { + var that = this + uni.request({ + url: 'https://apis.map.qq.com/ws/geocoder/v1/?address=' + value + '&key=' + + that.$api.key, + success(res) { + console.log('diz', res.data.result.location); + console.log('lat', res.data.result.location.lat); + console.log('lng', res.data.result.location.lng); + }, + fail(err) { + console.log('请求区域失败：', err); + } + }) + }, + submit() { + this.$refs.uForm.validate().then(res => { + console.log("提交表单信息:" + JSON.stringify(this.form)) + uni.$u.toast('发布成功') + // 调用服务端入表接口W + }).catch(errors => { + console.log("失败信息:" + JSON.stringify(errors)) + // uni.$u.toast('校验失败') + }) + }, + tradeConfirm(e){ + this.show2 = false + this.form.trade = e.value[0] + this.ClassCheckId = this.pid[e.indexs[0]] + this.$api.getClassList(this.ClassCheckId).then(res => { + // console.log(res); + this.Karmacolumns = res.data.data.map((item) => { + return item = item.name + }) + }) + }, + karmaConfirm(e){ + this.show3 = false + this.form.karma = e.value[0] + }, + regionConfirm(e){ + this.show1 = false + this.form.region = e.value[0] + }, + }, + onReady() { + this.$refs.uForm.setRules(this.rules) + + }, + onLoad() { + this.$api.getClassList().then(res =>{ + // console.log(res.data.data.length); + this.Classcolumns = res.data.data.map((item) => { + return item = item.name + }) + this.pid = res.data.data.map((item) => { + return item = item.id + }) + + }) + }, + computed:{ + isChecked(index){ + if(index.length > 0) + return true; + else + return false; } } } + \ No newline at end of file diff --git a/pages/publish/publishRent/publishRent.vue b/pages/publish/publishRent/publishRent.vue index 425d647..6670fde 100644 --- a/pages/publish/publishRent/publishRent.vue +++ b/pages/publish/publishRent/publishRent.vue @@ -6,40 +6,45 @@ 发布店铺图片({{ShopInfomation.count}}/5) - - + + - - 请选择所属区域 + + {{form.region}} + 请选择所属区域 + - + - + - - + + - - 请选择行业类型 + + {{form.trade}} + 请选择店铺行业 - + - + - - + + - - + + - - + + - + - - + + @@ -60,14 +65,79 @@ }, - form:{ - title:'' + form: { + title: '', + region: '', + place: '', + trade: '', + size: '', + rent: '', + name: '', + call: '', + introduce: '' }, - columns:[ - ], + Classcolumns:[], show1:false, show2:false, show3:false, + rules: { + 'title': [{ + required: true, + message: '请输入标题', + trigger: ['change', 'blur'] + }], + 'trade': [{ + required: true, + message: '请选择行业', + trigger: ['change', 'blur'] + }], + 'region': [{ + required: true, + message: '请选择地区', + trigger: ['change', 'blur'] + }], + 'name': [{ + required: true, + message: '请输入姓名', + trigger: ['change', 'blur'] + }], + 'introduce': [{ + required: true, + message: '请输入介绍', + trigger: ['change', 'blur'] + }], + 'size': [{ + required: true, + message: '请输入面积', + trigger: ['change', 'blur'] + }], + 'rent': [{ + required: true, + message: '请输入租金', + trigger: ['change', 'blur'] + }], + 'place': [{ + required: true, + message: '请输入地址', + trigger: ['change', 'blur'] + }], + 'call':[{ + required: true, + message: '请输入电话号码', + }, + { + validator: (rule, value, callback) => { + if(value) { + return this.$u.test.mobile(value); + } else { + return true + } + }, + message: '号码不正确', + trigger: ['change','blur'], + }] + + }, } }, @@ -77,10 +147,37 @@ this.ShopInfomation.area = e.value[1] this.show1 = false }, - submit(){ - console.log('提交'); + submit() { + this.$refs.uForm.validate().then(res => { + console.log("提交表单信息:" + JSON.stringify(this.form)) + uni.$u.toast('发布成功') + // 调用服务端入表接口W + }).catch(errors => { + console.log("失败信息:" + JSON.stringify(errors)) + // uni.$u.toast('校验失败') + }) + }, + tradeConfirm(e){ + this.show2 = false + this.form.trade = e.value[0] + }, + regionConfirm(e){ + this.show1 = false + this.form.region = e.value[0] } - } + }, + onLoad() { + this.$api.getClassList().then(res =>{ + // console.log(res.data.data.length); + this.Classcolumns = res.data.data.map((item) => { + return item = item.name + }) + }) + }, + onReady() { + this.$refs.uForm.setRules(this.rules) + + }, } @@ -123,7 +220,12 @@ font-weight:1px; color: #c1c4c7; } - + .checkedtext{ + margin-top: 5rpx; + font-size: 28rpx; + font-weight: 1px; + border-style: none; + } .picker{ display: flex; justify-content: space-between; diff --git a/pages/publish/publishTransfer/publishTransfer.vue b/pages/publish/publishTransfer/publishTransfer.vue index 07a75a4..05c6906 100644 --- a/pages/publish/publishTransfer/publishTransfer.vue +++ b/pages/publish/publishTransfer/publishTransfer.vue @@ -10,19 +10,22 @@ - 请选择所属区域 + {{form.region}} + 请选择所属区域 + + v-model="form.region" @confirm="regionConfirm"> - {{form.trade}} + {{form.trade}} + 请选择店铺行业 @@ -30,7 +33,8 @@ v-model="form.trade" @confirm="tradeConfirm"> - {{form.karma}} + {{form.karma}} + 请选择店铺业态 @@ -67,7 +71,7 @@ export default { data() { return { - // regionColumns: [JSON.parse(uni.getStorageSync('regionList'))] || [], + regionColumns: [JSON.parse(uni.getStorageSync('regionList'))] || [], ShopInfomation: { city: '', area: '', @@ -79,8 +83,8 @@ title: '', region: '', place: '', - trade: '请选择行业', - karma: '请选择业态', + trade: '', + karma: '', size: '', rent: '', sell: '', @@ -214,7 +218,11 @@ karmaConfirm(e){ this.show3 = false this.form.karma = e.value[0] - } + }, + regionConfirm(e){ + this.show1 = false + this.form.region = e.value[0] + }, }, onReady() { this.$refs.uForm.setRules(this.rules) @@ -231,6 +239,14 @@ }) }) + }, + computed:{ + isChecked(index){ + if(index.length > 0) + return true; + else + return false; + } } } @@ -279,7 +295,12 @@ font-weight: 1px; color: #c1c4c7; } - + .checkedtext{ + margin-top: 5rpx; + font-size: 28rpx; + font-weight: 1px; + border-style: none; + } .picker { display: flex; justify-content: space-between; From c6553909417108050f080404f88c6f9c0761c41d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=93=E6=B4=81?= <209192278@qq.com> Date: Fri, 17 Nov 2023 22:08:19 +0800 Subject: [PATCH 17/20] =?UTF-8?q?=E9=82=93=E6=B4=81=20:=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=BB=86=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/my/my.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pages/my/my.vue b/pages/my/my.vue index b3583a0..5fbf821 100644 --- a/pages/my/my.vue +++ b/pages/my/my.vue @@ -45,8 +45,8 @@ data() { return { src: 'https://cdn.uviewui.com/uview/album/2.jpg', - account: '123', - username: '用户名', + account: '', + username: '', isLoad: true } }, @@ -56,6 +56,7 @@ return } this.isLoad = true + this.getInfo() }, methods: { reOnLoad() { @@ -65,7 +66,7 @@ return } this.isLoad = true - if(this.isLoad){ + if (this.isLoad) { this.getInfo() } }, From 022da2f0d0b055785449e2a782624c4da698638e Mon Sep 17 00:00:00 2001 From: LuoShijie Date: Fri, 17 Nov 2023 22:36:02 +0800 Subject: [PATCH 18/20] =?UTF-8?q?=E7=BD=97=E4=B8=96=E6=9D=B0=EF=BC=9A?= =?UTF-8?q?=E5=95=86=E9=93=BA=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE=E7=BB=91?= =?UTF-8?q?=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/ShowShopList/ShowShopList.vue | 83 ++++++++++++++++--- .../ShowShopListItem/ShowShopListItem.vue | 34 ++++---- service/request.js | 5 +- 3 files changed, 92 insertions(+), 30 deletions(-) diff --git a/components/ShowShopList/ShowShopList.vue b/components/ShowShopList/ShowShopList.vue index 92b477d..8c28097 100644 --- a/components/ShowShopList/ShowShopList.vue +++ b/components/ShowShopList/ShowShopList.vue @@ -52,11 +52,32 @@ return false } }, + //获取列表类型传递参数部分 + listType:{ + type: Number, + default() { + return 1 + } + }, + pageSize: { + type: Number, + default() { + return 5 + } + }, + pageNum: { + type: Number, + default() { + return 1 + } + }, shopInfoList: { type: Array, default() { return [ { + id: 1, + type: 1, shopid: 1, imageUrl: 'https://alifei01.cfp.cn/creative/vcg/800/new/VCG41175510742.jpg', title: '琴行铺面转让', @@ -72,19 +93,41 @@ phoneNum: 13348946108, }, { - shopid: 2, - imageUrl: 'https://alifei01.cfp.cn/creative/vcg/800/new/VCG41175510742.jpg', - title: '琴行铺面转让', - promotionNum: 23, - price: 5000, - date: '2023-11-02', - pos: '锦江区', - exactPos: '锦江区-汇源南路366号', - sqr: 200, - zrfText: "转让费：20000万", - category: '餐饮美食', - uname: "王先生", - phoneNum: 13348946108, + "id": "1", + "pic": "3", + "tt": "333", + "type": "0", + "adress": "", + "trade1": "啊", + "trade2": "餐馆", + "btype1": "", + "btype2": "", + "area1": "青羊区", + "area2": "", + "mianji": "33", + "zhuanrangfei": "44", + "zujin": "44", + "hits": "0", + "58url": "", + "personurl": "", + "kw": "", + "remark": "", + "content": "44vv", + "pics": "", + "user_level_id": "1", + "lianxiren": "3333", + "mobile": "44444", + "status": "1", + "shangpulx": "1", + "zhuangtai": "1", + "lng": "2222.00000000", + "lat": "3333.00000000", + "pub_time": "0", + "create_time": "1699973131", + "update_time": "1699973131", + "delete_time": "0", + "userid": "1", + "success": "2" } ] } @@ -97,7 +140,21 @@ // TODO：不能直接修改 // if(delindex !== -1) this.shopInfoList = this.shopInfoList.slice(delindex,1) // console.log(this.shopInfoList); + }, + getList() { + const query = this.$u.queryParams({ + type: this.listType, + pageSize: this.pageSize, + pageNum: this.pageNum + }) + this.$api.getShopList(query).then(res => { + console.log("shoplist",res.data.data); + + }) } + }, + created() { + this.getList() } } diff --git a/components/ShowShopListItem/ShowShopListItem.vue b/components/ShowShopListItem/ShowShopListItem.vue index 0ec72ac..4392766 100644 --- a/components/ShowShopListItem/ShowShopListItem.vue +++ b/components/ShowShopListItem/ShowShopListItem.vue @@ -2,7 +2,7 @@ - + {{shopInfo.title}} @@ -11,13 +11,13 @@ - {{shopInfo.pos}} + {{shopInfo.area1}} - {{shopInfo.sqr}}m2 + {{shopInfo.mianji}}m2 @@ -25,13 +25,13 @@ - {{shopInfo.exactPos}} + {{shopInfo.area2}} - 租金：{{shopInfo.price}}元/月 - 发布日期：{{shopInfo.date}} - {{shopInfo.zrfText}} + 租金：{{shopInfo.zujin}}元/月 + 发布日期：{{shopInfo.create_time}} + 转让费：{{shopInfo.zhuanrangfei}} @@ -41,25 +41,25 @@ - {{shopInfo.sqr}}m2 + {{shopInfo.mianji}}m2 - {{shopInfo.category}} + {{shopInfo.trade1}} - {{shopInfo.uname}} + {{shopInfo.lianxiren}} - {{shopInfo.phoneNum}} + {{shopInfo.mobile}} @@ -78,11 +78,11 @@ - + 编辑 - + 删除 @@ -158,8 +158,14 @@ this.$emit('delItem', shopid) }, enterDetail(){ + // console.log("进入详情页面"); + const query=this.$u.queryParams({ + id: this.shopInfo.id, + type: this.shopInfo.type + }) + // console.log("query",query); uni.navigateTo({ - url: '/pages/detail/detail' + url: '/pages/detail/detail' + `${query}` }) }, handleAD(){ diff --git a/service/request.js b/service/request.js index c41bcba..727a26b 100644 --- a/service/request.js +++ b/service/request.js @@ -248,9 +248,8 @@ const apiService = { }) }, //获取商铺列表 - getShopList(data){ - const type = data.type - const url = `shop/alllist/?type=${type}` + getShopList(query){ + const url = `/shop/alllist${query}` return new Promise((resolve,reject) => { resolve(service.get(url)) }) From b055905bc432041d7e0116db1f962c8786b945cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=93=E6=B4=81?= <209192278@qq.com> Date: Sat, 18 Nov 2023 14:42:53 +0800 Subject: [PATCH 19/20] =?UTF-8?q?=E9=82=93=E6=B4=81=20:=20=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/index/map/map.vue | 132 ++++++++++++++++++++++++++++------------ 1 file changed, 94 insertions(+), 38 deletions(-) diff --git a/pages/index/map/map.vue b/pages/index/map/map.vue index d77f9d3..b2f59ce 100644 --- a/pages/index/map/map.vue +++ b/pages/index/map/map.vue @@ -8,12 +8,12 @@ --> - + - + @@ -22,6 +22,7 @@ data() { return { radius: '', + showShop: false, scaleM: [{ scale: 3, milo: 1000000 @@ -82,29 +83,40 @@ } ], scale: '', - lat: '30.48772', //纬度 - lng: '104.080145', //经度 - marker: [{ //用户当前位置 - id: 1, - latitude: 30.48772, - longitude: 104.080145, - iconPath: '../../../static/map/sp_icon_dw.png', - width: '58rpx', - height: '72rpx', - rotate: 0, - alpha: 1 - }, - //周围标记点 - { - id: 2, - latitude: 30.488573, - longitude: 104.081248, - // iconPath: '../../../static/map/sp_icon_dw.png', - width: '58rpx', - height: '72rpx', - rotate: 0, - alpha: 1 - } + lat: uni.getStorageSync('latitude'), //纬度 + lng: uni.getStorageSync('longitude'), //经度 + marker: [ + // { //用户当前位置 + // id: 1, + // latitude: uni.getStorageSync('latitude'), + // longitude: uni.getStorageSync('longitude'), + // // iconPath: '../../../static/map/sp_icon_hdw.png', + // width: '58rpx', + // height: '72rpx', + // rotate: 0, + // alpha: 1 + // }, + // { //用户当前位置 + // id: 2, + // latitude: 30.48772, + // longitude: 104.080145, + // iconPath: '../../../static/map/sp_icon_dw.png', + // width: '58rpx', + // height: '72rpx', + // rotate: 0, + // alpha: 1 + // }, + // //周围标记点 + // { + // id: 2, + // latitude: 30.488573, + // longitude: 104.081248, + // // iconPath: '../../../static/map/sp_icon_dw.png', + // width: '58rpx', + // height: '72rpx', + // rotate: 0, + // alpha: 1 + // } ], shopList: { shopid: 1, @@ -149,9 +161,9 @@ }, watch: { scale(newVal, oldVal) { - console.log('thisscale',newVal, Math.round(newVal)); - let ra='' - this.scaleM.forEach(item => { + console.log('thisscale', newVal, Math.round(newVal)); + let ra = '' + this.scaleM.forEach(item => { if (item.scale == Math.round(newVal)) { ra = item.milo } @@ -168,35 +180,62 @@ } }, created() { - this.getMapList() + // this.getMapList() }, methods: { + getDetail(type, id) { + this.$api.getShopDetail(type, id).then(res => { + console.log('详情', res); + const data = res.data.data + if (res.data.code == 1) { + this.shopList = { + shopid: 1, + imageUrl: this.$api.imgUrl + data.pics, + title: data.tt, + promotionNum: data.num, + price: data.zujin, + date: '2023-11-02', + pos: data.area1, + exactPos: data.address, + sqr: data.mianji, + zrfText: "转让费：" + data.zhuanrangfei, + category: data.trade, + uname: data.lianxiren, + phoneNum: data.mobile, + } + // data.pics = [this.$api.imgUrl + data.pics] + // this.shopInfo = data + } + }) + }, handleRegionChange(e) { console.log('地图缩放层级变化, 只能监听拖拽, 不能监听缩放', e); }, getMapList(radius) { - console.log('this.radius',radius); + console.log('longitude', uni.getStorageSync('longitude')); + console.log('latitude', uni.getStorageSync('latitude')); const realData = { longitude: uni.getStorageSync('longitude'), latitude: uni.getStorageSync('latitude'), - radius: 100 + radius: radius * 1000 } + console.log('realData.radius', realData.radius); const mockData = { longitude: 23.40, latitude: 116.38, radius: 1111111111 } - this.$api.getMap(mockData).then(res => { + this.$api.getMap(realData).then(res => { console.log('getMap', res); let obj = {} let arr = [] - if (res.statusCode === 200) { + if (res.data.code == 1) { res.data.data.forEach(item => { obj = { id: parseInt(item.id), latitude: item.lat, longitude: item.lng, - // iconPath: '../../../static/map/sp_icon_dw.png', + iconPath: '../../../static/map/sp_icon_dw.png', width: '58rpx', height: '72rpx', rotate: 0, @@ -204,7 +243,18 @@ } arr.push(obj) }) - // this.marker=arr + this.marker = [{ //用户当前位置 + id: 1, + latitude: realData.latitude, + longitude: realData.longitude, + iconPath: '../../../static/map/sp_icon_hdw.png', + width: '58rpx', + height: '72rpx', + rotate: 0, + alpha: 1 + }, + ...arr, + ] console.log('this.marker', this.marker); } }) @@ -212,12 +262,18 @@ // 图标点击 markerClick(e) { console.log('标记点击', e); + this.showShop = true let markerId = e.markerId; //点击标记点, 获取id, 查询店铺详情, 展示在下方 + this.getDetail(1, markerId) this.marker.forEach(item => { if (markerId === item.id) { - item.iconPath = "" + item.iconPath = "../../../static/map/sp_icon_hdw.png" + item.width = '58rpx' + item.height = '72rpx' } else { item.iconPath = "../../../static/map/sp_icon_dw.png" + item.width = '58rpx' + item.height = '72rpx' } }) }, From bfc5ce65656f292178fc7013b91d1e64da0a4fdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=93=E6=B4=81?= <209192278@qq.com> Date: Sat, 18 Nov 2023 14:55:02 +0800 Subject: [PATCH 20/20] =?UTF-8?q?=E9=82=93=E6=B4=81=20:=20=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE=E5=95=86=E9=93=BA=E5=B1=95=E7=A4=BA=E7=BB=86=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/index/map/map.vue | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/pages/index/map/map.vue b/pages/index/map/map.vue index b2f59ce..dcb29b4 100644 --- a/pages/index/map/map.vue +++ b/pages/index/map/map.vue @@ -188,21 +188,22 @@ console.log('详情', res); const data = res.data.data if (res.data.code == 1) { - this.shopList = { - shopid: 1, - imageUrl: this.$api.imgUrl + data.pics, - title: data.tt, - promotionNum: data.num, - price: data.zujin, - date: '2023-11-02', - pos: data.area1, - exactPos: data.address, - sqr: data.mianji, - zrfText: "转让费：" + data.zhuanrangfei, - category: data.trade, - uname: data.lianxiren, - phoneNum: data.mobile, - } + this.shopList = data + // { + // shopid: 1, + // pics: this.$api.imgUrl + data.pics, + // tt: data.tt, + // num: data.num, + // zujin: data.zujin, + // date: data.update_time, + // area1: data.area1, + // address: data.address, + // mianji: data.mianji, + // zhuanrangfei: "转让费：" + data.zhuanrangfei, + // trade: data.trade, + // lianxiren: data.lianxiren, + // mobile: data.mobile, + // } // data.pics = [this.$api.imgUrl + data.pics] // this.shopInfo = data }