From 1ebf13fcff1d64f0ab9f1981cd60ad3194a2d29c Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期五, 27 九月 2024 11:10:00 +0800
Subject: [PATCH] zf
---
packagePersonal/pages/activateProduct/index.js | 62 ++++++++++++++++++++++++-------
packagePersonal/pages/activateProduct/index.wxss | 6 --
packagePersonal/pages/activateProduct/index.wxml | 2
pages/cart/paymentPage/index.wxml | 2
pages/digitalTextbooks/digitalTextbooksDetails/index.json | 1
packageBookService/pages/bookServices/detail/index.wxml | 2
packageBookService/pages/bookServices/detail/index.wxss | 7 +++
packageBookService/pages/bookServices/detail/components/suggest/suggest.js | 2
pages/personalCenter/pointsRecord/index.wxml | 2
packageBookService/pages/bookServices/detail/components/suggestDialog/index.js | 2
pages/cart/paymentPage/index.js | 1
pages/digitalTextbooks/digitalTextbooksDetails/index.wxml | 6 +-
packageBookService/pages/bookServices/detail/index.js | 2
pages/digitalTextbooks/digitalTextbooksDetails/index.js | 20 ---------
14 files changed, 67 insertions(+), 50 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/components/suggest/suggest.js b/packageBookService/pages/bookServices/detail/components/suggest/suggest.js
index 0414fef..0722ecd 100644
--- a/packageBookService/pages/bookServices/detail/components/suggest/suggest.js
+++ b/packageBookService/pages/bookServices/detail/components/suggest/suggest.js
@@ -117,7 +117,7 @@
} else if (!textvalue.length) {
return wx.showToast({
icon: 'error',
- title: '璇疯緭鍏ュ弽棣堝弽棣堝唴瀹�',
+ title: '璇疯緭鍏ュ弽棣堝唴瀹�',
})
}
await this.feedBack()
diff --git a/packageBookService/pages/bookServices/detail/components/suggestDialog/index.js b/packageBookService/pages/bookServices/detail/components/suggestDialog/index.js
index c6721e0..9ec3c1d 100644
--- a/packageBookService/pages/bookServices/detail/components/suggestDialog/index.js
+++ b/packageBookService/pages/bookServices/detail/components/suggestDialog/index.js
@@ -130,7 +130,7 @@
} else if (!textvalue.length) {
return wx.showToast({
icon: 'error',
- title: '璇疯緭鍏ュ弽棣堝弽棣堝唴瀹�',
+ title: '璇疯緭鍏ュ弽棣堝唴瀹�',
})
}
await this.feedBack()
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index c3979af..1b9e298 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -2809,7 +2809,7 @@
}
app.MG.ugc.newTopicMessage(query).then((res) => {
wx.showToast({
- icon: "success",
+ icon: "error",
title: "璇蜂笂浼犺祫婧愭枃浠�",
});
this.closeDialog()
diff --git a/packageBookService/pages/bookServices/detail/index.wxml b/packageBookService/pages/bookServices/detail/index.wxml
index f28429c..8e534ac 100644
--- a/packageBookService/pages/bookServices/detail/index.wxml
+++ b/packageBookService/pages/bookServices/detail/index.wxml
@@ -495,7 +495,7 @@
wx:if="{{!isShowUp && fileList.length > 0}}"
class="fileList"
>
- <text>{{fileList[0].name}}</text>
+ <text class="fileName">{{fileList[0].name}}</text>
<image
src="/static/images/bookService/detail/deleteHover.png"
class="deleteBtn"
diff --git a/packageBookService/pages/bookServices/detail/index.wxss b/packageBookService/pages/bookServices/detail/index.wxss
index 94f8a6d..bba6422 100644
--- a/packageBookService/pages/bookServices/detail/index.wxss
+++ b/packageBookService/pages/bookServices/detail/index.wxss
@@ -612,6 +612,13 @@
background: #f1f1f1;
}
+.fileName {
+ width: 400rpx;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+
.t-cell::after {
border-bottom: none !important;
}
diff --git a/packagePersonal/pages/activateProduct/index.js b/packagePersonal/pages/activateProduct/index.js
index 8328d73..b55e0d0 100644
--- a/packagePersonal/pages/activateProduct/index.js
+++ b/packagePersonal/pages/activateProduct/index.js
@@ -94,20 +94,43 @@
oldlist.forEach(istrue => {
istrue.icon = getPublicImage(istrue.icon, "", 400)
})
+ item.saleMethodList.forEach(async (i) => {
+ if (i.type != 'defaultSaleMethod') {
+ var index = i.name.indexOf('-')
+ if (index !== -1) {
+ item.type = i.name.substring(0, index)
+ } else {
+ item.type = i.name
+ }
+ } else {
+ let parentData = await app.MG.store.getProductBySaleMethod({
+ saleMethodId: i.id
+ })
+ console.log(parentData, 111)
+ if (parentData.storeLinks[0].storeRefCode == 'jsek_digitalCourses') {
+ item.type = '鏁板瓧璇剧▼'
+ }
+ if (parentData.storeLinks[0].storeRefCode == 'jsek_digitalTextbooks') {
+ item.type = '鏁板瓧鏁欐潗'
+ }
+ }
+ })
})
- let dataList = res.datas;
- //瑙﹀簳鍔犺浇鏂版暟鎹苟淇濈暀鑰佹暟鎹�
- if (isReachBottom) {
- dataList = [...this.data.list, ...dataList] //灏嗘柊鏁版嵁鍔犲叆鑰佹暟鎹腑
- }
- this.setData({
- list: dataList,
- pageTotalCount: res.totalSize,
- bottomLoading: false,
- isMoreData: dataList.length > 0 ? false : true,
- skeletonLoding: false,
- loading: false
- })
+ setTimeout(() => {
+ let dataList = res.datas;
+ //瑙﹀簳鍔犺浇鏂版暟鎹苟淇濈暀鑰佹暟鎹�
+ if (isReachBottom) {
+ dataList = [...this.data.list, ...dataList] //灏嗘柊鏁版嵁鍔犲叆鑰佹暟鎹腑
+ }
+ this.setData({
+ list: dataList,
+ pageTotalCount: res.totalSize,
+ bottomLoading: false,
+ isMoreData: dataList.length > 0 ? false : true,
+ skeletonLoding: false,
+ loading: false
+ })
+ }, 500)
} else {
this.setData({
skeletonLoding: false,
@@ -175,7 +198,18 @@
}
this.getDataList(bool);
},
-
+ // 鐩戝惉婊氬姩璺濈
+ onPageScroll(e) {
+ if (e && e.scrollTop >= 1000) {
+ this.setData({
+ isBackTop: true
+ })
+ } else {
+ this.setData({
+ isBackTop: false
+ })
+ }
+ },
/**
* 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
*/
diff --git a/packagePersonal/pages/activateProduct/index.wxml b/packagePersonal/pages/activateProduct/index.wxml
index f860b36..c5e3413 100644
--- a/packagePersonal/pages/activateProduct/index.wxml
+++ b/packagePersonal/pages/activateProduct/index.wxml
@@ -44,7 +44,7 @@
<view class="rightCon">
<view class="productTitle">{{itemes.name}}</view>
<view class="typeBox">
- <text class="typeCon">鐢靛瓙涔�</text>
+ <text class="typeCon">{{items.type ? items.type : '鐢靛瓙涔�' }}</text>
</view>
</view>
</view>
diff --git a/packagePersonal/pages/activateProduct/index.wxss b/packagePersonal/pages/activateProduct/index.wxss
index fa3b6b0..9f3da81 100644
--- a/packagePersonal/pages/activateProduct/index.wxss
+++ b/packagePersonal/pages/activateProduct/index.wxss
@@ -131,7 +131,7 @@
.productTitle {
font-size: 28rpx;
- height: 88rpx;
+ max-height: 88rpx;
color: #333333;
line-height: 44rpx;
display: -webkit-box;
@@ -140,10 +140,6 @@
-webkit-line-clamp: 2;
overflow: hidden;
text-overflow: ellipsis;
-}
-
-.typeBox {
- line-height: 60rpx;
}
.typeCon {
diff --git a/pages/cart/paymentPage/index.js b/pages/cart/paymentPage/index.js
index 8bece7c..3a3b727 100644
--- a/pages/cart/paymentPage/index.js
+++ b/pages/cart/paymentPage/index.js
@@ -161,7 +161,6 @@
payPrice: res.payPrice.toFixed(2),
ImmediatelyReceive: res.payPrice
})
- console.log(1, res.saleMethodLinks);
res.saleMethodLinks.forEach(item => {
const type = item.orderSaleMethod.type == 'createProductItemSaleMethod' ? 'item' : 'product';
item.type = type; // 灏唗ype璁剧疆涓篿tem瀵硅薄鐨勫睘鎬э紝鑰屼笉鏄娇鐢╯etData
diff --git a/pages/cart/paymentPage/index.wxml b/pages/cart/paymentPage/index.wxml
index b20109e..3e2dc5d 100644
--- a/pages/cart/paymentPage/index.wxml
+++ b/pages/cart/paymentPage/index.wxml
@@ -73,7 +73,7 @@
<view class="paymentBox">
<view class="residue">寰呮敮浠橈細<text class="residueTextBox">锟{payPrice}}</text></view>
<view>
- <t-button wx:if="{{ImmediatelyReceive === 0}}" class="buttonBox" shape="round" catch:tap="onReceive">绔嬪嵆棰嗗彇</t-button>
+ <t-button wx:if="{{payPrice === 0}}" class="buttonBox" shape="round" catch:tap="onReceive">绔嬪嵆棰嗗彇</t-button>
<t-button wx:else class="buttonBox" shape="round" catch:tap="confirmOrderGet">寰俊鏀粯</t-button>
</view>
</view>
diff --git a/pages/digitalTextbooks/digitalTextbooksDetails/index.js b/pages/digitalTextbooks/digitalTextbooksDetails/index.js
index d2eb58f..2c2fb1c 100644
--- a/pages/digitalTextbooks/digitalTextbooksDetails/index.js
+++ b/pages/digitalTextbooks/digitalTextbooksDetails/index.js
@@ -85,7 +85,6 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad(options) {
- console.log(options);
this.setData({
digitalTextId: options.id
})
@@ -277,7 +276,6 @@
}
this.getAboutBook(res.datas.productLinkInfo[res.datas.productLinkInfo.length - 1].LinkPath)
- console.log(this.data.isBuy);
this.setData({
loading: false,
type: 'basicInformation',
@@ -315,12 +313,8 @@
this.setData({
tabValue: event.detail.value,
})
- console.log(this.data.tabValue);
},
- onTabsClick(event) {
- // console.log(`Click tab, tab-panel value is ${event.detail.value}.`);
- },
// 鑾峰彇鐩稿叧鏁欐潗
getAboutBook(path) {
let query = {
@@ -362,7 +356,6 @@
this.setData({
relatedBookData: bookArr
})
- console.log(this.data.relatedBookData);
} else {
this.setData({
relatedBookData: []
@@ -452,7 +445,6 @@
// 鍙戣捣璁㈠崟鍒濆鍖栬姹傚苟绛夊緟缁撴灉
const res = await app.MG.store.initOrder(query);
// 鑾峰彇璁㈠崟鍙峰苟璧嬪�肩粰 orderNumber.value
- console.log(res, 'res456');
bookOrdersId = res.orderNumber;
// 妫�鏌ヨ鍗曞彿鏄惁瀛樺湪
if (bookOrdersId) {
@@ -478,9 +470,7 @@
url,
});
}
- } else {
- console.log(222);
- }
+ } else {}
} else {
wx.showToast({
title: "鍟嗗搧涓嶅湪鏈夋晥鏈�",
@@ -490,8 +480,6 @@
}
},
- // console.log(item, app.config.textReaderUrl);
- // console.log(token);
goRead() {
// 棣栭〉娴嬭瘯鐧诲綍鍔熻兘锛屽悗缁敞閲�
// 妫�鏌ョ櫥褰曠姸鎬�
@@ -527,7 +515,6 @@
},
onTabClick(e) {
- console.log(e);
let tab = e.currentTarget.dataset.tab;
this.setData({
@@ -563,7 +550,6 @@
onScroll(e) {
let scrollTop = e.detail.scrollTop
- console.log(scrollTop);
// this.setData({
// type: scrollTop
// })
@@ -598,10 +584,8 @@
let that = this;
var query = wx.createSelectorQuery()
- console.log(query, '12355');
//鑾峰彇鏉垮潡涓�绂籹croll-view椤堕儴鐨勮窛绂�,绗竴鏉垮潡瀹為檯璺濈涓�0锛屾澶勮幏鍙栧彧涓虹粰绗簩鍙婄涓夋澘鍧楀噺鍘荤涓�鏉垮潡璺濈scroll-view鐨勯《閮ㄨ窛绂�
wx.createSelectorQuery().select('#basicInformation').boundingClientRect(function (res) {
- console.log(res, '456882588');
that.basicInformation = res.top
}).exec()
//鑾峰彇鏉垮潡浜岀scroll-view椤堕儴鐨勮窛绂�
@@ -622,7 +606,6 @@
}).exec()
},
setCoolect() {
- console.log(456);
// 棣栭〉娴嬭瘯鐧诲綍鍔熻兘锛屽悗缁敞閲�
// 妫�鏌ョ櫥褰曠姸鎬�
@@ -686,7 +669,6 @@
suggestBtn() {
// 妫�鏌ョ櫥褰曠姸鎬�
const token = wx.getStorageSync(app.config.tokenKey);
- console.log(465);
const child = this.selectComponent("#suggest-component1");
if (token)
// child.showDialog();
diff --git a/pages/digitalTextbooks/digitalTextbooksDetails/index.json b/pages/digitalTextbooks/digitalTextbooksDetails/index.json
index 9f8e188..c7f94c6 100644
--- a/pages/digitalTextbooks/digitalTextbooksDetails/index.json
+++ b/pages/digitalTextbooks/digitalTextbooksDetails/index.json
@@ -6,7 +6,6 @@
"t-image": "tdesign-miniprogram/image/image",
"t-toast": "tdesign-miniprogram/toast/toast",
"t-button": "tdesign-miniprogram/button/button",
- "suggest": "/packageBookService/pages/bookServices/detail/components/suggest/suggest",
"t-input": "tdesign-miniprogram/input/input",
"t-image-viewer": "tdesign-miniprogram/image-viewer/image-viewer",
"empty": "/components/empty/index"
diff --git a/pages/digitalTextbooks/digitalTextbooksDetails/index.wxml b/pages/digitalTextbooks/digitalTextbooksDetails/index.wxml
index 05dc058..9823862 100644
--- a/pages/digitalTextbooks/digitalTextbooksDetails/index.wxml
+++ b/pages/digitalTextbooks/digitalTextbooksDetails/index.wxml
@@ -44,13 +44,13 @@
</view>
</view>
<view class="certificate">
- <view class="proposal" bind:tap="suggestBtn">
+ <!-- <view class="proposal" bind:tap="suggestBtn">
<view class="suggestion">
<image src="/static/images/digitalTextbooks/Suggestion@2x.png" mode="" class="img" />
</view>
<view class="proposalText">鎴戣寤鸿</view>
- </view>
- <view class="frame"></view>
+ </view> -->
+ <!-- <view class="frame"></view> -->
<view class="information">
<view class="proposal" bind:tap="onCertificate">
<view class="suggestion">
diff --git a/pages/personalCenter/pointsRecord/index.wxml b/pages/personalCenter/pointsRecord/index.wxml
index 5b79a37..6b0adb0 100644
--- a/pages/personalCenter/pointsRecord/index.wxml
+++ b/pages/personalCenter/pointsRecord/index.wxml
@@ -20,7 +20,7 @@
<view class="lable">{{item.type}}</view>
<view class="createDate">{{item.createDate ? item.createDate : '-'}}</view>
</view>
- <view class="value yes" wx:if="item.value > 0">{{'+' + item.value}}</view>
+ <view class="value yes" wx:if="{{item.value > 0}}">{{'+' + item.value}}</view>
<view class="value no" wx:else>{{item.value}}</view>
</view>
</view>
--
Gitblit v1.9.1