From 7ebd4cebbdec2173fba7345285c0ed6d62043995 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期四, 29 二月 2024 19:27:33 +0800
Subject: [PATCH] 冲突
---
custom-tab-bar/data.js | 3 +++
pages/personalCenter/index.wxml | 5 +++++
pages/personalCenter/myCollection/index.wxml | 5 +++++
pages/teacherCertification/index.wxml | 5 +++++
pages/personalCenter/certificate/index.wxml | 5 +++++
pages/personalCenter/certificate/index.js | 4 ++++
assets/js/config.js | 2 +-
pages/teacherCertification/index.js | 4 ++++
pages/personalCenter/myOrder/index.wxml | 5 +++++
9 files changed, 37 insertions(+), 1 deletions(-)
diff --git a/assets/js/config.js b/assets/js/config.js
index e118a6b..c521369 100644
--- a/assets/js/config.js
+++ b/assets/js/config.js
@@ -16,7 +16,7 @@
export const reg_tel =
/^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/; // 鐢佃瘽鍙锋鍒�
-export const reg_telphone =/^0\d{2}-\d{8}$|^0\d{3}-\d{7}$/; //搴ф満鍙锋鍒�
+export const reg_telphone = /^0\d{2}-\d{8}$|^0\d{3}-\d{7}$/; //搴ф満鍙锋鍒�
export const fontUrl = "http://192.168.3.132:5173";
// export const fontUrl = "http://182.92.203.7:3007/jsek/website";
// export const fontUrl = "http://jsysf.bnuic.com/website";
diff --git a/custom-tab-bar/data.js b/custom-tab-bar/data.js
index b45be73..15a8a50 100644
--- a/custom-tab-bar/data.js
+++ b/custom-tab-bar/data.js
@@ -28,9 +28,12 @@
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 cd7b7c1..319aa9b 100644
--- a/pages/personalCenter/certificate/index.js
+++ b/pages/personalCenter/certificate/index.js
@@ -1,3 +1,7 @@
+<<<<<<< HEAD
+=======
+// pages/personalCenter/certificate/index.js
+>>>>>>> master
Page({
/**
diff --git a/pages/personalCenter/certificate/index.wxml b/pages/personalCenter/certificate/index.wxml
index 45592f3..a5dcc42 100644
--- a/pages/personalCenter/certificate/index.wxml
+++ b/pages/personalCenter/certificate/index.wxml
@@ -1,6 +1,11 @@
<<<<<<< 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
diff --git a/pages/personalCenter/index.wxml b/pages/personalCenter/index.wxml
index 8af8bde..479337b 100644
--- a/pages/personalCenter/index.wxml
+++ b/pages/personalCenter/index.wxml
@@ -1,4 +1,5 @@
<<<<<<< HEAD
+<<<<<<< HEAD
<view class="background {{ isWhite ? 'white':''}}">
<text class="text">涓汉涓績</text>
</view>
@@ -73,3 +74,7 @@
<!--pages/personalCenter/index.wxml-->
<text>pages/personalCenter/index.wxml</text>
>>>>>>> master
+=======
+<!--pages/personalCenter/index.wxml-->
+<text>pages/personalCenter/index.wxml</text>
+>>>>>>> master
diff --git a/pages/personalCenter/myCollection/index.wxml b/pages/personalCenter/myCollection/index.wxml
index 24884c0..a49ac6e 100644
--- a/pages/personalCenter/myCollection/index.wxml
+++ b/pages/personalCenter/myCollection/index.wxml
@@ -1,6 +1,11 @@
<<<<<<< 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
diff --git a/pages/personalCenter/myOrder/index.wxml b/pages/personalCenter/myOrder/index.wxml
index 23977d1..a4252b2 100644
--- a/pages/personalCenter/myOrder/index.wxml
+++ b/pages/personalCenter/myOrder/index.wxml
@@ -1,6 +1,11 @@
<<<<<<< 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 71dd20a..88a37c9 100644
--- a/pages/teacherCertification/index.js
+++ b/pages/teacherCertification/index.js
@@ -1,8 +1,12 @@
<<<<<<< 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 9373670..ecc0fec 100644
--- a/pages/teacherCertification/index.wxml
+++ b/pages/teacherCertification/index.wxml
@@ -1,4 +1,5 @@
<<<<<<< HEAD
+<<<<<<< HEAD
<view class="container">
<view class="tips">
浠呴檺瀛︽牎鏈绋嬩换璇炬暀甯堢敵璇凤紱璇蜂笂浼犳湁鏁堝湪鑱屾暀甯堝伐浣滆瘉灏嗘湁鍔╀簬瀹℃牳銆�
@@ -95,3 +96,7 @@
<!--pages/teacherCertification/index.wxml-->
<text>pages/teacherCertification/index.wxml</text>
>>>>>>> master
+=======
+<!--pages/teacherCertification/index.wxml-->
+<text>pages/teacherCertification/index.wxml</text>
+>>>>>>> master
--
Gitblit v1.9.1