From c19ed79e14f6a2d2f22f554ff2a4cfb144b6fc3e Mon Sep 17 00:00:00 2001
From: zsk <710162063@qq.com>
Date: Mon, 18 Dec 2023 10:37:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=90=8D=E6=88=90=E5=8A=9F=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/iconfont/iconfont.wxss    | 10 +++++++---
 components/recordBill/index.js   |  5 +++++
 components/recordBill/index.wxml |  2 +-
 pages/returnMessage/index.js     | 25 +++++++++++++++++++++----
 pages/returnMessage/index.wxml   |  2 +-
 5 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/assets/iconfont/iconfont.wxss b/assets/iconfont/iconfont.wxss
index 3d181d3..35008f5 100644
--- a/assets/iconfont/iconfont.wxss
+++ b/assets/iconfont/iconfont.wxss
@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4374774 */
-  src: url('//at.alicdn.com/t/c/font_4374774_q3e6az95gpf.woff2?t=1702625989224') format('woff2'),
-       url('//at.alicdn.com/t/c/font_4374774_q3e6az95gpf.woff?t=1702625989224') format('woff'),
-       url('//at.alicdn.com/t/c/font_4374774_q3e6az95gpf.ttf?t=1702625989224') format('truetype');
+  src: url('//at.alicdn.com/t/c/font_4374774_8lhn98fphhv.woff2?t=1702866649762') format('woff2'),
+       url('//at.alicdn.com/t/c/font_4374774_8lhn98fphhv.woff?t=1702866649762') format('woff'),
+       url('//at.alicdn.com/t/c/font_4374774_8lhn98fphhv.ttf?t=1702866649762') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-tijiaochenggong2:before {
+  content: "\e71c";
+}
+
 .icon-paizhao1:before {
   content: "\e83f";
 }
diff --git a/components/recordBill/index.js b/components/recordBill/index.js
index 444a651..cf316b6 100644
--- a/components/recordBill/index.js
+++ b/components/recordBill/index.js
@@ -58,5 +58,10 @@ Component({
       })
       // this.triggerEvent("hidedrawer", eventDetail);
     },
+    submitModal(){
+      wx.navigateTo({
+        url: '../../pages/returnMessage/index?type=success&msg=报名成功',
+      })
+    },
   }
 })
\ No newline at end of file
diff --git a/components/recordBill/index.wxml b/components/recordBill/index.wxml
index 8c8465a..f68d10e 100644
--- a/components/recordBill/index.wxml
+++ b/components/recordBill/index.wxml
@@ -47,7 +47,7 @@
     </view>
     <view class="fsa pl32 pr32 mb24" hover-class="none" hover-stop-propagation="false">
       <button class="nobg_Btn normalBtn36 mr16" style type role="button" hover-class="thover" bindtap='hideModal'>我再想想</button>
-      <button class="bgBtn normalBtn36" style type="primary" hover-class="thover" bindtap="hideModal">确认报名</button>
+      <button class="bgBtn normalBtn36" style type="primary" hover-class="thover" bindtap="submitModal">确认报名</button>
     </view>
   </view>
 </view>
diff --git a/pages/returnMessage/index.js b/pages/returnMessage/index.js
index 04f3104..9b565e2 100644
--- a/pages/returnMessage/index.js
+++ b/pages/returnMessage/index.js
@@ -69,6 +69,23 @@ Page({
 	 */
 	onShareAppMessage1() {},
 	finish() {
+
+    let pages = getCurrentPages();
+    //检查页面栈
+    //console.log(pages);
+    //判断页面栈中页面的数量是否有跳转(可以省去判断)
+    if(pages.length > 1){
+        //获取上一个页面实例对象
+        let prePage = pages[pages.length - 2];
+        //调用上一个页面实例对象的方法
+        prePage.setData({
+          recordBillShow : false
+        })
+        //返回上一个页面
+        wx.navigateBack();
+    }
+
+
 		// if (wx.getStorageSync("comeFromPage")) {
 		// 	let from = wx.getStorageSync("comeFromPage");
 		// 	wx.navigateTo({
@@ -76,11 +93,11 @@ Page({
 		// 	});
 		// 	console.log(wx.getStorageSync("comeFromPage"));
 		// }
-    wx.switchTab({
-      url: '../index/index',
-    })
+    // wx.switchTab({
+    //   url: '../index/index',
+    // })
 		// wx.navigateBack({
-		// 	delta: 2,
+		// 	delta: 1,
 		// });
 	},
 	/**
diff --git a/pages/returnMessage/index.wxml b/pages/returnMessage/index.wxml
index 573b5fb..6e46940 100644
--- a/pages/returnMessage/index.wxml
+++ b/pages/returnMessage/index.wxml
@@ -5,6 +5,6 @@
   <view class="f14 c9 mt16" wx:if='{{status}}' hover-class="none" hover-stop-propagation="false">
     {{'错误代码：' + status}}
   </view>
-  <view class='loginOut normalBtn'  bindtap='finish'>完成</view>
+  <view class='loginOut normalBtn' hover-class='thover' bindtap='finish'>完成</view>
   <!-- <view class='f14 mt24' bindtap='toMine' hover-class='none' style='color:#576B95' hover-stop-propagation='false'>返回职位列表</view> -->
 </view>