From d44f1c3412aeb61709e58c737279ac2b2f60e018 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期三, 03 四月 2024 09:30:52 +0800
Subject: [PATCH] 样式修改
---
packagePersonal/pages/activateProduct/index.js | 10 +++
packagePersonal/pages/sampleBooks/index.wxml | 4
packagePersonal/pages/activateProduct/index.wxml | 8 --
packagePersonal/pages/myOrder/index.js | 11 +++
pages/home/digitalRead/index.js | 1
packagePersonal/pages/downloads/index.wxss | 13 +++
packagePersonal/pages/downloads/index.wxml | 5 +
packagePersonal/pages/feedBack/index.wxss | 7 ++
packagePersonal/pages/feedBack/index.wxml | 1
packagePersonal/pages/myOrder/index.wxml | 2
packagePersonal/pages/myCollection/index.wxml | 2
packageBookService/pages/bookServices/detail/index.js | 6 +
packagePersonal/pages/downloads/index.js | 24 ++++---
packagePersonal/pages/sampleBooks/index.js | 17 ++++-
packagePersonal/pages/sampleBooks/index.wxss | 14 +++-
15 files changed, 90 insertions(+), 35 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index 1aa1212..95921f9 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -884,8 +884,12 @@
console.log(this.data.bookItemDetail.defaultSaleMethodId, 'this.data.bookItemDetail.defaultSaleMethodId');
if (!this.data.expire) {
let bookOrdersId = ''
+ let pBookInfo = {
+ type: "鐢靛瓙涔�",
+ pId: this.data.bookItemDetail ? this.data.bookDetail.id : ''
+ }
let query = {
- remarks: '鐢靛瓙涔�',
+ remarks: JSON.stringify(pBookInfo),
requests: [{
saleMethodId: this.data.bookItemDetail.defaultSaleMethodId ? this.data.bookItemDetail.defaultSaleMethodId : this.data.bookDetail.defaultSaleMethodId,
count: 1
diff --git a/packagePersonal/pages/activateProduct/index.js b/packagePersonal/pages/activateProduct/index.js
index 348c9b4..3247c02 100644
--- a/packagePersonal/pages/activateProduct/index.js
+++ b/packagePersonal/pages/activateProduct/index.js
@@ -123,7 +123,15 @@
})
},
-
+ goBookDetails(e) {
+ const {
+ book
+ } = e.currentTarget.dataset;
+ console.log(book)
+ wx.navigateTo({
+ url: `/packageBookService/pages/bookServices/detail/index?id=${book.id}&name=${book.name}`,
+ });
+ },
/**
* 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
*/
diff --git a/packagePersonal/pages/activateProduct/index.wxml b/packagePersonal/pages/activateProduct/index.wxml
index 532aaf1..3aab0ef 100644
--- a/packagePersonal/pages/activateProduct/index.wxml
+++ b/packagePersonal/pages/activateProduct/index.wxml
@@ -34,7 +34,7 @@
<view class="listBox">
<scroll-view class="srcolbox" scroll-x scroll-with-animation='true'>
<view class="order-centent">
- <view class="bookBox" wx:for="{{items.productList}}" wx:for-item="itemes" wx:for-index="idx" wx:key="idx" bindtap="onOrderDetail" data-info="{{itemes}}">
+ <view class="bookBox" wx:for="{{items.productList}}" wx:for-item="itemes" wx:for-index="idx" wx:key="idx" bindtap="goBookDetails" data-book="{{itemes}}">
<view class="leftCon">
<!-- 鑾峰彇鍥剧墖 -->
<image class="purchasedIcon" wx:if="{{itemes.icon}}" src="{{itemes.icon}}" mode="aspectFit" />
@@ -44,11 +44,7 @@
<view class="rightCon">
<view class="productTitle">{{itemes.name}}</view>
<view class="typeBox">
- <text class="typeCon">{{
- itemes.orderSaleMethod.type == 'defaultSaleMethod'
- ? '鐢靛瓙涔�'
- : itemes.orderSaleMethod.type == 'createProductSaleMethod' && itemes.orderSaleMethod.cmsItemList == 0 ? '缁勫嵎' : '浜戝涔�'
- }}</text>
+ <text class="typeCon">鐢靛瓙涔�</text>
</view>
</view>
</view>
diff --git a/packagePersonal/pages/downloads/index.js b/packagePersonal/pages/downloads/index.js
index 47cc245..76aa687 100644
--- a/packagePersonal/pages/downloads/index.js
+++ b/packagePersonal/pages/downloads/index.js
@@ -29,15 +29,15 @@
getDataList(isReachBottom) {
app.MG.ugc.getTopicMessageList({
- appRefCode: app.config.appRefCode,
- topicIdOrRefCode: "productDownLoad",
- start: this.data.page * this.data.limit - this.data.limit,
- size: this.data.limit,
- sort: {
- type: "Desc",
- field: "CreateDate"
- }
- })
+ appRefCode: app.config.appRefCode,
+ topicIdOrRefCode: "productDownLoad",
+ start: this.data.page * this.data.limit - this.data.limit,
+ size: this.data.limit,
+ sort: {
+ type: "Desc",
+ field: "CreateDate"
+ }
+ })
.then(res => {
try {
if (res.datas.length > 0) {
@@ -77,9 +77,11 @@
},
goBookDetails(e) {
- const { book } = e.currentTarget.dataset;
+ const {
+ book
+ } = e.currentTarget.dataset;
wx.navigateTo({
- url: `/packageBookService/pages/bookServices/detail/index?id=${book.id}&name=${book.name}`,
+ url: `/packageBookService/pages/bookServices/detail/index?id=${book.product.id}&name=${book.name}`,
});
},
diff --git a/packagePersonal/pages/downloads/index.wxml b/packagePersonal/pages/downloads/index.wxml
index edd6047..871e739 100644
--- a/packagePersonal/pages/downloads/index.wxml
+++ b/packagePersonal/pages/downloads/index.wxml
@@ -7,9 +7,10 @@
</view>
<view class="pageInfo" wx:if="{{list.length > 0 && !skeletonLoding}}">
<view class="content-item" wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index">
- <view class="item-con" data-info="{{item}}" bindtap="toList">
+ <view class="item-con" data-book="{{item}}" bindtap="goBookDetails">
<view class="icon">
- <t-image src="{{item.product.icon}}" mode="aspectFill" class="img" />
+ <t-image src="{{item.product.icon}}" mode="aspectFill" class="img" wx:if="{{item.product.icon}}" />
+ <image class="purchasedIcon" src="/static/images/default-book-img.png" mode="aspectFit" wx:else />
</view>
<view class="titleBox">
<view class="item-title">{{item.name}}</view>
diff --git a/packagePersonal/pages/downloads/index.wxss b/packagePersonal/pages/downloads/index.wxss
index 59b332b..18e268a 100644
--- a/packagePersonal/pages/downloads/index.wxss
+++ b/packagePersonal/pages/downloads/index.wxss
@@ -10,7 +10,7 @@
}
.pageInfo {
- padding: 40rpx;
+ padding: 24rpx;
}
.content-item {
@@ -22,6 +22,7 @@
.content-item .icon {
width: 150rpx;
height: 200rpx;
+ box-shadow: 0px 3px 6px 1px rgba(0, 0, 0, 0.16);
}
.content-item .icon .img {
@@ -42,6 +43,14 @@
.titleBox .item-title {
font-weight: bold;
margin-bottom: 20rpx;
+ max-height: 88rpx;
+ color: #333333;
+ line-height: 44rpx;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 2;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
.createDate {
@@ -62,7 +71,7 @@
}
.stateBox {
- width: 120rpx;
+ width: 110rpx;
text-align: right;
font-size: 28rpx;
line-height: 60rpx;
diff --git a/packagePersonal/pages/feedBack/index.wxml b/packagePersonal/pages/feedBack/index.wxml
index 278e0ed..0c8222d 100644
--- a/packagePersonal/pages/feedBack/index.wxml
+++ b/packagePersonal/pages/feedBack/index.wxml
@@ -4,6 +4,7 @@
<t-tab-panel wx:for="{{tabList}}" wx:for-index="index" wx:key="index" label="{{item.label}}" value="{{index}}">
</t-tab-panel>
</t-tabs>
+ <view class="con-bg"></view>
</view>
<view class="pageInfo">
<scroll-view class="scroll content" bind:scroll="onPageScroll" model:scroll-top="{{setScrollValue}}" scroll-y refresher-enabled="{{true}}" lower-threshold="{{200}}" refresher-threshold="{{80}}" refresher-default-style="none" refresher-triggered="{{triggered}}" bindrefresherpulling="{{refresh.onPulling}}" bindrefresherrefresh="onPullDownRefresh" bindscrolltolower="onReachBottom">
diff --git a/packagePersonal/pages/feedBack/index.wxss b/packagePersonal/pages/feedBack/index.wxss
index a206379..c9f47e4 100644
--- a/packagePersonal/pages/feedBack/index.wxss
+++ b/packagePersonal/pages/feedBack/index.wxss
@@ -8,6 +8,7 @@
}
.page-header {
+ background-color: #f0f2f5;
width: 100%;
position: fixed;
top: 0;
@@ -15,6 +16,12 @@
z-index: 1;
}
+.con-bg {
+ background: #fff;
+ height: 30rpx;
+ margin-top: -30rpx;
+}
+
.pageInfo {
padding-top: 90rpx;
}
diff --git a/packagePersonal/pages/myCollection/index.wxml b/packagePersonal/pages/myCollection/index.wxml
index 4350026..2e9424d 100644
--- a/packagePersonal/pages/myCollection/index.wxml
+++ b/packagePersonal/pages/myCollection/index.wxml
@@ -21,7 +21,7 @@
<view class="author">{{item.author}}</view>
</view>
<view class="currentBtn" data-info="{{item}}" bindtap="setCoolect">
- <t-image src="/static/images/personal/quxiaoshoucang.png" mode="heightFix" class="img" />
+ <image src="/static/images/personal/quxiaoshoucang.png" mode="aspectFit" class="img" />
</view>
</view>
</view>
diff --git a/packagePersonal/pages/myOrder/index.js b/packagePersonal/pages/myOrder/index.js
index 129bb1f..9798e7f 100644
--- a/packagePersonal/pages/myOrder/index.js
+++ b/packagePersonal/pages/myOrder/index.js
@@ -173,7 +173,16 @@
})
this.getDataList(false);
},
-
+ goBookDetails(e) {
+ const {
+ book,
+ remarks
+ } = e.currentTarget.dataset;
+ let id = remarks != null && JSON.stringify(remarks).slice(1, -1) == 'object' && JSON.parse(remarks).pId ? JSON.parse(remarks).pId : book.orderSaleMethod.product.id;
+ wx.navigateTo({
+ url: `/packageBookService/pages/bookServices/detail/index?id=${id}&name=${book.name}`,
+ });
+ },
/**
* 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
diff --git a/packagePersonal/pages/myOrder/index.wxml b/packagePersonal/pages/myOrder/index.wxml
index d5e5868..fa854fd 100644
--- a/packagePersonal/pages/myOrder/index.wxml
+++ b/packagePersonal/pages/myOrder/index.wxml
@@ -22,7 +22,7 @@
</view>
<view class="order-centent">
<scroll-view class="srcolbox" scroll-x scroll-with-animation='true'>
- <view class="bookBox {{items.saleMethodLinks.length == 1 ? 'flex' : ''}}" wx:for="{{items.saleMethodLinks}}" wx:for-item="itemes" wx:for-index="idx" wx:key="idx" bindtap="onOrderDetail" data-info="{{itemes}}">
+ <view class="bookBox {{items.saleMethodLinks.length == 1 ? 'flex' : ''}}" wx:for="{{items.saleMethodLinks}}" wx:for-item="itemes" wx:for-index="idx" wx:key="idx" bindtap="goBookDetails" data-book="{{itemes}}" data-remarks="{{items.remarks}}">
<view class="leftCon {{items.saleMethodLinks.length == 1 ? 'fl' : ''}}">
<!-- 鑾峰彇鍥剧墖 -->
<image class="purchasedIcon" wx:if="{{itemes.icon}}" src="{{itemes.icon}}" mode="aspectFit" />
diff --git a/packagePersonal/pages/sampleBooks/index.js b/packagePersonal/pages/sampleBooks/index.js
index 317096f..bc1a1e4 100644
--- a/packagePersonal/pages/sampleBooks/index.js
+++ b/packagePersonal/pages/sampleBooks/index.js
@@ -9,8 +9,7 @@
active: 0,
topicIdOrRefCode: "applyEntityBook",
active1: 0,
- tabList: [
- {
+ tabList: [{
label: '鍏ㄩ儴',
value: 'all',
},
@@ -94,7 +93,10 @@
that.setData({
skeletonLoding: true,
active1: item.detail.value,
- queryFilter: info.value == 'all' ? [] : [{ field: 'State', value: info.value }],
+ queryFilter: info.value == 'all' ? [] : [{
+ field: 'State',
+ value: info.value
+ }],
list: [],
page: 1,
bottomLoading: false,
@@ -151,6 +153,15 @@
})
},
+ goBookDetails(e) {
+ const {
+ book
+ } = e.currentTarget.dataset;
+ wx.navigateTo({
+ url: `/packageBookService/pages/bookServices/detail/index?id=${book.id}&name=${book.title}`,
+ });
+ },
+
/**
* 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
*/
diff --git a/packagePersonal/pages/sampleBooks/index.wxml b/packagePersonal/pages/sampleBooks/index.wxml
index b9be5b6..a42852e 100644
--- a/packagePersonal/pages/sampleBooks/index.wxml
+++ b/packagePersonal/pages/sampleBooks/index.wxml
@@ -35,14 +35,14 @@
<text wx:if="{{items.state =='Reject'}}">鍘熷洜锛歿{items.feedBack.reason}}</text>
<view wx:if="{{active == '0' && items.state =='Normal'}}" class="mailInfo">
<text class="mailNum">蹇�掑崟鍙凤細{{items.feedBack && items.feedBack.mailNum ? items.feedBack.mailNum : '-'}}</text>
- <text>蹇�掑叕鍙革細{{items.feedBack.mailName ? items.feedBack.mailName : '-'}}</text>
+ <text class="mailName">蹇�掑叕鍙革細{{items.feedBack.mailName ? items.feedBack.mailName : '-'}}</text>
</view>
</view>
</view>
<view class="listBox">
<scroll-view class="srcolbox" scroll-x scroll-with-animation='true'>
<view class="order-centent">
- <view class="bookBox" wx:for="{{items.productList}}" wx:for-item="itemes" wx:for-index="idx" wx:key="idx" bindtap="onOrderDetail" data-info="{{itemes}}">
+ <view class="bookBox" wx:for="{{items.productList}}" wx:for-item="itemes" wx:for-index="idx" wx:key="idx" bindtap="goBookDetails" data-book="{{itemes}}">
<view class="leftCon">
<!-- 鑾峰彇鍥剧墖 -->
<image class="purchasedIcon" wx:if="{{itemes.icon}}" src="{{itemes.icon}}" mode="aspectFit" />
diff --git a/packagePersonal/pages/sampleBooks/index.wxss b/packagePersonal/pages/sampleBooks/index.wxss
index fab9f33..876adf5 100644
--- a/packagePersonal/pages/sampleBooks/index.wxss
+++ b/packagePersonal/pages/sampleBooks/index.wxss
@@ -107,7 +107,7 @@
.content-item {
margin-bottom: 30rpx;
- padding: 30rpx;
+ padding: 24rpx;
background: #fff;
border-radius: 10rpx;
}
@@ -132,7 +132,15 @@
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
- max-width: 440rpx;
+ max-width: 420rpx;
+}
+
+.mailName {
+ white-space: nowrap;
+ /* 淇濊瘉鏂囨湰鍦ㄤ竴琛屽唴鏄剧ず */
+ overflow: hidden;
+ /* 闅愯棌瓒呭嚭瀹瑰櫒鐨勬枃鏈� */
+ text-overflow: ellipsis;
}
.success {
@@ -161,7 +169,7 @@
.bookBox .leftCon {
width: 180rpx;
height: 240rpx;
- box-shadow: 0px 0px 20rpx 2px #f1f1f1;
+ box-shadow: 0px 0px 20rpx 2px #EDECEC;
}
.bookBox .leftCon .purchasedIcon {
diff --git a/pages/home/digitalRead/index.js b/pages/home/digitalRead/index.js
index b845422..c88d98a 100644
--- a/pages/home/digitalRead/index.js
+++ b/pages/home/digitalRead/index.js
@@ -14,7 +14,6 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad(options) {
- console.log(options)
if (options && options.link) {
this.setData({
src: decodeURIComponent(options.link),
--
Gitblit v1.9.1