From 057199d5c5284a71e5d04e091492873ced412fa5 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期四, 21 三月 2024 09:28:54 +0800
Subject: [PATCH] 代码合并
---
pages/home/home.js | 3
packageBookService/pages/bookServices/detail/index.wxml | 2
pages/retrievalPage/index.json | 6
packageBookService/pages/bookServices/detail/index.wxss | 2
pages/bookExhibitionList/index.js | 7
packageBookService/pages/components/webView/index.js | 165 +++++++++
services/home/home.js | 2
pages/personalCenter/index.wxml | 11
packageBookService/pages/bookServices/detail/components/tree/index.js | 110 +++++-
pages/personalCenter/index.wxss | 46 ++
assets/js/config.js | 6
packageBookService/pages/bookServices/detail/index.js | 36 +
pages/home/home.wxml | 5
pages/personalCenter/index.js | 40 ++
pages/retrievalPage/index.js | 26 +
pages/cart/index.wxss | 8
packageBookService/pages/components/webView/index.json | 4
packageDomain/pages/resourceDetails/myAudio/index.json | 4
pages/cart/index.wxml | 9
packagePersonal/pages/userSetting/index.wxml | 42 ++
packagePersonal/pages/userSetting/index.wxss | 38 ++
pages/cart/paymentPage/index.wxml | 9
pages/bookExhibitionList/index.wxss | 96 +++++
pages/bookExhibitionList/index.wxml | 16
packageDomain/pages/resourceDetails/myAudio/index.js | 36 +
pages/retrievalPage/index.wxml | 23 +
pages/retrievalPage/index.wxss | 8
packagePersonal/pages/userSetting/index.js | 71 +++-
pages/bookExhibitionList/index.json | 3
app.json | 5
packageBookService/pages/components/webView/index.wxml | 4
packageBookService/pages/bookServices/detail/components/tree/index.wxml | 5
pages/cart/index.js | 9
pages/cart/paymentPage/index.js | 82 ----
packagePersonal/pages/userSetting/index.json | 6
packageDomain/pages/resourceDetails/myAudio/index.wxss | 33 +
packageDomain/pages/resourceDetails/myAudio/index.wxml | 24
packageBookService/pages/components/webView/index.wxss | 6
38 files changed, 799 insertions(+), 209 deletions(-)
diff --git a/app.json b/app.json
index c3c65c8..2b71cb4 100644
--- a/app.json
+++ b/app.json
@@ -1,9 +1,9 @@
{
"pages": [
- "pages/student/index",
"pages/home/home",
"pages/retrievalPage/index",
"pages/cart/paymentPage/index",
+ "pages/student/index",
"pages/cart/index",
"pages/bookExhibitionList/index",
"pages/bookExhibitionDetails/index",
@@ -51,7 +51,8 @@
"pages/bookServices/list/index",
"pages/bookServices/detail/index",
"pages/bookServices/examination/examination",
- "pages/bookServices/webpage/index"
+ "pages/bookServices/webpage/index",
+ "pages/components/webView/index"
]
}
],
diff --git a/assets/js/config.js b/assets/js/config.js
index c521369..f1adde9 100644
--- a/assets/js/config.js
+++ b/assets/js/config.js
@@ -20,7 +20,8 @@
export const fontUrl = "http://192.168.3.132:5173";
// export const fontUrl = "http://182.92.203.7:3007/jsek/website";
// export const fontUrl = "http://jsysf.bnuic.com/website";
-
+// export const epubUrl = "http://182.92.203.7:3007/epubReadMobile/";
+export const epubUrl = "http://jsysf.bnuic.com/epubReadMobile/#/";
const config = {
requestCtx,
@@ -34,6 +35,7 @@
seminar,
fontUrl,
reg_tel,
- reg_telphone
+ reg_telphone,
+ epubUrl
};
export default config;
diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.js b/packageBookService/pages/bookServices/detail/components/tree/index.js
index 2cc493e..eed99e1 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.js
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.js
@@ -3,6 +3,8 @@
const util = require('./components/util') // 寮曞叆灏佽杩囩殑鍔犺浇鎻愮ず
const app = getApp()
Component({
+ // checked: false,
+
properties: {
treeList: {
type: Array,
@@ -35,7 +37,8 @@
},
data: {
activeValues: [0],
- webpageSrc: ''
+ webpageSrc: '',
+ cloudShoppingCart: []
},
onShow() {
@@ -45,10 +48,11 @@
methods: {
// 鑺傜偣灞曞紑
handleChange(e) {
+ // console.log(this.properties.treeList, 'this.properties.treeList');
this.setData({
activeValues: e.detail.value,
});
- console.log('浼犻��', this.properties.buyIds);
+ // console.log('浼犻��', this.properties.buyIds);
},
handleCheck(data) {
for (let index = 0; index < data.length; index++) {
@@ -82,6 +86,8 @@
},
// 璺宠浆闊宠棰戞挱鏀惧櫒
goPlayer(e) {
+ console.log(e);
+ // debugger
const item = e.currentTarget.dataset.item
const parent = e.currentTarget.dataset.parent
let url
@@ -166,7 +172,7 @@
result.push(...item.children);
}
}
- console.log(this.properties.treeList);
+ console.log(this.properties.treeList, 'this.properties.treeList');
this.properties.treeList.forEach(item => {
findChildren(item);
});
@@ -174,20 +180,30 @@
},
// 鎷垮埌褰撳墠椤瑰瓙椤�
flattenTree(tree) {
+
let result = [];
+
function flatten(node) {
+
result.push(node);
+
if (node.children && node.children.length > 0) {
+
node.children.forEach(child => {
flatten(child);
});
}
}
tree.forEach(node => {
+
flatten(node);
});
+ // console.log(result, 'result');
return result
},
+
+
+
findAndUpdateItemById(tree, id) {
function findAndUpdate(node) {
if (node.id === id) {
@@ -212,9 +228,12 @@
},
// 鍙樹负true
findAndUpdateItemsByIds(tree, ids) {
+
function findAndUpdate(node) {
+
if (ids.includes(node.id)) {
- node.checked = true; // 灏嗙洰鏍囬」鐨� check 灞炴�ц缃负 true
+ // console.log(node, 'node');
+ node.checked = !node.checked // 灏嗙洰鏍囬」鐨� check 灞炴�ц缃负 true
}
if (node.children && node.children.length > 0) {
for (let child of node.children) {
@@ -224,30 +243,87 @@
}
for (let node of tree) {
+
findAndUpdate(node); // 瀵规瘡涓《灞傝妭鐐规墽琛屾煡鎵惧拰鏇存柊鎿嶄綔
}
+ // console.log(tree, 'tree345');
return tree; // 杩斿洖淇敼鍚庣殑瀹屾暣鏁扮粍
},
+
// 绔犺妭鍕鹃��
checkResourceTitle(e) {
+ // 杩欎釜鏃跺�檆hecked鐨勫�兼槸fals
const item = e.currentTarget.dataset.item
- console.log(item, 'item');
+
let list = this.flattenTree([item])
+
+
let ids = []
list.forEach(item => {
ids.push(item.id)
})
- const tab = this.findAndUpdateItemsByIds([item], ids)
- console.log(ids, tab);
- }
+
+ const updatedTreeList = this.findAndUpdateItemsByIds(this.properties.treeList, ids);
+ // console.log(updatedTreeList, 'updatedTreeList'); //杩欎釜鏃跺�檆hecked鐨勫�煎氨鍙樻垚浜唗rue
+
+ this.setData({
+ treeList: updatedTreeList // 鏇存柊 treeList 鏁版嵁
+ });
+
+ console.log(list, 'list');
+ list.forEach(items => {
+ console.log(items.checked, 'itesasd');
+ if (!items.checked) {
+ this.setData({
+ cloudShoppingCart: items
+ })
+ }
+ })
+
+ this.onCloudShoppingCart()
+ },
+ // 瀛愰」鍕鹃��
+ checkResource(e) {
+ const item = e.currentTarget.dataset.item
+
+
+ // let list = this.flattenTree([item])
+ // console.log(list, 'list121');
+ // let ids = []
+ // list.forEach(items => {
+ // console.log(items.id, 'itemsId');
+ // ids.push(items.id)
+ // })
+ },
+ // 鍔犲叆璐墿杞�
+ async onCloudShoppingCart() {
+ let requests = []
+ const item = this.data.cloudShoppingCart
+ console.log(item, 'item');
+ item.forEach((items) => {
+ if (items.saleMethod.length) {
+ requests.push({
+ saleMethodId: items.saleMethod[0].Id,
+ count: 1
+ })
+ }
+ })
+ let query = {
+ remarks: '浜戝涔�',
+ requests
+ }
+ // 鏌ヨ璁㈠崟
+ let initOrderRes = await app.MG.store.initOrder(query)
+ let parameter = {
+ orderNum: initOrderRes.orderNumber
+ }
+ const confirmOrderRes = await app.MG.store.confirmOrder(parameter)
+ // if (confirmOrderRes.orderNumber) {
+ // wx.navigateTo({
+ // url: `/pages/cart/paymentPage/index?orderNumber=${confirmOrderRes.orderNumber}`,
+ // })
+ // requests = []
+ // }
+ },
},
- onCloudShoppingCart() {
- console.log(this.properties.treeList);
- },
- oncheckbox() {
- console.log(111);
- },
- logdata(e) {
- console.log(e);
- }
})
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.wxml b/packageBookService/pages/bookServices/detail/components/tree/index.wxml
index 307998f..32b7b5a 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.wxml
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.wxml
@@ -4,6 +4,8 @@
<view slot="header" class="header-title">
<view wx:if="{{tab == 'jsek_cloudLearning'}}">
<t-checkbox icon="rectangle" checked="{{item.checked}}" data-item="{{item}}" bind:change="checkResourceTitle" />
+ <!-- <t-checkbox icon="rectangle" checked="{{true}}" data-item="{{item}}" bind:change="checkResourceTitle" /> -->
+
</view>
<text>{{item.name}}</text>
</view>
@@ -16,7 +18,8 @@
<view class="box-image" style="{{ tab == 'jsek_teachingResources' ? 'width: 350rpx;' : 'width: 450rpx;'}}">
<view class="checkBox" wx:if="{{tab == 'jsek_cloudLearning'}}">
<!-- checked="{{citem.checked}}" -->
- <t-checkbox icon="rectangle" checked="{{citem.checked}}" disabled="{{citem.selectType=='webpage' || citem.isDownload != 1 || citem.fileMap[citem.file].protectType == 'Private'}}" catch:change="checkResource" data-item="{{citem}}" />
+ <!-- <t-checkbox icon="rectangle" checked="{{citem.checked}}" disabled="{{citem.selectType=='webpage' || citem.isDownload != 1 || citem.fileMap[citem.file].protectType == 'Private'}}" catch:change="checkResource" data-item="{{citem}}" /> -->
+ <t-checkbox icon="rectangle" checked="{{citem.checked}}" data-item="{{citem}}" catch:change="checkResource" />
</view>
<!-- 鏁欏璧勬簮鍥炬爣 -->
<view class="teach-icon">
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index 6c00c0f..6231fb5 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -430,11 +430,11 @@
console.log('鏁欏璧勬簮', this.data.teach);
this.findChildIds(this.data.teach, this.data.openTeachids = [])
} else if (type.refCode == 'jsek_cloudLearning') {
- // res.datas.cmsDatas[0].datas.forEach(item => {
- // item.checked = false
- // })
- // const list = await this.getAllResource(res.datas.cmsDatas[0].datas)
- console.log(list, 'currentlist');
+ res.datas.cmsDatas[0].datas.forEach(item => {
+ item.checked = false
+ })
+ const list = await this.getAllResource(res.datas.cmsDatas[0].datas)
+ console.log(list, 'list');
this.setData({
learn: list,
loading: false
@@ -1003,14 +1003,14 @@
async allAddShoppiingCar() {
const child = this.selectComponent('#learn-resource')
const token = wx.getStorageSync('jsek-token')
- if (!token) {
- return wx.getUserProfile({
- desc: '鐢ㄦ埛鐧诲綍',
- success: (res) => {
- console.log(res);
- }
- })
- }
+ // if (!token) {
+ // return wx.getUserProfile({
+ // desc: '鐢ㄦ埛鐧诲綍',
+ // success: (res) => {
+ // console.log(res);
+ // }
+ // })
+ // }
let shopList = this.handleTreeData(this.data.learn).filter((item) => this.resourceIsBuy(item))
this.getShoppingCartProductGet()
if (!shopList.length) return wx.showToast({
@@ -1155,7 +1155,6 @@
})
res = await app.MG.store.initOrder(query)
}
-
if (res.orderNumber && this.data.mockData.price) {
wx.navigateTo({
url: `/pages/cart/paymentPage/index?orderNumber=${res.orderNumber}`,
@@ -1206,11 +1205,16 @@
this.buyBook()
}
else if (this.data.tabValue == 'jsek_cloudLearning') {
- console.log('浜戝涔�');
+ const tree = this.selectComponent('#tree')
+
+ tree.onCloudShoppingCart()
+
+
} else if (this.data.tabValue == 'questionBank') {
this.buyMock()
} else {
console.log(this.data.tabValue);
}
- }
+ },
+
})
diff --git a/packageBookService/pages/bookServices/detail/index.wxml b/packageBookService/pages/bookServices/detail/index.wxml
index 0ad4ec3..b6006bb 100644
--- a/packageBookService/pages/bookServices/detail/index.wxml
+++ b/packageBookService/pages/bookServices/detail/index.wxml
@@ -116,7 +116,7 @@
<t-tab-panel label="浜戝涔�" value="jsek_cloudLearning" style="{{tabPanelstyle}}">
<view wx:if="{{!loading && learn.length}}">
<learn-resource bind:getFreeResource="getFreeResource" bind:allAddShoppiingCar="allAddShoppiingCar" id="learn-resource"></learn-resource>
- <tree bookInfo="{{bookDetail}}" tab="{{tabValue}}" treeList="{{learn}}" buyIds="{{buyIdList}}" openLearnids="{{openLearnids}}"></tree>
+ <tree id="tree" bookInfo="{{bookDetail}}" tab="{{tabValue}}" treeList="{{learn}}" buyIds="{{buyIdList}}" openLearnids="{{openLearnids}}"></tree>
</view>
</t-tab-panel>
<t-tab-panel label="浜戞祴璇�" value="questionBank" style="{{tabPanelstyle}}">
diff --git a/packageBookService/pages/bookServices/detail/index.wxss b/packageBookService/pages/bookServices/detail/index.wxss
index 0a96f52..2287ac5 100644
--- a/packageBookService/pages/bookServices/detail/index.wxss
+++ b/packageBookService/pages/bookServices/detail/index.wxss
@@ -215,7 +215,7 @@
.box-bottom {
position: fixed;
left: 0;
- bottom: 40rpx;
+ bottom: env(safe-area-inset-bottom);
width: 100%;
height: 110rpx;
}
diff --git a/packageBookService/pages/components/webView/index.js b/packageBookService/pages/components/webView/index.js
new file mode 100644
index 0000000..452b945
--- /dev/null
+++ b/packageBookService/pages/components/webView/index.js
@@ -0,0 +1,165 @@
+// packageBookService/pages/components/webView/index.js
+const app = getApp()
+Page({
+
+ /**
+ * 椤甸潰鐨勫垵濮嬫暟鎹�
+ */
+ data: {
+ src: "",
+ link: false,
+ epubObj: null,
+ currentPage: '',
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
+ */
+ onLoad(options) {
+ if (options && options.link) {
+ this.setData({
+ src: decodeURIComponent(options.link),
+ link: options.link ? true : false,
+ })
+ } else {
+ this.setData({
+ epubObj: options,
+ src: ''
+ })
+ if (options) {
+ wx.setNavigationBarTitle({
+ title: options.fileName,
+ })
+ this.getProgress(options)
+ }
+ }
+ },
+
+ onLoadWeb(e) {
+ console.log(e, "load")
+ },
+
+ onError(e) {
+ console.log(e, "err")
+ },
+
+ setWebViewSrc: function (data) {
+ var url = app.config.epubUrl +
+ "?md5=" +
+ data.md5 +
+ "&bookName=" +
+ data.fileName +
+ "&url=" + app.config.requestCtx +
+ "&token=" +
+ wx.getStorageSync(app.config.tokenKey) +
+ "&recordLocation=" +
+ this.data.currentPage
+ this.setData({
+ src: url
+ })
+ },
+
+
+ // 鑾峰彇UserKey
+ getProgress: function (dataObj) {
+ app.MG.identity
+ .getUserKey({
+ domain: "bookReadProgress",
+ keys: [this.data.epubObj.md5],
+ })
+ .then((res) => {
+ if (res.length) {
+ try {
+ this.setData({
+ currentPage: JSON.parse(res[0].value).page,
+ });
+ } catch (error) {
+ this.setData({
+ currentPage: "",
+ });
+ }
+ if (this.data.currentPage > this.data.probationPage) {
+ this.setData({
+ currentPage: "",
+ });
+ }
+ }
+ this.setWebViewSrc(dataObj);
+ });
+ },
+ // 璁剧疆userKey
+ setProgress: function (data) {
+ if (data.page && data.page != this.data.currentPage) {
+ app.MG.identity
+ .setUserKey({
+ setKeyRequests: [{
+ domain: "bookReadProgress",
+ key: this.data.epubObj.md5,
+ value: JSON.stringify(data),
+ },],
+ })
+ .then((res) => { });
+ }
+ },
+
+ drawBack(e) {
+ let {
+ currentLocation,
+ percentage,
+ type
+ } =
+ e.detail.data[0];
+ if (type == "progress" && type != "backDetail") {
+ this.setProgress({
+ page: currentLocation,
+ progress: percentage,
+ });
+ } else if (type == "backDetail") {
+ this.setProgress({
+ page: 1,
+ progress: "0%",
+ });
+ }
+ },
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
+ */
+ onReachBottom() {
+
+ },
+})
\ No newline at end of file
diff --git a/packageBookService/pages/components/webView/index.json b/packageBookService/pages/components/webView/index.json
new file mode 100644
index 0000000..bac3413
--- /dev/null
+++ b/packageBookService/pages/components/webView/index.json
@@ -0,0 +1,4 @@
+{
+ "navigationBarTitleText": "浜笀E璇�",
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/packageBookService/pages/components/webView/index.wxml b/packageBookService/pages/components/webView/index.wxml
new file mode 100644
index 0000000..ec0dfb5
--- /dev/null
+++ b/packageBookService/pages/components/webView/index.wxml
@@ -0,0 +1,4 @@
+<!--packageBookService/pages/components/webView/index.wxml-->
+<view class="page-body">
+ <web-view bind:message="drawBack" binderror="onError" bindload="onLoadWeb" src="{{src}}"></web-view>
+</view>
\ No newline at end of file
diff --git a/packageBookService/pages/components/webView/index.wxss b/packageBookService/pages/components/webView/index.wxss
new file mode 100644
index 0000000..2a6a458
--- /dev/null
+++ b/packageBookService/pages/components/webView/index.wxss
@@ -0,0 +1,6 @@
+/* packageBookService/pages/components/webView/index.wxss */
+.page-body {
+ width: 100vw;
+ height: calc(100vh - env(safe-area-inset-bottom));
+ overflow: hidden;
+}
\ No newline at end of file
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.js b/packageDomain/pages/resourceDetails/myAudio/index.js
index 4a6103d..a15fcb2 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.js
+++ b/packageDomain/pages/resourceDetails/myAudio/index.js
@@ -7,6 +7,7 @@
* 椤甸潰鐨勫垵濮嬫暟鎹�
*/
data: {
+ showDropdown: false,
noteList: [],
navBarHeight: '',
barHeight: '',
@@ -521,7 +522,7 @@
myAudio.onCanplay(() => {
myAudio.duration; //蹇呴』鍐欙紝涓嶇劧鑾峰彇涓嶅埌銆傘�傘��
setTimeout(() => {
- console.log(myAudio.duration);
+ console.log(myAudio.duration, 'myAudio.duration');
this.setData({
myAudioDuration: this.format(myAudio.duration),
myAudioCurrent: this.format(myAudio.currentTime)
@@ -665,7 +666,36 @@
myAudioPos: position,
myAudioCurrent: this.format(currentTime)
})
+ },
+
+
+ toggleDropdown() {
+ this.setData({
+ showDropdown: !this.data.showDropdown
+ });
+ },
+ smallSpeed() {
+ this.setData({
+ speed: 0.5,
+ showDropdown: !this.data.showDropdown
+ })
+ },
+ centreSpeed() {
+ this.setData({
+ speed: 1.5,
+ showDropdown: !this.data.showDropdown
+ })
+ },
+ bigSpeed() {
+ this.setData({
+ speed: 2,
+ showDropdown: !this.data.showDropdown
+ })
+ },
+ smallSpeeDmultiple() {
+ this.setData({
+ speed: 1,
+ showDropdown: !this.data.showDropdown
+ })
}
-
-
})
\ No newline at end of file
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.json b/packageDomain/pages/resourceDetails/myAudio/index.json
index 60b450d..f4a9b39 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.json
+++ b/packageDomain/pages/resourceDetails/myAudio/index.json
@@ -13,7 +13,9 @@
"t-textarea": "tdesign-miniprogram/textarea/textarea",
"t-loading": "tdesign-miniprogram/loading/loading",
"t-popup": "tdesign-miniprogram/popup/popup",
- "t-slider": "tdesign-miniprogram/slider/slider"
+ "t-slider": "tdesign-miniprogram/slider/slider",
+ "t-dropdown-menu": "tdesign-miniprogram/dropdown-menu/dropdown-menu",
+ "t-dropdown-item": "tdesign-miniprogram/dropdown-item/dropdown-item"
},
"navigationStyle": "custom"
}
\ No newline at end of file
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.wxml b/packageDomain/pages/resourceDetails/myAudio/index.wxml
index 4fe7b87..ac2c8b6 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.wxml
+++ b/packageDomain/pages/resourceDetails/myAudio/index.wxml
@@ -9,15 +9,13 @@
+
<view class="audioPlayerBox">
<view class="audioBackground" style="background-image: url('/static/images/resourceDetailsMyAudio/video-bg.png');">
-
<image src="/static/images/resourceDetailsMyAudio/cd.png" alt="" />
</view>
<!-- 瑙嗛鎾斁鐨勬寜閽� -->
<view class="bigFunctionBox">
-
-
<view class="functionBox">
<!-- 宸﹀垏鎹� -->
<!-- <view class="leftSwitchBox color" bind:tap="onLeftSwitch">
@@ -44,19 +42,29 @@
<view class="color" style="margin: 0 10rpx;">/</view>
<view class="duration-time color"> {{myAudioDuration}} </view>
- <view class="publicBtn color" style="margin-left:40rpx ; width: 80rpx;" bind:tap="onSpeed">
- <text class="publicText">{{"x "+speed}}</text>
+ <!-- bind:tap="onSpeed" -->
+ <view class="publicBtn color">
+ <view class="publicText" bind:tap="toggleDropdown">
+ <view>
+ {{"x "+speed}}
+ </view>
+ <t-icon style="margin-top: 10rpx;" wx:if="{{showDropdown}}" name="caret-up-small" size="14" bind:click="onIconTap" />
+ <t-icon style="margin-top: 10rpx;" wx:else name="caret-down-small" size="14" bind:click="onIconTap" />
+ </view>
+ <view class="multipleBox" wx:if="{{showDropdown}}">
+ <view wx:if="{{speed != 0.5}}" style="margin: 5rpx 0;" bind:tap="smallSpeed">x0.5</view>
+ <view wx:if="{{speed != 1}}" style="margin: 5rpx 0;" bind:tap="smallSpeeDmultiple">x1</view>
+ <view wx:if="{{speed != 1.5}}" style="margin: 5rpx 0;" bind:tap="centreSpeed">x1.5</view>
+ <view wx:if="{{speed != 2}}" style="margin: 5rpx 0;" bind:tap="bigSpeed">x2</view>
+ </view>
</view>
</view>
</view>
-
-
</view>
<!-- 鏍囬 -->
<view class="titleBox">{{titleName}}</view>
-
<view class="contentBox">
<t-tabs defaultValue="{{0}}" bind:change="onTabsChange" bind:click="onTabsClick" t-class="custom-tabs" t-class-content="custom-panel">
<!-- 璧勬簮鍒楄〃 -->
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.wxss b/packageDomain/pages/resourceDetails/myAudio/index.wxss
index 888d2cf..1e73f88 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.wxss
+++ b/packageDomain/pages/resourceDetails/myAudio/index.wxss
@@ -269,7 +269,10 @@
.audioBackground {
flex: 1;
- background-size: 100% 110%;
+ /* background-image: no-repeat; */
+ background-repeat: no-repeat;
+ background-position: center center;
+ background-size: 100% 100%;
background-color: #f9f9f9;
display: flex;
justify-content: center;
@@ -311,7 +314,6 @@
.t-tabs__item--active {
color: #FF6C00 !important;
-
}
.t-tabs__track {
@@ -320,4 +322,31 @@
.audioIconBox {
/* margin-top: 10rpx; */
+}
+
+.publicBtn {
+ margin-right: 10rpx;
+ /* margin-left: 40rpx; */
+ margin-left: 20rpx;
+ width: 120rpx;
+ position: relative;
+}
+
+.multipleBox {
+ position: absolute;
+ /* top: 0; */
+ bottom: 60rpx;
+ right: 10rpx;
+ background-color: #000;
+ padding: 15rpx;
+ font-size: 25rpx;
+ /* padding-bottom: 100rpx; */
+
+}
+
+
+
+.publicText {
+ display: flex;
+
}
\ No newline at end of file
diff --git a/packagePersonal/pages/userSetting/index.js b/packagePersonal/pages/userSetting/index.js
index 110615f..3f131a4 100644
--- a/packagePersonal/pages/userSetting/index.js
+++ b/packagePersonal/pages/userSetting/index.js
@@ -1,18 +1,22 @@
-// packagePersonal/pages/userSetting/index.js
+const app = getApp()
Page({
/**
* 椤甸潰鐨勫垵濮嬫暟鎹�
*/
data: {
-
+ userInfo: {},
+ defaultAvatarUrl: 'https://cdn-we-retail.ym.tencent.com/miniapp/usercenter/icon-user-center-avatar@2x.png',
+ visible: false
},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
- onLoad(options) {
-
+ onLoad() {
+ if (wx.getStorageSync(app.config.tokenKey)) {
+ this.getUserInfo()
+ }
},
/**
@@ -28,19 +32,52 @@
onShow() {
},
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
- */
- onHide() {
-
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
- */
- onUnload() {
-
+ // 鑾峰彇鐧诲綍鐢ㄦ埛韬唤
+ getUserInfo() {
+ app.MG.identity.getCurrentAppUser().then(res => {
+ // 鐢ㄦ埛淇℃伅浼樺厛绾э細鏁欏笀璁よ瘉 > 寰俊 > 瀛︾敓锛堟敞鍐屾椂榛樿锛�
+ if (res) {
+ let defaultUser = {};
+ let teacherRole = res.roleLinks.find((item) => item.role.refCode == 'teacher')
+ let teacherInfos = res.infoList.find((item) => item.type == 'teacherInfo')
+ let secretData = res.secretList.find(i => i.type == 'LoginNameAndPassword')
+ let WeChatInfo = res.infoList.find((item) => item.type === "WeChat");
+ let phoneInfo = res.secretList.find((item) => item.type == 'MobilePhone')
+ let emailInfo = res.secretList.find((item) => item.type == 'EMail')
+ if (teacherRole && teacherInfos) {
+ defaultUser = {
+ ...teacherInfos,
+ fullName: teacherInfos.fullName,
+ icon: teacherInfos.icon,
+ userId: res.userId,
+ role: 'Teacher',
+ roleId: teacherRole.role.id,
+ phoneNumber: phoneInfo?.credential,
+ Email: emailInfo ? emailInfo.credential : JSON.parse(teacherInfos.data).email
+ }
+ } else if (WeChatInfo) {
+ defaultUser = {
+ ...WeChatInfo,
+ fullName: WeChatInfo.name,
+ icon: WeChatInfo.icon,
+ userId: res.userId,
+ phoneNumber: phoneInfo?.credential,
+ Email: emailInfo?.credential
+ }
+ } else if (secretData) {
+ defaultUser = {
+ fullName: secretData.credential,
+ icon: "",
+ userId: res.userId,
+ phoneNumber: phoneInfo?.credential,
+ Email: emailInfo?.credential
+ }
+ }
+ this.setData({
+ userInfo: defaultUser
+ })
+ }
+ });
},
/**
diff --git a/packagePersonal/pages/userSetting/index.json b/packagePersonal/pages/userSetting/index.json
index 8835af0..5ce906a 100644
--- a/packagePersonal/pages/userSetting/index.json
+++ b/packagePersonal/pages/userSetting/index.json
@@ -1,3 +1,7 @@
{
- "usingComponents": {}
+ "navigationBarTitleText": "璁剧疆",
+ "usingComponents": {
+ "t-icon": "tdesign-miniprogram/icon/icon",
+ "t-avatar": "tdesign-miniprogram/avatar/avatar"
+ }
}
\ No newline at end of file
diff --git a/packagePersonal/pages/userSetting/index.wxml b/packagePersonal/pages/userSetting/index.wxml
index 1b6bbbf..52ab0e9 100644
--- a/packagePersonal/pages/userSetting/index.wxml
+++ b/packagePersonal/pages/userSetting/index.wxml
@@ -1,2 +1,40 @@
-<!--packagePersonal/pages/userSetting/index.wxml-->
-<text>packagePersonal/pages/userSetting/index.wxml</text>
+<view class="container">
+ <view class="itemList">
+ <view class="label">澶村儚</view>
+ <view class="contentImg">
+ <t-avatar image="{{defaultAvatarUrl}}" class="user-center-card__header__avatar" />
+ </view>
+ <t-icon name="chevron-right" size="40rpx" color="#C2C2C2" />
+ </view>
+ <view class="itemList">
+ <view class="label">鐢ㄦ埛鍚�</view>
+ <view class="content">{{userInfo.fullName || '寰俊鐢ㄦ埛'}}</view>
+ <t-icon name="chevron-right" size="40rpx" color="#C2C2C2" />
+ </view>
+ <view class="itemList">
+ <view class="label">鎵嬫満鍙风爜</view>
+ <view class="content">{{userInfo.phoneNumber || '鏈粦瀹氭墜鏈哄彿'}}</view>
+ <t-icon name="chevron-right" size="40rpx" color="#C2C2C2" />
+ </view>
+ <view class="itemList">
+ <view class="label">閭</view>
+ <view class="content">{{userInfo.Email}}</view>
+ <t-icon name="chevron-right" size="40rpx" color="#C2C2C2" />
+ </view>
+</view>
+<t-popup visible="{{visible}}" bind:visible-change="onVisibleChange" placement="bottom">
+ <view class="block">
+ <view class="header">
+ <view class="title">璇烽�夋嫨鎮ㄧ殑鐢ㄦ埛绫诲瀷</view>
+ </view>
+ <view class="body">
+
+ <view wx:for="{{userTypeList}}" wx:for-item="item" wx:for-index="index" wx:key="index" data-info="{{item}}" bindtap="tabUserTypeClick" class="{{item.value === userTypeActive ? 'activeItem item' : 'item'}}">
+ {{ item.lable }}
+ </view>
+ </view>
+ <view class="footer">
+ <button class="submit" bindtap="submit">纭畾</button>
+ </view>
+ </view>
+</t-popup>
\ No newline at end of file
diff --git a/packagePersonal/pages/userSetting/index.wxss b/packagePersonal/pages/userSetting/index.wxss
index 42e75dd..31d6148 100644
--- a/packagePersonal/pages/userSetting/index.wxss
+++ b/packagePersonal/pages/userSetting/index.wxss
@@ -1 +1,37 @@
-/* packagePersonal/pages/userSetting/index.wxss */
\ No newline at end of file
+.container {
+ padding: 20rpx 0;
+}
+
+.itemList {
+ border-bottom: 2rpx solid #E9E9E9;
+ padding: 30rpx;
+ display: flex;
+ /* height: 120rpx; */
+ align-items: center;
+ justify-content: space-between !important;
+}
+
+.label {
+ font-weight: bold;
+ width: 180rpx;
+}
+
+.contentImg {
+ height: 120rpx;
+ width: 120rpx;
+ flex: 1;
+ text-align: right;
+ margin-right: 20rpx;
+}
+
+.user-center-card__header__avatar {
+ width: 120rpx;
+ height: 120rpx;
+ border-radius: 48rpx;
+ overflow: hidden;
+}
+
+.content {
+ flex: 1;
+ color: #5C5C5C;
+}
\ No newline at end of file
diff --git a/pages/bookExhibitionList/index.js b/pages/bookExhibitionList/index.js
index c1e3eaa..032e4a3 100644
--- a/pages/bookExhibitionList/index.js
+++ b/pages/bookExhibitionList/index.js
@@ -143,7 +143,10 @@
onPullDownRefresh() {
},
-
+ onPullDownRefresh() {
+ this.data.page.size = 16 //鏇存敼鏄剧ず鐨勫��
+ this.bookExhibitionGet(); // 璋冪敤鏂规硶鍔犺浇鏇村鏁版嵁
+ },
/**
* 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
*/
@@ -169,7 +172,7 @@
'page.size': newSize
});
this.bookExhibitionGet(); // 璋冪敤鏂规硶鍔犺浇鏇村鏁版嵁
- console.log(1111);
+
}
diff --git a/pages/bookExhibitionList/index.json b/pages/bookExhibitionList/index.json
index 0b56ca0..2a46042 100644
--- a/pages/bookExhibitionList/index.json
+++ b/pages/bookExhibitionList/index.json
@@ -9,5 +9,6 @@
"t-icon": "tdesign-miniprogram/icon/icon"
},
"onReachBottomDistance": 200,
- "navigationStyle": "custom"
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": true
}
\ No newline at end of file
diff --git a/pages/bookExhibitionList/index.wxml b/pages/bookExhibitionList/index.wxml
index e58ac3a..77fa0f8 100644
--- a/pages/bookExhibitionList/index.wxml
+++ b/pages/bookExhibitionList/index.wxml
@@ -23,13 +23,19 @@
</t-dropdown-menu>
- <view class="sortBox" bind:tap="onSwapRight">
- <text>鎺掑簭</text>
- <view class="iconBox">
- <t-icon class="swapRight" name="swap-right" size="35rpx" color="{{nameSort == 'Asc' ? '#ff6c00' : ''}}" />
- <t-icon class="swapLeft" name="swap-right" size="35rpx" color="{{nameSort == 'Desc' ? '#ff6c00' : ''}}" />
+
+
+
+ <view class="outsideSortBox">
+ <view class="sortBox" bind:tap="onSwapRight">
+ <text>鎺掑簭</text>
+ <view class="iconBox">
+ <t-icon class="swapRight" name="swap-right" size="35rpx" color="{{nameSort == 'Asc' ? '#ff6c00' : ''}}" />
+ <t-icon class="swapLeft" name="swap-right" size="35rpx" color="{{nameSort == 'Desc' ? '#ff6c00' : ''}}" />
+ </view>
</view>
</view>
+
</view>
<view class="assembleContent">
diff --git a/pages/bookExhibitionList/index.wxss b/pages/bookExhibitionList/index.wxss
index 4a267d8..7d917bb 100644
--- a/pages/bookExhibitionList/index.wxss
+++ b/pages/bookExhibitionList/index.wxss
@@ -63,6 +63,7 @@
/* width: 300px; */
background-color: #fff;
/* padding: 16rpx 32rpx; */
+
}
.iconBox {
@@ -81,15 +82,27 @@
.sortBox {
color: #999999;
display: flex;
- /* border-bottom: 1px #ededed solid; */
align-items: center;
height: 86rpx;
width: 195rpx;
margin-top: 8rpx;
- font-size: 30rpx;
+ font-size: 25rpx;
}
+.outsideSortBox {
+ width: 96rpx;
+ height: 95rpx;
+ margin: 0 15rpx;
+ box-shadow: 0px 0px 1px 0px rgba(0, 0, 0, 0.16);
+ padding: 0 10rpx;
+}
+.sortBox text {
+ font-family: PingFang SC, PingFang SC;
+ font-weight: 400;
+ font-size: 25rpx;
+ color: #999999;
+}
.titleBox {
display: flex;
@@ -104,31 +117,92 @@
height: 54rpx;
background: #FF6C00;
border-radius: 0rpx 9rpx 9rpx 0rpx;
-
}
.titleTextBox {
-
margin-left: 5px;
-
width: 150rpx;
height: 37rpx;
-
-
}
.classification {
width: 550rpx;
- /* margin-bottom: 50rpx; */
-
+ margin: 0 30rpx;
}
.menuBox {
display: flex;
height: 75rpx;
-
}
.assembleContent {
background-color: #F2F3F8;
-}
\ No newline at end of file
+}
+
+/* .t-dropdown-menu__item--active {
+ color: #0F1214;
+} */
+
+.t-dropdown-menu:after,
+.t-dropdown-menu::after {
+ height: 0px;
+}
+
+
+.t-dropdown-item__body,
+.t-dropdown-item__footer,
+.t-radio {
+ background: #F6F6F6 !important;
+}
+
+.t-dropdown-item__body {
+ padding: 40rpx 0;
+}
+
+.t-dropdown-menu__item {
+ margin: 10rpx 10rpx 0 10rpx;
+ border-radius: 40rpx;
+ height: 68rpx;
+ background: #F6F6F6 !important;
+}
+
+.t-dropdown-menu__item--active {
+ height: 68rpx !important;
+ background: #F6F6F6 !important;
+ /* border-radius: 40rpx 40rpx 0 0; */
+}
+
+.t-dropdown-menu__item--active,
+.t-radio__icon--checked,
+.t-checkbox__icon--checked {
+ color: #FF6C00 !important
+}
+
+.t-checkbox__icon--disabled {
+ color: #c0c4cc !important;
+}
+
+.t-radio--block {
+ padding: 20rpx !important;
+}
+
+.t-radio__border {
+ height: 0 !important;
+}
+
+/* .t-button--primary {
+ color: #fff !important;
+ background-color: #FF6C00 !important;
+
+}
+
+.t-button--light {
+ color: #fff !important;
+ /* background-color: #FF6C00 !important; */
+/* } */
+
+/* .menu--t-dropdown-menu::after {
+ background-color: var(--td-component-border, var(--td-gray-color-4, #fff)) !important;
+
+}
+ */
\ No newline at end of file
diff --git a/pages/cart/index.js b/pages/cart/index.js
index 98123d1..16c1922 100644
--- a/pages/cart/index.js
+++ b/pages/cart/index.js
@@ -20,7 +20,9 @@
});
this.shoppingCartGet();
},
-
+ onShow() {
+ this.shoppingCartGet();
+ },
onDelete(e) {
const item = e.currentTarget.dataset.item;
app.MG.store.delShoppingCart({
@@ -125,5 +127,10 @@
direction: 'column',
});
}
+ },
+ onLogin() {
+ wx.navigateTo({
+ url: '/pages/testLogin/index'
+ });
}
});
diff --git a/pages/cart/index.wxml b/pages/cart/index.wxml
index ef02555..7642960 100644
--- a/pages/cart/index.wxml
+++ b/pages/cart/index.wxml
@@ -1,10 +1,14 @@
<view class="outsideContentBox">
<!-- <checkbox-group bindchange="HandelItemChange"> -->
- <view wx:if="{{!shoppingCartData}}" class="noDataBox">
+ <view wx:if="{{shoppingCartData.length <= 0}}" class="noDataBox">
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" font-size="80" />
-
</view>
+ <!-- <button bind:tap="onLogin"> 鍘荤櫥褰�</button> -->
<t-swipe-cell wx:for="{{shoppingCartData}}" wx:key="index" wx:for-item="item" wx:for-index="index">
+
+
+
+
<!-- <view class="contentBox"> -->
<!-- <view class="contentCheckbox">
<checkbox value="{{item.id}}" checked="{{item.checked}}"></checkbox>
@@ -42,6 +46,7 @@
</view>
<view slot="right" class="btn delete-btn" bind:tap="onDelete" data-item="{{item}}">鍒犻櫎</view>
</t-swipe-cell>
+
</view>
<view class="bottomBox">
diff --git a/pages/cart/index.wxss b/pages/cart/index.wxss
index d83487e..5661723 100644
--- a/pages/cart/index.wxss
+++ b/pages/cart/index.wxss
@@ -33,14 +33,12 @@
}
.bottomBox {
- background-color: #0052d9;
position: fixed;
- bottom: 0;
+ /* bottom: 0; */
left: 0;
right: 0;
-
- padding-bottom: 53px;
- height: 112rpx;
+ bottom: calc(env(safe-area-inset-bottom) + 112rpx);
+ height: 120rpx;
background: #FFFFFF;
box-shadow: 0rpx -2rpx 0rpx 2rpx rgba(0, 0, 0, 0.08);
display: flex;
diff --git a/pages/cart/paymentPage/index.js b/pages/cart/paymentPage/index.js
index fcad534..739a4c7 100644
--- a/pages/cart/paymentPage/index.js
+++ b/pages/cart/paymentPage/index.js
@@ -15,20 +15,13 @@
purchasedIds: [],
productList: [],
payPrice: '',
- drawQrcodeText: 'https://www.baidu.com/',
orderGoods: '',
-
-
- confirmBtn: { content: '纭畾', variant: 'base' },
- dialogKey: 'false',
-
},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad(options) {
-
const systInfo = wx.getSystemInfoSync();
const menu = wx.getMenuButtonBoundingClientRect(); // 鑳跺泭淇℃伅
const navBarHeight = (menu.top - systInfo.statusBarHeight) * 2 + menu.height; // 瀵艰埅鏍忛珮搴�
@@ -39,44 +32,7 @@
selectedIds: options.selectedIds
})
console.log('鎺ユ敹鍒扮殑璁㈠崟鍙�:', this.data.orderNumber);
-
-
this.getOrderByOrderNum()
-
-
-
-
- drawQrcode({
-
- width: 200, // 蹇呴』锛屼簩缁寸爜瀹藉害锛屼笌canvas鐨剋idth淇濇寔涓�鑷�
-
- height: 200, // 蹇呴』锛屼簩缁寸爜楂樺害锛屼笌canvas鐨刪eight淇濇寔涓�鑷�
-
- canvasId: 'myQrcode',
-
- background: '#ffffff', // 闈炲繀椤伙紝浜岀淮鐮佽儗鏅鑹诧紝榛樿鍊肩櫧鑹�
-
- foreground: '#2bb15e', // 闈炲繀椤伙紝浜岀淮鐮佸墠鏅壊锛岄粯璁ゅ�奸粦鑹� '#000000'
-
- // ctx: wx.createCanvasContext('myQrcode'), // 闈炲繀椤伙紝缁樺浘涓婁笅鏂囷紝鍙�氳繃 wx.createCanvasContext('canvasId') 鑾峰彇锛寁1.0.0+鐗堟湰鏀寔
-
- text: this.data.drawQrcodeText, // 蹇呴』锛屼簩缁寸爜鍐呭
- // v1.0.0+鐗堟湰鏀寔鍦ㄤ簩缁寸爜涓婄粯鍒跺浘鐗�
-
- image: {
- // imageResource: '../../images/icon.png', // 鎸囧畾浜岀淮鐮佸皬鍥炬爣
- dx: 70,
- dy: 70,
- dWidth: 60,
- dHeight: 60
- }
- })
-
-
-
-
-
-
},
/**
@@ -171,32 +127,20 @@
orderNum: this.data.orderGoods
}
app.MG.store.confirmOrder(query).then(res => {
- this.makeWeChatQrPayGet()
+ console.log(res.orderNumber, 'res');
+ if (res.orderNumber) {
+ const resOrderNum = {
+ orderNum: res.orderNumber,
+ };
+
+ // 鐢ㄦ埛鏈粦瀹氬井淇� 鎶�500
+ app.MG.store.makeWeChatPay(resOrderNum).then(payRes => {
+ const payVal = JSON.parse(payRes);
+ console.log(payVal);
+ })
+ }
+ // this.makeWeChatQrPayGet()
})
// 璋冨彇寰俊浜岀淮鐮佹敮浠�
-
},
- // 璋冨彇寰俊浜岀淮鐮佹敮浠�
- makeWeChatQrPayGet() {
- let query = {
- orderNum: this.data.orderGoods
- }
- app.MG.store.makeWeChatQrPay(query).then((res) => {
-
- this.setData({
- drawQrcodeText: res
- })
- this.data.dialogKey = true
- console.log(this.data.drawQrcodeText, 'drawQrcodeText');
- })
- },
- showDialog(e) {
- const { key } = e.currentTarget.dataset;
- this.setData({ [key]: true, dialogKey: key });
- },
- closeDialog() {
- const { dialogKey } = this.data;
- this.setData({ [dialogKey]: false });
- },
-
})
\ No newline at end of file
diff --git a/pages/cart/paymentPage/index.wxml b/pages/cart/paymentPage/index.wxml
index f92e232..2abb441 100644
--- a/pages/cart/paymentPage/index.wxml
+++ b/pages/cart/paymentPage/index.wxml
@@ -11,14 +11,7 @@
<view class="paymentPageBox">
<view class="content">
- <t-dialog visible="{{showCloseBtn}}" close-btn bind:confirm="closeDialog" bind:cancel="closeDialog">
- <view slot="content" class="slotContent">
- <view class="myQrcodeBox">
- <canvas style="width: 200px; height: 200px;margin:0 auto" canvas-id="myQrcode"></canvas>
- <view class="myQrcodeTextBox">寰俊鎵爜鏀粯</view>
- </view>
- </view>
- </t-dialog>
+
<view class="shoppingCartList">
<view class="cartList" wx:for="{{productList}}" wx:key="index" wx:for-item="item" wx:for-index="index">
<view class="imageBox">
diff --git a/pages/home/home.js b/pages/home/home.js
index f534823..2105851 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -533,6 +533,7 @@
})
- }
+ },
+
});
diff --git a/pages/home/home.wxml b/pages/home/home.wxml
index baecdb0..ec9da0d 100644
--- a/pages/home/home.wxml
+++ b/pages/home/home.wxml
@@ -1,3 +1,8 @@
+
+
+
+
+
<view style="text-align: center; color: #b9b9b9" wx:if="{{pageLoading}}">
<t-loading theme="circular" size="40rpx" text="鍔犺浇涓�..." inherit-color />
</view>
diff --git a/pages/personalCenter/index.js b/pages/personalCenter/index.js
index 1ecdbf5..f4dfc6b 100644
--- a/pages/personalCenter/index.js
+++ b/pages/personalCenter/index.js
@@ -167,7 +167,9 @@
let userTypeData = res.infoList.find((item) => item.type == 'userType')
let type = "";
if (userTypeData) {
- this.data.userTypeActive = JSON.parse(userTypeData.data).userType;
+ this.setData({
+ userTypeActive: JSON.parse(userTypeData.data).userType,
+ });
type = userTypeList.find((item) => item.value === this.data.userTypeActive)?.lable;
} else {
type = '-'
@@ -250,7 +252,6 @@
},
//淇敼鐢ㄦ埛绫诲瀷
editUserType() {
- console.log(44)
if (!this.data.visible) {
this.setData({
visible: true,
@@ -261,6 +262,37 @@
this.setData({
visible: e.detail.visible,
});
+ },
+ tabUserTypeClick(e) {
+ console.log(e)
+ let { info } = e.currentTarget.dataset;
+ this.setData({
+ userTypeActive: info.value,
+ });
+ },
+ submit() {
+ let userTypeInfo = {
+ requests: [
+ {
+ data: JSON.stringify({ userType: this.data.userTypeActive }),
+ name: '鐢ㄦ埛绫诲瀷',
+ type: 'userType'
+ }
+ ]
+ }
+ app.MG.identity.setAppUserInfo(userTypeInfo).then((res) => {
+ if (res) {
+ wx.showToast({
+ title: "淇敼鎴愬姛",
+ icon: 'success',
+ duration: 1000,
+ })
+ this.getUserInfo()
+ this.setData({
+ visible: false,
+ });
+ }
+ })
},
//璁剧疆
gotoUserEditPage() {
@@ -292,8 +324,4 @@
onShareAppMessage() {
},
- //璺宠浆鍏充簬鎴戜滑鍜岃仈绯绘垜浠�
- onAboutUS() {
- console.log(111);
- }
})
\ No newline at end of file
diff --git a/pages/personalCenter/index.wxml b/pages/personalCenter/index.wxml
index e5396f0..4a4b851 100644
--- a/pages/personalCenter/index.wxml
+++ b/pages/personalCenter/index.wxml
@@ -33,7 +33,7 @@
<view class="domainList">
<view wx:for="{{menuData}}" wx:for-item="item" wx:for-index="index" wx:key="index" bindtap="toPages" data-info="{{item}}" class="listItem">
<view class="icon">
- <t-image src="{{item.icon}}" mode="heightFix" class="img" />
+ <image src="{{item.icon}}" mode="aspectFit" class="img" />
</view>
<view class="label">
<text>{{item.title}}</text>
@@ -48,7 +48,7 @@
<view class="domainList1">
<view wx:for="{{moreMenu}}" wx:for-item="item" wx:for-index="index" wx:key="index" bindtap="toPages" data-info="{{item}}" class="listItem">
<view class="icon">
- <t-image src="{{item.icon}}" mode="heightFix" class="img" />
+ <image src="{{item.icon}}" mode="aspectFit" class="img" />
</view>
<view class="label">
<text>{{item.title}}</text>
@@ -58,7 +58,7 @@
<view class="domainList2">
<view wx:for="{{moreMenu1}}" wx:for-item="item" wx:for-index="index" wx:key="index" bindtap="toPages" data-info="{{item}}" class="listItem">
<view class="icon">
- <t-image src="{{item.icon}}" mode="heightFix" class="img" />
+ <image src="{{item.icon}}" mode="aspectFit" class="img" />
</view>
<view class="label">
<text>{{item.title}}</text>
@@ -73,12 +73,13 @@
<view class="title">璇烽�夋嫨鎮ㄧ殑鐢ㄦ埛绫诲瀷</view>
</view>
<view class="body">
- <view wx:for="{{userTypeList}}" wx:for-item="item" wx:for-index="index" wx:key="index" data-info="{{item}}" bindtap="tabUserTypeClick" :class="item.value == userTypeActive ? 'activeItem item hover' : 'item hover'">
+
+ <view wx:for="{{userTypeList}}" wx:for-item="item" wx:for-index="index" wx:key="index" data-info="{{item}}" bindtap="tabUserTypeClick" class="{{item.value === userTypeActive ? 'activeItem item' : 'item'}}">
{{ item.lable }}
</view>
</view>
<view class="footer">
- <button class="submit" bindtap="submit">鎻愪氦</button>
+ <button class="submit" bindtap="submit">纭畾</button>
</view>
</view>
</t-popup>
diff --git a/pages/personalCenter/index.wxss b/pages/personalCenter/index.wxss
index 058000d..e3c23ce 100644
--- a/pages/personalCenter/index.wxss
+++ b/pages/personalCenter/index.wxss
@@ -122,12 +122,14 @@
width: 46rpx;
height: 46rpx;
margin: 0 auto;
+ display: flex;
}
-.listItem .icon .t-image {
- width: 100%;
+
+.listItem .icon .img {
+ /* width: 100%; */
height: 100%;
- object-fit: contain;
+
}
.listItem .label {
@@ -140,21 +142,53 @@
.block {
width: 100vw;
- height: 240px;
background: #fff;
border-top-left-radius: 16rpx;
border-top-right-radius: 16rpx;
}
-.header {
+.block .header {
display: flex;
align-items: center;
height: 116rpx;
}
-.title {
+.block .title {
flex: 1;
text-align: center;
font-weight: 600;
font-size: 36rpx;
+}
+
+.block .body {
+ padding: 0 20rpx;
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-between;
+}
+
+.item {
+ width: calc(100%/2 - 30rpx);
+ text-align: center;
+ padding: 30rpx 0;
+ margin: 0 10rpx 20rpx 10rpx;
+ background: #F9F9F9;
+ border: 4rpx solid #F9F9F9;
+ border-radius: 10rpx;
+}
+
+.activeItem {
+ border: 4rpx solid #ff6c00;
+ background: #fff;
+}
+
+.footer {
+ width: 80%;
+ margin: 10rpx auto;
+}
+
+.submit {
+ background: #ff6c00;
+ color: #fff;
+ border-radius: 50rpx;
}
\ No newline at end of file
diff --git a/pages/retrievalPage/index.js b/pages/retrievalPage/index.js
index e2ff6dd..e5e7d1c 100644
--- a/pages/retrievalPage/index.js
+++ b/pages/retrievalPage/index.js
@@ -433,7 +433,6 @@
datas5.forEach((items) => {
items.subtitleName = items.subtitle + items.name
-
})
console.log(datas5, 'sadasd');
this.setData({
@@ -490,10 +489,10 @@
downloadData(event) {
console.log(111);
const item = event.currentTarget.dataset.item;
- // console.log(item.datas.freeFile.searchVal);
- const URL = 'http://182.92.203.7:3001/file/api/ApiDownload?md5=' + item.datas.freeFile.searchVal
+ // console.log(item.datas.freeFile.Value);
+ const URL = app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.datas.freeFile.Value
item.determine = false
-
+ console.log(URL, 'URL');
setTimeout(() => {
if (URL) {
item.determine = true
@@ -531,6 +530,23 @@
})
- }
+ },
+ onBookExhibitionDetails(e) {
+ console.log(e.currentTarget.dataset.item);
+ const item = e.currentTarget.dataset.item
+
+ wx.navigateTo({
+ url: '/pages/bookExhibitionDetails/index?id=' + item.id + '&bookName=' + item.name // 鍋囪璺宠浆鍒拌鎯呴〉闈紝骞朵紶閫掍簡id鍙傛暟
+ });
+ },
+ //瑙﹀簳鍑芥暟
+ onReachBottom() {
+ console.log("涓婃媺鍔犺浇....");
+ },
+ //涓婃媺鍑芥暟
+ onPullDownRefresh() {
+ console.log("涓嬫媺鍒锋柊...");
+ },
+
})
\ No newline at end of file
diff --git a/pages/retrievalPage/index.json b/pages/retrievalPage/index.json
index 3c65fd8..fa9fab5 100644
--- a/pages/retrievalPage/index.json
+++ b/pages/retrievalPage/index.json
@@ -4,7 +4,9 @@
"t-icon": "tdesign-miniprogram/icon/icon",
"t-search": "tdesign-miniprogram/search/search",
"t-tabs": "tdesign-miniprogram/tabs/tabs",
- "t-tab-panel": "tdesign-miniprogram/tab-panel/tab-panel"
+ "t-tab-panel": "tdesign-miniprogram/tab-panel/tab-panel",
+ "t-empty": "tdesign-miniprogram/empty/empty"
},
- "navigationStyle": "custom"
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": true
}
\ No newline at end of file
diff --git a/pages/retrievalPage/index.wxml b/pages/retrievalPage/index.wxml
index ab0107a..c36c3f5 100644
--- a/pages/retrievalPage/index.wxml
+++ b/pages/retrievalPage/index.wxml
@@ -20,6 +20,9 @@
<t-tabs defaultValue="{{0}}" bind:change="onTabsChange" bind:click="onTabsClick" t-class="custom-tabs" t-class-content="custom-panel">
<t-tab-panel label="鍥句功({{bookTotal}})" value="0">
<view class="bookDataBox">
+ <view wx:if="{{bookData.length <= 0}}" class="noDataBox">
+ <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
+ </view>
<view class="bookDataForBox" wx:for="{{bookData}}" wx:key="index" wx:for-item="item" wx:for-index="index" data-item="{{item}}" bind:tap="onBook">
@@ -41,6 +44,9 @@
<view class="listBox1">
+ <view wx:if="{{courseData.length <= 0}}" class="noDataBox">
+ <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
+ </view>
<view wx:if="{{courseData.length>0}}">
<view wx:for="{{courseData}}" wx:for-item="item" wx:for-index="index" wx:key="index" bindtap="toList" data-info="{{item}}" class="listItemBox">
<view class="listItem flex">
@@ -62,9 +68,7 @@
</view>
</view>
</view>
- <view class="empyt" wx:else>
- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" font-size="80" />
- </view>
+
</view>
@@ -76,7 +80,9 @@
<view class="bookDataBox">
-
+ <view wx:if="{{digitalTextbooksData.length <= 0}}" class="noDataBox">
+ <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
+ </view>
<view class="bookDataForBox" wx:for="{{digitalTextbooksData}}" wx:key="index" wx:for-item="item" wx:for-index="index">
<view class="imageBox">
<image src="{{item.icon}}" mode="" />
@@ -96,6 +102,9 @@
</t-tab-panel>
<t-tab-panel label="涓撻({{seminarTotal}})" value="3">
<view class="listBox">
+ <view wx:if="{{seminarData.length <= 0}}" class="noDataBox">
+ <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
+ </view>
<view wx:for="{{seminarData}}" wx:for-item="item" wx:for-index="index" wx:key="index" bindtap="toList" data-info="{{item}}" class="listItemBox">
<view class="listItem">
<view class="specialSubject-img">
@@ -125,6 +134,9 @@
<view class="outsideHigherBox">
+ <view wx:if="{{bookFairData.length <= 0 }}" class="noDataBox">
+ <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
+ </view>
<view class="higherBox" wx:for="{{bookFairData}}" wx:key="index" wx:for-item="item" wx:for-index="index">
<view class="outsideHigherImageBox">
<image class="higherImageBox" src="{{item.icon}}" mode="" />
@@ -150,6 +162,9 @@
</t-tab-panel>
<t-tab-panel label="涔﹀睍({{biblioClassificationTotal}})" value="5">
<view class="outside">
+ <view wx:if="{{biblioClassificationData.length <= 0}}" class="noDataBox">
+ <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
+ </view>
<view class="contentBox" wx:for="{{biblioClassificationData}}" wx:key="index" wx:for-item="item" wx:for-index="index" bindtap="onBookExhibitionDetails" data-item="{{item}}">
<image class="bookFairImage" wx:if="{{item.icon}}" src="{{item.icon}}" mode="" />
<image class="bookFairImage" wx:else="" src="/static/images/bookExhibitionList/banner.png" mode="" />
diff --git a/pages/retrievalPage/index.wxss b/pages/retrievalPage/index.wxss
index a893adc..b17fdca 100644
--- a/pages/retrievalPage/index.wxss
+++ b/pages/retrievalPage/index.wxss
@@ -293,4 +293,12 @@
.t-tabs__track {
background-color: #FF6C00 !important;
+}
+
+.noDataBox {
+ /* display: flex;
+ justify-content: center;
+ align-items: center */
+ margin: 0 auto;
+ margin-top: 250rpx;
}
\ No newline at end of file
diff --git a/services/home/home.js b/services/home/home.js
index d1d92a2..35d6725 100644
--- a/services/home/home.js
+++ b/services/home/home.js
@@ -45,7 +45,7 @@
text: '涔︾洰涓嬭浇',
key: 6,
icon: '/static/images/home/shumuxiazai@2x.png',
- url: '',
+ url: '/pages/bibliographyList/index',
},
{
text: '鏁欏笀璁よ瘉',
--
Gitblit v1.9.1