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

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

pages.json

@@ -97,7 +97,17 @@
 			}
 
 		}
-	],
+	    
+        ,{
+            "path" : "pages/Partnerships/Partnerships",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "成功合伙人",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+    ],
 	"tabBar": {
 		"color": "#CCCCCC",
 		"borderStyle": "white",

pages/Partnerships/Partnerships.vue

@@ -0,0 +1,41 @@
+<template>
+	<view>
+		<u-form>
+			<u-form-item label="名称" label-position="top" border-bottom="true" labelStyle="margin-left: 20px">
+				<u-input v-model="form.name" placeholder="请输入标题以便吸引人的注意哦" placeholder-class="input-class" border="none"></u-input>
+			</u-form-item>
+			<u-form-item label="身份证号" label-position="top" border-bottom="true" labelStyle="margin-left: 20px">
+				<u-input v-model="form.name" placeholder="请输入标题以便吸引人的注意哦" placeholder-class="input-class" border="none"></u-input>
+			</u-form-item>
+			<u-form-item label="选择支付方式" label-position="top" border-bottom="true" labelStyle="font-size = 5px">
+				<u-cell is-link="true" @click="show = true" label="请选择支付方式">
+				</u-cell>
+				<u-picker mode="region" :show="show" :closeOnClickOverlay="true" @close="show = false" :columns="columns" @confirm="confirmCheckWay"></u-picker>
+			</u-form-item>
+		</u-form>
+		<u-button @click="submit" color="linear-gradient(to right, #E86262, #CC3333)" :size="normal" shape="circle" class="submit-btn">发布</u-button>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				show: false,
+			}
+		},
+		methods: {
+			submit(){
+				console.log('提交');
+			},
+			confirmCheckWay(){
+				
+			}
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/detail/detail.vue

@@ -5,7 +5,7 @@
 		</view>
 		<view class="sub-detail u-flex">
 			<view class="title">
-				石锅饭铺面转让石锅饭铺面转让石锅饭铺面转
+				{{title}}
 			</view>
 			<view>
 				<u-grid :col="3">
@@ -78,15 +78,13 @@
 			},
 		data() {
 			return {
-				viewheight:'',
+			shopInfo:{
+				
+			}
 				
 			}
 		},
 		methods: {
-			// getHeight(){
-			// 	let height = this.$refs.viewref.$el.offsetHeight
-			// 	this.viewheight = height
-			// },
 			phonecall(){
 				console.log('打电话');
 			},
@@ -97,10 +95,12 @@
 				console.log('客服');
 			}
 		},
-		mounted(){
+		onLoad: function(options) {
-			// this.getHeight();
+			const shopInfomation = JSON.parse(decodeURIComponent(options.shopInfo))
-			// console.log(viewheight)
+			console.log(shopInfomation);
+			this.shopInfo = shopInfomation
 		}
+		
 	}
 </script>
 

pages/my/my.vue

@@ -16,8 +16,8 @@
 					<u-cell icon="integral-fill" title="发布的找店选址" is-link="true"  @click="topublished('发布的找店选址')"></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="topublished('发布的项目招商')"></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="topartner"></u-cell>
-					<u-cell icon="integral-fill" title="我的匹配" is-link="true" @click="todetail"></u-cell>
+					<u-cell icon="integral-fill" title="我的匹配" is-link="true" @click="topublished('我的匹配')"></u-cell>
 			</u-cell-group>
 		</view>
 		</view>
@@ -47,6 +47,11 @@
 				uni.navigateTo({
 					url:'/pages/detail/detail'
 				})
+			},
+			topartner(){
+				uni.navigateTo({
+					url:'/pages/Partnerships/Partnerships'
+				})
 			}
 			//---------页面调用接口示例------------
 			// getInfo() {

pages/publish/publishTransfer/publishTransfer.vue

@@ -3,7 +3,7 @@
 		<u-form :model="form" ref="uForm">
 			<view class="upload">
 				<u-upload max-count="5" upload-icon="photo"></u-upload>
-				<text>发布房源图片({{count}}/5)</text>
+				<text>发布房源图片({{ShopInfomation.count}}/5)</text>
 			</view>
 				
 				<u-form-item label="标题" label-position="top" border-bottom="true" labelStyle="margin-left: 20px">
@@ -12,7 +12,7 @@
 				<u-form-item label="区域" label-position="top" border-bottom="true" labelStyle="margin-left: 20px">
 					<u-cell is-link="true" @click="show1 = true"><text>111111</text>
 					</u-cell>
-					<u-picker mode="region" :show="show1" :closeOnClickOverlay="true" @close="show1 = false" :columns="columns" @confirm="confirm"></u-picker>
+					<u-picker mode="region" :show="show1" :closeOnClickOverlay="true" @close="show1 = false" :columns="columns" @confirm="confirmArea"></u-picker>
 				</u-form-item>
 				<u-form-item label="地址" label-position="top" border-bottom="true" labelStyle="margin-left: 20px">
 					<u-input v-model="form.name" placeholder="请输入店铺地址" placeholder-class="input-class" border="none"></u-input>
@@ -37,7 +37,12 @@
 				<u-form-item label="标题" label-position="top" border-bottom="true" labelStyle="margin-left: 20px">
 					<u-input v-model="form.name" placeholder="请输入标题以便吸引人的注意哦" placeholder-class="input-class" border="none"></u-input>
 				</u-form-item>
+				
 			</u-form>
+			<u-button @click="submit" color="linear-gradient(to right, #E86262, #CC3333)" :size="normal" shape="circle" class="submit-btn">发布</u-button>
+			<view class="bug-figure">
+				
+			</view>
 	</view>
 </template>
 
@@ -45,27 +50,35 @@
 	export default {
 		data() {
 			return {
+				ShopInfomation:{
 				city:'',
 				area:'',
 				count:0,
-				show1:false,
+				
-				show2:false,
+				},
-				show3:false,
+				
 				form:{
 					title:''
 				},
 				columns:[
 					['中国', '美国'],
 					['深圳', '厦门', '上海', '拉萨']
-				]
+				],
+				show1:false,
+				show2:false,
+				show3:false,
 			}
+			
 		},
 		methods: {
-			confirm(e) {
+			confirmArea(e) {
-			                this.city = e.value[0]
+			                this.ShopInfomation.city = e.value[0]
-							this.area = e.value[1]
+							this.ShopInfomation.area = e.value[1]
 			                this.show1 = false
-						}
+						},
+			submit(){
+				console.log('提交');
+			}
 		}
 	}
 </script>
@@ -73,6 +86,7 @@
 <style lang="scss">
 	.form{
 		margin-left: 20px;
+		margin-right: 20px;
 	}
 	.input-class{
 		font-size: 30rpx;
@@ -85,6 +99,12 @@
 		justify-content: center;
 		align-items: center;
 		background-color: #F8F8F8;
-		margin-right: 20px;
+		// margin-right: 20px;
+	}
+	.submit-btn{
+		width: 80%;
+	}
+	.bug-figure{
+		height: 100rpx;
 	}
 </style>

pages/published/published.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view class="body">
 		<view class="search-box">
 			<view class="search-box-input">
 				<u-input placeholder="热门搜索" placeholder-style="color: #969696" prefixIcon="search"
@@ -7,7 +7,10 @@
 				</u-input>
 			</view>
 		</view>
-		<ShowShopList></ShowShopList>
+		<ShowShopList v-if="listId == 0" class="list"></ShowShopList>
+		<SearchShopList v-if="listId == 1" class="list"></SearchShopList>
+		<ShowShopList v-if="listId == 2" class="list"></ShowShopList>
+		<ShowShopList v-if="listId == 3" class="list"></ShowShopList>
 	</view>
 </template>
 
@@ -15,7 +18,8 @@
 	export default {
 		data() {
 			return {
-				titletext:''
+				titletext:'',
+				listId:''
 			}
 		},
 		methods: {
@@ -25,8 +29,24 @@
 		    wx.setNavigationBarTitle({
 		      title: option.titletext
 		    })
-		  },
+			this.titletext = option.titletext
+			if(this.titletext == '发布的店铺转让'){
+				this.listId = 0
+			}
+			else if(this.titletext == '发布的找店选址'){
+				this.listId = 1
+			}
+			else if(this.titletext = '成功合伙人'){
+				this.listId = 2
+			}
+			else
+			this.listId = 3
 			
+			
+		  },
+		computed:{
+			
+		}
 	}
 </script>
 
@@ -59,4 +79,7 @@
 				}
 			}
 		}
+		.body{
+			background-color: #F8F8F8;
+		}
 </style>