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

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

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>
-		<ShowShopList v-if="listId == 2" class="list" :is-edit="true" :showStyle="1"></ShowShopList>
-		<ShowShopList v-if="listId == 3" class="list" :is-edit="true" :showStyle="1"></ShowShopList>
-		<ShowShopList v-if="listId == 4" class="list" :showStyle="1"></ShowShopList>
+			<SearchShopList v-if="listId == 1" class="list" :is-edit="true" :showStyle="1"></SearchShopList>
+			<ShowShopList v-if="listId == 2" class="list" :is-edit="true" :showStyle="2"></ShowShopList>
+			<ShowShopList v-if="listId == 3" class="list" :is-edit="true" :showStyle="2"></ShowShopList>
+			<ShowShopList v-if="listId == 4" class="list" :showStyle="0"></ShowShopList>
 		</view>
-		
 	</view>
 </template>