From b2abfb1740ea996627bbef342c377721083db195 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期三, 03 四月 2024 17:04:13 +0800
Subject: [PATCH] 学习
---
custom-tab-bar/data.js | 7 +-
pages/study/index.wxss | 0
app.json | 4
pages/study/index.js | 37 +++++++++++-
pages/study/index.wxml | 0
packageBookService/pages/bookServices/detail/index.js | 127 +++++++++++++++++-------------------------
pages/study/index.json | 0
7 files changed, 89 insertions(+), 86 deletions(-)
diff --git a/app.json b/app.json
index 5d3f411..8e696a3 100644
--- a/app.json
+++ b/app.json
@@ -4,7 +4,7 @@
"pages/home/digitalRead/index",
"pages/retrievalPage/index",
"pages/cart/paymentPage/index",
- "pages/student/index",
+ "pages/study/index",
"pages/cart/index",
"pages/bookExhibitionList/index",
"pages/bookExhibitionDetails/index",
@@ -79,7 +79,7 @@
"selectedIconPatn": "/static/images/home/service-click@2x.png"
},
{
- "pagePath": "pages/student/index",
+ "pagePath": "pages/study/index",
"text": "瀛︿範",
"iconPath": "/static/images/home/learn@2x.png",
"selectedIconPatn": "/static/images/home/learn-click@2x.png"
diff --git a/custom-tab-bar/data.js b/custom-tab-bar/data.js
index 16a0b78..36dabc8 100644
--- a/custom-tab-bar/data.js
+++ b/custom-tab-bar/data.js
@@ -1,5 +1,4 @@
-export default [
- {
+export default [{
id: 0,
text: '棣栭〉',
url: 'pages/home/home',
@@ -17,7 +16,7 @@
{
id: 2,
text: '瀛︿範',
- url: 'pages/student/index',
+ url: 'pages/study/index',
icon: '/static/images/home/learn@2x.png',
activeIcon: '/static/images/home/learn-click@2x.png'
},
@@ -35,4 +34,4 @@
icon: '/static/images/home/my@2x.png',
activeIcon: '/static/images/home/my-click@2x.png'
},
-];
+];
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index ee021b8..d3cea05 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -1,7 +1,9 @@
// pages/bookServices/detail/index.js
import Toast from "tdesign-miniprogram/toast";
import tool from "../../../../assets/js/toolClass";
-import { loginInfo } from "../../../../assets/js/login";
+import {
+ loginInfo
+} from "../../../../assets/js/login";
const app = getApp();
Page({
/**
@@ -430,10 +432,9 @@
this.setData({
bookItemDetail: res.datas[0],
selectedIds: res.datas[0].defaultSaleMethod.id,
- bookBuy:
- res.datas[0].purchasedSaleMethodIdList.indexOf(
- res.datas[0].defaultSaleMethodId
- ) > -1,
+ bookBuy: res.datas[0].purchasedSaleMethodIdList.indexOf(
+ res.datas[0].defaultSaleMethodId
+ ) > -1,
});
let times = new Date(res.datas[0].defaultSaleMethod.endDate).getTime();
let startTime = new Date(
@@ -495,10 +496,9 @@
}
this.setData({
selectedIds: this.data.bookDetail.defaultSaleMethodId,
- bookBuy:
- this.data.bookDetail.purchasedSaleMethodIdList.indexOf(
- this.data.bookDetail.defaultSaleMethodId
- ) > -1,
+ bookBuy: this.data.bookDetail.purchasedSaleMethodIdList.indexOf(
+ this.data.bookDetail.defaultSaleMethodId
+ ) > -1,
});
let times = new Date(
this.data.bookDetail.defaultSaleMethod.endDate
@@ -602,7 +602,9 @@
},
// 璺宠浆缃戝簵
goShop(e) {
- const { link } = e.currentTarget.dataset;
+ const {
+ link
+ } = e.currentTarget.dataset;
wx.navigateTo({
url: `/packageBookService/pages/bookServices/webpage/index?url=${link}`,
});
@@ -611,25 +613,12 @@
onTabsChange(e) {
this.setData({
tabValue: e.detail.value,
-<<<<<<< Updated upstream
- noResources: false,
- });
- if (
- e.detail.label == "鏁欏璧勬簮" ||
- e.detail.label == "浜戝涔�" ||
- e.detail.label == "浜戞祴璇�"
- ) {
- const checkData = this.data.cmsDatas.find(
- (item) => item.refCode == e.detail.value
- );
-=======
noResources: false
})
if (e.detail.label == '鏁欏璧勬簮' || e.detail.label == '浜戝涔�' || e.detail.label == '浜戞祴璇�') {
const checkData = this.data.cmsDatas.find(item => item.refCode == e.detail.value)
->>>>>>> Stashed changes
if (checkData) {
if (e.detail.value == "jsek_cloudLearning") {
this.setData({
@@ -898,13 +887,11 @@
console.log(determine);
if (!determine) {
let query = {
- requests: [
- {
- saleMethodId: this.data.selectedIds,
- storeEventId: null,
- agentCode: "鐢靛瓙涔�",
- },
- ],
+ requests: [{
+ saleMethodId: this.data.selectedIds,
+ storeEventId: null,
+ agentCode: "鐢靛瓙涔�",
+ }, ],
};
const addRes = app.MG.store.addShoppingCart(query);
this.showSuccessToast();
@@ -945,14 +932,11 @@
let bookOrdersId = "";
let query = {
remarks: "鐢靛瓙涔�",
- requests: [
- {
- saleMethodId: this.data.bookItemDetail.defaultSaleMethodId
- ? this.data.bookItemDetail.defaultSaleMethodId
- : this.data.bookDetail.defaultSaleMethodId,
- count: 1,
- },
- ],
+ requests: [{
+ saleMethodId: this.data.bookItemDetail.defaultSaleMethodId ?
+ this.data.bookItemDetail.defaultSaleMethodId : this.data.bookDetail.defaultSaleMethodId,
+ count: 1,
+ }, ],
};
// 鍙戣捣璁㈠崟鍒濆鍖栬姹傚苟绛夊緟缁撴灉
const res = await app.MG.store.initOrder(query);
@@ -1076,14 +1060,12 @@
cmsTypeRefCode: "",
newDataListRequest: [],
name: this.data.bookDetail.name, // name涓虹敵璇风殑涔︽湰鍚嶇О
- content: JSON.stringify([
- {
- name: this.data.bookDetail.name,
- id: this.data.bookDetail.id,
- // defaultSaleMethodId: bookData.value.defaultSaleMethodId,
- icon: this.data.bookDetail.icon,
- },
- ]),
+ content: JSON.stringify([{
+ name: this.data.bookDetail.name,
+ id: this.data.bookDetail.id,
+ // defaultSaleMethodId: bookData.value.defaultSaleMethodId,
+ icon: this.data.bookDetail.icon,
+ }, ]),
};
app.MG.ugc.newTopicMessage(query).then(async (res) => {
if (res) {
@@ -1099,8 +1081,7 @@
title: "灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛�",
content: "璇峰厛杩涜鏁欏笀璁よ瘉锛�",
complete: (res) => {
- if (res.cancel) {
- }
+ if (res.cancel) {}
if (res.confirm) {
wx.navigateTo({
url: "/packageDomain/pages/teacherCertification/index",
@@ -1114,8 +1095,7 @@
title: "灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛�",
content: "璇峰厛杩涜鏁欏笀璁よ瘉锛�",
complete: (res) => {
- if (res.cancel) {
- }
+ if (res.cancel) {}
if (res.confirm) {
wx.navigateTo({
url: "/packageDomain/pages/teacherCertification/index",
@@ -1143,8 +1123,7 @@
title: "灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛�",
content: "璇峰厛杩涜鏁欏笀璁よ瘉锛�",
complete: (res) => {
- if (res.cancel) {
- }
+ if (res.cancel) {}
if (res.confirm) {
wx.navigateTo({
url: "/packageDomain/pages/teacherCertification/index",
@@ -1497,9 +1476,9 @@
if (new RegExp("(" + k + ")").test(fmt)) {
fmt = fmt.replace(
RegExp.$1,
- RegExp.$1.length == 1
- ? o[k]
- : ("00" + o[k]).substr(("" + o[k]).length)
+ RegExp.$1.length == 1 ?
+ o[k] :
+ ("00" + o[k]).substr(("" + o[k]).length)
);
}
}
@@ -1553,12 +1532,10 @@
try {
let query = {
remarks: "缁勫嵎",
- requests: [
- {
- saleMethodId: this.data.mockData.id,
- count: 1,
- },
- ],
+ requests: [{
+ saleMethodId: this.data.mockData.id,
+ count: 1,
+ }, ],
};
if (this.data.flag) {
this.setData({
@@ -1608,13 +1585,11 @@
});
// 璁板綍璐拱鏃堕棿锛屽苟璁剧姸鎬乻tate涓�1锛岃〃绀哄垰璐拱瀹屾垚缁勫嵎
app.MG.identity.setUserKey({
- setKeyRequests: [
- {
- domain: "mockData",
- key: this.data.bookDetail.id + "",
- value: JSON.stringify(this.data.mockData.mockList),
- },
- ],
+ setKeyRequests: [{
+ domain: "mockData",
+ key: this.data.bookDetail.id + "",
+ value: JSON.stringify(this.data.mockData.mockList),
+ }, ],
});
},
// 鑾峰彇鐩稿叧鍥句功
@@ -1671,7 +1646,10 @@
tabValue: "brief",
pageLoading: true,
});
- this.onLoad({ id: e.detail.id, name: e.detail.name });
+ this.onLoad({
+ id: e.detail.id,
+ name: e.detail.name
+ });
},
// 搴曢儴璐拱鎸夐挳
buyBtn() {
@@ -1695,8 +1673,7 @@
return false;
}
wx.navigateTo({
- url:
- "/packageBookService/pages/components/webView/index?md5=" +
+ url: "/packageBookService/pages/components/webView/index?md5=" +
this.data.fileInfo.md5 +
"&fileName=" +
this.data.fileInfo.bookName +
@@ -1871,8 +1848,7 @@
wx.navigateTo({
url: "/packageDomain/pages/teacherCertification/index",
});
- } else if (res.cancel) {
- }
+ } else if (res.cancel) {}
},
});
}
@@ -1941,8 +1917,7 @@
wx.navigateTo({
url: "/packageDomain/pages/teacherCertification/index",
});
- } else if (res.cancel) {
- }
+ } else if (res.cancel) {}
},
});
}
@@ -2027,4 +2002,4 @@
teach: tree,
});
},
-});
+});
\ No newline at end of file
diff --git a/pages/student/index.js b/pages/study/index.js
similarity index 85%
rename from pages/student/index.js
rename to pages/study/index.js
index a94d555..cb9b87e 100644
--- a/pages/student/index.js
+++ b/pages/study/index.js
@@ -2,14 +2,18 @@
import {
getPublicImage
} from "../../assets/js/middleGround/tool.js";
+import {
+ loginInfo
+} from '../../assets/js/login';
+import moment from 'moment'
Page({
/**
* 椤甸潰鐨勫垵濮嬫暟鎹�
*/
data: {
- learningDuration: 0,
- lastLoginTime: '2024-03-25 20:00:09',
+ learningDuration: "0灏忔椂",
+ lastLoginTime: '-',
active: 0,
titleBook: "鍥句功锛�0鏈級",
titleCourse: "璇剧▼锛�0闂級",
@@ -31,8 +35,24 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad() {
- this.getStaticsSum();
- this.getDataList(false);
+ // 妫�鏌ョ櫥褰曠姸鎬�
+ const token = wx.getStorageSync(app.config.tokenKey)
+ if (!token) {
+ loginInfo(app, (data) => {
+ if (data) {
+ this.getUserInfo()
+ this.getStaticsSum();
+ this.getDataList(false);
+
+ }
+ })
+ } else {
+ this.getUserInfo()
+ this.getStaticsSum();
+ this.getDataList(false);
+
+ }
+
},
/**
@@ -53,6 +73,15 @@
}
},
+ getUserInfo() {
+ app.MG.identity.getCurrentAppUser().then(res => {
+ if (res) {
+ this.setData({
+ lastLoginTime: res.lastLoginTime != null ? moment(res.lastLoginTime).format('YYYY-MM-DD HH:mm:ss') : '-'
+ })
+ }
+ })
+ },
getStaticsSum() {
const data = {
start: 0,
diff --git a/pages/student/index.json b/pages/study/index.json
similarity index 100%
rename from pages/student/index.json
rename to pages/study/index.json
diff --git a/pages/student/index.wxml b/pages/study/index.wxml
similarity index 100%
rename from pages/student/index.wxml
rename to pages/study/index.wxml
diff --git a/pages/student/index.wxss b/pages/study/index.wxss
similarity index 100%
rename from pages/student/index.wxss
rename to pages/study/index.wxss
--
Gitblit v1.9.1