Merge branch 'master' into second-mini

miniprogram/components/apply-refound/apply-refound.json

@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}

miniprogram/components/apply-refound/apply-refound.less

@@ -0,0 +1,106 @@
+/* components/apply-refound/apply-refound.wxss */
+.useRefound-pop {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 9;
+
+  .useRefound-mask {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-color: rgba(0, 0, 0, 0.6);
+  }
+  .useRefound-container {
+    position: absolute;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    width: 100%;
+    background: linear-gradient( 180deg, #FFDEE7 0%, #FFFFFF 12%, #FFFFFF 100%);
+    background-color: #fff;
+    border-radius: 32rpx 32rpx 0rpx 0rpx;
+    .icon-close {
+      position: absolute;
+      width: 38rpx;
+      height: 38rpx;
+      top: 40rpx;
+      right: 40rpx;
+    }
+    .use-title {
+      font-weight: 600;
+      font-size: 36rpx;
+      color: #000000;
+      line-height: 50rpx;
+      padding-top: 34rpx;
+      padding-bottom: 30rpx;
+      text-align: center;
+    }
+    .use-form {
+      background: #F7F8F9;
+      border-radius: 20rpx;
+      padding: 22rpx 24rpx 24rpx 30rpx;
+      textarea {
+        height: 140rpx;
+        font-size: 30rpx;
+        width: 100%;
+        &::placeholder {
+          color: #AAAAAA;
+        }
+      }
+      .num {
+        text-align: right;
+        font-size: 28rpx;
+        color: #AAAAAA;
+        line-height: 40rpx;
+      }
+    }
+    .use-form__input {
+      margin: 0 40rpx 0;
+      background: #FFFFFF;
+      border-radius: 20rpx;
+      margin-bottom: 48rpx;
+      display: flex;
+      flex-direction: column;
+      .title {
+        display: inline;
+        font-size: 30rpx;
+        color: #131415;
+        padding-bottom: 24rpx;
+        .red {
+          color: #F44541;
+        }
+        .sencd {
+          color: #AAAAAA;
+        }
+      }
+      input {
+        padding: 20rpx 16rpx;
+        background: #F7F8F9;
+        border-radius: 16rpx;
+        font-size: 30rpx;
+        &::placeholder {
+          color: #AAAAAA;
+        }
+      }
+    }
+    .btnSection {
+      padding: 0 32rpx 58rpx;
+      button {
+        margin: 0;
+        width: 100%;
+        background: linear-gradient( 270deg, #FF204B 0%, #FE5B71 100%);
+        border-radius: 78rpx;
+        padding: 22rpx 84rpx;
+        font-weight: 500;
+        font-size: 32rpx;
+        color: #FBEAC9;
+        line-height: 44rpx;
+      }
+    }
+  }
+}

miniprogram/components/apply-refound/apply-refound.ts

@@ -0,0 +1,89 @@
+import { api_userPaymentOrderRefundPayment } from "../../api/login";
+
+// components/apply-refound/apply-refound.ts
+Component({
+
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    refoundStatus: {
+      type: Boolean,
+      default: false,
+    },
+    goodsInfo: {
+      type: Object,
+      default: {}
+    }
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    refoundValue: "", // 退款内容
+    refoundPhone: ''
+  },
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    textareaInput(e: { detail: any }) {
+      this.setData({
+        refoundValue: e.detail.value
+      })
+    },
+    phoneInput(e: { detail: any }) {
+      this.setData({
+        refoundPhone: e.detail.value
+      })
+    },
+    onRefoundClose() {
+      this.triggerEvent("changeRefoundStatus", false)
+    },
+    checkPhone(phone: string) {
+      const phoneRule =
+        /^((13[0-9])|(14(0|[5-7]|9))|(15([0-3]|[5-9]))|(16(2|[5-9]))|(17[0-8])|(18[0-9])|(19([0-3]|[5-9])))\d{8}$/;
+      return phoneRule.test(phone);
+    },
+    async onRefound() {
+      const refoundValue = this.data.refoundValue
+      const refoundPhone = this.data.refoundPhone
+      if (!refoundValue) {
+        wx.showToast({ title: '请输入退款原因', icon: 'none' })
+        return
+      }
+      if (!this.checkPhone(refoundPhone)) {
+        wx.showToast({ title: '请输入正确的手机号码', icon: 'none' })
+        return
+      }
+      try {
+        const { goods, orderNo } = this.data.goodsInfo
+        const details: any = []
+        goods.forEach((item: any) => {
+          details.push({
+            num: item.goodsNum,
+            onlyRefund: false,
+            userPaymentOrderDetailId: item.id,
+            refundAmount: item.currentPrice
+          })
+        })
+        const params = {
+          merOrderNo: orderNo,
+          serviceCharge: false,
+          refundReason: refoundValue,
+          phone: refoundPhone, // 手机号
+          serviceChargeFee: 0,
+          userRefundOrderDetails: details
+        }
+        const { data } = await api_userPaymentOrderRefundPayment(params)
+        if (data.code == 200) {
+          wx.showToast({ title: '申请成功', icon: 'none' })
+          this.triggerEvent('onConfirm')
+        } else {
+          wx.showToast({ title: data.message, icon: 'none' })
+        }
+      } catch { }
+    },
+  }
+})

miniprogram/components/apply-refound/apply-refound.wxml

@@ -0,0 +1,22 @@
+<!--components/apply-refound/apply-refound.wxml-->
+<view class="useRefound-pop" wx:if="{{ refoundStatus }}">
+    <view class="useRefound-mask"></view>
+    <view class="useRefound-container">
+      <image bind:tap="onRefoundClose" class="icon-close" src="./images/icon-close.png"></image>
+      <view class="use-title">申请退款</view>
+      <view class="use-form__input">
+        <view class="title"><text class="red">*</text>退款原因</view>
+        <view class="use-form">
+          <textarea placeholder="请输入您的退款原因" maxlength="100" bindinput="textareaInput" value="{{ refoundValue }}"></textarea>
+          <view class="num">{{ refoundValue.length }}/100</view>
+        </view>
+      </view>
+      <view class="use-form__input">
+        <view class="title"><text class="red">*</text>联系方式 <text class="sencd">(必填)</text></view>
+        <input placeholder="请输入手机号码" type="number" maxlength="11" bindinput="phoneInput" value="{{ refoundPhone }}"></input>
+      </view>
+      <view class="btnSection">
+        <button type="primary" bind:tap="onRefound">提交申请</button>
+      </view>
+    </view>
+  </view>

miniprogram/pages/index/index.less

@@ -117,7 +117,7 @@ page {
     font-size: 28rpx;
     color: #131415;
     line-height: 68rpx;
-    margin: 24rpx;
+    margin: 24rpx 0;
     flex-shrink: 0;
   }
 

miniprogram/pages/index/index.ts

@@ -11,6 +11,19 @@ Page({
    * 页面的初始数据
    */
   data: {
+    imgList: [
+      'https://oss.dayaedu.com/ktyq/1731664204915.png',
+      'https://oss.dayaedu.com/ktyq/1731664238525.png',
+      'https://oss.dayaedu.com/ktyq/1731664250837.png',
+      'https://oss.dayaedu.com/ktyq/1731664259087.png',
+      'https://oss.dayaedu.com/ktyq/1731664269098.png',
+    ],
+    goodsImgList: [
+      'https://oss.dayaedu.com/ktyq/1731664304424.png',
+      'https://oss.dayaedu.com/ktyq/1731664318588.png',
+      'https://oss.dayaedu.com/ktyq/1731664330981.png',
+      'https://oss.dayaedu.com/ktyq/1732085582320.png'
+    ],
     current: 0,
     autoplay: false,
     interval: 5000,
@@ -84,7 +97,7 @@ Page({
       YEAR: "年卡"
     }
     if(type === "YEAR" && num >= 99) {
-      return '终生卡'
+      return '永久卡'
     }
     return num + template[type]
   },
@@ -174,6 +187,24 @@ Page({
       })
     }, 500)()
   },
+  onPreivewBannerImg(e: { currentTarget: { dataset: any } }) {
+    wx.previewImage({
+      current: e.currentTarget.dataset.src,
+      urls: this.data.imgList
+    })
+  },
+  onPreivewGoodsImg(e: { currentTarget: { dataset: any } }) {
+    wx.previewImage({
+      current: e.currentTarget.dataset.src,
+      urls: this.data.goodsImgList
+    })
+  },
+  onPreivewGoods(e: { currentTarget: { dataset: any } }) {
+    wx.previewImage({
+      current: e.currentTarget.dataset.src,
+      urls: [e.currentTarget.dataset.src]
+    })
+  },
   /**
    * 生命周期函数--监听页面显示
    */

miniprogram/pages/index/index.wxml

@@ -4,29 +4,9 @@
     <!-- <view class="topShadow"></view> -->
     <view class="slider-count">{{current + 1}}/{{5}}</view>
     <swiper indicator-dots="{{false}}" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}" bindchange="changeSwiper">
-      <swiper-item>
-        <view class="swiper-item ">
-          <image src="https://oss.dayaedu.com/ktyq/1732101023155.png"></image>
-        </view>
-      </swiper-item>
-      <swiper-item>
-        <view class="swiper-item ">
-          <image src="https://oss.dayaedu.com/ktyq/1732101058157.png"></image>
-        </view>
-      </swiper-item>
-      <swiper-item>
-        <view class="swiper-item ">
-          <image src="https://oss.dayaedu.com/ktyq/1732101072881.png"></image>
-        </view>
-      </swiper-item>
-      <swiper-item>
-        <view class="swiper-item ">
-          <image src="https://oss.dayaedu.com/ktyq/1732101091093.png"></image>
-        </view>
-      </swiper-item>
-      <swiper-item>
-        <view class="swiper-item ">
-          <image src="https://oss.dayaedu.com/ktyq/1732101102921.png"></image>
+      <swiper-item wx:for="{{imgList}}" wx:key="index">
+        <view class="swiper-item">
+          <image bind:tap="onPreivewBannerImg" data-src="{{ item }}" src="{{ item }}"></image>
         </view>
       </swiper-item>
     </swiper>
@@ -69,10 +49,9 @@
           <view class="after"></view>
         </view>
         <view class="images">
-          <image class="img1" src="https://oss.dayaedu.com/ktyq/1732101129195.png"></image>
-          <image class="img2" src="https://oss.dayaedu.com/ktyq/1732101146406.png"></image>
-          <image class="img3" src="https://oss.dayaedu.com/ktyq/1732101158356.png"></image>
-          <image class="img4" src="https://oss.dayaedu.com/ktyq/1732101169900.png"></image>
+          <block wx:for="{{goodsImgList}}" wx:key="index">
+            <image  mode="widthFix" bind:tap="onPreivewGoodsImg" data-src="{{item}}" src="{{item}}"></image>
+          </block>
         </view>
       </view>
     </view>
@@ -98,7 +77,7 @@
 
         <view class="product-section">
           <view class="product-img">
-            <image src="{{ selected.pic }}"></image>
+            <image bind:tap="onPreivewGoods" data-src="{{ selected.pic }}" src="{{ selected.pic }}"></image>
           </view>
           <view class="product-left">
             <view class="price-s">

miniprogram/pages/login/login.wxml

@@ -7,7 +7,7 @@
   </view>
   <view class="login-section">
     <view class="btnSection">
-      <button type="primary" disabled="{{ !isAgree }}" open-type="getPhoneNumber" bindgetphonenumber="getLogin">微信一键登录</button>
+      <button type="primary" disabled="{{ !isAgree }}" open-type="getUserInfo" bindgetuserinfo="getLogin">微信一键登录</button>
     </view>
     <view class="protocol-section">
       <image wx:if="{{isAgree}}" bind:tap="onAgree" src="./images/radio-active.png" class="radio"></image>

miniprogram/pages/orders/order-detail.less

@@ -185,6 +185,7 @@ page {
       color: #131415;
       line-height: 40rpx;
       padding-top: 20rpx;
+      flex-shrink: 0;
     }
     .currentPrice {
       font-weight: bold;
@@ -212,5 +213,6 @@ page {
     font-size: 32rpx;
     color: #FFFFFF;
     line-height: 44rpx;
+    flex-shrink: 0;
   }
 }

miniprogram/pages/orders/order-detail.ts

@@ -54,10 +54,10 @@ Page({
       console.log(error, "error");
     }
   },
-  onPayError() {
+  onPayError(message?: string) {
     wx.hideLoading()
     wx.showToast({
-      title: '支付失败',
+      title: message || '支付取消',
       icon: 'none'
     })
   },
@@ -132,7 +132,7 @@ Page({
         if(res.data.code === 200) {
           this.onPay(paymentType, res.data.data.reqParams, orderNo)
         } else {
-          this.onPayError()
+          this.onPayError(res.data.message)
         }
       },
       fail: () => {
@@ -153,7 +153,7 @@ Page({
       package: prePayInfo.package ? prePayInfo.package : prePayInfo.packageValue,
       paySign: prePayInfo.paySign,
       signType: prePayInfo.signType ? prePayInfo.signType : 'MD5',
-      success(resInfo) {
+      success() {
         wx.showToast({ title: '支付成功', icon: 'success' });
         wx.redirectTo({
           url: '/pages/orders/order-result?orderNo=' + orderNo
@@ -161,10 +161,11 @@ Page({
       },
       fail(ressonInfo) {
         console.log('支付失败', ressonInfo)
-        // wx.showToast({ title: '支付失败！', icon: 'none' });
         that.onPayError()
-        wx.redirectTo({
-          url: '/pages/orders/order-result?orderNo=' + orderNo
+        const goodsInfo = that.data.goodsInfo
+        goodsInfo.orderNo = orderNo
+        that.setData({
+          goodsInfo
         })
       }
     })

miniprogram/pages/orders/order-detail.wxml

@@ -46,7 +46,7 @@
       </view>
     <view class="more">
       <view class="price">
-        <view class="desc">订单金额：</view>
+        <view class="desc">金额：</view>
         <view class="currentPrice">
           <text class="stuff">¥</text>
           <text class="priceZ">{{ goodsInfo.integerPart }}</text>

miniprogram/pages/orders/order-result.json

@@ -1,6 +1,7 @@
 {
   "usingComponents": {
     "navigation-bar": "/components/navigation-bar/navigation-bar",
-    "service": "/components/service/service"
+    "service": "/components/service/service",
+    "apply-refound": "/components/apply-refound/apply-refound"
   }
 }

miniprogram/pages/orders/order-result.less

@@ -6,6 +6,10 @@ page {
   background: #F5F6F7;
 }
 
+.scroll-container {
+  padding-bottom: 174rpx;
+}
+
 .order-status {
   margin: 24rpx 26rpx 0;
   background-color: #FFFFFF;
@@ -101,9 +105,14 @@ page {
       line-height: 36rpx;
     }
   }
-
 }
-
+.only_canvas {
+  position: absolute;
+  left: -300rpx;
+  top: 0;
+  width: 262rpx;
+  height: 262rpx;
+}
 .qrcode-section {
   margin-top: 28rpx;
   border-top: 2rpx solid #F0F0F0;
@@ -115,6 +124,7 @@ page {
     border: 3rpx solid #EDEDED;
     padding: 10rpx;
     display: inline-block;
+    font-size: 0;
   }
   .my_draw_canvas {
     width: 262rpx;
@@ -150,16 +160,32 @@ page {
       line-height: 40rpx;
     }
     .value {
-      font-size: 28rpx;
+      font-size: 30rpx;
       color: #777777;
-      line-height: 40rpx;
-
+      line-height: 42rpx;
+      display: flex;
       &.red {
         color: #FE2451;
       }
+
+      .copy {
+        font-size: 30rpx;
+        color: #FE2451;
+        line-height: 42rpx;
+        display: flex;
+        align-items: center;
+        padding-left: 16rpx;
+      }
     }
   }
 }
+.btn-refound {
+  padding-top: 40rpx;
+  text-align: center;
+  font-size: 28rpx;
+  color: #A7ABAF;
+  line-height: 40rpx;
+}
 
 .order-btn {
   position: fixed;
@@ -226,79 +252,4 @@ page {
     color: #FFFFFF;
     line-height: 44rpx;
   }
-}
-
-.useRefound-pop {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-
-  .useRefound-mask {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background-color: rgba(0, 0, 0, 0.6);
-  }
-  .useRefound-container {
-    position: absolute;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    width: 100%;
-    background: linear-gradient( 180deg, #FFDEE7 0%, #FFFFFF 12%, #FFFFFF 100%);
-    background-color: #fff;
-    border-radius: 32rpx 32rpx 0rpx 0rpx;
-    .icon-close {
-      position: absolute;
-      width: 38rpx;
-      height: 38rpx;
-      top: 40rpx;
-      right: 40rpx;
-    }
-    .use-title {
-      font-weight: 600;
-      font-size: 36rpx;
-      color: #131415;
-      line-height: 50rpx;
-      padding-top: 34rpx;
-      padding-bottom: 30rpx;
-      text-align: center;
-    }
-    .use-form {
-      margin: 0 40rpx;
-      background: #F7F8F9;
-      border-radius: 16rpx;
-      padding: 16rpx 16rpx 8rpx;
-      margin-bottom: 80rpx;
-      textarea {
-        height: 140rpx;
-        font-size: 30rpx;
-      }
-      .num {
-        text-align: right;
-        font-size: 26rpx;
-        color: #AAAAAA;
-        line-height: 42rpx;
-      }
-    }
-
-    .btnSection {
-      padding: 0 32rpx 58rpx;
-      button {
-        margin: 0;
-        width: 100%;
-        background: linear-gradient( 270deg, #FF204B 0%, #FE5B71 100%);
-        border-radius: 78rpx;
-        padding: 22rpx 84rpx;
-        font-weight: 500;
-        font-size: 32rpx;
-        color: #FFFFFF;
-        line-height: 44rpx;
-      }
-    }
-  }
 }

miniprogram/pages/orders/order-result.ts

@@ -48,8 +48,7 @@ Page({
     showCanvas: false, // 是否显示二维码
     canvasImg: "" as string,
     showService: false,
-    refoundStatus: false,
-    refoundValue: "" // 退款内容
+    refoundStatus: false
   },
 
   /**
@@ -136,7 +135,7 @@ Page({
       YEAR: "年卡"
     }
     if(type === "YEAR" && num >= 99) {
-      return '终生卡'
+      return '永久卡'
     }
     return num + template[type]
   },
@@ -221,12 +220,15 @@ Page({
   async cancelRefound() {
     try {
       const {data} = await api_userPaymentCancelRefund(this.data.goodsInfo.refundOrderId)
-      console.log(data, 'data')
+      // console.log(data, 'data')
       if(data.code == 200) {
         wx.showToast({ title: '取消退款成功', icon: 'none' })
-        wx.navigateBack({
-          delta: 1
-        })
+        // setTimeout(() => {
+        //   wx.navigateBack({
+        //     delta: 1
+        //   })
+        // }, 1000);
+        this.getDetail()
       } else {
         wx.showToast({ title: data.message, icon: 'none' })
       }
@@ -235,58 +237,32 @@ Page({
   /** 申请退款 */
   useRefound() {
     this.setData({
-      refoundStatus: true,
-      refoundValue: ""
+      refoundStatus: true
     })
   },
-  textareaInput(e: { detail: any }) {
+  changeRefoundStatus(e: {detail: any}) {
     this.setData({
-      refoundValue: e.detail.value
+      refoundStatus: e.detail
     })
   },
-  onRefoundClose() {
+  onRefoundComfirm() {
     this.setData({
-      refoundStatus: false,
-      refoundValue: ''
+      refoundStatus: false
     })
+    // wx.navigateBack({
+    //   delta: 1
+    // })
+    this.getDetail()
   },
-  async onRefound() {
-    console.log(this.data.refoundValue, 'value')
-    const refoundValue = this.data.refoundValue
-    if(!refoundValue) {
-      wx.showToast({ title: '请输入退款原因', icon: 'none' })
-      return
-    }
-    try {
-      const { goods, orderNo } = this.data.goodsInfo
-      console.log(this.data.goodsInfo, 'goodsInfo')
-      const details: any = []
-      goods.forEach((item: any) => {
-        details.push({
-          num: item.goodsNum,
-          onlyRefund: false,
-          userPaymentOrderDetailId: item.id,
-          refundAmount: item.currentPrice
-        })
-      })
-      const params = {
-        merOrderNo: orderNo,
-        serviceCharge: false,
-        refundReason: refoundValue,
-        serviceChargeFee: 0,
-        userRefundOrderDetails: details
-      }
-      const {data} = await api_userPaymentOrderRefundPayment(params)
-      if(data.code == 200) {
-        wx.showToast({ title: '申请成功', icon: 'none' })
-        setTimeout(() => {
-          wx.navigateBack({
-            delta: 1
-          })
-        }, 2000);
-      } else {
-        wx.showToast({ title: data.message, icon: 'none' })
+  onCopy(e: { currentTarget: any }) {
+    wx.setClipboardData({
+      data: e.currentTarget.dataset.orderno,
+      success: () => {
+        wx.showToast({title: '复制成功', icon: 'none'})
+      },
+      fail: () => {
+        wx.showToast({title: '复制失败，请稍后再试', icon: 'none'})
       }
-    } catch {}
+    })
   }
 })

miniprogram/pages/orders/order-result.wxml

@@ -3,61 +3,69 @@
   <navigation-bar title="订单详情"></navigation-bar>
 
   <scroll-view class="record-list" type="list" scroll-y bindscrolltolower="loadMore">
-    <view class="order-status" wx:if="{{statusList[status]}}">
-      <view class="status">
-        <image src="{{ statusList[status].logo }}"></image>
-        <text>{{ statusList[status].title }}</text>
+    <view class="scroll-container">
+      <view class="order-status" wx:if="{{statusList[status]}}">
+        <view class="status">
+          <image src="{{ statusList[status].logo }}"></image>
+          <text>{{ statusList[status].title }}</text>
+        </view>
+        <view class="tips" wx:if="{{ statusList[status].content }}">{{ statusList[status].content }}</view>
       </view>
-      <view class="tips" wx:if="{{ statusList[status].content }}">{{ statusList[status].content }}</view>
-    </view>
 
-    <view class="order-content">
-      <view class="item-content" wx:for="{{ goodsInfo.goods }}" wx:key="index">
-        <image class='goods-icon' src="{{ item.goodsUrl }}" mode="" />
-        <view class="goods-desc">
-          <view class="goodsInfo">
-            <view class="goods-name">{{ item.goodsName }}</view>
-            <view class="goods-price">¥ {{ item.originalPrice }}</view>
+      <view class="order-content">
+        <view class="item-content" wx:for="{{ goodsInfo.goods }}" wx:key="index">
+          <image class='goods-icon' src="{{ item.goodsUrl }}" mode="" />
+          <view class="goods-desc">
+            <view class="goodsInfo">
+              <view class="goods-name">{{ item.goodsName }}</view>
+              <view class="goods-price">¥ {{ item.originalPrice }}</view>
+            </view>
+            <view class="goods-type">
+              <view class="goods-card">{{ item.typeName }}</view>
+              <view class="goods-num">x1</view>
+            </view>
           </view>
-          <view class="goods-type">
-            <view class="goods-card">{{ item.typeName }}</view>
-            <view class="goods-num">x1</view>
+        </view>
+        <view class="qrcode-section" wx:if="{{ (goodsInfo.wechatStatus == 'PAID' || goodsInfo.wechatStatus == 'WAIT_USE') && showCanvas }}">
+          <view class="qrcode-wrap">
+            <!-- <canvas class='my_draw_canvas' data-type="image" canvas-id='canvasCode' id="canvasCode"></canvas> -->
+            <image src="{{canvasImg}}" mode="scaleToFill" class='my_draw_canvas' style="opacity: {{ goodsInfo.wechatStatus == 'PAID' ? 0.4 : 1 }};" show-menu-by-longpress="true"></image>
           </view>
+          <view class="qrcode-text" wx:if="{{goodsInfo.wechatStatus == 'WAIT_USE'}}">请扫描二维码激活使用</view>
+          <view class="qrcode-text used" wx:else>二维码已使用</view>
         </view>
       </view>
-      <view class="qrcode-section" wx:if="{{ (goodsInfo.wechatStatus == 'PAID' || goodsInfo.wechatStatus == 'WAIT_USE') && showCanvas }}">
-        <view class="qrcode-wrap">
-          <canvas class='my_draw_canvas' data-type="image" canvas-id='canvasCode' id="canvasCode"></canvas>
+
+      <canvas class='my_draw_canvas only_canvas' data-type="image" canvas-id='canvasCode' id="canvasCode"></canvas>
+
+      <view class="order-time">
+        <view class="order-item">
+          <view class="title">订单号</view>
+          <view class="value">{{ goodsInfo.orderNo }}
+            <view class="copy" bind:tap="onCopy" data-orderno="{{goodsInfo.orderNo}}">复制</view></view>
+        </view>
+        <view class="order-item">
+          <view class="title">下单时间</view>
+          <view class="value">{{ goodsInfo.createTime }}</view>
         </view>
-        <view class="qrcode-text" wx:if="{{goodsInfo.wechatStatus == 'WAIT_USE'}}">请扫描二维码激活使用</view>
-        <view class="qrcode-text used" wx:else>二维码已使用</view>
       </view>
-    </view>
 
-    <view class="order-time">
-      <view class="order-item">
-        <view class="title">订单号</view>
-        <view class="value">{{ goodsInfo.orderNo }}</view>
-      </view>
-      <view class="order-item">
-        <view class="title">下单时间</view>
-        <view class="value">{{ goodsInfo.createTime }}</view>
+      <view class="order-time" wx:if="{{ goodsInfo.wechatStatus == 'REFUNDED' }}">
+        <view class="order-item">
+          <view class="title">{{ goodsInfo.wechatStatus == 'REFUNDED' ? '退款时间' : '申请退款时间' }}</view>
+          <view class="value">{{ goodsInfo.refundTime }}</view>
+        </view>
+        <view class="order-item">
+          <view class="title">退款金额</view>
+          <view class="value red">￥{{ goodsInfo.refundAmount }}</view>
+        </view>
+        <view class="order-item">
+          <view class="title">退款路径</view>
+          <view class="value">{{ goodsInfo.refundStyleStr }}</view>
+        </view>
       </view>
-    </view>
 
-    <view class="order-time" wx:if="{{ goodsInfo.wechatStatus == 'REFUNDED' }}">
-      <view class="order-item">
-        <view class="title">{{ goodsInfo.wechatStatus == 'REFUNDED' ? '退款时间' : '申请退款时间' }}</view>
-        <view class="value">{{ goodsInfo.refundTime }}</view>
-      </view>
-      <view class="order-item">
-        <view class="title">退款金额</view>
-        <view class="value red">￥{{ goodsInfo.refundAmount }}</view>
-      </view>
-      <view class="order-item">
-        <view class="title">退款路径</view>
-        <view class="value">{{ goodsInfo.refundStyleStr }}</view>
-      </view>
+      <view class="btn-refound" bind:tap="useRefound"  wx:if="{{ goodsInfo.wechatStatus == 'WAIT_USE' }}">申请退款</view>
     </view>
   </scroll-view>
 
@@ -66,27 +74,15 @@
       <image src="./images/icon-service.png" />
       <text>客服</text>
     </view>
-    <button type="primary" bind:tap="useRefound" wx:if="{{ goodsInfo.wechatStatus == 'WAIT_USE' }}">申请退款</button>
-    <block wx:else>
+    <!-- <button type="primary" bind:tap="useRefound" wx:if="{{ goodsInfo.wechatStatus == 'WAIT_USE' }}">申请退款</button>
+    <block wx:else> -->
       <button type="primary" bind:tap="cancelRefound" wx:if="{{ goodsInfo.wechatStatus == 'REFUNDING' }}">取消退款</button>
       <button type="primary" wx:else bind:tap="onSubmit">再来一单</button>
-    </block>
+    <!-- </block> -->
   </view>
 
   <service popShow="{{ showService }}" bind:changePop="changePop"></service>
 
-  <view class="useRefound-pop" wx:if="{{ refoundStatus }}">
-    <view class="useRefound-mask"></view>
-    <view class="useRefound-container">
-      <image bind:tap="onRefoundClose" class="icon-close" src="./images/icon-close.png"></image>
-      <view class="use-title">选择退款原因</view>
-      <view class="use-form">
-        <textarea placeholder="请输入您的退款原因" maxlength="50" bindinput="textareaInput" value="{{ refoundValue }}"></textarea>
-        <view class="num">{{ refoundValue.length }}/50</view>
-      </view>
-      <view class="btnSection">
-        <button type="primary" bind:tap="onRefound">申请退款</button>
-      </view>
-    </view>
-  </view>
+  <!-- 退费 -->
+  <apply-refound refoundStatus="{{ refoundStatus }}" goodsInfo="{{goodsInfo}}" bind:changeRefoundStatus="changeRefoundStatus" bind:onConfirm="onRefoundComfirm"></apply-refound>
 </view>

miniprogram/pages/orders/orders.json

@@ -1,5 +1,6 @@
 {
   "usingComponents": {
-    "navigation-bar": "/components/navigation-bar/navigation-bar"
+    "navigation-bar": "/components/navigation-bar/navigation-bar",
+    "apply-refound": "/components/apply-refound/apply-refound"
   }
 }

miniprogram/pages/orders/orders.less

@@ -85,7 +85,7 @@ page {
     justify-content: space-between;
     font-size: 28rpx;
     line-height: 48rpx;
-    padding-bottom: 12rpx;
+    padding-bottom: 24rpx;
     
     .item-mid {
       color: #131415;
@@ -174,13 +174,18 @@ page {
       color: #999999;
       line-height: 48rpx;
 
-      // .price {
-      //   font-family: DINAlternate, DINAlternate;
-      //   font-weight: bold;
-      //   font-size: 28rpx;
-      //   color: #FE2451;
-      //   line-height: 48rpx;
-      // }
+      .price-first {
+        font-weight: bold;
+        color: #FE2451;
+        font-size: 28rpx;
+      }
+      .price {
+        font-family: DINAlternate, DINAlternate;
+        font-weight: bold;
+        font-size: 36rpx;
+        color: #FE2451;
+        line-height: 48rpx;
+      }
     }
 
     button {

miniprogram/pages/orders/orders.ts

@@ -1,4 +1,4 @@
-import { api_studentOrderPage } from "../../api/login";
+import { api_executePayment, api_queryByParamName, api_studentOrderPage, api_userPaymentCancelRefund, api_userPaymentOrderUnpaid } from "../../api/login";
 // 获取应用实例
 const app = getApp<IAppOption>()
 Page({
@@ -42,6 +42,8 @@ Page({
     rows: 10,
     recordList: [],
     maxPage: 1, // 总分页数
+    refoundStatus: false,
+    goodsInfo: {}, // 选中的数据
   },
 
   /**
@@ -89,7 +91,7 @@ Page({
         openId: app.globalData.userInfo?.liteOpenid,
         page: currentPage,
         rows: this.data.rows,
-        wechatOrderStatus: tabIdx == 0 ? "" : tabIdx == 1 ? "WAIT_PAY" : tabIdx == 2 ? "WAIT_USE" : tabIdx == 3 ? "PAID" : tabIdx == 4 ? "CLOSED" : tabIdx == 5 ? 'REFUNDING' : "",
+        wechatOrderStatus: tabIdx == 0 ? "" : tabIdx == 1 ? "WAIT_PAY" : tabIdx == 2 ? "WAIT_USE" : tabIdx == 3 ? "PAID" : tabIdx == 4 ? "CLOSED" : tabIdx == 5 ? 'SALE_AFTER' : "",
       })
       if (data.code == 200) {
         const { rows, total } = data.data;
@@ -156,7 +158,7 @@ Page({
       YEAR: "年卡"
     }
     if(type === "YEAR" && num >= 99) {
-      return '终生卡'
+      return '永久卡'
     }
     return num + template[type]
   },
@@ -183,33 +185,9 @@ Page({
   onPay(e: any) {
     const { dataset } = e.currentTarget
     const item: any = this.data.recordList.find((item: any) => item.id === dataset.id)
-    console.log(dataset, item, 'item')
     if(item) {
-      const studentPaymentOrderDetails = item.studentPaymentOrderDetails[0]
-      const prices: any = this.formatPrice(item.paymentCashAmount)
-      const params = {
-        // buyNum: "0",
-        decimalPart: prices.decimalPart,
-        // id: "1856596669912584193",
-        integerPart: prices.integerPart,
-        userPaymentOrderDetailId: studentPaymentOrderDetails.userPaymentOrderDetailId,
-        name: studentPaymentOrderDetails.goodsName,
-        num: studentPaymentOrderDetails.goodsNum,
-        originalPrice: studentPaymentOrderDetails.originalPrice,
-        period: studentPaymentOrderDetails.activationCodeInfo.type,
-        pic: studentPaymentOrderDetails.goodsUrl,
-        salePrice: item.paymentCashAmount,
-        // shopId: "1815717514476302337",
-        orderNo: item.orderNo,
-        wechatStatus: item.wechatStatus,
-        // stockNum: "10",
-        typeName: studentPaymentOrderDetails.typeName
-      }
-      let info = JSON.stringify(params);
-      console.log(params, "params")
-      info = encodeURIComponent(info);
-      wx.navigateTo({
-        url: `../orders/order-detail?orderInfo=${info}`,
+      this.onSubmit({
+        orderNo: item.orderNo
       })
     }
   },
@@ -220,8 +198,166 @@ Page({
   },
   onDetail(e: any) {
     const { dataset } = e.currentTarget
-    wx.navigateTo({
-      url: '../orders/order-result?orderNo=' + dataset.orderno
+    if(dataset.wechatstatus === "WAIT_PAY") {
+      this.onSubmit({orderNo: dataset.orderno})
+    } else {
+      wx.navigateTo({
+        url: '../orders/order-result?orderNo=' + dataset.orderno
+      })
+    }
+  },
+  // 购买
+  async onSubmit(goodsInfo: any) {
+    wx.showLoading({
+      mask: true,
+      title: "订单提交中...",
+    });
+    try {
+      const { orderNo } = goodsInfo
+      const {data} = await api_userPaymentOrderUnpaid({
+        orderNo: orderNo,
+        paymentType: 'WECHAT_MINI'
+      })
+      if (data.code === 200) {
+        const { paymentConfig, paymentType, orderNo } = data.data.paymentConfig
+        this.onExecutePay(paymentConfig, paymentType, orderNo)
+      } else {
+        this.onPayError()
+      }
+    } catch {
+      wx.hideLoading()
+    }
+  },
+  async onExecutePay( paymentConfig: any, paymentType: string, orderNo: string) {
+    wx.login({
+      success: async (wxres: any) => {
+        const res = await api_executePayment({
+          merOrderNo: paymentConfig.merOrderNo,
+          paymentChannel: this.data.paymentChannel || 'wx_lite', 
+          paymentType,
+          userId: app.globalData.userInfo?.id,
+          code: wxres.code,
+          wxMiniAppId: app.globalData.appId
+        })
+        wx.hideLoading()
+        if(res.data.code === 200) {
+          this.onPaying(paymentType, res.data.data.reqParams, orderNo)
+        } else {
+          this.onPayError(res.data.message)
+        }
+      },
+      fail: () => {
+        this.onPayError()
+      }
     })
   },
+  onPaying(paymentType: string, paymentConfig: any, orderNo: string) {
+    const isYeePay = paymentType.indexOf('yeepay') !== -1
+    const prePayInfo = isYeePay ? JSON.parse(paymentConfig.prePayTn)
+      : paymentConfig?.expend
+        ? JSON.parse(paymentConfig?.expend?.pay_info)
+        : paymentConfig
+    const that = this
+    wx.requestPayment({
+      timeStamp: prePayInfo.timeStamp,
+      nonceStr: prePayInfo.nonceStr,
+      package: prePayInfo.package ? prePayInfo.package : prePayInfo.packageValue,
+      paySign: prePayInfo.paySign,
+      signType: prePayInfo.signType ? prePayInfo.signType : 'MD5',
+      success() {
+        wx.showToast({ title: '支付成功', icon: 'success' });
+        // that.onRefoundComfirm()
+      },
+      fail(ressonInfo) {
+        console.log('支付失败', ressonInfo)
+        that.onPayError()
+      }
+    })
+  },
+  // 获取后台配置的支付方式
+  async queryPayType() {
+    try {
+      // wxlite_payment_service_provider
+      const { data } = await api_queryByParamName({
+        paramName: app.globalData.appId
+      });
+      if (data.code == 200) {
+        const paramValue = data.data.paramValue ? JSON.parse(data.data.paramValue) : {}
+        this.setData({
+          paymentType: paramValue.vendor,
+          paymentChannel: paramValue.channel
+        });
+      }
+    } catch (error) {
+      console.log(error, "error");
+    }
+  },
+  onPayError(message?: string) {
+    wx.hideLoading()
+    wx.showToast({
+      title: message || '支付取消',
+      icon: 'none'
+    })
+  },
+  async onRefounded(e: any) {
+    const { dataset } = e.currentTarget
+    const item: any = this.data.recordList.find((item: any) => item.id === dataset.id)
+    console.log(dataset, item, 'item')
+    if(!item) {
+      return
+    }
+
+    if(item.wechatStatus === "REFUNDING") {
+      try {
+        const refundOrderId = item.refundOrderId
+        const {data} = await api_userPaymentCancelRefund(refundOrderId)
+        console.log(data, 'data')
+        if(data.code == 200) {
+          wx.showToast({ title: '取消退款成功', icon: 'none' })
+          this.onRefoundComfirm()
+        } else {
+          wx.showToast({ title: data.message, icon: 'none' })
+        }
+      } catch {}
+    } else {
+      const { orderNo, studentPaymentOrderDetails } = item
+      const goodsInfo: any = {
+        orderNo,
+        goods: []
+      }
+      if(Array.isArray(studentPaymentOrderDetails)) {
+        studentPaymentOrderDetails.forEach((item: any) => {
+          goodsInfo.goods.push({
+            ...item,
+            id: item.userPaymentOrderDetailId,
+            currentPrice: item.paymentCashAmount
+          })
+        })
+      }
+      this.setData({
+        goodsInfo,
+        refoundStatus: true
+      })
+    }
+  },
+  changeRefoundStatus(e: {detail: any}) {
+    this.setData({
+      refoundStatus: e.detail
+    })
+  },
+  onRefoundComfirm() {
+    const that = this
+    this.setData({
+      refoundStatus: false
+    })
+    setTimeout(() => {
+      that.setData({
+        page: 1,
+        maxPage: 1,
+        recordList: [],
+      }, () => {
+        this.getList()
+      })
+    }, 1500);
+  },
 })

miniprogram/pages/orders/orders.wxml

@@ -11,8 +11,8 @@
     <scroll-view class="record-list" type="list" scroll-y bindscrolltolower="loadMore">
       <block wx:if="{{ recordList.length }}">
         <view class="list-item-group">
-          <view class="list-item" wx:for="{{recordList}}" wx:key="index" data-orderno="{{item.orderNo}}" bind:tap="onDetail">
-            <!-- <view class="item-top">
+          <view class="list-item" wx:for="{{recordList}}" wx:key="index" data-orderno="{{item.orderNo}}" data-wechatstatus="{{item.wechatStatus}}" bind:tap="onDetail">
+            <view class="item-top">
               <view class="item-mid">订单号：{{ item.orderNo }}</view>
               <text class="{{ item.wechatStatus == 'WAIT_PAY' || item.wechatStatus == 'WAIT_USE' ? 'red' : '' }}">{{ item.statusName }}</text>
             </view> -->
@@ -34,11 +34,16 @@
             </view>
             <view class="item-footer">
               <view class="order-price">
-                <!-- 订单金额：<text class="price">¥ {{item.amount}}</text> -->
-                订单号：{{ item.orderNo }}
+                订单金额：<text class="price-first">¥ </text><text class="price">{{item.amount}}</text>
               </view>
-              <button class="sure" type="primary" wx:if="{{ item.wechatStatus == 'WAIT_PAY' }}"  catch:tap="onPay" data-id="{{item.id}}">继续支付</button>
-              <button type="primary" wx:else catch:tap="onOne" data-id="{{item.id}}">再次购买</button>
+              <block wx:if="{{ item.wechatStatus == 'REFUNDING' || (item.wechatStatus == 'WAIT_USE' && tabIdx == 5) }}" wx:key="block">
+                <button wx:if="{{ item.wechatStatus == 'REFUNDING' }}" type="primary" wx:if="{{ item.wechatStatus == 'REFUNDING' }}"  catch:tap="onRefounded" data-id="{{item.id}}">取消退款</button>
+                <button wx:else type="primary" catch:tap="onRefounded" data-id="{{item.id}}">申请退款</button>
+              </block>
+              <block wx:else wx:key="block">
+                <button class="sure" type="primary" wx:if="{{ item.wechatStatus == 'WAIT_PAY' }}"  catch:tap="onPay" data-id="{{item.id}}">继续支付</button>
+                <button type="primary" wx:else catch:tap="onOne" data-id="{{item.id}}">再来一单</button>
+              </block>
             </view>
           </view>
         </view>
@@ -51,4 +56,6 @@
       </block>
     </scroll-view>
   </view>
+  <!-- 申请退款 -->
+  <apply-refound refoundStatus="{{ refoundStatus }}" goodsInfo="{{goodsInfo}}" bind:changeRefoundStatus="changeRefoundStatus" bind:onConfirm="onRefoundComfirm"></apply-refound>
 </view>