diff --git a/pages/customer/score/exchange.js b/pages/customer/score/exchange.js index 4294d81..8c7200c 100644 --- a/pages/customer/score/exchange.js +++ b/pages/customer/score/exchange.js @@ -1,11 +1,11 @@ -// pages/customer/score/exchange.js +// pages/customer/score/exchange.js 20250624 Page({ /** * 页面的初始数据 */ data: { - startDate: '2025-05-18', + startDate: '', endDate: '', orderList: [ { @@ -30,7 +30,10 @@ Page({ validityPeriod: '2025-01-01~2025-12-12', orderTime: '2025-05-10 19:13' } - ] + ], + loading: true, + end: false, + noData: false }, /** diff --git a/pages/customer/score/exchange.wxml b/pages/customer/score/exchange.wxml index 22636ee..17ac482 100644 --- a/pages/customer/score/exchange.wxml +++ b/pages/customer/score/exchange.wxml @@ -1,24 +1,24 @@ - + - - 📅 - {{startDate || '2025.05.18 12'}} + + 📅 + {{startDate || '请选择开始时间'}} - - - 📅 + + 📅 {{endDate || '请选择结束时间'}} - + 搜索 @@ -27,44 +27,49 @@ - + 订单编号 {{item.orderNumber}} 订单详情 > - - - - {{item.customerName}} - ({{item.customerPhone}}) - - 消耗积分: - {{item.points}} - - - - - - - {{item.couponAmount}} - - - 使用规则 > + + + + {{item.customerName}} + ({{item.customerPhone}}) + + 消耗积分: + {{item.points}} - - - {{item.couponTitle}} - 时限 {{item.validityPeriod}} + + + + + + {{item.couponAmount}} + + + + 使用规则 > + + + + + 购车补贴 + 时限 {{item.validityPeriod}} + + + + + + 下单时间: {{item.orderTime}} - - - 下单时间: {{item.orderTime}} - + diff --git a/pages/customer/score/exchange.wxss b/pages/customer/score/exchange.wxss index 467a036..9eaf042 100644 --- a/pages/customer/score/exchange.wxss +++ b/pages/customer/score/exchange.wxss @@ -70,25 +70,26 @@ flex: 1; display: flex; align-items: center; - gap: 10px; + gap: 5px; } .date-input { display: flex; align-items: center; - gap: 5px; - padding: 8px 12px; - border: 1px solid #ddd; - border-radius: 4px; - background-color: #fff; + /* gap: 5px; */ + padding: 10rpx 15rpx; + /* border: 1px solid #ddd; */ + /* border-radius: 4px; */ + /* background-color: #fff; */ + width: 210rpx; } .date-icon { - font-size: 16px; + /* font-size: 16px; */ } .date-text { - font-size: 14px; + /* font-size: 14px; */ color: #333; } @@ -112,9 +113,9 @@ .order-item { background-color: #fff; - border-radius: 8px; - margin-bottom: 15px; - padding: 15px; + border-radius: 16rpx; + margin-bottom: 30rpx; + /* padding: 15px; */ box-shadow: 0 2px 4px rgba(0,0,0,0.1); } @@ -123,17 +124,17 @@ display: flex; justify-content: space-between; align-items: center; - margin-bottom: 15px; + background-color: #ebf7f5; + overflow: hidden; } .order-number { - font-size: 14px; - color: #4CAF50; + /* font-size: 28rpx; */ } .order-detail-btn { - color: #4CAF50; - font-size: 14px; + /* color: #4CAF50; + font-size: 14px; */ } /* 客户信息 */ @@ -176,25 +177,30 @@ /* 优惠券卡片 */ .coupon-card { display: flex; - background: linear-gradient(135deg, #ffebee 0%, #fff 100%); - border-radius: 8px; - overflow: hidden; + background-image: url('https://img.liche.cn/lichebao/coupon-red.png'); + width: 650rpx; + height: 174rpx; + background-size: 100% 100%; + background-repeat: no-repeat; + /* background: linear-gradient(135deg, #ffebee 0%, #fff 100%); */ + /* border-radius: 8px; + overflow: hidden; */ margin-bottom: 15px; position: relative; } .coupon-left { - padding: 20px; + /* padding: 20px; */ display: flex; flex-direction: column; align-items: center; justify-content: center; min-width: 120px; - background-color: #ffebee; + /* background-color: #ffebee; */ } .coupon-amount { - font-size: 32px; + font-size: 50rpx; font-weight: bold; color: #ff4444; line-height: 1; @@ -207,40 +213,21 @@ } .coupon-rules { - font-size: 12px; - color: #666; + color: #ae5151; } .coupon-divider { width: 2px; - background: repeating-linear-gradient( + /* background: repeating-linear-gradient( to bottom, transparent 0px, transparent 5px, #ddd 5px, #ddd 10px - ); + ); */ position: relative; } -.coupon-divider::before, -.coupon-divider::after { - content: ''; - position: absolute; - width: 12px; - height: 12px; - background-color: #f5f5f5; - border-radius: 50%; - left: -5px; -} - -.coupon-divider::before { - top: -6px; -} - -.coupon-divider::after { - bottom: -6px; -} .coupon-right { flex: 1; @@ -252,21 +239,14 @@ .coupon-title { font-size: 18px; - font-weight: 500; color: #333; - margin-bottom: 8px; + margin-bottom: 15rpx; } .coupon-validity { - font-size: 14px; - color: #666; + color: #ae5151; } -/* 下单时间 */ -.order-time { - font-size: 12px; - color: #999; -} /* 空状态 */ .empty-state { diff --git a/pages/customer/score/index.js b/pages/customer/score/index.js index 07c020b..75ef0d4 100644 --- a/pages/customer/score/index.js +++ b/pages/customer/score/index.js @@ -1,4 +1,4 @@ -// pages/customer/score/index.js +// pages/customer/score/index.js 20250624 import _ from '../../../commons/js/commons' const app = getApp() Page({ diff --git a/pages/customer/score/index.wxml b/pages/customer/score/index.wxml index 63fafcd..efd81cc 100644 --- a/pages/customer/score/index.wxml +++ b/pages/customer/score/index.wxml @@ -1,4 +1,4 @@ - + 8082 diff --git a/pages/customer/score/recharge.js b/pages/customer/score/recharge.js index 1e67c3d..e9a2d07 100644 --- a/pages/customer/score/recharge.js +++ b/pages/customer/score/recharge.js @@ -1,4 +1,4 @@ -// pages/customer/score/recharge.js +// pages/customer/score/recharge.js 20250624 Page({ /** diff --git a/pages/customer/score/recharge.wxml b/pages/customer/score/recharge.wxml index f168a6e..0e80428 100644 --- a/pages/customer/score/recharge.wxml +++ b/pages/customer/score/recharge.wxml @@ -1,4 +1,4 @@ - + diff --git a/project.config.json b/project.config.json index 91576ed..503ec47 100644 --- a/project.config.json +++ b/project.config.json @@ -1,7 +1,7 @@ { "appid": "wx4733380c110313ec", "compileType": "miniprogram", - "libVersion": "3.5.0", + "libVersion": "3.8.9", "packOptions": { "ignore": [], "include": [] @@ -19,11 +19,24 @@ "disablePlugins": [], "outputPath": "" }, - "condition": false + "condition": false, + "compileWorklet": false, + "uglifyFileName": false, + "uploadWithSourceMap": true, + "packNpmManually": false, + "minifyWXSS": true, + "minifyWXML": true, + "localPlugins": false, + "disableUseStrict": false, + "useCompilerPlugins": false, + "swc": false, + "disableSWC": true }, "condition": {}, "editorSetting": { "tabIndent": "insertSpaces", "tabSize": 2 - } + }, + "projectname": "lcb", + "simulatorPluginLibVersion": {} } \ No newline at end of file diff --git a/project.private.config.json b/project.private.config.json index a2e629d..8717dfd 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -1,56 +1,36 @@ { "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html", - "projectname": "lcb", - "setting": { - "compileHotReLoad": true, - "urlCheck": true - }, "condition": { "miniprogram": { "list": [ { - "name": "pages/signup/index", - "pathName": "pages/signup/index", - "query": "scene=25lzwSFJ3QcXvMLR6WIE2", - "launchMode": "default", - "scene": 1047 - }, - { - "name": "待跟进客户", - "pathName": "pages/customer/filterList/index", - "query": "status=1&visit=1&title=待跟进客户", - "launchMode": "default", - "scene": null - }, - { - "name": "建卡", - "pathName": "pages/customer/addCard/index", - "query": "status=0", - "launchMode": "default", - "scene": null - }, - { - "name": "门店", - "pathName": "pages/index/index", - "query": "biz_id=1", - "launchMode": "default", - "scene": null - }, - { - "name": "签到", - "pathName": "pages/signup/index", - "query": "key=9hPReOz0vYQ2qFHG4Nipj", - "launchMode": "default", - "scene": null - }, - { - "name": "", - "pathName": "pages/login/index", + "name": "pages/customer/index", + "pathName": "pages/customer/score/exchange", "query": "", - "launchMode": "default", - "scene": null + "scene": null, + "launchMode": "default" } ] } + }, + "libVersion": "3.8.9", + "projectname": "lcb", + "setting": { + "urlCheck": true, + "coverView": true, + "lazyloadPlaceholderEnable": false, + "skylineRenderEnable": false, + "preloadBackgroundData": false, + "autoAudits": false, + "useApiHook": true, + "useApiHostProcess": true, + "showShadowRootInWxmlPanel": true, + "useStaticServer": false, + "useLanDebug": false, + "showES6CompileOption": false, + "compileHotReLoad": true, + "checkInvalidKey": true, + "ignoreDevUnusedFiles": true, + "bigPackageSizeSupport": false } } \ No newline at end of file