Merge pull request 'lj' (#56) from lj into master

Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/56

components/ShowShopList/ShowShopList.vue

@@ -54,12 +54,12 @@
 							imageUrl: 'https://alifei01.cfp.cn/creative/vcg/800/new/VCG41175510742.jpg',
 							title: '琴行铺面转让',
 							promotionNum: 23,
-							price: 6000,
+							price: 5000,
 							date: '2023-11-02',
 							pos: '锦江区',
 							exactPos: '锦江区-汇源南路366号',
 							sqr: 100,
-							zrfText: "转让费：20万",
+							zrfText: "转让费：20000万",
 							category: '餐饮美食',
 							uname: "张先生",
 							phoneNum: 13348946108,
@@ -68,13 +68,13 @@
 							shopid: 2,
 							imageUrl: 'https://alifei01.cfp.cn/creative/vcg/800/new/VCG41175510742.jpg',
 							title: '琴行铺面转让',
-							promotionNum: 28,
+							promotionNum: 23,
 							price: 5000,
 							date: '2023-11-02',
 							pos: '锦江区',
 							exactPos: '锦江区-汇源南路366号',
 							sqr: 200,
-							zrfText: "转让费：30万",
+							zrfText: "转让费：20000万",
 							category: '餐饮美食',
 							uname: "王先生",
 							phoneNum: 13348946108,

components/ShowShopListItem/ShowShopListItem.vue

@@ -30,13 +30,13 @@
 				</view>
 				<view class="rent-and-date">
 					<text>租金：{{shopInfo.price}}元/月</text>
-					<text v-if="showStyle==0">发布日期：{{shopInfo.date}}</text>
+					<text v-if="showStyle == 0">发布日期：{{shopInfo.date}}</text>
-					<text v-else="showStyle==1 ">{{shopInfo.zrfText}}</text>
+					<text v-if="showStyle == 1">{{shopInfo.zrfText}}</text>
 				</view>
 			</view>
 		</view>
 		
-		<view class="cart-and-date bottom-common" v-if="showStyle==1">
+		<view class="cart-and-date bottom-common" v-if="showStyle == 1 || showStyle == 2">
 			<view>
 				<view>
 					<u-image src="/static/shoplist/sy_icon_lbpm.png" width="12px" height="15px"></u-image>

pages/detail/detail.vue

@@ -5,7 +5,7 @@
 		</view>
 		<view class="sub-detail u-flex">
 			<view class="title">
-				{{title}}
+				{{shopInfo.title}}
 			</view>
 			<view>
 				<u-grid :col="3">
@@ -73,7 +73,7 @@
 <script>
 	export default {
 		props: {
-			list: {
+			swiperlist: {
 				type: Array,
 				default () {
 					return [
@@ -83,8 +83,15 @@
 					]
 				}
 			},
-			
+			shopInfo: {
-			},
+				type: Object,
+				default () {
+					return {
+						title: "石锅饭铺面转让石锅饭铺面转让石锅饭铺面转",
+					}
+				}
+			}
+		},
 		data() {
 			return {
 			shopInfo:{
@@ -132,8 +139,6 @@
 		height: 100rpx;
 		background-color: #F8F8F8;
 	}
-	.swiper {
-		}
 	.title{
 		padding: 20rpx;
 		background-color: #fff;

pages/index/NavBarPages/czxx/czxx.vue

@@ -15,7 +15,7 @@
 			<DropDown></DropDown>
 		</view>
 		<view class="marginLR10">
-			<ShowShopList :showStyle="1"/>
+			<ShowShopList :showStyle="2"/>
 		</view>
 	</view>
 </template>

pages/index/NavBarPages/xmzs/xmzs.vue

@@ -15,7 +15,7 @@
 			<DropDown></DropDown>
 		</view>
 		<view class="marginLR10">
-			<ShowShopList :showStyle="1"/>
+			<ShowShopList :showStyle="2"/>
 		</view>
 	</view>
 </template>

pages/index/index.vue

@@ -29,6 +29,7 @@
 	import HomeNoticeBar from "./HomeMainContent/HomeNoticeBar.vue"
 	import HomeNavCard from "./HomeMainContent/HomeNavCard.vue"
 	import Statistics from "./HomeMainContent/Statistics.vue"
+
 	import QQMapWX from "@/utils/qqmap-wx-jssdk.min.js"
 	export default {
 		components: {
@@ -49,6 +50,7 @@
 			this.getNotice()
 			this.getStat()
 			this.open()
+			this.getClassList()
 		},
 		methods: {
 			getBanner() {
@@ -64,6 +66,10 @@
 			getStat() {
 				this.$api.getStat().then(res => {
 					this.statNum = res.data.data
+				})
+			},
+			getClassList() {
+				this.$api.getClassList().then(res => {
 					console.log(res.data.data);
 				})
 			},

pages/published/published.vue

@@ -9,12 +9,11 @@
 		</view>
 		<view class="content">
 			<ShowShopList v-if="listId == 0" class="list" :isEdit="true" :showStyle="1"></ShowShopList>
-		<SearchShopList v-if="listId == 1" class="list" :is-edit="true" :showStyle="1"></SearchShopList>
+			<SearchShopList v-if="listId == 1" class="list" :is-edit="true" :showStyle="1"></SearchShopList>
-		<ShowShopList v-if="listId == 2" class="list" :is-edit="true" :showStyle="1"></ShowShopList>
+			<ShowShopList v-if="listId == 2" class="list" :is-edit="true" :showStyle="2"></ShowShopList>
-		<ShowShopList v-if="listId == 3" class="list" :is-edit="true" :showStyle="1"></ShowShopList>
+			<ShowShopList v-if="listId == 3" class="list" :is-edit="true" :showStyle="2"></ShowShopList>
-		<ShowShopList v-if="listId == 4" class="list" :showStyle="1"></ShowShopList>
+			<ShowShopList v-if="listId == 4" class="list" :showStyle="0"></ShowShopList>
 		</view>
-		
 	</view>
 </template>
 

service/request.js

@@ -204,6 +204,7 @@ const apiService = {
 			resolve(service.get(url))
 		})
 	},
+	//获取首页分析数据
 	getStat() {
 		const url = `/home/stat`
 		return new Promise((resolve, reject) => {
@@ -223,6 +224,13 @@ const apiService = {
 		return new Promise((resolve,reject) => {
 			resolve(service.get(url))
 		})
+	},
+	//获取行业和业态
+	getClassList(pid){
+		const url = `/home/classlist/?pid=${pid}`
+		return new Promise((resolve,reject) => {
+			resolve(service.post(url))
+		})
 	}
 }
 export {