7.5(优化

2024-07-05 18:54:32 +08:00
parent 78355e782f
commit 260bd90b26
29 changed files with 290 additions and 221 deletions
--- a/api/system/config.js
+++ b/api/system/config.js
@@ -9,6 +9,27 @@ export function dutyCategory() {
 		'method': 'get'
 	})
 }
+
+/**
+ * 获取租卖灵活
+ */
+export function getRentingandbuyinginfo() {
+	return request({
+		'url': '/api/front/agreement/rentingandbuyinginfo',
+		'method': 'get'
+	})
+}
+
+/**
+ * 获取返佣规则
+ */
+export function getRebateactivitiesinfo() {
+	return request({
+		'url': '/api/front/agreement/rebateactivitiesinfo',
+		'method': 'get'
+	})
+}
+
 /**
 * 获取邀请规则
 */
@@ -301,10 +322,11 @@ export function balanceClosingApply(data) {
 }

 // 获取车商列表 /api/front/car/model/brand/model
-export function getCarDealerList() {
+export function getCarDealerList(params) {
 	return request({
 		'url': '/api/front/car/information/user/car/dealer/list',
 		'method': 'get',
+		params
 	})
 }
 //获取省级联动  /api/front/city/list/tree
--- a/components/count-down.vue
+++ b/components/count-down.vue
@@ -3,19 +3,19 @@
 		<u-count-down v-if="type==1" :time="stopTime" format="DD:HH:mm:ss" autoStart millisecond @change="onChange">
 			<view class="">
 				<text class="f-36 fw-5" style="color: #FF7527;margin-right: 16rpx;"
-					v-if="timeData.days>0">{{timeData.days+'天'}}</text>
+					v-if="timeData.days>3">{{timeData.days+'天'}}</text>
 				<view v-else class="f-36 fw-5" style="color: #FF7527">
-					{{timeData.hours>10?timeData.hours:'0'+timeData.hours}}:{{timeData.minutes>10?timeData.minutes:'0'+timeData.minutes}}:{{timeData.seconds>10?timeData.seconds:'0'+timeData.seconds }}
+					{{(timeData.days*24)+timeData.hours>10?(timeData.days*24)+timeData.hours:'0'+timeData.hours}}:{{timeData.minutes>10?timeData.minutes:'0'+timeData.minutes}}:{{timeData.seconds>10?timeData.seconds:'0'+timeData.seconds }}
 				</view>
 			</view>
 		</u-count-down>
 		<u-count-down v-if="type==2" :time="stopTime" format="DD:HH:mm:ss" autoStart millisecond @change="onChange">
 			<view class="swiper-item-cont-down flex align-center">
 				<text class="f-36 fw-5" style="color: #FF7527;margin-right: 16rpx;"
-					v-if="timeData.days>0">{{timeData.days+'天'}}</text>
+					v-if="timeData.days>3">{{timeData.days+'天'}}</text>
 				<view v-else class="serve-seckill-item flex align-center">
 					<view class="swiper-item-cont">
-						{{timeData.hours>10?timeData.hours:'0'+timeData.hours}}
+						{{(timeData.days*24)+timeData.hours>10?(timeData.days*24)+timeData.hours:'0'+timeData.hours}}
 					</view>
 					<text class="swiper-item-text">:</text>
 					<view class="swiper-item-cont">
--- a/config.js
+++ b/config.js
@@ -2,10 +2,10 @@

 module.exports = {
 	//正式
-	baseUrl: 'https://cms.diyouzhijia.com/car_app_api',
+	// baseUrl: 'https://cms.diyouzhijia.com/car_app_api',
 	TOKENNAME: 'Authori-zation',
 	//薛磊测试
-	// baseUrl: 'http://192.168.31.226:8081/car_app_api',
+	baseUrl: 'http://192.168.31.226:8081/car_app_api',
 	fileUploadUrl: 'https://cms.diyouzhijia.com/car_app_api/api/front/upload/image',
 	WebSocketUrl: 'ws://121.199.24.205:9107/lxk/websocket',
 	WebSocketOpen: false,
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -31,7 +31,7 @@
 				<image style="width: 725rpx;height: 261rpx;"
 					:src="`${config.aliyunOssUrl}/static/images/app/home/home_number.png`" mode=""></image>
 				<view class="home-income-top-left f-26 c666">
-					今日收益(元)
+					本月预估收益
 				</view>
 				<view class="home-income-top-right f-28">
 					我的收益
@@ -118,7 +118,6 @@
 </template>

 <script>
-	import {getTimeType} from "@/utils/index.js"
 	import {
 		categoryTypeList,
 		getReturnIncome
@@ -193,7 +192,7 @@
 				getPlazaList(obj).then(res => {
 					console.log('咨询', res.data.list);
 					res.data.list.forEach((item, index) => {
-						item.createTime=getTimeType(item.createTime,3)
+						item.createTime = item.createTime.split(' ')[0];
 						if (item.image != '') {
 							item.image = item.image.split(",")
 						} else {
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -380,12 +380,13 @@
 				this.dataList[trendsData.index] = trendsData
 				this.$store.dispatch('changeTrendsData', {})
 			}
+			
+			const trendsInfo = uni.getStorageSync('trends_info')
+			if(trendsInfo.id){
+				this.dataList.unshift(trendsInfo)
+				uni.setStorageSync('trends_info', {});
+			}
 		},
-		// onHide() {
-		// 	this.dataList.forEach((item, i) => {
-		// 		uni.createVideoContext('video1' + item.id, this).pause();
-		// 	});
-		// },
 		onShareAppMessage(res) {
 			if (res.from === 'button') {
 				// 来自页面内分享按钮
@@ -650,34 +651,20 @@
 						res.data.list.forEach(item => {
 							item.shareNum = formatNumber(item.shareNum)
 							item.replyNum = formatNumber(item.replyNum)
-							// if(item.strCreateTime){
-							// 	item.strCreateTime = formatDate(item.strCreateTime)
-							// }
-
 							if (item.image != '') {
 								item.image = item.image.split(",")
 							} else {
 								item.image = []
 							}
-
 							if (Number(item.wide) > Number(item.high)) {
 								let num = 686 / uni.$u.getPx(`${item.wide}rpx`)
 								item.wide = uni.$u.getPx(`${item.wide}rpx`) * num + 'rpx'
 								item.high = uni.$u.getPx(`${item.high}rpx`) * num + 'rpx'
 							} else {
-								// if (item.wide > 686) {
 								let num = 300 / uni.$u.getPx(`${item.wide}rpx`)
 								item.wide = uni.$u.getPx(`${item.wide}rpx`) * num + 'rpx'
 								item.high = uni.$u.getPx(`${item.high}rpx`) * num + 'rpx'
-								// } else {
-								// 	let num = 454 / uni.$u.getPx(`${item.wide}rpx`)
-								// 	item.wide = uni.$u.getPx(`${item.wide}rpx`) * num + 'rpx'
-								// 	item.high = uni.$u.getPx(`${item.high}rpx`) * num + 'rpx'
-								// 	item.wide = this.pxToRpx(item.wide) + 'rpx'
-								// 	item.high = this.pxToRpx(item.high) + 'rpx'
-								// }
 							}
-
 							const date1 = new Date();
 							const date2 = new Date(item.createTime);
 							// 计算相差的毫秒数
--- a/pages/index/post.vue
+++ b/pages/index/post.vue
@@ -55,6 +55,9 @@
 </template>

 <script>
+	import {
+		formatNumber
+	} from "@/utils/index.js"
 	import {
 		plazaNoteAdd
 	} from "@/api/discover/discover.js"
@@ -97,6 +100,31 @@
 					wide:this.videoInfo.width,
 					high:this.videoInfo.height,
 				}).then(res => {
+					console.log(res.data);
+					res.data.shareNum = formatNumber(res.data.shareNum)
+					res.data.replyNum = formatNumber(res.data.replyNum)
+					if (res.data.image != '') {
+						res.data.image = res.data.image.split(",")
+					} else {
+						res.data.image = []
+					}
+					if (Number(res.data.wide) > Number(res.data.high)) {
+						let num = 686 / uni.$u.getPx(`${res.data.wide}rpx`)
+						res.data.wide = uni.$u.getPx(`${res.data.wide}rpx`) * num + 'rpx'
+						res.data.high = uni.$u.getPx(`${res.data.high}rpx`) * num + 'rpx'
+					} else {
+						let num = 300 / uni.$u.getPx(`${res.data.wide}rpx`)
+						res.data.wide = uni.$u.getPx(`${res.data.wide}rpx`) * num + 'rpx'
+						res.data.high = uni.$u.getPx(`${res.data.high}rpx`) * num + 'rpx'
+					}
+					const date1 = new Date();
+					const date2 = new Date(res.data.createTime);
+					// 计算相差的毫秒数
+					const diffTime = Math.abs(date2 - date1);
+					// 将毫秒数转换为天数
+					const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24));
+					res.data.diffDays = diffDays
+					uni.setStorageSync('trends_info', res.data);
 					uni.setStorageSync('video_info', {});
 					uni.hideLoading();
 					uni.navigateBack()
--- a/pages/serve/coupons/cou_detail.vue
+++ b/pages/serve/coupons/cou_detail.vue
@@ -903,7 +903,7 @@ import { merchantInfo } from '../../../api/system/config';
 		background: #FFFFFF;
 		width: 100%;
 		// padding: 0 24rpx;
-		padding: 18rpx 24rpx 0;
+		padding: 18rpx 24rpx 24rpx;
 		position: fixed;
 		bottom: 0;
 		
--- a/pages/serve/coupons/cou_order.vue
+++ b/pages/serve/coupons/cou_order.vue
@@ -399,7 +399,7 @@
 		position: fixed;
 		bottom: 0;
 		width: 100%;
-		padding: 8rpx 24rpx 74rpx 24rpx;
+		padding: 8rpx 24rpx 24rpx 24rpx;
 		display: flex;
 		align-items: center;
 		justify-content: flex-end;
--- a/pages/showroom/carRental/index.vue
+++ b/pages/showroom/carRental/index.vue
@@ -785,7 +785,8 @@
 		}

 		.popup-car-list {
-			padding: 24rpx 0 24rpx 24rpx;
+			width: 750rpx;
+			padding: 24rpx 24rpx 24rpx 24rpx;
 			background-color: #fff;

 			.popup-car-title {
@@ -816,6 +817,7 @@
 			}

 			.popup-car-box {
+				width: 702rpx;
 				margin-top: 32rpx;
 				height: 155rpx;
 				overflow-x: auto;
--- a/pages/showroom/index.vue
+++ b/pages/showroom/index.vue
@@ -155,17 +155,20 @@
 						</text>
 					</view>
 				</view>
-				<view class="info1 flex flex-column justify-around" style="height: 98rpx;" v-else>
-					<view class="name">{{item.title}}</view>
-					<view v-if="form.type==0" class="price1 f-24 c666">
-						<text>月供：</text>
-						<text class="f-32 c111 price">{{item.monthTributePrice || 0 }}元 </text>
-						<text class="ml-2"> x {{item.monthTribute || 0 }}</text> 期
+				<view class="info flex flex-column justify-between" style="height: 150rpx;padding: 10rpx 0;" v-else>
+					<view class="name line-one">{{item.title}}</view>
+					<view class="f-26 c666 line-one">
+						{{item.subhead?item.subhead:'暂无副标题'}}
 					</view>
-					<view v-if="form.type==1" class="price1 f-24 c666">
+					<view v-if="form.type==0" class="f-24 c666">
+						<text>月供：</text>
+						<text class="f-32 c111 price">{{item.monthTributePrice}}元 /期</text>
+						<!-- <text class="ml-2"> x {{item.monthTribute}}</text> 期 -->
+					</view>
+					<view v-if="form.type==1" class="f-24 c666">
 						<text>月租：</text>
-						<text class="f-32 c111 price">{{item.monthRentPrice || 0 }}元 </text>
-						<text class="ml-2"> x {{item.monthRent || 0 }}</text> 期
+						<text class="f-32 c111 price">{{item.monthRentPrice}}元 /期</text>
+						<!-- <text class="ml-2"> x {{item.monthRent}}</text> 期 -->
 					</view>
 				</view>
 			</view>
--- a/pages/welfare/rightsInterests/confirm_order.vue
+++ b/pages/welfare/rightsInterests/confirm_order.vue
@@ -331,7 +331,7 @@
 		position: fixed;
 		left: 0;
 		bottom: 0;
-		padding: 8rpx 24rpx 94rpx 24rpx;
+		padding: 8rpx 24rpx 24rpx 24rpx;
 		background: #fff;

 		.order-data-payment {
--- a/pages/welfare/rightsInterests/rightsInterests_particulars.vue
+++ b/pages/welfare/rightsInterests/rightsInterests_particulars.vue
@@ -270,7 +270,7 @@
 		left: 0;
 		bottom: 0;
 		background: #fff;
-		padding: 18rpx 24rpx 68rpx 24rpx;
+		padding: 18rpx 24rpx 24rpx 24rpx;
 	}

 	.commodity-details {
--- a/pagesA/common/textview/index.vue
+++ b/pagesA/common/textview/index.vue
@@ -13,7 +13,9 @@
 		getAboutusinfo,
 		getClockRule,
 		getRentalRule,
-		getAgreementApplication
+		getAgreementApplication,
+		getRentingandbuyinginfo,
+		getRebateactivitiesinfo
 	} from '@/api/system/config.js'
 	import {
 		articleInfo
@@ -35,6 +37,8 @@
 			if (options.title == '规则详情') this.getClockRuleFn()
 			if (options.title == '租车协议') this.getRentalRuleFn()
 			if (options.title == '应用介绍') this.getAgreementApplicationFn()
+			if (options.title == '返佣规则') this.getRebateactivitiesinfoFn()
+				if (options.title == '租卖灵活') this.getRentingandbuyinginfoFn()
 			if (options.id) {
 				articleInfo(options.id).then(res => {
 					this.title = res.data.title
@@ -43,6 +47,18 @@
 			}
 		},
 		methods: {
+			//获取租卖灵活
+			getRentingandbuyinginfoFn(){
+				getRentingandbuyinginfo().then(res => {
+					this.content = JSON.parse(res.data).agreement
+				})
+			},
+			//获取返佣规则
+			getRebateactivitiesinfoFn(){
+				getRebateactivitiesinfo().then(res => {
+					this.content = JSON.parse(res.data).agreement
+				})
+			},
 			//获取应用介绍
 			getAgreementApplicationFn(){
 				getAgreementApplication().then(res => {
--- a/pagesA/every_day_card/every_day_card.vue
+++ b/pagesA/every_day_card/every_day_card.vue
@@ -162,7 +162,6 @@
 								</view>
 								<!-- 右边部分 -->
 								<view class="right">
-									<!-- <text v-if="item.length == 0" class="apply" @click="SignNow(items.id)">立即报名</text> -->
 									<text
 										v-if="item.clockStatus == 0 && Time>item.clockTime && items.clockInStartTime<newTime && item.dayTime == '今天'"
 										class="applyRed" @click="clockIn(items.id)">打卡</text>
@@ -394,6 +393,7 @@
 			},
 			// 判断时间是今天还是昨天
 			showText(timeString) {
+				console.log(timeString);
 				let date = new Date(timeString);
 				let today = new Date();
 				today.setHours(0);
@@ -402,6 +402,7 @@
 				// today 为今天凌晨的时间
 				let dayTime = 24 * 60 * 60 * 1000;
 				let delta = today - date; // 得到相差的时间 ms
+				console.log(delta);
 				if (delta > 0) {
 					if (delta <= dayTime) {
 						return '昨天';
--- a/pagesA/my_favorite/my_favorite.vue
+++ b/pagesA/my_favorite/my_favorite.vue
@@ -38,7 +38,7 @@
 						<view class="car-rental-cont">
 							<view class="car-rental-cont-name flex justify-between">
 								<view>{{item.carInformation.title}}</view>
-								<view class="flex justify-between align-center" style="height: 40rpx;">
+								<view class="flex justify-between align-center" style="height: 42rpx;">
 									<u--text :lines="1" size="14" :text="item.productName"></u--text>
 									<view v-show="actFlaf" class="cancel-collect"
 										@click.stop="cancelCollectFn(item.carInformation,1)">
@@ -88,13 +88,13 @@
 			</view>
 			<view v-else-if="actTab==3">
 				<view class="list-cont-dynamic" v-for="(item,index) in dataList" :key="index">
-					<view class="dynamic-condition" @click="toDetailPages(item)">
-						<view class="dynamic-condition-header f-jcsb f-a-i">
+					<view class="dynamic-condition" @click.stop="toDetailPages(item)">
+						<view class="dynamic-condition-header flex justify-between align-center">
 							<view class="f-a-i" @click.stop="linkPersonalCenter(item.authorId)">
 								<image :src="item.authorAvatar" mode="aspectFill"></image>
 								<view class="dynamic-condition-header-l">
 									<view>{{item.authorName}}</view>
-									<view>IP {{item.city||' '}} {{item.diffDays}}天前</view>
+									<view>{{item.city}} {{item.createTime|filtersTime}}</view>
 								</view>
 							</view>
 							<view v-if="actFlaf" class="cancel-collect" @click.stop="cancelCollectFn(item,3)">取消收藏
@@ -106,35 +106,23 @@
 						<view style="margin: 24rpx 0;width: 100%;">
 							<u--text :lines="2" bold size="14" :text="item.content"></u--text>
 						</view>
-						<video v-if="item.video" style="position: relative;" :src="item.video" initial-time="1s"
-							class="video-box">
-							<!-- poster="https://qicheoss.oss-cn-shanghai.aliyuncs.com/crmebimage/public/product/2024/01/24/c70ad2284470406280fb0e06200a63e2g4ht7zante.png" -->
-							</cover-view>
-						</video>
-						<view class="image-list-box" v-if="item.image">
-							<view v-show="item.image.length==1">
-								<view v-for="(itemImage,imageIndex) in item.image" :key="imageIndex">
-									<image class="image-one" :src="itemImage" mode="cover"
+						<view class="video-box" :style="{width:item.wide,height:item.high}" v-if="item.video"
+							@click.stop="actTabTypeVideoFn(item,index)">
+							<image class="video-box-bo" src="@/static/images/app/mine/bo_fang.png" mode=""></image>
+							<image :style="{width:item.wide}" class="video-box-bg" :src="item.cover"
+								mode="widthFix"></image>
+						</view>
+						<view v-if="item.image" class="image-list-box ">
+							<view v-if="item.image.length==1">
+								<view class="image-one" v-for="(itemImage,imageIndex) in item.image" :key="imageIndex">
+									<image :src="itemImage" mode="widthFix"
 										@click.stop="examineFn(item.image,imageIndex)"></image>
 								</view>
 							</view>
-							<view v-show="item.image.length==2" style="width: 100%;" class="flex justify-between">
-								<view v-for="(itemImage,imageIndex) in item.image" :key="imageIndex">
-									<image class="image-two" :src="itemImage" mode="cover"
-										@click.stop="examineFn(item.image,imageIndex)"></image>
-								</view>
-							</view>
-							<view v-show="item.image.length==4" style="width: 100%;"
-								class="flex justify-between flex-wrap">
-								<view v-for="(itemImage,imageIndex) in item.image" :key="imageIndex">
-									<image class="image-two" :src="itemImage" mode="cover"
-										@click.stop="examineFn(item.image,imageIndex)"></image>
-								</view>
-							</view>
-							<view v-show="item.image.length>2&&item.image.length!=4"
-								class="flex-wrap flex justify-between">
-								<view v-for="(itemImage,imageIndex) in item.image" :key="imageIndex">
-									<image class="image-three" :src="itemImage" mode="cover"
+							<view v-if="item.image.length>1" class="flex-wrap flex justify-between">
+								<view class="image-three" v-for="(itemImage,imageIndex) in item.image"
+									:key="imageIndex">
+									<image :src="itemImage" mode="aspectFill"
 										@click.stop="examineFn(item.image,imageIndex)"></image>
 								</view>
 								<view v-for="(a,b) in (item.image.length%3-1)<0?0:(item.image.length%3-1)">
@@ -145,37 +133,17 @@
 						<view class="faceback-box flex align-center justify-end">
 							<view class="flex align-center justify-end">
 								<view class="faceback-box-item flex align-center" @click.stop="shareFn(item)">
-									<!-- #ifdef APP -->
 									<image src="@/static/images/app/mine/share.png"></image>
-									<!-- #endif -->
-									<!-- #ifdef MP-WEIXIN -->
-									<image :src="`${config.aliyunOssUrl}/static/images/app/mine/share.png`">
-									</image>
-									<!-- #endif -->
-									{{item.shareNum}}
+									{{item.shareNum|filtersLikeNum}}
 								</view>
 								<view class="faceback-box-item flex align-center" @click.stop="toDetailPages(item)">
-									<!-- #ifdef APP -->
 									<image src="@/static/images/app/mine/information.png"></image>
-									<!-- #endif -->
-									<!-- #ifdef MP-WEIXIN -->
-									<image :src="`${config.aliyunOssUrl}/static/images/app/mine/information.png`">
-									</image>
-									<!-- #endif -->
-									{{item.replyNum}}
+									{{item.replyNum|filtersLikeNum}}
 								</view>
-								<view class="faceback-box-item flex align-center" @click="Like(item)">
-									<!-- #ifdef APP -->
+								<view class="faceback-box-item flex align-center" @click.stop="Like(item)">
 									<image v-show="!item.userIsLike" src="@/static/images/app/mine/like.png"></image>
 									<image v-show="item.userIsLike" src="@/static/images/app/icon/like.png"></image>
-									<!-- #endif -->
-									<!-- #ifdef MP-WEIXIN -->
-									<image v-show="!item.userIsLike"
-										:src="`${config.aliyunOssUrl}/static/images/app/mine/like.png`" />
-									<image v-show="item.userIsLike"
-										:src="`${config.aliyunOssUrl}/static/images/app/icon/like.png`"></image>
-									<!-- #endif -->
-									{{item.likeNum}}
+									{{item.likeNum|filtersLikeNum}}
 								</view>
 							</view>
 						</view>
@@ -200,15 +168,9 @@
 						</view>
 						<view style="margin: 24rpx 0;width: 100%;">
 							<view class="questions-and-answers-text rel">
-								<!-- #ifdef MP-WEIXIN -->
-								<image class="ads" style="width: 44rpx;height: 44rpx;top: 12rpx;left: 0;"
-									:src="`${config.aliyunOssUrl}/static/images/app/mine/ask.png`" mode=""></image>
-								<!-- #endif -->
-								<!-- #ifdef APP -->
 								<image class="ads mr-2" style="width: 44rpx;height: 44rpx;top: 12rpx;left: 0;"
 									src="@/static/images/app/mine/ask.png" mode="">
 								</image>
-								<!-- #endif -->
 								<text class="questions-and-answers-text-color" v-for="(topic,index) in item.topicList"
 									:key="index">
 									#{{topic.name}}#
@@ -217,29 +179,16 @@
 							</view>
 						</view>
 						<view class="image-list-box" v-if="item.image">
-							<view v-show="item.image.length==1">
-								<view v-for="(itemImage,imageIndex) in item.image" :key="imageIndex">
-									<image class="image-one" :src="itemImage" mode="cover"
+							<view v-if="item.image.length==1">
+								<view class="image-one" v-for="(itemImage,imageIndex) in item.image" :key="imageIndex">
+									<image :src="itemImage" mode="widthFix"
 										@click.stop="examineFn(item.image,imageIndex)"></image>
 								</view>
 							</view>
-							<view v-show="item.image.length==2" style="width: 100%;" class="flex justify-between">
-								<view v-for="(itemImage,imageIndex) in item.image" :key="imageIndex">
-									<image class="image-two" :src="itemImage" mode="cover"
-										@click.stop="examineFn(item.image,imageIndex)"></image>
-								</view>
-							</view>
-							<view v-show="item.image.length==4" style="width: 100%;"
-								class="flex justify-between flex-wrap">
-								<view v-for="(itemImage,imageIndex) in item.image" :key="imageIndex">
-									<image class="image-two" :src="itemImage" mode="cover"
-										@click.stop="examineFn(item.image,imageIndex)"></image>
-								</view>
-							</view>
-							<view v-show="item.image.length>2&&item.image.length!=4"
-								class="flex-wrap flex justify-between">
-								<view v-for="(itemImage,imageIndex) in item.image" :key="imageIndex">
-									<image class="image-three" :src="itemImage" mode="cover"
+							<view v-if="item.image.length>1" class="flex-wrap flex justify-between">
+								<view class="image-three" v-for="(itemImage,imageIndex) in item.image"
+									:key="imageIndex">
+									<image :src="itemImage" mode="aspectFill"
 										@click.stop="examineFn(item.image,imageIndex)"></image>
 								</view>
 								<view v-for="(a,b) in (item.image.length%3-1)<0?0:(item.image.length%3-1)">
@@ -248,7 +197,7 @@
 							</view>
 						</view>
 						<view class="f-jcsb f-a-i dynamic-condition-operate">
-							<view>IP {{item.city}} {{item.diffDays}}天前</view>
+							<view> {{item.city}} {{item.createTime|filtersTime}}</view>
 							<view class="f-jce ">
 								<view class="f-a-i">
 									<!-- #ifdef MP-WEIXIN -->
@@ -260,28 +209,27 @@
 									<image class="dynamic-condition-operate-image"
 										src="@/static/images/app/mine/information.png" mode=""></image>
 									<!-- #endif -->
-									<view class="dynamic-condition-operate-num">{{item.replyNum}}</view>
+									<view class="dynamic-condition-operate-num">{{item.replyNum|filtersLikeNum}}</view>
 								</view>
-								<view class="f-a-i">
+								<view class="f-a-i" @click.stop="Like(item)">
 									<!-- #ifdef MP-WEIXIN -->
-									<image v-if="index%2==0" class="dynamic-condition-operate-image"
+									<image v-if="item.userIsLike==0" class="dynamic-condition-operate-image"
 										:src="`${config.aliyunOssUrl}/static/images/app/mine/like.png`" mode=""></image>
 									<image v-else class="dynamic-condition-operate-image"
 										:src="`${config.aliyunOssUrl}/static/images/app/mine/like_act.png`" mode="">
 									</image>
 									<!-- #endif -->
 									<!-- #ifdef APP -->
-									<image v-if="index%2==0" class="dynamic-condition-operate-image"
+									<image v-if="item.userIsLike==0" class="dynamic-condition-operate-image"
 										src="@/static/images/app/mine/like.png" mode="">
 									</image>
 									<image v-else class="dynamic-condition-operate-image"
 										src="@/static/images/app/mine/like_act.png" mode=""></image>
 									<!-- #endif -->
-									<view class="dynamic-condition-operate-num">{{item.likeNum}}</view>
+									<view class="dynamic-condition-operate-num">{{item.likeNum|filtersLikeNum}}</view>
 								</view>
 							</view>
 						</view>
-
 					</view>
 				</view>
 			</view>
@@ -296,8 +244,7 @@
 								<u--text :lines="2" size="14" :text="item.title"></u--text>
 								<view class="flex justify-between align-center" style="height: 40rpx;">
 									<u--text :lines="1" size="14" :text="item.productName"></u--text>
-									<view v-show="actFlaf" class="cancel-collect"
-										@click.stop="cancelCollectFn(item,5)">
+									<view v-show="actFlaf" class="cancel-collect" @click.stop="cancelCollectFn(item,5)">
 										取消收藏
 									</view>
 								</view>
@@ -315,7 +262,7 @@
 					<view :class="['f-a-i','integral']">
 						<image :src="item.image" mode=""></image>
 						<view class="integral-cont">
-							<view class="flex justify-between align-center" style="height: 40rpx;">
+							<view class="flex justify-between align-center" style="height: 42rpx;">
 								<u--text :lines="1" size="14" :text="item.productName"></u--text>
 								<view v-show="actFlaf" class="cancel-collect" @click.stop="cancelCollectFn(item,6)">取消收藏
 								</view>
@@ -352,7 +299,7 @@
 					<view :class="['f-a-i','integral']" v-if="item.cardProduct">
 						<image :src="item.cardProduct.image" mode=""></image>
 						<view class="integral-cont">
-							<view class="flex justify-between align-center" style="height: 40rpx;">
+							<view class="flex justify-between align-center" style="height: 42rpx;">
 								<view class="f-28">
 									{{item.cardProduct.name?item.cardProduct.name:'--'}}
 								</view>
@@ -519,7 +466,7 @@
 						this.$refs.paging.complete(res.data.list);
 					})
 				} else {
-					obj.categoryId = this.actTab == 3 ? 1 : this.actTab == 4 ? 5 : 3
+					obj.categoryId = this.actTab == 3 ? 1 : this.actTab == 4 ? 4 : 3
 					await getCollectList(obj).then(res => {
 						// console.log(res,'111111111111111');
 						res.data.list.forEach(item => {
@@ -649,7 +596,7 @@
 		padding: 32rpx;
 		border-bottom: 1rpx solid #EDEDED;
 	}
-
+	
 	.questions-and-answers {
 		.questions-and-answers-text {
 			display: inline-block;
@@ -661,52 +608,52 @@
 			text-overflow: ellipsis;
 			font-size: 32rpx;
 			font-weight: 400;
-
+	
 			.questions-and-answers-text-color {
 				color: #13AFA8;
 			}
 		}
 	}
-
+	
 	.dynamic-condition-operate-image {
 		width: 36rpx;
 		height: 36rpx;
 		margin-right: 16rpx;
 	}
-
+	
 	.dynamic-condition-operate-num {
 		margin-right: 16rpx;
 	}
-
+	
 	.dynamic-condition-operate {
 		margin-top: 32rpx;
 	}
-
+	
 	.dynamic-condition-header {
-
+	
 		.dynamic-condition-header-r {
 			width: 32rpx;
 			height: 32rpx;
 			transform: rotate(90deg);
 		}
-
+	
 		.dynamic-condition-header-l {
 			margin-left: 16rpx;
 		}
-
+	
 		image {
 			width: 80rpx;
 			height: 80rpx;
 			border-radius: 50%;
 		}
 	}
-
+	
 	.car-rental {
 		width: 100%;
 		padding: 24rpx;
 		background-color: #fff;
 		border-radius: 8rpx 8rpx 8rpx 8rpx;
-
+	
 		.car-rental-cont {
 			height: 150rpx;
 			width: calc(100% - 218rpx);
@@ -714,61 +661,61 @@
 			display: flex;
 			flex-direction: column;
 			justify-content: space-around;
-
+	
 			.consult-name-time {
 				font-size: 26rpx;
 				font-weight: 400;
 				color: #666666;
 			}
-
+	
 			.car-rental-cont-name {
 				font-size: 32rpx;
 				font-weight: 400;
 				color: #111111;
 			}
-
+	
 			.car-rental-cont-auto-age {
 				font-size: 26rpx;
 				font-weight: 400;
 				color: #666666;
 			}
-
+	
 			.car-rental-cont-price {
 				font-size: 32rpx;
-				font-weight: bold;
+				font-weight: 500;
 				color: #111111;
 			}
-
+	
 			.car-rental-cont-total-payment {
 				font-size: 24rpx;
 				font-weight: 400;
 				color: #666666;
 			}
-
+	
 			.car-rental-cont-price-tit {
 				font-size: 24rpx;
 				font-weight: 400;
 				color: #666666;
 			}
 		}
-
+	
 		image {
 			width: 202rpx;
 			height: 150rpx;
 		}
 	}
-
+	
 	.list-cont {
 		width: calc(100% - 48rpx);
 		margin: 24rpx;
 	}
-
+	
 	.integral {
 		width: 100%;
 		padding: 24rpx;
 		background-color: #fff;
 		border-radius: 8rpx 8rpx 8rpx 8rpx;
-
+	
 		.integral-cont {
 			height: 144rpx;
 			width: calc(100% - 165rpx);
@@ -776,68 +723,69 @@
 			display: flex;
 			flex-direction: column;
 			justify-content: space-around;
-
+	
 			.integral-specification {
 				font-size: 26rpx;
 				font-weight: 400;
 				color: #666666;
 			}
-
+	
 			.integral-price {
 				font-size: 32rpx;
 				font-weight: bold;
 				color: #111111;
 			}
 		}
-
+	
 		image {
 			border-radius: 4rpx 4rpx 4rpx 4rpx;
 			width: 144rpx;
 			height: 144rpx;
 		}
 	}
-
+	
 	.administration {
 		margin-right: 180rpx;
 	}
-
+	
 	.tab-list {
 		background: #fff;
-
+	
 		view {
 			width: 59rpx;
 			padding-bottom: 12rpx;
+			border-radius: 4rpx;
 			border-bottom: 6rpx solid transparent;
+			margin-bottom: 16rpx;
 		}
-
+	
 		.act-tab {
-			border-bottom: 6rpx solid #000;
+			border-bottom: 6rpx solid #13AFA8;
 		}
-
 	}
-
+	
 	.checkmark-circle-class {
 		image {}
 	}
-
+	
 	.act-flaf {
 		width: calc(100% - 56rpx);
 		margin-left: 24rpx;
 	}
-
+	
 	.butt-bottom {
 		width: 100%;
 		padding: 8rpx 24rpx 60rpx 24rpx;
 		background: #fff;
 	}
-
+	
 	.circle {
 		width: 30rpx;
 		height: 30rpx;
 		border-radius: 50%;
 		border: 2rpx solid #D7D7D7;
 	}
-
+	
 	.cancel-collect {
 		width: 128rpx;
 		text-align: center;
@@ -848,44 +796,69 @@
 		color: #13AFA8;
 		border: 1rpx solid #13AFA8;
 	}
-
+	
 	.faceback-box {
-		padding: 34rpx 0;
-
+	
 		.faceback-box-item {
 			margin-left: 48rpx;
-
 		}
-
+	
 		image {
 			margin: 0 16rpx;
 			width: 36rpx;
 			height: 36rpx;
 		}
 	}
-
+	
+	.video-box {
+		border-radius: 8rpx;
+		margin-top: 24rpx;
+		position: relative;
+	
+		.video-box-bg {
+			position: absolute;
+			top: 0;
+			left: 0;
+		}
+	
+		.video-box-bo {
+			position: absolute;
+			top: calc(50% - 60rpx);
+			left: calc(50% - 60rpx);
+			width: 120rpx;
+			height: 120rpx;
+			border-radius: 50%;
+			z-index: 999;
+		}
+	}
 	.image-list-box {
 		width: 100%;
 		margin-top: 24rpx;
-
+	
 		.image-one {
-			width: 686rpx;
-			height: 686rpx;
+			width: 454rpx;
+			max-height: 666rpx;
+			overflow: hidden;
+			// height: 686rpx;
 			border-radius: 8rpx;
+			margin-bottom: 24rpx;
 		}
-
+	
 		.image-two {
-			width: 330rpx;
-			height: 330rpx;
+			width: 338rpx;
+			height: 338rpx;
 			box-shadow: 0rpx 0rpx 4rpx 0rpx rgba(0, 0, 0, 0.09);
 			border-radius: 8rpx;
+			margin-bottom: 16rpx;
+			// margin-top: 10rpx;
 		}
-
+	
 		.image-three {
-			width: 218rpx;
-			height: 218rpx;
+			width: 222rpx;
+			height: 222rpx;
 			box-shadow: 0rpx 0rpx 4rpx 0rpx rgba(0, 0, 0, 0.09);
 			border-radius: 8rpx;
+			margin-bottom: 16rpx;
 		}
 	}
 </style>
--- a/pagesA/rebate/rebate.vue
+++ b/pagesA/rebate/rebate.vue
@@ -1,7 +1,11 @@
 <template>
-
+<z-paging use-page-scroll :fixed="false"  ref="paging" v-model="dataList"
+				@query="queryList">
 	<view class="rebate">
 		<view class="rebate-header-bj">
+			<view class="activity flex justify-end">
+				<view class="activity-rules" @click="nacActivityFn">活动规则</view>
+			</view>
 			<view class="rebate-header">
 				<image class="rebate-header-tit"
 					:src="`${config.aliyunOssUrl}/static/images/app/home/home_rebate_tit.png`" mode=""></image>
@@ -33,8 +37,6 @@
 			<u-swiper keyName="image" :list="brannerList" height="240rpx"></u-swiper>
 		</view>
 		<view class="rebate-shop">
-			<z-paging use-page-scroll :fixed="false" style="maxHeight: 1150rpx;" ref="paging" v-model="dataList"
-				@query="queryList">
 				<view class="rebate-shop-hea flex justify-between align-center">
 					<view class="f-36 fw-5 c333">返佣平台</view>
 					<view class="rebate-shop-address flex align-center justify-center f-26 c333"
@@ -49,14 +51,8 @@
 					<image class="rebate-shop-list-image" :src="item.image" mode="aspectFill"></image>
 					<view class="rebate-shop-list-name">
 						<view class="f-30 c333 fw-6">{{item.name}}</view>
-						<view class="f-28 c333 fw-5" style="margin-top: 10rpx;">{{item.maxMoney}}
-							<text v-if="item.way==0" class="f-28 red ml-3">
-								{{item.ratio*100}}%</text>
-							<text v-else class="f-28 red ml-3">
-								{{item.eachMoney}}元/单
-							</text>
-
-
+						<view class="f-26 c333 fw-5" style="margin-top: 10rpx;">
+						{{item.maxMoney}}
 						</view>
 					</view>
 					<view class="rebate-shop-list-status f-30">
@@ -66,7 +62,7 @@
 						<view class="rebate-status4" v-else @click="joinRebateFn(item)">加入返佣</view>
 					</view>
 				</view>
-			</z-paging>
+			
 		</view>
 		<view class="rebate-header">
 			<image class="rebate-header-tit" :src="`${config.aliyunOssUrl}/static/images/app/home/home_rebate_tit2.png`"
@@ -89,7 +85,7 @@
 				</view>
 			</view>
 		</view>
-		<image class="bottom-img" :src="welfareImage" mode="aspectFill"></image>
+		<image class="bottom-img" :src="welfareImage" mode="widthFix"></image>
 		<!-- <view class="rebate-header mt-2">
 			<image class="rebate-header-tit" :src="`${config.aliyunOssUrl}/static/images/app/home/home_rebate_tit3.png`"
 				mode=""></image>
@@ -107,6 +103,7 @@
 		</view> -->
 		<view style="padding-bottom: 40rpx;padding-top: 20rpx;"></view>
 	</view>
+	</z-paging>
 </template>

 <script>
@@ -139,6 +136,12 @@
 			}
 		},
 		methods: {
+			//查看活动规则
+			nacActivityFn() {
+				uni.navigateTo({
+					url: '/pagesA/common/textview/index?title=返佣规则'
+				})
+			},
 			//加入返佣
 			joinRebateFn(item) {
 				console.log(item);
@@ -188,10 +191,20 @@
 	page {
 		background: #f5f5f5;
 	}
-
+	.activity-rules {
+		width: 132rpx;
+		height: 40rpx;
+		border-radius: 20rpx 0 0 20rpx;
+		font-size: 24rpx;
+		background: #F68400;
+		color: #ffffff;
+		text-align: center;
+		line-height: 40rpx;
+		margin-bottom: 8rpx;
+	}
 	.rebate-shop {
 		width: 690rpx;
-		margin: 20rpx 0rpx 20rpx 30rpx;
+		margin: 0rpx 0rpx 20rpx 30rpx;
 		background: #ffffff;
 		border-radius: 16rpx;

@@ -264,17 +277,16 @@

 	.swiper-box {
 		padding: 30rpx;
-		margin-top: 21rpx;
 	}

 	.rebate {
 		.rebate-header-bj {
 			width: 750rpx;
-			height: 585rpx;
+			// height: 585rpx;
 			background-image: url('https://qicheoss.oss-cn-shanghai.aliyuncs.com/static/images/app/home/home_rebate_bj.png');
-			background-size: 100%;
+			 background-size: cover;
+			background-repeat: no-repeat;
 			padding-top: 330rpx;
-
 		}

 		.rebate-header {
@@ -313,7 +325,7 @@
 	}
 	.bottom-img {
 		width: 690rpx;
-		height: 468rpx;
+		// height: 100%;
 		border-radius: 20rpx;
 		// height: ;
 		margin-left: 30rpx;
--- a/pagesA/showroom/carList/carList.vue
+++ b/pagesA/showroom/carList/carList.vue
@@ -162,6 +162,11 @@
 				</view>
 				<view class="popup-select-box">
 					<view class="store-list flex-wrap align-center">
+						<view class="store-list-item flex-center rel" @click="actcarDealerFn(0)">
+							全部
+							<image v-if="carDealerId==-1" class="checked abs"
+								:src="`${config.aliyunOssUrl}/static/images/app/icon/checked_1.png`" mode=""></image>
+						</view>
 						<view class="store-list-item flex-center rel" v-for="(item,index) in carUserList"
 							@click="actcarDealerFn(item)">
 							{{item.name}}
@@ -278,18 +283,32 @@
 					}
 				})
 			})
-			//获取车商列表
-			getCarDealerList().then(res => {
-				this.carUserList = res.data
-			})
 			//获取当前位置
-			getLocationFn()
+			// getLocationFn()
+			//获取车商列表
+			this.getCarDealerListFn()
 		},
 		methods: {
+			//获取车商列表
+			getCarDealerListFn() {
+				let obj = {
+					city: this.selectCity,
+				}
+				console.log('车商列表',obj);
+				getCarDealerList(obj).then(res => {
+					console.log(res.data);
+					this.carUserList = res.data
+				})
+			},
 			//选择商家
 			actcarDealerFn(item) {
-				this.carDealerId = item.id
-				this.carDealerName = item.name
+				if (item) {
+					this.carDealerId = item.id
+					this.carDealerName = item.name
+				} else {
+					this.carDealerId = -1
+					this.carDealerName = '商家'
+				}
 			},
 			//确认选择商家
 			affirmFn() {
@@ -350,7 +369,8 @@
 					priceType: this.priceId,
 					monthRent: this.tenancyId,
 					carAge: this.carAgeId,
-					carDealerId: this.carDealerId
+					carDealerId: this.carDealerId,
+					city:this.selectCity
 				}
 				if (this.type == 2) {
 					getInformationList(obj).then(res => {
@@ -534,7 +554,6 @@
 		.popup-btn {
 			padding: 16rpx 24rpx;
 			width: 750rpx;
-			height: 166rpx;
 		}
 	}

--- a/pagesA/showroom/confirmOrder/confirmOrder.vue
+++ b/pagesA/showroom/confirmOrder/confirmOrder.vue
@@ -41,7 +41,7 @@
 					</view>
 				</view>
 				<view class="content-text">
-					押金说明: 一定要在签合同或者交付定金的时候确认，以免自己的权益得不到保障。
+					定金说明: 定金支付后在正式提车前随时可退，在您签署正式租车合同之后定金会转为车辆押金。
 				</view>
 			</view>
 			<view class="" v-if="orderType == 2">
@@ -115,7 +115,7 @@
 					<view class="">
 						购车方案
 					</view>
-					<view class="flex align-center f-24 c999">
+					<view class="flex align-center f-24 c999" @click="navTextViewFn">
 						租买灵活方案
 						<u-icon name="arrow-right" size="12" color="#999"></u-icon>
 					</view>
@@ -202,8 +202,8 @@
 							class="c999">{{formProductData.interior.name}}/￥{{formProductData.interior.addPrice}}</text>
 					</view>
 					<view class="flex align-center justify-between mb-16">
-						<text class="c444">保险</text>
-						<text class="c999">不包含</text>
+						<text class="c444">上牌及营运证办理</text>
+						<text class="c999">包含</text>
 					</view>
 					<view class="aount flex align-center justify-between">
 						<text class="c444">购车总价</text>
@@ -474,6 +474,12 @@
 		},
 		mounted() {},
 		methods: {
+			//查看租卖灵活
+			navTextViewFn(){
+				uni.navigateTo({
+					url:'/pagesA/common/textview/index?title=租卖灵活'
+				})
+			},
 			//选择租期
 			leaseTermConFn(e) {
 				this.monthRentName = e.value[0].name
--- a/static/images/tabbar/index.png
+++ b/static/images/tabbar/index.png
--- a/static/images/tabbar/index_active.png
+++ b/static/images/tabbar/index_active.png
--- a/static/images/tabbar/mine.png
+++ b/static/images/tabbar/mine.png
--- a/static/images/tabbar/mine_active.png
+++ b/static/images/tabbar/mine_active.png
--- a/static/images/tabbar/serve.png
+++ b/static/images/tabbar/serve.png
--- a/static/images/tabbar/serve_active.png
+++ b/static/images/tabbar/serve_active.png
--- a/static/images/tabbar/showroom.png
+++ b/static/images/tabbar/showroom.png
--- a/static/images/tabbar/showroom_active.png
+++ b/static/images/tabbar/showroom_active.png
--- a/static/images/tabbar/welfare.png
+++ b/static/images/tabbar/welfare.png
--- a/static/images/tabbar/welfare_active.png
+++ b/static/images/tabbar/welfare_active.png
--- a/utils/index.js
+++ b/utils/index.js
@@ -44,6 +44,7 @@ export function getLocationFn() {
 					longitude: res.longitude
 				},
 				success: res1 => {
+					console.log(res1.result.address_component.city);
 					uni.setStorageSync('current_city',res1.result.address_component.city)
 					store.dispatch('SelectCity', res1.result.address_component.city)
 				},