From ccda9ec2fe70d8f51ef184eafc04b78d22dfbabd Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期三, 26 六月 2024 15:02:28 +0800
Subject: [PATCH] 小程序,教材,课程

---
 pages/personalCenter/certificate/index.js |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/pages/personalCenter/certificate/index.js b/pages/personalCenter/certificate/index.js
index 319aa9b..358d636 100644
--- a/pages/personalCenter/certificate/index.js
+++ b/pages/personalCenter/certificate/index.js
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-=======
-// pages/personalCenter/certificate/index.js
->>>>>>> master
 Page({
 
   /**
@@ -15,7 +11,7 @@
    * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
    */
   onLoad(options) {
-
+    console.log(options);
   },
 
   /**

--
Gitblit v1.9.1