dev--yt-commit

Merge remote-tracking branch 'origin/dev' into dev
2025-06-03 10:40:11 +08:00 · 2025-06-03 10:40:01 +08:00 · 2025-06-03 10:38:47 +08:00 · 2025-06-03 10:37:39 +08:00 · 2025-06-03 09:34:04 +08:00 · 2025-06-03 09:33:08 +08:00
1 changed files with 3 additions and 0 deletions
--- a/pages/personCenter/mine/mine.js
+++ b/pages/personCenter/mine/mine.js
@ -26,6 +26,9 @@ Page({
      showPopup: true
    });
  },
+  testOrigin() {
+    console.log("testOrigin");
+  },

  // 关闭弹窗
  closePopup() {
Author	SHA1	Message	Date
yuanteng0011	eaf4b6c5e5	dev--yt-commit	2025-06-03 10:40:11 +08:00
yuanteng0011	41e1570687	Merge remote-tracking branch 'origin/dev' into dev	2025-06-03 10:40:01 +08:00
yuanteng0011	ee098e31e3	Merge remote-tracking branch 'origin/dev' into dev	2025-06-03 10:38:47 +08:00
yuanteng0011	f825e45ff8	Merge remote-tracking branch 'origin/dev' into dev	2025-06-03 10:37:39 +08:00
yuanteng0011	b7807ade7a	Merge remote-tracking branch 'origin/dev' into dev	2025-06-03 09:34:04 +08:00
yuanteng0011	ea4cc63ba2	Merge remote-tracking branch 'origin/dev' into dev	2025-06-03 09:33:08 +08:00
yuanteng0011	87f760e991	Merge remote-tracking branch 'origin/dev' into dev	2025-06-03 09:31:53 +08:00
yuanteng0011	9fb8be3859	Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # pages/personCenter/mine/mine.js	2025-06-03 09:31:24 +08:00
yuanteng0011	58a56f42b8	dev--yt-commit	2025-06-03 09:30:28 +08:00
yuanteng0011	21c43db54e	Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # pages/personCenter/mine/mine.js	2025-06-03 09:30:18 +08:00
yuanteng0011	e04275130a	dev--yt-commit	2025-06-03 09:29:18 +08:00
yuanteng0011	509beeed4e	Merge remote-tracking branch 'origin/dev' into dev	2025-06-03 09:27:29 +08:00
yuanteng0011	e6fd08328a	Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # pages/personCenter/mine/mine.js	2025-06-03 09:25:42 +08:00
yuanteng0011	d0722ca09a	dev--yt-commit	2025-06-03 09:22:38 +08:00
yuanteng0011	b00e10761b	Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # pages/personCenter/mine/mine.js	2025-06-03 09:18:39 +08:00
yuanteng0011	441f8d89ea	dev--yt-commit	2025-06-03 09:17:38 +08:00
yuanteng0011	a9bd8212b9	Merge remote-tracking branch 'origin/dev' into dev	2025-06-03 09:16:53 +08:00
yuanteng0011	3a4ddd2cf7	dev--yt-commit	2025-06-03 09:16:01 +08:00
yuanteng0011	95bede1c28	Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # pages/personCenter/mine/mine.js	2025-06-03 09:15:43 +08:00
yuanteng0011	f7f43d8686	dev--yt-commit	2025-06-03 09:11:31 +08:00
yuanteng0011	1fbbd52cb7	Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # pages/personCenter/mine/mine.js	2025-06-03 09:10:45 +08:00
yuanteng0011	50b454adcf	dev--yt-commit	2025-06-03 09:09:50 +08:00
yuanteng0011	d021c035d4	Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # pages/personCenter/mine/mine.js	2025-06-03 09:09:05 +08:00
yuanteng0011	1a171a735d	dev--yt-commit	2025-06-03 09:07:26 +08:00
yuanteng0011	007265c4bd	Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # pages/personCenter/mine/mine.js	2025-06-03 09:06:40 +08:00
yuanteng0011	343893e629	dev--yt-commit	2025-06-03 09:03:55 +08:00
yuanteng0011	31a253227f	Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # pages/personCenter/mine/mine.js	2025-06-03 09:03:34 +08:00
yuanteng0011	ab4508bd51	dev--yt-commit	2025-06-03 09:01:48 +08:00
yuanteng0011	92aab2ab7b	Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # pages/personCenter/mine/mine.js	2025-06-03 08:56:48 +08:00
yuanteng0011	6323bfc11b	dev--yt-commit	2025-06-03 08:55:11 +08:00