From 19e734d2ea7d2831cc6382b8d74041bf5504c29e Mon Sep 17 00:00:00 2001
From: Joker_Yxin <2509699647@qq.com>
Date: Thu, 17 Oct 2024 14:18:52 +0800
Subject: [PATCH] 场地，登录页，隐私政策

---
 components/EditorBox/EditorBox.vue                    | 616 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 components/tabbar/tabbar.vue                          |   4 +++-
 manifest.json                                         |   9 ++++++++-
 pages.json                                            |  39 ++++++++++++++++++++++++++++++++++++++-
 pages/advertisementAdd/advertisementAdd - 副本.scss | 152 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/advertisementAdd/advertisementAdd - 副本.vue  | 152 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/advertisementApply/advertisementApply.scss      | 158 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/advertisementApply/advertisementApply.vue       | 189 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/advertisementDetail/advertisementDetail.vue     |   6 +++---
 pages/details/details - 副本.scss                   | 146 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/details/details - 副本.vue                    | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/details/details.vue                             |   2 +-
 pages/field/field.vue                                 |  59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 pages/home/home - 副本.scss                         | 348 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/home/home - 副本.vue                          | 401 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/home/home.scss                                  |  87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 pages/home/home.vue                                   | 205 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------
 pages/leaseAdd/leaseAdd - 副本.scss                 | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/leaseAdd/leaseAdd - 副本.vue                  | 140 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/login/login.vue                                 |  38 +++++++++++++++++++++++++++++++++++---
 pages/my/my - 副本.scss                             | 307 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/my/my - 副本.vue                              | 434 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/my/my.vue                                       |  41 ++++++++++-------------------------------
 pages/mycreated/mycreated.vue                         |   4 ++--
 pages/participation/participation - 副本.scss       | 148 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/participation/participation - 副本.vue        | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/privacy/privacy.vue                             |  36 ++++++++++++++++++++++++++++++++++++
 pages/questionnaire/questionnaire.scss                |  22 ++++++++++++++++++++++
 pages/questionnaire/questionnaire.vue                 |   8 +++++++-
 pages/record/record - 副本.scss                     |  86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/record/record - 副本.vue                      |  76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/record/record.scss                              |  68 +++++++++++++++++++++++++++++++++++++++++---------------------------
 pages/record/record.vue                               |   9 ++++-----
 pages/workbench/workbench-副.vue                     | 249 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/workbench/workbench.vue                         |  62 +++++++++++++++++++++++++++++++-------------------------------
 utils/request.js                                      |   3 +++
 36 files changed, 4470 insertions(+), 170 deletions(-)
 create mode 100644 components/EditorBox/EditorBox.vue
 create mode 100644 pages/advertisementAdd/advertisementAdd - 副本.scss
 create mode 100644 pages/advertisementAdd/advertisementAdd - 副本.vue
 create mode 100644 pages/advertisementApply/advertisementApply.scss
 create mode 100644 pages/advertisementApply/advertisementApply.vue
 create mode 100644 pages/details/details - 副本.scss
 create mode 100644 pages/details/details - 副本.vue
 create mode 100644 pages/home/home - 副本.scss
 create mode 100644 pages/home/home - 副本.vue
 create mode 100644 pages/leaseAdd/leaseAdd - 副本.scss
 create mode 100644 pages/leaseAdd/leaseAdd - 副本.vue
 create mode 100644 pages/my/my - 副本.scss
 create mode 100644 pages/my/my - 副本.vue
 create mode 100644 pages/participation/participation - 副本.scss
 create mode 100644 pages/participation/participation - 副本.vue
 create mode 100644 pages/privacy/privacy.vue
 create mode 100644 pages/record/record - 副本.scss
 create mode 100644 pages/record/record - 副本.vue
 create mode 100644 pages/workbench/workbench-副.vue

diff --git a/components/EditorBox/EditorBox.vue b/components/EditorBox/EditorBox.vue
new file mode 100644
index 0000000..9ac79bd
--- /dev/null
+++ b/components/EditorBox/EditorBox.vue
@@ -0,0 +1,616 @@
+<template>
+	<view class="liu-editor">
+			<!-- 工具栏 -->
+			<view class="scroll">
+				<view class="toolsBar-view">
+					<view class="toolsBar-item" :class="{active:formats[item.name]}" @click="toolsBarItemClick(item)" v-for="(item,index) in toolbarList" :key="index">
+						<image style="width: 30rpx;height: 30rpx;" :src="item.icon" mode=""></image>
+					</view>
+				</view>
+			</view>
+			
+			<!-- 编辑器 -->
+			<editor
+				id="editor"
+				:show-img-resize="true" 
+				:show-img-size="true" 
+				:show-img-toolbar="true" 
+				:placeholder="placeholder" 
+				@ready="onEditorReady"
+				@statuschange="onStatusChange"
+			></editor>
+			
+			<!-- 取色器 -->
+			<!-- <t-color-picker ref="colorPicker" :color="color" @confirm="colorConfirm" @cancel="colorCancel"></t-color-picker> -->
+		</view>
+</template>
+
+<script>
+	export default {
+			name: "liu-editor",
+	
+			props: {
+				// 提示信息
+				placeholder: {
+					type: String,
+					default: '开始输入...'
+				},
+				// 加载文字提示
+				loadingText: {
+					type: String,
+					default: '上传中...'
+				},
+				// 上传图片时是否使用加载
+				isLoading: {
+					type: Boolean,
+					default: true
+				},
+				// 图片上传路径
+				uploadImgUrl: {
+					type: String,
+					default: ''
+				},
+				// 上传的配置参数
+				uploadConfig:{
+					type:Object,
+					default:()=>({})
+				},
+				// 初始化文本信息
+				html:{
+					type:String,
+					default:''
+				}
+			},
+	
+			data() {
+				return {
+					editorCtx: null, // 富文本上下文api
+					formats:{}, // 点前选择的样式集
+					
+					// 工具栏
+					toolbarList:[
+						{
+							name:'image', // 图片上传
+							icon:'/static/editor-img/image.png',
+							type:'upload', // 上传类型
+						},
+						{
+							name:'previewFun', // 预览
+							icon:'/static/editor-img/preview.png',
+							type:'click', // 点击类型
+						},
+						{
+							name:'header', // 文字标题(header)
+							icon:'/static/editor-img/header.png',
+							type:'select', // 选择类型
+							value:[
+								{
+									name:'一级标题',
+									value:'H1'
+								},
+								{
+									name:'二级标题',
+									value:'H2'
+								},
+								{
+									name:'三级标题',
+									value:'H3'
+								},
+								{
+									name:'四级标题',
+									value:'H4'
+								},
+								{
+									name:'五级标题',
+									value:'H5'
+								},
+								{
+									name:'六级标题',
+									value:'H6'
+								}
+							]
+						},
+						{
+							name:'bold', // 文字加粗(bold)
+							icon:'/static/editor-img/bold.png',
+							type:'click', // 点击类型
+						},
+						{
+							name:'italic', // 文字斜体(italic)
+							icon:'/static/editor-img/italic.png',
+							type:'click', // 点击类型
+						},
+						{
+							name:'underline', // 文字下划线(underline)
+							icon:'/static/editor-img/underline.png',
+							type:'click', // 点击类型
+						},
+						{
+							name:'strike', // 文字删除线(strike)
+							icon:'/static/editor-img/strike.png',
+							type:'click', // 点击类型
+						},
+						{
+							name:'indent', // 文字缩进(indent)
+							icon:'/static/editor-img/indent.png',
+							type:'select', // 选择类型
+							value:[
+								{
+									name:'向右缩进',
+									value:'+1',
+								},
+								{
+									name:'向左缩进',
+									value:'-1'
+								}
+							]
+						},
+						{
+							name:'list', // 列表(list)
+							icon:'/static/editor-img/list.png',
+							type:'select', // 选择类型
+							value:[
+								{
+									name:'有序列表',
+									value:'ordered',
+								},
+								{
+									name:'无序列表',
+									value:'bullet'
+								},
+								{
+									name:'方框列表',
+									value:'check'
+								}
+							], // 数字 、点、方框
+						},
+						{
+							name:'lineHeight', // 文字行高(lineHeight)
+							icon:'/static/editor-img/lineHeight.png',
+							type:'select', // 选择类型
+							value:[
+								{
+									name:'1',
+									value:'1'
+								},
+								{
+									name:'1.5',
+									value:'1.5'
+								},
+								{
+									name:'2',
+									value:'2'
+								},
+								{
+									name:'2.5',
+									value:'2.5'
+								},
+								{
+									name:'3',
+									value:'3'
+								}
+							],
+						},
+						{
+							name:'fontSize', // 文字大小(fontSize)
+							icon:'/static/editor-img/fontSize.png',
+							type:'select', // 选择类型
+							value:[
+								{
+									name:'10px',
+									value:'10px'
+								},
+								{
+									name:'13px',
+									value:'13px'
+								},
+								{
+									name:'16px',
+									value:'16px'
+								},
+								{
+									name:'18px',
+									value:'18px'
+								},
+								{
+									name:'24px',
+									value:'24px'
+								},
+								{
+									name:'32px',
+									value:'32px'
+								},
+								{
+									name:'48px',
+									value:'48px'
+								}
+							],
+						},
+						{
+							name:'align', // 文字排版(align)
+							icon:'/static/editor-img/align.png',
+							type:'select', // 选择类型
+							value:[
+								{
+									name:'左对齐',
+									value:'left'
+								},
+								{
+									name:'居中对齐',
+									value:'center'
+								},
+								{
+									name:'右对齐',
+									value:'right'
+								},
+								{
+									name:'整行对齐',
+									value:'justify'
+								}
+							],
+						},
+						{
+							name:'color', // 文字颜色(color)
+							icon:'/static/editor-img/color.png',
+							type:'popup', // 弹窗类型
+						},
+						{
+							name:'undoFun', // 撤销
+							icon:'/static/editor-img/undo.png',
+							type:'click', // 点击类型
+						},
+						{
+							name:'redoFun', // 恢复
+							icon:'/static/editor-img/redo.png',
+							type:'click', // 点击类型
+						},
+						{
+							name:'margin', // 外边距(margin)
+							icon:'/static/editor-img/margin.png',
+							type:'select', // 选择类型
+							value:[
+								{
+									name:'四周外边距',
+									value:'margin',
+								},
+								{
+									name:'上外边距',
+									value:'marginTop',
+								},
+								{
+									name:'下外边距',
+									value:'marginBottom',
+								},
+								{
+									name:'左外边距',
+									value:'marginLeft',
+								},
+								{
+									name:'右外边距',
+									value:'marginRight',
+								}
+							],
+						},
+						{
+							name:'padding', // 内边距(padding)
+							icon:'/static/editor-img/padding.png',
+							type:'select', // 选择类型
+							value:[
+								{
+									name:'四周内边距',
+									value:'padding',
+								},
+								{
+									name:'上内边距',
+									value:'paddingTop',
+								},
+								{
+									name:'下内边距',
+									value:'paddingBottom',
+								},
+								{
+									name:'左内边距',
+									value:'paddingLeft',
+								},
+								{
+									name:'右内边距',
+									value:'paddingRight',
+								}
+							],
+						},
+						{
+							name:'clearFun', // 清空编辑器内容
+							icon:'/static/editor-img/clear.png',
+							type:'click', // 选择类型
+						}
+						
+					],
+					
+					// color
+					color: {
+						r: 255,
+						g: 0,
+						b: 0,
+						a: 0.6
+					},
+					
+				};
+			},
+			
+			watch:{
+				html(n,o){
+					n && this.onEditorReady();
+				}
+			},
+	
+			methods: {
+				
+				// 取色器确定事件
+				colorConfirm(e) {
+					// console.log(e);
+					this.format('color',e.hex);
+				},
+				// 取色器取消事件
+				colorCancel() {
+					// console.log('取消');
+				},
+				
+				// 初始化
+				onEditorReady() {
+					if( this.editorCtx ){
+						this.html && this.initEditor()
+						return;
+					}
+					uni.createSelectorQuery().select('#editor').context((res) => {
+						if( res.context ){
+							this.editorCtx = res.context;
+							this.html && this.initEditor()
+						}
+					}).exec()
+				},
+				
+				// 设置样式时触发
+				onStatusChange(e){
+					this.formats = e.detail;
+				},
+				
+				// 设置样式
+				format(name,value){
+					this.editorCtx.format(name,value);
+				},
+	
+				// 插入图片
+				insertImage() {
+	
+					uni.chooseImage({
+						success: async (res) => {
+							// console.log(res);
+							// res.tempFilePaths
+							if (res.tempFilePaths.length) {
+								// console.log(res.tempFilePaths);
+								// 加载
+								this.isLoading && uni.showLoading({title: this.loadingText,mask:true});
+								
+								for (let i = 0,ilen=res.tempFilePaths.length; i < ilen; i++) {
+									try{
+										let [err,img_res] = await this.uploadImageSync(res.tempFilePaths[i]);
+										let resData = JSON.parse(img_res.data);
+										// console.log(resData);
+										if( !resData.error_code ){
+											uni.hideLoading();
+											this.editorCtx.insertImage({
+												src:resData.data.uri,
+												alt:'图片',
+												extClass:'editor--editor-img'
+												// width:'100%',
+											})
+											this.editorCtx.insertText({text:' '});
+											
+										}else{
+											uni.hideLoading();
+											this.toast('图片上传失败');
+										}
+									}catch(e){
+										//TODO handle the exception
+										uni.hideLoading();
+										this.toast('上传图片发生错误');
+									}
+									
+								}
+								// console.log(1122);
+							}
+						},
+						fail: (err) => {
+							console.log(err);
+						}
+					})
+				},
+				
+				// 初始化文本信息
+				initEditor(){
+					this.editorCtx.setContents({html:this.html});
+				},
+	
+				// 图片上传
+				uploadImageSync(filePath) {
+					// 没有上传路径 直接返回 filePath
+					if( !this.uploadImgUrl ){return filePath};
+					let header = this.uploadConfig.header || {};
+					let formData = this.uploadConfig.formData || {};
+					// 返回 promise对象
+					return uni.uploadFile({
+						url: this.uploadImgUrl,
+						filePath,
+						header:{
+							// #ifdef APP-PLUS
+							'content-type': 'multipart/form-data',
+							// #endif
+							...header
+						},
+						// #ifdef APP-PLUS
+						name: 'file',
+						// #endif
+						formData,
+					});
+				},
+				
+				// 轻提示
+				toast(title,duration=1000,icon='none'){
+					uni.showToast({title,duration,icon});
+				},
+				
+				// 工具栏点击事件
+				toolsBarItemClick(item){
+					let switchFun = {
+						// 点击类型
+						'click':()=>{
+							let keys = {previewFun:1,undoFun:1,redoFun:1,clearFun:1};
+							if(  keys[item.name] ){
+								return this[item.name] && this[item.name]();
+							}
+							this.format(item.name,item.value);
+						},
+						// 弹窗类型
+						'popup':()=>{
+							if( this.formats[item.name] ){
+								return this.format(item.name,'');
+							}
+							this.$refs.colorPicker.open();
+						},
+						// 选择类型
+						'select':()=>{
+							if( this.formats[item.name] ){
+								return this.format(item.name,'');
+							}
+							let keys = item.value.map(item=>item.name);
+							if( item.name === 'margin' || item.name === 'padding' ){
+								uni.showActionSheet({
+								    itemList: keys,
+								    success: resOne=>{
+										let name = item.value[resOne.tapIndex].value;
+										setTimeout(()=>{
+											let list = ['0px','10px','15px','20px','25px','30px'];
+											uni.showActionSheet({
+											    itemList: list,
+											    success: resTwo=>{
+													this.format(name,list[resTwo.tapIndex]);
+													// console.log(name,list[resTwo.tapIndex]);
+											    }
+											});
+										},100);
+										
+								    },
+								    fail: function (res) {
+								        console.log(res.errMsg);
+								    }
+								});
+								return;
+							}
+							uni.showActionSheet({
+							    itemList: keys,
+							    success: res=>{
+									this.format(item.name,item.value[res.tapIndex].value);
+							    },
+							    fail: function (res) {
+							        console.log(res.errMsg);
+							    }
+							});
+						},
+						// 上传类型
+						'upload':()=>{
+							this.insertImage();
+						}
+					}
+					switchFun[item.type] && switchFun[item.type]();
+				},
+				
+				// 预览
+				async previewFun(){
+					// this.toast('预览');
+					let res = await this.editorGetContents();
+					if( res.html ){
+						uni.setStorageSync('editorPreviewHtml',res.html);
+					}
+					uni.navigateTo({url:'/pages/editorPreview/editorPreview'});
+				},
+				// 撤销
+				undoFun(){
+					this.toast('撤销');
+					this.editorCtx.undo();
+				},
+				// 清空编辑器内容
+				clearFun(){
+					uni.showModal({
+						content:'确定清空编辑器内容？',
+						success: res => {
+							if( res.confirm ){
+								this.editorCtx.clear();
+							}
+						}
+					})
+				},
+				
+				// 获取编辑器内容
+				editorGetContents(cb){
+					return new Promise((resolve,reject)=>{
+						this.editorCtx.getContents({
+							success:res=>{
+								resolve(res);
+							},
+							fail:err=>{
+								reject(err);
+							}
+						})
+					});
+				},
+				
+				
+			}
+		}
+</script>
+
+<style>
+	.liu-editor {
+			width: 100%;
+			background-color: #fff;
+		}
+		
+		.toolsBar-view{
+			display: flex;
+			align-items:center;
+			background-color: #F2F2F2;
+			padding-left: 20rpx;
+			border-bottom: 4rpx solid #e1e1e1;
+		}
+		.toolsBar-item{
+			margin-right:25rpx;
+			width: 50rpx;
+			height: 50rpx;
+			background-color: #fff;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+		}
+		.toolsBar-item.active{
+			background-color: rgba(255,85,0,0.5);
+		}
+	
+		.scroll{
+			width: 100%;
+			height: 80rpx;
+			overflow: hidden;
+			overflow-x: auto;
+			display: flex;
+		}
+		
+		#editor {
+			padding: 20rpx 20rpx 20rpx;
+			background-color: #F2F2F2;
+			box-sizing: border-box;
+			width: 100%;
+			height: 100%;
+			font-size: 16px;
+			line-height: 1.5;
+			overflow: auto;
+		}
+</style>
\ No newline at end of file
diff --git a/components/tabbar/tabbar.vue b/components/tabbar/tabbar.vue
index 01aafad..1d626b7 100644
--- a/components/tabbar/tabbar.vue
+++ b/components/tabbar/tabbar.vue
@@ -2,7 +2,7 @@
 	<view class="page-total">
 		<view class="tab-list">
 			<view class="list" v-for="(item,index) in TabBarList" 
-			@click="onTabBar(item,index)"
+			@click="onTabBar(item,item.index)"
 			:key="index">
 				<image :src="item.acImg" mode="widthFix" v-show="tabBarShow === index"></image>
 				<image :src="item.img" mode="widthFix" v-show="tabBarShow != index"></image>
@@ -85,7 +85,9 @@
 			 */
 			onTabBar(item,index){
 				// this.tabBarShow = index;
+				console.log(index)
 				switch (index){
+					
 					case 0:
 						wx.switchTab({
 							url:'/pages/home/home'
diff --git a/manifest.json b/manifest.json
index ac1fc7c..1261014 100644
--- a/manifest.json
+++ b/manifest.json
@@ -122,6 +122,13 @@
         "devServer" : {
             "https" : false
         },
-        "domain" : ""
+        "domain" : "",
+        "sdkConfigs" : {
+            "maps" : {
+                "qqmap" : {
+                    "key" : "6YVBZ-Z6EC4-JYNUH-FGQKA-G6PAE-JVF3U"
+                }
+            }
+        }
     }
 }
diff --git a/pages.json b/pages.json
index 879c31e..fad294a 100644
--- a/pages.json
+++ b/pages.json
@@ -125,7 +125,7 @@
 			"path": "pages/questionnaire/questionnaire",
 			"style": {
 				"navigationBarTitleText": "问卷调查",
-				"navigationBarBackgroundColor": "#E0E0E0"
+				"navigationBarBackgroundColor": "#FFFFFF"
 			}
 		},
 		{
@@ -226,6 +226,43 @@
 				"navigationBarTitleText": "招商方案",
 				"navigationBarBackgroundColor": "#FFFFFF"
 			}
+		},
+		// 营销推广活动
+		{
+			"path": "pages/marketing/marketingList/marketingList",
+			"style": {
+				"navigationBarTitleText": "营销推广活动",
+				"navigationBarBackgroundColor": "#FFFFFF"
+			}
+		},
+		{
+			"path": "pages/marketing/marketingDetail/marketingDetail",
+			"style": {
+				"navigationBarTitleText": "详情",
+				"navigationBarBackgroundColor": "#FFFFFF"
+			}
+		},
+		// 商务合作
+		{
+			"path": "pages/business/businessList/businessList",
+			"style": {
+				"navigationBarTitleText": "商务合作",
+				"navigationBarBackgroundColor": "#FFFFFF"
+			}
+		},
+		{
+			"path": "pages/business/businessDetail/businessDetail",
+			"style": {
+				"navigationBarTitleText": "详情",
+				"navigationBarBackgroundColor": "#FFFFFF"
+			}
+		},
+		{
+			"path": "pages/privacy/privacy",
+			"style": {
+				"navigationBarTitleText": "绿道用户隐私政策",
+				"navigationBarBackgroundColor": "#FFFFFF"
+			}
 		}
 	],
 	"globalStyle": {
diff --git a/pages/advertisementAdd/advertisementAdd - 副本.scss b/pages/advertisementAdd/advertisementAdd - 副本.scss
new file mode 100644
index 0000000..0143cde
--- /dev/null
+++ b/pages/advertisementAdd/advertisementAdd - 副本.scss
@@ -0,0 +1,152 @@
+.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%;
+	.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;
+			}
+		}
+	}
+}
+
+.page-footera {
+	position: fixed;
+	left: 0;
+	bottom: 100rpx;
+	display: flex;
+	width: 100%;
+	height: 100rpx;
+	background-color: #FFFFFF;
+	.footer-buya{
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		width: 100%;
+		padding: 0 30rpx;
+		.cart-adda{
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			text{
+				font-size: 28rpx;
+			}
+		}
+		.cart-addb {
+			text{
+				font-size: 28rpx;
+				font-weight: bold;
+			}
+		}
+	}
+}
+
+.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/advertisementAdd/advertisementAdd - 副本.vue b/pages/advertisementAdd/advertisementAdd - 副本.vue
new file mode 100644
index 0000000..56e63a5
--- /dev/null
+++ b/pages/advertisementAdd/advertisementAdd - 副本.vue
@@ -0,0 +1,152 @@
+<template>
+	<view class="page">
+		<view class="add-list">
+			<view class="list">
+				<view class="title">
+					<text>申请投放广告位</text>
+				</view>
+				<view class="content">
+					A小程序首页顶部banner
+				</view>
+			</view>
+			<view class="list">
+				<view class="title">
+					<text>所属移动端</text>
+				</view>
+				<view class="content">
+					A小程序
+				</view>
+			</view>
+			<view class="list">
+				<view class="title">
+					<text>申请人姓名</text>
+					<text class="star">*</text>
+				</view>
+				<view class="content">
+					<input type="text" placeholder="请输入">
+				</view>
+			</view>
+			<view class="list">
+				<view class="title">
+					<text>活动内容</text>
+					<text class="star">*</text>
+				</view>
+				<view class="content">
+					<input type="text" placeholder="请输入">
+				</view>
+			</view>
+			<view class="list">
+				<view class="title">
+					<text>联系方式</text>
+					<text class="star">*</text>
+				</view>
+				<view class="content">
+					<input type="text" placeholder="请输入">
+				</view>
+			</view>
+			<view class="list">
+				<view class="title">
+					<text>投放时间</text>
+					<text class="star">*</text>
+				</view>
+				<view class="content">
+					<input type="text" placeholder="请选择">
+					<image :src="$imgUrl('/right2.png')"></image>
+				</view>
+			</view>
+			<view class="list">
+				<view class="title">
+					<text>广告标题</text>
+					<text class="star">*</text>
+				</view>
+				<view class="content">
+					<input type="text" placeholder="请输入">
+				</view>
+			</view>
+			<view class="list">
+				<view class="title">
+					<text>跳转链接</text>
+					<text class="star">*</text>
+				</view>
+				<view class="content">
+					<input type="text" placeholder="请输入">
+				</view>
+			</view>
+			<view class="list">
+				<view class="title">
+					<text>投放内容</text>
+					<text class="star">*</text>
+				</view>
+				<view class="content">
+					<input type="text" placeholder="请输入">
+				</view>
+			</view>
+			<view class="feedback-data">
+				<view>
+					<view class="title">
+						<text>图片</text>
+						<text class="star">*</text>
+					</view>
+				</view>
+				<view class="voucher-img">
+					<view class="voucher-list">
+						<image :src="$imgUrl('/voucher_bg.png')" ></image>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 保存按钮 -->
+		<view class="page-footera">
+		  <view class="footer-buya">
+		    <view class="cart-adda">
+		      <text>合计</text>
+		    </view>
+			<view class="cart-addb">
+			  <text>1896.00元/4天</text>
+			</view>
+		  </view>
+		</view>
+		<view class="page-footer" @click="shenq">
+		  <view class="footer-buy">
+		    <view class="cart-add">
+		      <text>立即申请</text>
+		    </view>
+		  </view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			};
+		},
+		onShow() {
+		  
+		
+		},
+		methods:{
+			shenq(){
+				  const isLogin = uni.getStorageSync('token') || false;
+				  if (!isLogin) {
+				    // 如果未登录，跳转到登录页面
+				  		 uni.navigateTo({
+				  		  url: '/pages/login/login',
+				  		  })
+				  }else{
+				  		uni.navigateTo({
+				  		 url: '/pages/servicerecords/servicerecords',
+				  		 })
+				  }
+
+			}
+			
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import 'advertisementAdd.scss';
+</style>
diff --git a/pages/advertisementApply/advertisementApply.scss b/pages/advertisementApply/advertisementApply.scss
new file mode 100644
index 0000000..d50de53
--- /dev/null
+++ b/pages/advertisementApply/advertisementApply.scss
@@ -0,0 +1,158 @@
+.page{
+	position: absolute;
+	left: 0;
+	top: 0;
+	width: 100%;
+	overflow-y: scroll;
+	height: calc(100% - 120rpx);
+	background-color: #f6f6f6;
+}
+.steps-box {
+	padding-top: 40rpx;
+}
+
+.add-list{
+	padding: 0 4%;
+	background-color: #FFFFFF;
+	border-radius: 20rpx;
+	margin-top: 20rpx;
+	width: 100%;
+	.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 */
+			}
+		}
+	}
+	.deom-box {
+		width: 100vw;
+		display: flex !important;
+		padding: 14rpx 0;
+		background-color: #FFFFFF;
+		border-radius: 9px;
+		// margin-top: 9px;
+		width: 100%;
+		// .u-upload {
+		// .u-add-wrap {
+		// 	width: 304rpx !important;
+		// 	height: 182rpx !important;
+		// }
+		// }
+		// .u-upload {
+		// 	height: 88px;
+		// 	width: 155px;
+		// 	background: url(/static/images/uploadID1.png);
+		// 	background-size:134rpx 188rpx;
+		// 	background-repeat:no-repeat;
+		// }
+		.img-deom {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			padding: 20rpx;
+			text {
+				margin-top: 18rpx;
+			}
+		}
+	}
+}
+
+/* 保存按钮 */
+.page-footer{
+	position: fixed;
+	left: 0;
+	bottom: 0;
+	display: flex;
+	align-items: center;
+	width: 100%;
+	height: 125rpx;
+	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/advertisementApply/advertisementApply.vue b/pages/advertisementApply/advertisementApply.vue
new file mode 100644
index 0000000..53eaee5
--- /dev/null
+++ b/pages/advertisementApply/advertisementApply.vue
@@ -0,0 +1,189 @@
+<template>
+	<view class="page">
+		<view class="steps-box">
+			<u-steps :list="numList" :current="active"></u-steps>
+		</view>
+		<view>
+			<view class="add-list" v-if="active == 0">
+				<u-form labelPosition="left" :model="model1" :rules="rules" ref="uForm" :labelWidth="250">
+					<u-form-item label="经营用途" prop="name" borderBottom>
+						<u-input v-model="model1.name" ></u-input>
+					</u-form-item>
+					<u-form-item label="意向租期" prop="name" borderBottom>
+						<u-input v-model="model1.name" ></u-input>
+					</u-form-item>
+					<u-form-item label="经营主体" prop="name" borderBottom>
+						<u-input v-model="model1.name" ></u-input>
+					</u-form-item>
+				</u-form>
+			</view>
+			<view class="add-list" v-else-if='active == 1'>
+				<u-form labelPosition="left" :model="model1" :rules="rules" ref="uForm" :labelWidth="250">
+					<u-form-item label="主体名称" prop="name" borderBottom>
+						<u-input v-model="model1.name" ></u-input>
+					</u-form-item>
+					<u-form-item label="统一社会信用代码" prop="name" borderBottom>
+						<u-input v-model="model1.name" ></u-input>
+					</u-form-item>
+					<u-form-item label="类型" prop="type" borderBottom>
+						<u-input v-model="model1.type" type="select" @click="model1.typeShow = true" placeholder='请选择类型'/>
+						<u-select v-model="model1.typeShow" :list="activesType" @confirm="typeChange"></u-select>
+					</u-form-item>
+					<u-form-item label="法定代表人" prop="name" borderBottom>
+						<u-input v-model="model1.name" ></u-input>
+					</u-form-item>
+					<u-form-item label="经营范围" prop="name" borderBottom>
+						<u-input v-model="model1.name" ></u-input>
+					</u-form-item>
+					<u-form-item label="注册资本" prop="name" borderBottom>
+						<u-input v-model="model1.name" ></u-input>
+					</u-form-item>
+					<u-form-item label="成立日期" prop="name" borderBottom>
+						<u-input v-model="model1.name" ></u-input>
+					</u-form-item>
+					<u-form-item label="住所" prop="name" borderBottom>
+						<u-input v-model="model1.name" ></u-input>
+					</u-form-item>
+					<u-form-item label="邮箱地址" prop="name" borderBottom>
+						<u-input v-model="model1.name" ></u-input>
+					</u-form-item>
+					<u-form-item label="经营期限" prop="name" borderBottom>
+						<u-input v-model="model1.name" ></u-input>
+					</u-form-item>
+					<u-form-item label="营业执照" prop="name" borderBottom labelPosition="top">
+						<u-upload :active="active" :file-list="model1.fileList" ></u-upload>
+					</u-form-item>
+				</u-form>
+			</view>
+			<view v-else>
+				<u-form labelPosition="left" :model="model1" :rules="rules" ref="uForm" :labelWidth="250">
+					<view class="add-list">
+						<u-form-item label="经营者姓名" prop="name" borderBottom>
+							<u-input v-model="model1.name" ></u-input>
+						</u-form-item>
+						<u-form-item label="证件类型" prop="type" borderBottom>
+							<u-input v-model="model1.type" type="select" @click="model1.typeShow = true" placeholder='请选择类型'/>
+							<u-select v-model="model1.typeShow" :list="activesType" @confirm="typeChange"></u-select>
+						</u-form-item>
+						<u-form-item label="身份证号码" prop="name" borderBottom>
+							<u-input v-model="model1.name" ></u-input>
+						</u-form-item>
+						<u-form-item label="身份证有效期" prop="name" borderBottom>
+							<u-input v-model="model1.name" ></u-input>
+						</u-form-item>
+					</view>
+					<view class="add-list">
+						<view class="deom-box">
+							<view class="img-deom">
+								<u-upload :active="active" :file-list="model1.fileList" :custom-btn="true" :max-count="1">
+									<view slot="addBtn" class="slot-btn" hover-class="slot-btn__hover" hover-stay-time="150">
+										<u-image width="304rpx" height="182rpx" src="/static/images/uploadID1.png"></u-image>
+									</view>
+								</u-upload>
+								<text>点击上传证件人像面</text>
+							</view>
+							<view class="img-deom">
+								<u-upload :active="active" :file-list="model1.fileList" :custom-btn="true" :max-count="1">
+									<view slot="addBtn" class="slot-btn" hover-class="slot-btn__hover" hover-stay-time="150">
+										<u-image width="304rpx" height="182rpx" src="/static/images/uploadID2.png"></u-image>
+									</view>
+								</u-upload>
+								<text>点击上传证件国徽面</text>
+							</view>
+						</view>
+					</view>	
+					<view class="add-list">
+						<view style="line-height: 60rpx;">上传示例</view>
+						<view class="deom-box">
+							<view class="img-deom">
+								<u-image width="304rpx" height="182rpx" src="/static/images/front-icon.png"></u-image>
+								<text>人脸示例图</text>
+							</view>
+							<view class="img-deom">
+								<u-image width="304rpx" height="182rpx" src="/static/images/back-icon.png"></u-image>
+								<text>国徽面示例图</text>
+							</view>
+						</view>
+					</view>
+					<text style="display: inline-block; font-size: 24rpx; line-height: 30px; margin: 24rpx 30rpx 0;">请拍摄证件原件，保证照片拍摄清晰，取图完整，不反光。</text>
+					<view class="add-list" labelPosition="left" :model="model1" :rules="rules" ref="uForm" :labelWidth="250">
+						<u-form-item label="是否为法人" prop="name" borderBottom>
+							<u-radio-group v-model="model1.name">
+								<u-radio :name="1">是</u-radio>
+								<u-radio :name="2">否</u-radio>
+							</u-radio-group>
+						</u-form-item>
+						<u-form-item label="企业授权书" prop="name" borderBottom labelPosition="top">
+							<u-upload :active="active" :file-list="model1.fileList" ></u-upload>
+						</u-form-item>
+					</view>
+				</u-form>
+			</view>
+		</view>
+		<!-- 保存按钮 -->
+		<view class="page-footer">
+			<u-button style="background-color: #DFE0E4; flex: 1; margin: 0 10px;" @click="toBefor" v-if="active != 0">上一步</u-button>
+			<u-button type="success" style="flex: 1; margin: 0 10px;" @click="toNext" v-if="active != 2">下一步</u-button>
+			<u-button type="success" style="flex: 1; margin: 0 10px;" @click="go" v-if="active == 2">提交申请</u-button>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				active: 2,
+				numList: [{name: '租赁信息'}, {name: '主体信息'}, {name: '经营者信息'}],
+				model1: {
+					name: '',
+					type: '',
+					typeShow: false,
+					fileList: [], // 文件列表
+				},
+				rules: {},
+				// 类型
+				showType: false,
+				activesType: [
+					{value: 1, label: '类型1'},
+					{value: 2, label: '类型2'},
+				],
+				// 上传文件
+				active: '', // 地址
+				
+			};
+		},
+		  onLoad() {
+		    // 检查用户是否登录
+		    const isLogin = uni.getStorageSync('token') || false;
+		    if (!isLogin) {
+		      // 如果未登录，跳转到登录页面
+		     uni.redirectTo({
+		       url: '/pages/login/login'
+		     });
+		    }
+		  },
+		methods:{
+			typeChange(e) {
+				this.model1.type = e[0].label;
+			},
+			go(){
+				uni.navigateTo({
+					url: '/pages/record/record'
+				})
+			},
+			// 上一步
+			toBefor() {
+				this.active = +this.active - 1;
+			},
+			// 下一步
+			toNext() {
+				this.active = +this.active + 1;
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import 'advertisementApply.scss';
+</style>
diff --git a/pages/advertisementDetail/advertisementDetail.vue b/pages/advertisementDetail/advertisementDetail.vue
index e61be6e..6797f84 100644
--- a/pages/advertisementDetail/advertisementDetail.vue
+++ b/pages/advertisementDetail/advertisementDetail.vue
@@ -7,8 +7,8 @@
 			</view>
 			<view class="info-text">{{tableData.shopDescription}}</view>
 			<view class="info-racord">
-				<view class="info-price"><span>1000</span>元/月</view>
-				<view class="info-intention">2456人有意向</view>
+				<view class="info-price"><span>4800</span>元/月</view>
+				<view class="info-intention">10人有意向</view>
 			</view>
 		</view>
 		<view class="banner-item field">
@@ -73,7 +73,7 @@
 		<view class="footer-btn">
 			<u-button type="primary">意向申请</u-button>
 			<u-button type="success" style="margin-left: unset;" @click="leaseAdd">租赁申请</u-button>
-			<!-- <u-button type="success" style="margin-left: unset;" @click="leaseAdd">广告申请</u-button> -->
+			
 		</view>
 		<view class="footer-service">
 			<u-image :showLoading="true" src="/static/images/share-icon.png" width="30rpx" height="30rpx"></u-image>
diff --git a/pages/details/details - 副本.scss b/pages/details/details - 副本.scss
new file mode 100644
index 0000000..a085ef3
--- /dev/null
+++ b/pages/details/details - 副本.scss
@@ -0,0 +1,146 @@
+.page {
+	position: absolute;
+	width: 100%;
+	// height: 100%;
+	overflow-x: hidden;
+	// overflow-y: auto;
+}
+/* banner 标题 */
+.banner-title{
+	background-color: #FFFFFF;
+	padding-bottom: 20rpx;
+}
+/* banner */
+.banner{
+	width: 100%;
+	height: 450rpx;
+	.screen-swiper{
+		width: 100%;
+		height: 100%;
+	}
+}
+/* 价格 */
+.price-info{
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	padding: 0 4%;
+	margin: 20rpx 0;
+	.price{
+		font-size: 28rpx;
+		text {
+			font-size: 24rpx;
+			color: #aaaaaa;
+		}
+		.price-num {
+			font-weight: bold;
+			color: #ff7337;
+			font-size: 40rpx;
+			margin-top: 20rpx;
+		}
+	}
+	.price-line {
+		width: 2rpx;
+		height: 80rpx;
+		background-color: #f4f4f4;
+	}
+}
+/* 标题 */
+.goods-title{
+	padding: 0 4%;
+	margin: 40rpx auto;
+	text{
+		font-size: 34rpx;
+		color: #000;
+		font-weight: bold;
+	}
+}
+.goods-icon {
+	display: flex;
+	margin: 0 20rpx;
+	.goods-icon-list {
+		background-color: #f1fff6;
+		color:#4fa477;
+		font-size: 24rpx;
+		display: inline-block;
+		padding: 10rpx 20rpx;
+		margin-right: 10rpx;
+	}
+}
+/* 评价 */
+.evaluate-data{
+	padding: 0 4%;
+	margin: 20rpx auto;
+	background-color: #FFFFFF;
+	overflow: hidden;
+	.title-more{
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		width: 100%;
+		height: 100rpx;
+		.title{
+			display: flex;
+			align-items: center;
+			height: 100%;
+			text{
+				font-size: 30rpx;
+				color: #000;
+			}
+		}
+		.more{
+			display: flex;
+			align-items: center;
+			text{
+				font-size: 26rpx;
+				color: #212121;
+			}
+		}
+	}
+	.evaluate-list{
+		width: 100%;
+		.content{
+			width: 100%;
+			.character{
+				display: flex;
+				align-items: center;
+				padding: 10rpx 0;
+				text{
+					font-size: 26rpx;
+					color: #333333;
+				}
+			}
+		}
+	}
+}
+/* 底部 */
+.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;
+			}
+		}
+	}
+}
diff --git a/pages/details/details - 副本.vue b/pages/details/details - 副本.vue
new file mode 100644
index 0000000..f242632
--- /dev/null
+++ b/pages/details/details - 副本.vue
@@ -0,0 +1,114 @@
+<template>
+  <view>
+    <!-- banner，标题 -->
+    <view class="banner-title">
+      <!-- banner -->
+      <view class="banner">
+        <swiper class="screen-swiper round-dot" indicator-dots="true" circular="true" autoplay="true" interval="5000"
+                duration="500">
+          <swiper-item v-for="(val, index) in swiperList" :key="index">
+			
+            <image :src="val.url" mode="aspectFill"></image>
+          </swiper-item>
+        </swiper>
+      </view>
+	  <!-- 标题 -->
+	  <view class="goods-title">
+	    <text>{{tableList.shopName}}</text>
+	  </view>
+	  <view class="goods-icon">
+		  <view class="goods-icon-list">靠近地铁</view>
+		  <view class="goods-icon-list">采光好</view>
+	  </view>
+      <!-- 价格 -->
+      <view class="price-info">
+        <view class="price">
+          <view>单价<text>（元/m²/月）</text></view>
+		  <view class="price-num">100</view>
+        </view>
+		<view class="price-line"></view>
+		<view class="price">
+		  <view>面积<text>（m²）</text></view>
+		  <view class="price-num">265</view>
+		</view>
+		<view class="price-line"></view>
+		<view class="price">
+		  <view>月租金<text>（元/月）</text></view>
+		  <view class="price-num">26500</view>
+		</view>
+      </view>
+	  <view class="goods-icon">
+	  		  <view class="goods-icon-list">2押1付</view>
+	  		  <view class="goods-icon-list">使用率80%</view>
+	  </view>
+    </view>
+    <!-- 评价 -->
+    <view class="evaluate-data">
+      <view class="title-more">
+        <view class="title">
+          <text>更多信息</text>
+        </view>
+        <view class="more">
+          <text class="iconfont icon-more"></text>
+        </view>
+      </view>
+      <view class="evaluate-list">
+        <view class="content">
+          <view class="character">
+            <text>地址：{{tableList.detailedLocation}}</text>
+          </view>
+		  <view class="character">
+		    <text>业态：零售</text>
+		  </view>
+		  <view class="character">
+		    <text>招商要求：不可使用明火</text>
+		  </view>
+        </view>
+      </view>
+    </view>
+    <!-- 底部 -->
+    <view class="page-footer">
+      <view class="footer-buy" @click="leaseAdd">
+        <view class="cart-add">
+          <text>申请租赁</text>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+
+export default {
+  data() {
+    return {
+		tableList:{},
+      swiperList: [
+        {
+          id: 0,
+          type: 'image',
+          url: this.$imgUrl('/img/1.jpg')
+        }
+      ],
+    };
+  },
+  onLoad(option){
+	  this.tableList = JSON.parse(option.item)
+	  this.swiperList[0].url =  this.tableList.displayMainImage || this.tableList.locationDiagram
+	  				console.log( this.swiperList)
+					console.log( this.tableList)	
+
+  },
+  methods: {
+		leaseAdd(){
+			uni.navigateTo({
+				url: '/pages/leaseAdd/leaseAdd'
+			})
+		}
+  }
+};
+</script>
+
+<style scoped lang="scss">
+@import 'details.scss';
+</style>
diff --git a/pages/details/details.vue b/pages/details/details.vue
index b15ebe9..a03e267 100644
--- a/pages/details/details.vue
+++ b/pages/details/details.vue
@@ -95,7 +95,7 @@
 		<view class="footer-btn">
 			<u-button type="primary">意向申请</u-button>
 			<u-button type="success" style="margin-left: unset;" @click="leaseAdd">租赁申请</u-button>
-			<!-- <u-button type="success" style="margin-left: unset;" @click="leaseAdd">广告申请</u-button> -->
+			
 		</view>
 		<view class="footer-service">
 			<u-image :showLoading="true" src="/static/images/share-icon.png" width="30rpx" height="30rpx"></u-image>
diff --git a/pages/field/field.vue b/pages/field/field.vue
index ed71a0f..1a8159c 100644
--- a/pages/field/field.vue
+++ b/pages/field/field.vue
@@ -33,9 +33,9 @@
 			</view>
 		</view>
 		<!-- 订单列表 -->
-		<view class="goods-data">
+		<!-- <view class="goods-data">
 			<view class="goods-list">
-				<view class="list" v-for="(item,index) in 0" :key="index">
+				<view class="list" v-for="(item,index) in 10" :key="index">
 					<view class="thumb">
 						<image  :src="$imgUrl('/img/3.jpg')"  mode=""></image>
 					</view>
@@ -66,6 +66,41 @@
 					</view>
 				</view>
 			</view>
+		</view> -->
+		<view class="goods-data">
+			<view class="goods-list">
+				<view class="list" v-for="(item,index) in tableData" :key="index" @click="reconciliationdetail(item)">
+					<view class="thumb">
+						<u-image width="25vw" height="25vw" :src="item.displayImage"></u-image>
+						<!-- <image :src="item.displayMainImage" mode=""></image> -->
+					</view>
+					<view class="item">
+						<view class="title">
+							<text class="one-omit">{{item.venueName}}</text>
+						</view>
+						<view class="tag">
+							<!-- <text>标签标签</text>
+							<text>标签标签</text> -->
+						</view>
+						<view class="introduce">
+							<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">{{zujinList[index].price}}</text>
+								<text class="min">/月</text>
+								<text class="line"></text>
+								<text>面积:</text>
+								<text class="max">{{item.actualArea}}</text>
+								<text class="min">/m²</text>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
 		</view>
 	</view>
 </template>
@@ -75,9 +110,29 @@
 		data() {
 			return {
 				keyword:'',
+				pageindex: {
+					pageNumber: 1,
+					pageSize: 10,
+				},
+				tableData: [],
 			};
 		},
+		mounted() {
+			this.getAll()
+		},
+	
 		methods: {
+			//请求列表数据
+			getAll() {
+				let query = Object.assign(this.pageindex);
+				this.$http.sendRequest('/cereBasicInformationVenue/queryByPage', 'POST', query, 1).then(res => {
+					//成功回调
+					this.tableData = res.data.data.content
+				}).catch(err => {
+					console.log(err)
+					//请求失败
+				})
+			},
 			reconciliationdetail() {
 				uni.navigateTo({
 					url: '/pages/reconciliationdetail/reconciliationdetail'
diff --git a/pages/home/home - 副本.scss b/pages/home/home - 副本.scss
new file mode 100644
index 0000000..171726b
--- /dev/null
+++ b/pages/home/home - 副本.scss
@@ -0,0 +1,348 @@
+.page{
+	// position: absolute;
+	// left: 0;
+	// top: 0;
+	width: 100%;
+	height: 100%;
+	// overflow-x: hidden;
+	// overflow-y: auto;
+	position: absolute;
+}
+.top-img {
+	width: 750rpx;
+	height: 600rpx;
+	/* #ifdef MP */
+	height: 650rpx;
+	/* #endif */
+}
+.head{
+		position: fixed;
+		left: 0;
+		top: 0;
+		z-index: 100;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		width: 100%;
+		height: 100rpx;
+		/* #ifdef APP-PLUS */
+		height: calc(100rpx + var(--status-bar-height));
+		padding-top: var(--status-bar-height);
+		/* #endif */
+		/* #ifdef MP */
+		height: calc(120rpx + var(--status-bar-height));
+		padding-top: calc(40rpx + var(--status-bar-height));
+		/* #endif */
+		background-color: rgba(255,255,255,0);
+		.logo-title{
+			width: 40%;
+			color: #fff;
+			padding-left: 20rpx;
+			image {
+				width: 169rpx;
+				height: 40rpx;
+				margin-left: 10rpx;
+			}
+		}
+		.setting-mess{
+			width: 20%;
+			display: flex;
+			align-items: center;
+			height: 100%;
+			margin-right: 20rpx;
+			.setting{
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				width: 80rpx;
+				height: 100%;
+				text{
+					font-size: 38rpx;
+				}
+			}
+			.mess{
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				width: 80rpx;
+				height: 100%;
+				text{
+					font-size: 38rpx;
+				}
+			}
+		}
+	}
+.main{
+	position: relative;
+	top: 110rpx;
+	/* #ifdef MP */
+	top: 190rpx;
+	/* #endif */
+	padding-bottom: 140rpx;
+	margin: 0 20rpx;
+}
+.banner{
+		height: 400rpx;
+		margin-bottom: 30rpx;
+		// margin: -200rpx auto 20rpx;
+		border-radius: 10rpx;
+		overflow: hidden;
+		.screen-swiper{
+			height: 100%;
+			min-height: 100% !important;
+			image{
+				height: 400rpx;
+				border-radius: 10rpx;
+			}
+		}
+	}
+.bg-white {
+	background-color: #fff;
+	border-radius: 20rpx;
+}
+.notice-content {
+	display: flex;
+	align-items: center;
+	padding: 20rpx;
+	.notice-left {
+			image {
+				width: 70rpx;
+				height: 70rpx;
+		}
+	}
+	.notice-line {
+		width: 2rpx;
+		background-color: #e1e1e1;
+		height: 50rpx;
+		margin: 0 20rpx;
+	}
+	.notice-right {
+	.notice-right-content {
+		display: flex;
+		align-items: center;
+		margin-bottom: 10rpx;
+		.notice-icon {
+			border: 2rpx solid #0FBB59;
+			color: #0FBB59;
+			background-color: #eefff5;
+			border-radius: 10rpx;
+			font-size: 20rpx;
+			margin-right: 20rpx;
+			padding: 2rpx 10rpx;
+		}
+		.notice-text {
+			overflow: hidden;
+			text-overflow: ellipsis;
+			white-space: nowrap;
+			width: 460rpx;
+			font-size: 24rpx;
+		}
+	}
+	}
+}
+
+/* 订单tab */
+.order-tab{
+	display: flex;
+	align-items: center;
+	width: 100%;
+	height: 90rpx;
+	padding: 0 80rpx;
+	border-bottom: 2rpx solid #E5E5E5;
+	.tab{
+		position: relative;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 50%;
+		height: 115%;
+		text{
+			font-size: 28rpx;
+			font-weight: bold;
+			color:#7B7B7B;
+		}
+		.active-img {
+			display: none;
+		}
+		.active-img-right {
+			display: none;
+		}
+	}
+	.action{
+		text{
+			font-size: 32rpx;
+			color: #000;
+		}
+	}
+}
+.wallet-info{
+	display: flex;
+	width: 100%;
+	padding: 30rpx 0;
+	margin-top: 20rpx;
+	flex-wrap: wrap;
+	justify-content: center;
+	.list{
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		width: 25%;
+		.icon{
+			position: relative;
+			display: flex;
+			align-items: center;
+			image {
+				width: 100rpx;
+				height: 100rpx;
+			}
+		}
+		.title{
+			display: flex;
+			align-items: center;
+			margin-top: 10rpx;
+			text{
+				color: #333333;
+				font-size: 24rpx;
+			}
+		}
+	}
+}
+.screen-list {
+		display: flex;
+		align-items: center;
+		width: 100%;
+		height: 100rpx;
+		.list {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			width: 25%;
+			height: 100%;
+			text {
+				font-size: 26rpx;
+				color: #555555;
+			}
+			image {
+				width: 30rpx;
+				height: 30rpx;
+				margin-left: 10rpx;
+			}
+		}
+		.action {
+			text {
+				color: $base;
+			}
+		}
+	}
+
+/* 商品列表 */
+.goods-data {
+	width: 100%;
+	.goods-list {
+		overflow: hidden;
+		.list-view {
+			float: left;
+			width: 49%;
+			height: 560rpx;
+			background-color: #ffffff;
+			border-radius: 20rpx;
+			margin-right: 2%;
+			margin-bottom: 20rpx;
+			overflow: hidden;
+			.thumb {
+				width: 100%;
+				display: flex;
+				justify-content: space-evenly;
+				padding-top:10px;
+				//height: 300rpx;
+				overflow: hidden;
+				image {
+                    height: 270rpx;
+					border-radius: 20rpx;
+				}
+			}
+			.item {
+				width: 100%;
+				.tag {
+					padding: 10rpx 20rpx;
+					text {
+						display: inline-block;
+						color: #717981;
+						font-size: 24rpx;
+						margin-right: 10rpx;
+					}
+				}
+				.title {
+					padding: 0 20rpx;
+					text {
+						width: 100%;
+						color: #212121;
+						font-size: 28rpx;
+						font-weight: bold;
+						display: -webkit-box;
+						-webkit-box-orient: vertical;
+						-webkit-line-clamp: 1;
+						overflow: hidden;
+						text-overflow: ellipsis;
+					}
+				}
+				.price {
+					padding: 0 20rpx;
+					.retail-price {
+						display: flex;
+						justify-content: space-between;
+						align-items: flex-end;
+						width: 100%;
+						color: #676767;
+						font-size: 20rpx;
+						margin-top: 20rpx;
+						margin-bottom: 20rpx;
+						.min {
+							display: inline-block;
+							font-size: 24rpx;
+							color: #000;
+							font-weight: bold;
+							transform: scale(0.7);
+						}
+						.max {
+							font-size: 24rpx;
+							color: #000;
+							font-weight: bold;
+						}
+						.line {
+							height: 24rpx;
+							width: 2rpx;
+							border-right: 2rpx solid #E5E5E5;
+							margin: 0 12rpx;
+						}
+					}
+					.vip-price {
+						display: flex;
+						align-items: center;
+						width: 100%;
+						height: 40rpx;
+						image {
+							width: 26rpx;
+							height: 26rpx;
+							margin-right: 10rpx;
+						}
+						.min {
+							width: 92%;
+							font-size: 24rpx;
+							color: #717981;
+							display: -webkit-box;
+							-webkit-box-orient: vertical;
+							-webkit-line-clamp: 1;
+							overflow: hidden;
+							text-overflow: ellipsis;
+						}
+					}
+				}
+			}
+		}
+		.list-view:nth-child(2n) {
+			margin-right: 0;
+		}
+	}
+}
\ No newline at end of file
diff --git a/pages/home/home - 副本.vue b/pages/home/home - 副本.vue
new file mode 100644
index 0000000..908c041
--- /dev/null
+++ b/pages/home/home - 副本.vue
@@ -0,0 +1,401 @@
+<template>
+	<view class="page">
+		<view style="position: absolute; top: 0; width: 100%;">
+			<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="$imgUrl('/logo.png')" ></image>
+			</view>
+			<view class="title">
+			</view>
+			<view class="setting-mess"></view>
+		</view>
+		<view class="main">
+			<view class="banner">
+				<swiper class="screen-swiper square-dot" indicator-dots="true" circular="true" autoplay="true"
+					interval="5000" duration="500">
+					<swiper-item v-for="(item,index) in swiperList" :key="index">
+						<image :src="item.imageUrl" mode="aspectFill"></image>
+						<!-- <video src="{{item.url}}" autoplay loop muted show-play-btn="{{false}}" controls="{{false}}" objectFit="cover" wx:if="{{item.type=='video'}}"></video> -->
+					</swiper-item>
+				</swiper>
+			</view>
+			<view class="bg-white">
+				<view class="notice-content">
+					<view class="notice-left">
+						<view>
+							<image :src="$imgUrl('/home1.png')"></image>
+						</view>
+					</view>
+					<view class="notice-line"></view>
+					<view class="notice-right">
+						<view class="notice-right-content" @click="gaozhi(item)" v-for="(item,index) in procedureData">
+							<view class="notice-icon">公告</view>
+							<view class="notice-text" style="padding-top:4rpx">	{{item.announcementTitle}}</view>
+						</view>
+					</view>	
+				</view>
+			</view>
+
+			<view class="bg-white">
+				<view class="wallet-info">
+					<view class="list" @click="shops">
+						<view class="icon">
+							<image  :src="$imgUrl('/home2.png')"></image>
+						</view>
+						<view class="title">
+							<text>租商铺</text>
+						</view>
+					</view>
+					<view class="list" @click="field">
+						<view class="icon">
+							<image :src="$imgUrl('/home3.png')"></image>
+						</view>
+						<view class="title">
+							<text>租场地</text>
+						</view>
+					</view>
+					<view class="list" @click="advertisement">
+						<view class="icon">
+							<image :src="$imgUrl('/home4.png')"></image>
+						</view>
+						<view class="title">
+							<text>租广告</text>
+						</view>
+					</view>
+					<view class="list" @click="">
+						<view class="icon">
+							<image  :src="$imgUrl('/home4.png')"></image>
+						</view>
+						<view class="title">
+							<text>物业缴费</text>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<view class="order-tab">
+				<view class="tab" :class="{'action':OrderType==0}" @click="onCouponTab(0)">
+					<text>推荐</text>
+				</view>
+				<view class="tab" :class="{'action':OrderType==1}" @click="onCouponTab(1)">
+					<text>商铺</text>
+				</view>
+				<view class="tab" :class="{'action':OrderType==2}" @click="onCouponTab(2)">
+					<text>场地</text>
+				</view>
+				<view class="tab" :class="{'action':OrderType==3}" @click="onCouponTab(3)">
+					<text>广告</text>
+				</view>
+				<view class="tab" :class="{'action':OrderType==4}" @click="onCouponTab(4)">
+					<text>其他</text>
+				</view>
+			</view>
+
+			<!-- 订单列表 -->
+			<!-- <view v-if="OrderType===0">
+				<view class="screen-list">
+					<view class="list" @click="setList(0)">
+						<text>{{xuanList[0]}}</text>
+						
+						<image src="../../static/down.png"></image>
+					</view>
+					<view class="list" @click="setList(1)">
+						<text>{{xuanList[1]}}</text>
+						<image src="../../static/down.png"></image>
+					</view>
+					<view class="list" @click="setList(2)">
+						<text>{{xuanList[2]}}</text>
+						<image src="../../static/down.png"></image>
+					</view>
+					<view class="list" @click="setList(3)">
+						<text>{{xuanList[3]}}</text>
+						<image src="../../static/down.png"></image>
+					</view>
+					<u-select v-model="show" mode="single-column" :list="list" @confirm="confirm"></u-select>
+				</view>
+				<view class="goods-data">
+					<view class="goods-list">
+						<view class="list-view" v-for="(item,index) in 8" :key="index" @click="details">
+							<view class="thumb">
+								<image src="../../static/img/1.jpg" mode="heightFix"></image>
+							</view>
+							<view class="item">
+								<view class="tag">
+									<text>标签标签</text>
+									<text>标签标签</text>
+								</view>
+								<view class="title">
+									<text class="two-omit">这里有标题这里有标题这里有标题这里有标题</text>
+								</view>
+								<view class="price">
+									<view class="retail-price">
+										<text>租金:</text>
+										<text class="min">￥</text>
+										<text class="max">1067</text>
+										<text class="min">/月</text>
+										<text class="line"></text>
+										<text>面积:</text>
+										<text class="max">81</text>
+										<text class="min">/m²</text>
+									</view>
+									<view class="vip-price">
+										<image src="../../static/kefu.png"></image>
+										<text class="min">这里有地址这里有地址这里有地址这里有地址这里有地址这里有地址</text>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view> -->
+			<view>
+				<view class="screen-list">
+					<view class="list" @click="setList(0)">
+							<text>{{xuanList[0]}}</text>
+							
+							<image :src="$imgUrl('/down.png')"></image>
+						</view>
+						<view class="list" @click="setList(1)">
+							<text>{{xuanList[1]}}</text>
+							<image :src="$imgUrl('/down.png')"></image>
+						</view>
+						<view class="list" @click="setList(2)">
+							<text>{{xuanList[2]}}</text>
+							<image :src="$imgUrl('/down.png')"></image>
+						</view>
+						<view class="list" @click="setList(3)">
+							<text>{{xuanList[3]}}</text>
+							<image :src="$imgUrl('/down.png')"></image>
+						</view>
+						<u-select v-model="show" mode="single-column" :list="list" @confirm="confirm"></u-select>
+						
+					</view>
+				<view class="goods-data">
+					<view class="goods-list">
+						<view class="list-view" v-for="(item,index) in tableData" :key="index" @click="details(item)">
+							<view class="thumb">
+								<image
+									:src=" item.displayMainImage || item.locationDiagram"
+									mode="heightFix"></image>
+							</view>
+							<view class="item">
+								<!-- <view class="tag">
+									<text>标签标签</text>
+									<text>标签标签</text>
+								</view> -->
+								<view class="title">
+									<text
+										class="two-omit">{{ item.shopName || item.advertisingName || ''}}</text>
+								</view>
+								<view class="price">
+									<view class="retail-price">
+										<text>租金:</text>
+										<text class="min">￥</text>
+										<text class="max">{{zujin[index].price}}</text>
+										<text class="min">/月</text>
+										<text class="line"></text>
+										<text>面积:</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> -->
+										<text class="min">{{item.detailedLocation || ''}}</text>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+
+		</view>
+		<!-- tabbar -->
+		<tabbar :tabBarShow="0"></tabbar>
+	</view>
+</template>
+
+<script>
+	import tabbar from '../../components/tabbar/tabbar.vue';
+	export default {
+		components: {
+			tabbar
+		},
+		data() {
+			return {
+				scrollTop: 0,
+				OrderType: 0,
+				tableData: [],
+				procedureData:[],//公告
+				pageindex: {
+					pageNumber: 1,
+					pageSize: 10
+				},
+				swiperList: [],//轮播
+				zujin:[
+					{price:'4800'},
+					{price:'3400'},
+					{price:'3000'}
+				],
+				biaoqian:[
+					// {name:'4800'},
+					// {price:'3400'},
+					// {price:'3000'}
+				],
+				show: false,
+				xuanval:0,
+				xuanList:['区域','租金','默认排序','筛选'],
+				list: [{
+						value: '1',
+						label: '江'
+					},
+					{
+						value: '2',
+						label: '湖'
+					}
+				],
+			}
+		},
+		onLoad() {
+			uni.hideTabBar();
+		},
+		onPageScroll(e) {
+			this.scrollTop = e.scrollTop;
+		},
+		mounted() {
+			this.getALL()
+		},
+		methods: {
+			getALL(){
+				let pagesize = {
+					pageNumber: 1,
+					pageSize: 2
+				}
+				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 => {
+					//成功回调
+					this.swiperList =res.data.data.content 
+				})
+				
+			setTimeout(bss =>{
+				this.$http.sendRequest('/cereAdvertisingInformation/likeGet', 'POST', {pageNumber:1,pageSize:10,advertisingType:"线上广告位"},1).then(res => {
+					//成功回调
+					let reslist = res.data.data.content
+					reslist.forEach(item => {
+							this.tableData.push(item)
+					})
+				
+				})
+			},500)
+			},
+			onCouponTab(type) {
+				this.OrderType = type;
+				if(type == 0){
+					this.getALL()
+				}
+				if (type == 1) {
+					this.$http.sendRequest('/cereBasicInformationShop/queryByPage', 'POST', this.pageindex,1).then(res => {
+						//成功回调
+						this.tableData = res.data.data.content
+					}).catch(err => {
+						console.log(err)
+						//请求失败
+					})
+				} else if (type == 2) {
+					this.tableData = []
+				} else if (type == 3) {
+					this.pageindex.advertisingType = '线上广告位'
+					this.$http.sendRequest('/cereAdvertisingInformation/likeGet', 'POST', this.pageindex,1).then(res => {
+						//成功回调
+						this.tableData = res.data.data.content
+					}).catch(err => {
+						console.log(err)
+						//请求失败
+					})
+				} else if (type == 4) {
+					this.tableData = []
+				} else if (type == 5) {
+					this.tableData = []
+				}
+
+			},
+			shops() {
+				uni.navigateTo({
+					url: '/pages/shops/shops'
+				})
+			},
+			field() {
+				uni.navigateTo({
+					url: '/pages/field/field'
+				})
+			},
+			advertisement() {
+				uni.navigateTo({
+					url: '/pages/advertisement/advertisement'
+				})
+			},
+			gaozhi(item){
+				let items = JSON.stringify(item)
+				uni.navigateTo({
+					url: `/pages/procedure/procedure?item=${items}`
+				})
+			},
+			details(item) {
+				let items = JSON.stringify(item)
+				uni.navigateTo({
+					url: `/pages/details/details?item=${items}`
+				})
+			},
+			setList(val){
+				
+				this.xuanval = val
+				console.log(this.tableData)
+				if(val == 0){
+				const filteredTableData = this.tableData.filter(item => item.hasOwnProperty('belongingRegion'));
+				
+				// 提取 belongingRegion 字段并进行去重
+			const labeledBelongingRegions = filteredTableData.map(item => ({
+			  label: item.belongingRegion
+			}));
+
+				const uniqueBelongingRegions = [...new Set(labeledBelongingRegions)];
+					console.log(uniqueBelongingRegions)
+					this.list  = uniqueBelongingRegions
+				}else if(val == 1){
+					this.list = []
+				}else if(val == 2){
+					this.list = []
+				}
+				this.show = true
+			},
+			confirm(val) {
+					let page = {
+						pageNumber: 1,
+						pageSize: 10,
+						belongingRegion:val[0].label
+					}
+					this.$http.sendRequest('/cereBasicInformationShop/queryByPage', 'POST', page, 1).then(res => {
+						//成功回调
+						this.tableData = res.data.data.content
+					})
+							
+			}
+		}
+	};
+</script>
+
+<style scoped lang="scss">
+	@import 'home.scss';
+</style>
\ No newline at end of file
diff --git a/pages/home/home.scss b/pages/home/home.scss
index 171726b..1c0d723 100644
--- a/pages/home/home.scss
+++ b/pages/home/home.scss
@@ -79,7 +79,7 @@
 	top: 190rpx;
 	/* #endif */
 	padding-bottom: 140rpx;
-	margin: 0 20rpx;
+	// margin: 0 20rpx;
 }
 .banner{
 		height: 400rpx;
@@ -97,6 +97,7 @@
 		}
 	}
 .bg-white {
+	margin: 0 20rpx;
 	background-color: #fff;
 	border-radius: 20rpx;
 }
@@ -122,8 +123,8 @@
 		align-items: center;
 		margin-bottom: 10rpx;
 		.notice-icon {
-			border: 2rpx solid #0FBB59;
-			color: #0FBB59;
+			border: 2rpx solid #3F9B6A;
+			color: #3F9B6A;
 			background-color: #eefff5;
 			border-radius: 10rpx;
 			font-size: 20rpx;
@@ -345,4 +346,82 @@
 			margin-right: 0;
 		}
 	}
-}
\ No newline at end of file
+}
+.cardHome{
+	margin-top:20rpx;
+	padding:20rpx;
+	background-color: #fff;
+	.card_home{
+		display:flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+	.card_title{
+		font-size:16px;
+	}
+}
+.other-business {
+		.scroll-view_H {
+			white-space: nowrap;
+			width: 100%;
+		}
+		.scroll-view-item_H {
+			display: inline-block;
+			width: 210rpx;
+			margin-right: 22rpx;
+			&:last-child {
+				margin-right: 0;
+			}
+			.business-card {
+				width: 100%;
+				.u-image {
+					overflow: hidden !important;
+					border-radius: 20rpx !important;
+				}
+				.business-card-title {
+					width: 100%;
+					overflow : hidden;/*必须结合的属性,当内容溢出元素框时发生的事情*/
+					text-overflow: ellipsis;/*可以用来多行文本的情况下，用省略号“…”隐藏超出范围的文本 。*/
+					// display: -webkit-box;/*必须结合的属性 ，将对象作为弹性伸缩盒子模型显示 。*/
+					// -webkit-line-clamp: 2;/*用来限制在一个块元素显示的文本的行数。*/
+					// -webkit-box-orient: vertical;/*必须结合的属性 ，设置或检索伸缩盒对象的子元素的排*/
+					line-height: 30rpx;
+					margin: 10rpx 0;
+					padding: 0 10rpx;
+				}
+				
+				.business-card-item {
+					padding: 0 10rpx;
+					font-weight: 400;
+					font-size: 20rpx;
+					color: #676767;
+					line-height: 1.5;
+					span {
+						font-weight: 700;
+						font-size: 30rpx;
+						color: #000000;
+					}
+				}
+				.huo-card-item{
+					font-size: 20rpx;
+					line-height: 1.5;
+				}
+				.introduce{
+					display: flex;
+					align-items: center;
+					width: 100%;
+					margin-bottom: 50rpx;
+					image {
+						width: 26rpx;
+						height: 26rpx;
+						margin-right: 10rpx;
+					}
+					text{
+						font-size: 24rpx;
+						color: #c0c0c0;
+						width: 98%;
+					}
+				}
+			}
+		}
+	}
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 908c041..92bddd3 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -12,7 +12,7 @@
 			<view class="setting-mess"></view>
 		</view>
 		<view class="main">
-			<view class="banner">
+			<view class="banner" style="padding:0 20px;">
 				<swiper class="screen-swiper square-dot" indicator-dots="true" circular="true" autoplay="true"
 					interval="5000" duration="500">
 					<swiper-item v-for="(item,index) in swiperList" :key="index">
@@ -75,7 +75,7 @@
 				</view>
 			</view>
 
-			<view class="order-tab">
+			<!-- <view class="order-tab">
 				<view class="tab" :class="{'action':OrderType==0}" @click="onCouponTab(0)">
 					<text>推荐</text>
 				</view>
@@ -91,7 +91,7 @@
 				<view class="tab" :class="{'action':OrderType==4}" @click="onCouponTab(4)">
 					<text>其他</text>
 				</view>
-			</view>
+			</view> -->
 
 			<!-- 订单列表 -->
 			<!-- <view v-if="OrderType===0">
@@ -150,7 +150,7 @@
 					</view>
 				</view>
 			</view> -->
-			<view>
+			<!-- <view>
 				<view class="screen-list">
 					<view class="list" @click="setList(0)">
 							<text>{{xuanList[0]}}</text>
@@ -181,10 +181,7 @@
 									mode="heightFix"></image>
 							</view>
 							<view class="item">
-								<!-- <view class="tag">
-									<text>标签标签</text>
-									<text>标签标签</text>
-								</view> -->
+
 								<view class="title">
 									<text
 										class="two-omit">{{ item.shopName || item.advertisingName || ''}}</text>
@@ -201,7 +198,7 @@
 										<text class="min">/m²</text>
 									</view>
 									<view class="vip-price" v-if="item.detailedLocation">
-										<!-- <image :src="`${this.$imgs}/kefu.png`"></image> -->
+										
 										<text class="min">{{item.detailedLocation || ''}}</text>
 									</view>
 								</view>
@@ -209,9 +206,100 @@
 						</view>
 					</view>
 				</view>
+			</view> -->
+			<view class="cardHome">
+				<view class="card_home">
+					<view class="card_title">热点租赁信息</view>
+					<!-- <view class="card_more">查看更多 ></view> -->
+				</view>
+				<view style="width:50%" >
+					<u-tabs-swiper ref="tabs" :list="list" :is-scroll="false" active-color="#3F9B6A"  @change="tabsChange" :current="current"></u-tabs-swiper>
+					
+				</view>
+				<view style="width:100%;margin-top:10px;" class="other-business">
+					<scroll-view class="scroll-view_H" scroll-x="true" scroll-left="120" >
+						<view v-for="(item, index) in tableData" :key="index" class="scroll-view-item_H" @click="details(item)">
+							<view class="business-card">
+								<u-image :showLoading="true" :src="item.displayMainImage || item.locationDiagram" width="100%" height="210rpx"></u-image>
+								<view class="business-card-title">
+									{{ item.shopName || item.advertisingName || item.venueName}}
+								</view>
+								<view class="business-card-item">租金：￥<span>{{zujin[index].price}}</span>/月</view>
+								<view class="business-card-item">面积：<span>{{item.actualUsableArea?item.actualUsableArea:'55.4'}}</span>/m2</view>
+								<view class="introduce" v-if='item.detailedLocation'>
+									<image  :src="$imgUrl('/kefu.png')"></image>
+									<text class="one-omit">{{item.detailedLocation}}</text>
+								</view>
+							</view>
+						</view>
+					</scroll-view>
+				</view>
+			</view>
+			
+			<view class="cardHome">
+				<view class="card_home">
+					<view class="card_title">商家活动信息</view>
+					<view class="card_more">查看更多 ></view>
+				</view>
+				<view style="width:100%;margin-top:10px;" class="other-business">
+					<scroll-view class="scroll-view_H" scroll-x="true" scroll-left="120" >
+						<view v-for="(item, index) in 5" :key="index" class="scroll-view-item_H" >
+							<view class="business-card">
+								<u-image :showLoading="true" src="https://cdn.uviewui.com/uview/album/1.jpg" width="100%" height="210rpx"></u-image>
+								<view class="business-card-title">
+									标题
+								</view>
+								<view class="huo-card-item">活动日期：<span>04-13至05-10</span></view>
+								<view class="huo-card-item">举办方：<span>咖啡厅</span></view>
+								
+							</view>
+						</view>
+					</scroll-view>
+				</view>
+			</view>
+			
+			<view class="cardHome">
+				<view class="card_home">
+					<view class="card_title">营销推广活动</view>
+					<view class="card_more">查看更多 ></view>
+				</view>
+				<view style="width:100%;margin-top:10px;" class="other-business">
+					<scroll-view class="scroll-view_H" scroll-x="true" scroll-left="120" >
+						<view v-for="(item, index) in 5" :key="index" class="scroll-view-item_H" @click="toDetail(item, '/pages/marketing/marketingList/marketingList')">
+							<view class="business-card">
+								<u-image :showLoading="true" src="https://cdn.uviewui.com/uview/album/1.jpg" width="100%" height="210rpx"></u-image>
+								<view class="business-card-title">
+									标题
+								</view>
+								<view class="huo-card-item">活动日期：<span>04-13至05-10</span></view>
+								<view class="huo-card-item">举办方：<span>咖啡厅</span></view>
+								
+							</view>
+						</view>
+					</scroll-view>
+				</view>
+			</view>
+			
+			<view class="cardHome">
+				<view class="card_home">
+					<view class="card_title">商务合作</view>
+					<view class="card_more">查看更多 ></view>
+				</view>
+				<view style="width:100%;margin-top:10px;" class="other-business">
+					<scroll-view class="scroll-view_H" scroll-x="true" scroll-left="120" >
+						<view v-for="(item, index) in 5" :key="index" class="scroll-view-item_H" @click="toDetail(item, '/pages/business/businessList/businessList')">
+							<view class="business-card">
+								<u-image :showLoading="true" src="https://cdn.uviewui.com/uview/album/1.jpg" width="100%" height="210rpx"></u-image>
+								<view class="business-card-title">
+									标题
+								</view>
+							</view>
+						</view>
+					</scroll-view>
+				</view>
 			</view>
-
 		</view>
+		
 		<!-- tabbar -->
 		<tabbar :tabBarShow="0"></tabbar>
 	</view>
@@ -248,14 +336,16 @@
 				xuanval:0,
 				xuanList:['区域','租金','默认排序','筛选'],
 				list: [{
-						value: '1',
-						label: '江'
+						name: '商铺'
+					},
+					{
+						name: '场地'
 					},
 					{
-						value: '2',
-						label: '湖'
+						name: '广告位'
 					}
 				],
+				current:0
 			}
 		},
 		onLoad() {
@@ -266,6 +356,7 @@
 		},
 		mounted() {
 			this.getALL()
+			this.onCouponTab(0)
 		},
 		methods: {
 			getALL(){
@@ -273,39 +364,19 @@
 					pageNumber: 1,
 					pageSize: 2
 				}
-				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 => {
-					//成功回调
-					this.swiperList =res.data.data.content 
-				})
-				
-			setTimeout(bss =>{
-				this.$http.sendRequest('/cereAdvertisingInformation/likeGet', 'POST', {pageNumber:1,pageSize:10,advertisingType:"线上广告位"},1).then(res => {
-					//成功回调
-					let reslist = res.data.data.content
-					reslist.forEach(item => {
-							this.tableData.push(item)
-					})
-				
-				})
-			},500)
+		this.$http.sendRequest('/cereAnnouncement/queryByPage', 'POST', pagesize,1).then(res => {
+			//成功回调
+			
+		this.procedureData = res.data.data.content.slice(-2)
+		})
+		this.$http.sendRequest('/cereCarouselImage/queryByPage', 'POST', this.pageindex,1).then(res => {
+			//成功回调
+			this.swiperList =res.data.data.content 
+		})
 			},
 			onCouponTab(type) {
-				this.OrderType = type;
-				if(type == 0){
-					this.getALL()
-				}
-				if (type == 1) {
+				this.current = type;
+				if (type == 0) {
 					this.$http.sendRequest('/cereBasicInformationShop/queryByPage', 'POST', this.pageindex,1).then(res => {
 						//成功回调
 						this.tableData = res.data.data.content
@@ -313,9 +384,16 @@
 						console.log(err)
 						//请求失败
 					})
+				} else if (type == 1) {
+					this.$http.sendRequest('/cereBasicInformationVenue/queryByPage', 'POST', this.pageindex,1).then(res => {
+						//成功回调
+						this.tableData = res.data.data.content
+					}).catch(err => {
+						console.log(err)
+						//请求失败
+					})
+					
 				} else if (type == 2) {
-					this.tableData = []
-				} else if (type == 3) {
 					this.pageindex.advertisingType = '线上广告位'
 					this.$http.sendRequest('/cereAdvertisingInformation/likeGet', 'POST', this.pageindex,1).then(res => {
 						//成功回调
@@ -324,10 +402,6 @@
 						console.log(err)
 						//请求失败
 					})
-				} else if (type == 4) {
-					this.tableData = []
-				} else if (type == 5) {
-					this.tableData = []
 				}
 
 			},
@@ -341,6 +415,12 @@
 					url: '/pages/field/field'
 				})
 			},
+			toDetail(item, path) {
+				let items = JSON.stringify(item);
+				uni.navigateTo({
+					url: `${path}?item=${items}`
+				})
+			},
 			advertisement() {
 				uni.navigateTo({
 					url: '/pages/advertisement/advertisement'
@@ -352,12 +432,19 @@
 					url: `/pages/procedure/procedure?item=${items}`
 				})
 			},
-			details(item) {
-				let items = JSON.stringify(item)
-				uni.navigateTo({
-					url: `/pages/details/details?item=${items}`
-				})
-			},
+		details(item) {
+						let items = JSON.stringify(item)
+						if(this.current == 0 || this.current == 1){
+							uni.navigateTo({
+								url: `/pages/details/details?item=${items}`
+							})
+						}else{
+							uni.navigateTo({
+								url: `/pages/advertisementDetail/advertisementDetail?item=${items}`
+							})
+						}
+						
+					},
 			setList(val){
 				
 				this.xuanval = val
@@ -391,6 +478,10 @@
 						this.tableData = res.data.data.content
 					})
 							
+			},
+			tabsChange(itme){
+				console.log(itme)
+				this.onCouponTab(itme)
 			}
 		}
 	};
diff --git a/pages/leaseAdd/leaseAdd - 副本.scss b/pages/leaseAdd/leaseAdd - 副本.scss
new file mode 100644
index 0000000..a9722a7
--- /dev/null
+++ b/pages/leaseAdd/leaseAdd - 副本.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/leaseAdd/leaseAdd - 副本.vue b/pages/leaseAdd/leaseAdd - 副本.vue
new file mode 100644
index 0000000..509ae89
--- /dev/null
+++ b/pages/leaseAdd/leaseAdd - 副本.vue
@@ -0,0 +1,140 @@
+<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="请输入">
+				</view>
+			</view>
+			<view class="list">
+				<view class="title">
+					<text>身份证号</text>
+					<text class="star">*</text>
+				</view>
+				<view class="content">
+					<input type="text" placeholder="请输入">
+				</view>
+			</view>
+			<view class="list">
+				<view class="title">
+					<text>联系方式</text>
+					<text class="star">*</text>
+				</view>
+				<view class="content">
+					<input type="text" placeholder="请输入">
+				</view>
+			</view>
+			<view class="list">
+				<view class="title">
+					<text>意向租期</text>
+					<text class="star">*</text>
+				</view>
+				<view class="content">
+					<input type="text" placeholder="请选择">
+				</view>
+			</view>
+			<view class="list">
+				<view class="title">
+					<text>经营用途</text>
+					<text class="star">*</text>
+				</view>
+				<view class="content">
+					<input type="text" placeholder="请选择">
+					<image :src="$imgUrl('/right2.png')" ></image>
+				</view>
+			</view>
+			<view class="list">
+				<view class="title">
+					<text>经营类型</text>
+					<text class="star">*</text>
+				</view>
+				<view class="content">
+					<input type="text" placeholder="请选择">
+					<image :src="$imgUrl('/right2.png')"></image>
+				</view>
+			</view>
+			<view class="feedback-data">
+				<view>
+					<view class="title">
+						<text>法人身份证正反面</text>
+						<text class="star">*</text>
+					</view>
+				</view>
+				<view class="voucher-img">
+					<view class="voucher-list">
+						<image :src="$imgUrl('/voucher_bg.png')"></image>
+					</view>
+				</view>
+			</view>
+			<view class="feedback-data">
+				<view>
+					<view class="title">
+						<text>营业许可证</text>
+						<text class="star">*</text>
+					</view>
+				</view>
+				<view class="voucher-img">
+					<view class="voucher-list">
+						<image  :src="$imgUrl('/voucher_bg.png')"></image>
+					</view>
+				</view>
+			</view>
+			<view class="feedback-data">
+				<view>
+					<view class="title">
+						<text>餐饮服务许可证</text>
+						<text class="star">*</text>
+					</view>
+				</view>
+				<view class="voucher-img">
+					<view class="voucher-list">
+						<image :src="$imgUrl('/voucher_bg.png')" ></image>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 保存按钮 -->
+		<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 {
+				
+			};
+		},
+		  onLoad() {
+		    // 检查用户是否登录
+		    const isLogin = uni.getStorageSync('token') || false;
+		    if (!isLogin) {
+		      // 如果未登录，跳转到登录页面
+		     uni.redirectTo({
+		       url: '/pages/login/login'
+		     });
+		    }
+		  },
+		methods:{
+			go(){
+				uni.navigateTo({
+					url: '/pages/record/record'
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import 'leaseAdd.scss';
+</style>
diff --git a/pages/login/login.vue b/pages/login/login.vue
index d8e3de8..35b585b 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -18,9 +18,18 @@
 			<view>
 				<view class="loginBut" @click="goLogin">手机号登录</view>
 			</view>
-			<view class="flex-row-plus mar-top-30" style="margin-top: 30rpx;">
+			<!-- <view class="flex-row-plus mar-top-30" style="margin-top: 30rpx;">
 				<text class="font-color-C5AA7B">还没有账号，</text>
 				<text class="register-text" @click="goRegister">去注册</text>
+			</view> -->
+			<view style="margin-top:10px;">
+					<u-checkbox-group @change="checkboxGroupChange"  shape="circle" :label-disabled="true">
+							<u-checkbox 
+							active-color="#3f9b6a"
+								v-model="checked" 
+								name="tongyi"
+							>我已阅读并同意<span style="color:#3f9b6a;" @click="goyinsi">《隐私政策》</span></u-checkbox>
+						</u-checkbox-group>
 			</view>
 		</view>
 		
@@ -74,6 +83,8 @@
 				num: 60,
 				time: null,
 				// cid
+				checked:null,
+				showTong:'',
 				push_clientid:''
 			};
 		},
@@ -83,7 +94,24 @@
 		},
 		methods: {
 			goLogin(){
-				this.denglu = true
+				
+				if(this.showTong == 'tongyi'){
+					this.denglu = true
+				}else{
+					uni.showToast({
+						icon: 'none',
+						title: '请阅读并同意隐私政策'
+					})
+				}
+			},
+			goRegister(){
+				
+			},
+			goyinsi(){
+				console.log('1222222222222')
+				uni.navigateTo({
+					url: '/pages/privacy/privacy'
+				});
 			},
 			register() {
 					if (this.form.phone == '') {
@@ -136,7 +164,11 @@
 			/**
 			 * 登录点击
 			 */
-			onLogin() {}
+			onLogin() {},
+			checkboxGroupChange(val){	
+				this.showTong = val[0]
+				console.log(this.showTong)
+			}
 		},
 		watch: {
 			form: {
diff --git a/pages/my/my - 副本.scss b/pages/my/my - 副本.scss
new file mode 100644
index 0000000..0e93560
--- /dev/null
+++ b/pages/my/my - 副本.scss
@@ -0,0 +1,307 @@
+.page{
+	position: absolute;
+	left: 0;
+	top: 0;
+	width: 100%;
+	height: 100%;
+}
+.my-top{
+	position: absolute;
+	width: 100%;
+	height: 300rpx;
+	/* #ifdef MP */
+	height: 360rpx;
+	/* #endif */
+	overflow: hidden;
+	.head{
+		position: fixed;
+		left: 0;
+		top: 0;
+		z-index: 100;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		width: 100%;
+		height: 100rpx;
+		/* #ifdef APP-PLUS */
+		height: calc(100rpx + var(--status-bar-height));
+		padding-top: var(--status-bar-height);
+		/* #endif */
+		/* #ifdef MP */
+		height: calc(120rpx + var(--status-bar-height));
+		padding-top: calc(40rpx + var(--status-bar-height));
+		/* #endif */
+		background-color: rgba(255,255,255,0);
+		.logo-title{
+			width: 40%;
+			color: #fff;
+			padding-left: 20rpx;
+			image {
+				width: 169rpx;
+				height: 40rpx;
+				margin-left: 10rpx;
+			}
+		}
+		.setting-mess{
+			width: 20%;
+			display: flex;
+			align-items: center;
+			height: 100%;
+			margin-right: 20rpx;
+			.setting{
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				width: 80rpx;
+				height: 100%;
+				text{
+					font-size: 38rpx;
+				}
+			}
+			.mess{
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				width: 80rpx;
+				height: 100%;
+				text{
+					font-size: 38rpx;
+				}
+			}
+		}
+	}
+}
+.main {
+	position: relative;
+	top: 90rpx;
+	/* #ifdef MP */
+	top: 170rpx;
+	/* #endif */
+	margin: 0 20rpx;
+	padding-bottom: 150rpx;
+}
+	/* 用户信息 */
+	.user-info{
+		display: flex;
+		align-items: center;
+		padding: 0 0 10rpx 10rpx;
+		.portrait{
+			width: 120rpx;
+			height: 120rpx;
+			margin-right: 20rpx;
+			box-sizing: border-box;
+			image{
+				width: 120rpx;
+				height: 120rpx;
+				border-radius: 30rpx;
+				border: 4rpx solid #FFFFFF;
+				box-sizing: border-box;
+			}
+		}
+		.info{
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			width: 74%;
+			height: 100%;
+			.nickname{
+				width: 100%;
+				margin-bottom: 20rpx;
+				text{
+					font-size: 28rpx;
+					font-weight: bold;
+					color: #fff;
+				}
+			}
+			.rank{
+				.rank-box {
+					display: inline-block;
+					background-color:#FFF9EC;
+					border: 2rpx solid #C6A45A;
+					border-radius: 100rpx;
+					padding: 5rpx 20rpx;
+				}
+				image {
+					width: 24rpx;
+					height: 24rpx;
+					margin-right: 4rpx;
+					position: relative;
+					top: 2rpx;
+				}
+				text{
+					font-size: 24rpx;
+					color: #C6A45A;
+				}
+			}
+		}
+	}
+	
+	.user-right {
+		display: flex;
+		image {
+			width: 28rpx;
+			height: 28rpx;
+		}
+	}
+.main {
+	position: relative;
+	top: 120rpx;
+	padding-bottom: 150rpx;
+	/* #ifdef MP */
+	top: 190rpx;
+	padding-bottom: 200rpx;
+	/* #endif */
+}
+.titleall-box {
+	display: flex;
+	justify-content: space-between;
+	padding: 30rpx 0;
+	.titleall-left {
+		font-size: 32rpx;
+		font-weight: bold;
+		display: flex;
+		align-items: center;
+		.titleall-left-line {
+			width: 16rpx;
+			height: 36rpx;
+			border-radius: 100rpx;
+			background: -webkit-gradient(linear, top top, bottom top, from(#30a738), to(#4dcc56));
+			background: -o-linear-gradient(top, #30a738, #4dcc56);
+			background: linear-gradient(to top, #30a738, #4dcc56);
+			margin-right: 20rpx;
+			box-shadow: 0 5rpx 10rpx #ace2b0;
+		}
+	}
+	.titleall-right {
+		color: #C1C1C1;
+		image {
+			width: 20rpx;
+			height: 20rpx;
+			margin-left: 10rpx;
+		}
+	}
+}
+.message-list{
+	padding: 0 4%;
+	background-color: #FFFFFF;
+	border-radius: 0 0 20rpx 20rpx;
+	margin: 20rpx 0;
+	border-radius: 20rpx;
+	.list{
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		width: 100%;
+		height: 100rpx;
+		border-bottom: 2rpx solid #f6f6f6;
+		.icon-data{
+			display: flex;
+			align-items: center;
+			width: 80%;
+			height: 100%;
+			.icon{
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 40rpx;
+				height: 40rpx;
+				image{
+					width: 40rpx;
+					height: 40rpx;
+				}
+			}
+			.data{
+				margin-left: 20rpx;
+				.title{
+					display: flex;
+					width: 100%;
+					text{
+						font-size: 30rpx;
+						color: #000;
+					}
+				}
+			}
+		}
+		.more{
+			display: flex;
+			align-items: center;
+			image {
+				width: 20rpx;
+				height: 20rpx;
+			}
+		}
+	}
+}
+/* 我的服务 */
+.my-service-two {
+	padding: 10rpx 0 0 0;
+	.service-list-two{
+		display: flex;
+		align-items: center;
+		text-align: center;
+		flex-wrap: wrap;
+		.service-list-list-two{
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+			width: 33.33%;
+			margin-bottom: 40rpx;
+			.thumb{
+				font-size: 42rpx;
+				font-weight: bold;
+				margin-bottom: 10rpx;
+				image{
+					width: 100%;
+					height: 100%;
+				}
+			}
+			.name{
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				text{
+					color: #929292;
+					font-size: 28rpx;
+				}
+			}
+		}
+	}
+}
+
+/* 我的服务 */
+.my-service {
+	padding: 20rpx 0 40rpx 0;
+	.service-list{
+		display: flex;
+		align-items: center;
+		text-align: center;
+		flex-wrap: wrap;
+		.service-list-list{
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+			width: 25%;
+			.thumb{
+				width: 60rpx;
+				font-size: 42rpx;
+				font-weight: bold;
+				margin-bottom: 10rpx;
+				image{
+					width: 100%;
+					height: 100%;
+				}
+			}
+			.name{
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				text{
+					color: #929292;
+					font-size: 28rpx;
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/pages/my/my - 副本.vue b/pages/my/my - 副本.vue
new file mode 100644
index 0000000..e90451e
--- /dev/null
+++ b/pages/my/my - 副本.vue
@@ -0,0 +1,434 @@
+<template>
+	<view class="page">
+		<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="$imgUrl('/logo.png')" ></image>
+				</view>
+				<view class="title">
+					
+				</view>
+				<view class="setting-mess"></view>
+			</view>
+		</view>
+
+		<view class="main">
+			<view class="user-info" @click="myMsg">
+				<view class="portrait">
+					<image :src="$imgUrl('/img/head.jpg')"  v-if="Islogin"></image>
+					<image :src="shopMsg.shopLogo" v-else></image>
+				</view>
+				<view class="info">
+					<view class="nickname">
+						<text v-if="Islogin">请登录</text>
+						<text v-else >{{shopMsg.shopName}}</text>
+					</view>
+					<view class="rank">
+						<view class="rank-box">
+						<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="$imgUrl('/right1.png')" ></image>
+				</view>
+			</view>
+			<!-- 我的服务 -->
+			<view class="message-list">
+			<view class="titleall-box">
+				<view class="titleall-left"><view class="titleall-left-line"></view>招商及推广服务</view>
+			</view>
+			<view class="my-service">
+				<view class="service-list">
+					<view class="service-list-list">
+						<view class="thumb">
+							 <text v-if="Islogin">0</text>
+							 <text v-else>3</text>
+						</view>
+						<view class="name" @click="questionnaire">
+							<text>我的问卷</text>
+						</view>
+					</view>
+					<view class="service-list-list">
+						<view class="thumb">
+							<text v-if="Islogin">0</text>
+							<text v-else>8</text>
+						</view>
+						<view class="name" @click="myativity">
+							<text>我的活动</text>
+						</view>
+					</view>
+					<view class="service-list-list" @click="apply">
+						<view class="thumb">
+							<text v-if="Islogin">0</text>
+							<text v-else>2</text>
+						</view>
+						<view class="name">
+							<text>我的招商</text>
+						</view>
+					</view>
+					<view class="service-list-list" @click="projectM">
+						<view class="thumb">
+							 <text v-if="Islogin">0</text>
+							<text v-else>{{tuiguang}}</text>
+						</view>
+						<view class="name">
+							<text>我的推广</text>
+						</view>
+					</view>
+				</view>
+			</view>
+			</view>
+			<!-- 我的服务 -->
+			<view class="message-list">
+			<view class="titleall-box">
+				<view class="titleall-left"><view class="titleall-left-line"></view>商城数据</view>
+			</view>
+			<view class="my-service-two">
+				<view class="" v-if="Islogin">
+					<view style="padding: 10px;text-align: center;">暂无数据</view>
+				</view>
+				<view class="service-list-two" v-else>
+					<view class="service-list-list-two">
+						<view class="thumb">
+							{{tongji.money || 0}}
+						</view>
+						<view class="name">
+							<text>今日收入</text>
+						</view>
+					</view>
+					<!-- <view class="service-list-list-two">
+						<view class="thumb">
+							275
+						</view>
+						<view class="name">
+							<text>退款金额</text>
+						</view>
+					</view> -->
+					<view class="service-list-list-two">
+						<view class="thumb">
+							{{tongji.total}}
+						</view>
+						<view class="name">
+							<text>访客数</text>
+						</view>
+					</view>
+					<!-- <view class="service-list-list-two">
+						<view class="thumb">
+							135
+						</view>
+						<view class="name">
+							<text>订单量</text>
+						</view>
+					</view> -->
+					<view class="service-list-list-two">
+						<view class="thumb">
+						{{tongji.rate || `0%`}}
+						</view>
+						<view class="name">
+							<text>转化率</text>
+						</view>
+					</view>
+					<!-- <view class="service-list-list-two">
+						<view class="thumb">
+							10%
+						</view>
+						<view class="name">
+							<text>复购率</text>
+						</view>
+					</view> -->
+				</view>
+				
+			</view>
+			</view>
+			<view class="message-list">
+				<view class="titleall-box">
+					<view class="titleall-left"><view class="titleall-left-line"></view>我的服务</view>
+				</view>
+				<view class="list" @click="shopjcMsg">
+					<view class="icon-data">
+						<view class="icon">
+							<image :src="$imgUrl('/my-icon1.png')" mode=""></image>
+						</view>
+						<view class="data">
+							<view class="title">
+								<text>商家基本信息</text>
+							</view>
+						</view>
+					</view>
+					<view class="more">
+						<image :src="$imgUrl('/right2.png')"></image>
+					</view>
+				</view>
+				<view class="list" @click="recordService">
+					<view class="icon-data">
+						<view class="icon">
+							<image :src="$imgUrl('/my-icon2.png')" mode=""></image>
+						</view>
+						<view class="data">
+							<view class="title">
+								<text>服务记录</text>
+							</view>
+						</view>
+					</view>
+					<view class="more">
+						<image :src="$imgUrl('/right2.png')"></image>
+					</view>
+				</view>
+				<view class="list" @click="repair">
+					<view class="icon-data">
+						<view class="icon">
+							<image :src="$imgUrl('/my-icon3.png')" mode=""></image>
+						</view>
+						<view class="data">
+							<view class="title">
+								<text>故障报修</text>
+							</view>
+						</view>
+					</view>
+					<view class="more">
+						<image :src="$imgUrl('/right2.png')"></image>
+					</view>
+				</view>
+				<view class="list" @click="complaint">
+					<view class="icon-data">
+						<view class="icon">
+							<image :src="$imgUrl('/my-icon2.png')" mode=""></image>
+						</view>
+						<view class="data">
+							<view class="title">
+								<text>投诉建议</text>
+							</view>
+						</view>
+					</view>
+					<view class="more">
+						<image :src="$imgUrl('/right2.png')"></image>
+					</view>
+				</view>
+				<view class="list" @click="handleApplySettle">
+					<view class="icon-data">
+						<view class="icon">
+							<image :src="$imgUrl('/my-icon4.png')" mode=""></image>
+						</view>
+						<view class="data">
+							<view class="title">
+								<text>商城入驻申请</text>
+							</view>
+						</view>
+					</view>
+					<view class="more">
+						<image :src="$imgUrl('/right2.png')"></image>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- tabbar -->
+		<tabbar :tabBarShow="3"></tabbar>
+	</view>
+</template>
+
+<script>
+	import tabbar from '../../components/tabbar/tabbar.vue';
+	import {
+		Encrypt
+	} from '../../utils/secret'
+	export default {
+		components: {
+			tabbar,
+		},
+		data() {
+			return {
+				Islogin:true,
+				scrollTop: 0,
+				isHotline: false,
+				shopMsg:{},
+				pageindex: {
+					pageNumber: 1,
+					pageSize: 10
+				},
+				tuiguang:'',
+				tongji:{}
+			};
+		},
+		onload(){
+
+		},
+		onShow() {
+		let shopId = {
+			shopId:uni.getStorageSync('shopId') || ''
+		}
+		  const isLogin = uni.getStorageSync('token');
+		  console.log(isLogin)
+		  if (isLogin =='') { 
+		    // 如果未登录，跳转到登录页面
+		        	uni.navigateTo({
+		        	  url: '/pages/login/login'
+		        	})
+		  }else{
+			  let page={
+				condition:2
+			  }
+			 this.$http.sendRequest('/shop/getById', 'POST',shopId).then(res => {
+				 if(res.data.code !="20004"){
+					 this.shopMsg = res.data.data
+					 this.Islogin= false
+					 this.$http.sendRequest('/index/index', 'POST',page).then(res => {
+					 	//成功回调
+					 				console.log(res)
+					 									this.tongji = res.data.data
+					 })
+				 }else{
+					 uni.navigateTo({
+					   url: '/pages/login/login'
+					 })
+				 }
+					 
+				
+			 	//成功回调
+				
+			 })
+			 
+		  }		
+		
+		},
+		onReady() {
+			uni.hideTabBar();
+		},
+		onPageScroll(e) {
+			this.scrollTop = e.scrollTop;
+		},
+		mounted(){
+			this.getALL()
+		},
+		methods: {
+			getALL(){
+				this.pageindex.createUser =uni.getStorageSync('shopId')
+				this.$http.sendRequest('/cerePromotion/queryByPage', 'POST', this.pageindex,1).then(res => {
+					//成功回调
+					this.tuiguang = res.data.data.content.length
+				
+				})
+			},
+			recordService() {
+				if(this.Islogin == false){
+					uni.navigateTo({
+						url: '/pages/recordService/recordService'
+					})	
+				}
+				
+			},
+			complaint() {
+				if(this.Islogin == false){
+					uni.navigateTo({
+						url: '/pages/complaint/complaint'
+					})
+				}
+				
+			},
+			repair() {
+				if(this.Islogin == false){
+					uni.navigateTo({
+						url: '/pages/repair/repair'
+					})
+				}
+				
+			},
+			apply() {
+				if(this.Islogin == false){
+					uni.navigateTo({
+						url: '/pages/record/record'
+					})
+				}
+				
+			},
+			myativity(){
+				if(this.Islogin == false){
+					uni.navigateTo({
+						url: '/pages/mycreated/mycreated'
+					})
+				}
+				
+			},
+			questionnaire(){
+				if(this.Islogin == false){
+					uni.navigateTo({
+						url: '/pages/questionnaire/questionnaire'
+					})
+				}
+				
+			},
+			shopjcMsg(){
+				let shop = JSON.stringify(this.shopMsg)
+				if(this.Islogin == false){
+					uni.navigateTo({
+						url: `/pages/shopjcMsg/shopjcMsg?shopMsg=${shop}`
+					})
+				}
+				
+			},
+			projectM(){
+				if(this.Islogin == false){
+						uni.navigateTo({
+							url: '/pages/projectManagement/projectManagement'
+						})
+				}
+			
+			},
+			handleApplySettle() {
+				const res = uni.getStorageSync('token');
+				let token = Encrypt(res)
+				let username = this.shopMsg.shopName
+				let url = 'http://8.130.38.56:8027/settled-merchant'
+				// #ifdef H5
+				console.log('h5 test')
+				window.location.href = url + `/#/?username=${ username }&user=${ token }`
+				// #endif
+				// #ifdef APP-PLUS
+				plus.runtime.openURL(url + `/#/?username=${ username }&user=${ token }`, function(
+				e) {
+					console.log(e);
+				})
+				// #endif
+				// #ifdef MP-WEIXIN
+				uni.navigateTo({
+					url: `../linkOthers/index?url=${ url }&username=${ username }&user=${ token }`
+					// 此处的链接为小程序上面新建的webview页面路径，参数url为要跳转外链的地址
+					// url: '../../../pages_category_page1/linkOthers/index?url=' + encodeURIComponent(url)
+					// url:'../../../pages_category_page2/userModule/coupon'
+				})
+				// #endif
+				// #ifdef MP-ALIPAY
+				uni.navigateTo({
+					url: `../linkOthers/index?url=${ url }&username=${ username }&user=${ token }`
+					// 此处的链接为小程序上面新建的webview页面路径，参数url为要跳转外链的地址
+					// url: '../../../pages_category_page1/linkOthers/index?url=' + encodeURIComponent(url)
+					// url:'../../../pages_category_page2/userModule/coupon'
+				})
+				// #endif
+			},
+			myMsg(){
+				const res = uni.getStorageSync('token');
+				if(res ==''){
+					uni.navigateTo({
+					  url: '/pages/login/login'
+					})
+				}else{
+					let shop = JSON.stringify(this.shopMsg)
+					if(this.Islogin == false){
+						uni.navigateTo({
+							url: `/pages/shopjcMsg/shopjcMsg?shopMsg=${shop}`
+						})
+					}
+				}
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import 'my.scss';
+</style>
diff --git a/pages/my/my.vue b/pages/my/my.vue
index e90451e..f484ebc 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -62,7 +62,7 @@
 							<text>我的活动</text>
 						</view>
 					</view>
-					<view class="service-list-list" @click="apply">
+					<!-- <view class="service-list-list" @click="apply">
 						<view class="thumb">
 							<text v-if="Islogin">0</text>
 							<text v-else>2</text>
@@ -70,8 +70,8 @@
 						<view class="name">
 							<text>我的招商</text>
 						</view>
-					</view>
-					<view class="service-list-list" @click="projectM">
+					</view> -->
+					<!-- <view class="service-list-list" @click="projectM">
 						<view class="thumb">
 							 <text v-if="Islogin">0</text>
 							<text v-else>{{tuiguang}}</text>
@@ -79,12 +79,12 @@
 						<view class="name">
 							<text>我的推广</text>
 						</view>
-					</view>
+					</view> -->
 				</view>
 			</view>
 			</view>
 			<!-- 我的服务 -->
-			<view class="message-list">
+			<!-- <view class="message-list">
 			<view class="titleall-box">
 				<view class="titleall-left"><view class="titleall-left-line"></view>商城数据</view>
 			</view>
@@ -101,14 +101,6 @@
 							<text>今日收入</text>
 						</view>
 					</view>
-					<!-- <view class="service-list-list-two">
-						<view class="thumb">
-							275
-						</view>
-						<view class="name">
-							<text>退款金额</text>
-						</view>
-					</view> -->
 					<view class="service-list-list-two">
 						<view class="thumb">
 							{{tongji.total}}
@@ -117,14 +109,6 @@
 							<text>访客数</text>
 						</view>
 					</view>
-					<!-- <view class="service-list-list-two">
-						<view class="thumb">
-							135
-						</view>
-						<view class="name">
-							<text>订单量</text>
-						</view>
-					</view> -->
 					<view class="service-list-list-two">
 						<view class="thumb">
 						{{tongji.rate || `0%`}}
@@ -133,18 +117,10 @@
 							<text>转化率</text>
 						</view>
 					</view>
-					<!-- <view class="service-list-list-two">
-						<view class="thumb">
-							10%
-						</view>
-						<view class="name">
-							<text>复购率</text>
-						</view>
-					</view> -->
 				</view>
 				
 			</view>
-			</view>
+			</view> -->
 			<view class="message-list">
 				<view class="titleall-box">
 					<view class="titleall-left"><view class="titleall-left-line"></view>我的服务</view>
@@ -164,7 +140,7 @@
 						<image :src="$imgUrl('/right2.png')"></image>
 					</view>
 				</view>
-				<view class="list" @click="recordService">
+				<view class="list" @click="toPage('/pages/record/record')">
 					<view class="icon-data">
 						<view class="icon">
 							<image :src="$imgUrl('/my-icon2.png')" mode=""></image>
@@ -313,6 +289,9 @@
 				
 				})
 			},
+			toPage(url) {
+				uni.navigateTo({ url });
+			},
 			recordService() {
 				if(this.Islogin == false){
 					uni.navigateTo({
diff --git a/pages/mycreated/mycreated.vue b/pages/mycreated/mycreated.vue
index 3502c0f..3ca2780 100644
--- a/pages/mycreated/mycreated.vue
+++ b/pages/mycreated/mycreated.vue
@@ -15,11 +15,11 @@
 					<view class="body">
 						<image :src="$imgUrl('/img/2.jpg')" ></image>
 						<view class="info">
-							<view class="title">这里有标题这里有标题这里有标题这里有标题</view>
+							<view class="title">绿道好物节</view>
 							<view class="info-items">
 								<view class="info-item">
 									<view class="label">活动时间：</view>
-									<text>2022.22.22</text>
+									<text>2024.10.20</text>
 								</view>
 								<view class="info-item">
 									<view class="label">参与商家：</view>
diff --git a/pages/participation/participation - 副本.scss b/pages/participation/participation - 副本.scss
new file mode 100644
index 0000000..19ee78a
--- /dev/null
+++ b/pages/participation/participation - 副本.scss
@@ -0,0 +1,148 @@
+.page{
+	position: absolute;
+	left: 0;
+	top: 0;
+	width: 100%;
+	height: 100%;
+	padding: 0 40rpx;
+	background-color: #fff;
+}
+.head-search{
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		position: relative;
+		margin: 20rpx 0;
+		.search{
+			
+			display: flex;
+			align-items: center;
+			width: 100%;
+			height: 72rpx;
+			
+			border: 2rpx solid #E8E8E8;
+			justify-content: space-between;
+			padding: 0 10rpx 0 30rpx;
+			.icon{
+				display: flex;
+				align-items: center;
+				
+				margin-left: 20rpx;
+				margin-right: 15rpx;
+				image{
+					width: 29rpx;
+					height: 29rpx;
+				}
+			}
+
+		}
+	}
+/* 订单列表 */
+.screen-list {
+		display: flex;
+		align-items: center;
+		width: 100%;
+		margin: 40rpx 0;
+		width: 100%;
+		.list {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			width: 25%;
+			height: 100%;
+			text {
+				font-size: 26rpx;
+				color: #555555;
+			}
+			image {
+				width: 30rpx;
+				height: 30rpx;
+				margin-left: 10rpx;
+			}
+		}
+	
+		
+	}
+
+.goods-data{
+	width: 100%;
+	.goods-list{
+		width: 100%;
+	
+		.list{
+			display: flex;
+			margin-bottom: 40rpx;
+			.thumb{
+				display: flex;
+				// align-items: center;
+				width: 36%;
+				image{
+					width: 230rpx;
+					height: 190rpx;
+					border-radius: 10rpx;
+				}
+			}
+			
+			.item{
+				width: 60%;
+				margin-left: 4%;
+				.title{
+					display: flex;
+					align-items: center;
+					width: 100%;
+					margin: 20rpx 0;
+					.color{
+						color: #A8A8A8;
+					}
+				}
+				.canyu{
+					width: 100%;
+					padding: 30rpx 20rpx;
+					background-color: #3F9B6A;
+					height: 70rpx;
+					text-align: center;
+					line-height: 15rpx;
+					color: #fff;
+				}
+				text{
+					font-size: 30rpx;
+					// font-weight: bold;
+					color: #222222;
+				}
+				
+			}
+			
+		}
+		.goods-border{
+			padding: 30rpx;
+			border: 1px solid #F3F3F3;
+		}
+	}
+}
+/* 保存按钮 */
+.page-footer{
+	width: 100%;
+	background-color: #FFFFFF;
+	padding-bottom: constant(safe-area-inset-bottom);
+	padding-bottom: env(safe-area-inset-bottom);
+	margin:40rpx 0 80rpx 0;
+	.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: 70rpx;
+			background-color: #3f9b6a;
+			text{
+				font-size: 28rpx;
+				color: #FFFFFF;
+			}
+		}
+	}
+}
diff --git a/pages/participation/participation - 副本.vue b/pages/participation/participation - 副本.vue
new file mode 100644
index 0000000..ef149cb
--- /dev/null
+++ b/pages/participation/participation - 副本.vue
@@ -0,0 +1,100 @@
+<template>
+	<view class="page">
+		<!-- 搜索 -->
+		<view class="head-search" @click="myativity">
+			<view class="search">
+				<view class="">
+					 我创建的活动
+				</view>
+				<view class="icon">
+					<image :src="$imgUrl('/search.png')" ></image>
+				</view>
+				
+			</view>
+		</view>
+		<!-- 创建按钮 -->
+		<!-- <view class="page-footer" @click="createWen">
+		  <view class="footer-buy">
+		    <view class="cart-add">
+		      <text>创建活动</text>
+		    </view>
+		  </view>
+		</view> -->
+		
+		<view class="screen-list">
+			<view class="list">
+				<text>区域</text>
+				<image :src="$imgUrl('/down.png')"></image>	
+			</view>
+			<view class="list">
+				<text>租金</text>
+				<image :src="$imgUrl('/down.png')" ></image>
+			</view>
+			<view class="list">
+				<text>默认排序</text>
+				<image :src="$imgUrl('/down.png')"></image>
+			</view>
+			<view class="list">
+				<text>筛选</text>
+				<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 1" :key="index">
+					<view class="thumb">
+						<image :src="$imgUrl('/img/2.jpg')"></image>
+					</view>
+					<view class="item">
+						<view class="">
+							<text class="one-omit">名称：绿道好物节</text>
+						</view>
+						<view class="title">
+							<text class="one-omit color">活动时间：2024-10-10至2024-10-20</text>
+						</view>
+						<view class="title">
+							<text class="one-omit color">参与商家：1人</text>
+						</view>
+						<view class="title">
+							<text class="one-omit color">活动状态：待开始</text>
+						</view>
+						<view class="title">
+							<text class="one-omit color">举办方：绿道</text>
+						</view>
+						
+						<view class="canyu" @click='join'>
+							<view>我要参与</view>
+						</view>
+						
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+			};
+		},
+		methods: {
+			myativity() {
+				uni.navigateTo({
+					url: '/pages/mycreated/mycreated'
+				})
+			},
+			join(){
+				uni.navigateTo({
+					url: '/pages/mycreated/mycreated?id=1'
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import 'participation.scss';
+</style>
diff --git a/pages/privacy/privacy.vue b/pages/privacy/privacy.vue
new file mode 100644
index 0000000..61f7a60
--- /dev/null
+++ b/pages/privacy/privacy.vue
@@ -0,0 +1,36 @@
+<template>
+	<view class="page">
+		<view class="title">锦江绿道商家端小程序隐私保护指引</view>
+		<view style="font-size: 16px;font-weight: 600;margin-bottom: 15px;" >引言</view>
+		<view class="" style="margin-bottom: 20px;">本指引是锦江绿道商家端小程序开发者 成都锦江绿道建设投资集团有限公司(以下简称“开发者”)为处理你的个人信息而制定</view>
+		<view class="biaoti">1.开发者处理的信息</view>
+		<view class="neirong">根据法律规定，开发者仅处理实现小程序功能所必要的信息。</view>
+		<view class="neirong">为了在小程序中展示用户身份信息，开发者将在获取你的明示同意后，收集你的微信昵称、头像。</view>
+		<view class="neirong">为了用户注册、登录及后续服务沟通，开发者将在获取你的明示同意后，收集你的手机号。</view>
+		<view class="neirong">开发者 收集你的地址，用于商品配送或服务提供的地址确认。</view>
+		<view class="neirong">开发者 收集你的身份证号码，用于实名认证以确保服务的合法性和家全性。	</view>
+		<view class="neirong">开发者 收集你选中的照片或视频信息，用于用户在小程序中进行内容分享、创作等特定功能需求。</view>
+	</view>
+</template>
+
+<script>
+</script>
+
+<style>
+	.page{
+		padding:20px;
+		height: 100vh;
+		background-color: #fff;
+	}
+	.title{
+			font-size: 20px;
+			font-weight: 600;
+			text-align: center;margin-bottom: 20px;
+	}
+	.biaoti{
+		font-size: 16px;font-weight: 600;margin-bottom: 15px;
+	}
+	.neirong{
+		margin-bottom: 5px;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/questionnaire/questionnaire.scss b/pages/questionnaire/questionnaire.scss
index 4498b27..d4774cf 100644
--- a/pages/questionnaire/questionnaire.scss
+++ b/pages/questionnaire/questionnaire.scss
@@ -6,6 +6,28 @@
 	height: 100%;
 	background-color: #f6f6f6;
 }
+.head-search{
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	position: relative;
+	margin: 20rpx 24rpx;
+	background-color: #FFFFFF;
+	border-radius: 35rpx;
+	padding: 0 10rpx;
+	border: 2rpx solid #E8E8E8;
+	.u-search {
+		position: relative;
+	}
+	.u-btn {
+		border: unset;
+		border: 0px transparent;
+		height: 46rpx;
+		width: 88rpx;
+		font-size: 24rpx;
+		border-radius: 35rpx;
+	}
+}
 .screen-list {
 	display: flex;
 	align-items: center;
diff --git a/pages/questionnaire/questionnaire.vue b/pages/questionnaire/questionnaire.vue
index 86be7ba..ebcb63f 100644
--- a/pages/questionnaire/questionnaire.vue
+++ b/pages/questionnaire/questionnaire.vue
@@ -1,5 +1,9 @@
 <template>
 	<view class="page">
+		<view class="head-search">
+			<u-search bg-color="#fff" placeholder="请输入关键词" v-model="query.keyword" :show-action="false" @search="search"></u-search>
+			<u-button type="success" @click="search">搜索</u-button>
+		</view>
 		<view class="screen-list">
 			<view class="list" @click="show = true">
 				<text>问卷类型</text>
@@ -18,7 +22,7 @@
 					 <image :src="$imgUrl('/img/2.jpg')"></image>
 				 </view>
 				 <view class="info">
-					 <view class="title" >这里有标题这里有标题这里有...</view>
+					 <view class="title" >{{item.title}}</view>
 					 <view class="info-item">填写时间：<span>{{item.tTime}}分钟</span></view>
 					 <view class="info-item">截止时间：<span>{{item.jTime}}</span></view>
 					 <view class="info-item">问卷类型：<span>{{item.leiXing}}</span></view>
@@ -49,6 +53,7 @@
 				], // 区域列表
 				query: {
 					type: '',
+					keyword: '',
 				},
 				tableData:[
 					{	
@@ -73,6 +78,7 @@
 				this.query[`${key}`] = val[0].value;
 				this.search();
 			},
+			search() {},
 			toAdd() {
 				
 			},
diff --git a/pages/record/record - 副本.scss b/pages/record/record - 副本.scss
new file mode 100644
index 0000000..846f84d
--- /dev/null
+++ b/pages/record/record - 副本.scss
@@ -0,0 +1,86 @@
+.page{
+	position: absolute;
+	left: 0;
+	top: 0;
+	width: 100%;
+	height: 100%;
+}
+/* 记录列表 */
+.record-list{
+	margin: 20rpx;
+	.record-list-box {
+		background-color: #FFFFFF;
+		border-radius: 20rpx;
+		padding: 20rpx 30rpx;
+		margin-bottom: 20rpx;	
+	}
+	.list-btn {
+		display: inline-block;
+		width: 100%;
+		text-align: right;
+		padding-bottom: 10rpx;
+		.date-btn {
+			background-color: #3f9b6a;
+			color: #fff;
+			font-size: 28rpx;
+			font-weight: bold;
+			padding: 10rpx 20rpx;
+			border-radius: 10rpx;
+		}
+	}
+	.list{
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		.title-date{
+			.date{
+				margin: 14rpx 0;
+				text{
+					color:#3D3D3D;
+				}
+				.org{
+					color:#CDA33A;
+				}
+				.green{
+					color:#219129;
+				}
+			}
+		}
+		.integral{
+			text{
+				font-size: 28rpx;
+				color: #3D3D3D;
+			}
+			image {
+				width: 22rpx;
+				height: 22rpx;
+			}
+		}
+	}
+}
+.screen-list {
+		display: flex;
+		align-items: center;
+		width: 100%;
+		margin: 30rpx 25rpx;
+		.list {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			width: 75%;
+			height: 100%;
+			background-color: #fff;
+			padding: 20rpx;
+			border-radius: 10rpx;
+			margin-left: 30rpx;
+			text {
+				font-size: 26rpx;
+				color: #469e70;
+			}
+			image {
+				width: 30rpx;
+				height: 30rpx;
+				margin-left: 10rpx;
+			}
+		}
+	}
\ No newline at end of file
diff --git a/pages/record/record - 副本.vue b/pages/record/record - 副本.vue
new file mode 100644
index 0000000..7b0d6c9
--- /dev/null
+++ b/pages/record/record - 副本.vue
@@ -0,0 +1,76 @@
+<template>
+	<view class="page">
+		<view class="screen-list">
+			<view>记录查询</view>
+			<view class="list">
+				<text>租赁申请记录</text>
+				<image :src="$imgUrl('/down.png')" ></image>
+			</view>
+		</view>
+		<!-- 记录列表 -->
+		<view class="record-list">
+			<view class="record-list-box" v-for="(item,index) in recordList" :key="index" @click="recordXq(item)">
+				<view class="list">
+				<view class="title-date">
+					<view class="date">
+						<text>租赁资源名称：{{item.recordName}}</text>
+					</view>
+					<view class="date">
+						<text>承租人姓名：{{item.porName}}</text>
+					</view>
+					<view class="date">
+						<text>提交时间：{{item.tTime}}</text>
+					</view>
+					<view class="date">
+						状态：<text :class="item.state == '受理中'?'org':'green'">{{item.state}}</text>
+					</view>
+				</view>
+				<view class="integral">
+					<image :src="$imgUrl('/right2.png')"></image>
+				</view>
+				</view>
+				
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				recordList:[
+					{
+						recordName:'这里有名称这里有名称',
+						porName:'徐丽',
+						tTime:'2022-02-22 12：00：00',
+						state:'受理中'
+					},
+					{
+						recordName:'这里有名称这里有名称',
+						porName:'徐丽',
+						tTime:'2022-02-22 12：00：00',
+						state:'已通过'
+					}
+				]
+			};
+		},
+		methods: {
+			recordXq(item){
+				 const encodedItem = encodeURIComponent(JSON.stringify(item));
+				uni.navigateTo({
+				 url: `/pages/accepting/accepting?item=${encodedItem}`,
+				 })
+			},
+			contractdetail(){
+				// uni.navigateTo({
+				
+				// })
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import 'record.scss';
+</style> 
diff --git a/pages/record/record.scss b/pages/record/record.scss
index 846f84d..8868e12 100644
--- a/pages/record/record.scss
+++ b/pages/record/record.scss
@@ -5,9 +5,49 @@
 	width: 100%;
 	height: 100%;
 }
+.screen-list {
+		display: flex;
+		align-items: center;
+		width: 100%;
+		margin: 20rpx 20rpx;
+		padding: 0 10rpx;
+		.zidong{
+			width: 160rpx;
+			background-color: #3F9B6A;
+		color: #fff;
+		padding: 10rpx;
+		border-radius: 30rpx;
+		font-size: 24rpx;
+		text-align: center;
+		}
+		.list {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			width: 30%;
+			height: 100%;
+			background-color: #fff;
+			padding: 10rpx 16rpx;
+			border-radius: 18rpx;
+			color: #0FBB59;
+			text {
+				font-size: 26rpx;
+			}
+			image {
+				width: 30rpx;
+				height: 30rpx;
+				margin-left: 10rpx;
+			}
+		}
+		.action {
+			text {
+				color: $base;
+			}
+		}
+	}
 /* 记录列表 */
 .record-list{
-	margin: 20rpx;
+	margin: 0 20rpx;
 	.record-list-box {
 		background-color: #FFFFFF;
 		border-radius: 20rpx;
@@ -58,29 +98,3 @@
 		}
 	}
 }
-.screen-list {
-		display: flex;
-		align-items: center;
-		width: 100%;
-		margin: 30rpx 25rpx;
-		.list {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			width: 75%;
-			height: 100%;
-			background-color: #fff;
-			padding: 20rpx;
-			border-radius: 10rpx;
-			margin-left: 30rpx;
-			text {
-				font-size: 26rpx;
-				color: #469e70;
-			}
-			image {
-				width: 30rpx;
-				height: 30rpx;
-				margin-left: 10rpx;
-			}
-		}
-	}
\ No newline at end of file
diff --git a/pages/record/record.vue b/pages/record/record.vue
index 7b0d6c9..d345df6 100644
--- a/pages/record/record.vue
+++ b/pages/record/record.vue
@@ -1,7 +1,6 @@
 <template>
 	<view class="page">
 		<view class="screen-list">
-			<view>记录查询</view>
 			<view class="list">
 				<text>租赁申请记录</text>
 				<image :src="$imgUrl('/down.png')" ></image>
@@ -13,7 +12,7 @@
 				<view class="list">
 				<view class="title-date">
 					<view class="date">
-						<text>租赁资源名称：{{item.recordName}}</text>
+						<text>都江堰广场8#-2，都江堰市柏条河北路下段 I 茶坊 I 广场</text>
 					</view>
 					<view class="date">
 						<text>承租人姓名：{{item.porName}}</text>
@@ -43,13 +42,13 @@
 					{
 						recordName:'这里有名称这里有名称',
 						porName:'徐丽',
-						tTime:'2022-02-22 12：00：00',
+						tTime:'2024-10-8 11：04：20',
 						state:'受理中'
 					},
 					{
 						recordName:'这里有名称这里有名称',
-						porName:'徐丽',
-						tTime:'2022-02-22 12：00：00',
+						porName:'王城',
+						tTime:'2024-10-9 10：20：47',
 						state:'已通过'
 					}
 				]
diff --git a/pages/workbench/workbench-副.vue b/pages/workbench/workbench-副.vue
new file mode 100644
index 0000000..6daa224
--- /dev/null
+++ b/pages/workbench/workbench-副.vue
@@ -0,0 +1,249 @@
+<template>
+	<view class="page">
+		<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="$imgUrl('/logo.png')"></image>
+				</view>
+				<view class="title">
+					
+				</view>
+				<view class="setting-mess"></view>
+			</view>
+		</view>
+		<view class="main">
+			<view class="bg-white">
+				<view class="bidding-title"><view class="bidding-title-line"></view>招商服务</view>
+				<view class="wallet-info">
+					<view class="list" @click="questionnaire">
+						<view class="icon">
+							<image :src="$imgUrl('/workbench1.png')"></image>
+						</view>
+						<view class="title">
+							<text>问卷调查</text>
+						</view>
+					</view>
+					<view class="list" @click="Iproposal">
+						<view class="icon">
+							<image :src="$imgUrl('/workbench2.png')"></image>
+						</view>
+						<view class="title">
+							<text>招商方案</text>
+						</view>
+					</view>
+					<view class="list"  @click='participation'>
+						<view class="icon">
+							<image :src="$imgUrl('/workbench3.png')"></image>
+						</view>
+						<view class="title">
+							<text>活动参与</text>
+						</view>
+					</view>
+					<view class="list" @click="activityAdd">
+						<view class="icon">
+							<image :src="$imgUrl('/workbench4.png')"></image>
+						</view>
+						<view class="title">
+							<text>活动申请</text>
+						</view>
+					</view>
+					<view class="list" @click="sales">
+						<view class="icon">
+							<image :src="$imgUrl('/workbench5.png')"></image>
+						</view>
+						<view class="title">
+							<text>销售上报</text>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="bg-white">
+				<view class="bidding-title"><view class="bidding-title-line"></view>推广策划</view>
+				<view class="wallet-info">
+					<view class="list">
+						<view class="icon"  @click='popularize(1)'>
+							<image :src="$imgUrl('/workbench2.png')" ></image>
+						</view>
+						<view class="title">
+							<text>推广方案申请</text>
+						</view>
+					</view>
+					<view class="list">
+						<view class="icon"  @click='popularize(2)'>
+							<image :src="$imgUrl('/workbench7.png')"></image>
+						</view>
+						<view class="title">
+							<text>推广方案管理</text>
+						</view>
+					</view>
+					<view class="list">
+						<view class="icon">
+							<image :src="$imgUrl('/workbench8.png')"></image>
+						</view>
+						<view class="title">
+							<text>效果查看</text>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="bg-white">
+				<view class="bidding-title"><view class="bidding-title-line"></view>在线商城</view>
+				<view class="wallet-info">
+					<!-- <view class="list">
+						<view class="icon">
+							<image src="../../static/workbench9.png"></image>
+						</view>
+						<view class="title">
+							<text>新增商品</text>
+						</view>
+					</view> -->
+					<view class="list" @click="order">
+						<view class="icon">
+							<image :src="$imgUrl('/workbench10.png')"></image>
+						</view>
+						<view class="title">
+							<text>订单查询</text>
+						</view>
+					</view>
+					<!-- <view class="list">
+						<view class="icon">
+							<image src="../../static/workbench11.png"></image>
+						</view>
+						<view class="title">
+							<text>售后管理</text>
+						</view>
+					</view> -->
+					<!-- <view class="list">
+						<view class="icon">
+							<image src="../../static/workbench12.png"></image>
+						</view>
+						<view class="title">
+							<text>库存管理</text>
+						</view>
+					</view> -->
+					<view class="list" @click="salesSta">
+						<view class="icon">
+							<image :src="$imgUrl('/workbench15.png')"></image>
+						</view>
+						<view class="title">
+							<text>销售统计</text>
+						</view>
+					</view>
+					<!-- <view class="list">
+						<view class="icon">
+							<image src="../../static/workbench14.png"></image>
+						</view>
+						<view class="title">
+							<text>综合查询</text>
+						</view>
+					</view> -->
+					<!-- <view class="list">
+						<view class="icon">
+							<image src="../../static/workbench13.png"></image>
+						</view>
+						<view class="title">
+							<text>优惠券发放</text>
+						</view>
+					</view> -->
+				</view>
+			</view>
+			<view class="bg-white">
+				<view class="bidding-title"><view class="bidding-title-line"></view>支付服务</view>
+				<view class="wallet-info">
+					<view class="list">
+						<view class="icon">
+							<image :src="$imgUrl('/workbench16.png')"></image>
+						</view>
+						<view class="title">
+							<text>明细查询</text>
+						</view>
+					</view>
+					<view class="list">
+						<view class="icon">
+							<image :src="$imgUrl('/workbench7.png')"></image>
+						</view>
+						<view class="title">
+							<text>日志查询</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- tabbar -->
+		<tabbar :tabBarShow="1"></tabbar>
+	</view>
+</template>
+
+<script>
+	import tabbar from '../../components/tabbar/tabbar.vue';
+	export default {
+		components: {
+			tabbar
+		},
+		data() {
+			return {
+				scrollTop: 0,
+			};
+		},
+		onReady() {
+			uni.hideTabBar()
+		},
+		onPageScroll(e) {
+			this.scrollTop = e.scrollTop;
+		},
+		methods: {
+			activityAdd(){
+				uni.navigateTo({
+					url: '/pages/activityAdd/activityAdd',
+				})
+			},
+			participation(){
+				uni.navigateTo({
+					url: '/pages/participation/participation',
+				})
+			},
+			questionnaire(){
+				uni.navigateTo({
+					url: '/pages/questionnaire/questionnaire',
+				})
+			},
+			sales(){
+				uni.navigateTo({
+					url: '/pages/salesReporting/salesReporting',
+				})
+			},
+			order(){
+				uni.navigateTo({
+					url: '/pages/orderList/orderList',
+				})
+			},
+			salesSta(){
+				uni.navigateTo({
+					url: '/pages/salesSta/salesSta',
+				})
+			},
+			Iproposal(){
+				uni.navigateTo({
+					url: '/pages/Iproposal/Iproposal',
+				})
+			},
+			popularize(val){
+				if(val ==1){
+					uni.navigateTo({
+						url: '/pages/application/application',
+					})
+				}else{
+					uni.navigateTo({
+						url: '/pages/projectManagement/projectManagement',
+					})
+				}
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import 'workbench.scss';
+</style>
diff --git a/pages/workbench/workbench.vue b/pages/workbench/workbench.vue
index 1c9b7b6..fd23472 100644
--- a/pages/workbench/workbench.vue
+++ b/pages/workbench/workbench.vue
@@ -47,42 +47,42 @@
 						title: '招商服务',
 						children: [
 							{ name: '文件调查', img: '/workbench1.png', path: '/pages/questionnaire/questionnaire' },
-							{ name: '招商方案', img: '/workbench2.png', path: '/pages/Iproposal/Iproposal' },
+							// { name: '招商方案', img: '/workbench2.png', path: '/pages/Iproposal/Iproposal' },
 							{ name: '活动参与', img: '/workbench3.png', path: '/pages/participation/participation' },
 							{ name: '我的活动申请', img: '/workbench4.png', path: '/pages/mycreated/mycreated' },
 							{ name: '销售上报', img: '/workbench5.png', path: '/pages/salesReporting/salesReporting' },
 						]
 					},
-					{
-						id: 2,
-						title: '推广策划',
-						children: [
-							{ name: '推广方案申请', img: '/workbench2.png', path: '/pages/application/application' },
-							{ name: '推广方案管理', img: '/workbench7.png', path: '/pages/projectManagement/projectManagement' },
-							{ name: '效果查看', img: '/workbench8.png', path: '' },
-						]
-					},
-					{
-						id: 3,
-						title: '在线商城',
-						children: [
-							// { name: '新增商品', img: '/workbench9.png', path: '' },
-							{ name: '订单查询', img: '/workbench10.png', path: '/pages/orderList/orderList' },
-							// { name: '售后管理', img: '/workbench11.png', path: '' },
-							// { name: '库存管理', img: '/workbench12.png', path: '' },
-							{ name: '销售统计', img: '/workbench15.png', path: '/pages/salesSta/salesSta' },
-							// { name: '综合查询', img: '/workbench14.png', path: '' },
-							// { name: '优惠券发放', img: '/workbench13.png', path: '' },
-						]
-					},
-					{
-						id: 4,
-						title: '支付服务',
-						children: [
-							{ name: '明细查询', img: '/workbench16.png', path: '' },
-							{ name: '日志查询', img: '/workbench7.png', path: '' },
-						]
-					},
+					// {
+					// 	id: 2,
+					// 	title: '推广策划',
+					// 	children: [
+					// 		{ name: '推广方案申请', img: '/workbench2.png', path: '/pages/application/application' },
+					// 		{ name: '推广方案管理', img: '/workbench7.png', path: '/pages/projectManagement/projectManagement' },
+					// 		{ name: '效果查看', img: '/workbench8.png', path: '' },
+					// 	]
+					// },
+					// {
+					// 	id: 3,
+					// 	title: '在线商城',
+					// 	children: [
+					// 		// { name: '新增商品', img: '/workbench9.png', path: '' },
+					// 		{ name: '订单查询', img: '/workbench10.png', path: '/pages/orderList/orderList' },
+					// 		// { name: '售后管理', img: '/workbench11.png', path: '' },
+					// 		// { name: '库存管理', img: '/workbench12.png', path: '' },
+					// 		{ name: '销售统计', img: '/workbench15.png', path: '/pages/salesSta/salesSta' },
+					// 		// { name: '综合查询', img: '/workbench14.png', path: '' },
+					// 		// { name: '优惠券发放', img: '/workbench13.png', path: '' },
+					// 	]
+					// },
+					// {
+					// 	id: 4,
+					// 	title: '支付服务',
+					// 	children: [
+					// 		{ name: '明细查询', img: '/workbench16.png', path: '' },
+					// 		{ name: '日志查询', img: '/workbench7.png', path: '' },
+					// 	]
+					// },
 				],
 				scrollTop: 0,
 			};
diff --git a/utils/request.js b/utils/request.js
index 70dc3d5..29d4670 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -24,9 +24,12 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
 	}
 	var bases = ''
 	if(baseUrl == 1){
+		
+		// bases = 'http://172.16.61.48/admin-server' + url;
 		bases = 'http://8.130.38.56:8027/admin-server' + url;
 	}else{
 		bases = 'http://8.130.38.56:8027/business-server' + url;
+		// bases = 'http://172.16.61.48/business-server' + url;
 		// var bases = 'http://10.0.0.96:9004' + url;
 	}
 	var token = uni.getStorageSync('token') || '';
--
libgit2 0.21.4