From 350278e36ea69ddb585a3f881ad212057b3022db Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Tue, 5 Nov 2024 09:07:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                            |   2 +-
 main.js                                            |   4 +-
 mixins/share.js                                    |  29 +++
 pages/index/index.vue                              |   1 +
 .../components/list/renting/rentingItem.vue        |   1 +
 .../components/list/scenicSpot/scenicSpotItem.vue  |  11 +-
 pages_order/renting/addRenting.vue                 | 244 +++++++++++++++++++--
 pages_order/scenicSpot/scenicSpotDetail.vue        |  10 +-
 pages_order/work/addWork.vue                       |   2 +-
 store/store.js                                     |   2 +-
 10 files changed, 280 insertions(+), 26 deletions(-)
 create mode 100644 mixins/share.js

diff --git a/App.vue b/App.vue
index f8bcac5..00178af 100644
--- a/App.vue
+++ b/App.vue
@@ -21,7 +21,7 @@
 	}
 	.page{
 		padding-top: var(--window-top);
-			
+		padding-bottom: env(safe-area-inset-bottom);
 	}
 	.pageList{
 		/deep/ .uv-search__content__input{
diff --git a/main.js b/main.js
index 3ba095b..a3b0852 100644
--- a/main.js
+++ b/main.js
@@ -15,7 +15,9 @@ import './config'
 import './utils/index.js'
 
 
-
+// 导入并挂载全局的分享方法
+import share from '@/mixins/share.js'
+Vue.mixin(share)
 
 //组件注册
 import configPopup from '@/components/config/configPopup.vue'
diff --git a/mixins/share.js b/mixins/share.js
new file mode 100644
index 0000000..295e1b9
--- /dev/null
+++ b/mixins/share.js
@@ -0,0 +1,29 @@
+export default {
+	data() {
+		return {
+			// 默认的全局分享内容
+			share: {
+				title: '瑶都万能墙',
+				path: '/pages/index/index',    // 全局分享的路径，比如 首页
+				// imageUrl: '/static/image/login/logo.png',    // 全局分享的图片(可本地可网络)
+			}
+		}
+	},
+	// 定义全局分享
+	// 1.发送给朋友
+    onShareAppMessage(res) {
+        return {
+			title: this.share.title,
+			path: this.share.path,
+			imageUrl: this.share.imageUrl,
+		}
+    },
+	//2.分享到朋友圈
+    onShareTimeline(res) {
+        return {
+			title: this.share.title,
+			path: this.share.path,
+			imageUrl: this.share.imageUrl,
+		}
+    },
+}
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 71b9a75..e63e836 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -164,6 +164,7 @@
 			if(query.shareId){
 				uni.setStorageSync('shareId', query.shareId)
 			}
+			
 			this.getData()
 			this.getIndexHeaderInfo()
 			this.getClassifyList()
diff --git a/pages_order/components/list/renting/rentingItem.vue b/pages_order/components/list/renting/rentingItem.vue
index b7db810..a68648a 100644
--- a/pages_order/components/list/renting/rentingItem.vue
+++ b/pages_order/components/list/renting/rentingItem.vue
@@ -57,6 +57,7 @@
 	display: flex;
 	padding: 20rpx;
 	font-size: 24rpx;
+	border-bottom: 1px solid #00000012;
 	image{
 		width: 180rpx;
 		height: 180rpx;
diff --git a/pages_order/components/list/scenicSpot/scenicSpotItem.vue b/pages_order/components/list/scenicSpot/scenicSpotItem.vue
index c2836fd..96508bc 100644
--- a/pages_order/components/list/scenicSpot/scenicSpotItem.vue
+++ b/pages_order/components/list/scenicSpot/scenicSpotItem.vue
@@ -9,9 +9,16 @@
 			</view>
 			<view>
 			</view>
-			<view class="createBy">
+			<!-- <view class="createBy">
 				{{ item.address }}
-			</view>
+			</view> -->
+			
+			<addressSpot
+			:address="item.address"
+			:latitude="item.latitude"
+			:longitude="item.longitude"
+			/>
+			
 			<view class="createTime">
 				{{ $dayjs(item.createTime).format('YYYY-MM-DD') }}
 			</view>
diff --git a/pages_order/renting/addRenting.vue b/pages_order/renting/addRenting.vue
index fbdded1..1116f5f 100644
--- a/pages_order/renting/addRenting.vue
+++ b/pages_order/renting/addRenting.vue
@@ -20,18 +20,50 @@
 			></uv-cell>
 			
 			<uv-cell
-			title="所属工种"
+			title="朝向"
 			rightIconStyle="fontSize: 30rpx;"
-			value="请选择所属工种"
+			value="请选择朝向"
 			isLink
 			></uv-cell>
 			
+			<uv-cell
+			title="装修"
+			rightIconStyle="fontSize: 30rpx;"
+			value="请选择装修"
+			isLink
+			></uv-cell>
+			
+			<uv-cell
+			title="楼层"
+			rightIconStyle="fontSize: 30rpx;"
+			value="请选择楼层"
+			isLink
+			></uv-cell>
+			
+			<view class="form-sheet-cell">
+				<view class="label">
+					户型
+				</view>
+				<view class="price">
+					<input placeholder="请输入户型（三室一厅）" v-model="form.home" />
+				</view>
+			</view>
+			
 			<view class="form-sheet-cell">
 				<view class="label">
-					价格/月
+					付款方式
 				</view>
 				<view class="price">
-					<input placeholder="请输入价格" v-model="form.price" />
+					<input placeholder="请输入付款方式（押一付三）" v-model="form.price" />
+				</view>
+			</view>
+			
+			<view class="form-sheet-cell">
+				<view class="label">
+					租金/月
+				</view>
+				<view class="price">
+					<input placeholder="请输入租金" type="number" v-model="form.money" />
 				</view>
 			</view>
 			
@@ -40,44 +72,61 @@
 					面积
 				</view>
 				<view class="price">
-					<input placeholder="请输入面积" v-model="form.price" />
+					<input placeholder="请输入面积（米平方）" type="number" v-model="form.crm" />
 				</view>
 			</view>
 			
 			
 			<view class="form-sheet-cell">
 				<view class="label">
-					结算方式
+					看房
 				</view>
 				<uv-radio-group v-model="radiovalue">
 					<view class="price">
 						<uv-radio
 							:customStyle="{margin: '8px'}" 
-							v-for="(item, index) in priceType" 
-							:key="index" 
 							iconSize="30rpx"
 							size="40rpx"
 							labelSize="26rpx"
-							:label="item.name" 
-							:name="item.name">
+							label="随时可看" 
+							name="随时可看">
 						</uv-radio>
+						
+						<uv-radio
+							:customStyle="{margin: '8px'}" 
+							iconSize="30rpx"
+							size="40rpx"
+							labelSize="26rpx"
+							label="电话预约" 
+							name="电话预约">
+						</uv-radio>
+						
 					</view>
 				</uv-radio-group>
 			</view>
 			
 			<view class="form-sheet-cell">
 				<view class="label">
-					看房
+					租房类型
 				</view>
-				<uv-radio-group v-model="radiovalue">
+				<uv-radio-group v-model="form.type">
 					<view class="price">
 						<uv-radio
 							:customStyle="{margin: '8px'}" 
 							iconSize="30rpx"
 							size="40rpx"
 							labelSize="26rpx"
-							label="随时可看" 
-							name="0">
+							label="整租" 
+							name="整租">
+						</uv-radio>
+						
+						<uv-radio
+							:customStyle="{margin: '8px'}" 
+							iconSize="30rpx"
+							size="40rpx"
+							labelSize="26rpx"
+							label="合租" 
+							name="合租">
 						</uv-radio>
 					</view>
 				</uv-radio-group>
@@ -89,14 +138,49 @@
 				</view>
 				<input placeholder="请输入联系电话" v-model="form.phone" />
 			</view>
-			<view class="">
+			
+			<view class="images box">
+				<view class="">
+					精选照片
+				</view>
+				<uv-upload 
+				:fileList="fileList" 
+				:maxCount="imageMax" 
+				multiple 
+				width="150rpx" 
+				height="150rpx"
+				@delete="deleteImage"
+				@afterRead="afterRead"
+				:previewFullImage="true"></uv-upload>
+			</view>
+			
+			<view class="category">
+				<view class="title">
+					选择地区
+				</view>
+				<view class="tagList">
+					<view 
+					:class="{act : t.id == form.addId}"
+					@click="form.addId = t.id"
+					v-for="(t, i) in cityList"
+					:key="i">
+						{{ t.name }}
+					</view>
+				</view>
+			</view>
+			
+			<!-- <view class="">
 				<uv-textarea 
 				v-model="form.content" 
 				count 
 				:maxlength="300" 
 				autoHeight
 				placeholder="请输入详细介绍"></uv-textarea>
-			</view>
+			</view> -->
+			
+			<uv-picker ref="picker"
+			:columns="columns" 
+			@confirm="pickerConfirm"></uv-picker>
 			
 			<view class="uni-color-btn">
 				发布
@@ -106,11 +190,14 @@
 </template>
 
 <script>
+	import { mapState } from 'vuex'
 	export default {
 		data() {
 			return {
 				form : {
-					
+					addId : '',//地区id
+					address : '',//地址
+					crm : '',//面积
 				},
 				radiovalue : '',
 				priceType : [
@@ -132,10 +219,100 @@
 						name : '月结',
 					},
 				],
+				fileList : [],
+				imageMax : 9,
+				picker : {
+					workYear : [
+						'不限',
+					],
+					school : [
+						'不限',
+						'初中',
+						'高中',
+						'专科',
+						'本科',
+						'研究生',
+						'博士',
+					],
+				},
 			}
 		},
+		onLoad() {
+			for (var i = 0; i < 30; i++) {
+				this.picker.workYear.push((i + 1) + '年')
+			}
+			this.form.addId = this.cityList[0].id
+		},
+		computed : {
+			columns(){
+				return [this.picker[this.pickerKey]]
+			},
+			...mapState(['cityList', 'category']),
+		},
 		methods: {
-			
+			openPicker(key){
+				this.pickerKey = key
+				this.$refs.picker.open()
+			},
+			pickerConfirm(e){
+				this.form[this.pickerKey] = e.value[0]
+			},
+			deleteImage(e){
+				this.fileList.splice(e.index, 1)
+			},
+			afterRead(e){
+				let self = this
+				e.file.forEach(file => {
+					self.$Oss.ossUpload(file.url).then(url => {
+						self.fileList.push({
+							url
+						})
+					})
+				})
+			},
+			//地图上选择地址
+			selectAddr() {
+				Position.selectAddress(res => {
+					//经纬度信息
+					this.form.latitude = res.latitude
+					this.form.longitude = res.longitude
+					if (res.name) {
+						return this.form.address = res.name
+					}
+					this.form.address = ''
+				})
+			},
+			// 提交
+			submit(){
+				
+				if(this.fileList.length == 0){
+					return uni.showToast({
+						title: '请上传精选照片',
+						icon : 'none'
+					})
+				}
+				
+				if (this.$utils.verificationAll(this.form, {
+						title: '请输入标题',
+						address : '请选择租房地点',
+						money : '请输入租金',
+						phone: '请输入联系电话',
+						titleSub : '请输入备注',
+					})) {
+					return
+				}
+				
+				this.$api('publishJob', this.form, res => {
+					if(res.code == 200){
+						uni.showToast({
+							title: '发布成功!',
+							icon: 'none'
+						})
+						
+						setTimeout(uni.navigateBack, 1000, -1)
+					}
+				})
+			},
 		}
 	}
 </script>
@@ -184,6 +361,37 @@
 				margin-left: auto;
 			}
 		}
+		
+		.images{
+			padding: 30rpx;
+			view{
+				padding-bottom: 20rpx;
+			}
+		}
+	}
+	
+	.category{
+		padding: 20rpx;
+		.title{
+			// font-weight: 900;
+			// font-size: 30rpx;
+		}
+		.tagList{
+			display: flex;
+			flex-wrap: wrap;
+			padding: 10rpx 0;
+			view{
+				background: rgba($uni-color, 0.1);
+				padding: 10rpx 20rpx;
+				margin: 10rpx;
+				border-radius: 10rpx;
+				font-size: 26rpx;
+			}
+			.act{
+				color: #fff;
+				background: $uni-color;
+			}
+		}
 	}
 }
 </style>
diff --git a/pages_order/scenicSpot/scenicSpotDetail.vue b/pages_order/scenicSpot/scenicSpotDetail.vue
index ba545a5..c8e0e1d 100644
--- a/pages_order/scenicSpot/scenicSpotDetail.vue
+++ b/pages_order/scenicSpot/scenicSpotDetail.vue
@@ -21,11 +21,17 @@
 				</view>
 			</view>
 
-			<view class="createBy">
+			<!-- <view class="createBy">
 				<view class="">
 					地址：{{ detail.address }}
 				</view>
-			</view>
+			</view> -->
+			
+			<addressSpot
+			:address="detail.address"
+			:latitude="detail.latitude"
+			:longitude="detail.longitude"
+			/>
 
 
 			<view class="content">
diff --git a/pages_order/work/addWork.vue b/pages_order/work/addWork.vue
index 2c40c84..e5705b3 100644
--- a/pages_order/work/addWork.vue
+++ b/pages_order/work/addWork.vue
@@ -126,7 +126,7 @@
 					workYear : '',
 					minPrice : '',
 					maxPrice : '',
-					address : '123',
+					address : '',
 				},
 				radiovalue : '',
 				priceList : [
diff --git a/store/store.js b/store/store.js
index babae20..becbd21 100644
--- a/store/store.js
+++ b/store/store.js
@@ -11,7 +11,7 @@ const store = new Vuex.Store({
 		configList: [], //配置列表
 		shop : false,
 		userInfo : {}, //用户信息
-		city : {},//城市列表
+		city : {},//当前城市
 		cityList : [],//城市列表
 		category : [],//动态分类
 	},