From 29291988d5f4c294949d6893dcb93b5a7a261c62 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期四, 29 二月 2024 19:30:39 +0800
Subject: [PATCH] 1
---
custom-tab-bar/data.js | 6 ---
pages/personalCenter/index.wxml | 12 -----
pages/personalCenter/myCollection/index.wxml | 12 -----
pages/teacherCertification/index.wxml | 12 -----
pages/personalCenter/certificate/index.wxml | 11 -----
pages/personalCenter/certificate/index.js | 4 --
pages/teacherCertification/index.js | 9 ----
pages/personalCenter/myOrder/index.wxml | 11 -----
8 files changed, 4 insertions(+), 73 deletions(-)
diff --git a/custom-tab-bar/data.js b/custom-tab-bar/data.js
index 15a8a50..5bd6ab5 100644
--- a/custom-tab-bar/data.js
+++ b/custom-tab-bar/data.js
@@ -27,13 +27,7 @@
{
text: '涓汉涓績',
url: 'pages/personalCenter/index',
-<<<<<<< HEAD
-<<<<<<< HEAD
icon: '/static/images/home/my@2x.png',
activeIcon: '/static/images/home/my-click@2x.png'
-=======
->>>>>>> master
-=======
->>>>>>> master
},
];
diff --git a/pages/personalCenter/certificate/index.js b/pages/personalCenter/certificate/index.js
index 319aa9b..cd7b7c1 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({
/**
diff --git a/pages/personalCenter/certificate/index.wxml b/pages/personalCenter/certificate/index.wxml
index a5dcc42..715d10c 100644
--- a/pages/personalCenter/certificate/index.wxml
+++ b/pages/personalCenter/certificate/index.wxml
@@ -1,11 +1,2 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-=======
<!--pages/personalCenter/certificate/index.wxml-->
-<text>pages/personalCenter/certificate/index.wxml</text>
->>>>>>> master
-=======
-<!--pages/personalCenter/certificate/index.wxml-->
-<text>pages/personalCenter/certificate/index.wxml</text>
->>>>>>> master
+<text>pages/personalCenter/certificate/index.wxml</text>
\ No newline at end of file
diff --git a/pages/personalCenter/index.wxml b/pages/personalCenter/index.wxml
index 479337b..4e3b370 100644
--- a/pages/personalCenter/index.wxml
+++ b/pages/personalCenter/index.wxml
@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
<view class="background {{ isWhite ? 'white':''}}">
<text class="text">涓汉涓績</text>
</view>
@@ -69,12 +67,4 @@
</view>
</view>
</view>
-</view>
-=======
-<!--pages/personalCenter/index.wxml-->
-<text>pages/personalCenter/index.wxml</text>
->>>>>>> master
-=======
-<!--pages/personalCenter/index.wxml-->
-<text>pages/personalCenter/index.wxml</text>
->>>>>>> master
+</view>
\ No newline at end of file
diff --git a/pages/personalCenter/myCollection/index.wxml b/pages/personalCenter/myCollection/index.wxml
index a49ac6e..85d5124 100644
--- a/pages/personalCenter/myCollection/index.wxml
+++ b/pages/personalCenter/myCollection/index.wxml
@@ -1,11 +1 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-<text>鎴戠殑鏀惰棌</text>
-=======
-<!--pages/personalCenter/myCollection/index.wxml-->
-<text>pages/personalCenter/myCollection/index.wxml</text>
->>>>>>> master
-=======
-<!--pages/personalCenter/myCollection/index.wxml-->
-<text>pages/personalCenter/myCollection/index.wxml</text>
->>>>>>> master
+<text>鎴戠殑鏀惰棌</text>
\ No newline at end of file
diff --git a/pages/personalCenter/myOrder/index.wxml b/pages/personalCenter/myOrder/index.wxml
index a4252b2..e69de29 100644
--- a/pages/personalCenter/myOrder/index.wxml
+++ b/pages/personalCenter/myOrder/index.wxml
@@ -1,11 +0,0 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-<text>鎴戠殑璁㈠崟</text>
-=======
-<!--pages/personalCenter/myOrder/index.wxml-->
-<text>pages/personalCenter/myOrder/index.wxml</text>
->>>>>>> master
-=======
-<!--pages/personalCenter/myOrder/index.wxml-->
-<text>pages/personalCenter/myOrder/index.wxml</text>
->>>>>>> master
diff --git a/pages/teacherCertification/index.js b/pages/teacherCertification/index.js
index 88a37c9..cd7b7c1 100644
--- a/pages/teacherCertification/index.js
+++ b/pages/teacherCertification/index.js
@@ -1,12 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-// pages/bookServices/index.js
-=======
-// pages/teacherCertification/index.js
->>>>>>> master
-=======
-// pages/teacherCertification/index.js
->>>>>>> master
Page({
/**
diff --git a/pages/teacherCertification/index.wxml b/pages/teacherCertification/index.wxml
index ecc0fec..5a752b2 100644
--- a/pages/teacherCertification/index.wxml
+++ b/pages/teacherCertification/index.wxml
@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
<view class="container">
<view class="tips">
浠呴檺瀛︽牎鏈绋嬩换璇炬暀甯堢敵璇凤紱璇蜂笂浼犳湁鏁堝湪鑱屾暀甯堝伐浣滆瘉灏嗘湁鍔╀簬瀹℃牳銆�
@@ -91,12 +89,4 @@
</form>
</view>
-</view>
-=======
-<!--pages/teacherCertification/index.wxml-->
-<text>pages/teacherCertification/index.wxml</text>
->>>>>>> master
-=======
-<!--pages/teacherCertification/index.wxml-->
-<text>pages/teacherCertification/index.wxml</text>
->>>>>>> master
+</view>
\ No newline at end of file
--
Gitblit v1.9.1