diff --git a/components/DropDown/DropDown.vue b/components/DropDown/DropDown.vue index d53355f..12c017a 100644 --- a/components/DropDown/DropDown.vue +++ b/components/DropDown/DropDown.vue @@ -55,7 +55,8 @@ } }, created() { - this.postlist[1]=JSON.parse(uni.getStorageSync('regionList')) + this.postlist[0]=JSON.parse(uni.getStorageSync('classList')) + // this.postlist[1]=JSON.parse(uni.getStorageSync('regionList')) }, methods: { changeActiveIndex(index) { diff --git a/components/ShowShopList/ShowShopList.vue b/components/ShowShopList/ShowShopList.vue index eab12e1..8c28097 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,17 +40,44 @@ return true } }, + adlinkPath: { + type: String, + default() { + return '' + } + }, isEdit: { type: Boolean, default() { 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: '琴行铺面转让', @@ -65,26 +93,45 @@ 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" } ] } } - }, - computed: { - }, methods: { handleDel(shopid){ @@ -93,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 575f8de..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}} @@ -67,7 +67,7 @@ v-if="isADShow" class="list-ads bottom-common" style="font-size: 11px;" - @click="handleAD()" + @click="handleAD" > 已将该店推给 @@ -78,11 +78,11 @@ - + 编辑 - + 删除 @@ -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,19 +154,34 @@ console.log("点击了编辑ID为",shopid); }, handleDel(shopid) { + // 需完善删除请求 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(){ - 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/Partnerships/Partnerships.vue b/pages/Partnerships/Partnerships.vue index 9c1d2eb..e9c6783 100644 --- a/pages/Partnerships/Partnerships.vue +++ b/pages/Partnerships/Partnerships.vue @@ -29,15 +29,25 @@