1.付款：改成15分钟，并使用服务器时间进行倒计时 2.优惠券中心：已经领取（达到最大次数），显示已领取且置灰，未领取根据创建时间放前面，已领取根据首...

陶杰

2024-11-14 41426416bd250130129fb8a547bee874375768a8

 sub_pages/customer/shopping/confirm.vue

@@ -17,9 +17,50 @@
            cache_goods: state => {
               return state.cache.goods || []
            },
            cache_coupon_select_cancel: state => {
               return state.cache.cache_coupon_select_cancel==1?1:0 
            },
         }),
         coupon_fee() {
            //优惠券
            // 查看当前有没有优惠券
            if(!this.dto.couponRecordId || !this.cache_coupon ){
               // 根据优惠券的列表，查找到最合适的优惠券
               // 遍历优惠券的使用金额大于当前金额的，获取面值最大的优惠券取最大值couponDiscountValue
               var total = (this.dto.totalMemberAmount || this.dto.totalAmount || 0).toFixed(2)
               if(total && total>0){
                  // 获取当前用户最合适的优惠券
                  let res= this.$http.request('get', '/api/v2/coupon/app/mine/unused/fit', {
                     params: {orderAmount:total}
                  }).then(async res => {
                     let tmpCoupon = res.data;
                     if (tmpCoupon) {
                        if(this.cache_coupon_select_cancel==0){
                           console.log("自动为您选择优惠最大的优惠券")
                           await this.$store.dispatch('cache_coupon_select', tmpCoupon);
                           this.dto.couponRecordId = tmpCoupon.id;
                           this.dto.couponRecordStr = tmpCoupon.couponName;
                           setTimeout(() => {
                              this.$message.showToast('自动为您选择优惠最大的优惠券')
                           }, 2000)
									
                        }else{
                           console.log("清空")
                           await this.$store.dispatch('cache_coupon_select', {});
                           this.dto.couponRecordId ="";
                           this.dto.couponRecordStr = "";
                        }
								
                     }
							
                  }).catch(error => {
                     console.error('获取优惠券失败:', error);
                  });
						
               }

            }
				
            if (this.dto.couponRecordId && this.cache_coupon) {
               //计算优惠券
               if (this.cache_coupon.couponDiscountType === 'zero') {
@@ -44,9 +85,14 @@
            return 0
         },
         order_fee() {

            // 如果订单-优惠券<0,就等于0 +打包+运费，如果还等于0，那么就0.01
            var m1 = parseFloat(this.dto.totalMemberAmount || this.dto.totalAmount || 0)
            var m2 = parseFloat((this.dto.packing || 0) + (this.current_transport.fee || 0))

            // 统一处理 Promise 和普通值
            // var couponFee = await this.coupon_fee;


            if (m1 <= parseFloat(this.coupon_fee)) {
               if (m2 > 0) {
@@ -64,9 +110,12 @@
      async beforeDestroy() {
         await this.$store.dispatch('cache_coupon_select', {})
         await this.$store.dispatch('cache_goods_select', [])
         await this.$store.dispatch('cache_coupon_select_cancel', 0)

      },
      async onShow() {
      onShow() {
         // 获取当前用户为使用的优惠券
         // this.getSuitableCouponAuto()
         //优惠券
         if (this.cache_coupon && this.cache_coupon.id) {
            this.dto.couponRecordId = this.cache_coupon.id
@@ -153,6 +202,7 @@
               couponRecordId: '',
               couponRecordStr: '',
               goodsRecordIdListStr: '',
               unusedCouponList:[],
            },
            current_transport: {},
            cacheAddressId: '',
@@ -162,6 +212,7 @@
               []
            ],
            partnerInfo: {},
            isShowFlag:true,

         }
      },
@@ -181,6 +232,20 @@
         }
      },
      methods: {

         async getSuitableCouponAuto(){
            //1.提交订单后，根据订单的商品金额，判断是否达到优惠券使用条件，如果达到，自动选择面值最大的优惠券，用户也可以在优惠券自己切换优惠券或不使用优惠券
               await this.$http.request('get', '/api/v2/coupon/app/mine/unused/list', {
                  params: {}
               }).then(res => {
                  var data = res.data
                  this.unusedCouponList = data.list || []
						
               })
					

         },

         toSelectCoupon() {
            //跳转去列表页面进行选择
            var total = ((this.dto.totalMemberAmount || this.dto.totalAmount || 0) + (this.dto.packing || 0) + (this
@@ -441,12 +506,12 @@

         <view class="p10 bg-white m-t-20 br-4">
            <view class="form-item  flex ">
               <view class="label">优惠券</view>
               <view class="label t-red">优惠券</view>

               <view class="m-l-a m-r-0 flex " :class="[!dto.couponRecordId?'desc-gray':'']"
               <view class="m-l-a m-r-0 flex t-red" :class="[!dto.couponRecordId?'desc-gray':'']"
                  @click="toSelectCoupon">
                  <view>{{dto.couponRecordStr||dto.couponRecordId || '请选择'}}</view>
                  <u-icon class="m-l-a" name="arrow-right"></u-icon>
                  <u-icon class="m-l-a t-red" name="arrow-right"></u-icon>
               </view>
            </view>

@@ -507,10 +572,10 @@
            </view>
         </view>
         <view class="desc flex" v-if="cache_coupon&&cache_coupon.id">
            <view>
            <view class="t-red">
               优惠({{cache_coupon.couponDiscountType=='zero'?'无门槛':(cache_coupon.minOrderAmount?(`满￥${cache_coupon.minOrderAmount}可用`):'无门槛')}},优惠￥{{cache_coupon.couponDiscountValue||'0'}}):
            </view>
            <view class="m-l-a m-r-0 text-right">
            <view class="m-l-a m-r-0 text-right t-red">
               -{{ coupon_fee || 0 }}
            </view>
         </view>
@@ -539,6 +604,10 @@
   .page-confirm {
      padding: 20rpx 30rpx;

      .border-red {
         border: 1px solid red;
      }

      .bottom-price {
         position: fixed;
         background-color: #ffffff;