From 99dfeb5fc86bce593a5d3f43f45c26eedc00ab0a Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期二, 10 九月 2024 16:28:54 +0800
Subject: [PATCH] bug
---
pages/digitalCourses/digitalCoursesDetails/index.wxss | 8
pages/digitalCourses/digitalCoursesDetails/index.js | 75 +++++-
pages/digitalCourses/digitalCoursesDetails/index.wxml | 3
packageBookService/pages/bookServices/detail/components/learnTask/index.js | 3
pages/personalCenter/pointsRecord/index.js | 2
packageBookService/pages/bookServices/detail/index.json | 5
packageBookService/pages/bookServices/detail/index.wxml | 388 ++++++--------------------------------
packageBookService/pages/bookServices/detail/index.wxss | 16 +
packageBookService/pages/bookServices/detail/index.js | 56 +++++
assets/js/login.js | 7
10 files changed, 209 insertions(+), 354 deletions(-)
diff --git a/assets/js/login.js b/assets/js/login.js
index e685eab..751730f 100644
--- a/assets/js/login.js
+++ b/assets/js/login.js
@@ -1,7 +1,7 @@
import {
setSessionGuid
} from "./userAction"
-
+const app = getApp();
export const loginInfo = (app, callback) => {
if (app.config.appId == 27) {
@@ -57,6 +57,10 @@
getUserInfo(app, callback, res.token)
// 璁板綍鐧诲綍缁熻
setSessionGuid()
+ //鐧诲綍璁板綍绉垎
+ app.MG.app.creatUserBehavior({
+ refCode: "sign"
+ })
} else {
console.log(res);
callback(false)
@@ -85,7 +89,6 @@
})
}
}
-
// 鑾峰彇鐧诲綍鐢ㄦ埛韬唤
const getUserInfo = (app, callback, token) => {
app.MG.identity.getCurrentAppUser().then(res => {
diff --git a/packageBookService/pages/bookServices/detail/components/learnTask/index.js b/packageBookService/pages/bookServices/detail/components/learnTask/index.js
index 2c5b30a..37f6086 100644
--- a/packageBookService/pages/bookServices/detail/components/learnTask/index.js
+++ b/packageBookService/pages/bookServices/detail/components/learnTask/index.js
@@ -66,7 +66,7 @@
});
} else {
this.setData({
- userId: JSON.parse(wx.getStorageSync(app.config.userInfoKey)).id,
+ userId: JSON.parse(wx.getStorageSync(app.config.userInfoKey)).userId,
disabled: false
});
}
@@ -308,7 +308,6 @@
this.setData({
dataList: list
});
- console.log(this.data.dataList, 777)
}
})
},
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index 99d3595..8d73b89 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -169,6 +169,37 @@
description: '',
agree: false
},
+ resourceVisible: false,
+ resourceValue: [],
+ fileTypeList: [{
+ label: '闊抽',
+ value: '闊抽'
+ },
+ {
+ label: '瑙嗛',
+ value: '瑙嗛'
+ },
+ {
+ label: '鍥剧墖',
+ value: '鍥剧墖'
+ },
+ {
+ label: 'PDF',
+ value: 'PDF'
+ },
+ {
+ label: '璧勬簮鍖�',
+ value: '璧勬簮鍖�'
+ },
+ {
+ label: '鏂囨。',
+ value: '鏂囨。'
+ },
+ {
+ label: '鍏朵粬',
+ value: '鍏朵粬'
+ }
+ ],
fileList: [],
isShowUp: true,
protocolShow: false,
@@ -2647,9 +2678,24 @@
'resourceInfo.resourceName': e.detail.value,
});
},
- onFileTypeInput(e) {
+ onResourcePicker(e) {
this.setData({
- 'resourceInfo.fileType': e.detail.value,
+ resourceVisible: true,
+ });
+ },
+ onPickerChange(e) {
+ const {
+ value
+ } = e.detail;
+ this.setData({
+ resourceVisible: false,
+ resourceValue: value,
+ 'resourceInfo.fileType': value.join(' '),
+ });
+ },
+ onPickerCancel(e) {
+ this.setData({
+ resourceVisible: false,
});
},
textareaChange(e) {
@@ -2690,6 +2736,7 @@
const pdfData = ['pdf']
const Compression = ['rar', 'zip']
const pictureData = ['jpg', 'png']
+ const documentData = ['doc', 'docx', 'xls', 'xlsx', "ppt", "pptx"]
if (audioData.indexOf(Extension) > -1) {
medioType = '闊抽'
} else if (videoData.indexOf(Extension) > -1) {
@@ -2700,6 +2747,8 @@
medioType = '璧勬簮鍖�'
} else if (pictureData.indexOf(Extension) > -1) {
medioType = '鍥剧墖'
+ } else if (documentData.indexOf(Extension) > -1) {
+ medioType = '鏂囨。'
} else {
medioType = '鍏朵粬'
}
@@ -2743,6 +2792,7 @@
that.setData({
"resourceInfo.resourceName": FileName,
"resourceInfo.fileType": medioType,
+
fileList: file,
isShowUp: false
})
@@ -2772,7 +2822,7 @@
if (this.data.resourceInfo.fileType == '') {
return wx.showToast({
icon: "error",
- title: "璇峰～鍐欒祫婧愮被鍨�",
+ title: "璇烽�夋嫨璧勬簮绫诲瀷",
});
}
diff --git a/packageBookService/pages/bookServices/detail/index.json b/packageBookService/pages/bookServices/detail/index.json
index 10b385b..17987eb 100644
--- a/packageBookService/pages/bookServices/detail/index.json
+++ b/packageBookService/pages/bookServices/detail/index.json
@@ -25,7 +25,10 @@
"t-input": "tdesign-miniprogram/input/input",
"t-textarea": "tdesign-miniprogram/textarea/textarea",
"t-checkbox": "tdesign-miniprogram/checkbox/checkbox",
- "t-popup": "tdesign-miniprogram/popup/popup"
+ "t-popup": "tdesign-miniprogram/popup/popup",
+ "t-cell": "tdesign-miniprogram/cell/cell",
+ "t-picker": "tdesign-miniprogram/picker/picker",
+ "t-picker-item": "tdesign-miniprogram/picker-item/picker-item"
},
"onReachBottomDistance": 200,
"disableScroll": true
diff --git a/packageBookService/pages/bookServices/detail/index.wxml b/packageBookService/pages/bookServices/detail/index.wxml
index da17adf..a383338 100644
--- a/packageBookService/pages/bookServices/detail/index.wxml
+++ b/packageBookService/pages/bookServices/detail/index.wxml
@@ -4,12 +4,7 @@
<!-- pageLoading -->
<!--瀵艰埅鍖哄煙 -->
-<suggest-dialog
- class="suggest-dialog"
- showIndex="{{showIndex}}"
- bookIcon="{{bookDetail.icon}}"
- bookName="{{bookDetail.name}}"
-></suggest-dialog>
+<suggest-dialog class="suggest-dialog" showIndex="{{showIndex}}" bookIcon="{{bookDetail.icon}}" bookName="{{bookDetail.name}}"></suggest-dialog>
<!-- <popup showIndex="{{showIndex}}"></popup> -->
<view class="page-bookService" wx:if="{{!pageLoading}}">
<!-- <view style="width: 100%; height: {{barHeight}}px; "></view>
@@ -28,45 +23,25 @@
</view> -->
<t-toast id="t-toast" />
<movable-area class="movable-area">
- <scroll-view
- scroll-y="{{true}}"
- class="book"
- bindscrolltolower="onReachBottom"
- >
+ <scroll-view scroll-y="{{true}}" class="book" bindscrolltolower="onReachBottom">
<!-- 鍥句功璇︽儏 -->
<view class="book-box">
<view class="book-detail" id="book-detail">
<view class="detail-left">
<view class="book-img">
- <image
- loading=""
- src="{{bookDetail.icon ? bookDetail.icon : '/static/images/default-book-img.png'}}"
- mode="aspectFit"
- aria-label="{{bookDetail.name}}"
- />
+ <image loading="" src="{{bookDetail.icon ? bookDetail.icon : '/static/images/default-book-img.png'}}" mode="aspectFit" aria-label="{{bookDetail.name}}" />
</view>
<view class="book-use">
<view class="collect" bind:tap="setCollect">
<view>
- <image
- loading=""
- src="/static/images/bookService/detail/collect.png"
- wx:if="{{!bookDetail.isFavourite}}"
- />
- <image
- loading=""
- src="/static/images/bookService/detail/collecting.png"
- wx:if="{{bookDetail.isFavourite}}"
- />
+ <image loading="" src="/static/images/bookService/detail/collect.png" wx:if="{{!bookDetail.isFavourite}}" />
+ <image loading="" src="/static/images/bookService/detail/collecting.png" wx:if="{{bookDetail.isFavourite}}" />
</view>
<view class="use-title">鏀惰棌</view>
</view>
<view class="suggest" bind:tap="suggestBtn">
<view>
- <image
- loading=""
- src="/static/images/bookService/detail/suggest.png"
- />
+ <image loading="" src="/static/images/bookService/detail/suggest.png" />
</view>
<view class="use-title">鎴戣寤鸿</view>
</view>
@@ -91,19 +66,12 @@
<view class="li-title">鍑虹増鏃堕棿锛�</view>
<view class="li-content">{{bookDetail.publicationDate}}</view>
</view>
- <view
- class="message-li"
- wx:if="{{bookClass.length}}"
- style="height: 80rpx"
- >
+ <view class="message-li" wx:if="{{bookClass.length}}" style="height: 80rpx">
<view class="li-title">鍥句功鍒嗙被锛�</view>
<view class="class-name showTow">{{bookClass}}</view>
</view>
</view>
- <image
- src="/static/images/bookService/detail/square.png"
- class="right-background"
- />
+ <image src="/static/images/bookService/detail/square.png" class="right-background" />
</view>
</view>
<!-- 閿�鍞俊鎭� -->
@@ -112,19 +80,12 @@
<!-- 鐢靛瓙涔﹀敭浠� -->
<view class="electron-price" wx:if="{{bookDetail.price}}">
<view>
- <image
- src="/static/images/bookService/detail/electon-price.png"
- />
+ <image src="/static/images/bookService/detail/electon-price.png" />
</view>
<view class="price">
- <view class="price-text"
- >{{bookDetail.price == '0.00' ? '鍏嶈垂' : '楼'+
- bookDetail.price}}</view
- >
- <view
- class="price-old"
- wx:if="{{bookDetail.oldPrice != '0.00'}}"
- >楼{{bookDetail.oldPrice}}
+ <view class="price-text">{{bookDetail.price == '0.00' ? '鍏嶈垂' : '楼'+
+ bookDetail.price}}</view>
+ <view class="price-old" wx:if="{{bookDetail.oldPrice != '0.00'}}">楼{{bookDetail.oldPrice}}
</view>
</view>
<view> </view>
@@ -132,72 +93,27 @@
<!-- 绾歌川涔﹀敭浠� -->
<view class="paper-price" wx:if="{{bookDetail.paperPrice}}">
<view>
- <image
- src="/static/images/bookService/detail/paper-price.png"
- />
+ <image src="/static/images/bookService/detail/paper-price.png" />
</view>
- <view class="price"
- >{{bookDetail.paperPrice == '0.00' ? '鍏嶈垂' :
- '楼'+bookDetail.paperPrice}}</view
- >
+ <view class="price">{{bookDetail.paperPrice == '0.00' ? '鍏嶈垂' :
+ '楼'+bookDetail.paperPrice}}</view>
</view>
</view>
<!-- 缃戝簵 -->
<view class="book-web">
- <image
- src="/static/images/bookService/detail/jd.png"
- wx:if="{{bookDetail.JDLink}}"
- bind:tap="goShop"
- data-link="{{bookDetail.JDLink}}"
- data-type="jd"
- />
- <image
- class="tmall-image"
- src="/static/images/bookService/detail/tmall.png"
- bind:tap="goShop"
- data-link="{{bookDetail.tmallLink}}"
- wx:if="{{bookDetail.tmallLink}}"
- />
- <image
- src="/static/images/bookService/detail/dangdang.png"
- bind:tap="goShop"
- data-link="{{bookDetail.dangdangLink}}"
- wx:if="{{bookDetail.dangdangLink}}"
- />
- <image
- src="/static/images/bookService/detail/weidian.png"
- bind:tap="goShop"
- data-link="{{bookDetail.weidianLink}}"
- wx:if="{{bookDetail.weidianLink}}"
- />
+ <image src="/static/images/bookService/detail/jd.png" wx:if="{{bookDetail.JDLink}}" bind:tap="goShop" data-link="{{bookDetail.JDLink}}" data-type="jd" />
+ <image class="tmall-image" src="/static/images/bookService/detail/tmall.png" bind:tap="goShop" data-link="{{bookDetail.tmallLink}}" wx:if="{{bookDetail.tmallLink}}" />
+ <image src="/static/images/bookService/detail/dangdang.png" bind:tap="goShop" data-link="{{bookDetail.dangdangLink}}" wx:if="{{bookDetail.dangdangLink}}" />
+ <image src="/static/images/bookService/detail/weidian.png" bind:tap="goShop" data-link="{{bookDetail.weidianLink}}" wx:if="{{bookDetail.weidianLink}}" />
</view>
</view>
</view>
<view class="book-resource">
- <t-tabs
- value="{{tabValue}}"
- bind:change="onTabsChange"
- t-class="custom-tabs"
- t-class-content="custom-panel"
- class="tab-class"
- >
- <t-tab-panel
- label="鍥句功淇℃伅"
- icon="{{ tabValue == 'brief' ? briefIconClick : briefIcon}}"
- value="brief"
- style="{{tabPanelstyle}}"
- >
- <book-brief
- content="{{bookDetail.content}}"
- catalogue="{{bookDetail.catalogue}}"
- authorIntroduction="{{bookDetail.authorIntroduction}}"
- wx:if="{{bookDetail.content || bookDetail.authorIntroduction}}"
- ></book-brief>
- <view
- wx:if="{{!bookDetail.content && !bookDetail.authorIntroduction && !loading}}"
- class="noData"
- >
+ <t-tabs value="{{tabValue}}" bind:change="onTabsChange" t-class="custom-tabs" t-class-content="custom-panel" class="tab-class">
+ <t-tab-panel label="鍥句功淇℃伅" icon="{{ tabValue == 'brief' ? briefIconClick : briefIcon}}" value="brief" style="{{tabPanelstyle}}">
+ <book-brief content="{{bookDetail.content}}" catalogue="{{bookDetail.catalogue}}" authorIntroduction="{{bookDetail.authorIntroduction}}" wx:if="{{bookDetail.content || bookDetail.authorIntroduction}}"></book-brief>
+ <view wx:if="{{!bookDetail.content && !bookDetail.authorIntroduction && !loading}}" class="noData">
<!-- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" /> -->
<empty />
</view>
@@ -209,38 +125,10 @@
style="{{tabPanelstyle}}"
>
</t-tab-panel> -->
- <t-tab-panel
- label="鏁欏璧勬簮"
- icon="{{tabValue == 'jsek_teachingResources' ? teachResourcesClickIcon : teachResourcesIcon}}"
- value="jsek_teachingResources"
- class="{{loading ? 'loading': ''}}"
- >
- <view
- wx:if="{{!loading && teach.length && !noResources && applyState}}"
- >
- <teach-resource
- applyState="{{applyState}}"
- rejectCause="{{rejectCause}}"
- deadline="{{deadline}}"
- bind:applyResource="applyResource"
- applyResourceLoading="{{applyResourceLoading}}"
- bind:uploadFile="uploadFile"
- ></teach-resource>
- <tree
- id="teach-tree"
- openIds="{{openTeachids}}"
- bookInfo="{{bookDetail}}"
- treeList="{{teach}}"
- tab="{{tabValue}}"
- applyState="{{applyState}}"
- deadline="{{deadline}}"
- bind:downloadTeach="downloadTeach"
- bind:handleTree="handleTree"
- openTeachids="{{openTeachids}}"
- wx:if="{{teach.length}}"
- isShoppingCart="isShoppingCart"
- bind:updateCloudLearning="updateCloudLearning"
- ></tree>
+ <t-tab-panel label="鏁欏璧勬簮" icon="{{tabValue == 'jsek_teachingResources' ? teachResourcesClickIcon : teachResourcesIcon}}" value="jsek_teachingResources" class="{{loading ? 'loading': ''}}">
+ <view wx:if="{{!loading && teach.length && !noResources && applyState}}">
+ <teach-resource applyState="{{applyState}}" rejectCause="{{rejectCause}}" deadline="{{deadline}}" bind:applyResource="applyResource" applyResourceLoading="{{applyResourceLoading}}" bind:uploadFile="uploadFile"></teach-resource>
+ <tree id="teach-tree" openIds="{{openTeachids}}" bookInfo="{{bookDetail}}" treeList="{{teach}}" tab="{{tabValue}}" applyState="{{applyState}}" deadline="{{deadline}}" bind:downloadTeach="downloadTeach" bind:handleTree="handleTree" openTeachids="{{openTeachids}}" wx:if="{{teach.length}}" isShoppingCart="isShoppingCart" bind:updateCloudLearning="updateCloudLearning"></tree>
</view>
<!-- <t-loading
theme="circular"
@@ -249,93 +137,34 @@
loading="{{loading }}"
/> -->
<view wx:if="{{loading}}" style="width: 100%; height: min-content">
- <t-skeleton
- row-col="{{rowCol}}"
- theme="paragraph"
- animation="gradient"
- loading="{{loading}}"
- ></t-skeleton>
+ <t-skeleton row-col="{{rowCol}}" theme="paragraph" animation="gradient" loading="{{loading}}"></t-skeleton>
</view>
<view wx:if="{{noResources && !loading}}" class="noData">
<!-- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" /> -->
<empty />
</view>
</t-tab-panel>
- <t-tab-panel
- label="浜戝涔�"
- icon="{{tabValue == 'jsek_cloudLearning' ? learnResourceClickIcon : learnResourceIcon}}"
- value="jsek_cloudLearning"
- style="{{tabPanelstyle}}"
- >
+ <t-tab-panel label="浜戝涔�" icon="{{tabValue == 'jsek_cloudLearning' ? learnResourceClickIcon : learnResourceIcon}}" value="jsek_cloudLearning" style="{{tabPanelstyle}}">
<view wx:if="{{!loading && learn.length}}">
- <learn-resource
- bind:getFreeResource="getFreeResource"
- bind:allAddShoppiingCar="allAddShoppiingCar"
- id="learn-resource"
- buyResourceData="{{buyResourceData}}"
- bookId="{{bookDetail.id}}"
- isshowDrawBtn="{{isshowDrawBtn}}"
- successOrderNumber="{{successOrderNumber}}"
- isGoBuyResource="{{isGoBuyResource}}"
- ></learn-resource>
+ <learn-resource bind:getFreeResource="getFreeResource" bind:allAddShoppiingCar="allAddShoppiingCar" id="learn-resource" buyResourceData="{{buyResourceData}}" bookId="{{bookDetail.id}}" isshowDrawBtn="{{isshowDrawBtn}}" successOrderNumber="{{successOrderNumber}}" isGoBuyResource="{{isGoBuyResource}}"></learn-resource>
- <tree
- id="tree"
- openIds="{{openLearnids}}"
- bookInfo="{{bookDetail}}"
- tab="{{tabValue}}"
- treeList="{{learn}}"
- buyIds="{{buyIdList}}"
- openLearnids="{{openLearnids}}"
- bind:updateShoppingCartHidden="updateShoppingCartHidden"
- bind:updateCloudLearning="updateCloudLearning"
- ></tree>
+ <tree id="tree" openIds="{{openLearnids}}" bookInfo="{{bookDetail}}" tab="{{tabValue}}" treeList="{{learn}}" buyIds="{{buyIdList}}" openLearnids="{{openLearnids}}" bind:updateShoppingCartHidden="updateShoppingCartHidden" bind:updateCloudLearning="updateCloudLearning"></tree>
</view>
<view wx:if="{{noResources && !loading}}" class="noData">
<!-- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" /> -->
<empty />
</view>
</t-tab-panel>
- <t-tab-panel
- label="浜戞祴璇�"
- icon="{{tabValue == 'questionBank' ? testResourceClickIocn : testResourceIocn}}"
- value="questionBank"
- style="{{tabPanelstyle}}"
- >
+ <t-tab-panel label="浜戞祴璇�" icon="{{tabValue == 'questionBank' ? testResourceClickIocn : testResourceIocn}}" value="questionBank" style="{{tabPanelstyle}}">
<view wx:if="{{!loading}}">
- <test-resource
- id="test-resource"
- list="{{test}}"
- bookInfo="{{bookDetail}}"
- openIds="{{openLearnids}}"
- mockData="{{mockData}}"
- tab="{{tabValue}}"
- storeInfo="{{options.storeInfo}}"
- jslx="{{jslx}}"
- bind:buyMock="buyMock"
- ></test-resource>
+ <test-resource id="test-resource" list="{{test}}" bookInfo="{{bookDetail}}" openIds="{{openLearnids}}" mockData="{{mockData}}" tab="{{tabValue}}" storeInfo="{{options.storeInfo}}" jslx="{{jslx}}" bind:buyMock="buyMock"></test-resource>
</view>
</t-tab-panel>
- <t-tab-panel
- label="浜戠瑪璁�"
- icon="{{tabValue == 'jsek_note' ? noteClickIcon: noteIcon}}"
- value="jsek_note"
- style="{{tabPanelstyle}}"
- >
+ <t-tab-panel label="浜戠瑪璁�" icon="{{tabValue == 'jsek_note' ? noteClickIcon: noteIcon}}" value="jsek_note" style="{{tabPanelstyle}}">
<note bookInfo="{{bookDetail}}" id="note" class="note-list"></note>
</t-tab-panel>
- <t-tab-panel
- label="鐩稿叧鍥句功"
- icon="{{tabValue == 'related_books' ? linkClickIcon: linkIcon}}"
- value="related_books"
- style="{{tabPanelstyle}}"
- >
- <related-books
- relatedBookData="{{relatedBookData}}"
- relatedBookLoading="{{relatedBookLoading}}"
- noRelatedBookData="{{noRelatedBookData}}"
- bind:goBookDetails="goBookDetails"
- ></related-books>
+ <t-tab-panel label="鐩稿叧鍥句功" icon="{{tabValue == 'related_books' ? linkClickIcon: linkIcon}}" value="related_books" style="{{tabPanelstyle}}">
+ <related-books relatedBookData="{{relatedBookData}}" relatedBookLoading="{{relatedBookLoading}}" noRelatedBookData="{{noRelatedBookData}}" bind:goBookDetails="goBookDetails"></related-books>
</t-tab-panel>
</t-tabs>
</view>
@@ -343,86 +172,41 @@
<movable-view class="movable-view" :x="{{x}}" :y="{{y}}" direction="all">
<view class="applyBox" bindtap="goApply">
<view class="box">
- <t-image
- src="/static/images/home/yangshuForm1.png"
- mode="heightFix"
- class="img"
- />
+ <t-image src="/static/images/home/yangshuForm1.png" mode="heightFix" class="img" />
<view class="num" wx:if="{{num > 0}}">{{num}}</view>
</view>
</view>
</movable-view>
</movable-area>
<!-- 鎴戣寤鸿寮圭獥 -->
- <suggest
- class="suggest-component"
- id="suggest-component"
- bookIcon="{{bookDetail.icon}}"
- bookName="{{bookDetail.name}}"
- ></suggest>
+ <suggest class="suggest-component" id="suggest-component" bookIcon="{{bookDetail.icon}}" bookName="{{bookDetail.name}}"></suggest>
<!-- 鏁欏璧勬簮涓嬭浇鎻愮ず寮圭獥 -->
- <t-dialog
- class="teachDownloadDialog"
- visible="{{isShowTeachDownload}}"
- title="鎻愮ず"
- content="璇峰墠寰�PC绔笅杞�"
- confirm-btn="{{ confirmBtn }}"
- bind:confirm="closeTeachDownload"
- />
+ <t-dialog class="teachDownloadDialog" visible="{{isShowTeachDownload}}" title="鎻愮ず" content="璇峰墠寰�PC绔笅杞�" confirm-btn="{{ confirmBtn }}" bind:confirm="closeTeachDownload" />
<!-- 璐拱鎸夐挳 -->
<view class="box-bottom">
<view class="bottom-btn" bind:tap="appplyElectronicBook">
<view>
- <t-image
- loading=""
- src="/static/images/bookService/detail/ebook.png"
- ></t-image>
+ <t-image loading="" src="/static/images/bookService/detail/ebook.png"></t-image>
</view>
<view class="btn-text">鐢靛瓙鏍蜂功鐢宠</view>
</view>
<view class="bottom-btn" bind:tap="appplyPaperBook">
<view>
- <t-image
- src="/static/images/bookService/detail/paper-book.png"
- ></t-image>
+ <t-image src="/static/images/bookService/detail/paper-book.png"></t-image>
</view>
<view class="btn-text">绾歌川鏍蜂功鐢宠</view>
</view>
- <view
- class="{{!bookBuy && bookDetail.isSell ? 'bottom-btn tryRead' : 'bottom-btn try'}}"
- bind:tap="goRead"
- wx:if="{{!bookBuy || applicationState == 'overdue'}}"
- >
+ <view class="{{!bookBuy && bookDetail.isSell ? 'bottom-btn tryRead' : 'bottom-btn try'}}" bind:tap="goRead" wx:if="{{!bookBuy || applicationState == 'overdue'}}">
<view>
<t-image src="/static/images/bookService/detail/shidu.png"></t-image>
</view>
<view class="btn-text">璇曡</view>
</view>
- <view
- class="shopCar shopCarColor"
- bind:tap="addBookShopcCar"
- wx:if="{{!bookBuy && bookDetail.price !== '0.00' && bookDetail.isSell == '1'}}"
- >鍔犲叆璐墿杞�</view
- >
- <view
- class="buy buyColor"
- bind:tap="buyBtn"
- wx:if="{{!bookBuy && bookDetail.price !== '0.00' && bookDetail.isSell == '1'}}"
- >绔嬪嵆璐拱</view
- >
- <view
- class="buy receiveColor"
- bind:tap="buyBtn"
- wx:if="{{!bookBuy && bookDetail.price == '0.00' && bookDetail.isSell == '1'}}"
- >鍏嶈垂棰嗗彇</view
- >
- <view
- class="buy read"
- bind:tap="goRead"
- wx:if="{{bookBuy || applicationState == 'Normal'}}"
- >绔嬪嵆鏌ョ湅</view
- >
+ <view class="shopCar shopCarColor" bind:tap="addBookShopcCar" wx:if="{{!bookBuy && bookDetail.price !== '0.00' && bookDetail.isSell == '1'}}">鍔犲叆璐墿杞�</view>
+ <view class="buy buyColor" bind:tap="buyBtn" wx:if="{{!bookBuy && bookDetail.price !== '0.00' && bookDetail.isSell == '1'}}">绔嬪嵆璐拱</view>
+ <view class="buy receiveColor" bind:tap="buyBtn" wx:if="{{!bookBuy && bookDetail.price == '0.00' && bookDetail.isSell == '1'}}">鍏嶈垂棰嗗彇</view>
+ <view class="buy read" bind:tap="goRead" wx:if="{{bookBuy || applicationState == 'Normal'}}">绔嬪嵆鏌ョ湅</view>
</view>
</view>
<view wx:if="{{dialogBox}}">
@@ -432,84 +216,49 @@
<view class="row-info">
<view class="body">
<view class="dialog-title">鏂囦欢涓婁紶</view>
- <view
- style="width: 100%; height: 2rpx; background-color: #f4f4f4"
- ></view>
+ <view style="width: 100%; height: 2rpx; background-color: #f4f4f4"></view>
<view class="from-item">
<view class="label"> <text class="icon">*</text>璧勬簮鍚嶇О: </view>
<view class="item-content">
<view class="inputBox1">
- <t-input
- placeholder="杈撳叆璧勬簮鍚嶇О"
- borderless
- value="{{resourceInfo.resourceName}}"
- bindchange="onNameInput"
- />
+ <t-input placeholder="杈撳叆璧勬簮鍚嶇О" borderless value="{{resourceInfo.resourceName}}" bindchange="onNameInput" />
</view>
</view>
</view>
<view class="from-item">
<view class="label"> <text class="icon">*</text>璧勬簮绫诲瀷: </view>
<view class="item-content">
- <view class="inputBox1">
- <t-input
- placeholder="杈撳叆璧勬簮绫诲瀷"
- borderless
- value="{{resourceInfo.fileType}}"
- bindchange="onFileTypeInput"
- />
- </view>
+ <!-- <view class="inputBox1">
+ <t-input placeholder="杈撳叆璧勬簮绫诲瀷" borderless value="{{resourceInfo.fileType}}" bindchange="onFileTypeInput" />
+ </view> -->
+ <t-cell class="mb-16" title="" arrow hover note="{{resourceInfo.fileType}}" bind:click="onResourcePicker" />
+ <t-picker visible="{{resourceVisible}}" value="{{resourceValue}}" data-key="resource" title="閫夋嫨璧勬簮绫诲瀷" cancelBtn="鍙栨秷" confirmBtn="纭" usingCustomNavbar bindchange="onPickerChange" bindcancel="onPickerCancel">
+ <t-picker-item options="{{fileTypeList}}" />
+ </t-picker>
</view>
</view>
<view class="from-item">
<view class="label">鏂囦欢鎻忚堪:</view>
<view class="item-content">
<view class="inputBox1">
- <t-textarea
- placeholder="璇疯緭鍏ユ枃浠舵弿杩�"
- value="{{resourceInfo.description}}"
- disableDefaultPadding="{{true}}"
- autosize="{{true}}"
- maxlength="300"
- indicator
- bind:change="textareaChange"
- />
+ <t-textarea placeholder="璇疯緭鍏ユ枃浠舵弿杩�" value="{{resourceInfo.description}}" disableDefaultPadding="{{true}}" autosize="{{true}}" maxlength="300" indicator bind:change="textareaChange" />
</view>
</view>
</view>
<view class="from-item">
<view class="label"> <text class="icon">*</text>涓婁紶鏂囦欢: </view>
<view class="item-content">
- <t-button
- size="small"
- class="right-btn"
- bind:tap="uploadPicture"
- wx:if="{{isShowUp}}"
- >鐐瑰嚮涓婁紶</t-button
- >
- <view
- wx:if="{{!isShowUp && fileList.length > 0}}"
- class="fileList"
- >
+ <t-button size="small" class="right-btn" bind:tap="uploadPicture" wx:if="{{isShowUp}}">鐐瑰嚮涓婁紶</t-button>
+ <view wx:if="{{!isShowUp && fileList.length > 0}}" class="fileList">
<text>{{fileList[0].name}}</text>
- <image
- src="/static/images/bookService/detail/deleteHover.png"
- class="deleteBtn"
- data-md5="{{fileList[0].md5}}"
- bind:tap="handleRemove"
- />
+ <image src="/static/images/bookService/detail/deleteHover.png" class="deleteBtn" data-md5="{{fileList[0].md5}}" bind:tap="handleRemove" />
</view>
</view>
<view class="tip">娉細鏂囦欢澶у皬涓嶅緱瓒呰繃50MB</view>
</view>
<view class="from-item">
<view class="protocolBox">
- <t-checkbox
- label="鍚屾剰"
- icon="rectangle"
- checked="{{resourceInfo.agree}}"
- bind:change="onChange"
- />
+ <t-checkbox label="鍚屾剰" icon="rectangle" checked="{{resourceInfo.agree}}" bind:change="onChange" />
<text class="wait" bind:tap="getAgreement">銆婃巿鏉冨悓鎰忎功銆�</text>
</view>
</view>
@@ -522,26 +271,17 @@
</view>
</view>
</view>
+
<view class="popupBox">
- <t-popup
- visible="{{protocolShow}}"
- bind:visible-change="onVisibleChange"
- placement="center"
- >
+ <t-popup visible="{{protocolShow}}" bind:visible-change="onVisibleChange" placement="center">
<view class="block">
<view class="protocol">
<rich-text space="emsp" nodes="{{protocolTxt}}" class="content" />
</view>
- <t-icon
- t-class="close-btn"
- name="close-circle"
- size="32"
- color="#fff"
- bind:tap="onCloseProtocol"
- />
+ <t-icon t-class="close-btn" name="close-circle" size="32" color="#fff" bind:tap="onCloseProtocol" />
</view>
</t-popup>
</view>
<!-- <view class="loading" wx:if="{{pageLoading}}">
<t-loading loading="{{pageLoading}}" size="40"></t-loading>
-</view> -->
+</view> -->
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/detail/index.wxss b/packageBookService/pages/bookServices/detail/index.wxss
index e37f3b9..9ad1816 100644
--- a/packageBookService/pages/bookServices/detail/index.wxss
+++ b/packageBookService/pages/bookServices/detail/index.wxss
@@ -612,6 +612,22 @@
background: #f1f1f1;
}
+.t-cell::after {
+ border-bottom: none !important;
+}
+
+.info-center .t-cell {
+ border: 2rpx solid #D9D9D9;
+ border-radius: 15rpx;
+ padding: 10rpx !important;
+}
+
+.info-center .t-cell__note {
+ width: 98%;
+ justify-content: flex-start !important;
+}
+
+
.deleteBtn {
width: 30rpx;
height: 30rpx;
diff --git a/pages/digitalCourses/digitalCoursesDetails/index.js b/pages/digitalCourses/digitalCoursesDetails/index.js
index ad21895..8b78e3a 100644
--- a/pages/digitalCourses/digitalCoursesDetails/index.js
+++ b/pages/digitalCourses/digitalCoursesDetails/index.js
@@ -310,22 +310,8 @@
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 => {
- if (res.datas.subItems && res.datas.subItems.QueryCms.length > 0) {
- res.datas.subItems.QueryCms.forEach(item1 => {
- if (JSON.parse(item.Data.Value).items[0] == item1.id) {
- lecturer.push({
- name: item1.name,
- icon: item1.icon ? item1.icon : '',
- description: item1.description ? item1.description : '',
- })
- }
- })
-
- }
- })
+ this.getSpeaker(res.datas.datas.speaker)
}
if (this.data.bookPath) {
this.getAboutBook(this.data.bookPath)
@@ -338,12 +324,69 @@
'<img style="max-width:100%;height:auto;display:block;margin-top:0;margin-bottom:0;"'
)
this.setData({
- lecturerList: lecturer,
digitalsData: res.datas,
loading: false
})
})
},
+ //鑾峰彇涓昏浜�
+ getSpeaker(list) {
+ let query = {
+ path: 'jsek_speaker',
+ fields: {
+ content: [],
+ positionalTitle: []
+ },
+ coverSize: {
+ height: 250
+ }
+ }
+ app.MG.resource.getItem(query).then((res) => {
+ let lecturerList = []
+ if (list && res.datas.length > 0) {
+ list.forEach((item) => {
+ if (res.datas && res.datas.length > 0) {
+ res.datas.forEach((item1) => {
+ if (JSON.parse(item.Data.Value).items[0] == item1.id) {
+ lecturerList.push({
+ name: item1.name,
+ positionalTitle: item1.positionalTitle,
+ icon: item1.icon,
+ description: item1.description ? item1.description : '鏆傛棤绠�浠�'
+ })
+ }
+ })
+ }
+ })
+ this.getPositionalTitle(lecturerList)
+ }
+ })
+ },
+ async getPositionalTitle(listStr) {
+ let list = []
+ let query = {
+ refCodes: ['positionalTitle']
+ }
+ await app.MG.store.getProductTypeField(query).then((res) => {
+ let option = JSON.parse(res[0].config).option
+ listStr.forEach((unit) => {
+ option.forEach((item) => {
+ if (item.value == unit.positionalTitle) {
+ unit.positionalName = item.name
+ }
+ })
+ list.push({
+ name: unit.name,
+ positionalTitle: unit.positionalName,
+ icon: unit.icon,
+ description: unit.description ? unit.description : '鏆傛棤绠�浠�'
+ })
+ })
+ this.setData({
+ lecturerList: list
+ })
+ })
+ },
//鑾峰彇鍥句功鍑虹増鍗曚綅
async getBookPublishUnit(listStr) {
diff --git a/pages/digitalCourses/digitalCoursesDetails/index.wxml b/pages/digitalCourses/digitalCoursesDetails/index.wxml
index 8b2608f..6efdeac 100644
--- a/pages/digitalCourses/digitalCoursesDetails/index.wxml
+++ b/pages/digitalCourses/digitalCoursesDetails/index.wxml
@@ -83,8 +83,7 @@
</view>
<view class="lecturerInformation">
<view class="lecturerName">
- <view class="name"> {{item.name}} </view>
- <view class="title">{{item.title}}</view>
+ <view class="name"> {{item.name}} <text class="positionalTitle" wx:if="{{item.positionalTitle}}">({{item.positionalTitle}})</text></view>
</view>
<view class="lecturerContent">{{item.description}}</view>
</view>
diff --git a/pages/digitalCourses/digitalCoursesDetails/index.wxss b/pages/digitalCourses/digitalCoursesDetails/index.wxss
index e4f56de..6a78d69 100644
--- a/pages/digitalCourses/digitalCoursesDetails/index.wxss
+++ b/pages/digitalCourses/digitalCoursesDetails/index.wxss
@@ -165,15 +165,17 @@
.lecturerName {
display: flex;
/* justify-content: space-between; */
- margin-bottom: 10rpx;
+ margin-bottom: 20rpx;
}
.lecturerName .name {
color: #333;
- width: 200rpx;
+
+ /* width: 200rpx; */
}
-.lecturerName .title {
+
+.lecturerName .positionalTitle {
color: #949494;
}
diff --git a/pages/personalCenter/pointsRecord/index.js b/pages/personalCenter/pointsRecord/index.js
index e5692c0..d7aafdb 100644
--- a/pages/personalCenter/pointsRecord/index.js
+++ b/pages/personalCenter/pointsRecord/index.js
@@ -76,7 +76,7 @@
//瑙﹀簳鍔犺浇鏂版暟鎹苟淇濈暀鑰佹暟鎹�
if (isReachBottom) {
- dataList = [...this.data.list, ...dataList] //灏嗘柊鏁版嵁鍔犲叆鑰佹暟鎹腑
+ dataList = [...this.data.recordList, ...dataList] //灏嗘柊鏁版嵁鍔犲叆鑰佹暟鎹腑
}
this.setData({
recordList: dataList,
--
Gitblit v1.9.1