解决冲突

package-base-select/pages/select-collection_confirm/select-collection_confirm.js

@@ -653,36 +653,13 @@ Page({
    * @author : 姜永辉
    */
   handleData() {
-<<<<<<< HEAD
-   if (this.data.formType == 3 || this.data.formType == 4) { //客户收款/退款 
-=======
     if (this.data.formType == 3 || this.data.formType == 4) { //客户收款/退款 
->>>>>>> 57e41553ed7210650769ec5d0a6dd9fa718e73c0
       let pages = getCurrentPages();
       let prevPage = pages[pages.length - 3]; //上二页
       prevPage.setData({
         refreshByAdd: true
       })
-<<<<<<< HEAD
-=======
-      // wx.navigateBack({
-      //   delta: 1
-      // })
-
-          //新手引导过来,需要返回
-          if (this.data.formReturnMode == Constants.formReturnMode.beginnerGuide) {
-            const eventChannel = this.getOpenerEventChannel();
-            eventChannel.emit('refresh', {
-              id: 1
-            })
-            setTimeout(() => {
-              wx.navigateBack({
-                delta: 1
-              });
-            }, 200)
-          }
 
->>>>>>> 57e41553ed7210650769ec5d0a6dd9fa718e73c0
     } else if (this.data.formType == 8) { //订单收款
       let pages = getCurrentPages();
       let prevPage = pages[pages.length - 2]; //上1页