mkm/nk-shop2.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
weipengfei 2024-02-21 18:22:41 +08:00
parent 22aacdfcdd
commit b728bf6a4f
15 changed files with 56 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/activity.js
View File

@ -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);
}

4
config/app.js
View File

@ -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) {

4
manifest.json
View File

@ -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" : {

8
pages.json
View File

@ -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

18
pages/newActivity/giftBag/giftBag.vue
View File

@ -29,10 +29,10 @@
</view>
<view class="a_tips">
<view>礼包说明：</view>
<view>购买1000-4999元礼包，补贴对应金额5%的现金抵扣红包</view>
<view>购买5000-9999元礼包，补贴对应金额10%的现金抵扣红包</view>
<view>购买10000-49999元礼包，补贴对应金额15%的现金抵扣红包</view>
<view>购买50000-100000元礼包，补贴对应金额20%的现金抵扣红包</view>
<view>购买1000-4999元礼包，补贴对应金额5%的现金抵扣补贴</view>
<view>购买5000-9999元礼包，补贴对应金额10%的现金抵扣补贴</view>
<view>购买10000-49999元礼包，补贴对应金额15%的现金抵扣补贴</view>
<view>购买50000-100000元礼包，补贴对应金额20%的现金抵扣补贴</view>
</view>
</view>
<view class="footer">
@ -54,7 +54,7 @@
<text v-if="red_type==3">50000-100000</text>
</view>
<view class="ref_center">
赠送红包变为
赠送补贴变为
</view>
<view class="ref_bottom">
<view class="bottom_item" style="width: 100%;">
@ -127,16 +127,16 @@
recordList: [],
tipType: [
{
red1: '5%的现金抵扣红包',
red1: '5%的现金抵扣补贴',
},
{
red1: '10%的现金抵扣红包',
red1: '10%的现金抵扣补贴',
},
{
red1: '15%的现金抵扣红包',
red1: '15%的现金抵扣补贴',
},
{
red1: '20%的现金抵扣红包',
red1: '20%的现金抵扣补贴',
},
{
red1: '',

12
pages/newActivity/invitation/invitation.vue
View File

@ -9,8 +9,8 @@
<view class="qr_code">
<image :src="qr_img"></image>
</view>
<view class="qr_text">扫一扫，红包正在路上</view>
<view class="qr_tips">温馨提示：邀请新用户才有机会获得红包哦</view>
<view class="qr_text">扫一扫，补贴正在路上</view>
<view class="qr_tips">温馨提示：邀请新用户才有机会获得补贴哦</view>
</view>
</view>
<view class="b_user">
@ -22,7 +22,7 @@
</view>
</block>
</view>
<view class="u_tips">邀请新用户消费达目标金额，有机会领取红包哦~</view>
<view class="u_tips">邀请新用户消费达目标金额，有机会领取补贴哦~</view>
<view class="u_btn">
<image v-if="status==0" class="btn_image" @click="open" mode="widthFix" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/ibtn1.webp"></image>
<image v-if="status==1" class="btn_image" @click="open" mode="widthFix" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/ibtn2.webp"></image>
@ -36,7 +36,7 @@
<view class="p_text">
<view class="big">抱歉！</view>
<view class="smoll">有好友消费未达目标金额</view>
<view class="smoll">无法领红包哦~</view>
<view class="smoll">无法领补贴哦~</view>
</view>
</view>
<image @click="close()" class="close_img" mode="widthFix" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/close.png"></image>
@ -46,7 +46,7 @@
<image class="img" mode="widthFix" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/red_packet2.webp"></image>
<view class="p_text">
<view class="big">恭喜！</view>
<view class="smoll">成功获得实物通用红包</view>
<view class="smoll">成功获得实物通用补贴</view>
<view class="smoll">赶快打开吧~</view>
</view>
</view>
@ -143,7 +143,7 @@ export default {
this.qr_img = res.data.url;
})
},
// 打开红包
// 打开补贴
async openRedPacket(){
this.$refs.redPacket.close();
try{

4
pages/newActivity/subsidy/subsidy.vue
View File

@ -6,14 +6,14 @@
<image @click="back" class="bg_back" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/back.png"></image>
<view class="bg_title">补贴记录</view>
<view class="b_title">
<view>总计获得</view> <view class="count">{{total_amount}}</view> <view>元补贴红包</view>
<view>总计获得</view> <view class="count">{{total_amount}}</view> <view>元补贴补贴</view>
</view>
<view class="b_body">
<image class="body_head_img" mode="widthFix" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/srecord.webp"></image>
<view class="b_head">
<view class="head_title">消费金额</view>
<view class="head_title">补贴金额</view>
<view class="head_title2">红包获得时间</view>
<view class="head_title2">补贴获得时间</view>
</view>
<view class="b_content">
<view class="content_list" v-for="(item, index) in list" :key="index">

6
pages/newActivity/subsidy/subsidy2.vue
View File

@ -3,16 +3,16 @@
<view class="bg">
<image class="bg_img" mode="widthFix" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/subsidy.webp"></image>
<image @click="back" class="bg_back" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/back.png"></image>
<view class="bg_title">无门槛实物通用红包</view>
<view class="bg_title">无门槛实物通用补贴</view>
<view class="b_title">
<view>总计剩余</view> <view class="count">{{total_amount}}</view> <view>元通用红包</view>
<view>总计剩余</view> <view class="count">{{total_amount}}</view> <view>元通用补贴</view>
</view>
<view class="b_body">
<image class="body_head_img" mode="widthFix" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/srecord.webp"></image>
<view class="b_head">
<view class="head_title">消费金额</view>
<view class="head_title">补贴金额</view>
<view class="head_title2">红包获得时间</view>
<view class="head_title2">补贴获得时间</view>
</view>
<view class="b_content">
<view class="content_list" v-for="(item, index) in list" :key="index">

6
pages/newActivity/subsidy/subsidy3.vue
View File

@ -3,16 +3,16 @@
<view class="bg">
<image class="bg_img" mode="widthFix" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/subsidy.webp"></image>
<image @click="back" class="bg_back" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/back.png"></image>
<view class="bg_title">现金抵扣红包</view>
<view class="bg_title">现金抵扣补贴</view>
<view class="b_title">
<view>总计剩余</view> <view class="count">{{total_amount}}</view> <view>元抵扣红包</view>
<view>总计剩余</view> <view class="count">{{total_amount}}</view> <view>元抵扣补贴</view>
</view>
<view class="b_body">
<image class="body_head_img" mode="widthFix" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/srecord.webp"></image>
<view class="b_head">
<view class="head_title">消费金额</view>
<view class="head_title">补贴金额</view>
<view class="head_title2">红包获得时间</view>
<view class="head_title2">补贴获得时间</view>
</view>
<view class="b_content">
<view class="content_list" v-for="(item, index) in list" :key="index">

2
pages/nongKe/cloud_entrepot/indexa.vue
View File

@ -15,7 +15,7 @@
</block>
</view>
</view> -->
<view class="">
<view class="">
<view v-if="showtit">

12
pages/nongKe/cloud_entrepot/indexh.vue
View File

@ -177,12 +177,6 @@
<shortPopup ref="shortPopupRef" @addCart="loadCart" :source="103"></shortPopup>
<uni-popup ref="activityRef">
<view style="padding-bottom: 10vh;display: flex;flex-direction: column;align-items: center;" @click="closeAcvtivity">
<image style="width: 560rpx;" mode="widthFix" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/activity_card.webp"></image>
<image style="width: 60rpx" mode="widthFix" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/close.png"></image>
</view>
</uni-popup>
</view>
</template>
@ -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

6
pages/redpacket/redpack_type.vue
View File

@ -6,7 +6,7 @@
</view>
<view class="bg_back">
<image @click="back" class="bc_image" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/back.png"></image>
<view class="title">红包余额</view>
<view class="title">补贴余额</view>
</view>
<view class="r_list" v-for="(item, index) in list" :key="index">
<view class="r_item" @click="navgo(item)">
@ -27,9 +27,9 @@
</view>
</view>
<view style="width: 100%;height: 260rpx;"></view>
<view class="activity">
<!-- <view class="activity">
<image mode="widthFix" @click="navTo()" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/activity1.webp"></image>
</view>
</view> -->
</view>
</template>

18
pages/redpacket/redpacket.vue
View File

@ -2,7 +2,7 @@
<view class="">
<!-- <block v-for="(item, index) in info">
<block v-if="item.type==1">
<view class="type_name">无门槛实物通用红包<text class="n_count">(2张)</text></view>
<view class="type_name">无门槛实物通用补贴<text class="n_count">(2张)</text></view>
<view class="r_list" v-for="(e, i) in item.list">
<view class="r_item" @click="change(index, i)">
<image class="r_bg" src="/static/active/red_packet.webp"></image>
@ -13,7 +13,7 @@
</view>
</view>
<view class="r_content">
<view class="r_name">现金抵扣红包</view>
<view class="r_name">现金抵扣补贴</view>
<view>仅限平台指定商家商品可使用</view>
<view>有效期至 2026.01.15 24:00:00</view>
</view>
@ -26,7 +26,7 @@
</view>
</block>
<block v-if="item.type==2">
<view class="type_name">不可使用红包<text class="n_count">(2张)</text></view>
<view class="type_name">不可使用补贴<text class="n_count">(2张)</text></view>
<view class="none_list" v-for="(e, i) in item.list">
<view class="r_body">
<view class="r_count">
@ -35,7 +35,7 @@
</view>
</view>
<view class="r_content">
<view class="r_name">现金抵扣红包</view>
<view class="r_name">现金抵扣补贴</view>
<view>仅限平台指定商家商品可使用</view>
<view>有效期至 2026.01.15 24:00:00</view>
</view>
@ -73,8 +73,8 @@
<view class="footer">
<view>
<text>已选 {{ changeRed?1:0 }} 张</text>
<view v-if="changeRed&&changeRed.coupon_title.includes('抵扣红包')" style="font-size: 24rpx;margin-left: 10rpx;color: #ed4c3a;">(使用红包后此订单将不参与任何补贴活动)</view>
<view v-if="changeRed&&changeRed.coupon_title.includes('通用红包')" style="font-size: 24rpx;margin-left: 10rpx;color: #ed4c3a;">(使用红包后此订单将不参与用户消费补贴活动)</view>
<view v-if="changeRed&&changeRed.coupon_title.includes('抵扣补贴')" style="font-size: 24rpx;margin-left: 10rpx;color: #ed4c3a;">(使用补贴后此订单将不参与任何补贴活动)</view>
<view v-if="changeRed&&changeRed.coupon_title.includes('通用补贴')" style="font-size: 24rpx;margin-left: 10rpx;color: #ed4c3a;">(使用补贴后此订单将不参与用户消费补贴活动)</view>
<!-- , 可减 <text class="red_i">¥</text> <text class="red_c">0</text> -->
</view>
<view class="btn" @click="comfirm">确定</view>
@ -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]
}
],

2
pages/user/index.vue
View File

@ -97,7 +97,7 @@
<image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/d2868202401201750014779.png"></image>
<view>￥{{userInfo.red_pack_balance||"0.00"}}</view>
</view>
<view>红包余额 (元)</view>
<view>补贴余额 (元)</view>
</view>
</view>
<navigator hover-class="none"

14
pages/users/order_confirm/index.vue
View File

@ -379,16 +379,16 @@
</block>
</view> -->
<view class='item acea-row row-between-wrapper'>
<view>红包抵扣<!-- <text @tap="showCoupon" class="iconfont icon-wenhao1"></text> --></view>
<view>补贴抵扣<!-- <text @tap="showCoupon" class="iconfont icon-wenhao1"></text> --></view>
<block v-if="platformConsumption.length > 0">
<view class='discount money red_packet' @tap='couponTap3()'>
<text v-if="consumption_id">-￥{{consumption_money||'0.00'}}</text>
<text v-else>有补贴红包未选</text>
<text v-else>有补贴补贴未选</text>
<text class='iconfont icon-jiantou'></text>
</view>
</block>
<block v-else>
<view class='discount'>暂无可用红包</view>
<view class='discount'>暂无可用补贴</view>
</block>
</view>
<view class='item acea-row row-between-wrapper' v-if="priceGroup.storePostage > 0">
@ -441,7 +441,7 @@
<view class="ref_content">
<view class="r_c_title">优惠提示</view>
<view class="r_c_text">当前订单金额已大于100元</view>
<view class="r_c_text">建议参与惠农供销活动进行购买，下单满100元即可获得红包</view>
<view class="r_c_text">建议参与惠农供销活动进行购买，下单满100元即可获得补贴</view>
<view class="r_c_btn">
<button class="r_c_btn1" @click="closeAndSubOrder">继续支付</button>
<button class="r_c_btn2" @click="gotoCloud">前往活动</button>
@ -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);
}
},