From eba05ee10913f6b79d542e3f3d4ff3f7cf9ef31b Mon Sep 17 00:00:00 2001 From: maclien <421129572@qq.com> Date: Sun, 22 Jun 2025 23:55:03 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E5=AE=A2=E6=88=B7):=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=A7=AF=E5=88=86=E7=9B=B8=E5=85=B3=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=92=8C=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 添加客户积分充值、兑换页面及相关功能组件 在客户列表页增加线索池展示和解锁功能 更新订单页面的购车券核销按钮 新增红色字体样式并更新项目配置 --- app.json | 6 ++- commons/css/base/fontColor.wxss | 3 +- pages/customer/exchange/index.js | 66 ++++++++++++++++++++++++++++ pages/customer/exchange/index.json | 3 ++ pages/customer/exchange/index.wxml | 2 + pages/customer/exchange/index.wxss | 1 + pages/customer/index.js | 1 + pages/customer/index.wxml | 53 +++++++++++++++++++++- pages/customer/score/exchange.js | 66 ++++++++++++++++++++++++++++ pages/customer/score/exchange.json | 3 ++ pages/customer/score/exchange.wxml | 4 ++ pages/customer/score/exchange.wxss | 1 + pages/customer/score/index.js | 66 ++++++++++++++++++++++++++++ pages/customer/score/index.json | 3 ++ pages/customer/score/index.wxml | 2 + pages/customer/score/index.wxss | 1 + pages/customer/score/recharge.js | 70 ++++++++++++++++++++++++++++++ pages/customer/score/recharge.json | 3 ++ pages/customer/score/recharge.wxml | 40 +++++++++++++++++ pages/customer/score/recharge.wxss | 1 + pages/order/index.js | 35 +++++++++++++++ pages/order/index.wxml | 7 +++ 22 files changed, 434 insertions(+), 3 deletions(-) create mode 100644 pages/customer/exchange/index.js create mode 100644 pages/customer/exchange/index.json create mode 100644 pages/customer/exchange/index.wxml create mode 100644 pages/customer/exchange/index.wxss create mode 100644 pages/customer/score/exchange.js create mode 100644 pages/customer/score/exchange.json create mode 100644 pages/customer/score/exchange.wxml create mode 100644 pages/customer/score/exchange.wxss create mode 100644 pages/customer/score/index.js create mode 100644 pages/customer/score/index.json create mode 100644 pages/customer/score/index.wxml create mode 100644 pages/customer/score/index.wxss create mode 100644 pages/customer/score/recharge.js create mode 100644 pages/customer/score/recharge.json create mode 100644 pages/customer/score/recharge.wxml create mode 100644 pages/customer/score/recharge.wxss diff --git a/app.json b/app.json index 2976a53..cb60f91 100644 --- a/app.json +++ b/app.json @@ -71,7 +71,11 @@ "pages/clues/index", "pages/clues/detail/index", "pages/score/index", - "pages/score/detail" + "pages/score/detail", + "pages/customer/score/index", + "pages/customer/exchange/index", + "pages/customer/score/recharge", + "pages/customer/score/exchange" ], "permission": { "scope.userLocation": { diff --git a/commons/css/base/fontColor.wxss b/commons/css/base/fontColor.wxss index a484399..016ae0b 100644 --- a/commons/css/base/fontColor.wxss +++ b/commons/css/base/fontColor.wxss @@ -14,4 +14,5 @@ .color-fe4109{color:#fe4109;} .color-36afa2{color:#36afa2;} .color-00c800{color:#00c800;} -.color-575b6a{color:#575b6a;} \ No newline at end of file +.color-575b6a{color:#575b6a;} +.color-ff0000{color:#ff0000;} \ No newline at end of file diff --git a/pages/customer/exchange/index.js b/pages/customer/exchange/index.js new file mode 100644 index 0000000..d230ec4 --- /dev/null +++ b/pages/customer/exchange/index.js @@ -0,0 +1,66 @@ +// pages/customer/exchange/index.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/customer/exchange/index.json b/pages/customer/exchange/index.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/pages/customer/exchange/index.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/customer/exchange/index.wxml b/pages/customer/exchange/index.wxml new file mode 100644 index 0000000..077e393 --- /dev/null +++ b/pages/customer/exchange/index.wxml @@ -0,0 +1,2 @@ + +pages/customer/exchange/index.wxml \ No newline at end of file diff --git a/pages/customer/exchange/index.wxss b/pages/customer/exchange/index.wxss new file mode 100644 index 0000000..4eba341 --- /dev/null +++ b/pages/customer/exchange/index.wxss @@ -0,0 +1 @@ +/* pages/customer/exchange/index.wxss */ \ No newline at end of file diff --git a/pages/customer/index.js b/pages/customer/index.js index 1d800f6..8580115 100644 --- a/pages/customer/index.js +++ b/pages/customer/index.js @@ -103,6 +103,7 @@ Page({ series_id: '', //车系id modelArray: [], modelIndex: -1, //车系车型索引 + isShowLock: false }, onLoad(options) { for (let key in options) { diff --git a/pages/customer/index.wxml b/pages/customer/index.wxml index d05aead..15c89f7 100644 --- a/pages/customer/index.wxml +++ b/pages/customer/index.wxml @@ -3,7 +3,7 @@ - + {{item.name}} @@ -11,6 +11,9 @@ + + {{'线索池'}} + {{item.name}} @@ -65,6 +68,32 @@ + + + + {{'客户'}} + ({{'12233336666'}}) + + + {{'距转派还剩4小时23分'}} + + + + + {{'入池时间'}} + {{'2023-04-12'}} + + + {{'意向车型'}} + {{'比亚迪·宋·2023款'}} + + + + + + + + @@ -469,4 +498,26 @@ + + + + + + 确认解锁线索 + 解锁后，视为接受《合作条款》 + + + 不再提醒 + + + + + + + + \ No newline at end of file diff --git a/pages/customer/score/exchange.js b/pages/customer/score/exchange.js new file mode 100644 index 0000000..e2a7ee5 --- /dev/null +++ b/pages/customer/score/exchange.js @@ -0,0 +1,66 @@ +// pages/customer/score/exchange.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/customer/score/exchange.json b/pages/customer/score/exchange.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/pages/customer/score/exchange.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/customer/score/exchange.wxml b/pages/customer/score/exchange.wxml new file mode 100644 index 0000000..8bcc00b --- /dev/null +++ b/pages/customer/score/exchange.wxml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/pages/customer/score/exchange.wxss b/pages/customer/score/exchange.wxss new file mode 100644 index 0000000..3fe6e89 --- /dev/null +++ b/pages/customer/score/exchange.wxss @@ -0,0 +1 @@ +/* pages/customer/score/exchange.wxss */ \ No newline at end of file diff --git a/pages/customer/score/index.js b/pages/customer/score/index.js new file mode 100644 index 0000000..b93b953 --- /dev/null +++ b/pages/customer/score/index.js @@ -0,0 +1,66 @@ +// pages/customer/score/index.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/customer/score/index.json b/pages/customer/score/index.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/pages/customer/score/index.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/customer/score/index.wxml b/pages/customer/score/index.wxml new file mode 100644 index 0000000..315c000 --- /dev/null +++ b/pages/customer/score/index.wxml @@ -0,0 +1,2 @@ + +pages/customer/score/index.wxml \ No newline at end of file diff --git a/pages/customer/score/index.wxss b/pages/customer/score/index.wxss new file mode 100644 index 0000000..ce455b0 --- /dev/null +++ b/pages/customer/score/index.wxss @@ -0,0 +1 @@ +/* pages/customer/score/index.wxss */ \ No newline at end of file diff --git a/pages/customer/score/recharge.js b/pages/customer/score/recharge.js new file mode 100644 index 0000000..1e67c3d --- /dev/null +++ b/pages/customer/score/recharge.js @@ -0,0 +1,70 @@ +// pages/customer/score/recharge.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + text: `爱能之家（厦门）新能源有限公司 + 账号：129260100100576097 + 开户行：兴业银行厦门自贸试验区象屿支行 + 备注：公司名称 + ` + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/customer/score/recharge.json b/pages/customer/score/recharge.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/pages/customer/score/recharge.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/customer/score/recharge.wxml b/pages/customer/score/recharge.wxml new file mode 100644 index 0000000..f168a6e --- /dev/null +++ b/pages/customer/score/recharge.wxml @@ -0,0 +1,40 @@ + + + + + + + 方式一 · 在线充值 + + + + 充值金额￥20000 + + + + + + + + + 方式二 · 线下转账 + 复制信息 + + + + {{text}} + + + + + + 充值说明： + + 1. 充值金额为固定为20000元。 + 2. 微信充值后，积分实时到账（推荐）。 + 3. 线下转账方式需备注清楚公司名称，财务收到打款后会在1日内完成积分充值操作。 + 需开具充值发票请联系客服。 + + + + \ No newline at end of file diff --git a/pages/customer/score/recharge.wxss b/pages/customer/score/recharge.wxss new file mode 100644 index 0000000..8d4ed1f --- /dev/null +++ b/pages/customer/score/recharge.wxss @@ -0,0 +1 @@ +/* pages/customer/score/recharge.wxss */ \ No newline at end of file diff --git a/pages/order/index.js b/pages/order/index.js index 6d31b72..35cfdcd 100644 --- a/pages/order/index.js +++ b/pages/order/index.js @@ -503,4 +503,39 @@ Page({ this.getAppSeries() } }, + // 同意核销 + bindAgreeCheckCode(e){ + let that = this + let index = e.currentTarget.dataset.index + let item = that.data.list[index] + let params = {} + console.log(1111) + // params['id'] = item.id + // params['code'] = item.other_data.o_data_4['购车券'].value + // _.apiQuery.putAppCusorderAgreeCheckCode(params).then(res => { + // if(res.data.code == 0){ + // that.setData({ + // ['list['+index+'].other_data.o_data_4.购车券.value']:'已核销', + // }) + // wx.showToast({ + // title: '核销成功', + // icon: 'success', + // duration: 2000 + // }) + // } + // else{ + // wx.showToast({ + // title: res.data.msg, + // icon: 'none', + // duration: 2000 + // }) + // } + // that.setData({ + // ['list['+index+'].other_data.o_data_4.购车券.disabled']:true, + // }) + // that.setData({ + // ['list['+index+'].other_data.o_data_4.购车券.text']:'已核销', + // }) + // }) + }, }) \ No newline at end of file diff --git a/pages/order/index.wxml b/pages/order/index.wxml index 6bd385d..1d13ef1 100644 --- a/pages/order/index.wxml +++ b/pages/order/index.wxml @@ -139,6 +139,13 @@ + + {{'购车券'}} + + + + + 注：{{item.remark}}