jsek-applet.git

parent: 60bae3bf | 补丁 | 提交 | ignore whitespace

litian

2024-02-29 7ebd4cebbdec2173fba7345285c0ed6d62043995

冲突

9个文件已修改

	assets/js/config.js	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	custom-tab-bar/data.js	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/personalCenter/certificate/index.js	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/personalCenter/certificate/index.wxml	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/personalCenter/index.wxml	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/personalCenter/myCollection/index.wxml	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/personalCenter/myOrder/index.wxml	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/teacherCertification/index.js	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/teacherCertification/index.wxml	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 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";

 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
  },
];

 pages/personalCenter/certificate/index.js

@@ -1,3 +1,7 @@
<<<<<<< HEAD
=======
// pages/personalCenter/certificate/index.js
>>>>>>> master
Page({

  /**

 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

 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

 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

 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

 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({

  /**

 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

			@@ -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";

			@@ -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
			},
			];

			@@ -1,3 +1,7 @@
			<<<<<<< HEAD
			=======
			// pages/personalCenter/certificate/index.js
			>>>>>>> master
			Page({

			/**

			@@ -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

			@@ -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

			@@ -1,8 +1,12 @@
			<<<<<<< HEAD
			<<<<<<< HEAD
			// pages/bookServices/index.js
			=======
			// pages/teacherCertification/index.js
			>>>>>>> master
			=======
			// pages/teacherCertification/index.js
			>>>>>>> master
			Page({

			/**