From 260bd90b266f0ff9f8f32fef26d4bc6620790f2a Mon Sep 17 00:00:00 2001
From: Hong <1470048117@qq.com>
Date: Fri, 5 Jul 2024 18:54:32 +0800
Subject: [PATCH] =?UTF-8?q?7.5(=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/system/config.js | 24 +-
components/count-down.vue | 8 +-
config.js | 4 +-
pages/home/home.vue | 5 +-
pages/index/index.vue | 25 +-
pages/index/post.vue | 28 ++
pages/serve/coupons/cou_detail.vue | 2 +-
pages/serve/coupons/cou_order.vue | 2 +-
pages/showroom/carRental/index.vue | 4 +-
pages/showroom/index.vue | 21 +-
.../welfare/rightsInterests/confirm_order.vue | 2 +-
.../rightsInterests_particulars.vue | 2 +-
pagesA/common/textview/index.vue | 18 +-
pagesA/every_day_card/every_day_card.vue | 3 +-
pagesA/my_favorite/my_favorite.vue | 259 ++++++++----------
pagesA/rebate/rebate.vue | 52 ++--
pagesA/showroom/carList/carList.vue | 37 ++-
pagesA/showroom/confirmOrder/confirmOrder.vue | 14 +-
static/images/tabbar/index.png | Bin 2989 -> 7418 bytes
static/images/tabbar/index_active.png | Bin 6280 -> 6029 bytes
static/images/tabbar/mine.png | Bin 3951 -> 6697 bytes
static/images/tabbar/mine_active.png | Bin 8380 -> 6252 bytes
static/images/tabbar/serve.png | Bin 4032 -> 4217 bytes
static/images/tabbar/serve_active.png | Bin 8837 -> 6774 bytes
static/images/tabbar/showroom.png | Bin 3763 -> 8797 bytes
static/images/tabbar/showroom_active.png | Bin 8019 -> 8019 bytes
static/images/tabbar/welfare.png | Bin 4928 -> 9583 bytes
static/images/tabbar/welfare_active.png | Bin 10092 -> 9707 bytes
utils/index.js | 1 +
29 files changed, 290 insertions(+), 221 deletions(-)
diff --git a/api/system/config.js b/api/system/config.js
index 4ccf223..9cf0643 100644
--- 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
diff --git a/components/count-down.vue b/components/count-down.vue
index 64af881..20aac53 100644
--- a/components/count-down.vue
+++ b/components/count-down.vue
@@ -3,19 +3,19 @@
{{timeData.days+'天'}}
+ v-if="timeData.days>3">{{timeData.days+'天'}}
- {{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 }}
{{timeData.days+'天'}}
+ v-if="timeData.days>3">{{timeData.days+'天'}}
- {{timeData.hours>10?timeData.hours:'0'+timeData.hours}}
+ {{(timeData.days*24)+timeData.hours>10?(timeData.days*24)+timeData.hours:'0'+timeData.hours}}
:
diff --git a/config.js b/config.js
index 7868022..fae18c3 100644
--- 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,
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 02860f0..0fd5d19 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -31,7 +31,7 @@
- 今日收益(元)
+ 本月预估收益
我的收益
@@ -118,7 +118,6 @@