From bc7b375c7dd6b256ebd582c4ab85f77fca8dc054 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期四, 21 三月 2024 14:54:55 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
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