From b728bf6a4f0fcbcf28b0684de8035f69b3a14bb0 Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Wed, 21 Feb 2024 18:22:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/activity.js | 8 ++++---- config/app.js | 4 ++-- manifest.json | 4 ++-- pages.json | 8 ++++---- pages/newActivity/giftBag/giftBag.vue | 18 +++++++++--------- pages/newActivity/invitation/invitation.vue | 12 ++++++------ pages/newActivity/subsidy/subsidy.vue | 4 ++-- pages/newActivity/subsidy/subsidy2.vue | 6 +++--- pages/newActivity/subsidy/subsidy3.vue | 6 +++--- pages/nongKe/cloud_entrepot/indexa.vue | 2 +- pages/nongKe/cloud_entrepot/indexh.vue | 12 ------------ pages/redpacket/redpack_type.vue | 6 +++--- pages/redpacket/redpacket.vue | 18 +++++++++--------- pages/user/index.vue | 2 +- pages/users/order_confirm/index.vue | 14 +++++++------- 15 files changed, 56 insertions(+), 68 deletions(-) diff --git a/api/activity.js b/api/activity.js index 3a59792..48b1195 100644 --- a/api/activity.js +++ b/api/activity.js @@ -275,22 +275,22 @@ export function chooseConsumption(data) { return request.post(`storeActivity/choose`, data); } -// 拉新红包活动完成状态 +// 拉新补贴活动完成状态 export function storeActivityStatus(data) { return request.get(`storeActivity/status`, data); } -// 领取红包 +// 领取补贴 export function storeActivityReceive(data) { return request.post(`storeActivity/receive`, data); } -// 拉新红包活动完成状态 +// 拉新补贴活动完成状态 export function storeActivityRecord(data) { return request.get(`storeActivity/record`, data); } -// 红包余额统计 +// 补贴余额统计 export function storeActivityTotal(data) { return request.get(`storeActivity/total`, data); } diff --git a/config/app.js b/config/app.js index 5d52a61..aed86ed 100644 --- a/config/app.js +++ b/config/app.js @@ -12,8 +12,8 @@ let httpApiSix let wsApi // 在打包之前请检查当前环境是否正确 -const env = 'dev'; // 开发 -// const env = 'prod'; // 生产 +// const env = 'dev'; // 开发 +const env = 'prod'; // 生产 // const env = 'prew'; // 预上线 switch (env) { diff --git a/manifest.json b/manifest.json index 244d374..6ab46e5 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "惠农生活", "appid" : "__UNI__3A527D1", "description" : "", - "versionName" : "1.8.9", - "versionCode" : 189, + "versionName" : "1.9.0", + "versionCode" : 190, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages.json b/pages.json index 8e38cd9..f69b4b5 100644 --- a/pages.json +++ b/pages.json @@ -231,7 +231,7 @@ "path" : "pages/redpacket/redpacket", "style" : { - "navigationBarTitleText" : "红包", + "navigationBarTitleText" : "补贴", "enablePullDownRefresh" : false } }, @@ -239,7 +239,7 @@ "path" : "pages/redpacket/redpack_type", "style" : { - "navigationBarTitleText" : "红包余额", + "navigationBarTitleText" : "补贴余额", "enablePullDownRefresh": false, "navigationStyle": "custom", "onReachBottomDistance": 300 @@ -249,7 +249,7 @@ "path" : "pages/newActivity/subsidy/subsidy2", "style" : { - "navigationBarTitleText" : "实物通用红包", + "navigationBarTitleText" : "实物通用补贴", "enablePullDownRefresh": false, "navigationStyle": "custom", "onReachBottomDistance": 300 @@ -259,7 +259,7 @@ "path" : "pages/newActivity/subsidy/subsidy3", "style" : { - "navigationBarTitleText" : "现金抵扣红包", + "navigationBarTitleText" : "现金抵扣补贴", "enablePullDownRefresh": false, "navigationStyle": "custom", "onReachBottomDistance": 300 diff --git a/pages/newActivity/giftBag/giftBag.vue b/pages/newActivity/giftBag/giftBag.vue index fe564fc..b3b37e7 100644 --- a/pages/newActivity/giftBag/giftBag.vue +++ b/pages/newActivity/giftBag/giftBag.vue @@ -29,10 +29,10 @@ 礼包说明： - 购买1000-4999元礼包，补贴对应金额5%的现金抵扣红包 - 购买5000-9999元礼包，补贴对应金额10%的现金抵扣红包 - 购买10000-49999元礼包，补贴对应金额15%的现金抵扣红包 - 购买50000-100000元礼包，补贴对应金额20%的现金抵扣红包 + 购买1000-4999元礼包，补贴对应金额5%的现金抵扣补贴 + 购买5000-9999元礼包，补贴对应金额10%的现金抵扣补贴 + 购买10000-49999元礼包，补贴对应金额15%的现金抵扣补贴 + 购买50000-100000元礼包，补贴对应金额20%的现金抵扣补贴 @@ -54,7 +54,7 @@ 50000-100000 - 赠送红包变为 + 赠送补贴变为 @@ -127,16 +127,16 @@ recordList: [], tipType: [ { - red1: '5%的现金抵扣红包', + red1: '5%的现金抵扣补贴', }, { - red1: '10%的现金抵扣红包', + red1: '10%的现金抵扣补贴', }, { - red1: '15%的现金抵扣红包', + red1: '15%的现金抵扣补贴', }, { - red1: '20%的现金抵扣红包', + red1: '20%的现金抵扣补贴', }, { red1: '', diff --git a/pages/newActivity/invitation/invitation.vue b/pages/newActivity/invitation/invitation.vue index d04183b..a920aa8 100644 --- a/pages/newActivity/invitation/invitation.vue +++ b/pages/newActivity/invitation/invitation.vue @@ -9,8 +9,8 @@ - 扫一扫，红包正在路上 - 温馨提示：邀请新用户才有机会获得红包哦 + 扫一扫，补贴正在路上 + 温馨提示：邀请新用户才有机会获得补贴哦 @@ -22,7 +22,7 @@ - 邀请新用户消费达目标金额，有机会领取红包哦~ + 邀请新用户消费达目标金额，有机会领取补贴哦~ @@ -36,7 +36,7 @@ 抱歉！ 有好友消费未达目标金额 - 无法领红包哦~ + 无法领补贴哦~ @@ -46,7 +46,7 @@ 恭喜！ - 成功获得实物通用红包 + 成功获得实物通用补贴 赶快打开吧~ @@ -143,7 +143,7 @@ export default { this.qr_img = res.data.url; }) }, - // 打开红包 + // 打开补贴 async openRedPacket(){ this.$refs.redPacket.close(); try{ diff --git a/pages/newActivity/subsidy/subsidy.vue b/pages/newActivity/subsidy/subsidy.vue index deae5bb..8eea504 100644 --- a/pages/newActivity/subsidy/subsidy.vue +++ b/pages/newActivity/subsidy/subsidy.vue @@ -6,14 +6,14 @@ 补贴记录 - 总计获得 {{total_amount}} 元补贴红包 + 总计获得 {{total_amount}} 元补贴补贴 消费金额 补贴金额 - 红包获得时间 + 补贴获得时间 diff --git a/pages/newActivity/subsidy/subsidy2.vue b/pages/newActivity/subsidy/subsidy2.vue index 1d7599a..33f9ada 100644 --- a/pages/newActivity/subsidy/subsidy2.vue +++ b/pages/newActivity/subsidy/subsidy2.vue @@ -3,16 +3,16 @@ - 无门槛实物通用红包 + 无门槛实物通用补贴 - 总计剩余 {{total_amount}} 元通用红包 + 总计剩余 {{total_amount}} 元通用补贴 消费金额 补贴金额 - 红包获得时间 + 补贴获得时间 diff --git a/pages/newActivity/subsidy/subsidy3.vue b/pages/newActivity/subsidy/subsidy3.vue index 191f934..766cd60 100644 --- a/pages/newActivity/subsidy/subsidy3.vue +++ b/pages/newActivity/subsidy/subsidy3.vue @@ -3,16 +3,16 @@ - 现金抵扣红包 + 现金抵扣补贴 - 总计剩余 {{total_amount}} 元抵扣红包 + 总计剩余 {{total_amount}} 元抵扣补贴 消费金额 补贴金额 - 红包获得时间 + 补贴获得时间 diff --git a/pages/nongKe/cloud_entrepot/indexa.vue b/pages/nongKe/cloud_entrepot/indexa.vue index 0f67fb5..85a76b2 100644 --- a/pages/nongKe/cloud_entrepot/indexa.vue +++ b/pages/nongKe/cloud_entrepot/indexa.vue @@ -15,7 +15,7 @@ --> - + diff --git a/pages/nongKe/cloud_entrepot/indexh.vue b/pages/nongKe/cloud_entrepot/indexh.vue index 800d959..a5f53db 100644 --- a/pages/nongKe/cloud_entrepot/indexh.vue +++ b/pages/nongKe/cloud_entrepot/indexh.vue @@ -177,12 +177,6 @@ - - - - - - @@ -377,9 +371,6 @@ }) .exec(); }, 100) - this.$nextTick(()=>{ - this.$refs.activityRef.open(); - }) }, computed: { downMenus: function() { @@ -400,9 +391,6 @@ }, mapGetters(['viewColor', 'keyColor'])), }, methods: { - closeAcvtivity(){ - this.$refs.activityRef.close(); - }, async getCloundShop() { const { data diff --git a/pages/redpacket/redpack_type.vue b/pages/redpacket/redpack_type.vue index 9bf33bb..e101723 100644 --- a/pages/redpacket/redpack_type.vue +++ b/pages/redpacket/redpack_type.vue @@ -6,7 +6,7 @@ - 红包余额 + 补贴余额 @@ -27,9 +27,9 @@ - + diff --git a/pages/redpacket/redpacket.vue b/pages/redpacket/redpacket.vue index cb754fc..c5f26e7 100644 --- a/pages/redpacket/redpacket.vue +++ b/pages/redpacket/redpacket.vue @@ -2,7 +2,7 @@ 确定 @@ -89,17 +89,17 @@ info: [ { type: 1, // 是否可以使用 - name: '无门槛实物通用红包', + name: '无门槛实物通用补贴', list: [1, 2] }, { type: 1, // 是否可以使用 - name: '现金抵扣红包', + name: '现金抵扣补贴', list: [1,2,3] }, { type: 2, // 是否可以使用, 2不可以使用 - name: '不可使用红包', + name: '不可使用补贴', list: [1] } ], diff --git a/pages/user/index.vue b/pages/user/index.vue index 2d1ec79..4f42e5d 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -97,7 +97,7 @@ ￥{{userInfo.red_pack_balance||"0.00"}} - 红包余额 (元) + 补贴余额 (元) --> - 红包抵扣 + 补贴抵扣 -￥{{consumption_money||'0.00'}} - 有补贴红包未选 + 有补贴补贴未选 - 暂无可用红包 + 暂无可用补贴 @@ -441,7 +441,7 @@ 优惠提示 当前订单金额已大于100元 - 建议参与惠农供销活动进行购买，下单满100元即可获得红包 + 建议参与惠农供销活动进行购买，下单满100元即可获得补贴 @@ -692,14 +692,14 @@ interest_rate: '', //利率 settle_cycle: '', // 周期 type_id: '', //店铺类型 - consumption_id: '', //红包id - consumption_money: '', //红包抵扣金额 + consumption_id: '', //补贴id + consumption_money: '', //补贴抵扣金额 }; }, computed: { ...mapGetters(['isLogin', 'viewColor']), ...configMap(['hide_mer_status', 'alipay_open', 'yue_pay_status']), - red_price(){ // 计算红包抵扣了多少钱 + red_price(){ // 计算补贴抵扣了多少钱 return (this.proPrice - this.totalPrice).toFixed(2); } },