gaojian/xz_gangba
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码合并

Browse Source
This commit is contained in:
Renpc-kilig 2020-06-26 15:07:48 +08:00
parent e50f5ff3a3
commit 3acc1cd9e4
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pages/center/center.js
View File

@ -62,8 +62,6 @@ Page({
}, },
}) })
}, },
<<<<<<< HEAD
=======
/** /**
* 跳转到我的志愿团队页面 * 跳转到我的志愿团队页面
*/ */
@ -81,7 +79,6 @@ Page({
}) })
}, },
>>>>>>> 8efd16995df21586c7ff79678f34b0547afeb3e4
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */