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

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

pages/my/my.vue

@@ -106,6 +106,18 @@
 					}
 				})
 			}
+			//---------页面调用接口示例------------
+			getInfo() {
+				this.$api.getUser().then(res => {
+					var data = res.data.data
+					if (data) {
+						console.log(data);
+						this.src = this.$api.imgUrl + data.avatar
+						this.username = data.nickname
+						this.account = data.sn
+					}
+				})
+			}
 		}
 	}
 </script>

pages/publish/publishTransfer/publishTransfer.vue

@@ -2,8 +2,8 @@
 	<view class="form">
 		<u-form :model="form" ref="uForm">
 			<view class="upload">
-				<u-upload max-count="5" upload-icon="photo"></u-upload>
+				<u-upload max-count="5" upload-icon="photo" :preview-full-image="true" :file-list="image"></u-upload>
-				<text class="count">发布房源图片({{ShopInfomation.count}}/5)</text>
+				<text class="count">发布房源图片(0/5)</text>
 			</view>
 
 			<u-form-item label="标题" label-position="top" border-bottom="true" prop="title" label-width="auto">
@@ -19,45 +19,45 @@
 				<u-picker :columns="regionColumns" :show="show1" :closeOnClickOverlay="true" @close="show1 = false"
 					v-model="form.region" @confirm="regionConfirm"></u-picker>
 			</u-form-item>
-			<u-form-item label="地址" label-position="top" border-bottom="true" prop="place" label-width="auto">
+			<u-form-item label="地址" label-position="top" border-bottom="true" prop="address" label-width="auto">
-				<u-input v-model="form.place" placeholder="请输入店铺地址" placeholder-class="input-class" border="none"
+				<u-input v-model="form.address" 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" label-width="auto" prop="trade" >
+			<u-form-item label="行业" label-position="top" border-bottom="true" class="picker" label-width="auto" prop="business" >
-				<text @click="show2 = true" class="checkedtext" v-if="form.trade.length>0">{{form.trade}}</text>
+				<text @click="show2 = true" class="checkedtext" v-if="form.business.length>0">{{form.business}}</text>
 				<text @click="show2 = true" class="checktext" v-else>请选择店铺行业</text>
 				<view class="arrow-icon">
 					<u-icon name="arrow-right" size="30px" @click="show2 = true"></u-icon>
 				</view>
 				<u-picker mode="region" :show="show2" :closeOnClickOverlay="true" @close="show2 = false" :columns="[Classcolumns]"
-					v-model="form.trade" @confirm="tradeConfirm"></u-picker>
+					v-model="form.business" @confirm="tradeConfirm"></u-picker>
 			</u-form-item>
-			<u-form-item label="业态" label-position="top" border-bottom="true" label-width="auto" prop="karma">
+			<u-form-item label="业态" label-position="top" border-bottom="true" label-width="auto" prop="commercial">
-				<text @click="show3 = true" class="checkedtext" v-if="form.karma.length>0">{{form.karma}}</text>
+				<text @click="show3 = true" class="checkedtext" v-if="form.commercial.length>0">{{form.commercial}}</text>
 				<text @click="show3 = true" class="checktext" v-else>请选择店铺业态</text>
 				<view class="arrow-icon">
 					<u-icon name="arrow-right" size="30px" @click="show3 = true"></u-icon>
 				</view>
 				<u-picker mode="region" :show="show3" :closeOnClickOverlay="true" @close="show3 = false" :columns="[Karmacolumns]"
-					v-model="form.karma" @confirm="karmaConfirm"></u-picker>
+					v-model="form.commercial" @confirm="karmaConfirm"></u-picker>
 			</u-form-item>
-			<u-form-item label="面积" label-position="top" border-bottom="true" label-width="auto" prop="size">
+			<u-form-item label="面积" label-position="top" border-bottom="true" label-width="auto" prop="area">
-				<u-input v-model="form.size" placeholder="请输入店铺面积" placeholder-class="input-class" border="none"></u-input>
+				<u-input v-model="form.area" placeholder="请输入店铺面积" placeholder-class="input-class" border="none"></u-input>
 			</u-form-item>
 			<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="auto" prop="sell">
+			<u-form-item label="转让费（万元）" label-position="top" border-bottom="true" label-width="auto" prop="transferFee">
-				<u-input v-model="form.sell" placeholder="请输入店铺转让费" placeholder-class="input-class" border="none"></u-input>
+				<u-input v-model="form.transferFee" placeholder="请输入店铺转让费" placeholder-class="input-class" border="none"></u-input>
 			</u-form-item>
-			<u-form-item label="联系人" label-position="top" border-bottom="true" label-width="auto" prop="name">
+			<u-form-item label="联系人" label-position="top" border-bottom="true" label-width="auto" prop="contact">
-				<u-input v-model="form.name" placeholder="请输入联系人姓名" placeholder-class="input-class" border="none"></u-input>
+				<u-input v-model="form.contact" placeholder="请输入联系人姓名" placeholder-class="input-class" border="none"></u-input>
 			</u-form-item>
-			<u-form-item label="手机号码" label-position="top" border-bottom="true" label-width="auto" prop="call">
+			<u-form-item label="手机号码" label-position="top" border-bottom="true" label-width="auto" prop="mobile">
-				<u-input v-model="form.call" placeholder="请输入联系人手机号码" placeholder-class="input-class" border="none"></u-input>
+				<u-input v-model="form.mobile" placeholder="请输入联系人手机号码" placeholder-class="input-class" border="none"></u-input>
 			</u-form-item>
-			<u-form-item label="详情介绍" label-position="top" border-bottom="true" label-width="auto" prop="introduce">
+			<u-form-item label="详情介绍" label-position="top" border-bottom="true" label-width="auto" prop="content">
-				<u-input v-model="form.introduce" placeholder="请输入介绍详情" placeholder-class="input-class" border="none"></u-input>
+				<u-input v-model="form.content" placeholder="请输入介绍详情" placeholder-class="input-class" border="none"></u-input>
 			</u-form-item>
 		</u-form>
 		<view class="bug-figure"></view>
@@ -72,25 +72,23 @@
 		data() {
 			return {
 				regionColumns: [JSON.parse(uni.getStorageSync('regionList'))] || [],
-				ShopInfomation: {
-					city: '',
-					area: '',
-					count: 0,
-
-				},
 
 				form: {
 					title: '',
 					region: '',
-					place: '',
+					address: '',
-					trade: '',
+					business: '',
-					karma: '',
+					commercial: '',
-					size: '',
+					area: '',
 					rent: '',
-					sell: '',
+					transferFee: '',
-					name: '',
+					mobile: '',
-					call: '',
+					content: '',
-					introduce: ''
+					images:[],
+					longitude:'',
+					latitude:'',
+					id:'',
+					
 				},
 				Classcolumns: [],
 				ClassCheckId:'',
@@ -105,37 +103,37 @@
 						message: '请输入标题',
 						trigger: ['change', 'blur']
 					}],
-					'trade': [{
+					'business': [{
 						required: true,
 						message: '请选择行业',
-						trigger: ['change', 'blur']
+						trigger: ['change']
 					}],
 					'region': [{
 						required: true,
 						message: '请选择地区',
-						trigger: ['change', 'blur']
+						trigger: ['change']
 					}],
-					'karma': [{
+					'commercial': [{
 						required: true,
 						message: '请选择业态',
-						trigger: ['change', 'blur']
+						trigger: ['change']
 					}],
-					'name': [{
+					'contact': [{
 						required: true,
 						message: '请输入姓名',
 						trigger: ['change', 'blur']
 					}],
-					'sell': [{
+					'transferFee': [{
 						required: true,
 						message: '请输入转让金',
 						trigger: ['change', 'blur']
 					}],
-					'introduce': [{
+					'content': [{
 						required: true,
 						message: '请输入介绍',
 						trigger: ['change', 'blur']
 					}],
-					'size': [{
+					'area': [{
 						required: true,
 						message: '请输入面积',
 						trigger: ['change', 'blur']
@@ -145,12 +143,12 @@
 						message: '请输入租金',
 						trigger: ['change', 'blur']
 					}],
-					'place': [{
+					'address': [{
 						required: true,
 						message: '请输入地址',
 						trigger: ['change', 'blur']
 					}],
-					'call':[{
+					'mobile':[{
 						required: true,
 						message: '请输入电话号码',
 					},
@@ -179,7 +177,9 @@
 				this.$refs.uForm.validate().then(res => {
 					console.log("提交表单信息:" + JSON.stringify(this.form))
 					uni.$u.toast('发布成功')
-					// 调用服务端入表接口W
+					this.$api.publishTransfer(this.form).then(res => {
+						console.log(res);
+					})
 				}).catch(errors => {
 					console.log("失败信息:" + JSON.stringify(errors))
 					// uni.$u.toast('校验失败')
@@ -196,8 +196,10 @@
 						that.$api.key,
 					success(res) {
 						console.log('diz', res.data.result.location);
-						console.log('lat', res.data.result.location.lat);
+						// console.log('lat', res.data.result.location.lat);
-						console.log('lng', res.data.result.location.lng);
+						that.form.latitude = res.data.result.location.lat
+						// console.log('lng', res.data.result.location.lng);
+						that.form.longitude = res.data.result.location.lng
 					},
 					fail(err) {
 						console.log('请求区域失败：', err);
@@ -206,7 +208,7 @@
 			},
 			tradeConfirm(e){
 				this.show2 = false
-				this.form.trade = e.value[0]
+				this.form.business = e.value[0]
 				this.ClassCheckId = this.pid[e.indexs[0]]
 				this.$api.getClassList(this.ClassCheckId).then(res => {
 					// console.log(res);
@@ -217,7 +219,7 @@
 			},
 			karmaConfirm(e){
 				this.show3 = false
-				this.form.karma = e.value[0]
+				this.form.commercial = e.value[0]
 			},
 			regionConfirm(e){
 				this.show1 = false

service/request.js

@@ -1,5 +1,4 @@
 const serverHost = 'https://spsp.feashow.com/api' //http://xx.xxx.xx
-
 const service = {
 	get(url, data) {
 		const header = {}
@@ -253,7 +252,14 @@ const apiService = {
 		return new Promise((resolve,reject) => {
 			resolve(service.get(url))
 		})
-	}
+	},
+	//发布店铺转让
+	publishTransfer(data){
+		const url = `/shop/transfer/`
+		return new Promise((resolve, reject) => {
+			resolve(service.post(url, data))
+		})
+	},
 }
 export {
 	apiService,