From b471803c1a9e4c1452a98a8b3631bde66641b910 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期三, 25 九月 2024 15:01:50 +0800
Subject: [PATCH] css
---
pages/home/home.js | 11 -
pages/digitalCourses/digitalCoursesDetails/index.js | 32 +++---
packageBookService/pages/bookServices/detail/components/learnTask/index.js | 15 +-
pages/retrievalPage/index.wxml | 31 +----
packageBookService/pages/bookServices/detail/components/testTree/index.wxml | 2
packageBookService/pages/bookServices/detail/components/testTree/index.wxss | 2
pages/retrievalPage/index.wxss | 9 +
app.json | 25 +---
style/iconfont.wxss | 96 ++++++++++++++++++
pages/home/home.wxml | 3
pages/retrievalPage/index.js | 39 ++++++-
pages/home/home.wxss | 5 +
components/empty/index.wxss | 2
13 files changed, 185 insertions(+), 87 deletions(-)
diff --git a/app.json b/app.json
index 80256f0..1030dd3 100644
--- a/app.json
+++ b/app.json
@@ -80,7 +80,7 @@
"pages/bookServices/detail/components/learnTask/index",
"pages/bookServices/linkPage/index"
]
- }
+ }
],
"tabBar": {
"custom": true,
@@ -91,33 +91,23 @@
"list": [
{
"pagePath": "pages/home/home",
- "text": "棣栭〉",
- "iconPath": "/static/images/home/Home@2x.png",
- "selectedIconPatn": "/static/images/home/Home-click@2x.png"
+ "text": "棣栭〉"
},
{
"pagePath": "pages/bookServices/assort/index",
- "text": "鍥句功鏈嶅姟",
- "iconPath": "/static/images/home/service@2x.png",
- "selectedIconPatn": "/static/images/home/service-click@2x.png"
+ "text": "鍥句功鏈嶅姟"
},
{
"pagePath": "pages/study/index",
- "text": "瀛︿範",
- "iconPath": "/static/images/home/learn@2x.png",
- "selectedIconPatn": "/static/images/home/learn-click@2x.png"
+ "text": "瀛︿範"
},
{
"pagePath": "pages/cart/index",
- "text": "璐墿杞�",
- "iconPath": "/static/images/home/cart@2x.png",
- "selectedIconPatn": "/static/images/home/cart-click@2x.png"
+ "text": "璐墿杞�"
},
{
"pagePath": "pages/personalCenter/index",
- "text": "鎴戠殑",
- "iconPath": "/static/images/home/my@2x.png",
- "selectedIconPatn": "/static/images/home/my-click@2x.png"
+ "text": "鎴戠殑"
}
]
},
@@ -135,6 +125,5 @@
"scope.userLocation": {
"desc": "浣犵殑浣嶇疆淇℃伅灏嗙敤浜庡皬绋嬪簭浣嶇疆鎺ュ彛鐨勬晥鏋滃睍绀�"
}
- },
- "shareAppMessage": true
+ }
}
\ No newline at end of file
diff --git a/components/empty/index.wxss b/components/empty/index.wxss
index bf5d2f4..6cf59e2 100644
--- a/components/empty/index.wxss
+++ b/components/empty/index.wxss
@@ -3,7 +3,7 @@
padding: 80rpx;
}
-.noData-box image {
+.noData-box .note-icon {
width: 205rpx !important;
height: 133rpx !important;
}
diff --git a/packageBookService/pages/bookServices/detail/components/learnTask/index.js b/packageBookService/pages/bookServices/detail/components/learnTask/index.js
index 5ea7969..9908f90 100644
--- a/packageBookService/pages/bookServices/detail/components/learnTask/index.js
+++ b/packageBookService/pages/bookServices/detail/components/learnTask/index.js
@@ -69,7 +69,7 @@
this.setData({
bookId: options.bookId,
cmsPath: options.cmsPath,
- taskId: options.bookId,
+ taskId: options.taskId,
consumer: options.consumer,
userId: options.userId,
userName: JSON.parse(wx.getStorageSync(app.config.userInfoKey)).nickName
@@ -78,7 +78,7 @@
this.setData({
cmsPath: options.cmsPath,
bookId: options.bookId,
- taskId: options.bookId,
+ taskId: options.taskId,
consumer: options.consumer,
userId: options.userId,
disabled: true
@@ -176,7 +176,7 @@
menuList: dataList,
loading: false,
});
- }, 500)
+ }, 200)
if (this.data.taskId) {
setTimeout(() => {
this.data.menuList.forEach((item) => {
@@ -194,7 +194,7 @@
})
}
})
- }, 500)
+ }, 200)
} else {
setTimeout(() => {
if (this.data.menuList[0].children) {
@@ -206,10 +206,12 @@
taskInfo: this.data.menuList[0],
});
}
- }, 500)
+ }, 200)
}
}
- this.getTasksList()
+ setTimeout(() => {
+ this.getTasksList()
+ }, 200)
})
},
getTask(e) {
@@ -244,7 +246,6 @@
this.setData({
tasksListData: res.datas,
});
-
if (this.data.taskInfo.name) {
this.taskSelect(this.data.taskInfo)
}
diff --git a/packageBookService/pages/bookServices/detail/components/testTree/index.wxml b/packageBookService/pages/bookServices/detail/components/testTree/index.wxml
index a658307..1671792 100644
--- a/packageBookService/pages/bookServices/detail/components/testTree/index.wxml
+++ b/packageBookService/pages/bookServices/detail/components/testTree/index.wxml
@@ -36,7 +36,7 @@
<view class="box-image fl-cn">
<!-- 浜戞祴璇曞浘鏍� -->
<view class="teach-icon fl-cn">
- <image src="/static/images/bookService/detail/test-icon.png" mode="" />
+ <image src="/static/images/bookService/detail/test-icon.png" mode="" class="test-icon" />
</view>
<!-- 鍚嶇О -->
<text class="name">{{citem.name || '-'}}</text>
diff --git a/packageBookService/pages/bookServices/detail/components/testTree/index.wxss b/packageBookService/pages/bookServices/detail/components/testTree/index.wxss
index fd8e1e5..46a39d0 100644
--- a/packageBookService/pages/bookServices/detail/components/testTree/index.wxss
+++ b/packageBookService/pages/bookServices/detail/components/testTree/index.wxss
@@ -61,7 +61,7 @@
display: flex;
}
-.box-image image {
+.box-image .test-icon {
width: 44rpx;
height: 44rpx;
margin-right: 8rpx;
diff --git a/pages/digitalCourses/digitalCoursesDetails/index.js b/pages/digitalCourses/digitalCoursesDetails/index.js
index 57eed2f..aaa522c 100644
--- a/pages/digitalCourses/digitalCoursesDetails/index.js
+++ b/pages/digitalCourses/digitalCoursesDetails/index.js
@@ -1100,22 +1100,22 @@
},
onCertificate() {
- // if (!this.data.isBuy) {
- // wx.showToast({
- // title: "璇峰厛璐拱锛屼綋楠屽畬鏁存湇鍔�",
- // icon: "none",
- // duration: 1000,
- // });
- // return false
- // }
- // if (!this.data.isLearn) {
- // wx.showToast({
- // title: "鎮ㄧ殑瀛︿範浠诲姟杩樻湭瀹屾垚锛屾殏涓嶈兘鐢宠璇佷功锛屽姞娌瑰摝锛�",
- // icon: "none",
- // duration: 1000,
- // });
- // return false
- // }
+ if (!this.data.isBuy) {
+ wx.showToast({
+ title: "璇峰厛璐拱锛屼綋楠屽畬鏁存湇鍔�",
+ icon: "none",
+ duration: 1000,
+ });
+ return false
+ }
+ if (!this.data.isLearn) {
+ wx.showToast({
+ title: "鎮ㄧ殑瀛︿範浠诲姟杩樻湭瀹屾垚锛屾殏涓嶈兘鐢宠璇佷功锛屽姞娌瑰摝锛�",
+ icon: "none",
+ duration: 1000,
+ });
+ return false
+ }
if (this.data.isCertificate && this.data.isCertificate.state == 'WaitAudit') {
wx.showToast({
title: "鎮ㄧ敵璇风殑璇佷功姝ｅ湪瀹℃牳涓�",
diff --git a/pages/home/home.js b/pages/home/home.js
index 953b47e..b94578d 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -50,6 +50,7 @@
if (token) {
this.getShoppingCartList()
}
+ this.init();
},
onLoad() {
@@ -76,7 +77,6 @@
}
})
}
- this.init();
},
onReachBottom() {},
onPullDownRefresh() {
@@ -203,8 +203,8 @@
}
app.MG.store.getProductList(obj).then((res) => {
res.datas.forEach((item) => {
- item.liveTime = item.liveTime ? moment(item.liveTime).format("MM-DD HH:mm:ss") : '';
- item.startTime = item.startTime ? moment(item.startTime).format("MM-DD HH:mm:ss") : '';
+ item.liveTime = item.liveTime ? item.liveTime.substring(5) : '';
+ item.startTime = item.startTime ? item.startTime.substring(5) : '';
item.price = item.price ? item.price.toFixed(2) : item.price;
});
this.setData({
@@ -463,11 +463,6 @@
wx.navigateTo({
url: urlData ? url + `?path=${item.jsek_link.slice(0,flags)}` + '&' + urlData : url + `?path=${item.jsek_link}`
})
- // wx.navigateTo({
- // url: '/pages/specialDiscussion/webView/index?link=' + item.jsek_link
- // });
-
-
},
goCourseDetail(e) {
diff --git a/pages/home/home.wxml b/pages/home/home.wxml
index dd67987..ca0bba8 100644
--- a/pages/home/home.wxml
+++ b/pages/home/home.wxml
@@ -40,7 +40,7 @@
name="search"
size="40rpx"
color="#bbb"
- bind:tap="navToSearchPage"
+ bind:tap="onRetrievalPage"
/>
</t-search>
</view>
@@ -59,6 +59,7 @@
wx:key="index"
data-info="{{item}}"
bindtap="navToActivityDetail"
+ class="swiper-item"
>
<view class="swiperItem">
<image src="{{item.value}}" mode="widthFix" class="img" />
diff --git a/pages/home/home.wxss b/pages/home/home.wxss
index b152de7..675b791 100644
--- a/pages/home/home.wxss
+++ b/pages/home/home.wxss
@@ -88,6 +88,11 @@
width: 100%;
}
+.swiper-item {
+ width: 100%;
+ height: 100%;
+}
+
.swiperItem {
position: relative;
height: 380rpx;
diff --git a/pages/retrievalPage/index.js b/pages/retrievalPage/index.js
index 1d1843f..62a3742 100644
--- a/pages/retrievalPage/index.js
+++ b/pages/retrievalPage/index.js
@@ -657,12 +657,41 @@
}
},
- underConstruction() {
- wx.showToast({
- title: "寤鸿涓�",
- icon: 'none',
- duration: 1000
+ underConstruction(e) {
+ const {
+ book
+ } = e.currentTarget.dataset;
+ console.log(book);
+ wx.navigateTo({
+ url: '/pages/digitalCourses/digitalCoursesDetails/index?id=' + book.id + '&path=' + book.idPath,
+ });
+ },
+ goTextBookDetail(e) {
+ const {
+ item
+ } = e.currentTarget.dataset;
+ wx.navigateTo({
+ url: '/pages/digitalTextbooks/digitalTextbooksDetails/index?id=' + item.id,
+ });
+ },
+ goSubjectDetail(e) {
+ // return wx.showToast({
+ // title: "寤鸿涓�",
+ // icon: 'none',
+ // duration: 1000
+ // })
+ const item = e.currentTarget.dataset.item
+ // 缃戦〉绫诲瀷璺宠浆鍒扮綉鍧�澶嶅埗椤碉紝鍥犱负url浼犲弬涓嶈兘浼� 甯﹀弬鏁扮殑缃戠粶鍦板潃锛屾墍浠ユ澶勮鎶婄綉缁滃湴鍧�閲岀殑浼犲弬鎽樺嚭鏉ワ紝鏀惧埌url閲�
+ let urlData = ''
+ const flags = item.jsek_link.indexOf("?")
+ if (flags > -1) {
+ urlData = item.jsek_link.slice(flags + 1, item.jsek_link.length)
+ }
+ let url = '/packageBookService/pages/bookServices/linkPage/index'
+ wx.navigateTo({
+ url: urlData ? url + `?path=${item.jsek_link.slice(0,flags)}` + '&' + urlData : url + `?path=${item.jsek_link}`
})
+
},
// 閭鐐瑰嚮
mailbox(e) {
diff --git a/pages/retrievalPage/index.wxml b/pages/retrievalPage/index.wxml
index 60273d6..c094a0b 100644
--- a/pages/retrievalPage/index.wxml
+++ b/pages/retrievalPage/index.wxml
@@ -17,12 +17,7 @@
<!-- Tab甯冨眬 -->
<scroll-view scroll-x="{{true}}" class="scroll-x">
<view class="navBox">
- <view
- class="titleBox"
- wx:for="{{tabList}}"
- bindtap="tabsOn"
- data-idx="{{item.index}}"
- >
+ <view class="titleBox" wx:for="{{tabList}}" bindtap="tabsOn" wx:key="index" wx:for-item="item" wx:for-index="index" data-idx="{{item.index}}">
<view class="tabIndexBox">
<text class="{{item.index == tabsId ? 'fontColorBox' : ''}}"
>{{item.title}} ({{item.bookTotal}})
@@ -106,11 +101,11 @@
>
<view
class="listItem flex"
- data-item="{{item}}"
+ data-book="{{item}}"
bind:tap="underConstruction"
>
<view class="specialSubject-img-box">
- <image src="{{item.icon}}" mode="aspectFill" />
+ <image src="{{item.icon}}" mode="aspectFit" class="img"/>
</view>
<view class="body-info">
<view class="name">{{item.name}}</view>
@@ -165,10 +160,10 @@
wx:for-item="item"
wx:for-index="index"
data-item="{{item}}"
- bind:tap="underConstruction"
+ bind:tap="goTextBookDetail"
>
<view class="imageBox">
- <image src="{{item.icon}}" mode="" />
+ <image src="{{item.icon}}" mode="aspectFit" mode="" />
</view>
<view class="bookDataNmae"> {{item.name}} </view>
<view class="bookDataAuthor">{{item.author}}</view>
@@ -204,7 +199,7 @@
wx:key="index"
class="listItemBox"
data-item="{{item}}"
- bind:tap="underConstruction"
+ bind:tap="goSubjectDetail"
>
<view
class="listItem"
@@ -332,18 +327,8 @@
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=""
- />
+ <image class="bookFairImage" wx:if="{{item.icon}}" src="{{item.icon}}" mode=""/>
+ <image class="bookFairImage" wx:else src="/static/images/bookExhibitionList/banner.png" mode="" />
<view class="textBox" title="{{item.name}}">
<text>{{item.subtitleName}}</text>
</view>
diff --git a/pages/retrievalPage/index.wxss b/pages/retrievalPage/index.wxss
index be1f80c..526e838 100644
--- a/pages/retrievalPage/index.wxss
+++ b/pages/retrievalPage/index.wxss
@@ -120,11 +120,14 @@
.specialSubject-img-box {
width: 400rpx;
height: 218rpx;
+ flex: 1;
+ margin: 0 auto;
}
.specialSubject-img-box image {
- width: 380rpx;
- height: 218rpx;
+ width: 100%;
+ height: 100%;
+ object-fit: contain;
}
.listBox1 .addCartImg,
@@ -305,7 +308,7 @@
padding: 16rpx;
font-size: 28rpx;
width: 310rpx;
- height: 218rpx;
+ /* height: 218rpx; */
}
.body-info .name {
diff --git a/style/iconfont.wxss b/style/iconfont.wxss
index 23df272..2439b62 100644
--- a/style/iconfont.wxss
+++ b/style/iconfont.wxss
@@ -1,7 +1,6 @@
@font-face {
font-family: 'wr';
- src: url('https://cdn3.codesign.qq.com/icons/gqxWyZ1yMJZmVXk/Yyg5Zp2LG8292lK/iconfont.woff?t=cfc62dd36011e60805f5c3ad1a20b642')
- format('woff2');
+ src: url('https://cdn3.codesign.qq.com/icons/gqxWyZ1yMJZmVXk/Yyg5Zp2LG8292lK/iconfont.woff?t=cfc62dd36011e60805f5c3ad1a20b642') format('woff2');
}
.wr {
@@ -11,129 +10,171 @@
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
+
.wr-deliver:before {
content: '\e033';
}
+
.wr-indent_close:before {
content: '\e041';
}
+
.wr-edit:before {
content: '\e002';
}
+
.wr-succeed:before {
content: '\e00d';
}
+
.wr-goods_return:before {
content: '\e03c';
}
+
.wr-wallet:before {
content: '\e051';
}
+
.wr-package:before {
content: '\e047';
}
+
.wr-comment:before {
content: '\e037';
}
+
.wr-exchang:before {
content: '\e03e';
}
+
.wr-credit_card:before {
content: '\e035';
}
+
.wr-service:before {
content: '\e04a';
}
+
.wr-shop_bag:before {
content: '\e02a';
}
+
.wr-goods_refund:before {
content: '\e03d';
}
+
.wr-check:before {
content: '\e053';
}
+
.wr-wechat:before {
content: '\e065';
}
+
.wr-cartAdd:before {
content: '\e05d';
}
+
.wr-home:before {
content: '\e020';
}
+
.wr-person:before {
content: '\e02c';
}
+
.wr-cart:before {
content: '\e023';
}
+
.wr-location:before {
content: '\e016';
}
+
.wr-arrow_forward:before {
content: '\e012';
}
+
.wr-close:before {
content: '\e021';
}
+
.wr-search:before {
content: '\e011';
}
+
.wr-clear_filled:before {
content: '\e027';
}
+
.wr-arrow_drop_up:before {
content: '\e071';
}
+
.wr-arrow_drop_down:before {
content: '\e070';
}
+
.wr-filter:before {
content: '\e038';
}
+
.wr-copy:before {
content: '\e001';
}
+
.wr-arrow_back:before {
content: '\e003';
}
+
.wr-add_circle:before {
content: '\e004';
}
+
.wr-Download:before {
content: '\e006';
}
+
.wr-map:before {
content: '\e007';
}
+
.wr-store:before {
content: '\e008';
}
+
.wr-movie:before {
content: '\e00a';
}
+
.wr-done:before {
content: '\e00b';
}
+
.wr-minus:before {
content: '\e00c';
}
+
.wr-list:before {
content: '\e00e';
}
+
.wr-expand_less:before {
content: '\e00f';
}
+
.wr-person_add:before {
content: '\e010';
}
+
.wr-Photo:before {
content: '\e013';
}
+
.wr-preview:before {
content: '\e014';
}
+
.wr-remind:before {
content: '\e015';
}
@@ -141,39 +182,51 @@
.wr-info:before {
content: '\e017';
}
+
.wr-expand_less_s:before {
content: '\e018';
}
+
.wr-arrow_forward_s:before {
content: '\e019';
}
+
.wr-expand_more_s:before {
content: '\e01a';
}
+
.wr-share:before {
content: '\e01d';
}
+
.wr-notify:before {
content: '\e01e';
}
+
.wr-add:before {
content: '\e01f';
}
+
.wr-Home:before {
content: '\e020';
}
+
.wr-delete:before {
content: '\e022';
}
+
.wr-error:before {
content: '\e025';
}
+
.wr-sort:before {
content: '\e028';
}
+
.wr-sort_filled:before {
content: '\e029';
}
+
.wr-shop_bag_filled:before {
content: '\e02b';
}
@@ -181,12 +234,15 @@
.wr-person_filled:before {
content: '\e02d';
}
+
.wr-cart_filled:before {
content: '\e02e';
}
+
.wr-home_filled:before {
content: '\e02f';
}
+
.wr-add_outline:before {
content: '\e030';
}
@@ -194,30 +250,39 @@
.wr-compass:before {
content: '\e034';
}
+
.wr-goods_exchange:before {
content: '\e03a';
}
+
.wr-group_buy:before {
content: '\e03b';
}
+
.wr-group:before {
content: '\e03f';
}
+
.wr-indent_goods:before {
content: '\e040';
}
+
.wr-help:before {
content: '\e042';
}
+
.wr-group_takeout:before {
content: '\e043';
}
+
.wr-label:before {
content: '\e044';
}
+
.wr-indent_wating:before {
content: '\e045';
}
+
.wr-member:before {
content: '\e046';
}
@@ -225,15 +290,19 @@
.wr-scanning:before {
content: '\e04b';
}
+
.wr-tv:before {
content: '\e04d';
}
+
.wr-to_top:before {
content: '\e04f';
}
+
.wr-visibility_off:before {
content: '\e050';
}
+
.wr-error-1:before {
content: '\e052';
}
@@ -241,66 +310,87 @@
.wr-arrow_right:before {
content: '\e054';
}
+
.wr-arrow_left:before {
content: '\e056';
}
+
.wr-picture_filled:before {
content: '\e057';
}
+
.wr-navigation:before {
content: '\e058';
}
+
.wr-telephone:before {
content: '\e059';
}
+
.wr-indent_time:before {
content: '\e05c';
}
+
.wr-cart_add:before {
content: '\e05d';
}
+
.wr-classify:before {
content: '\e060';
}
+
.wr-place:before {
content: '\e063';
}
+
.wr-wechat_pay:before {
content: '\e064';
}
+
.wr-security:before {
content: '\e066';
}
+
.wr-alarm:before {
content: '\e067';
}
+
.wr-person-1:before {
content: '\e068';
}
+
.wr-open_in_new:before {
content: '\e069';
}
+
.wr-uncheck:before {
content: '\e06b';
}
+
.wr-thumb_up:before {
content: '\e06c';
}
+
.wr-thumb_up_filled:before {
content: '\e06d';
}
+
.wr-star:before {
content: '\e06e';
}
+
.wr-star_filled:before {
content: '\e06f';
}
+
.wr-cards:before {
content: '\e072';
}
+
.wr-picture_error_filled:before {
content: '\e076';
}
+
.wr-discount:before {
content: '\e077';
-}
+}
\ No newline at end of file
--
Gitblit v1.9.1