update 打印可能的空白（不能确定是不是纸张大小超出还是空数据的问题，已经提交了

xuxueyang

2024-11-20 cb623fcefa72d5b54b1e536aa84c3f3851743975

 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,47 +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() {
         // 支付回调
         // #ifdef PUB_CUSTOMER_DEV
         let options = wx.getEnterOptionsSync();
         if (options.scene == '1038' && options.referrerInfo.appId=='wxef277996acc166c3') {
            // 代表从收银台小程序返回
            let extraData = options.referrerInfo.extraData;
            // if (!extraData) {
            //    // "当前通过物理按键返回，未接收到返参，建议自行查询交易结果";
            // } else {
            //    if (extraData.code == 'success') {
            //       // "支付成功";
            //    } else if (extraData.code == 'cancel') {
            //       // "支付已取消";
            //       this.$message.showToast("支付已取消" + extraData.errmsg)
            //    } else {
            //       // "支付失败：" + extraData.errmsg;
            //       this.$message.showToast("支付失败：" + extraData.errmsg)
            //    }
            // }
            //
            //只要是进入了这个支付页面，都算是支付了，不管成功与否都返回
            console.log('pay success options.referrerInfo', options.referrerInfo)
            //返回上一页
            let tmp = this
            await tmp.$store.dispatch('sign_add', 'shopping')
            //清空优惠券
            tmp.$store.dispatch('cache_coupon_select', {})
            tmp.$store.dispatch('cache_goods_select', [])
				
            await tmp.$message.showToast('支付成功',{
               duration:500
            })
            uni.navigateBack()
            return
         }


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

         }
      },
@@ -219,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
@@ -335,7 +362,6 @@
                           await tmp.$store.dispatch('sign_add', 'shopping')
                           uni.navigateBack()
                        } else if (data) {
                           // #ifndef PUB_CUSTOMER_DEV
                           wx.requestPayment({
                              ...data,
                              async success(res) {
@@ -363,33 +389,6 @@
                                 // uni.navigateBack()
                              }
                           })
                           // #endif
                           // openEmbeddedMiniProgram，需要小程序基础库版本不低于 2.26.2
									
                           // #ifdef PUB_CUSTOMER_DEV
                           var param = {
                              // cusid: "平台分配的商户号",
                              // appid: "平台分配的appid",
                              // orgid: "平台分配的机构号",										
                              // version: "12",									
                              // trxamt: "1",								
                              // reqsn: "商户唯一订单号",				
                              // notify_url: "服务器异步通知页面路径",	
                              // body: "标题",
                              // remark: "备注",	
                              // validtime: "订单有效时间",	
                              // limit_pay: "no_credit",	
                              // randomstr: "随机字符串",	
                              // paytype: "W06",
                              // signtype: "签名方式",	
                              // sign: "签名，参考2.1",
                              ...data,
                           }
                           wx.openEmbeddedMiniProgram({
                              appId: 'wxef277996acc166c3',			
                              extraData: param
                           })
                           // #endif

                        }
                     }
@@ -507,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>

@@ -573,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>
@@ -605,6 +604,10 @@
   .page-confirm {
      padding: 20rpx 30rpx;

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

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