From 7344cb656ec84545a22836d3e9cb4b75fe3538bc Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期二, 24 九月 2024 12:04:13 +0800
Subject: [PATCH] zsrwd
---
pages/digitalCourses/digitalCoursesDetails/index.wxss | 10 ++++-
app.js | 6 +++
pages/digitalCourses/digitalCoursesDetails/index.wxml | 4 ++
packageBookService/pages/bookServices/detail/components/learnTask/index.js | 55 ++++++++++++++++++++-------
packageBookService/pages/bookServices/detail/components/learnTask/index.wxss | 7 +++
assets/request/index.js | 2
assets/js/middleGround/api/identity.js | 8 ++++
packageBookService/pages/bookServices/detail/components/testTree/index.js | 8 ++-
8 files changed, 80 insertions(+), 20 deletions(-)
diff --git a/app.js b/app.js
index daf7726..e203b18 100644
--- a/app.js
+++ b/app.js
@@ -7,5 +7,11 @@
onLaunch: function () {},
onShow: function () {
updateManager();
+ MG.identity.refreshToken({
+ appRefCode: config.appRefCode,
+ token: wx.getStorageSync(config.tokenKey)
+ }).then(res => {
+ console.log('宸插埛鏂�')
+ })
},
});
\ No newline at end of file
diff --git a/assets/js/middleGround/api/identity.js b/assets/js/middleGround/api/identity.js
index 7b4117c..f4a040a 100644
--- a/assets/js/middleGround/api/identity.js
+++ b/assets/js/middleGround/api/identity.js
@@ -192,6 +192,14 @@
data,
});
},
+ //鏇存柊鐢ㄦ埛token
+ refreshToken(data) {
+ return request({
+ url: "/identity/api/ApiRefreshToken",
+ method: "post",
+ data,
+ });
+ }
};
export default identityApi;
\ No newline at end of file
diff --git a/assets/request/index.js b/assets/request/index.js
index 798b3ab..5c0c389 100644
--- a/assets/request/index.js
+++ b/assets/request/index.js
@@ -57,7 +57,7 @@
})
reject('鎺ュ彛璇锋眰閿欒')
},
- complete: () => { }
+ complete: () => {}
})
})
}
diff --git a/packageBookService/pages/bookServices/detail/components/learnTask/index.js b/packageBookService/pages/bookServices/detail/components/learnTask/index.js
index 0607788..8cf3f61 100644
--- a/packageBookService/pages/bookServices/detail/components/learnTask/index.js
+++ b/packageBookService/pages/bookServices/detail/components/learnTask/index.js
@@ -74,7 +74,6 @@
disabled: false
});
}
- console.log(options.consumer, 77)
this.getResourceData()
this.getLearnTime()
}
@@ -199,7 +198,6 @@
})
},
getTask(e) {
- console.log(e)
let item = e.currentTarget.dataset.item
this.taskSelect(item)
},
@@ -231,6 +229,7 @@
this.setData({
tasksListData: res.datas,
});
+
if (this.data.taskInfo.name) {
this.taskSelect(this.data.taskInfo)
}
@@ -276,10 +275,11 @@
}
})
}
+ if (this.data.dataList.length == 0) {
+ this.goDetail(item)
+ }
}
- if (this.data.dataList.length == 0) {
- this.goDetail(item)
- }
+
},
goDetail(item) {
this.setData({
@@ -312,9 +312,20 @@
})
}
this.setData({
- dataList: res.datas.cmsDatas[0].datas,
- taskShow: true,
+
});
+ if (this.data.name && this.data.school && this.data.class) {
+ this.setData({
+ dataList: res.datas.cmsDatas[0].datas,
+ taskShow: true,
+ })
+ } else {
+ wx.showToast({
+ title: "璇峰厛濉啓涓汉淇℃伅",
+ icon: 'none',
+ duration: 1000
+ })
+ }
})
},
getChildTasksList() {
@@ -340,7 +351,7 @@
if (content.teacherComment.length > 0) {
content.teacherComment.forEach((item2) => {
if (item.id == item2.childTaskId) {
- item.mateEvaluation = [item2]
+ item.teacherEvaluation = [item2]
if (this.data.consumer == 'teacher') {
this.setData({
evaluated: true
@@ -358,7 +369,6 @@
content.mateComment.forEach((item3) => {
if (item.id == item3.childTaskId) {
item.mateEvaluation = [...item.mateEvaluation, item3]
- console.log(item.mateEvaluation, 123)
if (this.data.consumer == 'classmate') {
if (item.mateEvaluation && item.mateEvaluation.length > 0) {
let data = item.mateEvaluation.find(
@@ -387,6 +397,23 @@
dataList: list
});
}
+ })
+ },
+
+ // 涓汉淇℃伅濉啓
+ bindTnputBlur(e) {
+ this.setData({
+ name: e.detail.value
+ })
+ },
+ onSchoolInput(e) {
+ this.setData({
+ school: e.detail.value
+ })
+ },
+ bindClassBlur(e) {
+ this.setData({
+ class: e.detail.value
})
},
@@ -434,7 +461,6 @@
//鎻愪氦鑷繁濉啓
inviteBtn() {
let empty = false
- console.log(this.data.dataList, 123)
this.data.dataList.forEach((item) => {
if (item.introspection == '' || item.completion == '' || item.selfEvaluation == '') {
empty = true
@@ -494,7 +520,6 @@
},
updateSubmit() {
let evaluate = []
- console.log(this.data.dataList, 211)
this.data.dataList.forEach((item) => {
evaluate.push({
id: item.id,
@@ -558,10 +583,12 @@
duration: 1000
})
return false
+ } else {
+ wx.showShareMenu({
+ withShareTicket: true
+ });
}
- wx.showShareMenu({
- withShareTicket: true
- });
+
},
submitComment() {
let mateEvaluationList = []
diff --git a/packageBookService/pages/bookServices/detail/components/learnTask/index.wxss b/packageBookService/pages/bookServices/detail/components/learnTask/index.wxss
index ed792ca..d4efed6 100644
--- a/packageBookService/pages/bookServices/detail/components/learnTask/index.wxss
+++ b/packageBookService/pages/bookServices/detail/components/learnTask/index.wxss
@@ -240,4 +240,11 @@
.t-radio {
margin-right: 40rpx;
+}
+
+.empyt {
+ height: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
}
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/detail/components/testTree/index.js b/packageBookService/pages/bookServices/detail/components/testTree/index.js
index 5aa6708..2f55bc2 100644
--- a/packageBookService/pages/bookServices/detail/components/testTree/index.js
+++ b/packageBookService/pages/bookServices/detail/components/testTree/index.js
@@ -29,7 +29,6 @@
// 鑺傜偣灞曞紑
handleChange(e) {
- console.log(e, 123)
this.setData({
openIds: e.detail.value,
});
@@ -39,8 +38,11 @@
var myEventDetail = {
value,
};
- this.triggerEvent("goTest", myEventDetail);
-
+ var myEventOption = {
+ bubbles: true,
+ composed: true,
+ };
+ this.triggerEvent("goTest", myEventDetail, myEventOption);
},
},
});
\ No newline at end of file
diff --git a/pages/digitalCourses/digitalCoursesDetails/index.wxml b/pages/digitalCourses/digitalCoursesDetails/index.wxml
index 69bbb17..7154153 100644
--- a/pages/digitalCourses/digitalCoursesDetails/index.wxml
+++ b/pages/digitalCourses/digitalCoursesDetails/index.wxml
@@ -186,6 +186,7 @@
class="my_canvas"
wx:if="{{pubCertificateHide}}"
>
+ <view class="pubCon">
<image
data-type="image"
data-url="https://jsek.bnuic.com/home/certificate/szkc.jpg"
@@ -240,6 +241,7 @@
<view class="codeBox"></view>
</view>
</view>
+ </view>
<canvas
canvas-id="myCanvas1"
style="height: 845px; width: 595px"
@@ -250,6 +252,7 @@
class="my_canvas1"
wx:if="{{pubCertificateHide}}"
>
+ <view class="pubCon">
<image
data-type="image"
data-url="https://jsek.bnuic.com/home/certificate/kczs.jpg"
@@ -315,6 +318,7 @@
</view>
</view>
</view>
+ </view>
</t-tab-panel>
<t-tab-panel
icon="{{ tabValue == '2' ? courseLearningClick : courseLearning}}"
diff --git a/pages/digitalCourses/digitalCoursesDetails/index.wxss b/pages/digitalCourses/digitalCoursesDetails/index.wxss
index c42ccf9..80e2f36 100644
--- a/pages/digitalCourses/digitalCoursesDetails/index.wxss
+++ b/pages/digitalCourses/digitalCoursesDetails/index.wxss
@@ -447,8 +447,14 @@
#pubCertificate {
width: 595px;
height: 845px;
- position: relative;
+ position: fixed;
background-image: url('https://jsek.bnuic.com/home/certificate/szkc.jpg');
+}
+
+.pubCon {
+ width: 100%;
+ height: 100%;
+ position: relative;
}
#pubCertificate .bgImg {
@@ -509,7 +515,7 @@
#textCertificate {
width: 595px;
height: 845px;
- position: relative;
+ position: fixed;
/* background-image: url('https://jsek.bnuic.com/home/certificate/kczs.jpg'); */
}
--
Gitblit v1.9.1