From 1951e6ccf8dff46e6f8c671308f6e4db694fc800 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期五, 12 七月 2024 17:23:49 +0800
Subject: [PATCH] bug
---
packageDomain/pages/resourceDetails/myVideo/index.json | 1
packageBookService/pages/bookServices/list/index.wxss | 2
app.wxss | 5 ++
pages/digitalTextbooks/digitalTextbooksDetails/index.wxml | 18 ++++-----
pages/digitalTextbooks/digitalTextbooksDetails/index.json | 1
packageDomain/pages/sampleBookList/applicationForm/index.js | 25 ++++++------
packageBookService/pages/bookServices/detail/index.js | 4 +-
pages/digitalTextbooks/digitalTextbooksDetails/index.js | 24 ++++++++++++
packageDomain/pages/sampleBookList/applicationForm/index.wxml | 6 +-
9 files changed, 57 insertions(+), 29 deletions(-)
diff --git a/app.wxss b/app.wxss
index fc0f368..c2d9064 100644
--- a/app.wxss
+++ b/app.wxss
@@ -12,4 +12,9 @@
.t-loading__circular {
color: #ff6d00 !important;
+}
+
+@font-face {
+ font-family: "JDLANGZHENGTI";
+ src: url('https://jsek.bnuic.com/home/font/JDLANGZHENGTI.TTF')format("truetype");
}
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index 9601c49..9be7119 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -944,7 +944,7 @@
})
}
}
- const addNum = query.cmsPath.length > 10 ? 7 : query.cmsPath.length > 13 ? 8 : 6
+ const addNum = query.cmsPath.length > 11 ? 7 : query.cmsPath.length > 13 ? 8 : 6
const num = query.cmsPath.length + addNum
this.getTreeList(res.datas.cmsDatas[0].datas, num, list, '\\', addNum)
list = this.ensureTreeConsistency(list)
@@ -1035,7 +1035,7 @@
if (data.length > 0) {
let list = []
// 娴嬭瘯 6浣�// 姝ｅ紡 5浣�// 娴嬭瘯璋冪敤浼�20锛屽唴閮�7 姝ｅ紡璋冪敤浼�17 鍐呴儴浼�6
- const addNum = query.cmsPath.length > 10 ? 7 : query.cmsPath.length > 13 ? 8 : 6
+ const addNum = query.cmsPath.length > 11 ? 7 : query.cmsPath.length > 13 ? 8 : 6
const num = query.cmsPath.length + addNum
this.getTreeList(data, num, list, '\\', addNum)
list = this.ensureTreeConsistency(list)
diff --git a/packageBookService/pages/bookServices/list/index.wxss b/packageBookService/pages/bookServices/list/index.wxss
index 9faaf01..bf0deb6 100644
--- a/packageBookService/pages/bookServices/list/index.wxss
+++ b/packageBookService/pages/bookServices/list/index.wxss
@@ -147,7 +147,7 @@
.assort-title .title-name {
font-size: 32rpx;
margin-left: 32rpx;
- font-weight: 700;
+ font-family: "JDLANGZHENGTI";
}
.book-list {
diff --git a/packageDomain/pages/resourceDetails/myVideo/index.json b/packageDomain/pages/resourceDetails/myVideo/index.json
index d733c53..0ddab96 100644
--- a/packageDomain/pages/resourceDetails/myVideo/index.json
+++ b/packageDomain/pages/resourceDetails/myVideo/index.json
@@ -1,6 +1,7 @@
{
"component": true,
"usingComponents": {
+ "cti-video": "plugin://cti-video/cti-video",
"t-icon": "tdesign-miniprogram/icon/icon",
"t-tabs": "tdesign-miniprogram/tabs/tabs",
"t-tab-panel": "tdesign-miniprogram/tab-panel/tab-panel",
diff --git a/packageDomain/pages/sampleBookList/applicationForm/index.js b/packageDomain/pages/sampleBookList/applicationForm/index.js
index 8a7d525..451f903 100644
--- a/packageDomain/pages/sampleBookList/applicationForm/index.js
+++ b/packageDomain/pages/sampleBookList/applicationForm/index.js
@@ -5,18 +5,18 @@
Page({
data: {
userInfo: null,
- active: 0,
+ active: '0',
description: "", //鐢宠瑙勫垯
teacherInfo: {
workInfo: null,
schoolName: "",
courseName: "",
- detailedAddress: ""
+ address: ""
},
contactInfo: {
- fullName: "",
+ user: "",
phone: "",
- detailedAddress: ""
+ address: ""
},
phoneError: false,
paperBookList: [], //鏍蜂功鍗曠焊璐ㄤ功
@@ -48,9 +48,9 @@
that.setData({
'teacherInfo.schoolName': JSON.parse(that.data.userInfo.data).schoolName,
'teacherInfo.courseName': JSON.parse(that.data.userInfo.data).courseName,
- 'contactInfo.fullName': JSON.parse(that.data.userInfo.data).fullName,
+ 'contactInfo.user': JSON.parse(that.data.userInfo.data).fullName,
'contactInfo.phone': JSON.parse(that.data.userInfo.data).phone,
- 'contactInfo.detailedAddress': JSON.parse(that.data.userInfo.data).detailedAddress,
+ 'contactInfo.address': JSON.parse(that.data.userInfo.data).detailedAddress,
})
} else {
wx.showModal({
@@ -154,6 +154,7 @@
'teacherInfo.workInfo': res[0].cmsTypeLinks[0].children,
})
}
+
})
},
//鑾峰彇褰撳墠宸茬敵璇锋鏁帮紙鐢靛瓙锛�
@@ -187,7 +188,7 @@
//濮撳悕
onFullNameInput(e) {
this.setData({
- "contactInfo.fullName": e.detail.value,
+ "contactInfo.user": e.detail.value,
});
},
//杈撳叆鎵嬫満鍙�
@@ -209,13 +210,11 @@
});
}
},
- onAddressInput() {
+ onAddressInput(e) {
this.setData({
- "contactInfo.detailedAddress": e.detail.value,
+ "contactInfo.address": e.detail.value,
});
},
-
-
submit() {
let that = this;
if (that.data.bookList.length > 0) {
@@ -253,7 +252,7 @@
refType: 'applyBook'
}
} else {
- if (!(that.data.contactInfo.fullName && that.data.contactInfo.phone && that.data.contactInfo.detailedAddress)) {
+ if (!(that.data.contactInfo.user && that.data.contactInfo.phone && that.data.contactInfo.address)) {
wx.showToast({
title: "璇峰皢鏀惰揣浜轰俊鎭～鍐欏畬鏁达紒",
icon: 'none',
@@ -263,7 +262,7 @@
}
const mailAddress = JSON.stringify(that.data.contactInfo)
that.setData({
- 'teacherInfo.detailedAddress': mailAddress
+ 'teacherInfo.address': mailAddress
})
data = {
diff --git a/packageDomain/pages/sampleBookList/applicationForm/index.wxml b/packageDomain/pages/sampleBookList/applicationForm/index.wxml
index 9958e41..acd5bf8 100644
--- a/packageDomain/pages/sampleBookList/applicationForm/index.wxml
+++ b/packageDomain/pages/sampleBookList/applicationForm/index.wxml
@@ -51,11 +51,11 @@
</view>
</view>
<view class="title" wx:if="{{active =='0'}}"> 鏀惰揣浜烘儏鍐� </view>
- <view class="receiverInfo" wx:if="{{active =='0'}}">
+ <view class="receiverInfo" wx:if="{{active == '0'}}">
<view class="item form-input-1">
<text class="label"><text class="icon">*</text>濮撳悕锛�</text>
<view class="item-content">
- <t-input placeholder="璇疯緭鍏ョ湡瀹炲鍚�" borderless value="{{contactInfo.fullName}}" bindchange="onFullNameInput" adjust-position="{{isIos?false:true}}" bindkeyboardheightchange="bindkeyboardheightchange" bindblur="changeParam" data-class="form-input-1" />
+ <t-input placeholder="璇疯緭鍏ョ湡瀹炲鍚�" borderless value="{{contactInfo.user}}" bindchange="onFullNameInput" adjust-position="{{isIos?false:true}}" bindkeyboardheightchange="bindkeyboardheightchange" bindblur="changeParam" data-class="form-input-1" />
</view>
</view>
<view class="item form-input-2">
@@ -67,7 +67,7 @@
<view class="item form-input-3">
<text class="label"><text class="icon">*</text>璇︾粏鍦板潃锛�</text>
<view class="item-content">
- <t-input placeholder="璇疯緭鍏ヨ缁嗗湴鍧�" borderless value="{{contactInfo.detailedAddress}}" bindchange="onAddressInput" adjust-position="{{isIos?false:true}}" bindkeyboardheightchange="bindkeyboardheightchange" bindblur="changeParam" data-class="form-input-3" />
+ <t-input placeholder="璇疯緭鍏ヨ缁嗗湴鍧�" borderless value="{{contactInfo.address}}" bindchange="onAddressInput" adjust-position="{{isIos?false:true}}" bindkeyboardheightchange="bindkeyboardheightchange" bindblur="changeParam" data-class="form-input-3" />
</view>
</view>
</view>
diff --git a/pages/digitalTextbooks/digitalTextbooksDetails/index.js b/pages/digitalTextbooks/digitalTextbooksDetails/index.js
index 971c831..9f11531 100644
--- a/pages/digitalTextbooks/digitalTextbooksDetails/index.js
+++ b/pages/digitalTextbooks/digitalTextbooksDetails/index.js
@@ -773,4 +773,28 @@
}
},
+ //璇佷功鏌ョ湅
+ onClick1() {
+ this.setData({
+ images: ['/static/images/certificate/cbzs.jpg'],
+ showIndex: true,
+ visible: true,
+ })
+ },
+ onClick2() {
+ this.setData({
+ images: ['/static/images/certificate/rzzs.jpg'],
+ showIndex: true,
+ visible: true,
+ })
+ },
+ onClose(e) {
+ const {
+ trigger
+ } = e.detail;
+ this.setData({
+ visible: false,
+ });
+ }
+
})
\ No newline at end of file
diff --git a/pages/digitalTextbooks/digitalTextbooksDetails/index.json b/pages/digitalTextbooks/digitalTextbooksDetails/index.json
index 308811f..c5229c2 100644
--- a/pages/digitalTextbooks/digitalTextbooksDetails/index.json
+++ b/pages/digitalTextbooks/digitalTextbooksDetails/index.json
@@ -8,6 +8,7 @@
"t-empty": "tdesign-miniprogram/empty/empty",
"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"
}
}
\ No newline at end of file
diff --git a/pages/digitalTextbooks/digitalTextbooksDetails/index.wxml b/pages/digitalTextbooks/digitalTextbooksDetails/index.wxml
index 64a25fb..a9e6063 100644
--- a/pages/digitalTextbooks/digitalTextbooksDetails/index.wxml
+++ b/pages/digitalTextbooks/digitalTextbooksDetails/index.wxml
@@ -87,16 +87,14 @@
</view>
<view class="basic"> 璇佷功淇℃伅</view>
</view>
- <!-- <view class="certificateChart">
- <view class="chart">
- <image src="" mode="" />
+ <view class="certificateChart">
+ <view class="chart" bind:tap="onClick1">
+ <image src="/static/images/certificate/cbzs.jpg" mode="" />
+ </view>
+ <view class="chart" bind:tap="onClick2">
+ <image src="/static/images/certificate/rzzs.jpg" mode="" />
+ </view>
</view>
- <view class="chart">
- <image src="" mode="" />
- </view>
- </view> -->
-
-
<view class="noDataBox">
<!-- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" font-size="80" /> -->
<empty />
@@ -211,6 +209,6 @@
</view>
</view>
</view>
-
+<t-image-viewer usingCustomNavbar deleteBtn="{{deleteBtn}}" closeBtn="{{closeBtn}}" showIndex="{{showIndex}}" visible="{{visible}}" images="{{images}}" bind:change="onChange" bind:close="onClose"></t-image-viewer>
<t-toast id="t-toast" />
\ No newline at end of file
--
Gitblit v1.9.1