小程序连接接口

common/api.js

@@ -2,7 +2,7 @@ import config from '../config.js';
 const getDomain = (uri, method, type) => {
 	let serverUrl = config.serverUrl;
 	if (type && type == 'file') return serverUrl + `/files` + uri;
-	else return serverUrl + '/system/' + uri;
+	else return serverUrl + '/usedCar/api/' + uri;
 };
 
 export const requestBase = async (uri, method = 'GET', data, type) => {

config.js

@@ -8,8 +8,8 @@ if (system.uniPlatform == 'mp-weixin') {
 	let envV = wx_min.miniProgram.envVersion;
 }
 export default {
-	serverFile: 'http://localhost:8080',
-	serverUrl: 'http://localhost:8080',
+	serverFile: 'http://localhost:9800',
+	serverUrl: 'http://localhost:9800',
 	wx_projectkey: wx_projectkey,
 	wx_miniProgram: wx_min.miniProgram,
 	system: system,

pages/home/index.vue

@@ -13,9 +13,11 @@
 								</image>
 							</view>
 							<view class="right">
-								<view class="name textOver">{{item.name||'暂无'}}</view>
+								<view class="name textOver">{{item.series||'暂无'}} {{item.year||'暂无'}}
+									{{item.style||'暂无'}}
+								</view>
 								<view class="money">
-									<text>{{item.money||'0'}}</text>
+									<text>{{item.total_money||'0'}}</text>
 									<text>万</text>
 								</view>
 							</view>
@@ -33,104 +35,16 @@
 <script setup lang="ts">
 	import { getCurrentInstance, ref } from 'vue';
 	//该依赖已内置不需要单独安装
-	import { onLoad } from "@dcloudio/uni-app";
+	import { onShow, onPullDownRefresh } from "@dcloudio/uni-app";
 	// 请求接口
 	const $api = getCurrentInstance()?.appContext.config.globalProperties.$api;
 	const $config = getCurrentInstance()?.appContext.config.globalProperties.$config;
 	// 基本信息
 	const config = ref({ logoUrl: [] });
+	// 查询
+	const searchInfo = ref({});
 	// 列表
-	const list = ref([
-		{
-			id: '1',
-			file: [{ url: 'https://cdn.uviewui.com/uview/album/1.jpg' }],
-			name: '夏朗 2013款 1.8TSI 标配型 欧IV',
-			year: '2014年 ',
-			city: '丹东',
-			kilometer: '8万公里',
-			money: '7.80'
-		},
-		{
-			id: '1',
-			file: [{ url: 'https://cdn.uviewui.com/uview/album/2.jpg' }],
-			name: '捷豹XEL 2020款 2.0T 200PS S进取优雅版',
-			year: '2014年 ',
-			city: '丹东',
-			kilometer: '8万公里',
-			money: '7.80'
-		},
-		{
-			id: '1',
-			file: [{ url: 'https://cdn.uviewui.com/uview/album/3.jpg' }],
-			name: '夏朗 2013款 1.8TSI 标配型 欧IV',
-			year: '2014年 ',
-			city: '丹东',
-			kilometer: '8万公里',
-			money: '7.80'
-		},
-		{
-			id: '1',
-			file: [{ url: 'https://cdn.uviewui.com/uview/album/4.jpg' }],
-			name: '夏朗 2013款 1.8TSI 标配型 欧IV',
-			year: '2014年 ',
-			city: '丹东',
-			kilometer: '8万公里',
-			money: '7.80'
-		},
-		{
-			id: '1',
-			file: [{ url: 'https://cdn.uviewui.com/uview/album/5.jpg' }],
-			name: '夏朗 2013款 1.8TSI 标配型 欧IV',
-			year: '2014年 ',
-			city: '丹东',
-			kilometer: '8万公里',
-			money: '7.80'
-		},
-		{
-			id: '1',
-			file: [{ url: 'https://cdn.uviewui.com/uview/album/6.jpg' }],
-			name: '夏朗 2013款 1.8TSI 标配型 欧IV',
-			year: '2014年 ',
-			city: '丹东',
-			kilometer: '8万公里',
-			money: '7.80'
-		},
-		{
-			id: '1',
-			file: [{ url: 'https://cdn.uviewui.com/uview/album/7.jpg' }],
-			name: '夏朗 2013款 1.8TSI 标配型 欧IV',
-			year: '2014年 ',
-			city: '丹东',
-			kilometer: '8万公里',
-			money: '7.80'
-		},
-		{
-			id: '1',
-			file: [{ url: 'https://cdn.uviewui.com/uview/album/8.jpg' }],
-			name: '夏朗 2013款 1.8TSI 标配型 欧IV',
-			year: '2014年 ',
-			city: '丹东',
-			kilometer: '8万公里',
-			money: '7.80'
-		},
-		{
-			id: '1',
-			file: [{ url: 'https://cdn.uviewui.com/uview/album/9.jpg' }],
-			name: '夏朗 2013款 1.8TSI 标配型 欧IV',
-			year: '2014年 ',
-			city: '丹东',
-			kilometer: '8万公里',
-			money: '7.80'
-		},
-		{
-			id: '1',
-			file: [{ url: 'https://cdn.uviewui.com/uview/album/10.jpg' }],
-			name: '夏朗 2013款 1.8TSI 标配型 欧IV',
-			year: '2014年 ',
-			city: '丹东',
-			kilometer: '8万公里',
-			money: '7.80'
-		}]);
+	const list = ref([]);
 	const total = ref(0);
 	const skip = ref(0);
 	const limit = ref(6);
@@ -138,9 +52,15 @@
 	// 数据是否触底
 	const is_bottom = ref(false);
 	const scrollTop = ref(0);
-	onLoad(async () => {
+	onShow(async () => {
 		await searchConfig();
+		await clearPage();
+		await search();
+	})
+	onPullDownRefresh(async () => {
+		await clearPage();
 		await search();
+		uni.stopPullDownRefresh();
 	})
 	// config信息
 	const searchConfig = async () => {
@@ -148,7 +68,24 @@
 	};
 	// 查询
 	const search = async () => {
-
+		const info = {
+			skip: skip.value,
+			limit: limit.value,
+			status: '0'
+		}
+		const res = await $api('car', 'GET', {
+			...info,
+			...searchInfo.value
+		});
+		if (res.errcode === 0) {
+			list.value = list.value.concat(res.data)
+			total.value = res.total
+		} else {
+			uni.showToast({
+				title: res.errmsg || '',
+				icon: 'error',
+			});
+		}
 	};
 	const toCommon = (item) => {
 		console.log(item);
@@ -217,7 +154,7 @@
 						display: flex;
 						flex-direction: column;
 						justify-content: space-between;
-						margin: 0 0 0 2vw;
+						padding: 0 2vw;
 
 						.name {
 							font-size: var(--font14Size);

pages/select/index.vue

@@ -39,14 +39,15 @@
 								</image>
 							</view>
 							<view class="right">
-								<view class="name textOver">{{item.name||'暂无'}}</view>
+								<view class="name textOver">{{item.series||'暂无'}} {{item.year||'暂无'}}款
+									{{item.style||'暂无'}}</view>
 								<view class="other">
-									<text v-if="item.year">{{item.year||'暂无'}}| </text>
-									<text v-if="item.kilometer">{{item.kilometer||'暂无'}} | </text>
-									<text v-if="item.city">{{item.city||'暂无'}}</text>
+									<text v-if="item.year">{{item.year||'暂无'}}年 | </text>
+									<text v-if="item.mileage">{{item.mileage||'暂无'}}公里 | </text>
+									<text v-if="item.place">{{item.place||'暂无'}}</text>
 								</view>
 								<view class="money">
-									<text>{{item.money||'0'}}</text>
+									<text>{{item.total_money||'0'}}</text>
 									<text>万</text>
 								</view>
 							</view>
@@ -64,104 +65,16 @@
 <script setup lang="ts">
 	import { getCurrentInstance, ref } from 'vue';
 	//该依赖已内置不需要单独安装
-	import { onLoad } from "@dcloudio/uni-app";
+	import { onShow, onPullDownRefresh } from "@dcloudio/uni-app";
 	// 请求接口
 	const $api = getCurrentInstance()?.appContext.config.globalProperties.$api;
 	const $config = getCurrentInstance()?.appContext.config.globalProperties.$config;
 	// 基本信息
 	const config = ref({ logoUrl: [] });
+	// 查询
+	const searchInfo = ref({});
 	// 列表
-	const list = ref([
-		{
-			id: '1',
-			file: [{ url: 'https://cdn.uviewui.com/uview/album/1.jpg' }],
-			name: '夏朗 2013款 1.8TSI 标配型 欧IV',
-			year: '2014年 ',
-			city: '丹东',
-			kilometer: '8万公里',
-			money: '7.80'
-		},
-		{
-			id: '1',
-			file: [{ url: 'https://cdn.uviewui.com/uview/album/2.jpg' }],
-			name: '捷豹XEL 2020款 2.0T 200PS S进取优雅版',
-			year: '2014年 ',
-			city: '丹东',
-			kilometer: '8万公里',
-			money: '7.80'
-		},
-		{
-			id: '1',
-			file: [{ url: 'https://cdn.uviewui.com/uview/album/3.jpg' }],
-			name: '夏朗 2013款 1.8TSI 标配型 欧IV',
-			year: '2014年 ',
-			city: '丹东',
-			kilometer: '8万公里',
-			money: '7.80'
-		},
-		{
-			id: '1',
-			file: [{ url: 'https://cdn.uviewui.com/uview/album/4.jpg' }],
-			name: '夏朗 2013款 1.8TSI 标配型 欧IV',
-			year: '2014年 ',
-			city: '丹东',
-			kilometer: '8万公里',
-			money: '7.80'
-		},
-		{
-			id: '1',
-			file: [{ url: 'https://cdn.uviewui.com/uview/album/5.jpg' }],
-			name: '夏朗 2013款 1.8TSI 标配型 欧IV',
-			year: '2014年 ',
-			city: '丹东',
-			kilometer: '8万公里',
-			money: '7.80'
-		},
-		{
-			id: '1',
-			file: [{ url: 'https://cdn.uviewui.com/uview/album/6.jpg' }],
-			name: '夏朗 2013款 1.8TSI 标配型 欧IV',
-			year: '2014年 ',
-			city: '丹东',
-			kilometer: '8万公里',
-			money: '7.80'
-		},
-		{
-			id: '1',
-			file: [{ url: 'https://cdn.uviewui.com/uview/album/7.jpg' }],
-			name: '夏朗 2013款 1.8TSI 标配型 欧IV',
-			year: '2014年 ',
-			city: '丹东',
-			kilometer: '8万公里',
-			money: '7.80'
-		},
-		{
-			id: '1',
-			file: [{ url: 'https://cdn.uviewui.com/uview/album/8.jpg' }],
-			name: '夏朗 2013款 1.8TSI 标配型 欧IV',
-			year: '2014年 ',
-			city: '丹东',
-			kilometer: '8万公里',
-			money: '7.80'
-		},
-		{
-			id: '1',
-			file: [{ url: 'https://cdn.uviewui.com/uview/album/9.jpg' }],
-			name: '夏朗 2013款 1.8TSI 标配型 欧IV',
-			year: '2014年 ',
-			city: '丹东',
-			kilometer: '8万公里',
-			money: '7.80'
-		},
-		{
-			id: '1',
-			file: [{ url: 'https://cdn.uviewui.com/uview/album/10.jpg' }],
-			name: '夏朗 2013款 1.8TSI 标配型 欧IV',
-			year: '2014年 ',
-			city: '丹东',
-			kilometer: '8万公里',
-			money: '7.80'
-		}]);
+	const list = ref([]);
 	const total = ref(0);
 	const skip = ref(0);
 	const limit = ref(6);
@@ -210,17 +123,40 @@
 			type: '4',
 		}
 	])
-	onLoad(async () => {
+	onShow(async () => {
 		await searchConfig();
+		await clearPage();
 		await search();
 	})
+	onPullDownRefresh(async () => {
+		await clearPage();
+		await search();
+		uni.stopPullDownRefresh();
+	})
 	// config信息
 	const searchConfig = async () => {
 		config.value = uni.getStorageSync('config');
 	};
 	// 查询
 	const search = async () => {
-
+		const info = {
+			skip: skip.value,
+			limit: limit.value,
+			status: '0'
+		}
+		const res = await $api('car', 'GET', {
+			...info,
+			...searchInfo.value
+		});
+		if (res.errcode === 0) {
+			list.value = list.value.concat(res.data)
+			total.value = res.total
+		} else {
+			uni.showToast({
+				title: res.errmsg || '',
+				icon: 'error',
+			});
+		}
 	};
 	const toRoute = (item) => {
 		uni.navigateTo({

pagesHome/car/index.vue

@@ -4,11 +4,11 @@
 			<scroll-view scroll-y="true" class="scroll-view">
 				<view class="list-scroll-view">
 					<view class="top">
-						<u-swiper :list="info.url" height="300px" keyName="url" @change="e => currentNum = e.current"
+						<u-swiper :list="info.file" height="300px" keyName="url" @change="e => currentNum = e.current"
 							:autoplay="false" indicatorStyle="right: 20px" radius="0">
 							<template #indicator>
 								<view class="indicator-num">
-									<text class="indicator-num__text">{{ currentNum + 1 }}/{{ info.url.length }}</text>
+									<text class="indicator-num__text">{{ currentNum + 1 }}/{{ info.file?.length }}</text>
 								</view>
 							</template>
 						</u-swiper>
@@ -17,7 +17,7 @@
 						<view class="one">
 							<view class="left">
 								<view class="money">
-									<text>{{info.money||'0'}}</text>
+									<text>{{info.real_pay||'0'}}</text>
 									<text>万</text>
 								</view>
 								<view class="price">
@@ -31,10 +31,12 @@
 							</view>
 						</view>
 						<view class="two">
-							<view class="two_1">{{info.name||'暂无名称'}}</view>
+							<view class="two_1 textOver">{{info.series||'暂无'}} {{info.year||'暂无'}}
+								{{info.style||'暂无'}}
+							</view>
 							<view class="two_2">
 								<view class="other">
-									<span>{{info.type}}</span>&nbsp;
+									<span>{{info.series}}</span>&nbsp;
 									<u-icon name="arrow-right" size="12"></u-icon>
 								</view>
 								<view class="other">
@@ -46,7 +48,7 @@
 							<view class="two_3">
 								<view class="left">
 									<text>分期购车</text>
-									<text>首付{{info.payment}}万开回家</text>
+									<text>首付{{info.first_pay}}万开回家</text>
 								</view>
 								<view class="right">
 									<u-icon name="arrow-right" size="16"></u-icon>
@@ -80,7 +82,7 @@
 							<view class="four_1">
 								<view class="left">
 									<image class="image"
-										:src="shop.file&&shop.file.length>0?shop.file[0].url:'https://cdn.uviewui.com/uview/album/1.jpg'">
+										:src="shop.logo&&shop.logo?.length>0?shop.logo[0].url:'https://cdn.uviewui.com/uview/album/1.jpg'">
 									</image>
 								</view>
 								<view class="right">
@@ -105,25 +107,25 @@
 							<view class="five_1">
 								<view class="five_1">
 									<image class="image"
-										:src="info.file&&info.file.length>0?info.file[0].url:'https://cdn.uviewui.com/uview/album/1.jpg'">
+										:src="info.file&&info.file?.length>0?info.file[0].url:'https://cdn.uviewui.com/uview/album/1.jpg'">
 									</image>
 								</view>
 								<view class="five_2">
 									<image class="image"
-										:src="info.file&&info.file.length>1?info.file[1].url:'https://cdn.uviewui.com/uview/album/5.jpg'">
+										:src="info.file&&info.file?.length>1?info.file[1].url:'https://cdn.uviewui.com/uview/album/5.jpg'">
 									</image>
 									<image class="image"
-										:src="info.file&&info.file.length>2?info.file[2].url:'https://cdn.uviewui.com/uview/album/2.jpg'">
+										:src="info.file&&info.file?.length>2?info.file[2].url:'https://cdn.uviewui.com/uview/album/2.jpg'">
 									</image>
 								</view>
 							</view>
 							<view class="text">中控内饰</view>
 							<view class="five_2">
 								<image class="image"
-									:src="info.file&&info.file.length>3?info.file[3].url:'https://cdn.uviewui.com/uview/album/3.jpg'">
+									:src="info.file&&info.file?.length>3?info.file[3].url:'https://cdn.uviewui.com/uview/album/3.jpg'">
 								</image>
 								<image class="image"
-									:src="info.file&&info.file.length>4?info.file[4].url:'https://cdn.uviewui.com/uview/album/4.jpg'">
+									:src="info.file&&info.file?.length>4?info.file[4].url:'https://cdn.uviewui.com/uview/album/4.jpg'">
 								</image>
 							</view>
 							<view class="five_3">
@@ -141,14 +143,16 @@
 											</image>
 										</view>
 										<view class="right">
-											<view class="name textOver">{{item.name||'暂无'}}</view>
+											<view class="name textOver">{{item.series||'暂无'}} {{item.year||'暂无'}}款
+												{{item.style||'暂无'}}
+											</view>
 											<view class="other">
-												<text v-if="item.year">{{item.year||'暂无'}}| </text>
-												<text v-if="item.kilometer">{{item.kilometer||'暂无'}} | </text>
-												<text v-if="item.city">{{item.city||'暂无'}}</text>
+												<text v-if="item.year">{{item.year||'暂无'}}年 | </text>
+												<text v-if="item.mileage">{{item.mileage||'暂无'}}公里 | </text>
+												<text v-if="item.place">{{item.place||'暂无'}}</text>
 											</view>
 											<view class="money">
-												<text>{{item.money||'0'}}</text>
+												<text>{{item.total_money||'0'}}</text>
 												<text>万</text>
 											</view>
 										</view>
@@ -202,115 +206,68 @@
 	// 详情
 	const info = ref({ url: [{ url: 'https://cdn.uviewui.com/uview/album/1.jpg' }, { url: 'https://cdn.uviewui.com/uview/album/2.jpg' }, { url: 'https://cdn.uviewui.com/uview/album/3.jpg' }, { url: 'https://cdn.uviewui.com/uview/album/4.jpg' }, { url: 'https://cdn.uviewui.com/uview/album/5.jpg' }], payment: '2.7', rankNum: '11', rank: '全国紧凑型SUV销售榜', type: '夏朗', name: '夏朗 2013款 1.8TSI 标配型 欧IV', money: '7.80', price: '29.06' });
 	// 店铺
-	const shop = ref({ name: '淘车车长春店', num: '109' });
+	const shop = ref({});
 	// 列表
-	const list = ref([
-		{
-			id: '1',
-			file: [{ url: 'https://cdn.uviewui.com/uview/album/1.jpg' }],
-			name: '夏朗 2013款 1.8TSI 标配型 欧IV',
-			year: '2014年 ',
-			city: '丹东',
-			kilometer: '8万公里',
-			money: '7.80'
-		},
-		{
-			id: '1',
-			file: [{ url: 'https://cdn.uviewui.com/uview/album/2.jpg' }],
-			name: '捷豹XEL 2020款 2.0T 200PS S进取优雅版',
-			year: '2014年 ',
-			city: '丹东',
-			kilometer: '8万公里',
-			money: '7.80'
-		},
-		{
-			id: '1',
-			file: [{ url: 'https://cdn.uviewui.com/uview/album/3.jpg' }],
-			name: '夏朗 2013款 1.8TSI 标配型 欧IV',
-			year: '2014年 ',
-			city: '丹东',
-			kilometer: '8万公里',
-			money: '7.80'
-		},
-		{
-			id: '1',
-			file: [{ url: 'https://cdn.uviewui.com/uview/album/4.jpg' }],
-			name: '夏朗 2013款 1.8TSI 标配型 欧IV',
-			year: '2014年 ',
-			city: '丹东',
-			kilometer: '8万公里',
-			money: '7.80'
-		},
-		{
-			id: '1',
-			file: [{ url: 'https://cdn.uviewui.com/uview/album/5.jpg' }],
-			name: '夏朗 2013款 1.8TSI 标配型 欧IV',
-			year: '2014年 ',
-			city: '丹东',
-			kilometer: '8万公里',
-			money: '7.80'
-		},
-		{
-			id: '1',
-			file: [{ url: 'https://cdn.uviewui.com/uview/album/6.jpg' }],
-			name: '夏朗 2013款 1.8TSI 标配型 欧IV',
-			year: '2014年 ',
-			city: '丹东',
-			kilometer: '8万公里',
-			money: '7.80'
-		},
-		{
-			id: '1',
-			file: [{ url: 'https://cdn.uviewui.com/uview/album/7.jpg' }],
-			name: '夏朗 2013款 1.8TSI 标配型 欧IV',
-			year: '2014年 ',
-			city: '丹东',
-			kilometer: '8万公里',
-			money: '7.80'
-		},
-		{
-			id: '1',
-			file: [{ url: 'https://cdn.uviewui.com/uview/album/8.jpg' }],
-			name: '夏朗 2013款 1.8TSI 标配型 欧IV',
-			year: '2014年 ',
-			city: '丹东',
-			kilometer: '8万公里',
-			money: '7.80'
-		},
-		{
-			id: '1',
-			file: [{ url: 'https://cdn.uviewui.com/uview/album/9.jpg' }],
-			name: '夏朗 2013款 1.8TSI 标配型 欧IV',
-			year: '2014年 ',
-			city: '丹东',
-			kilometer: '8万公里',
-			money: '7.80'
-		},
-		{
-			id: '1',
-			file: [{ url: 'https://cdn.uviewui.com/uview/album/10.jpg' }],
-			name: '夏朗 2013款 1.8TSI 标配型 欧IV',
-			year: '2014年 ',
-			city: '丹东',
-			kilometer: '8万公里',
-			money: '7.80'
-		}]);
+	const list = ref([]);
 	onLoad(async (options) => {
 		id.value = options && options.id
 		await searchConfig();
-		await searchOther();
 		await search();
 	})
 	// config信息
 	const searchConfig = async () => {
 		config.value = uni.getStorageSync('config');
 	};
+	// 查询
+	const search = async () => {
+		if (id.value) {
+			const res = await $api(`car/${id.value}`, 'GET', {});
+			if (res.errcode === 0) {
+				info.value = res.data
+				await searchShop(res.data?.shop)
+				await searchOther();
+			} else {
+				uni.showToast({
+					title: res.errmsg || '',
+					icon: 'error',
+				});
+			}
+		}
+	};
+	// 店铺信息
+	const searchShop = async (e) => {
+		if (!e) return
+		const res = await $api(`shop/${e}`, 'GET', {});
+		if (res.errcode === 0) {
+			shop.value = res.data
+		} else {
+			uni.showToast({
+				title: res.errmsg || '',
+				icon: 'error',
+			});
+		}
+	};
 	// 查询其他信息
 	const searchOther = async () => {
-		let res;
+		const info = {
+			skip: 0,
+			limit: 20,
+			status: '0',
+			shop: shop.value._id
+		}
+		const res = await $api('car', 'GET', {
+			...info,
+		});
+		if (res.errcode === 0) {
+			list.value = res.data
+			shop.value.num = res.total
+		} else {
+			uni.showToast({
+				title: res.errmsg || '',
+				icon: 'error',
+			});
+		}
 	};
-	// 查询
-	const search = async () => { };
 	// 获取手机号
 	const PhoneNumber = (e) => {
 		console.log(e);
@@ -612,7 +569,7 @@
 									display: flex;
 									flex-direction: column;
 									justify-content: space-between;
-									margin: 0 0 0 2vw;
+									padding: 0 2vw;
 
 									.name {
 										font-size: var(--font14Size);

pagesHome/condition/index.vue

@@ -78,14 +78,12 @@
 	// 滑动菜单的值
 	const scrollTop = ref(0); //tab标题的滚动条位置
 	const current = ref(0); // 预设当前项的值
-	const menuHeight = ref(0); //左边菜单的高度
-	const menuItemHeight = ref(0); // 左边菜单item的高度
 	const itemId = ref(''); // 栏目右边scroll-view用于滚动的id
 	const tabbar = ref(classifyData);
 	const scrollRightTop = ref(0); // 右边栏目scroll-view的滚动条高度
 	const brandInfo = ref({}); // 车牌信息
 	const cityInfo = ref({}); // 城市信息
-	const searchList = ref([]); // 城市信息
+	const searchList = ref([]); // 选中的搜索信息
 	onLoad(async (options) => {
 		id.value = options && options.id
 		await searchOther();
@@ -183,12 +181,12 @@
 			}
 
 			.u-tab-view {
-				width: 200rpx;
+				width: 100px;
 				background: var(--f6Color);
 			}
 
 			.u-tab-item {
-				height: 110rpx;
+				height: 55px;
 				background: var(--f6Color);
 				box-sizing: border-box;
 				display: flex;
@@ -218,7 +216,7 @@
 			}
 
 			.class-item {
-				margin-bottom: 30rpx;
+				margin-bottom: 15px;
 				background-color: var(--mainColor);
 				padding: 8px;
 				border-radius: 4px;

pagesHome/rank/index.vue

@@ -275,7 +275,6 @@
 					display: flex;
 					flex-direction: column;
 					justify-content: space-between;
-					margin: 0 0 0 2vw;
 					width: 100%;
 
 					.name {

pagesHome/search/index.vue

@@ -522,7 +522,6 @@
 						display: flex;
 						flex-direction: column;
 						justify-content: space-between;
-						margin: 0 0 0 2vw;
 						width: 100%;
 
 						.name {

pagesHome/shop/index.vue

@@ -14,13 +14,13 @@
 							<view class="other">
 								<view class="left">
 									<view class="left_1">
-										<span>在售 {{shop.sale||'暂无'}} 辆</span>
+										<span>在售 {{shop.sale||'0'}} 辆</span>
 										|
-										<span>已售 {{shop.sold||'暂无'}} 辆</span>
+										<span>已售 {{shop.sold||'0'}} 辆</span>
 									</view>
 									<view class="left_2">
 										<span>{{shop.status=='0'?'营业中':'休息中'}}</span>&nbsp;
-										<span>{{shop.start_time||'暂无'}}-{{shop.end_time||'暂无'}}</span>
+										<span>{{shop.start_time||'8:00'}}-{{shop.end_time||'17:00'}}</span>
 									</view>
 									<view class="left_3">
 										<u-icon name="file-text" size="16"></u-icon>
@@ -118,14 +118,16 @@
 												</image>
 											</view>
 											<view class="right">
-												<view class="name textOver">{{item.name||'暂无'}}</view>
+												<view class="name textOver">{{item.series||'暂无'}} {{item.year||'暂无'}}款
+													{{item.style||'暂无'}}
+												</view>
 												<view class="other">
-													<text v-if="item.year">{{item.year||'暂无'}}| </text>
-													<text v-if="item.kilometer">{{item.kilometer||'暂无'}} | </text>
-													<text v-if="item.city">{{item.city||'暂无'}}</text>
+													<text v-if="item.year">{{item.year||'暂无'}}年 | </text>
+													<text v-if="item.mileage">{{item.mileage||'暂无'}}公里 | </text>
+													<text v-if="item.place">{{item.place||'暂无'}}</text>
 												</view>
 												<view class="money">
-													<text>{{item.money||'0'}}</text>
+													<text>{{item.total_money||'0'}}</text>
 													<text>万</text>
 												</view>
 											</view>
@@ -162,7 +164,7 @@
 	const id = ref('');
 	const imageURL = ref('https://cdn.uviewui.com/uview/album/1.jpg');
 	// 店铺
-	const shop = ref({ name: '淘车车长春店', num: '109', sale: '9', sold: '69', address: '吉林省长春市宽城区凯旋二手车市场排房J04', status: '0', file: [], start_time: '08:00', end_time: '17:00' });
+	const shop = ref({});
 	const type = ref('0');
 	const is_show = ref(false);
 	//查询
@@ -220,97 +222,7 @@
 		}
 	]);
 	// 列表
-	const list = ref([
-		{
-			id: '1',
-			file: [{ url: 'https://cdn.uviewui.com/uview/album/1.jpg' }],
-			name: '夏朗 2013款 1.8TSI 标配型 欧IV',
-			year: '2014年 ',
-			city: '丹东',
-			kilometer: '8万公里',
-			money: '7.80'
-		},
-		{
-			id: '1',
-			file: [{ url: 'https://cdn.uviewui.com/uview/album/2.jpg' }],
-			name: '捷豹XEL 2020款 2.0T 200PS S进取优雅版',
-			year: '2014年 ',
-			city: '丹东',
-			kilometer: '8万公里',
-			money: '7.80'
-		},
-		{
-			id: '1',
-			file: [{ url: 'https://cdn.uviewui.com/uview/album/3.jpg' }],
-			name: '夏朗 2013款 1.8TSI 标配型 欧IV',
-			year: '2014年 ',
-			city: '丹东',
-			kilometer: '8万公里',
-			money: '7.80'
-		},
-		{
-			id: '1',
-			file: [{ url: 'https://cdn.uviewui.com/uview/album/4.jpg' }],
-			name: '夏朗 2013款 1.8TSI 标配型 欧IV',
-			year: '2014年 ',
-			city: '丹东',
-			kilometer: '8万公里',
-			money: '7.80'
-		},
-		{
-			id: '1',
-			file: [{ url: 'https://cdn.uviewui.com/uview/album/5.jpg' }],
-			name: '夏朗 2013款 1.8TSI 标配型 欧IV',
-			year: '2014年 ',
-			city: '丹东',
-			kilometer: '8万公里',
-			money: '7.80'
-		},
-		{
-			id: '1',
-			file: [{ url: 'https://cdn.uviewui.com/uview/album/6.jpg' }],
-			name: '夏朗 2013款 1.8TSI 标配型 欧IV',
-			year: '2014年 ',
-			city: '丹东',
-			kilometer: '8万公里',
-			money: '7.80'
-		},
-		{
-			id: '1',
-			file: [{ url: 'https://cdn.uviewui.com/uview/album/7.jpg' }],
-			name: '夏朗 2013款 1.8TSI 标配型 欧IV',
-			year: '2014年 ',
-			city: '丹东',
-			kilometer: '8万公里',
-			money: '7.80'
-		},
-		{
-			id: '1',
-			file: [{ url: 'https://cdn.uviewui.com/uview/album/8.jpg' }],
-			name: '夏朗 2013款 1.8TSI 标配型 欧IV',
-			year: '2014年 ',
-			city: '丹东',
-			kilometer: '8万公里',
-			money: '7.80'
-		},
-		{
-			id: '1',
-			file: [{ url: 'https://cdn.uviewui.com/uview/album/9.jpg' }],
-			name: '夏朗 2013款 1.8TSI 标配型 欧IV',
-			year: '2014年 ',
-			city: '丹东',
-			kilometer: '8万公里',
-			money: '7.80'
-		},
-		{
-			id: '1',
-			file: [{ url: 'https://cdn.uviewui.com/uview/album/10.jpg' }],
-			name: '夏朗 2013款 1.8TSI 标配型 欧IV',
-			year: '2014年 ',
-			city: '丹东',
-			kilometer: '8万公里',
-			money: '7.80'
-		}]);
+	const list = ref([]);
 	const total = ref(0);
 	const skip = ref(0);
 	const limit = ref(6);
@@ -324,24 +236,62 @@
 			title: options && options.name || '车行详情'
 		});
 		await searchConfig();
-		await searchOther();
 		await search();
+		await searchOther();
 	})
 	onShow(() => {
 		uni.$on('toRoute', function (data) {
 			brandInfo.value = data
 		})
 	})
-	// 查询其他信息
-	const searchOther = async () => {
-		let res;
-	};
 	// config信息
 	const searchConfig = async () => {
 		config.value = uni.getStorageSync('config');
 	};
 	// 查询
-	const search = async () => { };
+	const search = async () => {
+		if (id.value) {
+			const res = await $api(`shop/${id.value}`, 'GET', {});
+			if (res.errcode === 0) {
+				shop.value = res.data
+			} else {
+				uni.showToast({
+					title: res.errmsg || '',
+					icon: 'error',
+				});
+			}
+		}
+	};
+	// 查询其他信息
+	const searchOther = async () => {
+		let res;
+		const info = {
+			skip: skip.value,
+			limit: limit.value,
+			status: '0',
+			shop: id.value
+		}
+		res = await $api('car', 'GET', {
+			...info,
+		});
+		if (res.errcode === 0) {
+			list.value = list.value.concat(res.data)
+			total.value = res.total
+			shop.value.sale = res.total
+		} else {
+			uni.showToast({
+				title: res.errmsg || '',
+				icon: 'error',
+			});
+		}
+		res = await $api('car', 'GET', {
+			skip: 0,
+			limit: 1,
+			status: '1',
+			shop: id.value
+		});
+		if (res.errcode === 0) shop.value.sold = res.total
+	};
 	// 查询
 	const toSearch = (value) => {
 		// 判断点击的是那个筛选
@@ -669,7 +619,7 @@
 								display: flex;
 								flex-direction: column;
 								justify-content: space-between;
-								margin: 0 0 0 2vw;
+								padding: 0 2vw;
 
 								.name {
 									font-size: var(--font14Size);

pagesMy/collect/index.vue

@@ -256,7 +256,6 @@
 					display: flex;
 					flex-direction: column;
 					justify-content: space-between;
-					margin: 0 0 0 2vw;
 					width: 100%;
 
 					.name {

unpackage/dist/dev/mp-weixin/common/api.js

@@ -6,7 +6,7 @@ const getDomain = (uri, method, type) => {
   if (type && type == "file")
     return serverUrl + `/files` + uri;
   else
-    return serverUrl + "/system/" + uri;
+    return serverUrl + "/usedCar/api/" + uri;
 };
 const requestBase = async (uri, method = "GET", data, type) => {
   let baseUrl = getDomain(uri, method, type);

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -10101,6 +10101,7 @@ const createHook = (lifecycle) => (hook, target = getCurrentInstance()) => {
 };
 const onShow = /* @__PURE__ */ createHook(ON_SHOW);
 const onLoad = /* @__PURE__ */ createHook(ON_LOAD);
+const onPullDownRefresh = /* @__PURE__ */ createHook(ON_PULL_DOWN_REFRESH);
 //! moment.js
 //! version : 2.30.1
 //! authors : Tim Wood, Iskren Chernev, Moment.js contributors
@@ -16777,6 +16778,7 @@ exports.mpMixin = mpMixin;
 exports.n = n;
 exports.o = o;
 exports.onLoad = onLoad;
+exports.onPullDownRefresh = onPullDownRefresh;
 exports.onShow = onShow;
 exports.openType = openType;
 exports.p = p;

unpackage/dist/dev/mp-weixin/config.js

@@ -7,8 +7,8 @@ if (system.uniPlatform == "mp-weixin") {
   wx_min.miniProgram.envVersion;
 }
 const config = {
-  serverFile: "http://localhost:8080",
-  serverUrl: "http://localhost:8080",
+  serverFile: "http://localhost:9800",
+  serverUrl: "http://localhost:9800",
   wx_projectkey,
   wx_miniProgram: wx_min.miniProgram,
   system,

unpackage/dist/dev/mp-weixin/pages/home/index.js

@@ -12,115 +12,49 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
   __name: "index",
   setup(__props) {
     var _a, _b;
-    (_a = common_vendor.getCurrentInstance()) == null ? void 0 : _a.appContext.config.globalProperties.$api;
+    const $api = (_a = common_vendor.getCurrentInstance()) == null ? void 0 : _a.appContext.config.globalProperties.$api;
     (_b = common_vendor.getCurrentInstance()) == null ? void 0 : _b.appContext.config.globalProperties.$config;
     const config = common_vendor.ref({ logoUrl: [] });
-    const list = common_vendor.ref([
-      {
-        id: "1",
-        file: [{ url: "https://cdn.uviewui.com/uview/album/1.jpg" }],
-        name: "夏朗 2013款 1.8TSI 标配型 欧IV",
-        year: "2014年 ",
-        city: "丹东",
-        kilometer: "8万公里",
-        money: "7.80"
-      },
-      {
-        id: "1",
-        file: [{ url: "https://cdn.uviewui.com/uview/album/2.jpg" }],
-        name: "捷豹XEL 2020款 2.0T 200PS S进取优雅版",
-        year: "2014年 ",
-        city: "丹东",
-        kilometer: "8万公里",
-        money: "7.80"
-      },
-      {
-        id: "1",
-        file: [{ url: "https://cdn.uviewui.com/uview/album/3.jpg" }],
-        name: "夏朗 2013款 1.8TSI 标配型 欧IV",
-        year: "2014年 ",
-        city: "丹东",
-        kilometer: "8万公里",
-        money: "7.80"
-      },
-      {
-        id: "1",
-        file: [{ url: "https://cdn.uviewui.com/uview/album/4.jpg" }],
-        name: "夏朗 2013款 1.8TSI 标配型 欧IV",
-        year: "2014年 ",
-        city: "丹东",
-        kilometer: "8万公里",
-        money: "7.80"
-      },
-      {
-        id: "1",
-        file: [{ url: "https://cdn.uviewui.com/uview/album/5.jpg" }],
-        name: "夏朗 2013款 1.8TSI 标配型 欧IV",
-        year: "2014年 ",
-        city: "丹东",
-        kilometer: "8万公里",
-        money: "7.80"
-      },
-      {
-        id: "1",
-        file: [{ url: "https://cdn.uviewui.com/uview/album/6.jpg" }],
-        name: "夏朗 2013款 1.8TSI 标配型 欧IV",
-        year: "2014年 ",
-        city: "丹东",
-        kilometer: "8万公里",
-        money: "7.80"
-      },
-      {
-        id: "1",
-        file: [{ url: "https://cdn.uviewui.com/uview/album/7.jpg" }],
-        name: "夏朗 2013款 1.8TSI 标配型 欧IV",
-        year: "2014年 ",
-        city: "丹东",
-        kilometer: "8万公里",
-        money: "7.80"
-      },
-      {
-        id: "1",
-        file: [{ url: "https://cdn.uviewui.com/uview/album/8.jpg" }],
-        name: "夏朗 2013款 1.8TSI 标配型 欧IV",
-        year: "2014年 ",
-        city: "丹东",
-        kilometer: "8万公里",
-        money: "7.80"
-      },
-      {
-        id: "1",
-        file: [{ url: "https://cdn.uviewui.com/uview/album/9.jpg" }],
-        name: "夏朗 2013款 1.8TSI 标配型 欧IV",
-        year: "2014年 ",
-        city: "丹东",
-        kilometer: "8万公里",
-        money: "7.80"
-      },
-      {
-        id: "1",
-        file: [{ url: "https://cdn.uviewui.com/uview/album/10.jpg" }],
-        name: "夏朗 2013款 1.8TSI 标配型 欧IV",
-        year: "2014年 ",
-        city: "丹东",
-        kilometer: "8万公里",
-        money: "7.80"
-      }
-    ]);
+    const searchInfo = common_vendor.ref({});
+    const list = common_vendor.ref([]);
     const total = common_vendor.ref(0);
     const skip = common_vendor.ref(0);
     const limit = common_vendor.ref(6);
     const page = common_vendor.ref(0);
     const is_bottom = common_vendor.ref(false);
     common_vendor.ref(0);
-    common_vendor.onLoad(async () => {
+    common_vendor.onShow(async () => {
       await searchConfig();
+      await clearPage();
+      await search();
+    });
+    common_vendor.onPullDownRefresh(async () => {
+      await clearPage();
       await search();
+      common_vendor.index.stopPullDownRefresh();
     });
     const searchConfig = async () => {
       config.value = common_vendor.index.getStorageSync("config");
     };
     const search = async () => {
+      const info = {
+        skip: skip.value,
+        limit: limit.value,
+        status: "0"
+      };
+      const res = await $api("car", "GET", {
+        ...info,
+        ...searchInfo.value
+      });
+      if (res.errcode === 0) {
+        list.value = list.value.concat(res.data);
+        total.value = res.total;
+      } else {
+        common_vendor.index.showToast({
+          title: res.errmsg || "",
+          icon: "error"
+        });
+      }
     };
     const toView = (item) => {
       common_vendor.index.navigateTo({
@@ -140,6 +74,12 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       } else
         is_bottom.value = true;
     };
+    const clearPage = () => {
+      list.value = [];
+      skip.value = 0;
+      limit.value = 6;
+      page.value = 0;
+    };
     return (_ctx, _cache) => {
       return common_vendor.e({
         a: common_vendor.p({
@@ -150,10 +90,12 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
         b: common_vendor.f(list.value, (item, index, i0) => {
           return {
             a: item.file && item.file.length > 0 ? item.file[0].url : "",
-            b: common_vendor.t(item.name || "暂无"),
-            c: common_vendor.t(item.money || "0"),
-            d: index,
-            e: common_vendor.o(($event) => toView(item), index)
+            b: common_vendor.t(item.series || "暂无"),
+            c: common_vendor.t(item.year || "暂无"),
+            d: common_vendor.t(item.style || "暂无"),
+            e: common_vendor.t(item.total_money || "0"),
+            f: index,
+            g: common_vendor.o(($event) => toView(item), index)
           };
         }),
         c: is_bottom.value

unpackage/dist/dev/mp-weixin/pages/home/index.wxss

@@ -32,7 +32,7 @@
   display: flex;
   flex-direction: column;
   justify-content: space-between;
-  margin: 0 0 0 2vw;
+  padding: 0 2vw;
 }
 .content .bottom .list .list_1 .right .name.data-v-4978fed5 {
   font-size: var(--font14Size);

unpackage/dist/dev/mp-weixin/pages/select/index.js

@@ -12,101 +12,11 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
   __name: "index",
   setup(__props) {
     var _a, _b;
-    (_a = common_vendor.getCurrentInstance()) == null ? void 0 : _a.appContext.config.globalProperties.$api;
+    const $api = (_a = common_vendor.getCurrentInstance()) == null ? void 0 : _a.appContext.config.globalProperties.$api;
     const $config = (_b = common_vendor.getCurrentInstance()) == null ? void 0 : _b.appContext.config.globalProperties.$config;
     const config = common_vendor.ref({ logoUrl: [] });
-    const list = common_vendor.ref([
-      {
-        id: "1",
-        file: [{ url: "https://cdn.uviewui.com/uview/album/1.jpg" }],
-        name: "夏朗 2013款 1.8TSI 标配型 欧IV",
-        year: "2014年 ",
-        city: "丹东",
-        kilometer: "8万公里",
-        money: "7.80"
-      },
-      {
-        id: "1",
-        file: [{ url: "https://cdn.uviewui.com/uview/album/2.jpg" }],
-        name: "捷豹XEL 2020款 2.0T 200PS S进取优雅版",
-        year: "2014年 ",
-        city: "丹东",
-        kilometer: "8万公里",
-        money: "7.80"
-      },
-      {
-        id: "1",
-        file: [{ url: "https://cdn.uviewui.com/uview/album/3.jpg" }],
-        name: "夏朗 2013款 1.8TSI 标配型 欧IV",
-        year: "2014年 ",
-        city: "丹东",
-        kilometer: "8万公里",
-        money: "7.80"
-      },
-      {
-        id: "1",
-        file: [{ url: "https://cdn.uviewui.com/uview/album/4.jpg" }],
-        name: "夏朗 2013款 1.8TSI 标配型 欧IV",
-        year: "2014年 ",
-        city: "丹东",
-        kilometer: "8万公里",
-        money: "7.80"
-      },
-      {
-        id: "1",
-        file: [{ url: "https://cdn.uviewui.com/uview/album/5.jpg" }],
-        name: "夏朗 2013款 1.8TSI 标配型 欧IV",
-        year: "2014年 ",
-        city: "丹东",
-        kilometer: "8万公里",
-        money: "7.80"
-      },
-      {
-        id: "1",
-        file: [{ url: "https://cdn.uviewui.com/uview/album/6.jpg" }],
-        name: "夏朗 2013款 1.8TSI 标配型 欧IV",
-        year: "2014年 ",
-        city: "丹东",
-        kilometer: "8万公里",
-        money: "7.80"
-      },
-      {
-        id: "1",
-        file: [{ url: "https://cdn.uviewui.com/uview/album/7.jpg" }],
-        name: "夏朗 2013款 1.8TSI 标配型 欧IV",
-        year: "2014年 ",
-        city: "丹东",
-        kilometer: "8万公里",
-        money: "7.80"
-      },
-      {
-        id: "1",
-        file: [{ url: "https://cdn.uviewui.com/uview/album/8.jpg" }],
-        name: "夏朗 2013款 1.8TSI 标配型 欧IV",
-        year: "2014年 ",
-        city: "丹东",
-        kilometer: "8万公里",
-        money: "7.80"
-      },
-      {
-        id: "1",
-        file: [{ url: "https://cdn.uviewui.com/uview/album/9.jpg" }],
-        name: "夏朗 2013款 1.8TSI 标配型 欧IV",
-        year: "2014年 ",
-        city: "丹东",
-        kilometer: "8万公里",
-        money: "7.80"
-      },
-      {
-        id: "1",
-        file: [{ url: "https://cdn.uviewui.com/uview/album/10.jpg" }],
-        name: "夏朗 2013款 1.8TSI 标配型 欧IV",
-        year: "2014年 ",
-        city: "丹东",
-        kilometer: "8万公里",
-        money: "7.80"
-      }
-    ]);
+    const searchInfo = common_vendor.ref({});
+    const list = common_vendor.ref([]);
     const total = common_vendor.ref(0);
     const skip = common_vendor.ref(0);
     const limit = common_vendor.ref(6);
@@ -153,14 +63,38 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
         type: "4"
       }
     ]);
-    common_vendor.onLoad(async () => {
+    common_vendor.onShow(async () => {
       await searchConfig();
+      await clearPage();
       await search();
     });
+    common_vendor.onPullDownRefresh(async () => {
+      await clearPage();
+      await search();
+      common_vendor.index.stopPullDownRefresh();
+    });
     const searchConfig = async () => {
       config.value = common_vendor.index.getStorageSync("config");
     };
     const search = async () => {
+      const info = {
+        skip: skip.value,
+        limit: limit.value,
+        status: "0"
+      };
+      const res = await $api("car", "GET", {
+        ...info,
+        ...searchInfo.value
+      });
+      if (res.errcode === 0) {
+        list.value = list.value.concat(res.data);
+        total.value = res.total;
+      } else {
+        common_vendor.index.showToast({
+          title: res.errmsg || "",
+          icon: "error"
+        });
+      }
     };
     const toRoute = (item) => {
       common_vendor.index.navigateTo({
@@ -197,6 +131,12 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       } else
         is_bottom.value = true;
     };
+    const clearPage = () => {
+      list.value = [];
+      skip.value = 0;
+      limit.value = 6;
+      page.value = 0;
+    };
     return (_ctx, _cache) => {
       return common_vendor.e({
         a: common_vendor.p({
@@ -230,22 +170,24 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
         e: common_vendor.f(list.value, (item, index, i0) => {
           return common_vendor.e({
             a: item.file && item.file.length > 0 ? item.file[0].url : "",
-            b: common_vendor.t(item.name || "暂无"),
-            c: item.year
+            b: common_vendor.t(item.series || "暂无"),
+            c: common_vendor.t(item.year || "暂无"),
+            d: common_vendor.t(item.style || "暂无"),
+            e: item.year
           }, item.year ? {
-            d: common_vendor.t(item.year || "暂无")
+            f: common_vendor.t(item.year || "暂无")
           } : {}, {
-            e: item.kilometer
-          }, item.kilometer ? {
-            f: common_vendor.t(item.kilometer || "暂无")
+            g: item.mileage
+          }, item.mileage ? {
+            h: common_vendor.t(item.mileage || "暂无")
           } : {}, {
-            g: item.city
-          }, item.city ? {
-            h: common_vendor.t(item.city || "暂无")
+            i: item.place
+          }, item.place ? {
+            j: common_vendor.t(item.place || "暂无")
           } : {}, {
-            i: common_vendor.t(item.money || "0"),
-            j: index,
-            k: common_vendor.o(($event) => toView(item), index)
+            k: common_vendor.t(item.total_money || "0"),
+            l: index,
+            m: common_vendor.o(($event) => toView(item), index)
           });
         }),
         f: is_bottom.value

unpackage/dist/dev/mp-weixin/pagesHome/car/index.js

@@ -16,7 +16,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
   __name: "index",
   setup(__props) {
     var _a;
-    (_a = common_vendor.getCurrentInstance()) == null ? void 0 : _a.appContext.config.globalProperties.$api;
+    const $api = (_a = common_vendor.getCurrentInstance()) == null ? void 0 : _a.appContext.config.globalProperties.$api;
     common_vendor.computed(() => {
       return common_vendor.index.getStorageSync("openid");
     });
@@ -26,111 +26,64 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
     const files = common_vendor.ref([{ name: "上牌时间", content: "2013-10" }, { name: "表显里程", content: "8.0万公里" }, { name: "排放标准", content: "国六" }, { name: "车源地", content: "长春" }]);
     const parameter = common_vendor.ref([{ name: "发动机", content: "1.8L" }, { name: "轴距", content: "2700mm" }, { name: "变速箱", content: "自动" }, { name: "最大功率", content: "103kW" }]);
     const info = common_vendor.ref({ url: [{ url: "https://cdn.uviewui.com/uview/album/1.jpg" }, { url: "https://cdn.uviewui.com/uview/album/2.jpg" }, { url: "https://cdn.uviewui.com/uview/album/3.jpg" }, { url: "https://cdn.uviewui.com/uview/album/4.jpg" }, { url: "https://cdn.uviewui.com/uview/album/5.jpg" }], payment: "2.7", rankNum: "11", rank: "全国紧凑型SUV销售榜", type: "夏朗", name: "夏朗 2013款 1.8TSI 标配型 欧IV", money: "7.80", price: "29.06" });
-    const shop = common_vendor.ref({ name: "淘车车长春店", num: "109" });
-    const list = common_vendor.ref([
-      {
-        id: "1",
-        file: [{ url: "https://cdn.uviewui.com/uview/album/1.jpg" }],
-        name: "夏朗 2013款 1.8TSI 标配型 欧IV",
-        year: "2014年 ",
-        city: "丹东",
-        kilometer: "8万公里",
-        money: "7.80"
-      },
-      {
-        id: "1",
-        file: [{ url: "https://cdn.uviewui.com/uview/album/2.jpg" }],
-        name: "捷豹XEL 2020款 2.0T 200PS S进取优雅版",
-        year: "2014年 ",
-        city: "丹东",
-        kilometer: "8万公里",
-        money: "7.80"
-      },
-      {
-        id: "1",
-        file: [{ url: "https://cdn.uviewui.com/uview/album/3.jpg" }],
-        name: "夏朗 2013款 1.8TSI 标配型 欧IV",
-        year: "2014年 ",
-        city: "丹东",
-        kilometer: "8万公里",
-        money: "7.80"
-      },
-      {
-        id: "1",
-        file: [{ url: "https://cdn.uviewui.com/uview/album/4.jpg" }],
-        name: "夏朗 2013款 1.8TSI 标配型 欧IV",
-        year: "2014年 ",
-        city: "丹东",
-        kilometer: "8万公里",
-        money: "7.80"
-      },
-      {
-        id: "1",
-        file: [{ url: "https://cdn.uviewui.com/uview/album/5.jpg" }],
-        name: "夏朗 2013款 1.8TSI 标配型 欧IV",
-        year: "2014年 ",
-        city: "丹东",
-        kilometer: "8万公里",
-        money: "7.80"
-      },
-      {
-        id: "1",
-        file: [{ url: "https://cdn.uviewui.com/uview/album/6.jpg" }],
-        name: "夏朗 2013款 1.8TSI 标配型 欧IV",
-        year: "2014年 ",
-        city: "丹东",
-        kilometer: "8万公里",
-        money: "7.80"
-      },
-      {
-        id: "1",
-        file: [{ url: "https://cdn.uviewui.com/uview/album/7.jpg" }],
-        name: "夏朗 2013款 1.8TSI 标配型 欧IV",
-        year: "2014年 ",
-        city: "丹东",
-        kilometer: "8万公里",
-        money: "7.80"
-      },
-      {
-        id: "1",
-        file: [{ url: "https://cdn.uviewui.com/uview/album/8.jpg" }],
-        name: "夏朗 2013款 1.8TSI 标配型 欧IV",
-        year: "2014年 ",
-        city: "丹东",
-        kilometer: "8万公里",
-        money: "7.80"
-      },
-      {
-        id: "1",
-        file: [{ url: "https://cdn.uviewui.com/uview/album/9.jpg" }],
-        name: "夏朗 2013款 1.8TSI 标配型 欧IV",
-        year: "2014年 ",
-        city: "丹东",
-        kilometer: "8万公里",
-        money: "7.80"
-      },
-      {
-        id: "1",
-        file: [{ url: "https://cdn.uviewui.com/uview/album/10.jpg" }],
-        name: "夏朗 2013款 1.8TSI 标配型 欧IV",
-        year: "2014年 ",
-        city: "丹东",
-        kilometer: "8万公里",
-        money: "7.80"
-      }
-    ]);
+    const shop = common_vendor.ref({});
+    const list = common_vendor.ref([]);
     common_vendor.onLoad(async (options) => {
       id.value = options && options.id;
       await searchConfig();
-      await searchOther();
       await search();
     });
     const searchConfig = async () => {
       config.value = common_vendor.index.getStorageSync("config");
     };
-    const searchOther = async () => {
-    };
     const search = async () => {
+      var _a2;
+      if (id.value) {
+        const res = await $api(`car/${id.value}`, "GET", {});
+        if (res.errcode === 0) {
+          info.value = res.data;
+          await searchShop((_a2 = res.data) == null ? void 0 : _a2.shop);
+          await searchOther();
+        } else {
+          common_vendor.index.showToast({
+            title: res.errmsg || "",
+            icon: "error"
+          });
+        }
+      }
+    };
+    const searchShop = async (e) => {
+      if (!e)
+        return;
+      const res = await $api(`shop/${e}`, "GET", {});
+      if (res.errcode === 0) {
+        shop.value = res.data;
+      } else {
+        common_vendor.index.showToast({
+          title: res.errmsg || "",
+          icon: "error"
+        });
+      }
+    };
+    const searchOther = async () => {
+      const info2 = {
+        skip: 0,
+        limit: 20,
+        status: "0",
+        shop: shop.value._id
+      };
+      const res = await $api("car", "GET", {
+        ...info2
+      });
+      if (res.errcode === 0) {
+        list.value = res.data;
+        shop.value.num = res.total;
+      } else {
+        common_vendor.index.showToast({
+          title: res.errmsg || "",
+          icon: "error"
+        });
+      }
     };
     const PhoneNumber = (e) => {
       console.log(e);
@@ -170,39 +123,42 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       console.log("收藏");
     };
     return (_ctx, _cache) => {
+      var _a2, _b, _c, _d, _e, _f, _g;
       return {
         a: common_vendor.t(currentNum.value + 1),
-        b: common_vendor.t(info.value.url.length),
+        b: common_vendor.t((_a2 = info.value.file) == null ? void 0 : _a2.length),
         c: common_vendor.o((e) => currentNum.value = e.current),
         d: common_vendor.p({
-          list: info.value.url,
+          list: info.value.file,
           height: "300px",
           keyName: "url",
           autoplay: false,
           indicatorStyle: "right: 20px",
           radius: "0"
         }),
-        e: common_vendor.t(info.value.money || "0"),
+        e: common_vendor.t(info.value.real_pay || "0"),
         f: common_vendor.t(info.value.price || "0"),
         g: common_vendor.o(PhoneNumber),
-        h: common_vendor.t(info.value.name || "暂无名称"),
-        i: common_vendor.t(info.value.type),
-        j: common_vendor.p({
+        h: common_vendor.t(info.value.series || "暂无"),
+        i: common_vendor.t(info.value.year || "暂无"),
+        j: common_vendor.t(info.value.style || "暂无"),
+        k: common_vendor.t(info.value.series),
+        l: common_vendor.p({
           name: "arrow-right",
           size: "12"
         }),
-        k: common_vendor.t(info.value.rank),
-        l: common_vendor.t(info.value.rankNum),
-        m: common_vendor.p({
+        m: common_vendor.t(info.value.rank),
+        n: common_vendor.t(info.value.rankNum),
+        o: common_vendor.p({
           name: "arrow-right",
           size: "12"
         }),
-        n: common_vendor.t(info.value.payment),
-        o: common_vendor.p({
+        p: common_vendor.t(info.value.first_pay),
+        q: common_vendor.p({
           name: "arrow-right",
           size: "16"
         }),
-        p: common_vendor.f(files.value, (item, index, i0) => {
+        r: common_vendor.f(files.value, (item, index, i0) => {
           return {
             a: common_vendor.t(item.content),
             b: common_vendor.t(item.name),
@@ -210,12 +166,12 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
             d: common_vendor.o(($event) => _ctx.toCommon(item), index)
           };
         }),
-        q: common_vendor.o(toRecord),
-        r: common_vendor.p({
+        s: common_vendor.o(toRecord),
+        t: common_vendor.p({
           name: "arrow-right",
           size: "16"
         }),
-        s: common_vendor.f(parameter.value, (item, index, i0) => {
+        v: common_vendor.f(parameter.value, (item, index, i0) => {
           return {
             a: common_vendor.t(item.content),
             b: common_vendor.t(item.name),
@@ -223,69 +179,71 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
             d: common_vendor.o(($event) => _ctx.toCommon(item), index)
           };
         }),
-        t: shop.value.file && shop.value.file.length > 0 ? shop.value.file[0].url : "https://cdn.uviewui.com/uview/album/1.jpg",
-        v: common_vendor.t(shop.value.name || "暂无"),
-        w: common_vendor.p({
+        w: shop.value.logo && ((_b = shop.value.logo) == null ? void 0 : _b.length) > 0 ? shop.value.logo[0].url : "https://cdn.uviewui.com/uview/album/1.jpg",
+        x: common_vendor.t(shop.value.name || "暂无"),
+        y: common_vendor.p({
           bold: true,
           color: "#000",
           name: "arrow-right",
           size: "16"
         }),
-        x: common_vendor.o(toShop),
-        y: common_vendor.t(shop.value.num || 0),
-        z: common_vendor.o(toChat),
-        A: common_vendor.p({
+        z: common_vendor.o(toShop),
+        A: common_vendor.t(shop.value.num || 0),
+        B: common_vendor.o(toChat),
+        C: common_vendor.p({
           icon: "phone",
           text: "咨询卖家车况",
           size: "normal",
           type: "info"
         }),
-        B: info.value.file && info.value.file.length > 0 ? info.value.file[0].url : "https://cdn.uviewui.com/uview/album/1.jpg",
-        C: info.value.file && info.value.file.length > 1 ? info.value.file[1].url : "https://cdn.uviewui.com/uview/album/5.jpg",
-        D: info.value.file && info.value.file.length > 2 ? info.value.file[2].url : "https://cdn.uviewui.com/uview/album/2.jpg",
-        E: info.value.file && info.value.file.length > 3 ? info.value.file[3].url : "https://cdn.uviewui.com/uview/album/3.jpg",
-        F: info.value.file && info.value.file.length > 4 ? info.value.file[4].url : "https://cdn.uviewui.com/uview/album/4.jpg",
-        G: common_vendor.o(toMore),
-        H: common_vendor.p({
+        D: info.value.file && ((_c = info.value.file) == null ? void 0 : _c.length) > 0 ? info.value.file[0].url : "https://cdn.uviewui.com/uview/album/1.jpg",
+        E: info.value.file && ((_d = info.value.file) == null ? void 0 : _d.length) > 1 ? info.value.file[1].url : "https://cdn.uviewui.com/uview/album/5.jpg",
+        F: info.value.file && ((_e = info.value.file) == null ? void 0 : _e.length) > 2 ? info.value.file[2].url : "https://cdn.uviewui.com/uview/album/2.jpg",
+        G: info.value.file && ((_f = info.value.file) == null ? void 0 : _f.length) > 3 ? info.value.file[3].url : "https://cdn.uviewui.com/uview/album/3.jpg",
+        H: info.value.file && ((_g = info.value.file) == null ? void 0 : _g.length) > 4 ? info.value.file[4].url : "https://cdn.uviewui.com/uview/album/4.jpg",
+        I: common_vendor.o(toMore),
+        J: common_vendor.p({
           text: "查看更多图片",
           size: "normal",
           type: "info"
         }),
-        I: common_vendor.f(list.value, (item, index, i0) => {
+        K: common_vendor.f(list.value, (item, index, i0) => {
           return common_vendor.e({
             a: item.file && item.file.length > 0 ? item.file[0].url : "",
-            b: common_vendor.t(item.name || "暂无"),
-            c: item.year
+            b: common_vendor.t(item.series || "暂无"),
+            c: common_vendor.t(item.year || "暂无"),
+            d: common_vendor.t(item.style || "暂无"),
+            e: item.year
           }, item.year ? {
-            d: common_vendor.t(item.year || "暂无")
+            f: common_vendor.t(item.year || "暂无")
           } : {}, {
-            e: item.kilometer
-          }, item.kilometer ? {
-            f: common_vendor.t(item.kilometer || "暂无")
+            g: item.mileage
+          }, item.mileage ? {
+            h: common_vendor.t(item.mileage || "暂无")
           } : {}, {
-            g: item.city
-          }, item.city ? {
-            h: common_vendor.t(item.city || "暂无")
+            i: item.place
+          }, item.place ? {
+            j: common_vendor.t(item.place || "暂无")
           } : {}, {
-            i: common_vendor.t(item.money || "0"),
-            j: index,
-            k: common_vendor.o(($event) => toView(item), index)
+            k: common_vendor.t(item.total_money || "0"),
+            l: index,
+            m: common_vendor.o(($event) => toView(item), index)
           });
         }),
-        J: common_vendor.p({
+        L: common_vendor.p({
           color: "#000",
           name: "red-packet",
           size: "20"
         }),
-        K: common_vendor.o(toChat),
-        L: common_vendor.p({
+        M: common_vendor.o(toChat),
+        N: common_vendor.p({
           color: "#000",
           name: "heart",
           size: "20"
         }),
-        M: common_vendor.o(toCollect),
-        N: common_vendor.o(toChat),
-        O: common_vendor.o(toChat)
+        O: common_vendor.o(toCollect),
+        P: common_vendor.o(toChat),
+        Q: common_vendor.o(toChat)
       };
     };
   }

unpackage/dist/dev/mp-weixin/pagesHome/car/index.wxss

@@ -207,7 +207,7 @@
   display: flex;
   flex-direction: column;
   justify-content: space-between;
-  margin: 0 0 0 2vw;
+  padding: 0 2vw;
 }
 .content .main .bottom .six .listL .list .list_1 .right .name.data-v-6b665083 {
   font-size: var(--font14Size);

unpackage/dist/dev/mp-weixin/pagesHome/condition/index.js

@@ -23,8 +23,6 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
     const total = common_vendor.ref(0);
     const scrollTop = common_vendor.ref(0);
     const current = common_vendor.ref(0);
-    common_vendor.ref(0);
-    common_vendor.ref(0);
     const itemId = common_vendor.ref("");
     const tabbar = common_vendor.ref(pagesHome_condition_common_classify.classifyData);
     const scrollRightTop = common_vendor.ref(0);

unpackage/dist/dev/mp-weixin/pagesHome/condition/index.wxss

@@ -20,11 +20,11 @@
   overflow: hidden;
 }
 .content .info .u-tab-view.data-v-4b99813d {
-  width: 200rpx;
+  width: 100px;
   background: var(--f6Color);
 }
 .content .info .u-tab-item.data-v-4b99813d {
-  height: 110rpx;
+  height: 55px;
   background: var(--f6Color);
   box-sizing: border-box;
   display: flex;
@@ -50,7 +50,7 @@
   padding: 8px;
 }
 .content .info .class-item.data-v-4b99813d {
-  margin-bottom: 30rpx;
+  margin-bottom: 15px;
   background-color: var(--mainColor);
   padding: 8px;
   border-radius: 4px;

unpackage/dist/dev/mp-weixin/pagesHome/rank/index.wxss

@@ -43,7 +43,6 @@
   display: flex;
   flex-direction: column;
   justify-content: space-between;
-  margin: 0 0 0 2vw;
   width: 100%;
 }
 .content .bottom .list .right .name.data-v-581af8d0 {

unpackage/dist/dev/mp-weixin/pagesHome/search/index.wxss

@@ -114,7 +114,6 @@
   display: flex;
   flex-direction: column;
   justify-content: space-between;
-  margin: 0 0 0 2vw;
   width: 100%;
 }
 .content .bottom .one .list .right .name.data-v-2519f642 {

unpackage/dist/dev/mp-weixin/pagesHome/shop/index.js

@@ -16,14 +16,14 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
   __name: "index",
   setup(__props) {
     var _a;
-    (_a = common_vendor.getCurrentInstance()) == null ? void 0 : _a.appContext.config.globalProperties.$api;
+    const $api = (_a = common_vendor.getCurrentInstance()) == null ? void 0 : _a.appContext.config.globalProperties.$api;
     common_vendor.computed(() => {
       return common_vendor.index.getStorageSync("openid");
     });
     const config = common_vendor.ref({});
     const id = common_vendor.ref("");
     common_vendor.ref("https://cdn.uviewui.com/uview/album/1.jpg");
-    const shop = common_vendor.ref({ name: "淘车车长春店", num: "109", sale: "9", sold: "69", address: "吉林省长春市宽城区凯旋二手车市场排房J04", status: "0", file: [], start_time: "08:00", end_time: "17:00" });
+    const shop = common_vendor.ref({});
     const type = common_vendor.ref("0");
     const is_show = common_vendor.ref(false);
     const searchList = common_vendor.ref([{ title: "默认排序", type: "0", is_open: false }, { title: "品牌", type: "1", is_open: false }, { title: "价格", type: "2", is_open: false }, { title: "车龄", type: "3", is_open: false }, { title: "更多筛选", type: "4", is_open: false }]);
@@ -74,98 +74,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
         type: "4"
       }
     ]);
-    const list = common_vendor.ref([
-      {
-        id: "1",
-        file: [{ url: "https://cdn.uviewui.com/uview/album/1.jpg" }],
-        name: "夏朗 2013款 1.8TSI 标配型 欧IV",
-        year: "2014年 ",
-        city: "丹东",
-        kilometer: "8万公里",
-        money: "7.80"
-      },
-      {
-        id: "1",
-        file: [{ url: "https://cdn.uviewui.com/uview/album/2.jpg" }],
-        name: "捷豹XEL 2020款 2.0T 200PS S进取优雅版",
-        year: "2014年 ",
-        city: "丹东",
-        kilometer: "8万公里",
-        money: "7.80"
-      },
-      {
-        id: "1",
-        file: [{ url: "https://cdn.uviewui.com/uview/album/3.jpg" }],
-        name: "夏朗 2013款 1.8TSI 标配型 欧IV",
-        year: "2014年 ",
-        city: "丹东",
-        kilometer: "8万公里",
-        money: "7.80"
-      },
-      {
-        id: "1",
-        file: [{ url: "https://cdn.uviewui.com/uview/album/4.jpg" }],
-        name: "夏朗 2013款 1.8TSI 标配型 欧IV",
-        year: "2014年 ",
-        city: "丹东",
-        kilometer: "8万公里",
-        money: "7.80"
-      },
-      {
-        id: "1",
-        file: [{ url: "https://cdn.uviewui.com/uview/album/5.jpg" }],
-        name: "夏朗 2013款 1.8TSI 标配型 欧IV",
-        year: "2014年 ",
-        city: "丹东",
-        kilometer: "8万公里",
-        money: "7.80"
-      },
-      {
-        id: "1",
-        file: [{ url: "https://cdn.uviewui.com/uview/album/6.jpg" }],
-        name: "夏朗 2013款 1.8TSI 标配型 欧IV",
-        year: "2014年 ",
-        city: "丹东",
-        kilometer: "8万公里",
-        money: "7.80"
-      },
-      {
-        id: "1",
-        file: [{ url: "https://cdn.uviewui.com/uview/album/7.jpg" }],
-        name: "夏朗 2013款 1.8TSI 标配型 欧IV",
-        year: "2014年 ",
-        city: "丹东",
-        kilometer: "8万公里",
-        money: "7.80"
-      },
-      {
-        id: "1",
-        file: [{ url: "https://cdn.uviewui.com/uview/album/8.jpg" }],
-        name: "夏朗 2013款 1.8TSI 标配型 欧IV",
-        year: "2014年 ",
-        city: "丹东",
-        kilometer: "8万公里",
-        money: "7.80"
-      },
-      {
-        id: "1",
-        file: [{ url: "https://cdn.uviewui.com/uview/album/9.jpg" }],
-        name: "夏朗 2013款 1.8TSI 标配型 欧IV",
-        year: "2014年 ",
-        city: "丹东",
-        kilometer: "8万公里",
-        money: "7.80"
-      },
-      {
-        id: "1",
-        file: [{ url: "https://cdn.uviewui.com/uview/album/10.jpg" }],
-        name: "夏朗 2013款 1.8TSI 标配型 欧IV",
-        year: "2014年 ",
-        city: "丹东",
-        kilometer: "8万公里",
-        money: "7.80"
-      }
-    ]);
+    const list = common_vendor.ref([]);
     const total = common_vendor.ref(0);
     const skip = common_vendor.ref(0);
     const limit = common_vendor.ref(6);
@@ -178,20 +87,59 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
         title: options && options.name || "车行详情"
       });
       await searchConfig();
-      await searchOther();
       await search();
+      await searchOther();
     });
     common_vendor.onShow(() => {
       common_vendor.index.$on("toRoute", function(data) {
         brandInfo.value = data;
       });
     });
-    const searchOther = async () => {
-    };
     const searchConfig = async () => {
       config.value = common_vendor.index.getStorageSync("config");
     };
     const search = async () => {
+      if (id.value) {
+        const res = await $api(`shop/${id.value}`, "GET", {});
+        if (res.errcode === 0) {
+          shop.value = res.data;
+        } else {
+          common_vendor.index.showToast({
+            title: res.errmsg || "",
+            icon: "error"
+          });
+        }
+      }
+    };
+    const searchOther = async () => {
+      let res;
+      const info = {
+        skip: skip.value,
+        limit: limit.value,
+        status: "0",
+        shop: id.value
+      };
+      res = await $api("car", "GET", {
+        ...info
+      });
+      if (res.errcode === 0) {
+        list.value = list.value.concat(res.data);
+        total.value = res.total;
+        shop.value.sale = res.total;
+      } else {
+        common_vendor.index.showToast({
+          title: res.errmsg || "",
+          icon: "error"
+        });
+      }
+      res = await $api("car", "GET", {
+        skip: 0,
+        limit: 1,
+        status: "1",
+        shop: id.value
+      });
+      if (res.errcode === 0)
+        shop.value.sold = res.total;
     };
     const toSearch = (value) => {
       searchList.value = searchList.value.map((item, index) => {
@@ -333,11 +281,11 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
     return (_ctx, _cache) => {
       return common_vendor.e({
         a: common_vendor.t(shop.value.name || "暂无"),
-        b: common_vendor.t(shop.value.sale || "暂无"),
-        c: common_vendor.t(shop.value.sold || "暂无"),
+        b: common_vendor.t(shop.value.sale || "0"),
+        c: common_vendor.t(shop.value.sold || "0"),
         d: common_vendor.t(shop.value.status == "0" ? "营业中" : "休息中"),
-        e: common_vendor.t(shop.value.start_time || "暂无"),
-        f: common_vendor.t(shop.value.end_time || "暂无"),
+        e: common_vendor.t(shop.value.start_time || "8:00"),
+        f: common_vendor.t(shop.value.end_time || "17:00"),
         g: common_vendor.p({
           name: "file-text",
           size: "16"
@@ -465,22 +413,24 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
         L: common_vendor.f(list.value, (item, index, i0) => {
           return common_vendor.e({
             a: item.file && item.file.length > 0 ? item.file[0].url : "",
-            b: common_vendor.t(item.name || "暂无"),
-            c: item.year
+            b: common_vendor.t(item.series || "暂无"),
+            c: common_vendor.t(item.year || "暂无"),
+            d: common_vendor.t(item.style || "暂无"),
+            e: item.year
           }, item.year ? {
-            d: common_vendor.t(item.year || "暂无")
+            f: common_vendor.t(item.year || "暂无")
           } : {}, {
-            e: item.kilometer
-          }, item.kilometer ? {
-            f: common_vendor.t(item.kilometer || "暂无")
+            g: item.mileage
+          }, item.mileage ? {
+            h: common_vendor.t(item.mileage || "暂无")
           } : {}, {
-            g: item.city
-          }, item.city ? {
-            h: common_vendor.t(item.city || "暂无")
+            i: item.place
+          }, item.place ? {
+            j: common_vendor.t(item.place || "暂无")
           } : {}, {
-            i: common_vendor.t(item.money || "0"),
-            j: index,
-            k: common_vendor.o(($event) => toView(item), index)
+            k: common_vendor.t(item.total_money || "0"),
+            l: index,
+            m: common_vendor.o(($event) => toView(item), index)
           });
         }),
         M: is_bottom.value

unpackage/dist/dev/mp-weixin/pagesHome/shop/index.wxss

@@ -158,7 +158,7 @@
   display: flex;
   flex-direction: column;
   justify-content: space-between;
-  margin: 0 0 0 2vw;
+  padding: 0 2vw;
 }
 .content .info .bottom .two .list .list_1 .right .name.data-v-88a3d2e5 {
   font-size: var(--font14Size);

unpackage/dist/dev/mp-weixin/pagesMy/collect/index.wxss

@@ -42,7 +42,6 @@
   display: flex;
   flex-direction: column;
   justify-content: space-between;
-  margin: 0 0 0 2vw;
   width: 100%;
 }
 .content .bottom .list .right .name.data-v-523c5cf9 {