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

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

pages/my/edit/edit.vue

@@ -1,45 +1,48 @@
 <template>
 	<view>
 		<view class="avatar">
-			<u-avatar @click="changeAvatar()" :src="avatar"></u-avatar>
+			<u-avatar @click="changeAvatar()" :src="Info.avatar"></u-avatar>
 		</view>
 		<view class="name-edit">
 			<text>用户名：</text>
-			<u-input border="surround"  v-model="username"></u-input>
+			<u-input border="surround"  v-model="Info.username"></u-input>
 		</view>
 		<view class="send">
-			<u-button @click="editInfo" color="linear-gradient(to right, #E86262, #CC3333)">提交</u-button>
+			<u-button @click="editInfo(Info)" color="linear-gradient(to right, #E86262, #CC3333)">提交</u-button>
 		</view>
 	</view>
 </template>
 
 <script>
 	export default {
-		data() {
+		data(){
 			return {
-				username:'',
-				avatar:''
+				Info:{
+					avatar:[],
+					username:''
+				}
 			}
 		},
 		methods: {
 			changeAvatar(){
-				// uni.uploadFile()
-				console.log(111);
+				uni.chooseImage({
+					success: (chooseImageRes) => {
+						this.Info.avatar = chooseImageRes.tempFilePaths.toString() ;
+					}
+				});
 			},
-			editInfo(){
-				this.$api.editPersonInfo({
-				nickname:this.$data.nickname,
-				avatar:this.$data.avatar,
-				Headers:wx.getStorageSync('token')
-			}).then(res => {
-				console.log(res);
+			editInfo(data){
+				let resdata=JSON.stringify(data);  
+				this.$api.editPersonInfo(resdata).then(res => {
+				console.log(resdata);
+				console.log(res)
 			})
-			}
+			},
 		},
 		onLoad() {
 			let that = this
-			this.$data.username = wx.getStorageSync('nickname')
-			this.$data.avatar = wx.getStorageSync('avatar')
+			this.$data.Info.username = wx.getStorageSync('nickname')
+			this.$data.Info.avatar = wx.getStorageSync('avatar')
 			
 		}
 	}

pages/publish/publishTransfer/publishTransfer.vue

@@ -6,11 +6,10 @@
 				<text class="count">发布房源图片({{ShopInfomation.count}}/5)</text>
 			</view>
 
-			<u-form-item label="标题" label-position="top" border-bottom="true" prop="title">
-				<u-input v-model="form.title" placeholder="请输入标题以便吸引人的注意哦" placeholder-class="input-class"
-					border="none"></u-input>
+			<u-form-item label="标题" label-position="top" border-bottom="true" prop="title" label-width="auto">
+				<u-input v-model="form.title" placeholder="请输入标题以便吸引人的注意哦" placeholder-class="input-class" border="none"></u-input>
 			</u-form-item>
-			<u-form-item label="区域" label-position="top" border-bottom="true" right-icon="arrow-right" prop="region">
+			<u-form-item label="区域" label-position="top" border-bottom="true" right-icon="arrow-right" prop="region" label-width="auto">
 				<text @click="show1 = true" class="checktext">请选择所属区域</text>
 				<view class="arrow-icon">
 					<u-icon name="arrow-right" size="30px"></u-icon>
@@ -18,11 +17,11 @@
 				<u-picker :columns="regionColumns" :show="show1" :closeOnClickOverlay="true" @close="show1 = false"
 					v-model="form.region"></u-picker>
 			</u-form-item>
-			<u-form-item label="地址" label-position="top" border-bottom="true" prop="place">
+			<u-form-item label="地址" label-position="top" border-bottom="true" prop="place" label-width="auto">
 				<u-input v-model="form.place" placeholder="请输入店铺地址" placeholder-class="input-class" border="none"
 					@change="changeAddress"></u-input>
 			</u-form-item>
-			<u-form-item label="行业" label-position="top" border-bottom="true" class="picker">
+			<u-form-item label="行业" label-position="top" border-bottom="true" class="picker" label-width="auto" prop="trade">
 				<text @click="show2 = true" class="checktext">请选择行业类型</text>
 				<view class="arrow-icon">
 					<u-icon name="arrow-right" size="30px"></u-icon>
@@ -30,7 +29,7 @@
 				<u-picker mode="region" :show="show2" :closeOnClickOverlay="true" @close="show2 = false"
 					v-model="form.trade"></u-picker>
 			</u-form-item>
-			<u-form-item label="业态" label-position="top" border-bottom="true">
+			<u-form-item label="业态" label-position="top" border-bottom="true" label-width="auto" prop="karma">
 				<text @click="show3 = true" class="checktext">请选择行业业态</text>
 				<view class="arrow-icon">
 					<u-icon name="arrow-right" size="30px"></u-icon>
@@ -38,22 +37,22 @@
 				<u-picker mode="region" :show="show3" :closeOnClickOverlay="true" @close="show3 = false"
 					v-model="form.karma"></u-picker>
 			</u-form-item>
-			<u-form-item label="面积" label-position="top" border-bottom="true" prop="size">
+			<u-form-item label="面积" label-position="top" border-bottom="true" label-width="auto" prop="size">
 				<u-input v-model="form.size" placeholder="请输入店铺面积" placeholder-class="input-class" border="none"></u-input>
 			</u-form-item>
-			<u-form-item label="租金（元/月）" label-position="top" border-bottom="true" label-width="100%" prop="rent">
+			<u-form-item label="租金（元/月）" label-position="top" border-bottom="true" label-width="auto" prop="rent">
 				<u-input v-model="form.rent" placeholder="请输入店铺租金" placeholder-class="input-class" border="none"></u-input>
 			</u-form-item>
-			<u-form-item label="转让费（万元）" label-position="top" border-bottom="true" label-width="100%" prop="sell">
+			<u-form-item label="转让费（万元）" label-position="top" border-bottom="true" label-width="auto" prop="sell">
 				<u-input v-model="form.sell" placeholder="请输入店铺转让费" placeholder-class="input-class" border="none"></u-input>
 			</u-form-item>
-			<u-form-item label="联系人" label-position="top" border-bottom="true" label-width="100%" prop="name">
+			<u-form-item label="联系人" label-position="top" border-bottom="true" label-width="auto" prop="name">
 				<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" label-width="100%" prop="call">
+			<u-form-item label="手机号码" label-position="top" border-bottom="true" label-width="auto" prop="call">
 				<u-input v-model="form.call" placeholder="请输入联系人手机号码" placeholder-class="input-class" border="none"></u-input>
 			</u-form-item>
-			<u-form-item label="详情介绍" label-position="top" border-bottom="true" label-width="100%" prop="introduce">
+			<u-form-item label="详情介绍" label-position="top" border-bottom="true" label-width="auto" prop="introduce">
 				<u-input v-model="form.introduce" placeholder="请输入介绍详情" placeholder-class="input-class" border="none"></u-input>
 			</u-form-item>
 		</u-form>
@@ -68,7 +67,7 @@
 	export default {
 		data() {
 			return {
-				regionColumns: [JSON.parse(uni.getStorageSync('regionList'))] || [],
+				// regionColumns: [JSON.parse(uni.getStorageSync('regionList'))] || [],
 				ShopInfomation: {
 					city: '',
 					area: '',
@@ -97,17 +96,70 @@
 				show3: false,
 				rules: {
 					'title': [{
-						type: 'string',
-						require: true,
+						required: true,
+						message: '请输入标题',
+						trigger: ['change', 'blur']
+					}],
+					'trade': [{
+						required: true,
+						message: '请选择行业',
+						trigger: ['change', 'blur']
+					}],
+					'region': [{
+						required: true,
+						message: '请选择地区',
+						trigger: ['change', 'blur']
+					}],
+					'karma': [{
+						required: true,
+						message: '请选择业态',
+						trigger: ['change', 'blur']
+					}],
+					'name': [{
+						required: true,
 						message: '请输入姓名',
 						trigger: ['change', 'blur']
 					}],
+					'sell': [{
+						required: true,
+						message: '请输入转让金',
+						trigger: ['change', 'blur']
+					}],
+					'introduce': [{
+						required: true,
+						message: '请输入介绍',
+						trigger: ['change', 'blur']
+					}],
+					'size': [{
+						required: true,
+						message: '请输入面积',
+						trigger: ['change', 'blur']
+					}],
+					'rent': [{
+						required: true,
+						message: '请输入租金',
+						trigger: ['change', 'blur']
+					}],
 					'place': [{
-						type: 'string',
-						require: true,
+						required: true,
 						message: '请输入地址',
 						trigger: ['change', 'blur']
 					}],
+					'call':[{
+						required: true,
+						message: '请输入电话号码',
+					},
+					{
+						validator: (rule, value, callback) => {
+							if(value) {
+								return this.$u.test.mobile(value);
+							} else {
+								return true
+							}
+						},
+						message: '号码不正确',
+						trigger: ['change','blur'],
+					}]
 
 				},
 			}
@@ -118,11 +170,6 @@
 					url: '/pages/publish/chooseAddress/chooseAddress'
 				})
 			},
-			confirmArea(e) {
-				this.ShopInfomation.city = e.value[0]
-				this.ShopInfomation.area = e.value[1]
-				this.show1 = false
-			},
 			submit() {
 				this.$refs.uForm.validate().then(res => {
 					console.log("提交表单信息:" + JSON.stringify(this.form))

pages/published/published.vue

@@ -7,11 +7,14 @@
 				</u-input>
 			</view>
 		</view>
-		<ShowShopList v-if="listId == 0" class="list" :isEdit="true"></ShowShopList>
-		<SearchShopList v-if="listId == 1" class="list" :is-edit="true"></SearchShopList>
-		<ShowShopList v-if="listId == 2" class="list" :is-edit="true"></ShowShopList>
-		<ShowShopList v-if="listId == 3" class="list" :is-edit="true"></ShowShopList>
-		<ShowShopList v-if="listId == 4" class="list" ></ShowShopList>
+		<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>
+		</view>
+		
 	</view>
 </template>
 
@@ -20,10 +23,17 @@
 		data() {
 			return {
 				titletext:'',
-				listId:''
+				listId:'',
+				matchList:[]
 			}
 		},
 		methods: {
+			getMatch(){
+				this.$api.getMyMatch().then(res => {
+					this.macthList = res.data.data
+					console.log(res);
+				})
+			}
 			
 		},
 		onLoad: function (option) {
@@ -44,9 +54,10 @@
 			if(this.titletext == '发布的店铺出租'){
 				this.listId = 3
 			}
-			if(this.titletext == '我的匹配')
+			if(this.titletext == '我的匹配'){
 				this.listId = 4
-			
+					this.getMatch()
+				}
 			
 		  },
 		computed:{
@@ -87,4 +98,8 @@
 		page{
 			background-color: #F8F8F8;
 		}
+			
+		.content{
+			margin: 0 10px;
+		}
 </style>

service/request.js

@@ -210,10 +210,18 @@ const apiService = {
 			resolve(service.get(url))
 		})
 	},
-	editPersonInfo(data) {
-		const url = `/center/userupdate`
-		return new Promise((resolve, reject) => {
-			resolve(service.post(url, data))
+	//修改个人信息
+	editPersonInfo(data){
+		const url = `center/userupdate`
+		return new Promise((resolve,reject) => {
+			resolve(service.putWithFormData(url,data))
+		})
+	},
+	//获取我的匹配
+	getMyMatch(){
+		const url = `/center/match/`
+		return new Promise((resolve,reject) => {
+			resolve(service.get(url))
 		})
 	}
 }