From 3f62d09217740b02d45bad3e6791916a9f11695c Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期四, 11 七月 2024 16:00:54 +0800
Subject: [PATCH] sudu
---
pages/index/bookDetail.wxml | 10 ++++
pages/test/testCover.wxml | 10 ++++
pages/index/bookDetail.wxss | 4 ++
packageDomain/pages/resourceDetails/myVideo/index.wxml | 2
pages/digitalTextbooks/digitalTextbooksDetails/index.wxml | 26 +++++++++++-
pages/index/resourceCover.wxml | 10 ++++
pages/index/resourceCover.wxss | 4 ++
pages/test/testCover.wxss | 4 ++
packageDomain/pages/resourceDetails/myVideo/index.js | 11 +++--
packageBookService/pages/bookServices/detail/index.js | 10 +++-
pages/digitalTextbooks/digitalTextbooksDetails/index.js | 4 +
services/home/home.js | 12 +++---
12 files changed, 85 insertions(+), 22 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index ec54438..990357d 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -190,7 +190,7 @@
// this.getResourceClass(); // 鑾峰彇璧勬簮鎵�灞炲垎绫�
const token = wx.getStorageSync(app.config.tokenKey);
if (token) {
- this.getShoppingCartProductGet();
+
this.getApplyInfo(options.id);
this.getAlreadyPBookList();
this.getAlreadyEBookList();
@@ -573,6 +573,9 @@
});
}
}
+ if (!this.data.buy && this.data.bookDetail.isSell == '1') {
+ this.getShoppingCartProductGet();
+ }
});
},
// 鑾峰彇鍥句功鍒嗙被
@@ -900,6 +903,7 @@
loading: false,
});
}
+ console.log(res.datas.cmsDatas[0].datas, "璧勬簮")
let list = []
// 娴嬭瘯 6浣�// 姝ｅ紡 5浣�// 娴嬭瘯璋冪敤浼�20锛屽唴閮�7 姝ｅ紡璋冪敤浼�17 鍐呴儴浼�6
//鏁欏璧勬簮 浜戝涔�
@@ -937,7 +941,7 @@
})
}
}
- const addNum = query.cmsPath.length > 12 ? 7 : query.cmsPath.length > 14 ? 8 : 6
+ const addNum = query.cmsPath.length > 10 ? 7 : query.cmsPath.length > 13 ? 8 : 6
const num = query.cmsPath.length + addNum
this.getTreeList(res.datas.cmsDatas[0].datas, num, list, '\\', addNum)
list = this.ensureTreeConsistency(list)
@@ -1028,7 +1032,7 @@
if (data.length > 0) {
let list = []
// 娴嬭瘯 6浣�// 姝ｅ紡 5浣�// 娴嬭瘯璋冪敤浼�20锛屽唴閮�7 姝ｅ紡璋冪敤浼�17 鍐呴儴浼�6
- const addNum = query.cmsPath.length > 12 ? 7 : query.cmsPath.length > 14 ? 8 : 6
+ const addNum = query.cmsPath.length > 10 ? 7 : query.cmsPath.length > 13 ? 8 : 6
const num = query.cmsPath.length + addNum
this.getTreeList(data, num, list, '\\', addNum)
list = this.ensureTreeConsistency(list)
diff --git a/packageDomain/pages/resourceDetails/myVideo/index.js b/packageDomain/pages/resourceDetails/myVideo/index.js
index ab3f70a..d08e26d 100644
--- a/packageDomain/pages/resourceDetails/myVideo/index.js
+++ b/packageDomain/pages/resourceDetails/myVideo/index.js
@@ -87,7 +87,7 @@
})
}
this.resourceDetailsData()
- this.getNoteList()
+
},
/**
@@ -173,12 +173,13 @@
},
onTabsChange(event) {
-
+ console.log(event, 234)
+ let tabValue = event.detail.value
+ if (tabValue == '1') {
+ this.getNoteList()
+ }
},
- onTabsClick(event) {
-
- },
handleChange(e) {
this.setData({
activeValues: e.detail.value,
diff --git a/packageDomain/pages/resourceDetails/myVideo/index.wxml b/packageDomain/pages/resourceDetails/myVideo/index.wxml
index 35f1699..9f7d46c 100644
--- a/packageDomain/pages/resourceDetails/myVideo/index.wxml
+++ b/packageDomain/pages/resourceDetails/myVideo/index.wxml
@@ -23,7 +23,7 @@
<!-- 鏍囬 -->
<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" split="{{false}}">
+ <t-tabs defaultValue="{{0}}" bind:change="onTabsChange" t-class="custom-tabs" t-class-content="custom-panel" split="{{false}}">
<!-- 璧勬簮鍒楄〃 -->
<t-tab-panel label="璧勬簮鍒楄〃" value="0" style="{{tabPanelstyle}}" style="width: 750rpx">
<view class="demo-section__content" wx:if="{{loading}}">
diff --git a/pages/digitalTextbooks/digitalTextbooksDetails/index.js b/pages/digitalTextbooks/digitalTextbooksDetails/index.js
index 30c7c1a..0b6d375 100644
--- a/pages/digitalTextbooks/digitalTextbooksDetails/index.js
+++ b/pages/digitalTextbooks/digitalTextbooksDetails/index.js
@@ -56,7 +56,9 @@
catalogueClickIcon: {
name: "/static/images/digitalTextbooks/mulu-t-click@3x.png",
},
-
+ userInfo: {
+ fullName: '' //鍚嶇О
+ }
},
/**
diff --git a/pages/digitalTextbooks/digitalTextbooksDetails/index.wxml b/pages/digitalTextbooks/digitalTextbooksDetails/index.wxml
index bdd0f4e..4301d97 100644
--- a/pages/digitalTextbooks/digitalTextbooksDetails/index.wxml
+++ b/pages/digitalTextbooks/digitalTextbooksDetails/index.wxml
@@ -46,7 +46,7 @@
</view>
<view class="frame"></view>
<view class="information">
- <view class="proposal">
+ <view class="proposal" bind:tap="onCertificate">
<view class="suggestion">
<image src="/static/images/digitalTextbooks/shengshu-t@2x.png" mode="" />
</view>
@@ -87,8 +87,6 @@
</view>
<view class="basic"> 璇佷功淇℃伅</view>
</view>
-
-
<!-- <view class="certificateChart">
<view class="chart">
<image src="" mode="" />
@@ -192,5 +190,27 @@
</view>
</view>
+<!-- 寮圭獥 -->
+<view wx:if="{{dialogBox}}">
+ <view class="popup-box" bindtap="closeDialog"></view>
+ <view class="info-center" style="top:{{height*0.4}}px;">
+ <view>
+ <view class="row-info">
+ <view class="body">
+ <view class="dialog-title">瀛︿範璇佷功鐢宠</view>
+ <view style="width: 100%; height: 2rpx; background-color: #F4F4F4;"></view>
+ <view class="input-box">
+ <t-input class="input" borderless placeholder="璇疯緭鍏ョ湡瀹炲鍚�" value="{{input}}" bind:change="inputChange"></t-input>
+ </view>
+ </view>
+ <view class="row-btn">
+ <view class="left-btn" bindtap="closeDialog">鍙栨秷</view>
+ <view class="right-btn" bindtap="confirmM">纭</view>
+ </view>
+ </view>
+ </view>
+ </view>
+</view>
+
<t-toast id="t-toast" />
\ No newline at end of file
diff --git a/pages/index/bookDetail.wxml b/pages/index/bookDetail.wxml
index 954af0b..c0afe2b 100644
--- a/pages/index/bookDetail.wxml
+++ b/pages/index/bookDetail.wxml
@@ -1,4 +1,12 @@
<!--pages/index/bookDetail.wxml-->
<view class="box">
- <t-skeleton theme="paragraph" animation="gradient" loading="true"></t-skeleton>
+ <view class="list">
+ <t-skeleton theme="paragraph" animation="gradient" loading="true"></t-skeleton>
+ </view>
+ <view class="list">
+ <t-skeleton theme="paragraph" animation="gradient" loading="true"></t-skeleton>
+ </view>
+ <view class="list">
+ <t-skeleton theme="paragraph" animation="gradient" loading="true"></t-skeleton>
+ </view>
</view>
\ No newline at end of file
diff --git a/pages/index/bookDetail.wxss b/pages/index/bookDetail.wxss
index fdc3ca5..98e802b 100644
--- a/pages/index/bookDetail.wxss
+++ b/pages/index/bookDetail.wxss
@@ -5,4 +5,8 @@
padding: 200rpx 0;
text-align: center;
margin: 40rpx;
+}
+
+.list {
+ margin-top: 20rpx;
}
\ No newline at end of file
diff --git a/pages/index/resourceCover.wxml b/pages/index/resourceCover.wxml
index 083b65c..156c8fb 100644
--- a/pages/index/resourceCover.wxml
+++ b/pages/index/resourceCover.wxml
@@ -4,5 +4,13 @@
</view>
<web-view wx:if="{{webpageSrc}}" src="{{webpageSrc}}"></web-view>
<view class="box" wx:if='{{!copyUrl && !webpageSrc}}'>
- <t-skeleton theme="paragraph" animation="gradient" loading="true"></t-skeleton>
+ <view class="list">
+ <t-skeleton theme="paragraph" animation="gradient" loading="true"></t-skeleton>
+ </view>
+ <view class="list">
+ <t-skeleton theme="paragraph" animation="gradient" loading="true"></t-skeleton>
+ </view>
+ <view class="list">
+ <t-skeleton theme="paragraph" animation="gradient" loading="true"></t-skeleton>
+ </view>
</view>
\ No newline at end of file
diff --git a/pages/index/resourceCover.wxss b/pages/index/resourceCover.wxss
index a252013..ae818c6 100644
--- a/pages/index/resourceCover.wxss
+++ b/pages/index/resourceCover.wxss
@@ -14,4 +14,8 @@
padding: 200rpx 0;
text-align: center;
margin: 40rpx;
+}
+
+.list {
+ margin-top: 20rpx;
}
\ No newline at end of file
diff --git a/pages/test/testCover.wxml b/pages/test/testCover.wxml
index 7dbcfc0..fd6abd1 100644
--- a/pages/test/testCover.wxml
+++ b/pages/test/testCover.wxml
@@ -1,4 +1,12 @@
<!--pages/test/testCover.wxml-->
<view class="box">
- <t-skeleton theme="paragraph" animation="gradient" loading="true"></t-skeleton>
+ <view class="list">
+ <t-skeleton theme="paragraph" animation="gradient" loading="true"></t-skeleton>
+ </view>
+ <view class="list">
+ <t-skeleton theme="paragraph" animation="gradient" loading="true"></t-skeleton>
+ </view>
+ <view class="list">
+ <t-skeleton theme="paragraph" animation="gradient" loading="true"></t-skeleton>
+ </view>
</view>
\ No newline at end of file
diff --git a/pages/test/testCover.wxss b/pages/test/testCover.wxss
index 283efef..f462c98 100644
--- a/pages/test/testCover.wxss
+++ b/pages/test/testCover.wxss
@@ -5,4 +5,8 @@
padding: 200rpx 0;
text-align: center;
margin: 40rpx;
+}
+
+.list {
+ margin-top: 20rpx;
}
\ No newline at end of file
diff --git a/services/home/home.js b/services/home/home.js
index e3f82b7..4e3f6b1 100644
--- a/services/home/home.js
+++ b/services/home/home.js
@@ -21,22 +21,22 @@
text: '鏁板瓧璇剧▼',
key: 2,
icon: '/static/images/home/shuzikecheng@2x.png',
- // url: '/pages/digitalCourses/index',
- url: ''
+ url: '/pages/digitalCourses/index',
+ // url: ''
},
{
text: '鏁板瓧鏁欐潗',
key: 3,
icon: '/static/images/home/shuzijiaocai@2x.png',
- // url: '/pages/digitalTextbooks/index',
- url: ''
+ url: '/pages/digitalTextbooks/index',
+ // url: ''
},
{
text: '涓撻璁ㄨ',
key: 4,
icon: '/static/images/home/zhuantitaolun@2x.png',
- // url: '/pages/specialDiscussion/index',
- url: ''
+ url: '/pages/specialDiscussion/index',
+ // url: ''
},
{
text: '绾夸笂涔﹀睍',
--
Gitblit v1.9.1