From f4a2f400fdc999946e75a4322fe1ceb6e528c169 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期二, 27 八月 2024 19:59:46 +0800
Subject: [PATCH] xuexi
---
pages/study/index.wxss | 3
pages/digitalCourses/digitalCoursesDetails/index.js | 33 +++++++
pages/study/index.js | 59 ++++++++++++++
pages/digitalCourses/digitalCoursesDetails/index.wxml | 29 +++---
pages/study/index.wxml | 21 +----
pages/digitalTextbooks/digitalTextbooksDetails/index.wxml | 12 ++
pages/digitalTextbooks/digitalTextbooksDetails/index.wxss | 4
pages/digitalTextbooks/digitalTextbooksDetails/index.js | 37 ++++++++-
8 files changed, 151 insertions(+), 47 deletions(-)
diff --git a/pages/digitalCourses/digitalCoursesDetails/index.js b/pages/digitalCourses/digitalCoursesDetails/index.js
index 69d1f5a..4ede1be 100644
--- a/pages/digitalCourses/digitalCoursesDetails/index.js
+++ b/pages/digitalCourses/digitalCoursesDetails/index.js
@@ -81,7 +81,8 @@
isTest: false,
userInfo: {
fullName: '' //鍚嶇О
- }
+ },
+ publishingUnit: ''
},
formatDate(dateString) {
if (!dateString) {
@@ -244,7 +245,7 @@
//epub璇曡鐧惧垎姣�
}
}
- app.MG.store.getProductDetail(query).then(res => {
+ app.MG.store.getProductDetail(query).then(async res => {
console.log(res);
if (res.datas.purchasedSaleMethodIdList.includes(res.datas.defaultSaleMethodId)) {
this.setData({
@@ -266,12 +267,15 @@
expire: res.false
})
}
- res.datas.publicationDate = this.formatDate(res.datas.publicationDate)
+ res.datas.publicationDate = moment(res.datas.publicationDate).format('YYYY骞碝M鏈圖D鏃�')
res.datas.price = res.datas.price.toFixed(2)
wx.setNavigationBarTitle({
title: res.datas.name,
})
+ if (res.datas.publishingUnit) {
+ await this.getBookPublishUnit(res.datas.publishingUnit)
+ }
let lecturer = []
if (res.datas.datas.speaker && res.datas.datas.speaker.length > 0) {
res.datas.datas.speaker.forEach(item => {
@@ -297,6 +301,29 @@
})
})
},
+
+ //鑾峰彇鍥句功鍑虹増鍗曚綅
+ async getBookPublishUnit(listStr) {
+ let query = {
+ refCodes: ['publishingUnit']
+ }
+ await app.MG.store.getProductTypeField(query).then((res) => {
+ const list = JSON.parse(listStr)
+ let dataList = []
+ list.forEach((unit) => {
+ JSON.parse(res[0].config).option.forEach((item) => {
+ if (item.value == unit) {
+ dataList.push(item.name)
+ }
+ })
+ })
+ if (dataList.length == list.length) {
+ this.setData({
+ publishingUnit: dataList.join(' '),
+ })
+ }
+ })
+ },
onTabsChange(event) {
const value = event.detail.value
this.setData({
diff --git a/pages/digitalCourses/digitalCoursesDetails/index.wxml b/pages/digitalCourses/digitalCoursesDetails/index.wxml
index 8768027..0042d60 100644
--- a/pages/digitalCourses/digitalCoursesDetails/index.wxml
+++ b/pages/digitalCourses/digitalCoursesDetails/index.wxml
@@ -11,29 +11,30 @@
<view class="nameBox">{{digitalsData.name}}</view>
<view>
<viwe class="styleCssBox">
- <view style="width: 170rpx;"> ISBN锛� </view>
+ <view style="width: 200rpx;"> ISBN锛� </view>
<view wx:if="{{digitalsData.isbn}}"> {{digitalsData.isbn}} </view>
- <view wx:else="">-</view>
+ <view wx:else>-</view>
</viwe>
+
<viwe class="styleCssBox">
- <view style="width: 170rpx;">鍑虹増鏃堕棿锛�</view>
- <view wx:if="{{digitalsData.publicationDate}}">{{digitalsData.publicationDate}} </view>
- <view wx:else="">-</view>
- </viwe>
- <viwe class="styleCssBox">
- <view style="width: 170rpx;">璇鹃璐熻矗浜猴細</view>
+ <view style="width: 200rpx;">璇剧▼璐熻矗浜猴細</view>
<view wx:if="{{digitalsData.courseLeader}}"> {{digitalsData.courseLeader }}</view>
- <view wx:else="">-</view>
+ <view wx:else>-</view>
</viwe>
<viwe class="styleCssBox">
- <view style="width: 170rpx;">鎵�灞炲崟浣嶏細</view>
+ <view style="width: 200rpx;">璇剧▼璐熻矗浜哄崟浣嶏細</view>
<view wx:if="{{digitalsData.affiliatedUnit}}"> {{ digitalsData.affiliatedUnit}}</view>
- <view wx:else="">-</view>
+ <view wx:else>-</view>
</viwe>
<viwe class="styleCssBox">
- <view style="width: 170rpx;">鍑虹増鍗曚綅锛�</view>
- <view wx:if="{{digitalsData.publishingUnit}}">{{digitalsData.publishingUnit}} </view>
- <view wx:else="">-</view>
+ <view style="width: 200rpx;">鍑虹増鍗曚綅锛�</view>
+ <view wx:if="{{digitalsData.publishingUnit}}"> {{publishingUnit}} </view>
+ <view wx:else>-</view>
+ </viwe>
+ <viwe class="styleCssBox">
+ <view style="width: 200rpx;">鍑虹増鏃堕棿锛�</view>
+ <view wx:if="{{digitalsData.publicationDate}}">{{digitalsData.publicationDate}} </view>
+ <view wx:else>-</view>
</viwe>
<image src="/static/images/bookService/detail/square.png" class="right-background" />
</view>
diff --git a/pages/digitalTextbooks/digitalTextbooksDetails/index.js b/pages/digitalTextbooks/digitalTextbooksDetails/index.js
index 9f11531..2f5b7dc 100644
--- a/pages/digitalTextbooks/digitalTextbooksDetails/index.js
+++ b/pages/digitalTextbooks/digitalTextbooksDetails/index.js
@@ -1,5 +1,6 @@
// pages/digitalTextbooks/digitalTextbooksDetails/index.js
import Toast from "tdesign-miniprogram/toast";
+import moment from 'moment'
import {
loginInfo
} from '../../../assets/js/login';
@@ -66,6 +67,7 @@
isCertificate: {},
isLearn: false,
isTest: false,
+ publishingUnit: ''
},
/**
@@ -194,7 +196,9 @@
seriesName: [],
author: [],
isbn: [],
+ editorUnit: [],
publicationDate: [],
+ publishingUnit: [],
bookClassification: [],
paperPrice: [],
JDLink: [],
@@ -213,7 +217,7 @@
//epub璇曡鐧惧垎姣�
}
}
- app.MG.store.getProductDetail(query).then(res => {
+ app.MG.store.getProductDetail(query).then(async res => {
if (res.datas.purchasedSaleMethodIdList.includes(res.datas.defaultSaleMethodId)) {
this.setData({
isBuy: true
@@ -223,13 +227,10 @@
isBuy: false
})
}
- // res.datas.publicationDate =
+ res.datas.publicationDate = moment(res.datas.publicationDate).format('YYYY骞碝M鏈圖D鏃�')
if (res.datas.icon == '') {
res.datas.icon = '/static/images/default-book-img.png'
}
- this.setData({
- publicationDate: this.formatDate(res.datas.publicationDate)
- })
res.datas.price = res.datas.price.toFixed(2)
this.setData({
@@ -249,6 +250,9 @@
wx.setNavigationBarTitle({
title: res.datas.name,
})
+ if (res.datas.publishingUnit) {
+ await this.getBookPublishUnit(res.datas.publishingUnit)
+ }
this.getAboutBook(res.datas.productLinkInfo[res.datas.productLinkInfo.length - 1].LinkPath)
console.log(this.data.isBuy);
@@ -262,6 +266,29 @@
})
},
+ //鑾峰彇鍥句功鍑虹増鍗曚綅
+ async getBookPublishUnit(listStr) {
+ let query = {
+ refCodes: ['publishingUnit']
+ }
+ await app.MG.store.getProductTypeField(query).then((res) => {
+ const list = JSON.parse(listStr)
+ let dataList = []
+ list.forEach((unit) => {
+ JSON.parse(res[0].config).option.forEach((item) => {
+ if (item.value == unit) {
+ dataList.push(item.name)
+ }
+ })
+ })
+ if (dataList.length == list.length) {
+ this.setData({
+ publishingUnit: dataList.join(' '),
+ })
+ }
+ })
+ },
+
onTabsChange(event) {
this.setData({
tabValue: event.detail.value,
diff --git a/pages/digitalTextbooks/digitalTextbooksDetails/index.wxml b/pages/digitalTextbooks/digitalTextbooksDetails/index.wxml
index a9e6063..dbd9954 100644
--- a/pages/digitalTextbooks/digitalTextbooksDetails/index.wxml
+++ b/pages/digitalTextbooks/digitalTextbooksDetails/index.wxml
@@ -22,8 +22,12 @@
</view>
<view class="content">
<view class="styleCssBox">
- <view style="width: 150rpx;"> 浣滆�咃細 </view>
+ <view style="width: 150rpx;"> 涓荤紪锛� </view>
<view class="authorBox">{{ digitalsData.author}}</view>
+ </view>
+ <view class="styleCssBox">
+ <view style="width: 150rpx;"> 缂栬�呭崟浣嶏細 </view>
+ <view class="authorBox">{{ digitalsData.editorUnit || '-'}}</view>
</view>
<view class="styleCssBox">
<view style="width: 150rpx;">ISBN锛�</view>
@@ -31,7 +35,11 @@
</view>
<view class="styleCssBox">
<view style="width: 150rpx;"> 鍑虹増鏃堕棿锛� </view>
- <view>{{ publicationDate}}</view>
+ <view>{{ digitalsData.publicationDate}}</view>
+ </view>
+ <view class="styleCssBox">
+ <view style="width: 150rpx;"> 鍑虹増鍗曚綅锛� </view>
+ <view>{{ publishingUnit || '-'}}</view>
</view>
</view>
<image src="/static/images/bookService/detail/square.png" class="right-background" />
diff --git a/pages/digitalTextbooks/digitalTextbooksDetails/index.wxss b/pages/digitalTextbooks/digitalTextbooksDetails/index.wxss
index bf3e2be..fb36cab 100644
--- a/pages/digitalTextbooks/digitalTextbooksDetails/index.wxss
+++ b/pages/digitalTextbooks/digitalTextbooksDetails/index.wxss
@@ -23,9 +23,6 @@
border-radius: 0 0 20rpx 20rpx;
}
-.book-img {
- border: 1rpx solid #ccc;
-}
.setCoolect {
display: flex;
@@ -38,6 +35,7 @@
.imageBox {
width: 220rpx;
height: 310rpx;
+ border: 1rpx solid #ccc;
}
.bookContent {
diff --git a/pages/study/index.js b/pages/study/index.js
index 490a6ae..3346031 100644
--- a/pages/study/index.js
+++ b/pages/study/index.js
@@ -63,13 +63,14 @@
this.getUserInfo()
this.getStaticsSum();
this.getDataList(false);
+ this.getListCount()
}
})
} else {
this.getUserInfo()
this.getStaticsSum();
this.getDataList(false);
-
+ this.getListCount()
}
},
@@ -112,6 +113,61 @@
}
})
},
+ getListCount() {
+ let that = this;
+ let data = {
+ Size: 9999,
+ Start: 0,
+ sort: {
+ type: "Desc",
+ field: "CreateDate",
+ },
+ searchList: [{
+ keywords: 'jsek_mediaBook',
+ field: "ProductType",
+ }],
+ }
+ app.MG.store.getPurchasedProductList(data).then((res) => {
+ that.setData({
+ titleBook: "鍥句功锛�" + res.totalSize + "鏈級",
+ })
+ })
+ let data1 = {
+ Size: 9999,
+ Start: 0,
+ sort: {
+ type: "Desc",
+ field: "CreateDate",
+ },
+ searchList: [{
+ keywords: 'jsek_digitalCourses',
+ field: "ProductType",
+ }],
+ }
+ app.MG.store.getPurchasedProductList(data1).then((res) => {
+ that.setData({
+ titleCourse: "璇剧▼锛�" + res.totalSize + "闂級",
+ })
+ })
+ let data2 = {
+ Size: 9999,
+ Start: 0,
+ sort: {
+ type: "Desc",
+ field: "CreateDate",
+ },
+ searchList: [{
+ keywords: 'jsek_digitalTextbooks',
+ field: "ProductType",
+ }],
+ }
+ app.MG.store.getPurchasedProductList(data2).then((res) => {
+ that.setData({
+ titleTextBook: "鏁板瓧鏁欐潗锛�" + res.totalSize + "鏈級",
+ })
+ })
+ },
+
tabClick(item) {
let that = this;
@@ -163,7 +219,6 @@
this.setData({
list: dataList,
pageTotalCount: res.totalSize,
- titleBook: "鍥句功锛�" + res.totalSize + "鏈級",
bottomLoading: false,
isMoreData: dataList.length > 0 ? false : true,
skeletonLoding: false,
diff --git a/pages/study/index.wxml b/pages/study/index.wxml
index 085299b..4212eed 100644
--- a/pages/study/index.wxml
+++ b/pages/study/index.wxml
@@ -13,7 +13,7 @@
</view>
<view class="tabOne" wx:if="{{!skeletonLoding}}">
<t-tabs t-class="t-tabs" value="{{active}}" split="{{false}}" bind:change="tabClick">
- <t-tab-panel label="{{titleBook}}" value="0" class="{{active == '2' ? 'oneBorder' : ''}}" />
+ <t-tab-panel label="{{titleBook}}" value="0" />
<t-tab-panel label="{{titleCourse}}" value="1" />
<t-tab-panel label="{{titleTextBook}}" value="2" />
</t-tabs>
@@ -26,10 +26,10 @@
</view>
</view>
<view class="list" wx:if="{{list.length > 0}}">
- <view wx:if="{{active == '0'}}" class="listBox">
- <view class="content-item" wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index">
+ <view class="listBox">
+ <view class="{{active == '1' ? 'class--tem' : 'content-item'}}" wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index">
<view class="book-img" bind:tap="goBookDetails" data-book="{{item}}">
- <t-image src="{{item.product.icon}}" width="105" height="145" aria-label="{{item.product.name}}" wx:if="{{item.product.icon}}" mode="aspectFit" />
+ <t-image src="{{item.product.icon}}" width="{{active == '1' ? 150 : 105}}" height="{{active == '1' ? 90 : 145}}" aria-label="{{item.product.name}}" wx:if="{{item.product.icon}}" mode="aspectFit" />
<t-image src="/static/images/default-book-img.png" width="105" height="145" aria-label="{{item.product.name}}" wx:else mode="aspectFit" />
</view>
<view class="body-info" data-book="{{item}}" bindtap="goBookDetails">
@@ -38,21 +38,8 @@
</view>
</view>
</view>
- <view wx:else class="empyt">
- <empty />
- </view>
- <!-- <view wx:if="{{activeName == 'Favoriteclass'}}">
- <view class="content-item" wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index">
- <view class="item-con">
- <view class="titleBox">
- <view class="item-title">{{item.name}}</view>
- </view>
- </view>
- </view>
- </view> -->
</view>
<view wx:if="{{list.length == 0}}" class="empyt">
- <!-- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" /> -->
<empty />
</view>
<view class="bottom-loading" wx:if="{{bottomLoading}}">
diff --git a/pages/study/index.wxss b/pages/study/index.wxss
index 4d8c9d3..816a77f 100644
--- a/pages/study/index.wxss
+++ b/pages/study/index.wxss
@@ -122,7 +122,8 @@
padding-top: 30rpx;
}
-.content-item {
+.content-item,
+.class--tem {
background: #F7F7F7;
border-radius: 10rpx;
box-sizing: border-box;
--
Gitblit v1.9.1