odjbin/city-store-transfer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

梁航：合并发布页冲突

Browse Source
This commit is contained in:
hot777zz
2023-11-15 23:59:52 +08:00
parent 1c9a23f610
commit 5b05eb8eba
1 changed files with 1 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
pages/publish/publishTransfer/publishTransfer.vue
View File

@@ -2,64 +2,9 @@
<view class="form">
<u-form :model="form" ref="uForm">
<view class="upload">
<u-upload max-count="5" upload-icon="photo" :preview-full-image="true" :action="action"></u-upload>
<u-upload max-count="5" upload-icon="photo"></u-upload>
<text class="count">发布房源图片({{ShopInfomation.count}}/5)</text>
</view>
<<<<<<< HEAD
<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>
<u-form-item label="区域" label-position="top" border-bottom="true" right-icon="arrow-right" prop="region">
<text @click="show1 = true" class="checktext" v-if="form.region.length == 0">请选择所属区域</text>
<text @click="show1 = true" class="checkedtext" v-if="form.region.length > 0">{{form.region}}</text>
<view class="arrow-icon">
<u-icon name="arrow-right" size="30px"></u-icon>
</view>
<u-picker mode="region" :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-input v-model="form.place" placeholder="请输入店铺地址" placeholder-class="input-class" border="none" ></u-input>
</u-form-item>
<u-form-item label="行业" label-position="top" border-bottom="true" class="picker">
<text @click="show2 = true" class="checktext" v-if="form.trade.length == 0">请选择行业类型</text>
<text @click="show2 = true" class="checkedtext" v-if="form.trade.length > 0">{{form.trade}}</text>
<view class="arrow-icon">
<u-icon name="arrow-right" size="30px"></u-icon>
</view>
<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">
<text @click="show3 = true" class="checktext" v-if="form.karma.length == 0">请选择行业业态</text>
<text @click="show3 = true" class="checkedtext" v-if="form.karma.length > 0">{{form.karma}}</text>
<view class="arrow-icon">
<u-icon name="arrow-right" size="30px"></u-icon>
</view>
<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-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-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-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-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-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-input v-model="form.introduce" placeholder="请输入介绍详情" placeholder-class="input-class" border="none"></u-input>
</u-form-item>
</u-form>
<view class="bug-figure"></view>
<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>
=======
<u-form-item label="标题" label-position="top" border-bottom="true" prop="title">
<u-input v-model="form.title" placeholder="请输入标题以便吸引人的注意哦" placeholder-class="input-class"
@@ -116,7 +61,6 @@
<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>
>>>>>>> remotes/origin/master
</view>
</template>
@@ -124,21 +68,6 @@
export default {
data() {
return {
<<<<<<< HEAD
action:'http://spsp.feashow.cn/api/upload/image/',
form:{
title:'',
region:'',
place:'',
trade:'',
karma:'',
size:'',
rent:'',
sell:'',
name:'',
call:'',
introduce:''
=======
regionColumns: [JSON.parse(uni.getStorageSync('regionList'))] || [],
ShopInfomation: {
city: '',
@@ -159,7 +88,6 @@
name: '',
call: '',
introduce: ''
>>>>>>> remotes/origin/master
},
columns: [
@@ -196,30 +124,6 @@
this.show1 = false
},
submit() {
<<<<<<< HEAD
this.$refs.uForm.validate().then(res => {
console.log("提交表单信息:" + JSON.stringify(this.form))
uni.$u.toast('发布成功')
// 调用服务端入表接口W
}).catch(errors => {
console.log("失败信息:" + JSON.stringify(errors))
// uni.$u.toast('校验失败')
})
},
getTradeInfo(){
this.$api.getTradeInfo().then(res=>{
console.log(res);
})
}
},
onReady() {
this.$refs.uForm.setRules(this.rules)
},
onLoad() {
this.getTradeInfo()
=======
this.$refs.uForm.validate().then(res => {
console.log("提交表单信息:" + JSON.stringify(this.form))
uni.$u.toast('发布成功')
@@ -251,7 +155,6 @@
},
onReady() {
this.$refs.uForm.setRules(this.rules)
>>>>>>> remotes/origin/master
}
}
</script>
@@ -300,18 +203,8 @@
font-weight: 1px;
color: #c1c4c7;
}
<<<<<<< HEAD
.checkedtext{
margin-top: 5rpx;
font-size: 30rpx;
font-weight:1px;
}
.picker{
=======
.picker {
>>>>>>> remotes/origin/master
display: flex;
justify-content: space-between;
}