Merge branch 'skk/feat/writeOff'

api/welfareMall.js

@@ -135,7 +135,7 @@ class WelfareMall extends request {
   }
 
   //获取支付参数
-  static getOrderParams(orderSn,openId) {
+  static getOrderParams(orderSn,openId,isOrderPayment=false) {
     let params = {
       orderSn:orderSn,
       source: "FREE_MINI_APP",
@@ -143,6 +143,11 @@ class WelfareMall extends request {
       payCode: "HSAY-SHARE",
       openId: openId
     };
+    if(isOrderPayment){
+      params.isOrderPayment =true;
+      params.orderInfoPath = "pages/welfareMall/order/orderCompletion?ordersn="
+      params.productDetailPath = "pages/welfareMall/activityInfo/activityInfo?activityId="
+    }
     return this.postRequest(`${this.BASE_URL}open/activity/get-order-params`, params);
   }
 

pages/welfareMall/activityInfo/activityInfo.js

@@ -181,15 +181,16 @@ Page({
   async goPay() {
     // console.log(wx.getStorageSync('loginInfo').openId)
     var _self = this;
-      let result = await WelfareMall.getOrderParams(_self.data.orderInfo.orderSn,wx.getStorageSync('loginInfo').openId);
+      let result = await WelfareMall.getOrderParams(_self.data.orderInfo.orderSn,wx.getStorageSync('loginInfo').openId,true);
       // console.log(result);
       let res = result.data
-      wx.requestPayment({
+      wx.requestOrderPayment({
         timeStamp: res.wxPrePayVo.timeStamp,
         package: res.wxPrePayVo.pack,
         nonceStr: res.wxPrePayVo.nonceStr,
         signType: res.wxPrePayVo.signType,
         paySign: res.wxPrePayVo.paySign,
+        orderInfo:res.orderInfo,
         success: function (res) {
           //支付成功，跳转领取成功页面
           _self.setData({

pages/welfareMall/order/orderCompletion.js

@@ -145,14 +145,15 @@ Page({
         return;
       }
       that.data.repeat = true;
-      let result = await WelfareMall.getOrderParams(that.data.orderSn,wx.getStorageSync('loginInfo').openId);
+      let result = await WelfareMall.getOrderParams(that.data.orderSn,wx.getStorageSync('loginInfo').openId,true);
       let res = result.data
-      wx.requestPayment({
+      wx.requestOrderPayment({
         timeStamp: res.wxPrePayVo.timeStamp,
         package: res.wxPrePayVo.pack,
         nonceStr: res.wxPrePayVo.nonceStr,
         signType: res.wxPrePayVo.signType,
         paySign: res.wxPrePayVo.paySign,
+        orderInfo:res.orderInfo,
         success: function (res) {
           //支付成功
           console.log(res);

pages/welfareMall/writeOff/writeOff.js

@@ -19,8 +19,8 @@ Page({
     storeList: [],
     index: 0,
     storeNo: '',
-    startDate: '',
-    endDate: '',
+    startDate: parseTime(new Date(), "{y}-{m}-{d}"),
+    endDate: parseTime(new Date(), "{y}-{m}-{d}"),
   },
 
   /**

pages/welfareMall/writeOff/writeOff.wxml

@@ -19,7 +19,7 @@
             <view class="picker" wx:else>{{startDate}}</view>
           </view>
         </picker>
-        ~
+        至
         <picker mode="date" value="{{endDate}}" bindchange="bindEndDateChange" start="2022-01-01">
           <view class="search-date flex-row">
             <view class="picker" wx:if="{{endDate == null || endDate == ''}}">分账时间止期</view>

pages/welfareMall/writeOff/writeOff.wxss

@@ -72,12 +72,12 @@ page{
 }
 
 .search-text{
-  width: 480rpx;
+  width: 460rpx;
   margin-left: 28rpx;
   font-size: 28rpx;
   font-weight: 500;
   color: #A0A0A0;
-  justify-content: flex-start;
+  justify-content: space-between;
 }
 
 .search-text-close{
@@ -85,6 +85,7 @@ page{
   font-weight: 500;
   color: #A0A0A0;
   opacity: 0.5;
+  margin-left: 20rpx;
 }
 
 .writeOff-content{