From c62ab6f2ff02e1111ad31934fd8faeda5ab9e5b7 Mon Sep 17 00:00:00 2001
From: Joker_Yxin <2509699647@qq.com>
Date: Wed, 9 Oct 2024 15:00:30 +0800
Subject: [PATCH] 1

---
 components/tabbar/tabbar.vue                  |  16 ++++++++--------
 main.js                                       |   6 ++++--
 pages.json                                    |  10 +++++++---
 pages/Iproposal/Iproposal.scss                | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/Iproposal/Iproposal.vue                 | 390 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/accepting/accepting.vue                 |   8 ++++----
 pages/activityAdd/activityAdd.vue             |  10 +++++-----
 pages/advertisement/advertisement.scss        |   9 ++++++---
 pages/advertisement/advertisement.vue         |  17 +++++++++--------
 pages/advertisementAdd/advertisementAdd.vue   |   4 ++--
 pages/apply/apply.vue                         |   6 +++---
 pages/applyDetail/applyDetail.vue             |   4 ++--
 pages/complaint/complaint.vue                 |   2 +-
 pages/details/details.vue                     |   2 +-
 pages/field/field.scss                        |   4 +---
 pages/field/field.vue                         |  29 ++++++++++++++++++-----------
 pages/home/home.scss                          |   5 ++++-
 pages/home/home.vue                           |  44 ++++++++++++++++++++++++++++----------------
 pages/leaseAdd/leaseAdd.vue                   |  10 +++++-----
 pages/login/login.vue                         |  12 ++++++------
 pages/message/message.vue                     |  21 +++++++++++----------
 pages/my/my.vue                               |  32 +++++++++++++++++---------------
 pages/mycreated/mycreated.vue                 |  20 +++++++++++++-------
 pages/participation/participation.vue         |  27 ++++++++++++++++-----------
 pages/projectManagement/projectManagement.vue |   4 ++--
 pages/questionnaire/questionnaire.vue         |  25 +++++++++----------------
 pages/record/record.vue                       |   4 ++--
 pages/recordService/recordService.vue         |   6 +++---
 pages/repair/repair.vue                       |   2 +-
 pages/salesReporting/salesReporting.vue       |   2 +-
 pages/salesSta/salesSta.vue                   |   2 +-
 pages/servicedetails/servicedetails.vue       |   2 +-
 pages/servicerecords/servicerecords.vue       |   6 +++---
 pages/shops/shops.vue                         |  28 +++++++++++++---------------
 pages/workbench/workbench.vue                 |  36 +++++++++++++++++++++---------------
 utils/request.js                              |  10 +++-------
 36 files changed, 743 insertions(+), 194 deletions(-)
 create mode 100644 pages/Iproposal/Iproposal.scss
 create mode 100644 pages/Iproposal/Iproposal.vue

diff --git a/components/tabbar/tabbar.vue b/components/tabbar/tabbar.vue
index bd810bb..01aafad 100644
--- a/components/tabbar/tabbar.vue
+++ b/components/tabbar/tabbar.vue
@@ -20,26 +20,26 @@
 					{
 						index: 0,
 						name: '首页',
-						img: `${this.$imgs}/tabbar/tab_01.png`,
-						acImg: `${this.$imgs}/tabbar/tab_02.png`,
+						img: '/static/tabbar/tab_01.png',
+						acImg: '/static/tabbar/tab_02.png',
 					},
 					{
 						index: 1,
 						name: '工作台',
-						img: `${this.$imgs}/tabbar/tab_03.png`,
-						acImg: `${this.$imgs}/tabbar/tab_04.png`
+						img: '/static/tabbar/tab_03.png',
+						acImg:'/static/tabbar/tab_04.png'
 					},
 					{
 						index: 2,
 						name: '消息',
-						img: `${this.$imgs}/tabbar/tab_05.png`,
-						acImg: `${this.$imgs}/tabbar/tab_06.png`
+						img: '/static/tabbar/tab_05.png',
+						acImg: '/static/tabbar/tab_06.png'
 					},
 					{
 						index: 3,
 						name: '我的',
-						img: `${this.$imgs}/tabbar/tab_07.png`,
-						acImg:`${this.$imgs}/tabbar/tab_08.png`
+						img: '/static/tabbar/tab_07.png',
+						acImg:'/static/tabbar/tab_08.png'
 					},
 				],
 				codeheight: 0,
diff --git a/main.js b/main.js
index 9bff4d6..6b42b04 100644
--- a/main.js
+++ b/main.js
@@ -9,11 +9,13 @@ import DialogBox from './components/DialogBox/DialogBox';
 
 Vue.config.productionTip = false
 Vue.prototype.$http = http
-Vue.prototype.$imgs = 'http://8.130.38.56:8027/local/file/static'
+Vue.prototype.$imgUrl = (url) => {
+  return ("http://8.130.38.56:8027/local/file/static" + url);
+};
+
 // 全局组件
 Vue.component('DialogBox', DialogBox);
 
-
 //mescroll
 import MescrollBody from "@/components/mescroll-uni/mescroll-body.vue"
 import MescrollUni from "@/components/mescroll-uni/mescroll-uni.vue"
diff --git a/pages.json b/pages.json
index 73ff9e6..f499329 100644
--- a/pages.json
+++ b/pages.json
@@ -211,10 +211,14 @@
 				"navigationBarTitleText": "销售统计",
 				"navigationBarBackgroundColor": "#FFFFFF"
 			}
+		},
+		{
+			"path": "pages/Iproposal/Iproposal",
+			"style": {
+				"navigationBarTitleText": "招商方案",
+				"navigationBarBackgroundColor": "#FFFFFF"
+			}
 		}
-		
-		
-		
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black"
diff --git a/pages/Iproposal/Iproposal.scss b/pages/Iproposal/Iproposal.scss
new file mode 100644
index 0000000..a9722a7
--- /dev/null
+++ b/pages/Iproposal/Iproposal.scss
@@ -0,0 +1,122 @@
+.page{
+	position: absolute;
+	left: 0;
+	top: 0;
+	width: 100%;
+	height: 100%;
+	background-color: #f6f6f6;
+}
+
+.add-list{
+	padding: 0 4%;
+	background-color: #FFFFFF;
+	border-radius: 20rpx;
+	margin-top: 20rpx;
+	width: 100%;
+	padding-bottom: 150rpx;
+	.list{
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		width: 100%;
+		height: 100rpx;
+		border-bottom: 2rpx solid #f6f6f6;
+		.title{
+			display: flex;
+			align-items: center;
+			height: 100%;
+			text{
+				font-size: 26rpx;
+				color: #222222;
+			}
+			.star{
+				color: red;
+			}
+		}
+		.content{
+			display: flex;
+			align-items: center;
+			text-align: right;
+			input{
+				width: 100%;
+				color: #222222;
+				font-size: 26rpx;
+				padding-top: 6rpx;
+				/* #ifdef MP */
+				padding-top: 5rpx;
+				/* #endif */
+			}
+			image {
+				width: 20rpx;
+				height: 20rpx;
+				margin-left: 10rpx;
+				/* #ifdef MP */
+				margin-top: 5rpx;
+				/* #endif */
+			}
+		}
+	}
+}
+
+/* 保存按钮 */
+.page-footer{
+	position: fixed;
+	left: 0;
+	bottom: 0;
+	display: flex;
+	width: 100%;
+	height: 100rpx;
+	background-color: #FFFFFF;
+	padding-bottom: constant(safe-area-inset-bottom);
+	padding-bottom: env(safe-area-inset-bottom);
+	.footer-buy{
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		width: 100%;
+		height: 100%;
+		.cart-add{
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 100%;
+			height: 100rpx;
+			background-color: #3f9b6a;
+			text{
+				font-size: 28rpx;
+				color: #FFFFFF;
+			}
+		}
+	}
+}
+
+.feedback-data{
+	width: 100%;
+	padding-bottom: 20rpx;
+	border-bottom: 2rpx solid #f6f6f6;
+	.title{
+		display: flex;
+		align-items: center;
+		height: 100rpx;
+		text{
+			font-size: 26rpx;
+			color: #222222;
+		}
+		.star{
+			color: red;
+		}
+	}
+	.voucher-img{
+		display: flex;
+		align-items: center;
+		.voucher-list {
+			width: 33%;
+			height: 100%;
+			image{
+				width: 160rpx;
+				height: 160rpx;
+				border-radius: 10rpx;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/pages/Iproposal/Iproposal.vue b/pages/Iproposal/Iproposal.vue
new file mode 100644
index 0000000..adefbbc
--- /dev/null
+++ b/pages/Iproposal/Iproposal.vue
@@ -0,0 +1,390 @@
+<template>
+	<view class="page">
+		<view class="add-list">
+			<!-- <view class="list">
+				<view class="title">
+					<text>方案编号</text>
+					<text class="star">*</text>
+				</view>
+				<view class="content">
+					<input type="text" placeholder="请输入" v-model="rulform.id">
+				</view>
+			</view> -->
+			<view class="list">
+				<view class="title">
+					<text>招商方案名称</text>
+					<text class="star">*</text>
+				</view>
+				<view class="content">
+					<input type="text" placeholder="请输入" v-model="rulform.schemeTitle">
+				</view>
+			</view>
+			<view class="list" v-if="Fenshow">
+				<view class="title">
+					<text>规划方案</text>
+					<text class="star">*</text>
+				</view>
+				<view class="juli" style="padding-top: 10px;" @click="chooseLocation(1)">
+					<u-input v-model="lableXian" type="select" disabledColor="#ffffff"
+						placeholder="请选择" :border="false" suffixIcon="arrow-right" style="pointer-events:none">
+					</u-input>
+					<!-- <u-icon name="arrow-right" @click="chooseLocation(1)"></u-icon> -->
+				</view>
+			</view>
+			
+			<view class="list">
+				<view class="title">
+					<text>招商政策与条件</text>
+					<text class="star">*</text>
+				</view>
+				<view class="content">
+					<!-- <u-textarea v-model="rulform.schemeTitle" placeholder="请输入" ></u-textarea> -->
+				</view>
+			</view>
+			<view class="list">
+				<view class="title">
+					<text>方案概述</text>
+					<text class="star">*</text>
+				</view>
+				<view class="content">
+					<!-- <u-textarea v-model="rulform.schemeTitle" placeholder="请输入" ></u-textarea> -->
+				</view>
+			</view>
+			<view class="list">
+				<view class="title">
+					<text>财务分析与投资回报</text>
+					<text class="star">*</text>
+				</view>
+			</view>
+			<view>
+				<u-input v-model="rulform.schemeTitle" type="textarea" 
+					placeholder="请输入" >
+				</u-input>
+				<!-- <u-textarea v-model="rulform.schemeTitle" placeholder="请输入" ></u-textarea> -->
+				
+			</view>
+			<!-- <view class="list" @click="setTime">
+				<view class="title">
+					<text>上线时间</text>
+					<text class="star">*</text>
+				</view>
+				<view class="content">
+					<u-picker mode="time" v-model="show" :params="params" default-time="2024-07-02 13:01"
+						@confirm="timeConfirm"></u-picker>
+					<input type="text" placeholder="请选择" v-model="rulform.createDate">
+				</view>
+			</view> -->
+
+			<!-- <view class="feedback-data">
+				<view>
+					<view class="title">
+						<text>渠道海报</text>
+						<text class="star">*</text>
+					</view>
+				</view>
+				<view class="voucher-img">
+					<u-upload :action="action" :file-list="fileList"  max-count="1"  :before-upload="beforeUpload"></u-upload>
+				</view>
+			</view> -->
+		</view>
+		<!-- <u-select v-model="popup1" :list="list" @confirm="pops"></u-select> -->
+		<u-select v-model="popup1" mode="mutil-column-auto" :list="list" @confirm="pops" label-name="classificationName" child-name="childClassifications" value-name="id"></u-select>
+
+		<!-- 保存按钮 -->
+		<view class="page-footer" @click="go">
+			<view class="footer-buy">
+				<view class="cart-add">
+					<text>提交</text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				action: 'http://8.130.38.56:8027/admin-server/file/upload',
+				fileList: [],
+				lableXian:'',
+				rulform: {
+					schemeTitle: '',
+					classificationCode: '',
+					createDate: '',
+					createUser: '',
+					promotionContent: '',
+					coverImage: ''
+				},
+				params: {
+					year: true,
+					month: true,
+					day: true,
+					hour: true,
+					minute: true,
+					second: true,
+					province: true,
+				},
+				show: false,
+				popup1: false,
+				list: [{
+						value: '1',
+						label: '江'
+					},
+					{
+						value: '2',
+						label: '湖'
+					}
+				],
+				pageindex: {
+					classificationType: "3",
+					pageNumber: 1,
+					pageSize: 10
+				},
+				Fenshow:true,
+			};
+		},
+		mounted() {
+			this.getALL()
+		},
+		onLoad(optiong) {
+			console.log(optiong.item)
+			if(optiong.item){
+				this.rulform = JSON.parse(optiong.item)
+				this.Fenshow = false
+			}
+		},
+		methods: {
+			 padZero(num) {
+			  return num < 10 ? '0' + num : num;
+			},
+		getCurrentTimeFormatted() {
+			  const now = new Date();
+			  return `${now.getFullYear()}-${this.padZero(now.getMonth() + 1)}-${this.padZero(now.getDate())} ${this.padZero(now.getHours())}:${this.padZero(now.getMinutes())}:${this.padZero(now.getSeconds())}`;
+			},
+			beforeUpload(index, list) {
+							// 返回一个promise
+						
+						},
+			
+			getALL() {
+				this.$http.sendRequest('/cereClassification/queryBySubquery', 'POST', this.pageindex, 1).then(res => {
+					//成功回调	
+					this.list = res.data.data.map(item => ({
+					  ...item.cereClassification,
+					  childClassifications: item.childClassifications
+					}));
+				})
+			},
+			go() {
+				console.log(this.rulform)
+				if(this.Fenshow){
+					this.rulform.createDate = this.getCurrentTimeFormatted()
+					  this.rulform.createUser =uni.getStorageSync('shopId')
+					this.$http.sendRequest('/cerePromotion/addPromotionPlanning', 'POST', this.rulform,1).then(res => {
+						//成功回调
+						uni.redirectTo({
+							url: '/pages/projectManagement/projectManagement'
+						})
+					})
+				}else{
+					this.rulform.updateDate = ''
+					this.$http.sendRequest('/cerePromotion/editPromotionPlanning', 'POST', this.rulform,1).then(res => {
+						//成功回调
+						uni.redirectTo({
+							url: '/pages/projectManagement/projectManagement'
+						})
+					})
+				}
+			
+			},
+			setTime() {
+				this.show = true
+			},
+			// timeConfirm(e) {
+			// 	this.rulform.createDate = e.year + '-' + e.month + '-' + e.day + ' ' + e.hour + ':' + e.minute + ':' + e.second
+			// },
+			pops(val) {
+				this.lableXian =  val[0].label
+				this.rulform.classificationCode = val[0].value
+				
+			},
+			chooseLocation(val, item) {
+				// this.popupShow = true
+				this.popup1 = true
+				// if (val == 1) {
+				// 	this.$refs.popup1.open()
+				// } else if (val == 2) {
+				// 	this.$refs.popup2.open()
+				// }
+
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import './Iproposal.scss';
+
+	.juli {
+		padding: 10rpx;
+		display: flex;
+		flex-wrap: wrap;
+
+		.u-transition {
+			// width: 31%;
+			margin: 1%;
+			// width: 212rpx;
+			// height: 80rpx;
+			border-radius: 16rpx 16rpx 16rpx 16rpx;
+			background-color: rgba(21, 98, 214, 0.1);
+			// line-height: 80rpx;
+			text-align: center;
+			font-style: normal;
+			color: #1562D6;
+			font-size: 28rpx;
+			border-radius: 2px;
+
+		}
+
+		::v-deep .u-tag--primary--plain {
+			border: 0px;
+			border-radius: 2px;
+			background-color: #ebebeb;
+
+			.u-tag__text--primary--plain {
+				color: #000;
+
+			}
+		}
+
+		::v-deep .u-tag--primary {
+			background-color: rgba(245, 178, 160, 0.3);
+			border: 0px;
+			border-radius: 2px;
+
+			.u-tag__text--primary {
+				color: #ff3442;
+			}
+		}
+
+		.jinbutiao {
+			display: flex;
+			width: 100%;
+			align-items: center;
+
+			.u-slider {
+				width: 80%;
+				margin-right: 20rpx;
+			}
+		}
+	}
+
+	.choose1 {
+		width: 100%;
+		display: flex;
+
+		.choose1left {
+			width: 26%;
+			border-right: 2rpx solid #f6f6f6;
+
+			.leftItem1 {
+				width: 100%;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				padding: 20rpx 0;
+			}
+		}
+
+		.choose1right {
+			flex: 1;
+
+			// width: 70%;
+			.rightBox {
+				width: 90%;
+				margin: 0 auto;
+
+				.weizhiName {
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+
+					// height: 80rpx;
+					.weizhiLeft {
+						display: flex;
+						align-items: center;
+
+						.weizhiInput {
+							color: #959595;
+						}
+					}
+
+					.weizhiSpan {
+						color: #D32D25;
+					}
+				}
+
+				.juli {
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					flex-wrap: wrap;
+
+					.u-transition {
+						// width: 31%;
+						margin: 1%;
+						// width: 212rpx;
+						// height: 80rpx;
+						border-radius: 16rpx 16rpx 16rpx 16rpx;
+						background-color: rgba(21, 98, 214, 0.1);
+						// line-height: 80rpx;
+						text-align: center;
+						font-style: normal;
+						color: #1562D6;
+						font-size: 28rpx;
+
+					}
+
+					.u-tag-wrapper {
+						width: 100%;
+						height: 100%;
+						border: none !important;
+					}
+
+					.u-tag {
+						padding: 0;
+						width: 212rpx !important;
+						height: 60rpx !important;
+					}
+
+					.u-tag__text {
+						width: 100%;
+						font-size: 25rpx;
+						text-align: center;
+						margin: 0 auto;
+					}
+
+				}
+			}
+
+			.quyu {
+				display: flex;
+				padding-left: 20rpx;
+				height: 300px;
+				width: 100%;
+
+				.sl_city {
+					width: 48%;
+					margin-right: 0px;
+					overflow: auto;
+
+				}
+			}
+		}
+	}
+
+	::v-deep .u-input__input {
+		text-align: right;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/accepting/accepting.vue b/pages/accepting/accepting.vue
index 8183629..a7f443f 100644
--- a/pages/accepting/accepting.vue
+++ b/pages/accepting/accepting.vue
@@ -6,7 +6,7 @@
 			<view class="record-list-box" >
 				<view class="list">
 					<view class="thumb">
-						<image :src="`${this.$imgs}/img/2.jpg`" mode=""></image>
+						<image :src="$imgUrl('/img/2.jpg')" mode=""></image>
 					</view>
 				<view class="title-date">
 					<view class="date">
@@ -23,7 +23,7 @@
 					</view>
 				</view>
 				<view class="integral">
-					<image :src="`${this.$imgs}/img/right2.png`"></image>
+					<image :src="$imgUrl('/img/right2.png')"></image>
 				</view>
 				</view>
 				
@@ -83,8 +83,8 @@
 					身份证正反面
 				</view>
 				<view class="msg_body imgGroup">
-					 <image :src="`${this.$imgs}/组 18072.png`" mode=""></image>
-					 <image :src="`${this.$imgs}/组 18072.png`" mode=""></image>
+					 <image :src="$imgUrl('/组 18072.png')" mode=""></image>
+					 <image :src="$imgUrl('/组 18072.png')" mode=""></image>
 				</view>
 			</view>
 			<view class="state">
diff --git a/pages/activityAdd/activityAdd.vue b/pages/activityAdd/activityAdd.vue
index 89bea2c..c19be51 100644
--- a/pages/activityAdd/activityAdd.vue
+++ b/pages/activityAdd/activityAdd.vue
@@ -44,7 +44,7 @@
 				</view>
 				<view class="content">
 					<input type="text" placeholder="请选择">
-					<image :src="`${this.$imgs}/right2.png`"></image>
+					<image :src="$imgUrl('/right2.png')" ></image>
 				</view>
 			</view>
 			<view class="list">
@@ -54,7 +54,7 @@
 				</view>
 				<view class="content">
 					<input type="text" placeholder="请选择">
-					<image :src="`${this.$imgs}/right2.png`"></image>
+					<image :src="$imgUrl('/right2.png')"></image>
 				</view>
 			</view>
 			<view class="list">
@@ -64,7 +64,7 @@
 				</view>
 				<view class="content">
 					<input type="text" placeholder="请选择">
-					<image :src="`${this.$imgs}/right2.png`"></image>
+					<image :src="$imgUrl('/right2.png')"></image>
 				</view>
 			</view>
 			<view class="list">
@@ -74,7 +74,7 @@
 				</view>
 				<view class="content">
 					<input type="text" placeholder="请选择">
-					<image :src="`${this.$imgs}/right2.png`"></image>
+					<image :src="$imgUrl('/right2.png')"></image>
 				</view>
 			</view>
 			<view class="feedback-data">
@@ -86,7 +86,7 @@
 				</view>
 				<view class="voucher-img">
 					<view class="voucher-list">
-						<image  :src="`${this.$imgs}/voucher_bg.png`"></image>
+						<image :src="$imgUrl('/voucher_bg.png')"></image>
 					</view>
 				</view>
 			</view>
diff --git a/pages/advertisement/advertisement.scss b/pages/advertisement/advertisement.scss
index ef40b5d..033edf7 100644
--- a/pages/advertisement/advertisement.scss
+++ b/pages/advertisement/advertisement.scss
@@ -89,10 +89,10 @@
 			.thumb{
 				display: flex;
 				align-items: center;
-				width: 20%;
+				width: 30%;
 				image{
-					width: 130rpx;
-					height: 280rpx;
+					width: 100%;
+					// height: 280rpx;
 				}
 			}
 			.item{
@@ -120,6 +120,9 @@
 					.goods-list-txt {
 						width: 50%;
 						padding-right: 2%;
+						 white-space: nowrap; /* 防止文本换行 */
+						  overflow: hidden; /* 隐藏溢出的文本 */
+						  text-overflow: ellipsis; /* 添加省略号 */
 					}
 				}
 				.goods-btn {
diff --git a/pages/advertisement/advertisement.vue b/pages/advertisement/advertisement.vue
index 100266f..70bea31 100644
--- a/pages/advertisement/advertisement.vue
+++ b/pages/advertisement/advertisement.vue
@@ -16,11 +16,11 @@
 		<view class="screen-list">
 			<view class="list" @click="setList(0)">
 				<text>类型</text>
-				<image :src="`${this.$imgs}/down.png`"></image>
+				<image :src="$imgUrl('/down.png')"></image>
 			</view>
 			<view class="list" @click="setList(1)">
 				<text>租金</text>
-				<image :src="`${this.$imgs}/down.png`"></image>
+				<image :src="$imgUrl('/down.png')"></image>
 			</view>
 			<!-- <view class="list">
 				<text>默认排序</text>
@@ -28,7 +28,7 @@
 			</view> -->
 			<view class="list" @click="setList(2)">
 				<text>筛选</text>
-				<image :src="`${this.$imgs}/down.png`"></image>
+				<image :src="$imgUrl('/down.png')"></image>
 			</view>
 			<u-select v-model="show" :list="companys" @confirm="handleCompanyConfirm" mini borderless></u-select>
 		</view>
@@ -37,7 +37,7 @@
 			<view class="goods-list">
 				<view class="list" v-for="(item,index) in tableData" :key="index">
 					<view class="thumb">
-						<image :src="item.locationDiagram" mode=""></image>
+						<image :src="item.locationDiagram" mode="widthFix"></image>
 					</view>
 					<view class="item">
 						<view class="title">
@@ -46,19 +46,20 @@
 						<view>
 							<view class="goods-list-text">
 								<view class="goods-list-txt">轮播顺序：<text>{{item.rotationOrder}}</text></view>
-								<view>所属移动端：<text>{{item.affiliation}}</text></view>
+								<view class="goods-list-txt">所属移动端：<text>{{item.affiliation}}</text></view>
 							</view>
 							<view class="goods-list-text">
 								<view class="goods-list-txt">投放定价：<text>100元/天</text></view>
-								<view>历史平均点击率：<text>80%</text></view>
+								<view class="goods-list-txt">历史平均点击率：<text>80%</text></view>
 							</view>
 							<view class="goods-list-text">
 								<view class="goods-list-txt">高频时段：<text>18:00 - 20:00</text></view>
-								<view>单次可租赁时间：<text>1天</text></view>
+								<view class="goods-list-txt">单次可租赁时间：<text>1天</text></view>
 							</view>
 						</view>
 						<view>
-							<view @click="advertisementTime" class="goods-btn">可租赁时段<image  :src="`${this.$imgs}/right1.png`"></image></view>
+							<view @click="advertisementTime" class="goods-btn">可租赁时段
+							<image  :src="$imgUrl('/right1.png')"></image></view>
 						</view>
 					</view>
 				</view>
diff --git a/pages/advertisementAdd/advertisementAdd.vue b/pages/advertisementAdd/advertisementAdd.vue
index bc72e7f..56e63a5 100644
--- a/pages/advertisementAdd/advertisementAdd.vue
+++ b/pages/advertisementAdd/advertisementAdd.vue
@@ -51,7 +51,7 @@
 				</view>
 				<view class="content">
 					<input type="text" placeholder="请选择">
-					<image :src="`${this.$imgs}/right2.png`"></image>
+					<image :src="$imgUrl('/right2.png')"></image>
 				</view>
 			</view>
 			<view class="list">
@@ -90,7 +90,7 @@
 				</view>
 				<view class="voucher-img">
 					<view class="voucher-list">
-						<image :src="`${this.$imgs}/voucher_bg.png`" ></image>
+						<image :src="$imgUrl('/voucher_bg.png')" ></image>
 					</view>
 				</view>
 			</view>
diff --git a/pages/apply/apply.vue b/pages/apply/apply.vue
index a7c2054..0f6197d 100644
--- a/pages/apply/apply.vue
+++ b/pages/apply/apply.vue
@@ -4,7 +4,7 @@
 			<view>记录查询</view>
 			<view class="list">
 				<text>租赁申请记录</text>
-				<image :src="`${this.$imgs}/down.png`" ></image>
+				<image :src="$imgUrl('/down.png')" ></image>
 			</view>
 		</view>
 		<!-- 记录列表 -->
@@ -25,7 +25,7 @@
 					</view>
 				</view>
 				<view class="integral">
-					<image :src="`${this.$imgs}/right2.png`" ></image>
+					<image :src="$imgUrl('/right2.png')" ></image>
 				</view>
 			</view>
 			<view class="list">
@@ -44,7 +44,7 @@
 					</view>
 				</view>
 				<view class="integral">
-					<image :src="`${this.$imgs}/right2.png`"></image>
+					<image :src="$imgUrl('/right2.png')"></image>
 				</view>
 			</view>
 		</view>
diff --git a/pages/applyDetail/applyDetail.vue b/pages/applyDetail/applyDetail.vue
index 579e091..ca179cc 100644
--- a/pages/applyDetail/applyDetail.vue
+++ b/pages/applyDetail/applyDetail.vue
@@ -71,8 +71,8 @@
 			</view>
 			<view class="list" style="padding: 0 0 30rpx 0;">
 				<view class="reconciliationdetail-img">
-					<view><image :src="`${this.$imgs}/img/2.jpg`" ></image></view>
-					<view><image :src="`${this.$imgs}/img/2.jpg`"></image></view>
+					<view><image :src="$imgUrl('/img/2.jpg')" ></image></view>
+					<view><image :src="$imgUrl('/img/2.jpg')" ></image></view>
 				</view>
 			</view>
 			</view>
diff --git a/pages/complaint/complaint.vue b/pages/complaint/complaint.vue
index f04f1a8..82af1eb 100644
--- a/pages/complaint/complaint.vue
+++ b/pages/complaint/complaint.vue
@@ -28,7 +28,7 @@
 				</view>
 				<view class="voucher-img">
 					<view class="voucher-list">
-						<image :src="`${this.$imgs}/voucher_bg.png`" ></image>
+						<image :src="$imgUrl('/voucher_bg.png')" ></image>
 					</view>
 				</view>
 			</view>
diff --git a/pages/details/details.vue b/pages/details/details.vue
index 4f78a31..f242632 100644
--- a/pages/details/details.vue
+++ b/pages/details/details.vue
@@ -87,7 +87,7 @@ export default {
         {
           id: 0,
           type: 'image',
-          url: `${this.$imgs}/img/1.jpg`
+          url: this.$imgUrl('/img/1.jpg')
         }
       ],
     };
diff --git a/pages/field/field.scss b/pages/field/field.scss
index d17a7f6..7aeb72c 100644
--- a/pages/field/field.scss
+++ b/pages/field/field.scss
@@ -15,10 +15,8 @@
 			display: flex;
 			align-items: center;
 			width: 100%;
-			padding: 0 10rpx;
 			height: 72rpx;
-			background-color: #fff;
-			border: 2rpx solid #E8E8E8;
+			// border: 2rpx solid #E8E8E8;
 			border-radius: 100rpx;
 			.icon{
 				display: flex;
diff --git a/pages/field/field.vue b/pages/field/field.vue
index a365d26..ed71a0f 100644
--- a/pages/field/field.vue
+++ b/pages/field/field.vue
@@ -2,40 +2,42 @@
 	<view class="page">
 		<!-- 搜索 -->
 		<view class="head-search">
+			
 			<view class="search">
-				<view class="icon">
-					<image :src="`${this.$imgs}/search.png`"  mode=""></image>
+				<u-search placeholder="请输入" v-model="keyword" @search="sousu" @custom="sousu"></u-search>
+			<!-- 	<view class="icon">
+					<image :src="$imgUrl('/search.png')" mode=""></image>
 				</view>
 				<view class="hint">
 					<text class="min">请输入关键词</text>
 					<text class="max">搜索</text>
-				</view>
+				</view> -->
 			</view>
 		</view>
 		<view class="screen-list">
 			<view class="list">
 				<text>区域</text>
-				<image :src="`${this.$imgs}/down.png`"></image>
+				<image :src="$imgUrl('/down.png')"></image>
 			</view>
 			<view class="list">
 				<text>租金</text>
-				<image :src="`${this.$imgs}/down.png`"></image>
+				<image :src="$imgUrl('/down.png')"></image>
 			</view>
 			<view class="list">
 				<text>默认排序</text>
-				<image :src="`${this.$imgs}/down.png`"></image>
+				<image :src="$imgUrl('/down.png')"></image>
 			</view>
 			<view class="list">
 				<text>筛选</text>
-				<image :src="`${this.$imgs}/down.png`"></image>
+				<image :src="$imgUrl('/down.png')"></image>
 			</view>
 		</view>
 		<!-- 订单列表 -->
 		<view class="goods-data">
 			<view class="goods-list">
-				<view class="list" v-for="(item,index) in 8" :key="index">
+				<view class="list" v-for="(item,index) in 0" :key="index">
 					<view class="thumb">
-						<image  :src="`${this.$imgs}/img/3.jpg`"  mode=""></image>
+						<image  :src="$imgUrl('/img/3.jpg')"  mode=""></image>
 					</view>
 					<view class="item">
 						<view class="title">
@@ -46,7 +48,7 @@
 							<text>标签标签</text>
 						</view>
 						<view class="introduce">
-							<image  :src="`${this.$imgs}/kefu.png`"></image>
+							<image  :src="$imgUrl('/kefu.png')"></image>
 							<text class="one-omit">这里有地址这里有地址这里有地址这里有地址</text>
 						</view>
 						<view class="like-goods">
@@ -72,6 +74,7 @@
 	export default {
 		data() {
 			return {
+				keyword:'',
 			};
 		},
 		methods: {
@@ -79,7 +82,11 @@
 				uni.navigateTo({
 					url: '/pages/reconciliationdetail/reconciliationdetail'
 				})
-			}
+			},
+			sousu(){
+				if(this.keyword != ''){
+				}
+			},
 		}
 	}
 </script>
diff --git a/pages/home/home.scss b/pages/home/home.scss
index 151531c..171726b 100644
--- a/pages/home/home.scss
+++ b/pages/home/home.scss
@@ -252,6 +252,9 @@
 			overflow: hidden;
 			.thumb {
 				width: 100%;
+				display: flex;
+				justify-content: space-evenly;
+				padding-top:10px;
 				//height: 300rpx;
 				overflow: hidden;
 				image {
@@ -303,7 +306,7 @@
 							transform: scale(0.7);
 						}
 						.max {
-							font-size: 28rpx;
+							font-size: 24rpx;
 							color: #000;
 							font-weight: bold;
 						}
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 64c57d6..908c041 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -1,11 +1,11 @@
 <template>
 	<view class="page">
 		<view style="position: absolute; top: 0; width: 100%;">
-			<image   :src="`${this.$imgs}/bg.png`"  class="top-img" mode="aspectFill"></image>
+			<image  :src="$imgUrl('/bg.png')"   class="top-img" mode="aspectFill"></image>
 		</view>
 		<view class="head" :style="'background-color: rgba(38,197,112,'+(scrollTop/50)+');'">
 			<view class="logo-title">
-				<image :src="`${this.$imgs}/logo.png`" ></image>
+				<image :src="$imgUrl('/logo.png')" ></image>
 			</view>
 			<view class="title">
 			</view>
@@ -25,7 +25,7 @@
 				<view class="notice-content">
 					<view class="notice-left">
 						<view>
-							<image :src="`${this.$imgs}/home1.png`"></image>
+							<image :src="$imgUrl('/home1.png')"></image>
 						</view>
 					</view>
 					<view class="notice-line"></view>
@@ -42,7 +42,7 @@
 				<view class="wallet-info">
 					<view class="list" @click="shops">
 						<view class="icon">
-							<image :src="`${this.$imgs}/home2.png`"></image>
+							<image  :src="$imgUrl('/home2.png')"></image>
 						</view>
 						<view class="title">
 							<text>租商铺</text>
@@ -50,7 +50,7 @@
 					</view>
 					<view class="list" @click="field">
 						<view class="icon">
-							<image :src="`${this.$imgs}/home3.png`"></image>
+							<image :src="$imgUrl('/home3.png')"></image>
 						</view>
 						<view class="title">
 							<text>租场地</text>
@@ -58,7 +58,7 @@
 					</view>
 					<view class="list" @click="advertisement">
 						<view class="icon">
-							<image :src="`${this.$imgs}/home4.png`"></image>
+							<image :src="$imgUrl('/home4.png')"></image>
 						</view>
 						<view class="title">
 							<text>租广告</text>
@@ -66,7 +66,7 @@
 					</view>
 					<view class="list" @click="">
 						<view class="icon">
-							<image  :src="`${this.$imgs}/home4.png`"></image>
+							<image  :src="$imgUrl('/home4.png')"></image>
 						</view>
 						<view class="title">
 							<text>物业缴费</text>
@@ -155,19 +155,19 @@
 					<view class="list" @click="setList(0)">
 							<text>{{xuanList[0]}}</text>
 							
-							<image :src="`${this.$imgs}/down.png`"></image>
+							<image :src="$imgUrl('/down.png')"></image>
 						</view>
 						<view class="list" @click="setList(1)">
 							<text>{{xuanList[1]}}</text>
-							<image :src="`${this.$imgs}/down.png`"></image>
+							<image :src="$imgUrl('/down.png')"></image>
 						</view>
 						<view class="list" @click="setList(2)">
 							<text>{{xuanList[2]}}</text>
-							<image :src="`${this.$imgs}/down.png`"></image>
+							<image :src="$imgUrl('/down.png')"></image>
 						</view>
 						<view class="list" @click="setList(3)">
 							<text>{{xuanList[3]}}</text>
-							<image :src="`${this.$imgs}/down.png`"></image>
+							<image :src="$imgUrl('/down.png')"></image>
 						</view>
 						<u-select v-model="show" mode="single-column" :list="list" @confirm="confirm"></u-select>
 						
@@ -181,10 +181,10 @@
 									mode="heightFix"></image>
 							</view>
 							<view class="item">
-								<view class="tag">
+								<!-- <view class="tag">
 									<text>标签标签</text>
 									<text>标签标签</text>
-								</view>
+								</view> -->
 								<view class="title">
 									<text
 										class="two-omit">{{ item.shopName || item.advertisingName || ''}}</text>
@@ -193,15 +193,15 @@
 									<view class="retail-price">
 										<text>租金:</text>
 										<text class="min">￥</text>
-										<text class="max">1067</text>
+										<text class="max">{{zujin[index].price}}</text>
 										<text class="min">/月</text>
 										<text class="line"></text>
 										<text>面积:</text>
-										<text class="max">81</text>
+										<text class="max">{{item.actualUsableArea?item.actualUsableArea:'55.4'}}</text>
 										<text class="min">/m²</text>
 									</view>
 									<view class="vip-price" v-if="item.detailedLocation">
-										<image :src="`${this.$imgs}/kefu.png`"></image>
+										<!-- <image :src="`${this.$imgs}/kefu.png`"></image> -->
 										<text class="min">{{item.detailedLocation || ''}}</text>
 									</view>
 								</view>
@@ -234,6 +234,16 @@
 					pageSize: 10
 				},
 				swiperList: [],//轮播
+				zujin:[
+					{price:'4800'},
+					{price:'3400'},
+					{price:'3000'}
+				],
+				biaoqian:[
+					// {name:'4800'},
+					// {price:'3400'},
+					// {price:'3000'}
+				],
 				show: false,
 				xuanval:0,
 				xuanList:['区域','租金','默认排序','筛选'],
@@ -265,11 +275,13 @@
 				}
 				this.$http.sendRequest('/cereAnnouncement/queryByPage', 'POST', pagesize,1).then(res => {
 					//成功回调
+					
 				this.procedureData = res.data.data.content.slice(-2)
 				})
 				
 				this.$http.sendRequest('/cereBasicInformationShop/queryByPage', 'POST', this.pageindex,1).then(res => {
 					//成功回调
+					console.log(res.data.data.content)
 					this.tableData = res.data.data.content
 				})
 				this.$http.sendRequest('/cereCarouselImage/queryByPage', 'POST', this.pageindex,1).then(res => {
diff --git a/pages/leaseAdd/leaseAdd.vue b/pages/leaseAdd/leaseAdd.vue
index 4b76cc4..509ae89 100644
--- a/pages/leaseAdd/leaseAdd.vue
+++ b/pages/leaseAdd/leaseAdd.vue
@@ -44,7 +44,7 @@
 				</view>
 				<view class="content">
 					<input type="text" placeholder="请选择">
-					<image :src="`${this.$imgs}/right2.png`"></image>
+					<image :src="$imgUrl('/right2.png')" ></image>
 				</view>
 			</view>
 			<view class="list">
@@ -54,7 +54,7 @@
 				</view>
 				<view class="content">
 					<input type="text" placeholder="请选择">
-					<image :src="`${this.$imgs}/right2.png`"></image>
+					<image :src="$imgUrl('/right2.png')"></image>
 				</view>
 			</view>
 			<view class="feedback-data">
@@ -66,7 +66,7 @@
 				</view>
 				<view class="voucher-img">
 					<view class="voucher-list">
-						<image :src="`${this.$imgs}/voucher_bg.png`"></image>
+						<image :src="$imgUrl('/voucher_bg.png')"></image>
 					</view>
 				</view>
 			</view>
@@ -79,7 +79,7 @@
 				</view>
 				<view class="voucher-img">
 					<view class="voucher-list">
-						<image :src="`${this.$imgs}/voucher_bg.png`"></image>
+						<image  :src="$imgUrl('/voucher_bg.png')"></image>
 					</view>
 				</view>
 			</view>
@@ -92,7 +92,7 @@
 				</view>
 				<view class="voucher-img">
 					<view class="voucher-list">
-						<image :src="`${this.$imgs}/voucher_bg.png`"></image>
+						<image :src="$imgUrl('/voucher_bg.png')" ></image>
 					</view>
 				</view>
 			</view>
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 732970a..d8e3de8 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="page">
 		<view style="display: flex;justify-content: space-between;padding: 20px;height: 64px;">
-			<view @click="goHome"><image :src="`${this.$imgs}/right2.png`" style="width: 20px;height: 20px; transform: rotate(180deg);"></image></view>
+			<view @click="goHome"><image :src="$imgUrl('/right2.png')"  style="width: 20px;height: 20px; transform: rotate(180deg);"></image></view>
 			<view>登录</view>
 			<view class="">
 			</view>
@@ -55,7 +55,6 @@
 </template>
 
 <script>
-	const JM = require('@/utils/rsaEncrypt.js')
 	export default {
 		data() {
 			return {
@@ -102,11 +101,12 @@
 						return
 					}
 				const data = {
-				  username: JM.encrypt(this.form.username),
-				  password: JM.encrypt(this.form.password),
-				  rememberMe: this.form.rememberMe
+				  // username: JM.encrypt(this.form.username),
+				  // password: JM.encrypt(this.form.password),
+				  // rememberMe: this.form.rememberMe
+				  
 				}
-				this.$http.sendRequest('/business/login', 'POST',data,2).then(res => {
+				this.$http.sendRequest('/business/login', 'POST',this.form,2).then(res => {
 					if(res.data.code == ''){
 						uni.setStorageSync('token', res.data.data.token);
 						uni.setStorageSync('shopId', res.data.data.shopId);
diff --git a/pages/message/message.vue b/pages/message/message.vue
index f6dc37e..be88856 100644
--- a/pages/message/message.vue
+++ b/pages/message/message.vue
@@ -1,10 +1,11 @@
 <template>
 	<view class="page">
-		<view style="position: absolute; top: 0; width: 100%;"><image :src="`${this.$imgs}/bg.png`" style="width: 100%; height: 490rpx;border-radius: 0 0 40rpx 40rpx;"></image></view>
+		<view style="position: absolute; top: 0; width: 100%;">
+			<image :src="$imgUrl('/bg.png')" style="width: 100%; height: 490rpx;border-radius: 0 0 40rpx 40rpx;"></image></view>
 		<view class="my-top">
 			<view class="head" :style="'background-color: rgba(38,197,112,'+(scrollTop/50)+');'">
 				<view class="logo-title">
-					<image  :src="`${this.$imgs}/logo.png`" ></image>
+					<image :src="$imgUrl('/logo.png')" ></image>
 				</view>
 				<view class="title">
 					
@@ -17,7 +18,7 @@
 			<view class="list">
 				<view class="icon-data">
 					<view class="icon">
-						<image  :src="`${this.$imgs}/msg1.png`" mode=""></image>
+						<image :src="$imgUrl('/msg1.png')"  mode=""></image>
 					</view>
 					<view class="data">
 						<view class="title">
@@ -36,7 +37,7 @@
 			<view class="list">
 				<view class="icon-data">
 					<view class="icon">
-						<image  :src="`${this.$imgs}/msg2.png`" mode=""></image>
+						<image :src="$imgUrl('/msg2.png')" mode=""></image>
 					</view>
 					<view class="data">
 						<view class="title">
@@ -55,7 +56,7 @@
 			<view class="list">
 				<view class="icon-data">
 					<view class="icon">
-						<image :src="`${this.$imgs}/msg3.png`"  mode=""></image>
+						<image  :src="$imgUrl('/msg3.png')"   mode=""></image>
 					</view>
 					<view class="data">
 						<view class="title">
@@ -74,7 +75,7 @@
 			<view class="list">
 				<view class="icon-data">
 					<view class="icon">
-						<image :src="`${this.$imgs}/msg4.png`" mode=""></image>
+						<image  :src="$imgUrl('/msg4.png')"  mode=""></image>
 					</view>
 					<view class="data">
 						<view class="title">
@@ -93,7 +94,7 @@
 			<view class="list">
 				<view class="icon-data">
 					<view class="icon">
-						<image :src="`${this.$imgs}/msg5.png`" mode=""></image>
+						<image :src="$imgUrl('/msg5.png')"  mode=""></image>
 					</view>
 					<view class="data">
 						<view class="title">
@@ -112,7 +113,7 @@
 			<view class="list">
 				<view class="icon-data">
 					<view class="icon">
-						<image :src="`${this.$imgs}/msg6.png`" mode=""></image>
+						<image :src="$imgUrl('/msg6.png')" mode=""></image>
 					</view>
 					<view class="data">
 						<view class="title">
@@ -131,7 +132,7 @@
 			<view class="list">
 				<view class="icon-data">
 					<view class="icon">
-						<image :src="`${this.$imgs}/msg7.png`" mode=""></image>
+						<image :src="$imgUrl('/msg7.png')" mode=""></image>
 					</view>
 					<view class="data">
 						<view class="title">
@@ -150,7 +151,7 @@
 			<view class="list">
 				<view class="icon-data">
 					<view class="icon">
-						<image :src="`${this.$imgs}/msg7.png`" mode=""></image>
+						<image :src="$imgUrl('/msg7.png')" mode=""></image>
 					</view>
 					<view class="data">
 						<view class="title">
diff --git a/pages/my/my.vue b/pages/my/my.vue
index c0c9e83..e90451e 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -1,10 +1,11 @@
 <template>
 	<view class="page">
-		<view style="position: absolute; top: 0; width: 100%;"><image :src="`${this.$imgs}/bg.png`" style="width: 100%; height: 490rpx;border-radius: 0 0 40rpx 40rpx;"></image></view>
+		<view style="position: absolute; top: 0; width: 100%;">
+			<image :src="$imgUrl('/bg.png')" style="width: 100%; height: 490rpx;border-radius: 0 0 40rpx 40rpx;"></image></view>
 		<view class="my-top">
 			<view class="head" :style="'background-color: rgba(38,197,112,'+(scrollTop/50)+');'">
 				<view class="logo-title">
-					<image :src="`${this.$imgs}/logo.png`"></image>
+					<image :src="$imgUrl('/logo.png')" ></image>
 				</view>
 				<view class="title">
 					
@@ -16,7 +17,7 @@
 		<view class="main">
 			<view class="user-info" @click="myMsg">
 				<view class="portrait">
-					<image :src="`${this.$imgs}/img/head.jpg`"  v-if="Islogin"></image>
+					<image :src="$imgUrl('/img/head.jpg')"  v-if="Islogin"></image>
 					<image :src="shopMsg.shopLogo" v-else></image>
 				</view>
 				<view class="info">
@@ -26,14 +27,14 @@
 					</view>
 					<view class="rank">
 						<view class="rank-box">
-						<image :src="`${this.$imgs}/vip.png`" ></image>
+						<image :src="$imgUrl('/vip.png')" ></image>
 						<text v-if="Islogin"></text>
 						<text v-else >{{shopMsg.shopReturn.returnAdress}}有限公司</text>
 						</view>
 					</view>
 				</view>
 				<view class="user-right">
-					<image :src="`${this.$imgs}/right1.png`" ></image>
+					<image :src="$imgUrl('/right1.png')" ></image>
 				</view>
 			</view>
 			<!-- 我的服务 -->
@@ -151,7 +152,7 @@
 				<view class="list" @click="shopjcMsg">
 					<view class="icon-data">
 						<view class="icon">
-							<image :src="`${this.$imgs}/my-icon1.png`" mode=""></image>
+							<image :src="$imgUrl('/my-icon1.png')" mode=""></image>
 						</view>
 						<view class="data">
 							<view class="title">
@@ -160,13 +161,13 @@
 						</view>
 					</view>
 					<view class="more">
-						<image :src="`${this.$imgs}/right2.png`"></image>
+						<image :src="$imgUrl('/right2.png')"></image>
 					</view>
 				</view>
 				<view class="list" @click="recordService">
 					<view class="icon-data">
 						<view class="icon">
-							<image :src="`${this.$imgs}/my-icon2.png`"  mode=""></image>
+							<image :src="$imgUrl('/my-icon2.png')" mode=""></image>
 						</view>
 						<view class="data">
 							<view class="title">
@@ -175,13 +176,13 @@
 						</view>
 					</view>
 					<view class="more">
-						<image :src="`${this.$imgs}/right2.png`"></image>
+						<image :src="$imgUrl('/right2.png')"></image>
 					</view>
 				</view>
 				<view class="list" @click="repair">
 					<view class="icon-data">
 						<view class="icon">
-							<image :src="`${this.$imgs}/my-icon3.png`" mode=""></image>
+							<image :src="$imgUrl('/my-icon3.png')" mode=""></image>
 						</view>
 						<view class="data">
 							<view class="title">
@@ -190,13 +191,13 @@
 						</view>
 					</view>
 					<view class="more">
-						<image :src="`${this.$imgs}/right2.png`" ></image>
+						<image :src="$imgUrl('/right2.png')"></image>
 					</view>
 				</view>
 				<view class="list" @click="complaint">
 					<view class="icon-data">
 						<view class="icon">
-							<image :src="`${this.$imgs}/my-icon2.png`"  mode=""></image>
+							<image :src="$imgUrl('/my-icon2.png')" mode=""></image>
 						</view>
 						<view class="data">
 							<view class="title">
@@ -205,13 +206,13 @@
 						</view>
 					</view>
 					<view class="more">
-						<image :src="`${this.$imgs}/right2.png`" ></image>
+						<image :src="$imgUrl('/right2.png')"></image>
 					</view>
 				</view>
 				<view class="list" @click="handleApplySettle">
 					<view class="icon-data">
 						<view class="icon">
-							<image :src="`${this.$imgs}/my-icon4.png`"  mode=""></image>
+							<image :src="$imgUrl('/my-icon4.png')" mode=""></image>
 						</view>
 						<view class="data">
 							<view class="title">
@@ -220,7 +221,7 @@
 						</view>
 					</view>
 					<view class="more">
-						<image :src="`${this.$imgs}/right2.png`" ></image>
+						<image :src="$imgUrl('/right2.png')"></image>
 					</view>
 				</view>
 			</view>
@@ -309,6 +310,7 @@
 				this.$http.sendRequest('/cerePromotion/queryByPage', 'POST', this.pageindex,1).then(res => {
 					//成功回调
 					this.tuiguang = res.data.data.content.length
+				
 				})
 			},
 			recordService() {
diff --git a/pages/mycreated/mycreated.vue b/pages/mycreated/mycreated.vue
index 05c156b..daf930f 100644
--- a/pages/mycreated/mycreated.vue
+++ b/pages/mycreated/mycreated.vue
@@ -5,7 +5,7 @@
 			<view class="search">
 					<input class="uni-input"  placeholder="请输入关键词" />
 				<view class="icon">
-					<image :src="`${this.$imgs}/search.png`" ></image>
+					<image :src="$imgUrl('/search.png')" ></image>
 				</view>
 				
 			</view>
@@ -25,20 +25,20 @@
 		<!-- 订单列表 -->
 		<view class="goods-data">
 			<view class="goods-list">
-				<view  class="goods-border" v-for="(item,index) in 8" :key="index">
+				<view  class="goods-border" v-for="(item,index) in num" :key="index">
 					<view class="list ">
 						<view class="thumb">
-							<image :src="`${this.$imgs}/img/2.jpg`" ></image>
+							<image :src="$imgUrl('/img/2.jpg')" ></image>
 						</view>
 						<view class="item">
 							<view class="">
-								<text class="one-omit">名称：这里有名称</text>
+								<text class="one-omit">名称：绿道好物节</text>
 							</view>
 							<view class="title">
-								<text class="one-omit color">活动时间：02-22至02-23</text>
+								<text class="one-omit color">活动时间：2024-10-10至2024-10-20</text>
 							</view>
 							<view class="title">
-								<text class="one-omit color">参与商家：6人</text>
+								<text class="one-omit color">参与商家：1人</text>
 							</view>
 							<view class="title">
 								<text class="one-omit color">活动状态：待开始</text>
@@ -66,9 +66,15 @@
 		data() {
 			return {
 				shenlist:['全部','待提交','待审核','通过','驳回','进行中','已结束'],
-				listIn:0
+				listIn:0,
+				num:0,
+				
 			};
 		},
+		onLoad(option) {
+			console.log(option.id)
+			this.num = option.id
+		},
 		methods: {
 			sel(val){
 				this.listIn = val
diff --git a/pages/participation/participation.vue b/pages/participation/participation.vue
index 934f801..ef149cb 100644
--- a/pages/participation/participation.vue
+++ b/pages/participation/participation.vue
@@ -7,7 +7,7 @@
 					 我创建的活动
 				</view>
 				<view class="icon">
-					<image :src="`${this.$imgs}/search.png`" ></image>
+					<image :src="$imgUrl('/search.png')" ></image>
 				</view>
 				
 			</view>
@@ -24,37 +24,37 @@
 		<view class="screen-list">
 			<view class="list">
 				<text>区域</text>
-				<image :src="`${this.$imgs}/down.png`" ></image>	
+				<image :src="$imgUrl('/down.png')"></image>	
 			</view>
 			<view class="list">
 				<text>租金</text>
-				<image :src="`${this.$imgs}/down.png`" ></image>
+				<image :src="$imgUrl('/down.png')" ></image>
 			</view>
 			<view class="list">
 				<text>默认排序</text>
-				<image :src="`${this.$imgs}/down.png`" ></image>
+				<image :src="$imgUrl('/down.png')"></image>
 			</view>
 			<view class="list">
 				<text>筛选</text>
-				<image :src="`${this.$imgs}/down.png`" ></image>
+				<image :src="$imgUrl('/down.png')" ></image>
 			</view>
 		</view>
 		<!-- 订单列表 -->
 		<view class="goods-data">
 			<view class="goods-list">
-				<view class="list goods-border" v-for="(item,index) in 8" :key="index">
+				<view class="list goods-border" v-for="(item,index) in 1" :key="index">
 					<view class="thumb">
-						<image :src="`${this.$imgs}/img/2.jpg`" ></image>
+						<image :src="$imgUrl('/img/2.jpg')"></image>
 					</view>
 					<view class="item">
 						<view class="">
-							<text class="one-omit">名称：这里有名称</text>
+							<text class="one-omit">名称：绿道好物节</text>
 						</view>
 						<view class="title">
-							<text class="one-omit color">活动时间：02-22至02-23</text>
+							<text class="one-omit color">活动时间：2024-10-10至2024-10-20</text>
 						</view>
 						<view class="title">
-							<text class="one-omit color">参与商家：6人</text>
+							<text class="one-omit color">参与商家：1人</text>
 						</view>
 						<view class="title">
 							<text class="one-omit color">活动状态：待开始</text>
@@ -63,7 +63,7 @@
 							<text class="one-omit color">举办方：绿道</text>
 						</view>
 						
-						<view class="canyu">
+						<view class="canyu" @click='join'>
 							<view>我要参与</view>
 						</view>
 						
@@ -85,6 +85,11 @@
 				uni.navigateTo({
 					url: '/pages/mycreated/mycreated'
 				})
+			},
+			join(){
+				uni.navigateTo({
+					url: '/pages/mycreated/mycreated?id=1'
+				})
 			}
 		}
 	}
diff --git a/pages/projectManagement/projectManagement.vue b/pages/projectManagement/projectManagement.vue
index 344ed30..6aa3c4c 100644
--- a/pages/projectManagement/projectManagement.vue
+++ b/pages/projectManagement/projectManagement.vue
@@ -5,7 +5,7 @@
 			<view class="search">
 					<input class="uni-input"  placeholder="请输入关键词" />
 				<view class="icon">
-					<image :src="`${this.$imgs}/search.png`" ></image>
+					<image :src="$imgUrl('/search.png')"  ></image>
 				</view>
 				
 			</view>
@@ -28,7 +28,7 @@
 				<view  class="goods-border" v-for="(item,index) in tableData" :key="index">
 					<view class="list ">
 						<view class="thumb">
-							<image :src="item.coverImage ||`${this.$imgs}/img/2.jpg`" mode=""></image>
+							<image :src="item.coverImage || $imgUrl('/img/2.jpg')" mode=""></image>
 						</view>
 						<view class="item">
 							<view class="">
diff --git a/pages/questionnaire/questionnaire.vue b/pages/questionnaire/questionnaire.vue
index a2968e4..1b80347 100644
--- a/pages/questionnaire/questionnaire.vue
+++ b/pages/questionnaire/questionnaire.vue
@@ -12,7 +12,7 @@
 		<view>
 			<view class='listbox' v-for="(item,index) in tableData">
 				 <view class="img">
-					 <image :src="`${this.$imgs}/img/2.jpg`"></image>
+					 <image :src="$imgUrl('/img/2.jpg')"></image>
 				 </view>
 				 <view style="width: 50%;">
 					 <view style="font-size: 24rpx;font-weight: 600;" >名称：{{item.title}}</view>
@@ -35,24 +35,17 @@
 				tableData:[
 					{	
 						Image:'',
-						title:'名称：这里有名称',
-						tTime:'22',
-						jTime:'2022-02-22',
-						leiXing:'游玩体验'
+						title:'对于物业管理服务，您满意度如何？',
+						tTime:'15',
+						jTime:'2024-10-10',
+						leiXing:'物业满意度'
 				},
 				{		
 						Image:'',
-						title:'名称：这里有名称',
-						tTime:'22',
-						jTime:'2022-02-22',
-						leiXing:'游玩体验'
-				},
-				{			
-						Image:'',
-						title:'名称：这里有名称',
-						tTime:'22',
-						jTime:'2022-02-22',
-						leiXing:'游玩体验'
+						title:'您是否认为公共设施设备维护及时有效？',
+						tTime:'10',
+						jTime:'2024-10-9',
+						leiXing:'安保服务'
 				}
 				]
 			};
diff --git a/pages/record/record.vue b/pages/record/record.vue
index 90bd4e6..7b0d6c9 100644
--- a/pages/record/record.vue
+++ b/pages/record/record.vue
@@ -4,7 +4,7 @@
 			<view>记录查询</view>
 			<view class="list">
 				<text>租赁申请记录</text>
-				<image :src="`${this.$imgs}/down.png`" ></image>
+				<image :src="$imgUrl('/down.png')" ></image>
 			</view>
 		</view>
 		<!-- 记录列表 -->
@@ -26,7 +26,7 @@
 					</view>
 				</view>
 				<view class="integral">
-					<image :src="`${this.$imgs}/right2.png`" ></image>
+					<image :src="$imgUrl('/right2.png')"></image>
 				</view>
 				</view>
 				
diff --git a/pages/recordService/recordService.vue b/pages/recordService/recordService.vue
index 11d1b41..f81b71c 100644
--- a/pages/recordService/recordService.vue
+++ b/pages/recordService/recordService.vue
@@ -4,12 +4,12 @@
 			<view>记录查询</view>
 			<view class="list">
 				<text>报事报修</text>
-				<image :src="`${this.$imgs}/down.png`" ></image>
+				<image :src="$imgUrl('/down.png')"></image>
 			</view>
 		</view>
 		<!-- 记录列表 -->
 		<view class="record-list">
-			<view class="record-list-box" v-for="(item,index) in 4" :key="index">
+			<view class="record-list-box" v-for="(item,index) in 0" :key="index">
 				<view class="list">
 				<view class="title-date">
 					<view class="date">
@@ -26,7 +26,7 @@
 					</view>
 				</view>
 				<view class="integral">
-					<image :src="`${this.$imgs}/right2.png`" ></image>
+					<image :src="$imgUrl('/right2.png')" ></image>
 				</view>
 				</view>
 				<view class="list-btn">
diff --git a/pages/repair/repair.vue b/pages/repair/repair.vue
index dd1d5cf..d66574f 100644
--- a/pages/repair/repair.vue
+++ b/pages/repair/repair.vue
@@ -64,7 +64,7 @@
 				</view>
 				<view class="voucher-img">
 					<view class="voucher-list">
-						<image :src="`${this.$imgs}/voucher_bg.png`" ></image>
+						<image :src="$imgUrl('/voucher_bg.png')" ></image>
 					</view>
 				</view>
 			</view>
diff --git a/pages/salesReporting/salesReporting.vue b/pages/salesReporting/salesReporting.vue
index d545009..e34ef50 100644
--- a/pages/salesReporting/salesReporting.vue
+++ b/pages/salesReporting/salesReporting.vue
@@ -148,6 +148,6 @@
 	}
 </script>
 
-<style>
+<style lang="scss" scoped>
 	@import 'salesReporting.scss';
 </style>
\ No newline at end of file
diff --git a/pages/salesSta/salesSta.vue b/pages/salesSta/salesSta.vue
index 3fc0def..79c3240 100644
--- a/pages/salesSta/salesSta.vue
+++ b/pages/salesSta/salesSta.vue
@@ -148,6 +148,6 @@
 	}
 </script>
 
-<style>
+<style lang="scss" scoped>
 	@import './salesSta.scss';
 </style>
\ No newline at end of file
diff --git a/pages/servicedetails/servicedetails.vue b/pages/servicedetails/servicedetails.vue
index 91adca5..09f3eab 100644
--- a/pages/servicedetails/servicedetails.vue
+++ b/pages/servicedetails/servicedetails.vue
@@ -64,7 +64,7 @@
 			</view>
 		</view>
 	<view style="padding:0  30rpx;margin-top: 30rpx;">
-		<image :src="`${this.$imgs}/组 18072.png`" mode="" style="width: 100%;"></image>
+		<image :src="$imgUrl('/组 18072.png')"  mode="" style="width: 100%;"></image>
 	</view>
 		
 		<view class="" style="padding: 0 40rpx;" v-if="record.state == '已通过'">
diff --git a/pages/servicerecords/servicerecords.vue b/pages/servicerecords/servicerecords.vue
index 67e265c..3915f97 100644
--- a/pages/servicerecords/servicerecords.vue
+++ b/pages/servicerecords/servicerecords.vue
@@ -4,7 +4,7 @@
 			<view>记录查询</view>
 			<view class="list">
 				<text>广告申请记录</text>
-				<image  :src="`${this.$imgs}/down.png`" ></image>
+				<image :src="$imgUrl('/down.png')" ></image>
 			</view>
 		</view>
 		<!-- 记录列表 -->
@@ -12,7 +12,7 @@
 			<view class="record-list-box" v-for="(item,index) in recordList" :key="index" @click="recordXq(item)">
 				<view class="list">	
 				<view class="thumb">
-					<image :src="`${this.$imgs}/img/2.jpg`"></image>
+					<image :src="$imgUrl('/img/2.jpg')" ></image>
 				</view>
 				<view class="title-date">
 					<view class="date">
@@ -29,7 +29,7 @@
 					</view>
 				</view>
 				<view class="integral">
-					<image  :src="`${this.$imgs}/right2.png`"></image>
+					<image  :src="$imgUrl('/right2.png')" ></image>
 				</view>
 				</view>
 				
diff --git a/pages/shops/shops.vue b/pages/shops/shops.vue
index 966cfeb..e4a939b 100644
--- a/pages/shops/shops.vue
+++ b/pages/shops/shops.vue
@@ -3,28 +3,21 @@
 		<!-- 搜索 -->
 		<view class="head-search">
 			<view class="search">
-				<!-- <view class="icon">
-					<image src="/static/search.png" mode=""></image>
-				</view>
-				<view class="hint">
-					<text class="min">请输入关键词</text>
-					<text class="max">搜索</text>
-				</view> -->
 					<u-search placeholder="请输入" v-model="keyword" @search="sousu" @custom="sousu"></u-search>
 			</view>
 		</view>
 		<view class="screen-list">
 			<view class="list" @click="setList(0)">
 				<text>区域</text>
-				<image :src="`${this.$imgs}/down.png`" ></image>
+				<image  :src="$imgUrl('/down.png')"></image>
 			</view>
 			<view class="list" @click="setList(1)">
 				<text>租金</text>
-				<image :src="`${this.$imgs}/down.png`" ></image>
+				<image :src="$imgUrl('/down.png')"></image>
 			</view>
 			<view class="list" @click="setList(2)">
 				<text>默认排序</text>
-				<image :src="`${this.$imgs}/down.png`" ></image>
+				<image :src="$imgUrl('/down.png')"></image>
 			</view>
 			<!-- <view class="list" @click="setList(3)">
 				<text>筛选</text>
@@ -47,22 +40,22 @@
 							<text class="one-omit">{{item.shopName}}</text>
 						</view>
 						<view class="tag">
-							<text>标签标签</text>
-							<text>标签标签</text>
+							<!-- <text>标签标签</text>
+							<text>标签标签</text> -->
 						</view>
 						<view class="introduce">
-							<image  :src="`${this.$imgs}/kefu.png`"></image>
+							<image  :src="$imgUrl('/kefu.png')"></image>
 							<text class="one-omit">{{item.detailedLocation}}</text>
 						</view>
 						<view class="like-goods">
 							<view class="retail-price">
 								<text>租金:</text>
 								<text class="min">￥</text>
-								<text class="max">1067</text>
+								<text class="max">{{zujinList[index].price}}</text>
 								<text class="min">/月</text>
 								<text class="line"></text>
 								<text>面积:</text>
-								<text class="max">81</text>
+								<text class="max">{{item.actualUsableArea}}</text>
 								<text class="min">/m²</text>
 							</view>
 						</view>
@@ -153,6 +146,11 @@
 				showSex: false,
 				show:false,
 				index:1,
+				zujinList:[
+					{price:'4800'},
+					{price:'3400'},
+					{price:'3000'}
+				],
 				companys: [
 					{
 						value: '1',
diff --git a/pages/workbench/workbench.vue b/pages/workbench/workbench.vue
index 066c1a6..6daa224 100644
--- a/pages/workbench/workbench.vue
+++ b/pages/workbench/workbench.vue
@@ -1,10 +1,11 @@
 <template>
 	<view class="page">
-		<view style="position: absolute; top: 0; width: 100%;"><image  :src="`${this.$imgs}/bg.png`" style="width: 100%; height: 490rpx;border-radius: 0 0 40rpx 40rpx;"></image></view>
+		<view style="position: absolute; top: 0; width: 100%;">
+			<image  :src="$imgUrl('/bg.png')" style="width: 100%; height: 490rpx;border-radius: 0 0 40rpx 40rpx;"></image></view>
 		<view class="my-top">
 			<view class="head" :style="'background-color: rgba(38,197,112,'+(scrollTop/50)+');'">
 				<view class="logo-title">
-					<image  :src="`${this.$imgs}/logo.png`"></image>
+					<image :src="$imgUrl('/logo.png')"></image>
 				</view>
 				<view class="title">
 					
@@ -18,15 +19,15 @@
 				<view class="wallet-info">
 					<view class="list" @click="questionnaire">
 						<view class="icon">
-							<image :src="`${this.$imgs}/workbench1.png`"></image>
+							<image :src="$imgUrl('/workbench1.png')"></image>
 						</view>
 						<view class="title">
 							<text>问卷调查</text>
 						</view>
 					</view>
-					<view class="list">
+					<view class="list" @click="Iproposal">
 						<view class="icon">
-							<image :src="`${this.$imgs}/workbench2.png`"></image>
+							<image :src="$imgUrl('/workbench2.png')"></image>
 						</view>
 						<view class="title">
 							<text>招商方案</text>
@@ -34,7 +35,7 @@
 					</view>
 					<view class="list"  @click='participation'>
 						<view class="icon">
-							<image :src="`${this.$imgs}/workbench3.png`"></image>
+							<image :src="$imgUrl('/workbench3.png')"></image>
 						</view>
 						<view class="title">
 							<text>活动参与</text>
@@ -42,7 +43,7 @@
 					</view>
 					<view class="list" @click="activityAdd">
 						<view class="icon">
-							<image :src="`${this.$imgs}/workbench4.png`"></image>
+							<image :src="$imgUrl('/workbench4.png')"></image>
 						</view>
 						<view class="title">
 							<text>活动申请</text>
@@ -50,7 +51,7 @@
 					</view>
 					<view class="list" @click="sales">
 						<view class="icon">
-							<image :src="`${this.$imgs}/workbench5.png`"></image>
+							<image :src="$imgUrl('/workbench5.png')"></image>
 						</view>
 						<view class="title">
 							<text>销售上报</text>
@@ -63,7 +64,7 @@
 				<view class="wallet-info">
 					<view class="list">
 						<view class="icon"  @click='popularize(1)'>
-							<image :src="`${this.$imgs}/workbench2.png`"></image>
+							<image :src="$imgUrl('/workbench2.png')" ></image>
 						</view>
 						<view class="title">
 							<text>推广方案申请</text>
@@ -71,7 +72,7 @@
 					</view>
 					<view class="list">
 						<view class="icon"  @click='popularize(2)'>
-							<image :src="`${this.$imgs}/workbench7.png`"></image>
+							<image :src="$imgUrl('/workbench7.png')"></image>
 						</view>
 						<view class="title">
 							<text>推广方案管理</text>
@@ -79,7 +80,7 @@
 					</view>
 					<view class="list">
 						<view class="icon">
-							<image :src="`${this.$imgs}/workbench8.png`"></image>
+							<image :src="$imgUrl('/workbench8.png')"></image>
 						</view>
 						<view class="title">
 							<text>效果查看</text>
@@ -100,7 +101,7 @@
 					</view> -->
 					<view class="list" @click="order">
 						<view class="icon">
-							<image :src="`${this.$imgs}/workbench10.png`"></image>
+							<image :src="$imgUrl('/workbench10.png')"></image>
 						</view>
 						<view class="title">
 							<text>订单查询</text>
@@ -124,7 +125,7 @@
 					</view> -->
 					<view class="list" @click="salesSta">
 						<view class="icon">
-							<image :src="`${this.$imgs}/workbench15.png`"></image>
+							<image :src="$imgUrl('/workbench15.png')"></image>
 						</view>
 						<view class="title">
 							<text>销售统计</text>
@@ -153,7 +154,7 @@
 				<view class="wallet-info">
 					<view class="list">
 						<view class="icon">
-							<image :src="`${this.$imgs}/workbench16.png`"></image>
+							<image :src="$imgUrl('/workbench16.png')"></image>
 						</view>
 						<view class="title">
 							<text>明细查询</text>
@@ -161,7 +162,7 @@
 					</view>
 					<view class="list">
 						<view class="icon">
-							<image :src="`${this.$imgs}/workbench7.png`"></image>
+							<image :src="$imgUrl('/workbench7.png')"></image>
 						</view>
 						<view class="title">
 							<text>日志查询</text>
@@ -223,6 +224,11 @@
 					url: '/pages/salesSta/salesSta',
 				})
 			},
+			Iproposal(){
+				uni.navigateTo({
+					url: '/pages/Iproposal/Iproposal',
+				})
+			},
 			popularize(val){
 				if(val ==1){
 					uni.navigateTo({
diff --git a/utils/request.js b/utils/request.js
index 9d4922e..70dc3d5 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -22,17 +22,13 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
 	} else {
 		types = 'application/json';
 	}
- 
-	// #ifdef H5
+	var bases = ''
 	if(baseUrl == 1){
-		var bases = 'http://8.130.38.56:8027/admin-server' + url;
+		bases = 'http://8.130.38.56:8027/admin-server' + url;
 	}else{
-		var bases = 'http://8.130.38.56:8027/business-server' + url;
+		bases = 'http://8.130.38.56:8027/business-server' + url;
 		// var bases = 'http://10.0.0.96:9004' + url;
 	}
-	
-	// #endif
- 
 	var token = uni.getStorageSync('token') || '';
 	var shopId = uni.getStorageSync('shopId') || '';
 	return new Promise(function(resolve, reject) {
--
libgit2 0.21.4