From 81c23f9c2f5bdfbe962d0b19a5a80ea7c12f043d Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期三, 10 七月 2024 17:39:02 +0800
Subject: [PATCH] 二维码
---
pages/test/testCover.wxml | 2
pages/home/home.js | 3
pages/index/bookDetail.json | 3
pages/index/resourceCover.js | 6
pages/index/resourceCover.wxml | 2
pages/index/resourceCover.wxss | 1
pages/test/testCover.wxss | 1
packageDomain/pages/resourceDetails/myVideo/index.js | 9
pages/index/bookDetail.wxml | 2
pages/test/testCover.js | 2
/dev/null | 140 -------
pages/index/bookDetail.wxss | 1
packageDomain/pages/resourceDetails/myVideo/index.wxml | 11
pages/test/testCover.json | 3
pages/index/resourceCover.json | 3
packageDomain/pages/resourceDetails/myVideo/index.wxss | 6
pages/index/bookDetail.js | 4
pages/bibliographyList/index.js | 994 +++++++++++++++++++++++++------------------------
18 files changed, 539 insertions(+), 654 deletions(-)
diff --git a/packageDomain/pages/resourceDetails/myVideo/index.js b/packageDomain/pages/resourceDetails/myVideo/index.js
index 1734666..ab3f70a 100644
--- a/packageDomain/pages/resourceDetails/myVideo/index.js
+++ b/packageDomain/pages/resourceDetails/myVideo/index.js
@@ -207,7 +207,8 @@
},
resourceDetailsData() {
this.setData({
- videoLoaidng: true
+ videoLoaidng: true,
+ loading: true
})
let query = {
storeInfo: this.data.storeInfo,
@@ -412,9 +413,9 @@
},
// 鑾峰彇绗旇鍒楄〃
async getNoteList() {
- // this.setData({
- // loading: true
- // })
+ this.setData({
+ loading: true
+ })
let topicId
await app.MG.ugc
.getProductUserSubmitTopic({
diff --git a/packageDomain/pages/resourceDetails/myVideo/index.skeleton.wxml b/packageDomain/pages/resourceDetails/myVideo/index.skeleton.wxml
deleted file mode 100644
index 6dc4be6..0000000
--- a/packageDomain/pages/resourceDetails/myVideo/index.skeleton.wxml
+++ /dev/null
@@ -1,213 +0,0 @@
-<!--
-姝ゆ枃浠朵负寮�鍙戣�呭伐鍏风敓鎴愶紝鐢熸垚鏃堕棿: 2024/4/11涓嬪崍6:39:42
-浣跨敤鏂规硶锛�
-鍦� D:\course_of_growth\jsekXcx\jsek-applet\packageDomain\pages\resourceDetails\myVideo\index.wxml 寮曞叆妯℃澘
-
-```
-<import src="index.skeleton.wxml"/>
-<template is="skeleton" wx:if="{{loading}}" />
-```
-
-鍦� D:\course_of_growth\jsekXcx\jsek-applet\packageDomain\pages\resourceDetails\myVideo\index.wxss 涓紩鍏ユ牱寮�
-```
-@import "./index.skeleton.wxss";
-```
-
-鏇村璇︾粏淇℃伅鍙互鍙傝�冩枃妗ｏ細https://developers.weixin.qq.com/miniprogram/dev/devtools/skeleton.html
--->
-<template name="skeleton">
- <view class="sk-container">
- <view style="width: 100%; height: 44px; "></view>
- <view class="nacigationBar" style="width: 70%; height: 40px;">
- <view>
- <view class="t-icon icon--t-icon " style="font-size: 30px;">
- <label class="t-icon-chevron-left icon--t-icon-chevron-left t-icon-base icon--t-icon-base sk-pseudo sk-pseudo-circle"></label>
- </view>
- </view>
- <view class="navbar-title sk-transparent sk-text-14-2857-124 sk-text">璧勬簮璇︽儏-瑙嗛</view>
- </view>
- <view class="videoBox">
- <view controls="true" enable-auto-rotation="true" enable-play-gesture="true" object-fit="fill" play-btn-position="center" src="http://182.92.203.7:3001/file/api/ApiDownload?md5=fb8ab1d18a75ffaf4bde4e47280f7c0b" unit-id="true" show-fullscreen-btn="true" class="sk-transparent sk-text--Infinity-550 sk-text sk-image">37:47</view>
- </view>
- <view class="titleBox sk-transparent sk-text-14-2857-20 sk-text">涓�銆侀亾寰蜂笌鍝佸痉鐨勫叧绯�-鏈夎瘯鐪�</view>
- <view class="contentBox">
- <view class="t-tabs tabs--t-tabs t-tabs--top tabs--t-tabs--top custom-tabs" style="true">
- <view class="t-sticky sticky--t-sticky tabs--t-tabs__sticky tabs--t-tabs__sticky--top" style="z-index:1;;">
- <view class="t-sticky__content sticky--t-sticky__content " style="z-index:1;;">
- <view class="t-tabs__wrapper tabs--t-tabs__wrapper t-tabs__wrapper--line tabs--t-tabs__wrapper--line">
- <scroll-view enable-flex="true" enable-passive="true" enhanced="true" scroll-anchoring="true" scroll-with-animation="true" class="t-tabs__scroll tabs--t-tabs__scroll t-tabs__scroll--top tabs--t-tabs__scroll--top t-tabs__scroll--split tabs--t-tabs__scroll--split sk-pseudo sk-pseudo-circle" scroll-left="0" scroll-x="true">
- <view class="t-tabs__nav tabs--t-tabs__nav t-tabs__nav--top tabs--t-tabs__nav--top" style="scroll-snap-align: none;">
- <view class="t-tabs__item tabs--t-tabs__item t-tabs__item--line tabs--t-tabs__item--line t-tabs__item--evenly tabs--t-tabs__item--evenly t-tabs__item--top tabs--t-tabs__item--top t-tabs__item--active tabs--t-tabs__item--active " data-index="0">
- <view class="t-tabs__item-inner tabs--t-tabs__item-inner t-tabs__item-inner--line tabs--t-tabs__item-inner--line t-tabs__item-inner--active tabs--t-tabs__item-inner--active sk-transparent sk-text-14-2857-701 sk-text">璧勬簮鍒楄〃</view>
- </view>
- <view class="t-tabs__item tabs--t-tabs__item t-tabs__item--line tabs--t-tabs__item--line t-tabs__item--evenly tabs--t-tabs__item--evenly t-tabs__item--top tabs--t-tabs__item--top " data-index="1">
- <view class="t-tabs__item-inner tabs--t-tabs__item-inner t-tabs__item-inner--line tabs--t-tabs__item-inner--line sk-transparent sk-text-14-2857-250 sk-text">绗旇</view>
- </view>
- <view class="t-tabs__track tabs--t-tabs__track t-tabs__track--top tabs--t-tabs__track--top " style="-webkit-transform: translateX(49px); transform: translateX(49px);"></view>
- </view>
- </scroll-view>
- </view>
- </view>
- </view>
- <view class="t-tabs__content tabs--t-tabs__content">
- <view class="t-tabs__content-inner tabs--t-tabs__content-inner custom-panel" style="true">
- <view class=" t-tab-panel tab-panel--t-tab-panel t-is-active tab-panel--t-is-active" style="width: 375px;" id="8dd02aa9--t_tabs_4_panel_0">
- <view class="wrapper">
- <view class=" t-collapse collapse--t-collapse t-collapse--default collapse--t-collapse--default" style="true">
- <view class="t-collapse-panel panel--t-collapse-panel t-collapse-panel--bottom panel--t-collapse-panel--bottom sk-pseudo sk-pseudo-circle" style="true">
- <view class="t-collapse-panel__title panel--t-collapse-panel__title sk-button">
- <view class="panel--t-collapse-panel__header panel--t-collapse-panel__header--bottom panel--t-collapse-panel__header--expanded t-cell cell--t-cell t-cell--middle cell--t-cell--middle sk-pseudo sk-pseudo-circle" hover-class="true" hover-stay-time="70" style="true">
- <view class="t-cell__left cell--t-cell__left "></view>
- <view class="t-cell__title cell--t-cell__title ">
- <view class="t-cell__title-text cell--t-cell__title-text panel--class-title sk-transparent sk-text-16-6667-511 sk-text"> 绗竴鑺� </view>
- <view class="t-cell__description cell--t-cell__description "></view>
- </view>
- <view class="t-cell__right cell--t-cell__right ">
- <view class="t-icon icon--t-icon cell--undefined cell--t-cell__right-icon panel--class-right-icon panel--t-collapse-panel__arrow--bottom" style="true">
- <label class="t-icon-chevron-up icon--t-icon-chevron-up t-icon-base icon--t-icon-base sk-pseudo sk-pseudo-circle"></label>
- </view>
- </view>
- </view>
- </view>
- <view class="t-collapse-panel__wrapper panel--t-collapse-panel__wrapper" style=";transition:0ms ease-in-out 0ms;transform:;transition-property:transform,height,top;transform-origin:50% 50% 0;-webkit-transition:0ms ease-in-out 0ms;-webkit-transform:;-webkit-transition-property:transform,height,top;-webkit-transform-origin:50% 50% 0;height:auto;top:0px">
- <view class="t-collapse-panel__content panel--t-collapse-panel__content sk-transparent">
- <view class="detailsName" data-index="0" data-item="[object Object]">
- <view style="color: #ff6c00" class="sk-transparent sk-text-16-6667-447 sk-text">涓�銆侀亾寰蜂笌鍝佸痉鐨勫叧绯�-鏈夎瘯鐪�</view>
- </view>
- <view class="detailsName" data-index="1" data-item="[object Object]">
- <view style="color: #000" class="sk-transparent sk-text-16-6667-527 sk-text">浜屻�侀噸瑙嗗痉鑲茬悊璁� 淇冭繘涓皬瀛︾敓鍝佸痉鐨勫彂灞�-鏃犺瘯鐪�</view>
- </view>
- <view class="detailsName" data-index="2" data-item="[object Object]">
- <view style="color: #000" class="sk-transparent sk-text-16-6667-291 sk-text">涓夈�佹暀甯堟槸瀛︽牎寰疯偛鐨勪富鍔涘啗</view>
- </view>
- </view>
- </view>
- </view>
- </view>
- </view>
- </view>
- <view class=" t-tab-panel tab-panel--t-tab-panel" style="display:flex;justify-content:center;align-items:center; height: 0;" id="32db8407--t_tabs_4_panel_1">
- <view class="wrapper">
- <view class=" t-collapse collapse--t-collapse t-collapse--default collapse--t-collapse--default" style="true">
- <view class="t-collapse-panel panel--t-collapse-panel t-collapse-panel--bottom panel--t-collapse-panel--bottom sk-pseudo sk-pseudo-circle" style="true">
- <view class="t-collapse-panel__title panel--t-collapse-panel__title sk-button">
- <view class="panel--t-collapse-panel__header panel--t-collapse-panel__header--bottom t-cell cell--t-cell t-cell--middle cell--t-cell--middle sk-pseudo sk-pseudo-circle" hover-class="true" hover-stay-time="70" style="true">
- <view class="t-cell__left cell--t-cell__left "></view>
- <view class="t-cell__title cell--t-cell__title ">
- <view class="t-cell__title-text cell--t-cell__title-text panel--class-title">
- <view class="collapse-header">
- <image class="note-icon t-image image--t-image t-image--shape-square image--t-image--shape-square sk-image" id="ebd0dd1d--image" mode="scaleToFill" style="true"></image>
- <view class="header-name sk-transparent sk-text-16-6667-849 sk-text">涓�銆侀亾寰蜂笌鍝佸痉鐨勫叧绯�-鏈夎瘯鐪�</view>
- </view>
- </view>
- <view class="t-cell__description cell--t-cell__description "></view>
- </view>
- <view class="t-cell__right cell--t-cell__right ">
- <view class="t-icon icon--t-icon cell--undefined cell--t-cell__right-icon panel--class-right-icon panel--t-collapse-panel__arrow--bottom" style="true">
- <label class="t-icon-chevron-down icon--t-icon-chevron-down t-icon-base icon--t-icon-base sk-pseudo sk-pseudo-circle"></label>
- </view>
- </view>
- </view>
- </view>
- <view class="t-collapse-panel__wrapper panel--t-collapse-panel__wrapper">
- <view class="t-collapse-panel__content panel--t-collapse-panel__content sk-transparent">
- <view>
- <view class="note-content sk-transparent sk-text-16-6667-129 sk-text">绫冲浗</view>
- <view class="note-bottom">
- <view class="note-time sk-transparent sk-text-16-6667-518 sk-text">2024-04-10 15:49:49</view>
- <view class="bottom-btn">
- <image class="complice t-image image--t-image t-image--shape-square image--t-image--shape-square sk-image" id="f874cd40--image" mode="scaleToFill" style="true"></image>
- <view></view>
- <image class="delete t-image image--t-image t-image--shape-square image--t-image--shape-square sk-image" id="fade9893--image" mode="scaleToFill" style="true"></image>
- </view>
- </view>
- </view>
- </view>
- </view>
- </view>
- <view class="t-collapse-panel panel--t-collapse-panel t-collapse-panel--bottom panel--t-collapse-panel--bottom sk-pseudo sk-pseudo-circle" style="true">
- <view class="t-collapse-panel__title panel--t-collapse-panel__title sk-button">
- <view class="panel--t-collapse-panel__header panel--t-collapse-panel__header--bottom t-cell cell--t-cell t-cell--middle cell--t-cell--middle sk-pseudo sk-pseudo-circle" hover-class="true" hover-stay-time="70" style="true">
- <view class="t-cell__left cell--t-cell__left "></view>
- <view class="t-cell__title cell--t-cell__title ">
- <view class="t-cell__title-text cell--t-cell__title-text panel--class-title">
- <view class="collapse-header">
- <image class="note-icon t-image image--t-image t-image--shape-square image--t-image--shape-square sk-image" id="c1a1821e--image" mode="scaleToFill" style="true"></image>
- <view class="header-name sk-transparent sk-text-16-6667-814 sk-text">涓�銆侀亾寰蜂笌鍝佸痉鐨勫叧绯�-鏈夎瘯鐪�</view>
- </view>
- </view>
- <view class="t-cell__description cell--t-cell__description "></view>
- </view>
- <view class="t-cell__right cell--t-cell__right ">
- <view class="t-icon icon--t-icon cell--undefined cell--t-cell__right-icon panel--class-right-icon panel--t-collapse-panel__arrow--bottom" style="true">
- <label class="t-icon-chevron-down icon--t-icon-chevron-down t-icon-base icon--t-icon-base sk-pseudo sk-pseudo-circle"></label>
- </view>
- </view>
- </view>
- </view>
- <view class="t-collapse-panel__wrapper panel--t-collapse-panel__wrapper">
- <view class="t-collapse-panel__content panel--t-collapse-panel__content sk-transparent">
- <view>
- <view class="note-content sk-transparent sk-text-16-6667-761 sk-text">sadsad</view>
- <view class="note-bottom">
- <view class="note-time sk-transparent sk-text-16-6667-226 sk-text">2024-04-09 17:29:22</view>
- <view class="bottom-btn">
- <image class="complice t-image image--t-image t-image--shape-square image--t-image--shape-square sk-image" id="69b62741--image" mode="scaleToFill" style="true"></image>
- <view></view>
- <image class="delete t-image image--t-image t-image--shape-square image--t-image--shape-square sk-image" id="4ac9b04c--image" mode="scaleToFill" style="true"></image>
- </view>
- </view>
- </view>
- </view>
- </view>
- </view>
- <view class="t-collapse-panel panel--t-collapse-panel t-collapse-panel--bottom panel--t-collapse-panel--bottom sk-pseudo sk-pseudo-circle" style="true">
- <view class="t-collapse-panel__title panel--t-collapse-panel__title sk-button">
- <view class="panel--t-collapse-panel__header panel--t-collapse-panel__header--bottom t-cell cell--t-cell t-cell--middle cell--t-cell--middle sk-pseudo sk-pseudo-circle" hover-class="true" hover-stay-time="70" style="true">
- <view class="t-cell__left cell--t-cell__left "></view>
- <view class="t-cell__title cell--t-cell__title ">
- <view class="t-cell__title-text cell--t-cell__title-text panel--class-title">
- <view class="collapse-header">
- <image class="note-icon t-image image--t-image t-image--shape-square image--t-image--shape-square sk-image" id="3a1b9843--image" mode="scaleToFill" style="true"></image>
- <view class="header-name sk-transparent sk-text-16-6667-819 sk-text">涓�銆侀亾寰蜂笌鍝佸痉鐨勫叧绯�-鏈夎瘯鐪�</view>
- </view>
- </view>
- <view class="t-cell__description cell--t-cell__description "></view>
- </view>
- <view class="t-cell__right cell--t-cell__right ">
- <view class="t-icon icon--t-icon cell--undefined cell--t-cell__right-icon panel--class-right-icon panel--t-collapse-panel__arrow--bottom" style="true">
- <label class="t-icon-chevron-down icon--t-icon-chevron-down t-icon-base icon--t-icon-base sk-pseudo sk-pseudo-circle"></label>
- </view>
- </view>
- </view>
- </view>
- <view class="t-collapse-panel__wrapper panel--t-collapse-panel__wrapper">
- <view class="t-collapse-panel__content panel--t-collapse-panel__content sk-transparent">
- <view>
- <view class="note-content sk-transparent sk-text-16-6667-784 sk-text">鏂囨槑灏�</view>
- <view class="note-bottom">
- <view class="note-time sk-transparent sk-text-16-6667-869 sk-text">2024-04-08 11:24:02</view>
- <view class="bottom-btn">
- <image class="complice t-image image--t-image t-image--shape-square image--t-image--shape-square sk-image" id="7e859dc7--image" mode="scaleToFill" style="true"></image>
- <view></view>
- <image class="delete t-image image--t-image t-image--shape-square image--t-image--shape-square sk-image" id="9b3ed7bb--image" mode="scaleToFill" style="true"></image>
- </view>
- </view>
- </view>
- </view>
- </view>
- </view>
- </view>
- </view>
- </view>
- </view>
- </view>
- </view>
- <view class="takeNotes" data-key="showCloseBtn">
- <view class="takeNotesLining sk-transparent">
- <image mode="true" class="sk-image"></image> 璁扮瑪璁�
- </view>
- </view>
- </view>
- </view>
-</template>
\ No newline at end of file
diff --git a/packageDomain/pages/resourceDetails/myVideo/index.skeleton.wxss b/packageDomain/pages/resourceDetails/myVideo/index.skeleton.wxss
deleted file mode 100644
index 1cc2f1d..0000000
--- a/packageDomain/pages/resourceDetails/myVideo/index.skeleton.wxss
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
-姝ゆ枃浠朵负寮�鍙戣�呭伐鍏风敓鎴愶紝鐢熸垚鏃堕棿: 2024/4/11涓嬪崍6:39:42
-
-鍦� D:\course_of_growth\jsekXcx\jsek-applet\packageDomain\pages\resourceDetails\myVideo\index.wxss 涓紩鍏ユ牱寮�
-```
-@import "./index.skeleton.wxss";
-```
-
-鏇村璇︾粏淇℃伅鍙互鍙傝�冩枃妗ｏ細https://developers.weixin.qq.com/miniprogram/dev/devtools/skeleton.html
-*/
-.sk-transparent {
- color: transparent !important;
- }
-.sk-text-14-2857-124 {
- background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
- background-size: 100% 56.0000rpx;
- position: relative !important;
- }
-.sk-text {
- background-origin: content-box !important;
- background-clip: content-box !important;
- background-color: transparent !important;
- color: transparent !important;
- background-repeat: repeat-y !important;
- }
-.sk-text--Infinity-550 {
- background-image: linear-gradient(transparent -Infinity%, #EEEEEE 0%, #EEEEEE NaN%, transparent 0%) !important;
- background-size: 100% 0.0000rpx;
- position: relative !important;
- }
-.sk-text-14-2857-20 {
- background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
- background-size: 100% 44.8000rpx;
- position: relative !important;
- }
-.sk-text-14-2857-701 {
- background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
- background-size: 100% 39.2000rpx;
- position: relative !important;
- }
-.sk-text-14-2857-250 {
- background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
- background-size: 100% 39.2000rpx;
- position: relative !important;
- }
-.sk-text-16-6667-511 {
- background-image: linear-gradient(transparent 16.6667%, #EEEEEE 0%, #EEEEEE 83.3333%, transparent 0%) !important;
- background-size: 100% 48.0000rpx;
- position: relative !important;
- }
-.sk-text-16-6667-447 {
- background-image: linear-gradient(transparent 16.6667%, #EEEEEE 0%, #EEEEEE 83.3333%, transparent 0%) !important;
- background-size: 100% 42.0000rpx;
- position: relative !important;
- }
-.sk-text-16-6667-527 {
- background-image: linear-gradient(transparent 16.6667%, #EEEEEE 0%, #EEEEEE 83.3333%, transparent 0%) !important;
- background-size: 100% 42.0000rpx;
- position: relative !important;
- }
-.sk-text-16-6667-291 {
- background-image: linear-gradient(transparent 16.6667%, #EEEEEE 0%, #EEEEEE 83.3333%, transparent 0%) !important;
- background-size: 100% 42.0000rpx;
- position: relative !important;
- }
-.sk-text-16-6667-849 {
- background-image: linear-gradient(transparent 16.6667%, #EEEEEE 0%, #EEEEEE 83.3333%, transparent 0%) !important;
- background-size: 100% 48.0000rpx;
- position: relative !important;
- }
-.sk-text-16-6667-129 {
- background-image: linear-gradient(transparent 16.6667%, #EEEEEE 0%, #EEEEEE 83.3333%, transparent 0%) !important;
- background-size: 100% 42.0000rpx;
- position: relative !important;
- }
-.sk-text-16-6667-518 {
- background-image: linear-gradient(transparent 16.6667%, #EEEEEE 0%, #EEEEEE 83.3333%, transparent 0%) !important;
- background-size: 100% 42.0000rpx;
- position: relative !important;
- }
-.sk-text-16-6667-814 {
- background-image: linear-gradient(transparent 16.6667%, #EEEEEE 0%, #EEEEEE 83.3333%, transparent 0%) !important;
- background-size: 100% 48.0000rpx;
- position: relative !important;
- }
-.sk-text-16-6667-761 {
- background-image: linear-gradient(transparent 16.6667%, #EEEEEE 0%, #EEEEEE 83.3333%, transparent 0%) !important;
- background-size: 100% 42.0000rpx;
- position: relative !important;
- }
-.sk-text-16-6667-226 {
- background-image: linear-gradient(transparent 16.6667%, #EEEEEE 0%, #EEEEEE 83.3333%, transparent 0%) !important;
- background-size: 100% 42.0000rpx;
- position: relative !important;
- }
-.sk-text-16-6667-819 {
- background-image: linear-gradient(transparent 16.6667%, #EEEEEE 0%, #EEEEEE 83.3333%, transparent 0%) !important;
- background-size: 100% 48.0000rpx;
- position: relative !important;
- }
-.sk-text-16-6667-784 {
- background-image: linear-gradient(transparent 16.6667%, #EEEEEE 0%, #EEEEEE 83.3333%, transparent 0%) !important;
- background-size: 100% 42.0000rpx;
- position: relative !important;
- }
-.sk-text-16-6667-869 {
- background-image: linear-gradient(transparent 16.6667%, #EEEEEE 0%, #EEEEEE 83.3333%, transparent 0%) !important;
- background-size: 100% 42.0000rpx;
- position: relative !important;
- }
-.sk-button {
- color: #EFEFEF !important;
- background: #EFEFEF !important;
- border: none !important;
- box-shadow: none !important;
- }
-.sk-image {
- background: #EFEFEF !important;
- }
-.sk-pseudo::before, .sk-pseudo::after {
- background: #EFEFEF !important;
- background-image: none !important;
- color: transparent !important;
- border-color: transparent !important;
- }
-.sk-pseudo-rect::before, .sk-pseudo-rect::after {
- border-radius: 0 !important;
- }
-.sk-pseudo-circle::before, .sk-pseudo-circle::after {
- border-radius: 50% !important;
- }
-.sk-container {
- position: absolute;
- left: 0;
- top: 0;
- width: 100%;
- height: 100%;
- overflow: hidden;
- background-color: transparent;
- }
diff --git a/packageDomain/pages/resourceDetails/myVideo/index.wxml b/packageDomain/pages/resourceDetails/myVideo/index.wxml
index 7845c6e..35f1699 100644
--- a/packageDomain/pages/resourceDetails/myVideo/index.wxml
+++ b/packageDomain/pages/resourceDetails/myVideo/index.wxml
@@ -1,7 +1,4 @@
-<import src="index.skeleton.wxml" />
-<template is="skeleton" wx:if="{{loading}}" />
-
-<view wx:if="{{!loading}}">
+<view>
<!-- <view style="width: 100%; height: {{barHeight}}px; "></view>
<view class="nacigationBar" style="width: 100%; height: {{navBarHeight}}px;">
<view>
@@ -29,7 +26,10 @@
<t-tabs defaultValue="{{0}}" bind:change="onTabsChange" bind:click="onTabsClick" t-class="custom-tabs" t-class-content="custom-panel" split="{{false}}">
<!-- 璧勬簮鍒楄〃 -->
<t-tab-panel label="璧勬簮鍒楄〃" value="0" style="{{tabPanelstyle}}" style="width: 750rpx">
- <view class="wrapper">
+ <view class="demo-section__content" wx:if="{{loading}}">
+ <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}}">
@@ -37,6 +37,7 @@
</view>
</view>
</view>
+
</t-tab-panel>
<!-- 绗旇灞曠ず -->
<t-tab-panel label="绗旇" value="1" style="{{tabPanelstyle}}">
diff --git a/packageDomain/pages/resourceDetails/myVideo/index.wxss b/packageDomain/pages/resourceDetails/myVideo/index.wxss
index 4f33124..084a21c 100644
--- a/packageDomain/pages/resourceDetails/myVideo/index.wxss
+++ b/packageDomain/pages/resourceDetails/myVideo/index.wxss
@@ -1,6 +1,4 @@
/* pages/resourceDetails/index.wxss */
-@import "./index.skeleton.wxss";
-
.nacigationBar {
background-color: #fff;
display: flex;
@@ -354,4 +352,8 @@
overflow-y: scroll;
overflow-x: hidden;
height: 50vh;
+}
+
+.demo-section__content {
+ margin: 40rpx;
}
\ No newline at end of file
diff --git a/pages/bibliographyList/index.js b/pages/bibliographyList/index.js
index 32eb3c8..f1bca7e 100644
--- a/pages/bibliographyList/index.js
+++ b/pages/bibliographyList/index.js
@@ -1,496 +1,512 @@
// pages/bibliographyList/index.js
import Toast from 'tdesign-miniprogram/toast/index';
const app = getApp()
-const config =
- Page({
+import {
+ loginInfo
+} from '../../assets/js/login';
+Page({
- /**
- * 椤甸潰鐨勫垵濮嬫暟鎹�
- */
- data: {
- personalDataEmail: '',
- hiddenmodalput: false,
- name: "",
- phoneNum: '',
- input: '',
- dialogKey: '',
- showWithInput: false,
- showTextAndTitleWithInput: false,
- downloadLoadin: false,
- isMore: null,
- higherList: [],
- vocationalList: [],
- teacherList: [],
- higherTotal: 0,
- vocationalTotal: 0,
- teacherTotal: 0,
- value: '',
- BarHeight: '',
- navBarHeight: '',
- start: 1,
- tabValue: '',
- keyword: '',
- Md5: '',
- emailError: false,
- loading: true, //寮�鍚鏋跺睆鍔犺浇
- hidden: true, //鏄惁灞曠ず鍐呭
- height: '',
- dialogBox: false,
- inputStyle: 'border: 2rpx solid rgba(220,220,220,1);border-radius: 12rpx; padding: 0 0 0 16rpx;height:70rpx',
- },
+ /**
+ * 椤甸潰鐨勫垵濮嬫暟鎹�
+ */
+ data: {
+ personalDataEmail: '',
+ hiddenmodalput: false,
+ name: "",
+ phoneNum: '',
+ input: '',
+ dialogKey: '',
+ showWithInput: false,
+ showTextAndTitleWithInput: false,
+ downloadLoadin: false,
+ isMore: null,
+ higherList: [],
+ vocationalList: [],
+ teacherList: [],
+ higherTotal: 0,
+ vocationalTotal: 0,
+ teacherTotal: 0,
+ value: '',
+ BarHeight: '',
+ navBarHeight: '',
+ start: 1,
+ tabValue: '',
+ keyword: '',
+ Md5: '',
+ emailError: false,
+ loading: true, //寮�鍚鏋跺睆鍔犺浇
+ hidden: true, //鏄惁灞曠ず鍐呭
+ height: '',
+ dialogBox: false,
+ inputStyle: 'border: 2rpx solid rgba(220,220,220,1);border-radius: 12rpx; padding: 0 0 0 16rpx;height:70rpx',
+ },
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
- */
- onLoad(options) {
- this.higherGet()
- this.vocationalGet()
- this.teacherGet()
- const systInfo = wx.getSystemInfoSync();
- const menu = wx.getMenuButtonBoundingClientRect(); // 鑳跺泭淇℃伅
- const navBarHeight = (menu.top - systInfo.statusBarHeight) * 2 + menu.height; // 瀵艰埅鏍忛珮搴�
- this.setData({
- navBarHeight: navBarHeight,
- barHeight: systInfo.statusBarHeight,
- })
- let event = {
- detail: {
- value: "0"
- }
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
+ */
+ onLoad(options) {
+ this.higherGet()
+ this.vocationalGet()
+ this.teacherGet()
+ const systInfo = wx.getSystemInfoSync();
+ const menu = wx.getMenuButtonBoundingClientRect(); // 鑳跺泭淇℃伅
+ const navBarHeight = (menu.top - systInfo.statusBarHeight) * 2 + menu.height; // 瀵艰埅鏍忛珮搴�
+ this.setData({
+ navBarHeight: navBarHeight,
+ barHeight: systInfo.statusBarHeight,
+ })
+ let event = {
+ detail: {
+ value: "0"
}
- this.onTabsChange(event)
- var that = this;
- // 鍔ㄦ�佽幏鍙栧睆骞曢珮搴�
- wx.getSystemInfo({
- success: (result) => {
- that.setData({
- height: result.windowHeight
- });
- },
- })
-
- this.ceShi()
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
- */
- onReady() {
-
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
- */
- onShow() {
- // console.log(this.data.value);
-
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
- */
- onHide() {
-
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
- */
- onUnload() {
-
- },
-
- /**
- * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
- */
- onPullDownRefresh() {
-
- },
-
- /**
- * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
- */
- onReachBottom() {
-
- },
-
- /**
- * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
- */
- onShareAppMessage() {
-
- },
- onTabsChange(event) {
- const value = event.detail.value
- this.setData({
- isMore: null,
- tabValue: value,
- })
- if (value == '0') {
- this.higherGet()
- } else if (value == '1') {
- this.vocationalGet()
- } else if (value == '2') {
- this.teacherGet()
- }
- },
- //楂樼瓑鏁欒偛
- higherGet(keyword) {
- let searchObj = {
- 'Name*': keyword,
- '||author*': keyword,
- '||isbn*': keyword
- }
- app.MG.resource.getItem({
- path: 'jsek_biblioClassification\\jsek_bCHigherEducation',
- queryType: '*',
- paging: {
- start: '0',
- size: this.data.start * 9
- },
- coverSize: {
- width: 260
- },
- fields: {
- jsek_link: [],
- subtitle: [],
- content: [],
- fileType: [],
- jsek_resource: [],
- freeFile: [],
- ...searchObj,
- },
- SysType: 'CmsItem'
- }).then(res => {
- res.datas.forEach(item => {
- item.determine = true
- })
- this.setData({
- higherList: res.datas,
- higherTotal: res.total
- })
- this.setData({
- loading: false, //寮�鍚鏋跺睆鍔犺浇
- hidden: false, //鏄惁灞曠ず鍐呭
- })
- if (res.datas.length < 7 && res.datas.length > 0) {
- this.setData({
- isMore: false
- })
- }
- })
- wx.stopPullDownRefresh()
- },
-
- //鏁欏笀鏁欒偛
- vocationalGet(keyword) {
- let searchObj = {
- 'Name*': keyword,
- '||author*': keyword,
- '||isbn*': keyword
- }
- app.MG.resource.getItem({
- path: 'jsek_biblioClassification\\jsek_bCVocationalEducation',
- queryType: '*',
- paging: {
- start: '0',
- size: this.data.start * 9
- },
- coverSize: {
- width: 260
- },
- fields: {
- jsek_link: [],
- content: [],
- subtitle: [],
- fileType: [],
- jsek_resource: [],
- freeFile: [],
- ...searchObj
- },
- SysType: 'CmsItem'
- }).then(res => {
- console.log(res);
- res.datas.forEach(item => {
- item.determine = true
- })
- this.setData({
- vocationalList: res.datas,
- vocationalTotal: res.total
- })
- if (res.datas.length < 7 && this.datas.length > 0) {
- this.setData({
- isMore: false
- })
- }
- })
- wx.stopPullDownRefresh()
- },
- // 鑱屼笟鏁欒偛
- teacherGet(keyword) {
- let searchObj = {
- 'Name*': keyword,
- '||author*': keyword,
- '||isbn*': keyword
- }
- app.MG.resource.getItem({
- path: 'jsek_biblioClassification\\jsek_bCTeacherEducation',
- queryType: '*',
- paging: {
- start: '0',
- size: this.data.start * 9
- },
- coverSize: {
- width: 260
- },
- fields: {
- jsek_link: [],
- content: [],
- subtitle: [],
- fileType: [],
- jsek_resource: [],
- freeFile: [],
- bookshelf_freeEpub: [], //epub璇曡鐧惧垎姣�
- bookshelf_probationPage: [], //pdf璇曡椤垫暟
- ...searchObj
- },
- SysType: 'CmsItem'
- }).then(res => {
- res.datas.forEach(item => {
- item.determine = true
- })
- this.setData({
- teacherList: res.datas,
- teacherTotal: res.total
- })
- if (res.datas.length < 7 && this.datas.length > 0) {
- this.setData({
- isMore: false
- })
- }
- })
- wx.stopPullDownRefresh()
- },
- // downloadData(event) {
- // this.setData({
- // downloadLoadin: true
- // })
- // console.log(111);
- // const item = event.currentTarget.dataset.item;
- // // console.log(item.datas.freeFile.Value);
- // const URL = app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.datas.freeFile.Value
- // item.determine = false
- // console.log(URL, 'URL');
- // setTimeout(() => {
- // if (URL) {
- // item.determine = true
- // }
- // }, 600)
- // wx.downloadFile({
- // url: URL,
- // success: function (res) {
- // const filePath = res.tempFilePath;
- // wx.openDocument({
- // filePath: filePath,
- // success: function (res) {
- // console.log('鎵撳紑鏂囨。鎴愬姛');
- // },
- // fail: function (res) {
- // console.log('鎵撳紑鏂囨。澶辫触', res);
- // }
- // });
- // },
- // fail: function (res) {
- // console.log('涓嬭浇鏂囦欢澶辫触', res);
- // }
- // });
- // setTimeout(() => {
- // this.setData({
- // downloadLoadin: false
- // });
- // }, 2000);
- // },
- downloadData(event) {
- const item = event.currentTarget.dataset.item
- if (item.fileType == "pdf") {
- wx.navigateTo({
- url: "/packageBookService/pages/components/webView/index?md5=" +
- item.freeFile +
- "&fileName=" +
- item.name +
- "&fileType=" +
- item.fileType + "&bookBuy=true"
- // "&freePage=" +
- // this.data.fileInfo.freePage +
-
- +
- "&bookId=" +
- item.id,
- });
- } else {
- Toast({
- context: this,
- selector: '#t-toast',
- message: '姝や功涓嶈兘鏌ョ湅',
- theme: 'warning',
- direction: 'column',
- });
- }
- },
- onSearchSubmit: function (e) {
- const keyword = e.detail.value;
- // 澶勭悊鎼滅储閫昏緫锛屼緥濡傚彂閫佹悳绱㈣姹傜瓑
- console.log('鎼滅储鍏抽敭璇嶏細', keyword);
- this.higherGet(keyword)
- this.vocationalGet(keyword)
- this.teacherGet(keyword)
- },
- goBack() {
- wx.navigateBack();
- },
- onReachBottom(e) {
- if (this.data.tabValue == 0) {
- if (this.data.higherList.length < this.data.higherTotal) {
- this.setData({
- isMore: true,
- start: this.data.start + 1
- })
- this.higherGet()
- } else {
- this.setData({
- isMore: true,
- })
- setTimeout(() => {
- this.setData({
- isMore: false
- })
- }, 100)
- }
- } else if (this.data.tabValue == 2) {
- if (this.data.teacherList.length < this.data.teacherTotal) {
- this.setData({
- isMore: true,
- start: this.data.start + 1
- })
- this.teacherGet()
- } else {
- this.setData({
- isMore: true,
- })
- setTimeout(() => {
- this.setData({
- isMore: false
- })
- }, 100)
- }
- } else if (this.data.tabValue == 1) {
- console.log(this.data.vocationalList.length);
- console.log(this.data.vocationalTotal);
- if (this.data.vocationalList.length < this.data.vocationalTotal) {
- this.setData({
- isMore: true,
- start: this.data.start + 1
- })
- this.vocationalGet()
- } else {
- this.setData({
- isMore: true,
- })
- setTimeout(() => {
- this.setData({
- isMore: false
- })
- }, 100)
- }
- }
- },
-
- onPullDownRefresh() {
- let keyword = this.data.value
- this.setData({
- start: 1,
- })
- this.higherGet(keyword)
- this.vocationalGet(keyword)
- this.teacherGet(keyword)
- },
- // 閭鐐瑰嚮
- mailbox(e) {
- const key = e.currentTarget.dataset.key;
- const item = e.currentTarget.dataset.item;
- this.setData({
- Md5: item.datas.freeFile.FileList[0].Md5,
- dialogBox: true
- })
- // wx.scanCode({
- // success: res => {
- // console.log(res);
- // }
- // })
- },
- // 寮圭獥鍙栨秷
- closeDialog() {
- this.setData({
- dialogBox: false,
- // input: ''
- })
- },
- //鎻愪氦
- confirmM(e) {
- wx.showLoading({
- title: '鍙戦�佷腑...',
- })
- const isEmailValid = /^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$/.test(this.data.input);
- if (isEmailValid && this.data.input) {
- this.setData({
- dialogBox: false
- })
- let query = {
- eMail: this.data.input,
- md5s: [this.data.Md5]
- }
- app.MG.file.sendFileWithEmail(query).then(res => {
- wx.hideLoading()
- if (res) {
- wx.showToast({
- icon: 'success',
- title: '閭欢宸插彂閫�',
- })
- }
- })
- } else {
- // 鏍￠獙涓嶉�氳繃锛岀粰鍑洪敊璇彁绀�
- wx.showToast({
- title: '閭鏍煎紡涓嶆纭�',
- icon: 'none',
- });
- }
- },
- inputChange(e) {
- this.setData({
- input: e.detail.value
- })
- },
- ceShi() {
- let that = this;
- // 鑾峰彇Storage涓殑鏁版嵁
- wx.getStorage({
- key: 'website-front-userInfo',
- success(res) {
- let datas = JSON.parse(res.data)
- console.log(datas.Email);
- let personalData = JSON.parse(datas.data)
-
- that.setData({
- input: datas.Email
- })
- console.log(that.data.value);
- },
- fail(err) {
- console.error(err);
- }
- });
-
}
- })
\ No newline at end of file
+ this.onTabsChange(event)
+ var that = this;
+ // 鍔ㄦ�佽幏鍙栧睆骞曢珮搴�
+ wx.getSystemInfo({
+ success: (result) => {
+ that.setData({
+ height: result.windowHeight
+ });
+ },
+ })
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
+ */
+ onShow() {
+ // console.log(this.data.value);
+ // 妫�鏌ョ櫥褰曠姸鎬�
+ const token = wx.getStorageSync(app.config.tokenKey)
+ if (!token) {
+ loginInfo(app, (data) => {
+ if (data) {
+ this.getUserInfo()
+ }
+ })
+ } else {
+ this.getUserInfo()
+ }
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
+ */
+ onShareAppMessage() {
+
+ },
+ // 鑾峰彇鐧诲綍鐢ㄦ埛韬唤
+ getUserInfo() {
+ app.MG.identity.getCurrentAppUser().then(res => {
+ // 鐢ㄦ埛淇℃伅浼樺厛绾э細鏁欏笀璁よ瘉 > 寰俊 > 瀛︾敓锛堟敞鍐屾椂榛樿锛�
+ if (res) {
+ //鑾峰彇鐢ㄦ埛绫诲瀷
+ let teacherRole = res.roleLinks.find((item) => item.role.refCode == 'teacher')
+ let teacherInfos = res.infoList.find((item) => item.type == 'teacherInfo')
+ let eMailData = res.secretList.find(i => i.type == 'EMail')
+ if (eMailData) {
+ this.setData({
+ input: eMailData.credential
+ })
+ } else if (teacherRole && teacherInfos) {
+ this.setData({
+ input: JSON.parse(teacherInfos.data).email
+ })
+ } else {
+ this.setData({
+ input: ''
+ })
+ }
+ }
+ });
+ },
+
+ onTabsChange(event) {
+ const value = event.detail.value
+ this.setData({
+ isMore: null,
+ tabValue: value,
+ })
+ if (value == '0') {
+ this.higherGet()
+ } else if (value == '1') {
+ this.vocationalGet()
+ } else if (value == '2') {
+ this.teacherGet()
+ }
+ },
+ //楂樼瓑鏁欒偛
+ higherGet(keyword) {
+ let searchObj = {
+ 'Name*': keyword,
+ '||author*': keyword,
+ '||isbn*': keyword
+ }
+ app.MG.resource.getItem({
+ path: 'jsek_biblioClassification\\jsek_bCHigherEducation',
+ queryType: '*',
+ paging: {
+ start: '0',
+ size: this.data.start * 9
+ },
+ coverSize: {
+ width: 260
+ },
+ fields: {
+ jsek_link: [],
+ subtitle: [],
+ content: [],
+ fileType: [],
+ jsek_resource: [],
+ freeFile: [],
+ ...searchObj,
+ },
+ SysType: 'CmsItem'
+ }).then(res => {
+ res.datas.forEach(item => {
+ item.determine = true
+ })
+ this.setData({
+ higherList: res.datas,
+ higherTotal: res.total
+ })
+ this.setData({
+ loading: false, //寮�鍚鏋跺睆鍔犺浇
+ hidden: false, //鏄惁灞曠ず鍐呭
+ })
+ if (res.datas.length < 7 && res.datas.length > 0) {
+ this.setData({
+ isMore: false
+ })
+ }
+ })
+ wx.stopPullDownRefresh()
+ },
+
+ //鏁欏笀鏁欒偛
+ vocationalGet(keyword) {
+ let searchObj = {
+ 'Name*': keyword,
+ '||author*': keyword,
+ '||isbn*': keyword
+ }
+ app.MG.resource.getItem({
+ path: 'jsek_biblioClassification\\jsek_bCVocationalEducation',
+ queryType: '*',
+ paging: {
+ start: '0',
+ size: this.data.start * 9
+ },
+ coverSize: {
+ width: 260
+ },
+ fields: {
+ jsek_link: [],
+ content: [],
+ subtitle: [],
+ fileType: [],
+ jsek_resource: [],
+ freeFile: [],
+ ...searchObj
+ },
+ SysType: 'CmsItem'
+ }).then(res => {
+ console.log(res);
+ res.datas.forEach(item => {
+ item.determine = true
+ })
+ this.setData({
+ vocationalList: res.datas,
+ vocationalTotal: res.total
+ })
+ if (res.datas.length < 7 && this.datas.length > 0) {
+ this.setData({
+ isMore: false
+ })
+ }
+ })
+ wx.stopPullDownRefresh()
+ },
+ // 鑱屼笟鏁欒偛
+ teacherGet(keyword) {
+ let searchObj = {
+ 'Name*': keyword,
+ '||author*': keyword,
+ '||isbn*': keyword
+ }
+ app.MG.resource.getItem({
+ path: 'jsek_biblioClassification\\jsek_bCTeacherEducation',
+ queryType: '*',
+ paging: {
+ start: '0',
+ size: this.data.start * 9
+ },
+ coverSize: {
+ width: 260
+ },
+ fields: {
+ jsek_link: [],
+ content: [],
+ subtitle: [],
+ fileType: [],
+ jsek_resource: [],
+ freeFile: [],
+ bookshelf_freeEpub: [], //epub璇曡鐧惧垎姣�
+ bookshelf_probationPage: [], //pdf璇曡椤垫暟
+ ...searchObj
+ },
+ SysType: 'CmsItem'
+ }).then(res => {
+ res.datas.forEach(item => {
+ item.determine = true
+ })
+ this.setData({
+ teacherList: res.datas,
+ teacherTotal: res.total
+ })
+ if (res.datas.length < 7 && this.datas.length > 0) {
+ this.setData({
+ isMore: false
+ })
+ }
+ })
+ wx.stopPullDownRefresh()
+ },
+ // downloadData(event) {
+ // this.setData({
+ // downloadLoadin: true
+ // })
+ // console.log(111);
+ // const item = event.currentTarget.dataset.item;
+ // // console.log(item.datas.freeFile.Value);
+ // const URL = app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.datas.freeFile.Value
+ // item.determine = false
+ // console.log(URL, 'URL');
+ // setTimeout(() => {
+ // if (URL) {
+ // item.determine = true
+ // }
+ // }, 600)
+ // wx.downloadFile({
+ // url: URL,
+ // success: function (res) {
+ // const filePath = res.tempFilePath;
+ // wx.openDocument({
+ // filePath: filePath,
+ // success: function (res) {
+ // console.log('鎵撳紑鏂囨。鎴愬姛');
+ // },
+ // fail: function (res) {
+ // console.log('鎵撳紑鏂囨。澶辫触', res);
+ // }
+ // });
+ // },
+ // fail: function (res) {
+ // console.log('涓嬭浇鏂囦欢澶辫触', res);
+ // }
+ // });
+ // setTimeout(() => {
+ // this.setData({
+ // downloadLoadin: false
+ // });
+ // }, 2000);
+ // },
+ downloadData(event) {
+ const item = event.currentTarget.dataset.item
+ if (item.fileType == "pdf") {
+ wx.navigateTo({
+ url: "/packageBookService/pages/components/webView/index?md5=" +
+ item.freeFile +
+ "&fileName=" +
+ item.name +
+ "&fileType=" +
+ item.fileType + "&bookBuy=true"
+ // "&freePage=" +
+ // this.data.fileInfo.freePage +
+
+ +
+ "&bookId=" +
+ item.id,
+ });
+ } else {
+ Toast({
+ context: this,
+ selector: '#t-toast',
+ message: '姝や功涓嶈兘鏌ョ湅',
+ theme: 'warning',
+ direction: 'column',
+ });
+ }
+ },
+ onSearchSubmit: function (e) {
+ const keyword = e.detail.value;
+ // 澶勭悊鎼滅储閫昏緫锛屼緥濡傚彂閫佹悳绱㈣姹傜瓑
+ console.log('鎼滅储鍏抽敭璇嶏細', keyword);
+ this.higherGet(keyword)
+ this.vocationalGet(keyword)
+ this.teacherGet(keyword)
+ },
+ goBack() {
+ wx.navigateBack();
+ },
+ onReachBottom(e) {
+ if (this.data.tabValue == 0) {
+ if (this.data.higherList.length < this.data.higherTotal) {
+ this.setData({
+ isMore: true,
+ start: this.data.start + 1
+ })
+ this.higherGet()
+ } else {
+ this.setData({
+ isMore: true,
+ })
+ setTimeout(() => {
+ this.setData({
+ isMore: false
+ })
+ }, 100)
+ }
+ } else if (this.data.tabValue == 2) {
+ if (this.data.teacherList.length < this.data.teacherTotal) {
+ this.setData({
+ isMore: true,
+ start: this.data.start + 1
+ })
+ this.teacherGet()
+ } else {
+ this.setData({
+ isMore: true,
+ })
+ setTimeout(() => {
+ this.setData({
+ isMore: false
+ })
+ }, 100)
+ }
+ } else if (this.data.tabValue == 1) {
+ console.log(this.data.vocationalList.length);
+ console.log(this.data.vocationalTotal);
+ if (this.data.vocationalList.length < this.data.vocationalTotal) {
+ this.setData({
+ isMore: true,
+ start: this.data.start + 1
+ })
+ this.vocationalGet()
+ } else {
+ this.setData({
+ isMore: true,
+ })
+ setTimeout(() => {
+ this.setData({
+ isMore: false
+ })
+ }, 100)
+ }
+ }
+ },
+
+ onPullDownRefresh() {
+ let keyword = this.data.value
+ this.setData({
+ start: 1,
+ })
+ this.higherGet(keyword)
+ this.vocationalGet(keyword)
+ this.teacherGet(keyword)
+ },
+ // 閭鐐瑰嚮
+ mailbox(e) {
+ const key = e.currentTarget.dataset.key;
+ const item = e.currentTarget.dataset.item;
+ this.setData({
+ Md5: item.datas.freeFile.FileList[0].Md5,
+ dialogBox: true
+ })
+ // wx.scanCode({
+ // success: res => {
+ // console.log(res);
+ // }
+ // })
+ },
+ // 寮圭獥鍙栨秷
+ closeDialog() {
+ this.setData({
+ dialogBox: false,
+ // input: ''
+ })
+ },
+ //鎻愪氦
+ confirmM(e) {
+ wx.showLoading({
+ title: '鍙戦�佷腑...',
+ })
+ const isEmailValid = /^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$/.test(this.data.input);
+ if (isEmailValid && this.data.input) {
+ this.setData({
+ dialogBox: false
+ })
+ let query = {
+ eMail: this.data.input,
+ md5s: [this.data.Md5]
+ }
+ app.MG.file.sendFileWithEmail(query).then(res => {
+ wx.hideLoading()
+ if (res) {
+ wx.showToast({
+ icon: 'success',
+ title: '閭欢宸插彂閫�',
+ })
+ }
+ })
+ } else {
+ // 鏍￠獙涓嶉�氳繃锛岀粰鍑洪敊璇彁绀�
+ wx.showToast({
+ title: '閭鏍煎紡涓嶆纭�',
+ icon: 'none',
+ });
+ }
+ },
+ inputChange(e) {
+ this.setData({
+ input: e.detail.value
+ })
+ },
+
+})
\ No newline at end of file
diff --git a/pages/home/home.js b/pages/home/home.js
index 9bd1189..38aed50 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -46,11 +46,10 @@
});
console.log(this.data.searchVal)
this.loadHomePage();
- this.getBannerList()
-
},
onLoad() {
+ this.getBannerList()
const systInfo = wx.getSystemInfoSync();
const menu = wx.getMenuButtonBoundingClientRect(); // 鑳跺泭淇℃伅
const navBarHeight = (menu.top - systInfo.statusBarHeight) * 2 + menu.height; // 瀵艰埅鏍忛珮搴�
diff --git a/pages/index/bookDetail.js b/pages/index/bookDetail.js
index 7072e18..a24a4a1 100644
--- a/pages/index/bookDetail.js
+++ b/pages/index/bookDetail.js
@@ -48,7 +48,7 @@
},
getBookList() {
const obj = {
- storeInfo: app.config.jslx,
+ // storeInfo: app.config.jslx,
path: "*",
queryType: '*',
coverSize: {
@@ -71,7 +71,7 @@
console.log(res.datas, '鍥句功淇℃伅')
let book = res.datas[0]
wx.redirectTo({
- url: `/packageBookService/pages/bookServices/detail/index?id=${book.id}&name=${book.name}&storeInfo=${app.config.jslx}`,
+ url: `/packageBookService/pages/bookServices/detail/index?id=${book.id}&name=${book.name}`,
});
})
},
diff --git a/pages/index/bookDetail.json b/pages/index/bookDetail.json
index c38efb2..b2aa31c 100644
--- a/pages/index/bookDetail.json
+++ b/pages/index/bookDetail.json
@@ -1,5 +1,6 @@
{
"usingComponents": {
- "t-loading": "tdesign-miniprogram/loading/loading"
+ "t-loading": "tdesign-miniprogram/loading/loading",
+ "t-skeleton": "tdesign-miniprogram/skeleton/skeleton"
}
}
\ No newline at end of file
diff --git a/pages/index/bookDetail.wxml b/pages/index/bookDetail.wxml
index f1aecfa..954af0b 100644
--- a/pages/index/bookDetail.wxml
+++ b/pages/index/bookDetail.wxml
@@ -1,4 +1,4 @@
<!--pages/index/bookDetail.wxml-->
<view class="box">
- <t-loading theme="circular" size="60rpx" text="鍔犺浇涓�" layout="vertical" class="wrapper" />
+ <t-skeleton theme="paragraph" animation="gradient" loading="true"></t-skeleton>
</view>
\ No newline at end of file
diff --git a/pages/index/bookDetail.wxss b/pages/index/bookDetail.wxss
index 63c62d1..fdc3ca5 100644
--- a/pages/index/bookDetail.wxss
+++ b/pages/index/bookDetail.wxss
@@ -4,4 +4,5 @@
height: 100vh;
padding: 200rpx 0;
text-align: center;
+ margin: 40rpx;
}
\ No newline at end of file
diff --git a/pages/index/resourceCover.js b/pages/index/resourceCover.js
index 731edf3..de4f902 100644
--- a/pages/index/resourceCover.js
+++ b/pages/index/resourceCover.js
@@ -57,8 +57,8 @@
getBookInfo(refcode) {
const obj = {
- storeInfo: app.config.jslx,
- path: app.config.jslx,
+ storeInfo: app.config.goodsStore,
+ path: app.config.goodsStore,
queryType: 'ProductCmsItem',
SysType: "CmsItem",
RefCode: refcode,
@@ -108,7 +108,7 @@
formPath: book.learnSelectType ? 'jsek_cloudLearning' : ''
})
wx.redirectTo({
- url: `${url}?productLinkPath=${this.data.productLinkPath}&parentProductLinkPath=${this.data.parentProductLinkPath}&bookId=${book.productLinkInfo.ProductId}&activeId=${book.id}&bookName=${book.productLinkInfo.Name}&cmsId=${book.id}&storeInfo=${book.storeInfo}&formPath=${this.data.formPath}`,
+ url: `${url}?productLinkPath=${this.data.productLinkPath}&parentProductLinkPath=${this.data.parentProductLinkPath}&bookId=${book.productLinkInfo.ProductId}&activeId=${book.id}&bookName=${book.productLinkInfo.Name}&cmsId=${book.id}&formPath=${this.data.formPath}`,
});
if (book.selectType == "pdf" || book.selectType == 'document') {
diff --git a/pages/index/resourceCover.json b/pages/index/resourceCover.json
index c38efb2..b2aa31c 100644
--- a/pages/index/resourceCover.json
+++ b/pages/index/resourceCover.json
@@ -1,5 +1,6 @@
{
"usingComponents": {
- "t-loading": "tdesign-miniprogram/loading/loading"
+ "t-loading": "tdesign-miniprogram/loading/loading",
+ "t-skeleton": "tdesign-miniprogram/skeleton/skeleton"
}
}
\ No newline at end of file
diff --git a/pages/index/resourceCover.wxml b/pages/index/resourceCover.wxml
index 3548e23..083b65c 100644
--- a/pages/index/resourceCover.wxml
+++ b/pages/index/resourceCover.wxml
@@ -4,5 +4,5 @@
</view>
<web-view wx:if="{{webpageSrc}}" src="{{webpageSrc}}"></web-view>
<view class="box" wx:if='{{!copyUrl && !webpageSrc}}'>
- <t-loading theme="circular" size="60rpx" text="鍔犺浇涓�" layout="vertical" class="wrapper" />
+ <t-skeleton theme="paragraph" animation="gradient" loading="true"></t-skeleton>
</view>
\ No newline at end of file
diff --git a/pages/index/resourceCover.wxss b/pages/index/resourceCover.wxss
index 7ee59fd..a252013 100644
--- a/pages/index/resourceCover.wxss
+++ b/pages/index/resourceCover.wxss
@@ -13,4 +13,5 @@
height: 100vh;
padding: 200rpx 0;
text-align: center;
+ margin: 40rpx;
}
\ No newline at end of file
diff --git a/pages/test/testCover.js b/pages/test/testCover.js
index 914d4a8..c62708e 100644
--- a/pages/test/testCover.js
+++ b/pages/test/testCover.js
@@ -100,7 +100,7 @@
this.data.rootCmsItemId
}&idPathList=${JSON.stringify(idPathList)}&answerTitle=${
this.data.answerTitle
- }&answerType=${"option"}&storeInfo=${book.storeInfo}`,
+ }&answerType=${"option"}`,
});
})
},
diff --git a/pages/test/testCover.json b/pages/test/testCover.json
index c38efb2..b2aa31c 100644
--- a/pages/test/testCover.json
+++ b/pages/test/testCover.json
@@ -1,5 +1,6 @@
{
"usingComponents": {
- "t-loading": "tdesign-miniprogram/loading/loading"
+ "t-loading": "tdesign-miniprogram/loading/loading",
+ "t-skeleton": "tdesign-miniprogram/skeleton/skeleton"
}
}
\ No newline at end of file
diff --git a/pages/test/testCover.wxml b/pages/test/testCover.wxml
index 946c336..7dbcfc0 100644
--- a/pages/test/testCover.wxml
+++ b/pages/test/testCover.wxml
@@ -1,4 +1,4 @@
<!--pages/test/testCover.wxml-->
<view class="box">
- <t-loading theme="circular" size="60rpx" text="鍔犺浇涓�" layout="vertical" class="wrapper" />
+ <t-skeleton theme="paragraph" animation="gradient" loading="true"></t-skeleton>
</view>
\ No newline at end of file
diff --git a/pages/test/testCover.wxss b/pages/test/testCover.wxss
index 4b427a0..283efef 100644
--- a/pages/test/testCover.wxss
+++ b/pages/test/testCover.wxss
@@ -4,4 +4,5 @@
height: 100vh;
padding: 200rpx 0;
text-align: center;
+ margin: 40rpx;
}
\ No newline at end of file
--
Gitblit v1.9.1