Merge pull request 'lh' (#12) from lh into master

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

pages.json

@@ -62,6 +62,16 @@
 				"navigationBarTitleText" : "商品详情"
 			}
         }
+        
+        ,{
+            "path" : "pages/published/published",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": true
+            }
+            
+        }
     ],
     "tabBar" : {
         "color" : "#CCCCCC",

pages/detail/detail.vue

@@ -1,7 +1,7 @@
 <template>
-	<view class="detail">
+	<view class="detail" ref="viewref">
 		<view class="swiper">
-				<u-swiper :list="list" height="300rpx" radius="0"></u-swiper>
+				<u-swiper :list="list" height="500rpx" radius="0"></u-swiper>
 		</view>
 		<view class="sub-detail u-flex">
 			<view class="title">
@@ -10,15 +10,15 @@
 			<view>
 				<u-grid :col="3">
 						<u-grid-item>
-							<view class="grid-text">22</view>
+							<view class="grid-textup">22</view>
 							<view class="grid-text">租金</view>
 						</u-grid-item>
 						<u-grid-item>
-							<view class="grid-text">22</view>
+							<view class="grid-textup">22</view>
 							<view class="grid-text">转让费</view>
 						</u-grid-item>
 						<u-grid-item>
-							<view class="grid-text">22</view>
+							<view class="grid-textup">22</view>
 							<view class="grid-text">面积</view>
 						</u-grid-item>
 					</u-grid>
@@ -34,28 +34,30 @@
 				<u-avatar :src="src"></u-avatar>
 				<u-cell title="张先生" label="123456"></u-cell>
 			</view>
-			<u-cell title="店铺介绍" label="美食杂货店是一个主打食品和日用杂货的淘宝222222222222222222222美食杂货店是一个主打食品和日用杂货的淘宝美食杂货店是一个主打食品和日用杂货的淘宝"></u-cell>
+			<u-cell title="店铺介绍" label="美食杂货店是一个主打食品和日用杂货的淘宝222222222222222222222美食杂货店是一个主打食品和日用杂货的淘宝美食杂货店是一个主打食品和日用杂货的淘宝" label-style="color = #5D5D5D"></u-cell>
 		</view>
 		<view class="bottom">
 			<view class="bot-tab">
 				<view class="tab-left">
-					<view class="share">
+					<view class="share" @click="share()">
 						<u-icon name="share-fill" color="green"></u-icon>
 						分享
 					</view>
-					<view class="customer">
+					<view class="customer" @click="assist()">
 						<u-icon name="server-fill" color="green"></u-icon>
 						客服
 					</view>
 				</view>
-				<view class="tab-right">
+				<view class="tab-right" @click="phonecall()">
-					<view class="call">
+					<view class="call" >
-						打电话
+						<text>打电话</text>
 					</view>
 				</view>
 			</view>
 	</view>
-		
+		<view class="bug-figure">
+			
+		</view>
 	</view>
 </template>
 
@@ -76,11 +78,28 @@
 			},
 		data() {
 			return {
+				viewheight:'',
 				
 			}
 		},
 		methods: {
-			
+			// getHeight(){
+			// 	let height = this.$refs.viewref.$el.offsetHeight
+			// 	this.viewheight = height
+			// },
+			phonecall(){
+				console.log('打电话');
+			},
+			share(){
+				console.log('分享');
+			},
+			assist(){
+				console.log('客服');
+			}
+		},
+		mounted(){
+			// this.getHeight();
+			// console.log(viewheight)
 		}
 	}
 </script>
@@ -90,12 +109,22 @@
 		// background-color: #F8F8F8;
 		height: 100%;
 	}
+	.bug-figure{
+		height: 100rpx;
+	}
 	.swiper {
 		}
 	.title{
 		padding: 20rpx;
 		background-color: #fff;
 	}
+	.grid-textup{
+		color: #CC3333;
+		font-size: 20px;
+	}
+	.grid-text{
+		color: #B3B3B3;
+	}
 	.location-detail{
 		display: flex;
 		margin-top: 20rpx;
@@ -120,7 +149,8 @@
 		background-color: #fff;
 		width: 100%;
 		z-index: 100;
-		height: 100rpx;
+		// height: 100rpx;
+		// bottom: calc(var(--window-bottom) + 20px);
 	}
 	.bot-tab{
 		display: flex;
@@ -131,19 +161,36 @@
 		width: 50%;
 		display: flex;
 		justify-content: space-around;
-		height: 100px;
+		height: 50px;
 	}
-	.coustom{
+	.customer{
-		height: 100px;
+		// height: 50px;
-	}
-	.tab-right{
-		width: 50%;
-		height: 100%;
 		display: flex;
 		justify-content: center;
 		align-items: center;
+		flex-direction: column;
+		width: 50%;
+	}
+	.tab-right{
+		width: 50%;
+		height: 50px;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		background-image: linear-gradient(to right, #E86262, #CC3333);
 	}
 	.share{
-		
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		flex-direction: column;
+		width: 50%;
+	}
+	.call{
+		color: #fff;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		flex-direction: column;
 	}
 </style>

pages/my/my.vue

@@ -12,11 +12,12 @@
 		</view>
 		<view class="publish">
 			<u-cell-group>
-					<u-cell icon="setting-fill" title="发布的店铺转让" is-link="true"></u-cell>
+					<u-cell icon="setting-fill" title="发布的店铺转让" is-link="true" @click="topublished('发布的店铺转让')"></u-cell>
-					<u-cell icon="integral-fill" title="发布的找店选址" is-link="true"></u-cell>
+					<u-cell icon="integral-fill" title="发布的找店选址" is-link="true"  @click="topublished('发布的找店选址')"></u-cell>
-					<u-cell icon="integral-fill" title="发布的店铺出租" is-link="true"></u-cell>
+					<u-cell icon="integral-fill" title="发布的店铺出租" is-link="true"  @click="topublished('发布的店铺出租')"></u-cell>
-					<u-cell icon="integral-fill" title="发布的项目招商" is-link="true"></u-cell>
+					<u-cell icon="integral-fill" title="发布的项目招商" is-link="true"  @click="topublished('发布的项目招商')"></u-cell>
-					<u-cell icon="integral-fill" title="成功合伙人" is-link="true"></u-cell>
+					<u-cell icon="integral-fill" title="成功合伙人" is-link="true"  @click="topublished('成功合伙人')"></u-cell>
+					<u-cell icon="integral-fill" title="我的匹配" is-link="true" @click="todetail"></u-cell>
 			</u-cell-group>
 		</view>
 		</view>
@@ -30,13 +31,23 @@
 			return {
 				src: 'https://cdn.uviewui.com/uview/album/2.jpg',
 				account:'11111111',
-				username:'用户名'
+				username:'用户名',
 			}
 		},
 		onLoad() {
 			// this.getInfo()
 		},
 		methods: {
+			topublished(title){
+				uni.navigateTo({
+					url:'/pages/published/published?titletext='+title
+				})
+			},
+			todetail(){
+				uni.navigateTo({
+					url:'/pages/detail/detail'
+				})
+			}
 			//---------页面调用接口示例------------
 			// getInfo() {
 			// 	this.$api.getUserInfo().then(res => {
@@ -60,6 +71,7 @@
 		gap: 10rpx;
 		.profile-bgi{
 			position: absolute;
+			width: 100%;
 			z-index: -1;
 		}
 		.avator{

pages/published/published.vue

@@ -0,0 +1,61 @@
+<template>
+	<view>
+		<view class="search-box">
+			<view class="search-box-input">
+				<u-input placeholder="热门搜索" placeholder-style="color: #969696" prefixIcon="search"
+					prefixIconStyle="font-size: 24px;color: #909399;" border="true">
+				</u-input>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				titletext:''
+			}
+		},
+		methods: {
+			
+		},
+		onLoad: function (option) {
+		    wx.setNavigationBarTitle({
+		      title: option.titletext
+		    })
+		  },
+
+	}
+</script>
+
+<style lang="scss">
+		.search-box {
+			position: absolute;
+			z-index: 1;
+			left: 50%;
+			width: 84.6%;
+			transform: translateX(-50%);
+		
+			.search-box-input {
+				border-radius: 12rpx;
+				margin-top: 20rpx;
+				background-color: #fff;
+				opacity: 0.85;
+		
+				.u-border {
+					border: none;
+		
+					.u-input__content {
+						height: 62rpx;
+						border-radius: 12rpx;
+						background-color: #fff;
+		
+						.u-input__content__field-wrapper__field {
+							font-size: 26rpx !important;
+						}
+					}
+				}
+			}
+		}
+</style>