From 5e649be819c7297c79c21c6dc120b4b6b362db9e Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期三, 03 四月 2024 17:23:39 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
packageBookService/pages/bookServices/detail/index.js | 143 +++++++++++++++++++++++------------------------
1 files changed, 70 insertions(+), 73 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index f4f4c86..d3cea05 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -1,7 +1,9 @@
// pages/bookServices/detail/index.js
import Toast from "tdesign-miniprogram/toast";
import tool from "../../../../assets/js/toolClass";
-import { loginInfo } from "../../../../assets/js/login";
+import {
+ loginInfo
+} from "../../../../assets/js/login";
const app = getApp();
Page({
/**
@@ -430,10 +432,9 @@
this.setData({
bookItemDetail: res.datas[0],
selectedIds: res.datas[0].defaultSaleMethod.id,
- bookBuy:
- res.datas[0].purchasedSaleMethodIdList.indexOf(
- res.datas[0].defaultSaleMethodId
- ) > -1,
+ bookBuy: res.datas[0].purchasedSaleMethodIdList.indexOf(
+ res.datas[0].defaultSaleMethodId
+ ) > -1,
});
let times = new Date(res.datas[0].defaultSaleMethod.endDate).getTime();
let startTime = new Date(
@@ -495,10 +496,9 @@
}
this.setData({
selectedIds: this.data.bookDetail.defaultSaleMethodId,
- bookBuy:
- this.data.bookDetail.purchasedSaleMethodIdList.indexOf(
- this.data.bookDetail.defaultSaleMethodId
- ) > -1,
+ bookBuy: this.data.bookDetail.purchasedSaleMethodIdList.indexOf(
+ this.data.bookDetail.defaultSaleMethodId
+ ) > -1,
});
let times = new Date(
this.data.bookDetail.defaultSaleMethod.endDate
@@ -602,7 +602,9 @@
},
// 璺宠浆缃戝簵
goShop(e) {
- const { link } = e.currentTarget.dataset;
+ const {
+ link
+ } = e.currentTarget.dataset;
wx.navigateTo({
url: `/packageBookService/pages/bookServices/webpage/index?url=${link}`,
});
@@ -611,16 +613,12 @@
onTabsChange(e) {
this.setData({
tabValue: e.detail.value,
- noResources: false,
- });
- if (
- e.detail.label == "鏁欏璧勬簮" ||
- e.detail.label == "浜戝涔�" ||
- e.detail.label == "浜戞祴璇�"
- ) {
- const checkData = this.data.cmsDatas.find(
- (item) => item.refCode == e.detail.value
- );
+ noResources: false
+ })
+ if (e.detail.label == '鏁欏璧勬簮' || e.detail.label == '浜戝涔�' || e.detail.label == '浜戞祴璇�') {
+ const checkData = this.data.cmsDatas.find(item => item.refCode == e.detail.value)
+
+
if (checkData) {
if (e.detail.value == "jsek_cloudLearning") {
this.setData({
@@ -889,13 +887,11 @@
console.log(determine);
if (!determine) {
let query = {
- requests: [
- {
- saleMethodId: this.data.selectedIds,
- storeEventId: null,
- agentCode: "鐢靛瓙涔�",
- },
- ],
+ requests: [{
+ saleMethodId: this.data.selectedIds,
+ storeEventId: null,
+ agentCode: "鐢靛瓙涔�",
+ }, ],
};
const addRes = app.MG.store.addShoppingCart(query);
this.showSuccessToast();
@@ -936,14 +932,11 @@
let bookOrdersId = "";
let query = {
remarks: "鐢靛瓙涔�",
- requests: [
- {
- saleMethodId: this.data.bookItemDetail.defaultSaleMethodId
- ? this.data.bookItemDetail.defaultSaleMethodId
- : this.data.bookDetail.defaultSaleMethodId,
- count: 1,
- },
- ],
+ requests: [{
+ saleMethodId: this.data.bookItemDetail.defaultSaleMethodId ?
+ this.data.bookItemDetail.defaultSaleMethodId : this.data.bookDetail.defaultSaleMethodId,
+ count: 1,
+ }, ],
};
// 鍙戣捣璁㈠崟鍒濆鍖栬姹傚苟绛夊緟缁撴灉
const res = await app.MG.store.initOrder(query);
@@ -1067,14 +1060,12 @@
cmsTypeRefCode: "",
newDataListRequest: [],
name: this.data.bookDetail.name, // name涓虹敵璇风殑涔︽湰鍚嶇О
- content: JSON.stringify([
- {
- name: this.data.bookDetail.name,
- id: this.data.bookDetail.id,
- // defaultSaleMethodId: bookData.value.defaultSaleMethodId,
- icon: this.data.bookDetail.icon,
- },
- ]),
+ content: JSON.stringify([{
+ name: this.data.bookDetail.name,
+ id: this.data.bookDetail.id,
+ // defaultSaleMethodId: bookData.value.defaultSaleMethodId,
+ icon: this.data.bookDetail.icon,
+ }, ]),
};
app.MG.ugc.newTopicMessage(query).then(async (res) => {
if (res) {
@@ -1090,8 +1081,7 @@
title: "灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛�",
content: "璇峰厛杩涜鏁欏笀璁よ瘉锛�",
complete: (res) => {
- if (res.cancel) {
- }
+ if (res.cancel) {}
if (res.confirm) {
wx.navigateTo({
url: "/packageDomain/pages/teacherCertification/index",
@@ -1105,8 +1095,7 @@
title: "灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛�",
content: "璇峰厛杩涜鏁欏笀璁よ瘉锛�",
complete: (res) => {
- if (res.cancel) {
- }
+ if (res.cancel) {}
if (res.confirm) {
wx.navigateTo({
url: "/packageDomain/pages/teacherCertification/index",
@@ -1134,8 +1123,7 @@
title: "灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛�",
content: "璇峰厛杩涜鏁欏笀璁よ瘉锛�",
complete: (res) => {
- if (res.cancel) {
- }
+ if (res.cancel) {}
if (res.confirm) {
wx.navigateTo({
url: "/packageDomain/pages/teacherCertification/index",
@@ -1310,6 +1298,19 @@
return false;
}
},
+
+ updateShoppingCartHidden() {
+ const isSHow = this.data.shoppingCartGetId.some((item) => item == data.saleMethod[0].Id)
+ console.log(isSHow);
+ return !isSHow
+
+ },
+ updateCloudLearning() {
+ const checkData = this.data.cmsDatas.find(item => item.refCode == 'jsek_cloudLearning')
+ this.getResourceData(checkData)
+ debugger
+ console.log(55555);
+ },
// 閬嶅巻鏍戠粨鏋勮浆鎹负鏁扮粍鏂规硶
handleTreeData(array) {
const flattenedArray = [];
@@ -1475,9 +1476,9 @@
if (new RegExp("(" + k + ")").test(fmt)) {
fmt = fmt.replace(
RegExp.$1,
- RegExp.$1.length == 1
- ? o[k]
- : ("00" + o[k]).substr(("" + o[k]).length)
+ RegExp.$1.length == 1 ?
+ o[k] :
+ ("00" + o[k]).substr(("" + o[k]).length)
);
}
}
@@ -1531,12 +1532,10 @@
try {
let query = {
remarks: "缁勫嵎",
- requests: [
- {
- saleMethodId: this.data.mockData.id,
- count: 1,
- },
- ],
+ requests: [{
+ saleMethodId: this.data.mockData.id,
+ count: 1,
+ }, ],
};
if (this.data.flag) {
this.setData({
@@ -1586,13 +1585,11 @@
});
// 璁板綍璐拱鏃堕棿锛屽苟璁剧姸鎬乻tate涓�1锛岃〃绀哄垰璐拱瀹屾垚缁勫嵎
app.MG.identity.setUserKey({
- setKeyRequests: [
- {
- domain: "mockData",
- key: this.data.bookDetail.id + "",
- value: JSON.stringify(this.data.mockData.mockList),
- },
- ],
+ setKeyRequests: [{
+ domain: "mockData",
+ key: this.data.bookDetail.id + "",
+ value: JSON.stringify(this.data.mockData.mockList),
+ }, ],
});
},
// 鑾峰彇鐩稿叧鍥句功
@@ -1649,7 +1646,10 @@
tabValue: "brief",
pageLoading: true,
});
- this.onLoad({ id: e.detail.id, name: e.detail.name });
+ this.onLoad({
+ id: e.detail.id,
+ name: e.detail.name
+ });
},
// 搴曢儴璐拱鎸夐挳
buyBtn() {
@@ -1673,8 +1673,7 @@
return false;
}
wx.navigateTo({
- url:
- "/packageBookService/pages/components/webView/index?md5=" +
+ url: "/packageBookService/pages/components/webView/index?md5=" +
this.data.fileInfo.md5 +
"&fileName=" +
this.data.fileInfo.bookName +
@@ -1849,8 +1848,7 @@
wx.navigateTo({
url: "/packageDomain/pages/teacherCertification/index",
});
- } else if (res.cancel) {
- }
+ } else if (res.cancel) {}
},
});
}
@@ -1919,8 +1917,7 @@
wx.navigateTo({
url: "/packageDomain/pages/teacherCertification/index",
});
- } else if (res.cancel) {
- }
+ } else if (res.cancel) {}
},
});
}
@@ -2005,4 +2002,4 @@
teach: tree,
});
},
-});
+});
\ No newline at end of file
--
Gitblit v1.9.1