From 615c441c87676709be62e95043c3e977b7c7d305 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=BB=BA=E5=AE=87?= <656078035@qq.com>
Date: Wed, 16 Oct 2024 15:59:36 +0800
Subject: [PATCH] v3.0
---
code 2.0/pages/course/course.js | 114 ---------------
.../pages/course_detail/course_detail.wxml | 20 ---
code 2.0/pages/my/my.js | 66 ---------
{code 2.0 => code 3.0}/.eslintrc.js | 0
{code 2.0 => code 3.0}/app.js | 0
{code 2.0 => code 3.0}/app.json | 0
{code 2.0 => code 3.0}/app.wxss | 0
.../assets/course/arrow-right.png | Bin
.../assets/course/多栏明细账.png | Bin
.../assets/login/极光.png | Bin
.../assets/my/个人信息.png | Bin
.../assets/my/修改密码.png | Bin
.../assets/tabbar/我的（1）.png | Bin
.../assets/tabbar/我的（2）.png | Bin
.../assets/tabbar/课程（1）.png | Bin
.../assets/tabbar/课程（2）.png | Bin
{code 2.0 => code 3.0}/openAPI/default.html | 0
.../pages/call_the_name/call_the_name.js | 1 +
.../pages/call_the_name/call_the_name.json | 0
.../pages/call_the_name/call_the_name.scss | 0
.../pages/call_the_name/call_the_name.wxml | 0
.../pages/choose_name/choose_name.js | 0
.../pages/choose_name/choose_name.json | 0
.../pages/choose_name/choose_name.scss | 0
.../pages/choose_name/choose_name.wxml | 0
code 3.0/pages/course/course.js | 137 ++++++++++++++++++
.../pages/course/course.json | 0
.../pages/course/course.scss | 0
.../pages/course/course.wxml | 2 +-
.../course_detail(2)/course_detail(2).js | 0
.../course_detail(2)/course_detail(2).json | 0
.../course_detail(2)/course_detail(2).scss | 0
.../course_detail(2)/course_detail(2).wxml | 0
.../pages/course_detail/course_detail.js | 21 ++-
.../pages/course_detail/course_detail.json | 0
.../pages/course_detail/course_detail.scss | 0
.../pages/course_detail/course_detail.wxml | 45 ++++++
{code 2.0 => code 3.0}/pages/forget/forget.js | 0
.../pages/forget/forget.json | 0
.../pages/forget/forget.scss | 0
.../pages/forget/forget.wxml | 0
{code 2.0 => code 3.0}/pages/login/login.js | 2 +-
{code 2.0 => code 3.0}/pages/login/login.json | 0
{code 2.0 => code 3.0}/pages/login/login.scss | 0
{code 2.0 => code 3.0}/pages/login/login.wxml | 0
{code 2.0 => code 3.0}/pages/logs/logs.js | 0
{code 2.0 => code 3.0}/pages/logs/logs.json | 0
{code 2.0 => code 3.0}/pages/logs/logs.wxml | 0
{code 2.0 => code 3.0}/pages/logs/logs.wxss | 0
code 3.0/pages/my/my.js | 68 +++++++++
{code 2.0 => code 3.0}/pages/my/my.json | 0
{code 2.0 => code 3.0}/pages/my/my.scss | 0
{code 2.0 => code 3.0}/pages/my/my.wxml | 4 +-
.../pages/my_callname/my_callname.js | 0
.../pages/my_callname/my_callname.json | 0
.../pages/my_callname/my_callname.scss | 0
.../pages/my_callname/my_callname.wxml | 0
.../pages/register/register.js | 0
.../pages/register/register.json | 0
.../pages/register/register.scss | 0
.../pages/register/register.wxml | 0
.../pages/student_info(2)/student_info(2).js | 0
.../student_info(2)/student_info(2).json | 0
.../student_info(2)/student_info(2).scss | 0
.../student_info(2)/student_info(2).wxml | 0
.../pages/student_info/student_info.js | 0
.../pages/student_info/student_info.json | 0
.../pages/student_info/student_info.scss | 0
.../pages/student_info/student_info.wxml | 0
{code 2.0 => code 3.0}/project.config.json | 0
.../project.private.config.json | 0
{code 2.0 => code 3.0}/sitemap.json | 0
{code 2.0 => code 3.0}/utils/util.js | 0
.../素材/bird，鸟，动物，卡通.png | Bin
.../素材/circle-plus-outline.png | Bin
.../素材/乌龟，卡通动物.png | Bin
.../素材/任务完成.png | Bin
.../素材/企鹅，卡通动物.png | Bin
.../素材/各司其职.png | Bin
.../素材/大象，卡通动物.png | Bin
.../素材/奶牛，卡通动物.png | Bin
{code 2.0 => code 3.0}/素材/微笑.png | Bin
.../素材/打招呼的猫.png | Bin
.../素材/海豚，卡通动物.png | Bin
.../素材/海马，卡通动物.png | Bin
.../素材/牛，卡通动物.png | Bin
.../素材/狗，卡通动物.png | Bin
.../素材/猴子，卡通动物.png | Bin
.../素材/章鱼，卡通动物.png | Bin
.../素材/绵羊，卡通动物.png | Bin
.../素材/老虎，卡通动物.png | Bin
.../素材/蛇，卡通动物.png | Bin
{code 2.0 => code 3.0}/素材/蜗牛.png | Bin
.../素材/蜜蜂，昆虫.png | Bin
.../素材/蝴蝶，昆虫，卡通.png | Bin
.../素材/螃蟹，卡通动物.png | Bin
{code 2.0 => code 3.0}/素材/问答.png | Bin
.../素材/鱼，卡通动物.png | Bin
.../素材/鲨鱼，卡通动物.png | Bin
.../素材/鸡，卡通动物.png | Bin
.../素材/鹰，卡通动物.png | Bin
.../素材/鹿，卡通动物.png | Bin
102 files changed, 270 insertions(+), 210 deletions(-)
delete mode 100644 code 2.0/pages/course/course.js
delete mode 100644 code 2.0/pages/course_detail/course_detail.wxml
delete mode 100644 code 2.0/pages/my/my.js
rename {code 2.0 => code 3.0}/.eslintrc.js (100%)
rename {code 2.0 => code 3.0}/app.js (100%)
rename {code 2.0 => code 3.0}/app.json (100%)
rename {code 2.0 => code 3.0}/app.wxss (100%)
rename {code 2.0 => code 3.0}/assets/course/arrow-right.png (100%)
rename {code 2.0 => code 3.0}/assets/course/多栏明细账.png (100%)
rename {code 2.0 => code 3.0}/assets/login/极光.png (100%)
rename {code 2.0 => code 3.0}/assets/my/个人信息.png (100%)
rename {code 2.0 => code 3.0}/assets/my/修改密码.png (100%)
rename {code 2.0 => code 3.0}/assets/tabbar/我的（1）.png (100%)
rename {code 2.0 => code 3.0}/assets/tabbar/我的（2）.png (100%)
rename {code 2.0 => code 3.0}/assets/tabbar/课程（1）.png (100%)
rename {code 2.0 => code 3.0}/assets/tabbar/课程（2）.png (100%)
rename {code 2.0 => code 3.0}/openAPI/default.html (100%)
rename {code 2.0 => code 3.0}/pages/call_the_name/call_the_name.js (98%)
rename {code 2.0 => code 3.0}/pages/call_the_name/call_the_name.json (100%)
rename {code 2.0 => code 3.0}/pages/call_the_name/call_the_name.scss (100%)
rename {code 2.0 => code 3.0}/pages/call_the_name/call_the_name.wxml (100%)
rename {code 2.0 => code 3.0}/pages/choose_name/choose_name.js (100%)
rename {code 2.0 => code 3.0}/pages/choose_name/choose_name.json (100%)
rename {code 2.0 => code 3.0}/pages/choose_name/choose_name.scss (100%)
rename {code 2.0 => code 3.0}/pages/choose_name/choose_name.wxml (100%)
create mode 100644 code 3.0/pages/course/course.js
rename {code 2.0 => code 3.0}/pages/course/course.json (100%)
rename {code 2.0 => code 3.0}/pages/course/course.scss (100%)
rename {code 2.0 => code 3.0}/pages/course/course.wxml (91%)
rename {code 2.0 => code 3.0}/pages/course_detail(2)/course_detail(2).js (100%)
rename {code 2.0 => code 3.0}/pages/course_detail(2)/course_detail(2).json (100%)
rename {code 2.0 => code 3.0}/pages/course_detail(2)/course_detail(2).scss (100%)
rename {code 2.0 => code 3.0}/pages/course_detail(2)/course_detail(2).wxml (100%)
rename {code 2.0 => code 3.0}/pages/course_detail/course_detail.js (85%)
rename {code 2.0 => code 3.0}/pages/course_detail/course_detail.json (100%)
rename {code 2.0 => code 3.0}/pages/course_detail/course_detail.scss (100%)
create mode 100644 code 3.0/pages/course_detail/course_detail.wxml
rename {code 2.0 => code 3.0}/pages/forget/forget.js (100%)
rename {code 2.0 => code 3.0}/pages/forget/forget.json (100%)
rename {code 2.0 => code 3.0}/pages/forget/forget.scss (100%)
rename {code 2.0 => code 3.0}/pages/forget/forget.wxml (100%)
rename {code 2.0 => code 3.0}/pages/login/login.js (96%)
rename {code 2.0 => code 3.0}/pages/login/login.json (100%)
rename {code 2.0 => code 3.0}/pages/login/login.scss (100%)
rename {code 2.0 => code 3.0}/pages/login/login.wxml (100%)
rename {code 2.0 => code 3.0}/pages/logs/logs.js (100%)
rename {code 2.0 => code 3.0}/pages/logs/logs.json (100%)
rename {code 2.0 => code 3.0}/pages/logs/logs.wxml (100%)
rename {code 2.0 => code 3.0}/pages/logs/logs.wxss (100%)
create mode 100644 code 3.0/pages/my/my.js
rename {code 2.0 => code 3.0}/pages/my/my.json (100%)
rename {code 2.0 => code 3.0}/pages/my/my.scss (100%)
rename {code 2.0 => code 3.0}/pages/my/my.wxml (88%)
rename {code 2.0 => code 3.0}/pages/my_callname/my_callname.js (100%)
rename {code 2.0 => code 3.0}/pages/my_callname/my_callname.json (100%)
rename {code 2.0 => code 3.0}/pages/my_callname/my_callname.scss (100%)
rename {code 2.0 => code 3.0}/pages/my_callname/my_callname.wxml (100%)
rename {code 2.0 => code 3.0}/pages/register/register.js (100%)
rename {code 2.0 => code 3.0}/pages/register/register.json (100%)
rename {code 2.0 => code 3.0}/pages/register/register.scss (100%)
rename {code 2.0 => code 3.0}/pages/register/register.wxml (100%)
rename {code 2.0 => code 3.0}/pages/student_info(2)/student_info(2).js (100%)
rename {code 2.0 => code 3.0}/pages/student_info(2)/student_info(2).json (100%)
rename {code 2.0 => code 3.0}/pages/student_info(2)/student_info(2).scss (100%)
rename {code 2.0 => code 3.0}/pages/student_info(2)/student_info(2).wxml (100%)
rename {code 2.0 => code 3.0}/pages/student_info/student_info.js (100%)
rename {code 2.0 => code 3.0}/pages/student_info/student_info.json (100%)
rename {code 2.0 => code 3.0}/pages/student_info/student_info.scss (100%)
rename {code 2.0 => code 3.0}/pages/student_info/student_info.wxml (100%)
rename {code 2.0 => code 3.0}/project.config.json (100%)
rename {code 2.0 => code 3.0}/project.private.config.json (100%)
rename {code 2.0 => code 3.0}/sitemap.json (100%)
rename {code 2.0 => code 3.0}/utils/util.js (100%)
rename {code 2.0 => code 3.0}/素材/bird，鸟，动物，卡通.png (100%)
rename {code 2.0 => code 3.0}/素材/circle-plus-outline.png (100%)
rename {code 2.0 => code 3.0}/素材/乌龟，卡通动物.png (100%)
rename {code 2.0 => code 3.0}/素材/任务完成.png (100%)
rename {code 2.0 => code 3.0}/素材/企鹅，卡通动物.png (100%)
rename {code 2.0 => code 3.0}/素材/各司其职.png (100%)
rename {code 2.0 => code 3.0}/素材/大象，卡通动物.png (100%)
rename {code 2.0 => code 3.0}/素材/奶牛，卡通动物.png (100%)
rename {code 2.0 => code 3.0}/素材/微笑.png (100%)
rename {code 2.0 => code 3.0}/素材/打招呼的猫.png (100%)
rename {code 2.0 => code 3.0}/素材/海豚，卡通动物.png (100%)
rename {code 2.0 => code 3.0}/素材/海马，卡通动物.png (100%)
rename {code 2.0 => code 3.0}/素材/牛，卡通动物.png (100%)
rename {code 2.0 => code 3.0}/素材/狗，卡通动物.png (100%)
rename {code 2.0 => code 3.0}/素材/猴子，卡通动物.png (100%)
rename {code 2.0 => code 3.0}/素材/章鱼，卡通动物.png (100%)
rename {code 2.0 => code 3.0}/素材/绵羊，卡通动物.png (100%)
rename {code 2.0 => code 3.0}/素材/老虎，卡通动物.png (100%)
rename {code 2.0 => code 3.0}/素材/蛇，卡通动物.png (100%)
rename {code 2.0 => code 3.0}/素材/蜗牛.png (100%)
rename {code 2.0 => code 3.0}/素材/蜜蜂，昆虫.png (100%)
rename {code 2.0 => code 3.0}/素材/蝴蝶，昆虫，卡通.png (100%)
rename {code 2.0 => code 3.0}/素材/螃蟹，卡通动物.png (100%)
rename {code 2.0 => code 3.0}/素材/问答.png (100%)
rename {code 2.0 => code 3.0}/素材/鱼，卡通动物.png (100%)
rename {code 2.0 => code 3.0}/素材/鲨鱼，卡通动物.png (100%)
rename {code 2.0 => code 3.0}/素材/鸡，卡通动物.png (100%)
rename {code 2.0 => code 3.0}/素材/鹰，卡通动物.png (100%)
rename {code 2.0 => code 3.0}/素材/鹿，卡通动物.png (100%)
diff --git a/code 2.0/pages/course/course.js b/code 2.0/pages/course/course.js
deleted file mode 100644
index 45b5049..0000000
--- a/code 2.0/pages/course/course.js
+++ /dev/null
@@ -1,114 +0,0 @@
-Page({
-
- /**
- * 页面的初始数据
- */
- data: {
- courseList: [],
- isAdmin: true
- },
- enterCourse : function(event) {
- const courseId = event.currentTarget.dataset.id;
- const description = event.currentTarget.dataset.description;
- wx.setStorageSync('courseId', courseId);
- wx.setStorageSync('description', description);
- console.log('courseId', courseId);
- console.log('description', description);
- if (this.data.isAdmin) {
- wx.navigateTo({url: '/pages/course_detail/course_detail'});
- } else {
- wx.navigateTo({url: '/pages/course_detail(2)/course_detail(2)'});
- }
- },
-
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad(options) {
- const that = this;
- that.setData ({
- isAdmin: wx.getStorageSync("isAdmin")
- });
- if (that.data.isAdmin) {
- wx.request({
- url: 'http://10.133.15.50:8888/admin/ownCourseList',
- method: 'GET',
- header: {
- admin_token: wx.getStorageSync('token') // 携带token
- },
- success(res) {
- if (res.statusCode === 200) {
- console.log(res.data.data);
- that.setData({
- courseList: res.data.data
- });
- }
- },
- fail(error) {
- console.error(err);
- }
- });
- } else {
- wx.request({
- url: 'http://10.133.15.50:8888/student/ownCourseList',
- method: 'GET',
- header: {
- student_token: wx.getStorageSync('token') // 携带token
- },
- success(res) {
- if (res.statusCode === 200) {
- console.log(res.data.data);
- that.setData({
- courseList: res.data.data
- });
- }
- },
- fail(error) {
- console.error(err);
- }
- });
- }
- },
-
- util: function (currentStatu) {
- /* 动画部分 */
- // 第1步：创建动画实例
- var animation = wx.createAnimation({
- duration: 200, //动画时长
- timingFunction: "linear", //线性
- delay: 0 //0则不延迟
- });
- // 第2步：这个动画实例赋给当前的动画实例
- this.animation = animation;
-
- // 第3步：执行第一组动画
- animation.opacity(0).rotateX(-100).step();
-
- // 第4步：导出动画对象赋给数据对象储存
- this.setData({
- animationData: animation.export()
- })
-
- // 第5步：设置定时器到指定时候后，执行第二组动画
- setTimeout(function () {
- // 执行第二组动画
- animation.opacity(1).rotateX(0).step();
- // 给数据对象储存的第一组动画，更替为执行完第二组动画的动画对象
- this.setData({
- animationData: animation
- })
- //关闭
- if (currentStatu == "close") {
- this.setData({
- showModalStatus: false
- });
- }
- }.bind(this), 200)
- // 显示
- if (currentStatu == "open") {
- this.setData({
- showModalStatus: true
- });
- }
- },
-})
\ No newline at end of file
diff --git a/code 2.0/pages/course_detail/course_detail.wxml b/code 2.0/pages/course_detail/course_detail.wxml
deleted file mode 100644
index 1d49b7a..0000000
--- a/code 2.0/pages/course_detail/course_detail.wxml
+++ /dev/null
@@ -1,20 +0,0 @@
-
- {{description}}
-
- 查看学生信息
-
-
-
- 点名
-
-
-
- 添加学生
-
-
-
- 导入学生名单
-
-
-
-
diff --git a/code 2.0/pages/my/my.js b/code 2.0/pages/my/my.js
deleted file mode 100644
index 7c8d6d5..0000000
--- a/code 2.0/pages/my/my.js
+++ /dev/null
@@ -1,66 +0,0 @@
-// pages/my/my.js
-Page({
-
- /**
- * 页面的初始数据
- */
- data: {
-
- },
-
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad(options) {
-
- },
-
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady() {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow() {
-
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide() {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload() {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh() {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom() {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage() {
-
- }
-})
\ No newline at end of file
diff --git a/code 2.0/.eslintrc.js b/code 3.0/.eslintrc.js
similarity index 100%
rename from code 2.0/.eslintrc.js
rename to code 3.0/.eslintrc.js
diff --git a/code 2.0/app.js b/code 3.0/app.js
similarity index 100%
rename from code 2.0/app.js
rename to code 3.0/app.js
diff --git a/code 2.0/app.json b/code 3.0/app.json
similarity index 100%
rename from code 2.0/app.json
rename to code 3.0/app.json
diff --git a/code 2.0/app.wxss b/code 3.0/app.wxss
similarity index 100%
rename from code 2.0/app.wxss
rename to code 3.0/app.wxss
diff --git a/code 2.0/assets/course/arrow-right.png b/code 3.0/assets/course/arrow-right.png
similarity index 100%
rename from code 2.0/assets/course/arrow-right.png
rename to code 3.0/assets/course/arrow-right.png
diff --git a/code 2.0/assets/course/多栏明细账.png b/code 3.0/assets/course/多栏明细账.png
similarity index 100%
rename from code 2.0/assets/course/多栏明细账.png
rename to code 3.0/assets/course/多栏明细账.png
diff --git a/code 2.0/assets/login/极光.png b/code 3.0/assets/login/极光.png
similarity index 100%
rename from code 2.0/assets/login/极光.png
rename to code 3.0/assets/login/极光.png
diff --git a/code 2.0/assets/my/个人信息.png b/code 3.0/assets/my/个人信息.png
similarity index 100%
rename from code 2.0/assets/my/个人信息.png
rename to code 3.0/assets/my/个人信息.png
diff --git a/code 2.0/assets/my/修改密码.png b/code 3.0/assets/my/修改密码.png
similarity index 100%
rename from code 2.0/assets/my/修改密码.png
rename to code 3.0/assets/my/修改密码.png
diff --git a/code 2.0/assets/tabbar/我的（1）.png b/code 3.0/assets/tabbar/我的（1）.png
similarity index 100%
rename from code 2.0/assets/tabbar/我的（1）.png
rename to code 3.0/assets/tabbar/我的（1）.png
diff --git a/code 2.0/assets/tabbar/我的（2）.png b/code 3.0/assets/tabbar/我的（2）.png
similarity index 100%
rename from code 2.0/assets/tabbar/我的（2）.png
rename to code 3.0/assets/tabbar/我的（2）.png
diff --git a/code 2.0/assets/tabbar/课程（1）.png b/code 3.0/assets/tabbar/课程（1）.png
similarity index 100%
rename from code 2.0/assets/tabbar/课程（1）.png
rename to code 3.0/assets/tabbar/课程（1）.png
diff --git a/code 2.0/assets/tabbar/课程（2）.png b/code 3.0/assets/tabbar/课程（2）.png
similarity index 100%
rename from code 2.0/assets/tabbar/课程（2）.png
rename to code 3.0/assets/tabbar/课程（2）.png
diff --git a/code 2.0/openAPI/default.html b/code 3.0/openAPI/default.html
similarity index 100%
rename from code 2.0/openAPI/default.html
rename to code 3.0/openAPI/default.html
diff --git a/code 2.0/pages/call_the_name/call_the_name.js b/code 3.0/pages/call_the_name/call_the_name.js
similarity index 98%
rename from code 2.0/pages/call_the_name/call_the_name.js
rename to code 3.0/pages/call_the_name/call_the_name.js
index e3f55ea..015346e 100644
--- a/code 2.0/pages/call_the_name/call_the_name.js
+++ b/code 3.0/pages/call_the_name/call_the_name.js
@@ -13,6 +13,7 @@ Page({
this.call_the_name();
},
addScore2: function() {
+ this.addScore(0);
this.call_the_name();
},
addScore3: function() {
diff --git a/code 2.0/pages/call_the_name/call_the_name.json b/code 3.0/pages/call_the_name/call_the_name.json
similarity index 100%
rename from code 2.0/pages/call_the_name/call_the_name.json
rename to code 3.0/pages/call_the_name/call_the_name.json
diff --git a/code 2.0/pages/call_the_name/call_the_name.scss b/code 3.0/pages/call_the_name/call_the_name.scss
similarity index 100%
rename from code 2.0/pages/call_the_name/call_the_name.scss
rename to code 3.0/pages/call_the_name/call_the_name.scss
diff --git a/code 2.0/pages/call_the_name/call_the_name.wxml b/code 3.0/pages/call_the_name/call_the_name.wxml
similarity index 100%
rename from code 2.0/pages/call_the_name/call_the_name.wxml
rename to code 3.0/pages/call_the_name/call_the_name.wxml
diff --git a/code 2.0/pages/choose_name/choose_name.js b/code 3.0/pages/choose_name/choose_name.js
similarity index 100%
rename from code 2.0/pages/choose_name/choose_name.js
rename to code 3.0/pages/choose_name/choose_name.js
diff --git a/code 2.0/pages/choose_name/choose_name.json b/code 3.0/pages/choose_name/choose_name.json
similarity index 100%
rename from code 2.0/pages/choose_name/choose_name.json
rename to code 3.0/pages/choose_name/choose_name.json
diff --git a/code 2.0/pages/choose_name/choose_name.scss b/code 3.0/pages/choose_name/choose_name.scss
similarity index 100%
rename from code 2.0/pages/choose_name/choose_name.scss
rename to code 3.0/pages/choose_name/choose_name.scss
diff --git a/code 2.0/pages/choose_name/choose_name.wxml b/code 3.0/pages/choose_name/choose_name.wxml
similarity index 100%
rename from code 2.0/pages/choose_name/choose_name.wxml
rename to code 3.0/pages/choose_name/choose_name.wxml
diff --git a/code 3.0/pages/course/course.js b/code 3.0/pages/course/course.js
new file mode 100644
index 0000000..e00be67
--- /dev/null
+++ b/code 3.0/pages/course/course.js
@@ -0,0 +1,137 @@
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ courseList: [],
+ isAdmin: true
+ },
+ enterCourse : function(event) {
+ const courseId = event.currentTarget.dataset.id;
+ const description = event.currentTarget.dataset.description;
+ wx.setStorageSync('courseId', courseId);
+ wx.setStorageSync('description', description);
+ console.log('courseId', courseId);
+ console.log('description', description);
+ if (this.data.isAdmin) {
+ wx.navigateTo({url: '/pages/course_detail/course_detail'});
+ } else {
+ wx.navigateTo({url: '/pages/course_detail(2)/course_detail(2)'});
+ }
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+ this.getCourse();
+ },
+ getCourse: function() {
+ const that = this;
+ that.setData ({
+ isAdmin: wx.getStorageSync("isAdmin")
+ });
+ if (that.data.isAdmin) {
+ wx.request({
+ url: 'http://10.133.15.50:8888/admin/ownCourseList',
+ method: 'GET',
+ header: {
+ admin_token: wx.getStorageSync('token') // 携带token
+ },
+ success(res) {
+ if (res.statusCode === 200) {
+ console.log(res.data.data);
+ that.setData({
+ courseList: res.data.data
+ });
+ }
+ },
+ fail(error) {
+ console.error(err);
+ }
+ });
+ } else {
+ wx.request({
+ url: 'http://10.133.15.50:8888/student/ownCourseList',
+ method: 'GET',
+ header: {
+ student_token: wx.getStorageSync('token') // 携带token
+ },
+ success(res) {
+ if (res.statusCode === 200) {
+ console.log(res.data.data);
+ that.setData({
+ courseList: res.data.data
+ });
+ }
+ },
+ fail(error) {
+ console.error(err);
+ }
+ });
+ }
+ },
+ update: function(event) {
+ const that = this;
+ if (wx.getStorageSync('isAdmin') == true) {
+ wx.showModal({
+ title:'创建新课程',
+ editable:true,//显示输入框
+ placeholderText:'输入课程名',//显示输入框提示信息
+ success: res => {
+ if (res.confirm) { //点击了确认
+ console.log(res.content)//用户输入的值
+ wx.request({
+ url: 'http://10.133.15.50:8888/admin/createCourse?courseDescription=' + res.content,
+ method: 'POST',
+ header: {
+ 'admin_token': wx.getStorageSync('token') // 携带token
+ },
+ success(res) {
+ if (res.statusCode === 200) {
+ console.log("yes");
+ }
+ that.getCourse();
+ },
+ fail(error) {
+ console.error(error);
+ }
+ })
+ } else {
+ console.log("取消");
+ }
+ }
+ })
+ } else {
+ wx.showModal({
+ title:'加入课程',
+ editable:true,//显示输入框
+ placeholderText:'输入课程名',//显示输入框提示信息
+ success: res => {
+ if (res.confirm) { //点击了确认
+ console.log(res.content)//用户输入的值
+ wx.request({
+ url: 'http://10.133.15.50:8888/student/joinCourse?courseDescription=' + res.content,
+ method: 'POST',
+ header: {
+ 'student_token': wx.getStorageSync('token') // 携带token
+ },
+ success(res) {
+ if (res.statusCode === 200) {
+ console.log("yes");
+ }
+ that.getCourse();
+ },
+ fail(error) {
+ console.error(error);
+ }
+ })
+ } else {
+ console.log("取消");
+ }
+ }
+ })
+ }
+ }
+})
\ No newline at end of file
diff --git a/code 2.0/pages/course/course.json b/code 3.0/pages/course/course.json
similarity index 100%
rename from code 2.0/pages/course/course.json
rename to code 3.0/pages/course/course.json
diff --git a/code 2.0/pages/course/course.scss b/code 3.0/pages/course/course.scss
similarity index 100%
rename from code 2.0/pages/course/course.scss
rename to code 3.0/pages/course/course.scss
diff --git a/code 2.0/pages/course/course.wxml b/code 3.0/pages/course/course.wxml
similarity index 91%
rename from code 2.0/pages/course/course.wxml
rename to code 3.0/pages/course/course.wxml
index 5f424f7..8456150 100644
--- a/code 2.0/pages/course/course.wxml
+++ b/code 3.0/pages/course/course.wxml
@@ -7,7 +7,7 @@
-
+
diff --git a/code 2.0/pages/course_detail(2)/course_detail(2).js b/code 3.0/pages/course_detail(2)/course_detail(2).js
similarity index 100%
rename from code 2.0/pages/course_detail(2)/course_detail(2).js
rename to code 3.0/pages/course_detail(2)/course_detail(2).js
diff --git a/code 2.0/pages/course_detail(2)/course_detail(2).json b/code 3.0/pages/course_detail(2)/course_detail(2).json
similarity index 100%
rename from code 2.0/pages/course_detail(2)/course_detail(2).json
rename to code 3.0/pages/course_detail(2)/course_detail(2).json
diff --git a/code 2.0/pages/course_detail(2)/course_detail(2).scss b/code 3.0/pages/course_detail(2)/course_detail(2).scss
similarity index 100%
rename from code 2.0/pages/course_detail(2)/course_detail(2).scss
rename to code 3.0/pages/course_detail(2)/course_detail(2).scss
diff --git a/code 2.0/pages/course_detail(2)/course_detail(2).wxml b/code 3.0/pages/course_detail(2)/course_detail(2).wxml
similarity index 100%
rename from code 2.0/pages/course_detail(2)/course_detail(2).wxml
rename to code 3.0/pages/course_detail(2)/course_detail(2).wxml
diff --git a/code 2.0/pages/course_detail/course_detail.js b/code 3.0/pages/course_detail/course_detail.js
similarity index 85%
rename from code 2.0/pages/course_detail/course_detail.js
rename to code 3.0/pages/course_detail/course_detail.js
index 6f96544..b687195 100644
--- a/code 2.0/pages/course_detail/course_detail.js
+++ b/code 3.0/pages/course_detail/course_detail.js
@@ -114,21 +114,30 @@ Page({
var that = this;
wx.chooseMessageFile({
count: 1,
- type: 'file',
+ type: 'all',
success(res) {
var filename = res.tempFiles[0].name
- console.info(filename);
that.setData({filename:filename});
+ console.info(filename);
+ console.log(res.tempFiles[0].path);
wx.uploadFile({
- url: 'http://10.133.15.50:8888/admin/',
- filePath: res.tempFiles[0].path,
- name: 'uploadFile',
+ url: 'http://10.133.15.50:8888/admin/batchAddStudents?courseId=' + wx.getStorageSync('courseId') + '&file=' + res.tempFiles[0].path,
header: {
admin_token: wx.getStorageSync('token') // 携带token
},
+ name: filename,
method: 'POST',
success(res) {
- //json字符串 需用JSON.parse 转
+ var data = JSON.parse(res.data)
+ if (data.code == 200) {
+ console.log('上传成功');
+ } else{
+ console.log('上传失败');
+ wx.showToast({
+ title: res.message,
+ icon: 'none'
+ })
+ }
}
})
}
diff --git a/code 2.0/pages/course_detail/course_detail.json b/code 3.0/pages/course_detail/course_detail.json
similarity index 100%
rename from code 2.0/pages/course_detail/course_detail.json
rename to code 3.0/pages/course_detail/course_detail.json
diff --git a/code 2.0/pages/course_detail/course_detail.scss b/code 3.0/pages/course_detail/course_detail.scss
similarity index 100%
rename from code 2.0/pages/course_detail/course_detail.scss
rename to code 3.0/pages/course_detail/course_detail.scss
diff --git a/code 3.0/pages/course_detail/course_detail.wxml b/code 3.0/pages/course_detail/course_detail.wxml
new file mode 100644
index 0000000..1033f6c
--- /dev/null
+++ b/code 3.0/pages/course_detail/course_detail.wxml
@@ -0,0 +1,45 @@
+
+ {{description}}
+
+ 查看学生信息
+
+
+
+ 点名
+
+
+
+ 添加学生
+
+
+
+ 导入学生名单
+
+
+
+
+
+
+
+
+
+
+
+
+ 添加学生
+
+
+ 学生学号:
+
+
+
+ 学生姓名:
+
+
+
+
+ 取消
+ 确定
+
+
+
\ No newline at end of file
diff --git a/code 2.0/pages/forget/forget.js b/code 3.0/pages/forget/forget.js
similarity index 100%
rename from code 2.0/pages/forget/forget.js
rename to code 3.0/pages/forget/forget.js
diff --git a/code 2.0/pages/forget/forget.json b/code 3.0/pages/forget/forget.json
similarity index 100%
rename from code 2.0/pages/forget/forget.json
rename to code 3.0/pages/forget/forget.json
diff --git a/code 2.0/pages/forget/forget.scss b/code 3.0/pages/forget/forget.scss
similarity index 100%
rename from code 2.0/pages/forget/forget.scss
rename to code 3.0/pages/forget/forget.scss
diff --git a/code 2.0/pages/forget/forget.wxml b/code 3.0/pages/forget/forget.wxml
similarity index 100%
rename from code 2.0/pages/forget/forget.wxml
rename to code 3.0/pages/forget/forget.wxml
diff --git a/code 2.0/pages/login/login.js b/code 3.0/pages/login/login.js
similarity index 96%
rename from code 2.0/pages/login/login.js
rename to code 3.0/pages/login/login.js
index 8471a7f..4c78170 100644
--- a/code 2.0/pages/login/login.js
+++ b/code 3.0/pages/login/login.js
@@ -55,7 +55,7 @@ Page({
console.log(res.data);
if (res.statusCode === 200) {
// 处理登录成功
- wx.setStorageSync('adminId', res.data.data.studentId);
+ wx.setStorageSync('studentId', res.data.data.studentId);
wx.setStorageSync('name', res.data.data.name);
wx.setStorageSync('token', res.data.data.token);
wx.setStorageSync('isAdmin', false);
diff --git a/code 2.0/pages/login/login.json b/code 3.0/pages/login/login.json
similarity index 100%
rename from code 2.0/pages/login/login.json
rename to code 3.0/pages/login/login.json
diff --git a/code 2.0/pages/login/login.scss b/code 3.0/pages/login/login.scss
similarity index 100%
rename from code 2.0/pages/login/login.scss
rename to code 3.0/pages/login/login.scss
diff --git a/code 2.0/pages/login/login.wxml b/code 3.0/pages/login/login.wxml
similarity index 100%
rename from code 2.0/pages/login/login.wxml
rename to code 3.0/pages/login/login.wxml
diff --git a/code 2.0/pages/logs/logs.js b/code 3.0/pages/logs/logs.js
similarity index 100%
rename from code 2.0/pages/logs/logs.js
rename to code 3.0/pages/logs/logs.js
diff --git a/code 2.0/pages/logs/logs.json b/code 3.0/pages/logs/logs.json
similarity index 100%
rename from code 2.0/pages/logs/logs.json
rename to code 3.0/pages/logs/logs.json
diff --git a/code 2.0/pages/logs/logs.wxml b/code 3.0/pages/logs/logs.wxml
similarity index 100%
rename from code 2.0/pages/logs/logs.wxml
rename to code 3.0/pages/logs/logs.wxml
diff --git a/code 2.0/pages/logs/logs.wxss b/code 3.0/pages/logs/logs.wxss
similarity index 100%
rename from code 2.0/pages/logs/logs.wxss
rename to code 3.0/pages/logs/logs.wxss
diff --git a/code 3.0/pages/my/my.js b/code 3.0/pages/my/my.js
new file mode 100644
index 0000000..09a674a
--- /dev/null
+++ b/code 3.0/pages/my/my.js
@@ -0,0 +1,68 @@
+// pages/my/my.js
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+
+ },
+
+ change: function(event) {
+ wx.showModal({
+ title:'修改密码',
+ editable:true,//显示输入框
+ placeholderText:'输入新密码',//显示输入框提示信息
+ success: res => {
+ if (res.confirm) { //点击了确认
+ console.log(res.content)//用户输入的值
+ if (wx.getStorageSync('isAdmin') == true) {
+ wx.request({
+ url: 'http://10.133.15.50:8888/admin/changePassword',
+ method: 'PUT',
+ header: {
+ 'admin_token': wx.getStorageSync('token') // 携带token
+ },
+ data: {
+ name: wx.getStorageSync('name'),
+ adminId: wx.getStorageSync('adminId'),
+ password: res.content
+ },
+ success(res) {
+ if (res.statusCode === 200) {
+ console.log("yes");
+ }
+ },
+ fail(error) {
+ console.error(error);
+ }
+ })
+ } else {
+ wx.request({
+ url: 'http://10.133.15.50:8888/student/changePassword',
+ method: 'PUT',
+ header: {
+ 'student_token': wx.getStorageSync('token') // 携带token
+ },
+ data: {
+ name: wx.getStorageSync('name'),
+ adminId: wx.getStorageSync('studentId'),
+ password: res.content
+ },
+ success(res) {
+ if (res.statusCode === 200) {
+ console.log("yes");
+ }
+ },
+ fail(error) {
+ console.error(error);
+ }
+ })
+ }
+ } else {
+ console.log("取消");
+ }
+ }
+ })
+ }
+})
\ No newline at end of file
diff --git a/code 2.0/pages/my/my.json b/code 3.0/pages/my/my.json
similarity index 100%
rename from code 2.0/pages/my/my.json
rename to code 3.0/pages/my/my.json
diff --git a/code 2.0/pages/my/my.scss b/code 3.0/pages/my/my.scss
similarity index 100%
rename from code 2.0/pages/my/my.scss
rename to code 3.0/pages/my/my.scss
diff --git a/code 2.0/pages/my/my.wxml b/code 3.0/pages/my/my.wxml
similarity index 88%
rename from code 2.0/pages/my/my.wxml
rename to code 3.0/pages/my/my.wxml
index cadbf37..fa65ac9 100644
--- a/code 2.0/pages/my/my.wxml
+++ b/code 3.0/pages/my/my.wxml
@@ -4,10 +4,10 @@
个人信息
-
+
修改密码
-
+
\ No newline at end of file
diff --git a/code 2.0/pages/my_callname/my_callname.js b/code 3.0/pages/my_callname/my_callname.js
similarity index 100%
rename from code 2.0/pages/my_callname/my_callname.js
rename to code 3.0/pages/my_callname/my_callname.js
diff --git a/code 2.0/pages/my_callname/my_callname.json b/code 3.0/pages/my_callname/my_callname.json
similarity index 100%
rename from code 2.0/pages/my_callname/my_callname.json
rename to code 3.0/pages/my_callname/my_callname.json
diff --git a/code 2.0/pages/my_callname/my_callname.scss b/code 3.0/pages/my_callname/my_callname.scss
similarity index 100%
rename from code 2.0/pages/my_callname/my_callname.scss
rename to code 3.0/pages/my_callname/my_callname.scss
diff --git a/code 2.0/pages/my_callname/my_callname.wxml b/code 3.0/pages/my_callname/my_callname.wxml
similarity index 100%
rename from code 2.0/pages/my_callname/my_callname.wxml
rename to code 3.0/pages/my_callname/my_callname.wxml
diff --git a/code 2.0/pages/register/register.js b/code 3.0/pages/register/register.js
similarity index 100%
rename from code 2.0/pages/register/register.js
rename to code 3.0/pages/register/register.js
diff --git a/code 2.0/pages/register/register.json b/code 3.0/pages/register/register.json
similarity index 100%
rename from code 2.0/pages/register/register.json
rename to code 3.0/pages/register/register.json
diff --git a/code 2.0/pages/register/register.scss b/code 3.0/pages/register/register.scss
similarity index 100%
rename from code 2.0/pages/register/register.scss
rename to code 3.0/pages/register/register.scss
diff --git a/code 2.0/pages/register/register.wxml b/code 3.0/pages/register/register.wxml
similarity index 100%
rename from code 2.0/pages/register/register.wxml
rename to code 3.0/pages/register/register.wxml
diff --git a/code 2.0/pages/student_info(2)/student_info(2).js b/code 3.0/pages/student_info(2)/student_info(2).js
similarity index 100%
rename from code 2.0/pages/student_info(2)/student_info(2).js
rename to code 3.0/pages/student_info(2)/student_info(2).js
diff --git a/code 2.0/pages/student_info(2)/student_info(2).json b/code 3.0/pages/student_info(2)/student_info(2).json
similarity index 100%
rename from code 2.0/pages/student_info(2)/student_info(2).json
rename to code 3.0/pages/student_info(2)/student_info(2).json
diff --git a/code 2.0/pages/student_info(2)/student_info(2).scss b/code 3.0/pages/student_info(2)/student_info(2).scss
similarity index 100%
rename from code 2.0/pages/student_info(2)/student_info(2).scss
rename to code 3.0/pages/student_info(2)/student_info(2).scss
diff --git a/code 2.0/pages/student_info(2)/student_info(2).wxml b/code 3.0/pages/student_info(2)/student_info(2).wxml
similarity index 100%
rename from code 2.0/pages/student_info(2)/student_info(2).wxml
rename to code 3.0/pages/student_info(2)/student_info(2).wxml
diff --git a/code 2.0/pages/student_info/student_info.js b/code 3.0/pages/student_info/student_info.js
similarity index 100%
rename from code 2.0/pages/student_info/student_info.js
rename to code 3.0/pages/student_info/student_info.js
diff --git a/code 2.0/pages/student_info/student_info.json b/code 3.0/pages/student_info/student_info.json
similarity index 100%
rename from code 2.0/pages/student_info/student_info.json
rename to code 3.0/pages/student_info/student_info.json
diff --git a/code 2.0/pages/student_info/student_info.scss b/code 3.0/pages/student_info/student_info.scss
similarity index 100%
rename from code 2.0/pages/student_info/student_info.scss
rename to code 3.0/pages/student_info/student_info.scss
diff --git a/code 2.0/pages/student_info/student_info.wxml b/code 3.0/pages/student_info/student_info.wxml
similarity index 100%
rename from code 2.0/pages/student_info/student_info.wxml
rename to code 3.0/pages/student_info/student_info.wxml
diff --git a/code 2.0/project.config.json b/code 3.0/project.config.json
similarity index 100%
rename from code 2.0/project.config.json
rename to code 3.0/project.config.json
diff --git a/code 2.0/project.private.config.json b/code 3.0/project.private.config.json
similarity index 100%
rename from code 2.0/project.private.config.json
rename to code 3.0/project.private.config.json
diff --git a/code 2.0/sitemap.json b/code 3.0/sitemap.json
similarity index 100%
rename from code 2.0/sitemap.json
rename to code 3.0/sitemap.json
diff --git a/code 2.0/utils/util.js b/code 3.0/utils/util.js
similarity index 100%
rename from code 2.0/utils/util.js
rename to code 3.0/utils/util.js
diff --git a/code 2.0/素材/bird，鸟，动物，卡通.png b/code 3.0/素材/bird，鸟，动物，卡通.png
similarity index 100%
rename from code 2.0/素材/bird，鸟，动物，卡通.png
rename to code 3.0/素材/bird，鸟，动物，卡通.png
diff --git a/code 2.0/素材/circle-plus-outline.png b/code 3.0/素材/circle-plus-outline.png
similarity index 100%
rename from code 2.0/素材/circle-plus-outline.png
rename to code 3.0/素材/circle-plus-outline.png
diff --git a/code 2.0/素材/乌龟，卡通动物.png b/code 3.0/素材/乌龟，卡通动物.png
similarity index 100%
rename from code 2.0/素材/乌龟，卡通动物.png
rename to code 3.0/素材/乌龟，卡通动物.png
diff --git a/code 2.0/素材/任务完成.png b/code 3.0/素材/任务完成.png
similarity index 100%
rename from code 2.0/素材/任务完成.png
rename to code 3.0/素材/任务完成.png
diff --git a/code 2.0/素材/企鹅，卡通动物.png b/code 3.0/素材/企鹅，卡通动物.png
similarity index 100%
rename from code 2.0/素材/企鹅，卡通动物.png
rename to code 3.0/素材/企鹅，卡通动物.png
diff --git a/code 2.0/素材/各司其职.png b/code 3.0/素材/各司其职.png
similarity index 100%
rename from code 2.0/素材/各司其职.png
rename to code 3.0/素材/各司其职.png
diff --git a/code 2.0/素材/大象，卡通动物.png b/code 3.0/素材/大象，卡通动物.png
similarity index 100%
rename from code 2.0/素材/大象，卡通动物.png
rename to code 3.0/素材/大象，卡通动物.png
diff --git a/code 2.0/素材/奶牛，卡通动物.png b/code 3.0/素材/奶牛，卡通动物.png
similarity index 100%
rename from code 2.0/素材/奶牛，卡通动物.png
rename to code 3.0/素材/奶牛，卡通动物.png
diff --git a/code 2.0/素材/微笑.png b/code 3.0/素材/微笑.png
similarity index 100%
rename from code 2.0/素材/微笑.png
rename to code 3.0/素材/微笑.png
diff --git a/code 2.0/素材/打招呼的猫.png b/code 3.0/素材/打招呼的猫.png
similarity index 100%
rename from code 2.0/素材/打招呼的猫.png
rename to code 3.0/素材/打招呼的猫.png
diff --git a/code 2.0/素材/海豚，卡通动物.png b/code 3.0/素材/海豚，卡通动物.png
similarity index 100%
rename from code 2.0/素材/海豚，卡通动物.png
rename to code 3.0/素材/海豚，卡通动物.png
diff --git a/code 2.0/素材/海马，卡通动物.png b/code 3.0/素材/海马，卡通动物.png
similarity index 100%
rename from code 2.0/素材/海马，卡通动物.png
rename to code 3.0/素材/海马，卡通动物.png
diff --git a/code 2.0/素材/牛，卡通动物.png b/code 3.0/素材/牛，卡通动物.png
similarity index 100%
rename from code 2.0/素材/牛，卡通动物.png
rename to code 3.0/素材/牛，卡通动物.png
diff --git a/code 2.0/素材/狗，卡通动物.png b/code 3.0/素材/狗，卡通动物.png
similarity index 100%
rename from code 2.0/素材/狗，卡通动物.png
rename to code 3.0/素材/狗，卡通动物.png
diff --git a/code 2.0/素材/猴子，卡通动物.png b/code 3.0/素材/猴子，卡通动物.png
similarity index 100%
rename from code 2.0/素材/猴子，卡通动物.png
rename to code 3.0/素材/猴子，卡通动物.png
diff --git a/code 2.0/素材/章鱼，卡通动物.png b/code 3.0/素材/章鱼，卡通动物.png
similarity index 100%
rename from code 2.0/素材/章鱼，卡通动物.png
rename to code 3.0/素材/章鱼，卡通动物.png
diff --git a/code 2.0/素材/绵羊，卡通动物.png b/code 3.0/素材/绵羊，卡通动物.png
similarity index 100%
rename from code 2.0/素材/绵羊，卡通动物.png
rename to code 3.0/素材/绵羊，卡通动物.png
diff --git a/code 2.0/素材/老虎，卡通动物.png b/code 3.0/素材/老虎，卡通动物.png
similarity index 100%
rename from code 2.0/素材/老虎，卡通动物.png
rename to code 3.0/素材/老虎，卡通动物.png
diff --git a/code 2.0/素材/蛇，卡通动物.png b/code 3.0/素材/蛇，卡通动物.png
similarity index 100%
rename from code 2.0/素材/蛇，卡通动物.png
rename to code 3.0/素材/蛇，卡通动物.png
diff --git a/code 2.0/素材/蜗牛.png b/code 3.0/素材/蜗牛.png
similarity index 100%
rename from code 2.0/素材/蜗牛.png
rename to code 3.0/素材/蜗牛.png
diff --git a/code 2.0/素材/蜜蜂，昆虫.png b/code 3.0/素材/蜜蜂，昆虫.png
similarity index 100%
rename from code 2.0/素材/蜜蜂，昆虫.png
rename to code 3.0/素材/蜜蜂，昆虫.png
diff --git a/code 2.0/素材/蝴蝶，昆虫，卡通.png b/code 3.0/素材/蝴蝶，昆虫，卡通.png
similarity index 100%
rename from code 2.0/素材/蝴蝶，昆虫，卡通.png
rename to code 3.0/素材/蝴蝶，昆虫，卡通.png
diff --git a/code 2.0/素材/螃蟹，卡通动物.png b/code 3.0/素材/螃蟹，卡通动物.png
similarity index 100%
rename from code 2.0/素材/螃蟹，卡通动物.png
rename to code 3.0/素材/螃蟹，卡通动物.png
diff --git a/code 2.0/素材/问答.png b/code 3.0/素材/问答.png
similarity index 100%
rename from code 2.0/素材/问答.png
rename to code 3.0/素材/问答.png
diff --git a/code 2.0/素材/鱼，卡通动物.png b/code 3.0/素材/鱼，卡通动物.png
similarity index 100%
rename from code 2.0/素材/鱼，卡通动物.png
rename to code 3.0/素材/鱼，卡通动物.png
diff --git a/code 2.0/素材/鲨鱼，卡通动物.png b/code 3.0/素材/鲨鱼，卡通动物.png
similarity index 100%
rename from code 2.0/素材/鲨鱼，卡通动物.png
rename to code 3.0/素材/鲨鱼，卡通动物.png
diff --git a/code 2.0/素材/鸡，卡通动物.png b/code 3.0/素材/鸡，卡通动物.png
similarity index 100%
rename from code 2.0/素材/鸡，卡通动物.png
rename to code 3.0/素材/鸡，卡通动物.png
diff --git a/code 2.0/素材/鹰，卡通动物.png b/code 3.0/素材/鹰，卡通动物.png
similarity index 100%
rename from code 2.0/素材/鹰，卡通动物.png
rename to code 3.0/素材/鹰，卡通动物.png
diff --git a/code 2.0/素材/鹿，卡通动物.png b/code 3.0/素材/鹿，卡通动物.png
similarity index 100%
rename from code 2.0/素材/鹿，卡通动物.png
rename to code 3.0/素材/鹿，卡通动物.png