From 4d258a0c2ead1dfdf402f5a65fc01b79500cc6a5 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Sat, 20 Jan 2024 18:27:30 +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

---
 components/activityCard.vue         |   2 +-
 pages.json                          |  16 ++
 pages/redpacket/redpack_type.vue    |  25 +++
 pages/redpacket/redpacket.vue       | 292 ++++++++++++++++++++++++++++
 pages/user/index.vue                |  55 +++++-
 pages/users/order_confirm/index.vue |  41 +++-
 static/active/red_packet.webp       | Bin 0 -> 1948 bytes
 7 files changed, 422 insertions(+), 9 deletions(-)
 create mode 100644 pages/redpacket/redpack_type.vue
 create mode 100644 pages/redpacket/redpacket.vue
 create mode 100644 static/active/red_packet.webp

diff --git a/components/activityCard.vue b/components/activityCard.vue
index e050baf..55daa7e 100644
--- a/components/activityCard.vue
+++ b/components/activityCard.vue
@@ -48,7 +48,7 @@
 <style lang="scss">
 .a_c_home{
   width: 600rpx;
-  height: 80vh;
+  height: 90vh;
   // border: 1px solid red;
   position: relative;
   .head_img{
diff --git a/pages.json b/pages.json
index ea46af7..82a7a5e 100644
--- a/pages.json
+++ b/pages.json
@@ -226,6 +226,22 @@
             "navigationStyle": "custom",
             "onReachBottomDistance": 300
           }
+        },
+        {
+          "path" : "pages/redpacket/redpacket",
+          "style" : 
+          {
+            "navigationBarTitleText" : "补贴红包",
+            "enablePullDownRefresh" : false
+          }
+        },
+        {
+          "path" : "pages/redpacket/redpack_type",
+          "style" : 
+          {
+            "navigationBarTitleText" : "红包余额",
+            "enablePullDownRefresh" : false
+          }
         }
     ],
 	"subPackages": [{
diff --git a/pages/redpacket/redpack_type.vue b/pages/redpacket/redpack_type.vue
new file mode 100644
index 0000000..ec0113f
--- /dev/null
+++ b/pages/redpacket/redpack_type.vue
@@ -0,0 +1,25 @@
+<template>
+  <view class="">
+    
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+       
+    }
+  },
+  onLoad() {},
+  onShow() {},
+  methods: {},
+  onPullDownRefresh() {
+      uni.stopPullDownRefresh()
+    }
+  }
+</script>
+
+<style lang="scss">
+
+</style>
diff --git a/pages/redpacket/redpacket.vue b/pages/redpacket/redpacket.vue
new file mode 100644
index 0000000..d4ece15
--- /dev/null
+++ b/pages/redpacket/redpacket.vue
@@ -0,0 +1,292 @@
+<template>
+  <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="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>
+            <view class="r_body">
+              <view class="r_count">
+                <view class="rc_count">
+                  <text class="rc_icon">￥</text>240
+                </view>
+              </view>
+              <view class="r_content">
+                <view class="r_name">现金抵扣红包</view>
+                <view>仅限平台指定商家商品可使用</view>
+                <view>有效期至 2026.01.15 24:00:00</view>
+              </view>
+              <view class="r_icon">
+                <u-icon v-if="changeRed.type == index && changeRed.id == i" name="checkmark-circle-fill" color="#FFF3CC" size="56rpx"></u-icon>
+                <u-icon v-else name="checkmark-circle" color="#FFF3CC" size="56rpx"></u-icon>
+              </view>
+            </view>
+          </view>
+        </view>
+      </block>
+      <block v-if="item.type==2">
+        <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">
+              <view class="rc_count">
+                <text class="rc_icon">￥</text>200
+              </view>
+            </view>
+            <view class="r_content">
+              <view class="r_name">现金抵扣红包</view>
+              <view>仅限平台指定商家商品可使用</view>
+              <view>有效期至 2026.01.15 24:00:00</view>
+            </view>
+          </view>
+          <u-line dashed color="#999999"></u-line>
+          <view class="n_tips">本单不可用原因：未在平台指定店铺使用</view>
+        </view>
+      </block>
+    </block>
+    
+    <view class="footer">
+      <view>已选 {{ changeRed.id!=-1?1:0 }} 张, 可减 <text class="red_i">¥</text> <text class="red_c">50</text></view>
+      <view class="btn" @click="comfirm">确定</view>
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    data() {
+      return {
+        info: [
+          {
+            type: 1, // 是否可以使用
+            name: '无门槛实物通用红包',
+            list: [1, 2]
+          },
+          {
+            type: 1, // 是否可以使用
+            name: '现金抵扣红包',
+            list: [1,2,3]
+          },
+          {
+            type: 2, // 是否可以使用, 2不可以使用
+            name: '不可使用红包',
+            list: [1]
+          }
+        ],
+        changeRed: {
+          type: -1,
+          id: -1,
+        },
+      }
+    },
+    onLoad(option) {
+      const eventChannel = this.getOpenerEventChannel();
+      // 监听acceptDataFromOpenerPage事件，获取上一页面通过eventChannel传送到当前页面的数据
+      eventChannel.on('changeRedPacketInfo', (data) => {
+        console.log(data)
+      })
+    },
+    onShow() {},
+    methods: {
+      change(e, i) {
+        console.log(e, i);
+        if(this.changeRed.type==e&&this.changeRed.id==i){
+          this.changeRed = {
+            type: -1,
+            id: -1
+          }
+        }else this.changeRed = {
+          type: e,
+          id: i
+        }
+      },
+      comfirm(){
+        uni.$emit('changeRedPacket', { id: 1 });
+        uni.navigateBack()
+      }
+    },
+    onPullDownRefresh() {
+      uni.stopPullDownRefresh()
+    }
+  }
+</script>
+
+<style lang="scss">
+  page{
+    background-color: #fff;
+  }
+  .type_name{
+    padding: 20rpx;
+    font-size: 28rpx;
+    .n_count{
+      color: #7A7A7A;
+      font-size: 24rpx;
+      margin-left: 10rpx;
+    }
+  }
+  .r_list {
+    padding: 0 20rpx 20rpx 20rpx;
+
+    .r_item {
+      height: 156rpx;
+      width: 710rpx;
+      position: relative;
+
+      .r_bg {
+        width: 100%;
+        height: 100%;
+      }
+
+      .r_body {
+        position: absolute;
+        top: 0;
+        left: 0;
+        bottom: 0;
+        right: 0;
+        display: flex;
+
+        .r_count {
+          flex: 2;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          color: #A46F32;
+          font-size: 44rpx;
+          font-weight: bold;
+
+          .rc_count {
+            display: flex;
+            align-items: flex-end;
+          }
+
+          .rc_icon {
+            font-size: 28rpx;
+            font-weight: 500;
+            margin-bottom: 8rpx;
+          }
+        }
+
+        .r_content {
+          flex: 4;
+          color: #FFF3CC;
+          font-size: 24rpx;
+          padding: 18rpx 10rpx 18rpx 40rpx;
+          display: flex;
+          flex-direction: column;
+          justify-content: space-between;
+
+          .r_name {
+            font-size: 32rpx;
+            font-weight: 500;
+            margin-bottom: 10rpx;
+          }
+          view{
+            width: 100%;
+            overflow: hidden; /* 隐藏超出宽度的文本 */
+            white-space: nowrap; /* 不换行 */
+            text-overflow: ellipsis; /* 文本末尾显示省略号 */
+          }
+        }
+
+        .r_icon {
+          flex: 1;
+          display: flex;
+          align-items: center;
+        }
+      }
+    }
+  }
+  .none_list{
+    margin: 0 20rpx 20rpx 20rpx;
+    background-color: #E2E2E2;
+    border-radius: 20rpx;
+    
+    .r_body {
+      height: 156rpx;
+      width: 710rpx;
+      display: flex;
+    
+      .r_count {
+        flex: 2;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        color: #333;
+        font-size: 44rpx;
+        font-weight: bold;
+    
+        .rc_count {
+          display: flex;
+          align-items: flex-end;
+        }
+    
+        .rc_icon {
+          font-size: 28rpx;
+          font-weight: 500;
+          margin-bottom: 8rpx;
+        }
+      }
+    
+      .r_content {
+        flex: 5;
+        color: #333;
+        font-size: 24rpx;
+        padding: 18rpx 10rpx 18rpx 40rpx;
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+    
+        .r_name {
+          font-size: 32rpx;
+          font-weight: 500;
+          margin-bottom: 10rpx;
+        }
+        view{
+          width: 100%;
+          overflow: hidden; /* 隐藏超出宽度的文本 */
+          white-space: nowrap; /* 不换行 */
+          text-overflow: ellipsis; /* 文本末尾显示省略号 */
+        }
+      }
+    
+    }
+    
+    .n_tips{
+      padding: 10rpx 30rpx 20rpx 30rpx;
+      color: #333;
+      font-size: 24rpx;
+    }
+  }
+  .footer{
+    height: 130rpx;
+    padding: 30rpx;
+    width: 100%;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    background-color: #F6F6F6;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-size: 28rpx;
+    .red_i{
+      color: #FF421D;
+      margin-left: 20rpx;
+    }
+    .red_c{
+      color: #FF421D;
+      font-size: 44rpx;
+    }
+    .btn{
+      width: 128rpx;
+      height: 68rpx;
+      background-color: #EC693F;
+      border-radius: 34rpx;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      color: #fff;
+    }
+  }
+</style>
\ No newline at end of file
diff --git a/pages/user/index.vue b/pages/user/index.vue
index c6958f4..2465040 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -17,7 +17,7 @@
 		<!-- 自定义顶部背景颜色 -->
 		<view class="new-users skeleton" :style="{visibility: showSkeleton ? 'hidden' : 'visible'}">
 			<view class="head">
-				<view class="user-card" :class="userInfo.svip_open && svip_switch_status == 1 ? 'svip-card' : ''">
+				<view class="user-card" style="padding-bottom: 0;" :class="userInfo.svip_open && svip_switch_status == 1 ? 'svip-card' : ''">
 					<view class="bg"></view>
 					<view class="user-info">
 						<view class="avatar-box" :class="{on:userInfo.is_svip > 0 && svip_switch_status == 1}">
@@ -61,7 +61,7 @@
 							<view class="phone" v-if="!userInfo.phone && isLogin" @tap="bindPhone">绑定手机号</view>
 						</view>
 					</view>
-					<view class="num-wrapper skeleton-rect">
+					<!-- <view class="num-wrapper skeleton-rect">
 						<view class="num-item" @click="goMenuPage('/pages/users/user_goods_collection/index')">
 							<text class="num">{{userInfo.total_collect_product || 0}}</text>
 							<view class="txt">我的收藏</view>
@@ -75,15 +75,31 @@
 							<text class="num">{{userInfo.total_visit_product || 0}}</text>
 							<view class="txt">浏览记录</view>
 						</view>
-						<!-- <view class="num-item" @click="goMenuPage('/pages/users/user_coupon/index')">
+						<view class="num-item" @click="goMenuPage('/pages/users/user_coupon/index')">
 							<text class="num">{{userInfo.total_coupon || 0}}</text>
 							<view class="txt">优惠券</view>
-						</view> -->
+						</view>
             <view class="num-item" @click="goMenuPage('/pages/users/user_coupon/index')">
             	<text class="num">{{userInfo.total_coupon || 0}}</text>
             	<view class="txt">购物券</view>
             </view>
-					</view>
+					</view> -->
+          <view class="packet_card">
+            <view class="p_d_item" @click="authTo('/pages/users/user_money/index')">
+              <view class="p_d_count">
+                <image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e41f4202401201745498894.png"></image>
+                ￥20000
+              </view>
+              <view>我的余额 (元)</view>
+            </view>
+            <view class="p_d_item" @click="authTo('/pages/redpacket/redpack_type')">
+              <view class="p_d_count">
+                <image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/d2868202401201750014779.png"></image>
+                ￥200
+              </view>
+              <view>红包余额 (元)</view>
+            </view>
+          </view>
 					<navigator hover-class="none"
 						:url="userInfo.is_svip > 0 ? '/pages/annex/vip_center/index' : '/pages/annex/vip_paid/index'"
 						class="cardVipA acea-row row-between-wrapper"
@@ -1319,4 +1335,33 @@
 			font-size: 24rpx;
 		}
 	}
+  .packet_card{
+    height: 140rpx;
+    width: 710rpx;
+    background-color: rgba(#fff, 0.3);
+    margin: 0 auto;
+    border-radius: 20rpx 20rpx 0 0;
+    margin-top: 20rpx;
+    padding: 20rpx 40rpx;
+    color: #fff;
+    display: flex;
+    justify-content: space-between;
+    .p_d_item{
+      font-size: 26rpx;
+      font-weight: bold;
+      flex: 1;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      .p_d_count{
+        display: flex;
+        align-items: center;
+        font-size: 38rpx;
+        image{
+          width: 53rpx;
+          height: 53rpx;
+        }
+      }
+    }
+  }
 </style>
\ No newline at end of file
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index f3e38e2..e6b6508 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -363,7 +363,7 @@
 						</checkbox-group>
 					</view>
 				</view>
-				<view class='item acea-row row-between-wrapper'
+				<!-- <view class='item acea-row row-between-wrapper'
 					v-if="!seckillId && order_type != 3 && order_type != 4 && enabledPlatformCoupon">
 					<view>平台优惠券<text @tap="showCoupon" class="iconfont icon-wenhao1"></text></view>
 					<block v-if="platformCoupon.length > 0">
@@ -376,7 +376,21 @@
 					<block v-else>
 						<view class='discount'>暂无优惠券</view>
 					</block>
-				</view>
+				</view> -->
+        <view class='item acea-row row-between-wrapper'
+        	v-if="platformConsumption.length > 0">
+        	<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="total_platform_coupon_price>0">-￥{{total_platform_coupon_price}}</text>
+        			<text v-else>有补贴红包未选</text>
+        			<text class='iconfont icon-jiantou'></text>
+        		</view>
+        	</block>
+        	<block v-else>
+        		<view class='discount'>暂无可用红包</view>
+        	</block>
+        </view>
 				<view class='item acea-row row-between-wrapper' v-if="priceGroup.storePostage > 0">
 					<view>运费：</view>
 					<view class='money'>+￥{{priceGroup.storePostage}}</view>
@@ -503,6 +517,7 @@
 				// 备注
 				msgObj: {},
 				textareaStatus: true,
+        platformConsumption: [],
 				deliveryName: '快递配送',
 				//支付方式
 				cartArr: [{
@@ -1037,7 +1052,8 @@
 				}).then(res => {
 					// 默认选中
 					that.product_type=res.data.order_type
-					that.is_take = false
+					that.is_take = false;
+          that.platformConsumption = res.data.platformConsumption;
 					res.data.order.forEach(el => {
 						if (el.order.isTake == 1) that.is_take = true
 						el.isTake = 0
@@ -1183,6 +1199,17 @@
 				this.$set(this, "coupon_number", this.subCoupon['0'].length);
 				this.$set(this, "coupon_amount", this.plant_coupon_amount);
 			},
+      couponTap3: function(item, index) {
+      	uni.navigateTo({
+      	  url: '/pages/redpacket/redpacket',
+          success:(res)=> {
+            res.eventChannel.emit('changeRedPacketInfo', this.platformConsumption)
+            uni.$once('changeRedPacket', (data)=>{
+              console.log('选择红包', data);
+            })
+          }
+      	})
+      },
 			car: function() {
 				let that = this;
 				that.animated = false;
@@ -2583,4 +2610,12 @@
 		height: 756rpx;
 		overflow-y: scroll;
 	}
+  .red_packet{
+    color: #ff5c2d !important;
+    background-color: rgba(#ff5c2d, 0.3);
+    border-radius: 60rpx;
+    padding: 5rpx 10rpx;
+    padding-left: 20rpx;
+    font-size: 25rpx;
+  }
 </style>
\ No newline at end of file
diff --git a/static/active/red_packet.webp b/static/active/red_packet.webp
new file mode 100644
index 0000000000000000000000000000000000000000..0d2b0af715f278ab036b048dc30bb3a56a931d51
GIT binary patch
literal 1948
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

literal 0
HcmV?d00001