From 23f872505d56a06183f55964f40ee697817e1858 Mon Sep 17 00:00:00 2001
From: QYF-GitLab1 <1940665526@qq.com>
Date: 星期三, 23 七月 2025 15:24:22 +0800
Subject: [PATCH] 修改提示词、修改扫码icon颜色
---
pages/home/home.js | 1
packageDomain/pages/resourceDetails/document/index.js | 5 +
packageBookService/pages/psychologyAnswer/psychologyAnswer.js | 2
packageDomain/pages/resourceDetails/document/index.wxml | 89 ++++-------------------------
packageBookService/pages/bookServices/examination/examination.js | 2
static/images/home/nav_icon_scan.png | 0
packageDomain/pages/resourceDetails/myVideo/index.js | 9 --
packageDomain/pages/resourceDetails/myAudio/index.js | 3
pages/home/home.wxml | 2
packageDomain/pages/publickBookForm/index.js | 25 +++++---
pages/home/home.wxss | 6 +-
11 files changed, 41 insertions(+), 103 deletions(-)
diff --git a/packageBookService/pages/bookServices/examination/examination.js b/packageBookService/pages/bookServices/examination/examination.js
index 04c90bb..1e376b2 100644
--- a/packageBookService/pages/bookServices/examination/examination.js
+++ b/packageBookService/pages/bookServices/examination/examination.js
@@ -649,7 +649,7 @@
const saleData = res.datas.saleMethod.find(item => item.Name.includes('棰樺簱'))
if (saleData && !res.datas.purchasedSaleMethodIdList.includes(saleData.Id)) return wx.showModal({
title: '鎻愮ず',
- content: '璇峰厛璐拱棰樺簱鍐嶇瓟棰�',
+ content: '璇峰厛婵�娲绘垨璐拱棰樺簱鍐嶇瓟棰�',
confirmColor: "#ff6c00",
cancelColor: "#949494",
editable: false, //鏄惁鏄剧ず杈撳叆妗�
diff --git a/packageBookService/pages/psychologyAnswer/psychologyAnswer.js b/packageBookService/pages/psychologyAnswer/psychologyAnswer.js
index 77d6c63..0bb02d0 100644
--- a/packageBookService/pages/psychologyAnswer/psychologyAnswer.js
+++ b/packageBookService/pages/psychologyAnswer/psychologyAnswer.js
@@ -93,7 +93,7 @@
wx.showModal({
icon: 'error',
title: '娓╅Θ鎻愮ず',
- content: '璇疯喘涔伴搴擄紝鍗冲皢杩斿洖璐拱椤�',
+ content: '璇锋縺娲绘垨璐拱棰樺簱锛屽嵆灏嗚繑鍥炲浘涔﹁鎯呴〉闈�',
confirmText: '纭畾',
showCancel: false, // 鍏抽棴鍙栨秷鎸夐挳
success: function (res) {
diff --git a/packageDomain/pages/publickBookForm/index.js b/packageDomain/pages/publickBookForm/index.js
index bf7f175..0772913 100644
--- a/packageDomain/pages/publickBookForm/index.js
+++ b/packageDomain/pages/publickBookForm/index.js
@@ -57,16 +57,16 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
*/
onShow() {
- const token = wx.getStorageSync(app.config.tokenKey)
- if (!token) {
- loginInfo(app, (data) => {
- if (data) {} else {
- wx.switchTab({
- url: '/pages/home/home',
- })
- }
- })
- } else {}
+ // const token = wx.getStorageSync(app.config.tokenKey)
+ // if (!token) {
+ // loginInfo(app, (data) => {
+ // if (data) {} else {
+ // wx.switchTab({
+ // url: '/pages/home/home',
+ // })
+ // }
+ // })
+ // } else {}
},
/**
@@ -213,6 +213,11 @@
submit() {
let that = this;
+ const token = wx.getStorageSync(app.config.tokenKey)
+ if (!token) {
+ loginInfo(app, (data) => {})
+ return false
+ }
if (!that.data.teacherInfo.topicName) {
wx.showToast({
title: "璇峰～鍐欓�夐鍚嶇О锛�",
diff --git a/packageDomain/pages/resourceDetails/document/index.js b/packageDomain/pages/resourceDetails/document/index.js
index c5247eb..9f1643a 100644
--- a/packageDomain/pages/resourceDetails/document/index.js
+++ b/packageDomain/pages/resourceDetails/document/index.js
@@ -233,7 +233,8 @@
if (this.data.storeInfo) query['storeInfo'] = this.data.storeInfo
app.MG.store.getProductDetail(query).then(async (res) => {
this.setData({
- bookDetail: res.datas
+ bookDetail: res.datas,
+ bookName: res.datas.name,
})
this.resourceDetailsData();
});
@@ -308,7 +309,7 @@
wx.hideLoading();
wx.showModal({
title: '娓╅Θ鎻愮ず',
- content: '璇ヨ祫婧愭湭璐拱锛屽皢杩斿洖璐拱',
+ content: '璇ヨ祫婧愭湭婵�娲绘垨璐拱锛屽嵆灏嗚繑鍥炲浘涔﹁鎯呴〉闈�',
success: (res) => {
if (res.confirm) {
if (this.data.source == 'qrcode') {
diff --git a/packageDomain/pages/resourceDetails/document/index.wxml b/packageDomain/pages/resourceDetails/document/index.wxml
index f4e3b5a..9c41886 100644
--- a/packageDomain/pages/resourceDetails/document/index.wxml
+++ b/packageDomain/pages/resourceDetails/document/index.wxml
@@ -1,19 +1,8 @@
-<view
- class="titleNameBox"
- wx:if="{{selectType != 'webpage' && learnSelectType != 'webpage'}}"
->
+<view class="titleNameBox" wx:if="{{selectType != 'webpage' && learnSelectType != 'webpage'}}">
{{titleName}}
</view>
-<view
- class="pictureBox"
- wx:if="{{selectType == 'picture' || learnSelectType == 'picture'}}"
->
- <image
- src="{{showData}}"
- mode="widthFix"
- data-src="{{showData}}"
- bindtap="preview"
- />
+<view class="pictureBox" wx:if="{{selectType == 'picture' || learnSelectType == 'picture'}}">
+ <image src="{{showData}}" mode="widthFix" data-src="{{showData}}" bindtap="preview" />
</view>
<view wx:if="{{selectType == 'zip' || learnSelectType == 'zip'}}">
@@ -28,79 +17,25 @@
</view>
</view>
-<view
- wx:if="{{(selectType == 'document' || learnSelectType == 'document') && selectTypeData == 'excel'}}"
- class="excelBox"
->
- <view
- wx:for="{{naturalResources}}"
- wx:key="key"
- wx:for-item="item"
- wx:for-index="index"
- class="textBox"
- >
- <view
- class="textWidth"
- wx:for="{{item}}"
- wx:key="key1"
- wx:for-index="index1"
- wx:for-item="item1"
- >{{item1}}</view
- >
+<view wx:if="{{(selectType == 'document' || learnSelectType == 'document') && selectTypeData == 'excel'}}" class="excelBox">
+ <view wx:for="{{naturalResources}}" wx:key="key" wx:for-item="item" wx:for-index="index" class="textBox">
+ <view class="textWidth" wx:for="{{item}}" wx:key="key1" wx:for-index="index1" wx:for-item="item1">{{item1}}</view>
</view>
</view>
-<scroll-view
- wx:if="{{(selectType == 'pdf' || selectType == 'document' || learnSelectType == 'pdf' || learnSelectType == 'document') && selectTypeData != 'excel'}}"
- scroll-y="{{true}}"
- bindscrolltolower="scrolltolower"
- class="scrollBox"
->
- <view
- wx:for="{{naturalResources}}"
- wx:key="index"
- wx:for-item="item"
- wx:for-index="index"
- class="img-box"
- >
- <image
- src="{{item}}"
- data-src="{{item}}"
- bind:tap="preview"
- alt=""
- style="min-height: 550px; width: 100%"
- mode="aspectFit"
- ></image>
+<scroll-view wx:if="{{(selectType == 'pdf' || selectType == 'document' || learnSelectType == 'pdf' || learnSelectType == 'document') && selectTypeData != 'excel'}}" scroll-y="{{true}}" bindscrolltolower="scrolltolower" class="scrollBox">
+ <view wx:for="{{naturalResources}}" wx:key="index" wx:for-item="item" wx:for-index="index" class="img-box">
+ <image src="{{item}}" data-src="{{item}}" bind:tap="preview" alt="" style="min-height: 550px; width: 100%" mode="aspectFit"></image>
<view class="divider">绗� {{index + 1}} 椤�</view>
</view>
<!-- <web-view src="{{pdfSrc}}" id="web-view-pdf" /> -->
</scroll-view>
-<web-view
- wx:if="{{selectType == 'webpage' || learnSelectType == 'webpage'}}"
- src="{{webpageSrc}}"
-></web-view>
+<web-view wx:if="{{selectType == 'webpage' || learnSelectType == 'webpage'}}" src="{{webpageSrc}}"></web-view>
<!-- <button bind:tap="handleTap">鐐逛綅</button> -->
<!-- <t-button theme="primary" size="large" variant="outline" block>鍩虹鍥剧墖棰勮</t-button> -->
<t-toast id="t-toast" />
-<t-image-viewer
- usingCustomNavbar
- deleteBtn="{{deleteBtn}}"
- closeBtn="{{closeBtn}}"
- showIndex="{{showIndex}}"
- visible="{{visible}}"
- images="{{images}}"
- bind:change="onChange"
- bind:delete="onDelete"
- bind:close="onClose"
-></t-image-viewer>
+<t-image-viewer usingCustomNavbar deleteBtn="{{deleteBtn}}" closeBtn="{{closeBtn}}" showIndex="{{showIndex}}" visible="{{visible}}" images="{{images}}" bind:change="onChange" bind:delete="onDelete" bind:close="onClose"></t-image-viewer>
-<t-dialog
- class="prompDialog"
- visible="{{promptVisable}}"
- title="鎻愮ず"
- content="璇曠湅缁撴潫锛岃璐拱姝ｅ紡璧勬簮"
- confirm-btn="{{ confirmBtn }}"
- bind:confirm="closePromapDialog"
-/>
+<t-dialog class="prompDialog" visible="{{promptVisable}}" title="鎻愮ず" content="璇曠湅缁撴潫锛岃璐拱姝ｅ紡璧勬簮" confirm-btn="{{ confirmBtn }}" bind:confirm="closePromapDialog" />
\ No newline at end of file
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.js b/packageDomain/pages/resourceDetails/myAudio/index.js
index 243bcda..edd87da 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.js
+++ b/packageDomain/pages/resourceDetails/myAudio/index.js
@@ -273,6 +273,7 @@
app.MG.store.getProductDetail(query).then(async (res) => {
this.setData({
bookDetail: res.datas,
+ bookName: res.datas.name,
buyIdList: res.datas.purchasedSaleMethodIdList,
learnClassData: res.datas.cmsDatas[0].datas.find(item => item.refCode == "jsek_cloudLearning")
})
@@ -405,7 +406,7 @@
wx.hideLoading();
wx.showModal({
title: '娓╅Θ鎻愮ず',
- content: '璇ヨ祫婧愭湭璐拱锛屽皢杩斿洖璐拱',
+ content: '璇ヨ祫婧愭湭婵�娲绘垨璐拱锛屽嵆灏嗚繑鍥炲浘涔﹁鎯呴〉闈�',
success: (res) => {
if (res.confirm) {
if (this.data.source == 'qrcode') {
diff --git a/packageDomain/pages/resourceDetails/myVideo/index.js b/packageDomain/pages/resourceDetails/myVideo/index.js
index c3f44a1..ad5933d 100644
--- a/packageDomain/pages/resourceDetails/myVideo/index.js
+++ b/packageDomain/pages/resourceDetails/myVideo/index.js
@@ -219,6 +219,7 @@
try {
this.setData({
bookDetail: res.datas,
+ bookName: res.datas.name,
buyIdList: res.datas.purchasedSaleMethodIdList,
learnClassData: res.datas.cmsDatas[0].datas.length > 0 ? res.datas.cmsDatas[0].datas.find(item => item.refCode == "jsek_cloudLearning") : null
})
@@ -230,7 +231,6 @@
} catch (error) {
console.log(error)
}
-
});
},
// 鏁欏璧勬簮 浜戝涔� 鑾峰彇
@@ -329,8 +329,6 @@
goBack() {
wx.navigateBack();
},
-
-
async getBuyCmsItem() {
let cmsItemData = null
let query = {
@@ -389,7 +387,7 @@
wx.hideLoading();
wx.showModal({
title: '娓╅Θ鎻愮ず',
- content: '璇ヨ祫婧愭湭璐拱锛屽皢杩斿洖璐拱',
+ content: '璇ヨ祫婧愭湭婵�娲绘垨璐拱锛屽嵆灏嗚繑鍥炲浘涔﹁鎯呴〉闈�',
success: (res) => {
if (res.confirm) {
if (this.data.source == 'qrcode') {
@@ -406,10 +404,8 @@
} else {
cmsItemData = dataList[0]
}
-
return cmsItemData
},
-
resourceDetailsData() {
this.setData({
videoLoading: true,
@@ -507,7 +503,6 @@
})
})
},
-
onVideo(e) {
this.setPlayerList()
const item = e.currentTarget.dataset.item
diff --git a/pages/home/home.js b/pages/home/home.js
index 21b3c04..2027911 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -544,6 +544,7 @@
})
})
},
+
addCart(e) {
const {
info
diff --git a/pages/home/home.wxml b/pages/home/home.wxml
index 701fb14..e64a92e 100644
--- a/pages/home/home.wxml
+++ b/pages/home/home.wxml
@@ -8,7 +8,7 @@
<image src="https://jsek.bnuic.com/home/image/home-bg.png" mode="heightFix" class="image" />
</view>
<view class="search">
- <image class="icon" src="/static/images/home/nav_icon_scan.png" bindtap="onIconScanTap" />
+ <image class="icon" src="/static/images/home/nav_icon_scan.png" bindtap="onIconScanTap" mode="aspectFit" />
<t-search t-class-input="t-search__input" t-class-input-container="t-search__input-container" placeholder="璇疯緭鍏ュ叧閿瘝/涔﹀悕/ISBN/浣滆��/椤圭洰璐熻矗浜�" leftIcon="" bind:submit="onRetrievalPage" model:value="{{searchVal}}">
<t-icon slot="left-icon" prefix="wr" name="search" size="40rpx" color="#bbb" bind:tap="onRetrievalPage" />
</t-search>
diff --git a/pages/home/home.wxss b/pages/home/home.wxss
index e0c52ff..5963943 100644
--- a/pages/home/home.wxss
+++ b/pages/home/home.wxss
@@ -55,13 +55,13 @@
background: #fff !important;
font-size: 28rpx !important;
flex: 1;
- width: 85vw;
+ width: 82vw;
margin-left: 20rpx;
}
.home-page-header .search .icon {
- width: 40rpx;
- height: 40rpx;
+ width: 60rpx;
+ height: 60rpx;
}
diff --git a/static/images/home/nav_icon_scan.png b/static/images/home/nav_icon_scan.png
index 21d2d63..1be4698 100644
--- a/static/images/home/nav_icon_scan.png
+++ b/static/images/home/nav_icon_scan.png
Binary files differ
--
Gitblit v1.9.1