最新修改

杨鑫
1 parent a0c78b15
Showing 20 changed files with 470 additions and 120 deletions
admin-web-master/src/api/newly.js
admin-web-master/src/components/add/addht.vue
admin-web-master/src/components/chakan/map.vue
admin-web-master/src/router/index.js
admin-web-master/src/utils/request.js
admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue
admin-web-master/src/views/detect/analyse.vue
admin-web-master/src/views/detect/information/index.vue
admin-web-master/src/views/serve/salesReport.vue
ceres-uniapp-master/components/canvasShow/basics/banner.vue
ceres-uniapp-master/components/canvasShow/config/api.js
ceres-uniapp-master/config/api.js
lvdao-miniapp/pages/business/businessDetail/businessDetail.vue
lvdao-miniapp/pages/details/details.vue
lvdao-miniapp/pages/home/home.vue
lvdao-miniapp/pages/marketing/marketingDetail/marketingDetail.vue
lvdao-miniapp/pages/procedure/procedure.vue
lvdao-miniapp/pages/propertyPay/propertyPayList/propertyPayList.vue
lvdao-miniapp/pages/questionnaire/questionnaire.vue
lvdao-miniapp/pagesA/myZiyuan/myZiyuanQuit.vue
 import request from '@/utils/request'
 // import request from '@/utils/request2'
+// 广告位投放效果统计
+export function selectByAdPlacementId(data) {
+  return request({
+    url: `/cereAdvertisingVisitLog/selectByAdPlacementId?adPlacementId=${data}`,
+    method: 'get',
+    data
+  })
+}
+// 广告位投放效果统计
+export function selectByAdPlacementIdAndTime(data) {
+  return request({
+    url: '/cereAdvertisingVisitLog/selectByAdPlacementIdAndTime',
+    method: 'post',
+    data
+  })
+}
+// 广告位投放效果统计
+export function selectByAdPlacementIdAndTimeAndHour(data) {
+  return request({
+    url: '/cereAdvertisingVisitLog/selectByAdPlacementIdAndTimeAndHour',
+    method: 'post',
+    data
+  })
+}
 // 资源数量增长趋势
 export function resourceQuantityGrowth(data) {
   return request({
@@ -465,11 +465,19 @@ import {
         for (let index = 0; index < this.list1.length; index++) {
           const element = this.list1[index];
           // console.error({...element})
+		  
           if(element.type == '资源') {
+			  console.log(element.value,'element.value')
             if(element.value && typeof element.value == 'object') {
-              info['资源名称'] =''+ element.value.shopName?element.value.shopName:element.value.advertisingName?element.value.advertisingName:element.value.venueName?element.value.venueName:'暂无'
-              info['资源类型'] = ''+ element.value.shopName?'商铺':element.value.advertisingType?element.value.advertisingType:element.value.venueName?'场地':'暂无'
-              info['详细地址'] = element.value.detailedLocation?element.value.detailedLocation:'暂无'
+              info['资源名称'] =element.value.shopName?element.value.shopName:element.value.advertisingName?element.value.advertisingName:element.value.venueName?element.value.venueName:'暂无'
+			  
+              info['资源类型'] =element.value.shopName?'商铺':element.value.advertisingType?element.value.advertisingType:element.value.venueName?'场地':'暂无'
+			  if(element.value.venueName){
+				  info['详细地址'] ='暂无'
+			  }else{
+				info['详细地址'] = element.value.detailedLocation?element.value.detailedLocation:'暂无'  
+			  }
+              
               info['实际使用面积'] = element.value.actualArea?element.value.actualArea:element.value.actualUsableArea?element.value.actualUsableArea:'暂无'
             } else {
               info['资源名称'] = '暂无'
@@ -497,6 +505,7 @@ import {
           }
         }
+		
         return info
       },
       async ylht(){
@@ -258,25 +258,25 @@
 						</div>
 					</div>
 				</el-tab-pane>
-				<el-tab-pane label="投放效果" name="five">
+				<el-tab-pane label="投放效果" name="five" v-if="editbgid.advertisingType == '线上广告位'">
 					<el-descriptions class="margin-top" :column="3" border :labelStyle="labelStyle">
 						<el-descriptions-item>
 							<template slot="label">
 								点击量
 							</template>
-							120次
+							{{msg.dianji}}次
 						</el-descriptions-item>
 						<el-descriptions-item>
 							<template slot="label">
 								高频时段
 							</template>
-							18：00-23：00
+							{{msg.hour}}
 						</el-descriptions-item>
 						<el-descriptions-item>
 							<template slot="label">
-								平均点击价格
+								高峰时段访问量
 							</template>
-							无
+							{{msg.count}}
 						</el-descriptions-item>
@@ -338,7 +338,10 @@
 		cereResourceStrategylist,
 		cereBusinessPlan,
 		cereContractInformation,
-		resourcesFindPlan
+		resourcesFindPlan,
+		selectByAdPlacementId,
+		selectByAdPlacementIdAndTime,
+		selectByAdPlacementIdAndTimeAndHour
 	} from '@/api/newly';
 	import {
 		editList
@@ -404,7 +407,12 @@
 				labelStyle: {
 					width: '10%'
 				},
-				shouldShowChart: false
+				shouldShowChart: false,
+				msg:{
+					hour:'',
+					count:0,
+					dianji:0
+				}
 			}
 		},
 		created() {
@@ -414,13 +422,22 @@
 					pageSize: 10,
 					resourcesId: 'gg' + this.editbgid.id
 				}
-				cereResourceStrategylist(c1).then(res => {
-					console.error(res)
-					if (!Array.isArray(res.data)) {
-						this.datalist = [];
-						return;
-					}
-					this.datalist = res.data
+				// cereResourceStrategylist(c1).then(res => {
+				// 	console.error(res)
+				// 	if (!Array.isArray(res.data)) {
+				// 		this.datalist = [];
+				// 		return;
+				// 	}
+				// 	this.datalist = res.data
+				// })
+				selectByAdPlacementId(this.editbgid.id).then(res => {
+					this.msg.dianji = res.data
+					
+				})
+			
+				selectByAdPlacementIdAndTimeAndHour({adPlacementId:this.editbgid.id}).then(res => {
+					this.msg.count = res.data.count
+					this.msg.hour = res.data.hour
 				})
 				// cereBusinessPlan(c1).then(res => {
 				//   console.error(res)
@@ -477,28 +494,32 @@
 			tabClick(val) {
 				if (val.index == '3') {
 					this.shouldShowChart = true
-					this.$nextTick(() => {
-						const chartContainer = this.$refs.shop1ZX;
-						if (chartContainer) {
-							this.initChart();
-						} else {
-							console.log('图表容器元素未找到，尝试延迟初始化');
-							setTimeout(() => {
-
-								if (chartContainer) {
-									this.initChart();
-								} else {
-									console.error('图表容器元素仍然未找到');
-								}
-							}, 100);
-						}
-					});
+					selectByAdPlacementIdAndTime({adPlacementId:this.editbgid.id}).then(res => {
+						this.$nextTick(() => {
+							const chartContainer = this.$refs.shop1ZX;
+							if (chartContainer) {
+								this.initChart(res.data);
+							} else {
+								console.log('图表容器元素未找到，尝试延迟初始化');
+								setTimeout(() => {
+						
+									if (chartContainer) {
+										this.initChart(res.data);
+									} else {
+										console.error('图表容器元素仍然未找到');
+									}
+								}, 100);
+							}
+						});
+						
+					})
+					
 				} else {
 					this.shouldShowChart = false
 				}
 			},
-			initChart() {
+			initChart(datas) {
 				// 初始化 echarts 实例
 				const chartDom = this.$refs.shop1ZX;
 				const myChart = echarts.init(chartDom)
@@ -511,16 +532,15 @@
 					},
 					xAxis: {
 						type: 'category',
-						data: ['2023-11-26', '2023-11-27', '2023-11-28',
-							'2023-11-29', '2023-11-30', '2023-12-1', '2023-12-2'
-						]
+						data:  datas.map(item => item.month),
 					},
 					yAxis: {
 						type: 'value'
 					},
 					series: [{
+						color:'#3F9B6A',
 						name: '销售量',
-						data: [300, 500, 350, 300, 420, 600, 800],
+						data:  datas.map(item => item.count),
 						type: 'line',
 						symbol: 'none' // 不显示数据点
 					}]
@@ -880,7 +880,7 @@ const prefixRoutes = (routes, prefix) =&gt; {
 console.log(' process.env.NODE_ENV='+ process.env.NODE_ENV)
 const createRouter = () => new Router({
   base: process.env.NODE_ENV === 'production' ? '/cdwlMall/' : '/',
- mode: process.env.NODE_ENV === 'production' ? 'history' : 'hash', // require service support
+ mode: process.env.NODE_ENV === 'production' ? 'history' : 'history', // require service support
  // base: '/',
  // mode: 'hash',
   scrollBehavior: () => ({
@@ -22,7 +22,7 @@ if(host === &#39;localhost:8080&#39; || host === &#39;localhost:8081&#39; || host === &#39;localhost
   // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
-  baseURL = 'http://128.10.249.44:9003';
+  baseURL = 'http://128.10.249.39:9003';
 } else {
@@ -57,6 +57,7 @@ service.interceptors.request.use(
       // config.headers['Content-Type'] = 'application/json; charset=UTF-8'
       // config.headers['type'] = ' admin'
     }
+	console.log(config)
     return config
   },
   error => {
@@ -321,6 +321,7 @@
                 type: 'success'
               })
               this.removeonaction('1')
+			  
             } else {
               this.$message({
                 message: res.msg,
@@ -24,15 +24,41 @@
 					</div>
 				</div>
 			</div>
-			<div style="width: 100%;">
-				<div style="width: 46%;">
+			<div style="width: 100%;display: flex;margin-bottom: 20px;">
+				<div style="width: 50%;">
 					<div>
-						<TitleWithCircle title="资源数量增长趋势" style="margin: 20px 0;" />
+						<TitleWithCircle title="资源数量增长趋势" style="margin: 10px 0;" />
 					</div>
 					<div>
 						<div ref="echarts1" style="width:100%;height: 400px;"></div>
 					</div>
 				</div>
+				<div style="width: 50%;">
+					<div>
+						<TitleWithCircle title="资源分布统计" style="margin: 10px 0;" />
+					</div>
+					<div>
+						<div ref="shop2TJ" style="width:100%;height: 400px;"></div>
+					</div>
+				</div>
+			</div>
+			<div style="width: 100%;display: flex;">
+				<div style="width: 50%;">
+					<div>
+						<TitleWithCircle title="资源情况占比" style="margin: 10px 0;" />
+					</div>
+					<div>
+						<div ref="zyzbTJ" style="width:100%;height: 400px;"></div>
+					</div>
+				</div>
+				<div style="width: 50%;">
+					<div>
+						<TitleWithCircle title="资源利用率占比" style="margin: 10px 0;" />
+					</div>
+					<div>
+						<div ref="zylhlTJ" style="width:100%;height: 400px;"></div>
+					</div>
+				</div>
 			</div>
 		</div>
 	</div>
@@ -67,6 +93,10 @@
 					startTime: "1990-09-11",
 					endTime: "2024-11-09"
 				},
+				msgList:{
+					belongingGreenwaySection:'',
+					belongingParkTrail:''
+				},
 				formSel: {
 				}
@@ -93,50 +123,258 @@
 		},
 		methods: {
 			initecharts1(datas) {
-				console.error(datas)
-				let allx = []
-				let list1 = {
-					cent:[],
-					name:'商铺资源',
-				}
-				for (let index = 0; index < datas.shopTrend.length; index++) {
-					const element = datas.shopTrend[index];
-					allx.push(element.trendDate)
-					list1.cent.push(element.trendQuantity)
-				}
 				let Dom = this.$refs.echarts1
 				let myChart = echarts.init(Dom);  
-				let option = {
-					grid: {
-						top: '3%',
-						left: '6%',
-						right: '6%',
-						bottom: '6%',
-					},
-					xAxis: {
-						type: 'category',
-						boundaryGap: false,
-						data: allx
-					},
-					yAxis: {
-						type: 'value'
-					},
-					series: [
-						{
-							name: list1.name,
-							type: 'line',
-							stack: 'Total',
-							data: list1.cent
-						},
-						
-					]
-				};
+				  // 提取所有日期
+				      const allDates = [];
+				      Object.values(datas).forEach(trend => {
+				        trend.forEach(item => {
+				          if (!allDates.includes(item.trendDate)) {
+				            allDates.push(item.trendDate);
+				          }
+				        });
+				      });
+				      allDates.sort();
+				
+				      // 提取每条折线的数据
+				      const shopData =datas.shopTrend.map(item => item.trendQuantity);
+				      const venueData = datas.venueTrend.map(item => item.trendQuantity);
+				      const advertisingData = datas.advertisingTrend.map(item => item.trendQuantity);
+				      const greenwayData = datas.greenwayTrend.map(item => item.trendQuantity);
+				
+				      const option = {
+				        tooltip: {
+				          trigger: 'axis'
+				        },
+				        legend: {
+				          data: ['商铺资源增长趋势', '场地资源增长趋势', '广告位资源增长趋势', '总资源增长趋势'],
+					
+				        },
+				        xAxis: {
+				          type: 'category',
+				          data: allDates
+				        },
+				        yAxis: {
+				          type: 'value'
+				        },
+						  color: ['#4A90E2', '#37c954', '#F7C153', '#7a69d8'], // 使用浅色系颜色
+				        series: [
+				          {
+				            name: '商铺资源增长趋势',
+				            type: 'line',
+				            data: shopData
+				          },
+				          {
+				            name: '场地资源增长趋势',
+				            type: 'line',
+				            data: venueData
+				          },
+				          {
+				            name: '广告位资源增长趋势',
+				            type: 'line',
+				            data: advertisingData
+				          },
+				          {
+				            name: '总资源增长趋势',
+				            type: 'line',
+				            data: greenwayData
+				          }
+				        ]
+				      };
+
 				option && myChart.setOption(option);
+				window.addEventListener('resize', function() {
+					myChart.resize();
+				})
+			},
+			initecharts2(val) {
+				// 获取图表容器的 DOM 元素
+				const chartDom = this.$refs.shop2TJ
+				// 初始化 ECharts 实例
+				const myChart = echarts.init(chartDom);
+			
+				// 处理数据
+				      const processedData = [
+				        { name: '商铺分布占比', value: val.shopCount },
+				        { name: '场地分布占比', value: val.vendorCount },
+				        { name: '广告位分布占比', value: val.advertisingCount }
+				      ];
+			 const option = {
+			        tooltip: {
+			          trigger: 'axis',
+			          axisPointer: {
+			            type: 'shadow'
+			          },
+			          formatter: function (params) {
+			            return `${params[0].name}: ${params[0].value}%`;
+			          }
+			        },
+			        xAxis: {
+			          type: 'category',
+			          data: processedData.map(item => item.name)
+			        },
+			        yAxis: {
+			          type: 'value',
+			          name: '分布占比(%)',
+			          axisLabel: {
+			            formatter: '{value}%'
+			          }
+			        },
+			        series: [
+			          {
+			            name: '资源分布',
+			            type: 'bar',
+			            data: processedData.map(item => item.value),
+			            itemStyle: {
+			              color: function (params) {
+			                const colors = ['#3F7BC5', '#3F9B6A', '#F7C153'];
+			                return colors[params.dataIndex % colors.length];
+			              }
+			            }
+			          }
+			        ]
+			      };
+
+				// 使用刚指定的配置项和数据显示图表
+				option && myChart.setOption(option)
+				window.addEventListener('resize', function() {
+					myChart.resize();
+				})
+			},
+			initecharts3(val) {
+				// 获取图表容器的 DOM 元素
+				const chartDom = this.$refs.zyzbTJ
+				// 初始化 ECharts 实例
+				const myChart = echarts.init(chartDom);
+			
+			   // 统计不同发布状态的总数
+			      const statusCountMap = {
+			        0: 0,
+			        1: 0,
+			        2: 0,
+			        4: 0
+			      };
+			
+			      Object.values(val).forEach(resourceType => {
+			        resourceType.forEach(item => {
+			          statusCountMap[item.publishStatus] += item.statusCount;
+			        });
+			      });
+			
+			      const statusLabels = {
+			        0: '待发布',
+			        1: '待审核',
+			        2: '已发布',
+			        4: '已租赁'
+			      };
+			
+			      const chartData = Object.keys(statusCountMap).map(status => ({
+			        name: statusLabels[status],
+			        value: statusCountMap[status]
+			      }));
+			
+			      const option = {
+			        tooltip: {
+			          trigger: 'item',
+			          formatter: '{b}: {c}%'
+			        },
+			        legend: {
+			   orient: 'horizontal', // 横向展示
+			          left: 'center', // 居中显示
+			          data: chartData.map(item => item.name)
+			        },
+			        series: [
+			          {
+						  color: ['#F7C153', '#3F7BC5', '#3F9B6A','#904bf7'],
+			            name: '发布状态',
+			            type: 'pie',
+			            radius: '50%',
+			            data: chartData,
+			            label: {
+			              formatter: '{b}: {d}%'
+			            }
+			          }
+			        ]
+			      };
+				// 使用刚指定的配置项和数据显示图表
+				option && myChart.setOption(option)
+				window.addEventListener('resize', function() {
+					myChart.resize();
+				})
+			},
+			initecharts4(val) {
+				// 获取图表容器的 DOM 元素
+				const chartDom = this.$refs.zylhlTJ
+				// 初始化 ECharts 实例
+				const myChart = echarts.init(chartDom);
+			
+			 // 处理数据
+			      const processedData = [
+			        { name: '商铺', value: val.shop },
+			        { name: '场地', value: val.venue },
+			        { name: '广告位', value: val.adv }
+			      ];
+			
+			    const option = {
+					title: [
+					    {
+					      text: `已发布总数:${val.total}`,
+					      left: 'center',
+					      top: 'center',
+					      textStyle: {
+					        fontSize: 14,
+					        fontWeight: 'bold'
+					      }
+					    }
+					  ],
+			      tooltip: {
+			        trigger: 'item',
+			        formatter: function (params) {
+			          return `${params.name}: ${params.value}%`;
+			        }
+			      },
+			      legend: {
+			         orient: 'horizontal', // 横向展示
+			                left: 'center', // 居中显示
+			        data: processedData.map(item => item.name)
+			      },
+			      series: [
+			        {
+			    					 color: ['#F7C153', '#3F7BC5', '#3F9B6A'],
+			          name: '资源分布',
+			          type: 'pie',
+			    				   radius: ['40%', '60%'],
+			          avoidLabelOverlap: false,
+			          label: {
+			            show: true,
+			            position: 'outside',
+			            formatter: '{b}: {c}%'
+			          },
+			          labelLine: {
+			            show: true
+			          },
+			         data: processedData
+			        },
+			        
+			      ]
+			    };
+				// 使用刚指定的配置项和数据显示图表
+				option && myChart.setOption(option)
+				window.addEventListener('resize', function() {
+					myChart.resize();
+				})
 			},
 			async getAll() {
 				const res1 = await resourceQuantityGrowth({...this.pageindex})
-				console.log(res1.data)
+				const res2 = await resourceDistributionStatistics({...this.msgList})
+				const res3 = await resourceSituationProportion()
+				
+				 const res4 = await resourceUtilizationProportion()
+					
 				this.initecharts1(res1.data)
+				this.initecharts2(res2.data)
+				this.initecharts3(res3.data)
+				this.initecharts4(res4.data)
 			},
 			resetting() {
 				let today = new Date();
@@ -157,15 +395,7 @@
 					startTime: this.FormTime[0],
 					endTime: this.FormTime[1]
 				}
-				const res = await statistical(Msg)
-				this.charDam(res.data.seekingIntentionStatistics)
-				this.charDam2(res.data.seekingIntentionStatistics)
-				this.charDam6(res.data.contractTrend)
-				this.charDam7(res.data.basicQueryTrends)
-				let trends = [...res.data.shopTrend, ...res.data.venueTrend, ...res.data.advertisingTrend]
-
-				this.charDam1(trends)
-				this.charDam3(trends)
+				
 			},
 			async gitOut() {
@@ -195,7 +195,7 @@
         },
         tableData: [],
         total: 0,
-        onaction: '2',
+        onaction: '1',
         formInline: {},
       }
     },
@@ -93,7 +93,8 @@
       </div>
     </div>
-
+<iframe src="http://localhost:9528/investigation/wenjuanList?token=eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX25hbWUiOiIxODEwODE0Mzk0NSIsImp0aSI6Imt3Z1c4aU96NkVtTFZsNWg0UWdORF9aUFBRRSIsImNsaWVudF9pZCI6ImNiOGYxNDE2M2QxYzExZWM5NmU4MDBlMDRjMzEwMjUzIiwic2NvcGUiOlsiZ2V0X3VzZXJfaW5mbyJdfQ.T1zOJ9N78NJ01yW0C7Kv7QdgqDoLGt4EC4XoZ76jnocIGAgH30gFqI6o-dbQuSYeXGmgTfGfbqSINUksP91GEsEHpJK_knLrmpfHTMf7gtfzx8nIsRQLtf_GPZbUn3hoWnHpEuhH5c__3KEdVaruOZDxrevHqO7IfFRjp3giw19n0ymmDDmvtCidtrVM4XvyQEHTQ9iikWaAqW3W582MEh1GsIBh5S2fqBU_h6vc5q4OIFyQeNb-tEhcMb0gEY3rxbukdCKP3pgAZeZtFYpWn4MY8W4CZeRU9A6JcU8pFNj0Ar8zrveLrx0Oh3FRcNADsx0nUA4dXPvERnEMAZpDOQ" ref="iframe" frameborder="0" width="100%" height="700px" />
+<!-- <iframe v-if="show" src="https://zhgw-uat.028wlkj.com/cdwlMall/investigation/wenjuanList?token=eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX25hbWUiOiIxODEwODE0Mzk0NSIsImp0aSI6Imt3Z1c4aU96NkVtTFZsNWg0UWdORF9aUFBRRSIsImNsaWVudF9pZCI6ImNiOGYxNDE2M2QxYzExZWM5NmU4MDBlMDRjMzEwMjUzIiwic2NvcGUiOlsiZ2V0X3VzZXJfaW5mbyJdfQ.T1zOJ9N78NJ01yW0C7Kv7QdgqDoLGt4EC4XoZ76jnocIGAgH30gFqI6o-dbQuSYeXGmgTfGfbqSINUksP91GEsEHpJK_knLrmpfHTMf7gtfzx8nIsRQLtf_GPZbUn3hoWnHpEuhH5c__3KEdVaruOZDxrevHqO7IfFRjp3giw19n0ymmDDmvtCidtrVM4XvyQEHTQ9iikWaAqW3W582MEh1GsIBh5S2fqBU_h6vc5q4OIFyQeNb-tEhcMb0gEY3rxbukdCKP3pgAZeZtFYpWn4MY8W4CZeRU9A6JcU8pFNj0Ar8zrveLrx0Oh3FRcNADsx0nUA4dXPvERnEMAZpDOQ" ref="iframe" frameborder="0" width="100%" height="700px" /> -->
   </div>
 </template>
@@ -117,7 +118,7 @@ export default {
 	  pageSize:10,
       total: 0,
       flag: false,
-	  tableData:[]
+	  tableData:[],
     }
   },
   computed: {},
 <template>
   <div class="banner" :class="'terminal' + terminal">
     <swiper class="swiper" :circular="true" :indicator-dots="false" :autoplay="true" :style="{'height':bannerHeight + 'rpx'}" @change="swiperChange">
-      <swiper-item class="banner-item" v-for="(item,index) in bannerList" :key="index" :style="{backgroundImage: 'url('+item.imageUrl+')'}"  @click="jumpLink(item.jumpUrl)">
-        <div class="a-link" @click="jumpLink(item.jumpUrl)"><img class="img" :src="item.imageUrl" v-show="item.imageUrl" mode="widthFix"></div>
+      <swiper-item class="banner-item" v-for="(item,index) in bannerList" :key="index" :style="{backgroundImage: 'url('+item.imageUrl+')'}"  @click="jumpLink(item.jumpUrl,item.id)">
+        <div class="a-link" @click="jumpLink(item.jumpUrl,item.id)"><img class="img" :src="item.imageUrl" v-show="item.imageUrl" mode="widthFix"></div>
       </swiper-item>
     </swiper>
     <view class="swiper-dots" v-if="bannerList && bannerList.length > 1">
@@ -73,14 +73,32 @@
     //   }
     // },
     methods:{
-		jumpLink(urls){
+		getCurrentTime() {
+		     const now = new Date();
+		     const year = now.getFullYear();
+		     const month = ('0' + (now.getMonth() + 1)).slice(-2);
+		     const day = ('0' + now.getDate()).slice(-2);
+		     const hours = ('0' + now.getHours()).slice(-2);
+		     const minutes = ('0' + now.getMinutes()).slice(-2);
+		     const seconds = ('0' + now.getSeconds()).slice(-2);
+					
+		     return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+		   },
+		jumpLink(urls,ids){
+			let obj ={
+				adPlacementId:ids,
+				createdAt:this.getCurrentTime()
+			}
+			NET.request(API.bannerUpdete, obj, 'POST').then(res => {
+			})
 			if(urls){
 					window.open(urls, '_blank');
-			}else{
-				uni.navigateTo({
-					url: '/pages_category_page1/goodsModule/goodsList'
-				});
 			}
+			// else{
+			// 	uni.navigateTo({
+			// 		url: '/pages_category_page1/goodsModule/goodsList'
+			// 	});
+			// }
 			// uni.navigateBack({
@@ -10,6 +10,7 @@ const BASEURL = (process.env.NODE_ENV === &#39;production&#39;) ? DOMAIN_PREFIX : &#39;https
+
 export const api = {
   // 画布模块
   fileUpload: BASEURL + '/file/upload', // 文件上传
 // const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'
 // const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api'
-// const TIAOZHUAN = 'https://jy.scjysm.asia:18086/cdwlMall/'
-// const DOMAIN_PREFIXPING = 'http://128.10.249.26:9003' 
-// const DOMAIN_PREFIX = 'http://128.10.249.26:9007'
+const TIAOZHUAN = 'https://jy.scjysm.asia:18086/cdwlMall/'
+const DOMAIN_PREFIXPING = 'http://128.10.249.39:9003' 
+const DOMAIN_PREFIX = 'http://128.10.249.41:9007'
 // const DOMAIN_PREFIXPING = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'
 // const DOMAIN_PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api'
 // const TIAOZHUAN = 'https://zhgw-uat.028wlkj.com/cdwlMall/'
-const host = `${window.location.protocol}//${window.location.host}`
-const DOMAIN_PREFIXPING = `${host}/cdwlMall/meserver/admin-server`
-const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api` 
-const TIAOZHUAN = `${host}/cdwlMall/`
+// const host = `${window.location.protocol}//${window.location.host}`
+// const DOMAIN_PREFIXPING = `${host}/cdwlMall/meserver/admin-server`
+// const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api` 
+// const TIAOZHUAN = `${host}/cdwlMall/`
@@ -345,5 +345,7 @@ module.exports = {
 	   keSeverList:WX_API_BASE+ '/cereMessageCustomerServiceChat/user/list',
 	   // 用户查看商家消息
 	   keSeverList:WX_API_BASE+ '/cereMessageCustomerServiceChat/user/getDetails',
+	   //轮播修改次数
+	   bannerUpdete:WX_API_BASEPING+ '/cereAdvertisingVisitLog/create',
 }
@@ -6,7 +6,7 @@
 	  		<view class="title">{{tableData.title}}</view>
 			<view class="banner-info-top">
 				<view class="times">{{tableData.createTime}}</view>
-				<view><u-icon name="eye"></u-icon>{{tableData.viewsNumber}}人</view>
+				<view><u-icon name="eye"></u-icon>{{tableData.viewsNumber || 0}}人</view>
 			</view>
 	  		<view class="banner-info-item">
 	  			<u-parse :html="tableData.content"></u-parse>
@@ -153,7 +153,7 @@
 						<u-col span="6">
 							<view class="form-item">
 								<view class="label">负责人：</view>
-								<text>{{tableData.belongingParkTrail || '无'}}</text>
+								<text>{{tableData.head || '无'}}</text>
 							</view>
 						</u-col>
 						<u-col span="6">
@@ -165,7 +165,7 @@
 						<u-col span="6">
 							<view class="form-item">
 								<view class="label">联系方式：</view>
-								<text>{{tableData.belongingParkTrail || '无'}}</text>
+								<text>{{tableData.phoneNumber || '无'}}</text>
 							</view>
 						</u-col>
 						<u-col span="12">
@@ -194,8 +194,8 @@
 			</view>
 			<view class="banner-item position" v-if="tableData.shopName">
 				<view class="banner-item-title">位置信息</view>
-				<view style="margin-top: 16rpx;">
-					<map style="width: 100%; height: 200rpx;" longitude="104.06730651855469" latitude="30.65681556429287"  @click="gomapApp(latitude,longitude)">
+				<view style="margin-top: 16rpx;" @click="gomapApp(latitude,longitude)">
+					<map style="width: 100%; height: 200rpx;" longitude="104.06730651855469" latitude="30.65681556429287"  >
 						<view class="position-info" >
 							<u-image :showLoading="true" :src="$imgUrl('/location-icon.png')" width="20rpx"
 								height="20rpx"></u-image>
@@ -400,6 +400,7 @@
 				uni.openLocation({
 					latitude: latitude,
 					longitude: longitude,
+					name:this.tableData.detailedLocation,
 					success: function() {
 						console.log('success');
 					}
@@ -16,8 +16,8 @@
 			<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">
-						<image :src="item.imageUrl" mode="aspectFill"></image>
+					<swiper-item v-for="(item,index) in swiperList" :key="index" @click="jumpLink(item.jumpUrl,item.id)">
+						<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>
@@ -632,9 +632,9 @@
 				// 	url: `/pages/procedureDetail/procedureDetail?item=${items}`
 				// })
 				uni.setStorageSync('gghd', item);
-				let items = item
+				let items = JSON.stringify(item)
 				uni.navigateTo({
-					url: `/pages/procedure/procedure?item=${items.id}`
+					url: `/pages/procedure/procedure?item=${items}`
 				})
 			},
@@ -738,6 +738,32 @@
 					})
 				}
 			},
+			getCurrentTime() {
+			     const now = new Date();
+			     const year = now.getFullYear();
+			     const month = ('0' + (now.getMonth() + 1)).slice(-2);
+			     const day = ('0' + now.getDate()).slice(-2);
+			     const hours = ('0' + now.getHours()).slice(-2);
+			     const minutes = ('0' + now.getMinutes()).slice(-2);
+			     const seconds = ('0' + now.getSeconds()).slice(-2);
+						
+			     return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+			   },
+			jumpLink(urls,ids){
+				let obj ={
+					adPlacementId:ids,
+					createdAt:this.getCurrentTime()
+				}
+				this.$http.sendRequest('/cereAdvertisingVisitLog/create', 'POST', obj, 1).then(res => {
+				})
+				
+				if(urls){
+						uni.navigateTo({
+							url: `/pagesA/weball/web?url=${urls}`
+						})
+				}
+				
+			},
 		}
 	};
 </script>
@@ -5,7 +5,7 @@
 	  		<view class="title">{{tableData.title}}</view>
 			<view class="banner-info-top">
 				<view class="times">{{tableData.createdAt}}</view>
-				<view><u-icon name="eye"></u-icon>{{tableData.viewsNumber}}人</view>
+				<view><u-icon name="eye"></u-icon>{{tableData.viewsNumber || 0}}人</view>
 			</view>
 	  		<view class="banner-info-item">
 				<u-parse :html="tableData.content"></u-parse>
@@ -24,6 +24,9 @@
 		},
 		onLoad(option){
 	this.tableList = JSON.parse(decodeURIComponent(option.item))
+	  uni.setNavigationBarTitle({
+	                title: this.tableList.informationType
+	            });
 			// console.error()
 			// this.tableList = uni.getStorageSync('gghd')
 		},
@@ -310,8 +310,13 @@
 				// })
 			},
 			async submit() {
-
-				// console.log(this.recordList)
+				if(this.recordList.length == 0){
+					uni.showToast({
+						icon: 'none',
+						title: '请选择需要缴费的订单'
+					})
+					return
+				}
 				let c1 = []
 				for (let i = 0; i < this.recordList.length; i++) {
 					if (this.recordList[i].isshowxz) {
@@ -73,13 +73,15 @@
 					title: '',
 					pageNumber: 0,
 					pageSize: 10,
-					publishPort: '商家端'
+					publishPort: '商家端',
+					reviewStatus:'3'
 				},
 				tableData: [],
 				pagesize: {
 					pageNumber: 0,
 					pageSize: 10,
-					publishPort: '商家端'
+					publishPort: '商家端',
+					reviewStatus:'3'
 				},
 				imgurl:''
 			};
@@ -56,11 +56,17 @@
 			};
 		},
 		onLoad(option) {
+			if(option.type == '1'){
+				uni.setNavigationBarTitle({
+				                title: '申请续租'
+				            });
+			}
 			if (option.ids) {
 				this.ruleForm.contractId = Number(option.ids)
 			}
 			if (option.type) {
 				this.ruleForm.contractType = option.type
+			
 			}
 		},
 		onShow() {},