From a22c86c0a14de6fe7e7110f158beefa86ebc58ad Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期四, 19 九月 2024 19:52:43 +0800
Subject: [PATCH] 资源播放器，是否购买判断
---
pages/home/home.js | 23 ++
packageBookService/pages/bookServices/detail/buyResource/index.js | 3
packageBookService/pages/bookServices/linkPage/index.wxss | 10 +
packageDomain/pages/resourceDetails/myVideo/index.wxml | 140 ++++++++++++++---
packageDomain/pages/resourceDetails/myVideo/index.js | 125 +++++++++-----
packageDomain/pages/resourceDetails/myAudio/index.js | 106 ++++++++----
pages/digitalCourses/digitalCoursesDetails/components/tree/index.wxss | 4
pages/home/home.wxml | 1
pages/digitalCourses/index.wxml | 2
pages/digitalCourses/index.wxss | 9 +
10 files changed, 303 insertions(+), 120 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/buyResource/index.js b/packageBookService/pages/bookServices/detail/buyResource/index.js
index 4bc928f..58ce970 100644
--- a/packageBookService/pages/bookServices/detail/buyResource/index.js
+++ b/packageBookService/pages/bookServices/detail/buyResource/index.js
@@ -258,8 +258,7 @@
itemFields: {
SysType: 'CmsFolder',
// 璧勬簮绫诲瀷锛岃瘯璇绘枃浠讹紝鏄惁鍏佽涓嬭浇绛夊弬鏁�
- // learnSelectType: [],
- // selectType: [],
+ learnSelectType: [],
// freeFile: [],
// file: [],
// protectedFile: [],
diff --git a/packageBookService/pages/bookServices/linkPage/index.wxss b/packageBookService/pages/bookServices/linkPage/index.wxss
index 3e9d570..d9356fc 100644
--- a/packageBookService/pages/bookServices/linkPage/index.wxss
+++ b/packageBookService/pages/bookServices/linkPage/index.wxss
@@ -1,5 +1,8 @@
.page {
padding: 200rpx 40rpx;
+ width: 100%;
+ height: 100%;
+ box-sizing: border-box;
}
.title-text {
@@ -8,6 +11,13 @@
color: #000;
}
+.link {
+ width: 100%;
+ height: max-content;
+ word-wrap: break-word;
+ word-break: break-all;
+}
+
.link,
.bottom-btn {
margin-top: 50px;
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.js b/packageDomain/pages/resourceDetails/myAudio/index.js
index 06c0fb7..624b1dc 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.js
+++ b/packageDomain/pages/resourceDetails/myAudio/index.js
@@ -54,6 +54,10 @@
hidden: true,
playerList: [],
progress: 0,
+ buyIdList: [],
+ buyList: [],
+ learnClassData: null,
+ bookDetail: null
},
format(time) {
@@ -102,7 +106,6 @@
formPath: options.formPath,
source: options.source,
})
-
if (options.parentName !== "鏁欏璧勬簮" && options.parentName !== "浜戝涔�") {
this.setData({
parentName: options.parentName,
@@ -123,6 +126,7 @@
this.resourceDetailsData()
this.getNoteList()
}
+ if (options.formPath == 'jsek_cloudLearning') this.getBookInfo(options.bookId)
},
/**
@@ -203,27 +207,61 @@
console.log('缁熻', data)
app.MG.job.newJobWithApiNewEvent(data).then((res) => {})
},
- /**
- * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
- */
- onPullDownRefresh() {
-
+ // 鑾峰彇鍥句功璇︽儏
+ getBookInfo(id) {
+ const query = {
+ path: "*",
+ queryType: "*",
+ productId: id,
+ favoriteTypes: "FavoriteBookCity",
+ itemFields: {
+ "SysType=": "CmsFolder",
+ },
+ coverSize: {
+ height: 1,
+ },
+ fields: {},
+ };
+ app.MG.store.getProductDetail(query).then(async (res) => {
+ console.log('鍥句功璇︽儏', res);
+ this.setData({
+ bookDetail: res.datas,
+ buyIdList: res.datas.purchasedSaleMethodIdList,
+ learnClassData: res.datas.cmsDatas[0].datas.find(item => item.refCode == "jsek_cloudLearning")
+ })
+ this.getResourceDataList(this.data.learnClassData)
+ });
+ },
+ // 鏁欏璧勬簮 浜戝涔� 鑾峰彇
+ getResourceDataList(type) {
+ let query = {
+ path: '*',
+ queryType: '*',
+ productId: this.data.bookDetail.id,
+ cmsPath: type.productLinkPath,
+ cmsType: '*',
+ itemFields: {
+ SysType: 'CmsFolder',
+ },
+ pading: {
+ start: 0,
+ size: 999
+ },
+ }
+ app.MG.store.getProductDetailNoChildren(query).then((res) => {
+ const buyList = res.datas.cmsDatas[0].datas.filter(item => item.saleMethod.length && this.data.buyIdList.includes(item.saleMethod.find(citem => citem.SaleType == 'Normal').Id))
+ if (this.data.learnClassData && this.data.learnClassData.saleMethod.length) {
+ const learnSaleMethod = this.data.learnClassData.saleMethod.find(citem => citem.SaleType == 'Normal')
+ if (this.data.buyIdList.includes(learnSaleMethod.Id)) buyList.push(learnClassData)
+ }
+ this.setData({
+ buyList
+ })
+ console.log('浜戝涔�', buyList);
+ })
},
- /**
- * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
- */
- onReachBottom() {
-
- },
-
- /**
- * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
- */
- onShareAppMessage() {},
- onShareTimeline() {},
onTabsChange(event) {},
-
onTabsClick(event) {},
handleChange(e) {
this.setData({
@@ -279,7 +317,6 @@
let selectedId = -1; // 鍒濆鍖栭�変腑椤圭储寮�
let showDataUrl = '';
let titleName = '';
-
res.datas.cmsDatas[0].datas.forEach((item, index) => {
if (this.data.source == 'qrcode') {
if (item.id == this.data.activeId) {
@@ -287,31 +324,24 @@
}
} else {
if (item.selectType === "audio" || item.learnSelectType === "audio") {
- // this.data.threeLeveData.push(item);
if (this.data.storeInfo == 'jsek_digitalCourses') {
- if (this.data.isBuy) {
- if (item.sysType == 'CmsItem') {
- this.data.threeLeveData.push(item)
- }
- } else {
- if (item.sysType == 'CmsItem' && item.freeFile) {
- this.data.threeLeveData.push(item)
- }
+ if (item.sysType == 'CmsItem') {
+ this.data.threeLeveData.push(item)
+ }
+ if (item.sysType == 'CmsItem' && item.freeFile) {
+ this.data.threeLeveData.push(item)
}
} else {
- if (res.datas.purchasedSaleMethodIdList.includes(item.defaultSaleMethodId) || item.freeFile) {
- this.data.threeLeveData.push(item)
+ if (this.data.buyList.length) {
+ if (this.data.buyList.some(citem => item.productLinkPath.includes(citem.productLinkPath))) this.data.threeLeveData.push(item)
+ } else {
+ if (!item.saleMethod.length) this.data.threeLeveData.push(item)
}
}
}
}
-
});
- this.data.threeLeveData.forEach((items, indexs) => {
- if (this.data.productLinkPath == items.productLinkPath) {
- selectedId = indexs;
- }
- })
+ selectedId = this.data.threeLeveData.findIndex(items => items.productLinkPath == this.data.productLinkPath)
if (selectedId !== -1) {
let datas = this.data.threeLeveData[selectedId];
if (this.data.formPath == 'jsek_cloudLearning') {
@@ -331,6 +361,7 @@
loading: false,
hidden: false
});
+ console.log(1, this.data);
this.pubulicPlayFun();
});
},
@@ -362,6 +393,7 @@
this.setData({
showData: item.file ? app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.file : app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.freeFile
})
+ console.log(2, this.data);
this.pubulicPlayFun()
}
}
diff --git a/packageDomain/pages/resourceDetails/myVideo/index.js b/packageDomain/pages/resourceDetails/myVideo/index.js
index ef8f945..54d914b 100644
--- a/packageDomain/pages/resourceDetails/myVideo/index.js
+++ b/packageDomain/pages/resourceDetails/myVideo/index.js
@@ -50,7 +50,11 @@
videoLoading: false,
progress: 0,
playerList: [],
- videoLoading: true
+ videoLoading: true,
+ buyIdList: [],
+ buyList: [],
+ learnClassData: null,
+ bookDetail: null
},
// 鏍煎紡鍖栫瑪璁版椂闂�
convertTimestamp(timestamp) {
@@ -106,13 +110,7 @@
} else {
this.resourceDetailsData()
}
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
- */
- onReady() {
-
+ if (options.formPath == 'jsek_cloudLearning') this.getBookInfo(options.bookId)
},
/**
@@ -152,6 +150,60 @@
}
this.setPlayerList()
},
+
+ // 鑾峰彇鍥句功璇︽儏
+ getBookInfo(id) {
+ const query = {
+ path: "*",
+ queryType: "*",
+ productId: id,
+ favoriteTypes: "FavoriteBookCity",
+ itemFields: {
+ "SysType=": "CmsFolder",
+ },
+ coverSize: {
+ height: 1,
+ },
+ fields: {},
+ };
+ app.MG.store.getProductDetail(query).then(async (res) => {
+ console.log('鍥句功璇︽儏', res);
+ this.setData({
+ bookDetail: res.datas,
+ buyIdList: res.datas.purchasedSaleMethodIdList,
+ learnClassData: res.datas.cmsDatas[0].datas.find(item => item.refCode == "jsek_cloudLearning")
+ })
+ this.getResourceDataList(this.data.learnClassData)
+ });
+ },
+ // 鏁欏璧勬簮 浜戝涔� 鑾峰彇
+ getResourceDataList(type) {
+ let query = {
+ path: '*',
+ queryType: '*',
+ productId: this.data.bookDetail.id,
+ cmsPath: type.productLinkPath,
+ cmsType: '*',
+ itemFields: {
+ SysType: 'CmsFolder',
+ },
+ pading: {
+ start: 0,
+ size: 999
+ },
+ }
+ app.MG.store.getProductDetailNoChildren(query).then((res) => {
+ const buyList = res.datas.cmsDatas[0].datas.filter(item => item.saleMethod.length && this.data.buyIdList.includes(item.saleMethod.find(citem => citem.SaleType == 'Normal').Id))
+ if (this.data.learnClassData && this.data.learnClassData.saleMethod.length) {
+ const learnSaleMethod = this.data.learnClassData.saleMethod.find(citem => citem.SaleType == 'Normal')
+ if (this.data.buyIdList.includes(learnSaleMethod.Id)) buyList.push(learnClassData)
+ }
+ this.setData({
+ buyList
+ })
+ console.log('浜戝涔�', buyList);
+ })
+ },
count(timeStr) {
const data = {
appRefCode: app.config.appRefCode,
@@ -170,25 +222,7 @@
}
app.MG.job.newJobWithApiNewEvent(data).then((res) => {})
},
- /**
- * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
- */
- onPullDownRefresh() {
- },
-
- /**
- * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
- */
- onReachBottom() {
-
- },
-
- /**
- * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
- */
- onShareAppMessage() {},
- onShareTimeline() {},
onTabsChange(event) {
console.log(event, 234)
let tabValue = event.detail.value
@@ -254,15 +288,9 @@
}
}
app.MG.store.getProductDetail(query).then(res => {
- if (res.datas.purchasedSaleMethodIdList.includes(res.datas.defaultSaleMethodId)) {
- this.setData({
- isBuy: true
- })
- } else {
- this.setData({
- isBuy: false
- })
- }
+ this.setData({
+ isBuy: res.datas.purchasedSaleMethodIdList.includes(res.datas.defaultSaleMethodId)
+ })
res.datas.cmsDatas[0].datas.forEach((item) => {
if (this.data.source == 'qrcode') {
if (item.id == this.data.activeId) {
@@ -270,19 +298,23 @@
}
} else {
if (item.selectType === "video" || item.learnSelectType === "video") {
+
if (this.data.storeInfo == 'jsek_digitalCourses') {
- if (this.data.isBuy) {
- if (item.sysType == 'CmsItem') {
- this.data.threeLeveData.push(item)
- }
- } else {
- if (item.sysType == 'CmsItem' && item.freeFile) {
- this.data.threeLeveData.push(item)
- }
- }
+ if (item.sysType == 'CmsItem') this.data.threeLeveData.push(item)
+ // if (this.data.isBuy) {
+ // if (item.sysType == 'CmsItem') {
+ // this.data.threeLeveData.push(item)
+ // }
+ // } else {
+ // if (item.sysType == 'CmsItem' && item.freeFile) {
+ // this.data.threeLeveData.push(item)
+ // }
+ // }
} else {
- if (res.datas.purchasedSaleMethodIdList.includes(item.defaultSaleMethodId) || item.freeFile) {
- this.data.threeLeveData.push(item)
+ if (this.data.buyList.length) {
+ if (this.data.buyList.some(citem => item.productLinkPath.includes(citem.productLinkPath))) this.data.threeLeveData.push(item)
+ } else {
+ if (!item.saleMethod.length) this.data.threeLeveData.push(item)
}
}
this.setData({
@@ -424,7 +456,6 @@
.then((res) => {})
}
},
-
getProductUserSubmitTopicGet() {
app.MG.ugc.getProductUserSubmitTopic({
diff --git a/packageDomain/pages/resourceDetails/myVideo/index.wxml b/packageDomain/pages/resourceDetails/myVideo/index.wxml
index 412c005..6046aab 100644
--- a/packageDomain/pages/resourceDetails/myVideo/index.wxml
+++ b/packageDomain/pages/resourceDetails/myVideo/index.wxml
@@ -1,20 +1,24 @@
<view>
- <!-- <view style="width: 100%; height: {{barHeight}}px; "></view>
- <view class="nacigationBar" style="width: 100%; height: {{navBarHeight}}px;">
- <view>
- <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" />
- </view>
- <view class="navbar-title">璧勬簮璇︽儏-瑙嗛</view>
- </view> -->
<!-- 瑙嗛 -->
<view class="videoBox" wx:if="{{videoChange}}">
<!-- autoplay='false' 鏄惁鑷姩鎾斁 -->
<!-- <video binderror="videoErrorCallback" src="{{showData}}" play-btn-position='center' object-fit='fill' controls enable-play-gesture enable-auto-rotation></video> -->
<view wx:if="{{videoLoading}}" class="video-loading">
- <t-loading theme="circular" size="60rpx" class="wrapper" loading="{{videoLoading}}" />
+ <t-loading
+ theme="circular"
+ size="60rpx"
+ class="wrapper"
+ loading="{{videoLoading}}"
+ />
</view>
- <!-- <video show-center-play-btn="{{false}}" src="{{showData}}" bindloadedmetadata="loadedmetadata" bindtimeupdate="timeUpdate"></video> -->
- <t-video id="tvd" src="{{showDataVod}}" style="width:100%;" bindvideoloaded="loadedmetadata" bindtimeupdate="timeUpdate" wx:if="{{!videoLoading}}">
+ <t-video
+ id="tvd"
+ src="{{showDataVod}}"
+ style="width: 100%"
+ bindvideoloaded="loadedmetadata"
+ bindtimeupdate="timeUpdate"
+ wx:if="{{!videoLoading}}"
+ >
</t-video>
</view>
@@ -25,17 +29,43 @@
<!-- 鏍囬 -->
<view class="titleBox">{{titleName}}</view>
<view class="contentBox">
- <t-tabs defaultValue="{{0}}" bind:change="onTabsChange" 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">
+ <t-tab-panel
+ label="璧勬簮鍒楄〃"
+ value="0"
+ style="{{tabPanelstyle}}"
+ style="width: 750rpx"
+ >
<view class="demo-section__content" wx:if="{{loading}}">
- <t-skeleton theme="paragraph" animation="gradient" loading="true"></t-skeleton>
+ <t-skeleton
+ theme="paragraph"
+ animation="gradient"
+ loading="true"
+ ></t-skeleton>
</view>
<view class="wrapper" wx:if="{{!loading}}">
<view class="outsideDetailsName">
<view class="titleBox">{{parentName}}</view>
- <view class="detailsName" wx:for="{{threeLeveData}}" wx:key="index" wx:for-item="item" wx:for-index="index" bind:tap="onVideo" data-item="{{item}}" data-index="{{index}}">
- <view style="color: {{selectedId == index ? '#ff6c00' : '#000'}}">{{item.name}}</view>
+ <view
+ class="detailsName"
+ wx:for="{{threeLeveData}}"
+ wx:key="index"
+ wx:for-item="item"
+ wx:for-index="index"
+ bind:tap="onVideo"
+ data-item="{{item}}"
+ data-index="{{index}}"
+ >
+ <view style="color: {{selectedId == index ? '#ff6c00' : '#000'}}"
+ >{{item.name}}</view
+ >
</view>
</view>
</view>
@@ -48,9 +78,17 @@
<empty />
</view>
<t-collapse value="{{activeValues}}" bind:change="handleChange">
- <t-collapse-panel value="{{item.id}}" expandIcon wx:for="{{noteList}}" wx:key="id">
+ <t-collapse-panel
+ value="{{item.id}}"
+ expandIcon
+ wx:for="{{noteList}}"
+ wx:key="id"
+ >
<view slot="header" class="collapse-header">
- <t-image class="note-icon" src="/static/images/bookService/detail/note-icon.png"></t-image>
+ <t-image
+ class="note-icon"
+ src="/static/images/bookService/detail/note-icon.png"
+ ></t-image>
<view class="header-name">{{item.name}}</view>
</view>
<view>
@@ -58,9 +96,19 @@
<view class="note-bottom">
<view class="note-time">{{item.createDate}}</view>
<view class="bottom-btn">
- <t-image src="/static/images/bookService/detail/compliceHover.png" class="complice" bind:tap="editNote" data-note="{{item}}"></t-image>
+ <t-image
+ src="/static/images/bookService/detail/compliceHover.png"
+ class="complice"
+ bind:tap="editNote"
+ data-note="{{item}}"
+ ></t-image>
<view></view>
- <t-image src="/static/images/bookService/detail/deleteHover.png" class="delete" bind:tap="deleteNote" data-id="{{item.id}}"></t-image>
+ <t-image
+ src="/static/images/bookService/detail/deleteHover.png"
+ class="delete"
+ bind:tap="deleteNote"
+ data-id="{{item.id}}"
+ ></t-image>
</view>
</view>
</view>
@@ -73,7 +121,10 @@
<!-- 璁扮瑪璁� -->
<view class="takeNotes" data-key="showCloseBtn" bind:tap="showDialog">
<view class="takeNotesLining">
- <image src="/static/images/resourceDetails/jibiji锛廼con@2x.png" mode="" />
+ <image
+ src="/static/images/resourceDetails/jibiji锛廼con@2x.png"
+ mode=""
+ />
璁扮瑪璁�
</view>
</view>
@@ -81,27 +132,62 @@
</view>
<!-- 璁扮瑪璁板脊绐� -->
- <t-popup visible="{{dialogKey}}" bind:visible-change="onVisibleChange" placement="center">
+ <t-popup
+ visible="{{dialogKey}}"
+ bind:visible-change="onVisibleChange"
+ placement="center"
+ >
<view class="popup">
<view slot="title">
<view class="title-text" wx:if="{{!flag}}">
<text class="note-title">{{submitTitle}}</text>
- <t-image src="/static/images/bookService/detail/edit.png" class="edit-icon" bind:tap="changeTitle" data-value="{{true}}"></t-image>
+ <t-image
+ src="/static/images/bookService/detail/edit.png"
+ class="edit-icon"
+ bind:tap="changeTitle"
+ data-value="{{true}}"
+ ></t-image>
</view>
<view wx:else>
- <t-input value="{{submitTitle}}" style="{{inputStyle}}" data-value="{{false}}" bind:enter="changeTitle" bind:blur="changeTitle" maxlength="{{50}}" bind:change="inputChange"></t-input>
+ <t-input
+ value="{{submitTitle}}"
+ style="{{inputStyle}}"
+ data-value="{{false}}"
+ bind:enter="changeTitle"
+ bind:blur="changeTitle"
+ maxlength="{{50}}"
+ bind:change="inputChange"
+ ></t-input>
</view>
</view>
<view slot="content">
<view class="textarea-example">
<text class="textarea-example__label">鍐呭:</text>
- <t-textarea value="{{textvalue}}" t-class="external-class" placeholder="璇疯緭鍏ユ枃瀛�" bordered maxlength="500" disableDefaultPadding="{{true}}" indicator style="{{inputStyle}}" bind:change="textareaChange" />
+ <t-textarea
+ value="{{textvalue}}"
+ t-class="external-class"
+ placeholder="璇疯緭鍏ユ枃瀛�"
+ bordered
+ maxlength="500"
+ disableDefaultPadding="{{true}}"
+ indicator
+ style="{{inputStyle}}"
+ bind:change="textareaChange"
+ />
</view>
<view class="submit-btn">
- <t-button theme="primary" size="large" block bind:tap="confirmSuggest">鎻愪氦</t-button>
+ <t-button theme="primary" size="large" block bind:tap="confirmSuggest"
+ >鎻愪氦</t-button
+ >
</view>
</view>
</view>
- <t-icon t-class="close-btn" name="close-circle" size="32" color="#fff" bind:tap="closeDialog" />
+ <t-icon
+ t-class="close-btn"
+ name="close-circle"
+ size="32"
+ color="#fff"
+ bind:tap="closeDialog"
+ />
</t-popup>
-</view>
\ No newline at end of file
+</view>
diff --git a/pages/digitalCourses/digitalCoursesDetails/components/tree/index.wxss b/pages/digitalCourses/digitalCoursesDetails/components/tree/index.wxss
index 4a94ddf..1f2db60 100644
--- a/pages/digitalCourses/digitalCoursesDetails/components/tree/index.wxss
+++ b/pages/digitalCourses/digitalCoursesDetails/components/tree/index.wxss
@@ -89,6 +89,10 @@
align-items: center;
}
+.testSee {
+ margin-left: 14rpx;
+}
+
.testSee,
.need-buy,
.shopCar {
diff --git a/pages/digitalCourses/index.wxml b/pages/digitalCourses/index.wxml
index 940cc90..4955298 100644
--- a/pages/digitalCourses/index.wxml
+++ b/pages/digitalCourses/index.wxml
@@ -91,7 +91,7 @@
</view>
<view class="viewCount"> {{item.viewCount }}娆＄偣鍑� </view>
<view class="author">
- <view> {{ item.courseLeader}} </view>
+ <view class="courseLeader" > {{ item.courseLeader}} </view>
<view> {{ item.classHours}}璇炬椂 </view>
</view>
<view class="money">
diff --git a/pages/digitalCourses/index.wxss b/pages/digitalCourses/index.wxss
index d1b5649..0eaba8a 100644
--- a/pages/digitalCourses/index.wxss
+++ b/pages/digitalCourses/index.wxss
@@ -167,6 +167,13 @@
color: #333333;
}
+.courseLeader {
+ width: 65%;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+
.money {
display: flex;
flex-direction: row;
@@ -211,4 +218,4 @@
/* width: calc(100vw - 60rpx); */
-}
+}
\ No newline at end of file
diff --git a/pages/home/home.js b/pages/home/home.js
index 3bce987..f85bf4e 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -39,7 +39,7 @@
baseRefresh: {
value: false
},
- loading: true
+ loading: true,
},
onShow() {
this.setData({
@@ -454,9 +454,22 @@
// })
const item = e.currentTarget.dataset.book
console.log(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: '/pages/specialDiscussion/webView/index?link=' + item.jsek_link
- });
+ 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) {
// return wx.showToast({
@@ -508,7 +521,7 @@
})
})
},
- addCart(e) {
+ async addCart(e) {
const {
info
} = e.currentTarget.dataset;
@@ -538,7 +551,7 @@
agentCode: '鐢靛瓙涔�'
}]
}
- const addRes = app.MG.store.addShoppingCart(query)
+ const addRes = await app.MG.store.addShoppingCart(query)
if (addRes) {
wx.showToast({
title: "娣诲姞鎴愬姛",
diff --git a/pages/home/home.wxml b/pages/home/home.wxml
index f2b827b..dd67987 100644
--- a/pages/home/home.wxml
+++ b/pages/home/home.wxml
@@ -272,6 +272,7 @@
>锟{item.price}}</text
>
<image
+ wx:if="{{item.price}}"
src="/static/images/home/home-cart.png"
mode="aspectFit"
class="addCartImg"
--
Gitblit v1.9.1