新优化功能

src/component/applyRefund/applyRefund.js

@@ -124,8 +124,7 @@ Component({
           })
         }
 
-      }).finally(() => {
-      })
+      }).finally(() => {})
     },
 
   },

src/config/index.js

@@ -6,7 +6,7 @@
 // 修改 BRANCH_ID 为对应的商户id
 // app.js 中brandId 修改为对应
 
-const PROJECT_ENV = 'prod' // 生产 prod, 开发 dev, 测试 test , 测试门户 test_store, 预生产 pre
+const PROJECT_ENV = 'test' // 生产 prod, 开发 dev, 测试 test , 测试门户 test_store, 预生产 pre
 //仅生产环境时 配置 ： 
 //3001 3001 ,  wx313ec36b710125d4
 //2006 泰华 , wx40fec8944623c8b3
@@ -24,7 +24,7 @@ const PROJECT_ENV = 'prod' // 生产 prod, 开发 dev, 测试 test , 测试门
 //2992 山东盛联微商城 wx53dedc202ae0d0c2
 //2002 巴黎贝甜 wx21968cb3a486d4ab
 
-const BRANCH_ID = 3001
+const BRANCH_ID = 1002
 const isMall = true
 
 // const needMock = '' //

src/pages/confirmOrder/confirmOrder.js

@@ -246,7 +246,7 @@ wxService.page({
                 [finCouponName]: finCouponId,
                 // couponId: id,
                 haveCoupon: true,
-                currentCoupon: `${faceAmount / 100} 元`
+                currentCoupon: `${parseFloat(faceAmount/10/10).toFixed(2)} 元`
             })
         } else if (type == 2) {
             // let discounPrice = (faceAmount / 100) * (orderPrice)
@@ -593,6 +593,9 @@ wxService.page({
                         data.couponDiscountPreviews[0].couponSettingDTO.faceAmount / 100 : data &&
                         data.couponDiscountPreviews.length && data.couponDiscountPreviews[0] &&
                         data.couponDiscountPreviews[0].couponDiscount;
+                    
+                    defalutCoupon = defalutCoupon ? parseFloat(defalutCoupon).toFixed(2) : 0; 
+
                     let defalutCouponId = data && data.couponDiscountPreviews.length &&
                         data.couponDiscountPreviews[0] && data.couponDiscountPreviews[0].couponDTOS[0] &&
                         data.couponDiscountPreviews[0].couponDTOS[0].id || '';

src/pages/order/order.js

@@ -45,7 +45,7 @@ wxService.page({
     ],
     currentIndex: 1,
     pageNo: 1,
-    pageSize: 5,
+    pageSize: 10,
     noMoreFlag: false,
     orderList: null,
     totalPages: 0,
@@ -89,7 +89,7 @@ wxService.page({
     } else {
       this.setData({
         pageNo: 1,
-        pageSize: 5
+        pageSize: 10
       }, () => {
         this.initOrderList(this.data.pageNo, this.data.pageSize, this.data.status)
       })

src/pages/orderDetail/orderDetail.js

@@ -42,6 +42,18 @@ wxService.page({
       })
     }
   },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+    this.getOrderDetail(this.data.id);
+    setTimeout(() => {
+      wx.stopPullDownRefresh();
+    }, 500);
+  },
+
+  //获取订单详情
   getOrderDetail(id){
     wx.showLoading({
       title: '加载中',
@@ -379,39 +391,4 @@ wxService.page({
       }
     });
   },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
-  }
 })
\ No newline at end of file

src/pages/orderDetail/orderDetail.json

 {
   "navigationBarTitleText": "订单详情",
+  "enablePullDownRefresh": true,
   "usingComponents": {
     "go-home": "/component/goHome/goHome",
     "go-guid": "/component/goGuid/goGuid"

src/pages/refund/refund.js

@@ -105,7 +105,7 @@ wxService.page({
                             wx.navigateBack({
                               delta: 1
                             });
-                          }, 2000);
+                          }, 500);
                           return ;
                         }
 
@@ -134,7 +134,7 @@ wxService.page({
                                   wx.navigateBack({
                                       delta: 1
                                   });
-                                }, 2000)
+                                }, 500)
                             }
                         })
                     }).catch(err => {

src/pages/refundDetail/refundDetail.js

@@ -38,6 +38,17 @@ wxService.page({
       })
     }
   },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+    this.getRfDetail(this.data.id);
+    setTimeout(() => {
+      wx.stopPullDownRefresh();
+    }, 500);
+  },
+  
   handelRevokeRefund() {
     const { id } = this.data
     wx.showLoading({
@@ -68,6 +79,7 @@ wxService.page({
   onDeliveryOk(){
     this.getRfDetail(this.data.id);
   },
+  //获取退单详情
   getRfDetail(id) {
     wx.showLoading({
       title: '加载中',
@@ -85,6 +97,7 @@ wxService.page({
       }
     })
   },
+  //复制
   copy(e) {
     wx.setClipboardData({
       //准备复制的数据

src/pages/refundDetail/refundDetail.json

 {
   "navigationBarTitleText": "退单详情",
+  "enablePullDownRefresh": true,
   "usingComponents": {
     "apply-refund": "/component/applyRefund/applyRefund",
     "go-home": "/component/goHome/goHome",

src/project.config.json

@@ -13,7 +13,7 @@
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.8.2",
-	"appid": "wx313ec36b710125d4",
+	"appid": "wxac09792264c49b5c",
 	"projectname": "%E5%BE%AE%E5%95%86%E5%9F%8E",
 	"debugOptions": {
 		"hidedInDevtools": []