From 10db09788d74b441a2efd85f5d4614e944b07bb3 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期二, 26 三月 2024 20:07:11 +0800
Subject: [PATCH] 问题修改
---
static/images/home/home-cart.png | 0
pages/student/index.wxss | 4
packagePersonal/pages/activateProduct/index.wxss | 5
packageDomain/pages/sampleBookList/index.wxss | 5
packagePersonal/pages/myCollection/index.js | 1
packageBookService/pages/bookServices/detail/index.wxml | 268 ++++------------------------
packagePersonal/pages/myOrder/index.js | 2
static/images/personal/notification.png | 0
static/images/personal/suggestion.png | 0
packagePersonal/pages/feedBack/index.wxml | 12
pages/personalCenter/feedBackSubmit/index.js | 28 +-
static/images/personal/about.png | 0
packagePersonal/pages/myOrder/index.wxss | 6
pages/personalCenter/index.js | 4
pages/home/home.wxss | 20 +
custom-tab-bar/index.wxml | 4
static/images/personal/wodeshoucang.png | 0
packageDomain/pages/sampleBookList/applicationForm/index.js | 2
packageBookService/pages/bookServices/detail/components/suggest/suggest.js | 3
static/images/personal/notification1.png | 0
packagePersonal/pages/myCollection/index.wxml | 7
pages/personalCenter/feedBackSubmit/index.wxml | 4
pages/personalCenter/feedBackSubmit/index.wxss | 8
static/images/personal/feedback.png | 0
packagePersonal/pages/aboutUs/index.js | 1
pages/home/home.js | 29 +-
packagePersonal/pages/activateProduct/index.wxml | 7
static/images/personal/upload.png | 0
packageDomain/pages/teacherCertification/index.js | 4
static/images/personal/contact.png | 0
static/images/personal/download.png | 0
static/images/personal/order.png | 0
packagePersonal/pages/feedBack/index.wxss | 31 +--
pages/student/index.js | 2
static/images/personal/certificate.png | 0
static/images/personal/chushu.png | 0
packageDomain/pages/teacherCertification/index.wxml | 2
packagePersonal/pages/myOrder/index.wxml | 7
pages/personalCenter/index.wxss | 2
packagePersonal/pages/feedBack/index.js | 7
packageDomain/pages/sampleBookList/index.js | 3
packageBookService/pages/bookServices/detail/index.js | 1
pages/home/home.wxml | 34 ++-
pages/personalCenter/feedBackSubmit/index.json | 4
custom-tab-bar/index.wxss | 6
static/images/personal/setting.png | 0
packageBookService/pages/bookServices/detail/index.json | 3
static/images/personal/yangshushenqing.png | 0
packagePersonal/pages/userSetting/index.js | 6
static/images/personal/quxiaoshoucang.png | 0
packagePersonal/pages/myCollection/index.wxss | 5
packagePersonal/pages/sampleBooks/index.js | 1
static/images/personal/jihuo.png | 0
53 files changed, 189 insertions(+), 349 deletions(-)
diff --git a/custom-tab-bar/index.wxml b/custom-tab-bar/index.wxml
index cb27aba..5b38995 100644
--- a/custom-tab-bar/index.wxml
+++ b/custom-tab-bar/index.wxml
@@ -10,8 +10,8 @@
<view class="tabBarBox">
<view class="tabItem" wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index" bindtap="changeTab" data-num="{{index}}">
<view class="custom-tab-bar-wrapper">
- <t-image wx:if="{{active !== index}}" class="tabImg" src="{{item.icon}}" mode="aspectFill" width="22" height="22" />
- <t-image wx:else class="tabImg" src="{{item.activeIcon}}" mode="aspectFill" width="22" height="22" />
+ <t-image wx:if="{{active !== index}}" class="tabImg" src="{{item.icon}}" mode="aspectFit" width="22" height="22" />
+ <t-image wx:else class="tabImg" src="{{item.activeIcon}}" mode="aspectFit" width="22" height="22" />
<view class="text {{active == index ? 'activeText' : ''}}">{{ item.text }}</view>
</view>
</view>
diff --git a/custom-tab-bar/index.wxss b/custom-tab-bar/index.wxss
index ffad08d..b6b71b6 100644
--- a/custom-tab-bar/index.wxss
+++ b/custom-tab-bar/index.wxss
@@ -11,18 +11,18 @@
.tabBarBox {
display: flex;
- padding-bottom: 50rpx;
+ padding-bottom: env(safe-area-inset-bottom);
background-color: #fff;
/* opacity: 1; */
}
.tabItem {
flex: 1;
- height: var(--td-tab-bar-height, 80rpx);
+ height: var(--td-tab-bar-height, 88rpx);
box-sizing: border-box;
user-select: none;
position: relative;
- margin-bottom: 26rpx;
+ margin-bottom: 24rpx;
background-color: var(--td-tab-bar-bg-color, var(--td-bg-color-container, var(--td-font-white-1, #ffffff)));
padding: 0 24rpx;
padding-top: 20rpx;
diff --git a/packageBookService/pages/bookServices/detail/components/suggest/suggest.js b/packageBookService/pages/bookServices/detail/components/suggest/suggest.js
index b7190c7..bc609d8 100644
--- a/packageBookService/pages/bookServices/detail/components/suggest/suggest.js
+++ b/packageBookService/pages/bookServices/detail/components/suggest/suggest.js
@@ -70,7 +70,7 @@
}
})
}
- this.closeDialog()
+
let content = {
source: this.data.ratevalue,
phone: this.data.inputvalue,
@@ -92,6 +92,7 @@
icon: 'success',
duration: 2000
})
+ this.closeDialog()
})
},
// 纭畾
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index 711cb30..007b526 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -402,7 +402,6 @@
});
}
}
- console.log(this.data.fileInfo, 456)
this.setData({
selectedIds: this.data.bookDetail.defaultSaleMethodId,
bookBuy: this.data.bookDetail.purchasedSaleMethodIdList.indexOf(this.data.bookDetail.defaultSaleMethodId) > -1
diff --git a/packageBookService/pages/bookServices/detail/index.json b/packageBookService/pages/bookServices/detail/index.json
index 980bf12..1d821e3 100644
--- a/packageBookService/pages/bookServices/detail/index.json
+++ b/packageBookService/pages/bookServices/detail/index.json
@@ -17,7 +17,8 @@
"t-loading": "tdesign-miniprogram/loading/loading",
"t-dialog": "tdesign-miniprogram/dialog/dialog",
"t-toast": "tdesign-miniprogram/toast/toast",
- "t-empty": "tdesign-miniprogram/empty/empty"
+ "t-empty": "tdesign-miniprogram/empty/empty",
+ "t-fab": "tdesign-miniprogram/fab/fab"
},
"navigationStyle": "custom",
"onReachBottomDistance": 200
diff --git a/packageBookService/pages/bookServices/detail/index.wxml b/packageBookService/pages/bookServices/detail/index.wxml
index 323c78d..204ed68 100644
--- a/packageBookService/pages/bookServices/detail/index.wxml
+++ b/packageBookService/pages/bookServices/detail/index.wxml
@@ -4,55 +4,30 @@
<view style="width: 100%; height: {{barHeight}}px; "></view>
<view class="nacigationBar" style="width: 70%; height: {{navBarHeight}}px;">
<view>
- <t-icon
- name="chevron-left"
- size="30"
- data-name="{{item}}"
- bind:click="goBack"
- />
+ <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" />
</view>
<view class="navbar-title">{{options.name}}</view>
</view>
<t-toast id="t-toast" />
- <scroll-view
- scroll-y="{{true}}"
- class="book"
- bindscrolltolower="onReachBottom"
- >
+ <scroll-view scroll-y="{{true}}" class="book" bindscrolltolower="onReachBottom">
<!-- 鍥句功璇︽儏 -->
<view class="book-box">
<view class="book-detail">
<view class="detail-left">
<view class="book-img">
- <image
- loading=""
- src="{{bookDetail.icon ? bookDetail.icon : '/static/images/default-book-img.png'}}"
- mode="aspectFill"
- aria-label="{{bookDetail.name}}"
- />
+ <image loading="" src="{{bookDetail.icon ? bookDetail.icon : '/static/images/default-book-img.png'}}" mode="aspectFill" aria-label="{{bookDetail.name}}" />
</view>
<view class="book-use">
<view class="collect" bind:tap="setCollect">
<view>
- <image
- loading=""
- src="/static/images/bookService/detail/collect.png"
- wx:if="{{!bookDetail.isFavourite}}"
- />
- <image
- loading=""
- src="/static/images/bookService/detail/collecting.png"
- wx:if="{{bookDetail.isFavourite}}"
- />
+ <image loading="" src="/static/images/bookService/detail/collect.png" wx:if="{{!bookDetail.isFavourite}}" />
+ <image loading="" src="/static/images/bookService/detail/collecting.png" wx:if="{{bookDetail.isFavourite}}" />
</view>
<view class="use-title">鏀惰棌</view>
</view>
<view class="suggest" bind:tap="suggestBtn">
<view>
- <image
- loading=""
- src="/static/images/bookService/detail/suggest.png"
- />
+ <image loading="" src="/static/images/bookService/detail/suggest.png" />
</view>
<view class="use-title">鎴戣寤鸿</view>
</view>
@@ -74,24 +49,15 @@
<view class="li-content">{{bookDetail.isbn}}</view>
</view>
<view class="message-li">
- <view class="li-title" wx:if="{{bookDetail.publicationDate}}"
- >鍑虹増鏃堕棿锛�</view
- >
+ <view class="li-title" wx:if="{{bookDetail.publicationDate}}">鍑虹増鏃堕棿锛�</view>
<view class="li-content">{{bookDetail.publicationDate}}</view>
</view>
- <view
- class="message-li"
- wx:if="{{bookDetail.class}}"
- style="height: 80rpx"
- >
+ <view class="message-li" wx:if="{{bookDetail.class}}" style="height: 80rpx">
<view class="li-title">鍥句功鍒嗙被锛�</view>
<view class="class-name showTow">{{bookDetail.class}}</view>
</view>
</view>
- <image
- src="/static/images/bookService/detail/square.png"
- class="right-background"
- />
+ <image src="/static/images/bookService/detail/square.png" class="right-background" />
</view>
</view>
<!-- 閿�鍞俊鎭� -->
@@ -100,17 +66,12 @@
<!-- 鐢靛瓙涔﹀敭浠� -->
<view class="electron-price">
<view>
- <image
- src="/static/images/bookService/detail/electon-price.png"
- />
+ <image src="/static/images/bookService/detail/electon-price.png" />
</view>
<view class="price">
- <view class="price-text"
- >{{bookDetail.price == '0.00' ? '鍏嶈垂' : '楼'+
- bookDetail.price}}</view
- >
- <view class="price-old" wx:if="{{bookDetail.oldPrice != '0.00'}}"
- >楼{{bookDetail.oldPrice}}
+ <view class="price-text">{{bookDetail.price == '0.00' ? '鍏嶈垂' : '楼'+
+ bookDetail.price}}</view>
+ <view class="price-old" wx:if="{{bookDetail.oldPrice != '0.00'}}">楼{{bookDetail.oldPrice}}
</view>
</view>
<view> </view>
@@ -120,147 +81,52 @@
<view>
<image src="/static/images/bookService/detail/paper-price.png" />
</view>
- <view class="price"
- >{{bookDetail.paperPrice == '0.00' ? '鍏嶈垂' :
- '楼'+bookDetail.paperPrice}}</view
- >
+ <view class="price">{{bookDetail.paperPrice == '0.00' ? '鍏嶈垂' :
+ '楼'+bookDetail.paperPrice}}</view>
</view>
</view>
<!-- 缃戝簵 -->
<view class="book-web">
- <image
- src="/static/images/bookService/detail/jd.png"
- wx:if="{{bookDetail.JDLink}}"
- bind:tap="goShop"
- data-link="{{bookDetail.JDLink}}"
- data-type="jd"
- />
- <image
- class="tmall-image"
- src="/static/images/bookService/detail/tmall.png"
- bind:tap="goShop"
- data-link="{{bookDetail.tmallLink}}"
- wx:if="{{bookDetail.tmallLink}}"
- />
- <image
- src="/static/images/bookService/detail/dangdang.png"
- bind:tap="goShop"
- data-link="{{bookDetail.dangdangLink}}"
- wx:if="{{bookDetail.dangdangLink}}"
- />
- <image
- src="/static/images/bookService/detail/weidian.png"
- bind:tap="goShop"
- data-link="{{bookDetail.weidianLink}}"
- wx:if="{{bookDetail.weidianLink}}"
- />
+ <image src="/static/images/bookService/detail/jd.png" wx:if="{{bookDetail.JDLink}}" bind:tap="goShop" data-link="{{bookDetail.JDLink}}" data-type="jd" />
+ <image class="tmall-image" src="/static/images/bookService/detail/tmall.png" bind:tap="goShop" data-link="{{bookDetail.tmallLink}}" wx:if="{{bookDetail.tmallLink}}" />
+ <image src="/static/images/bookService/detail/dangdang.png" bind:tap="goShop" data-link="{{bookDetail.dangdangLink}}" wx:if="{{bookDetail.dangdangLink}}" />
+ <image src="/static/images/bookService/detail/weidian.png" bind:tap="goShop" data-link="{{bookDetail.weidianLink}}" wx:if="{{bookDetail.weidianLink}}" />
</view>
</view>
</view>
<view class="book-resource">
- <t-tabs
- defaultValue="{{tabValue}}"
- bind:change="onTabsChange"
- t-class="custom-tabs"
- t-class-content="custom-panel"
- class="tab-class"
- >
+ <t-tabs defaultValue="{{tabValue}}" bind:change="onTabsChange" t-class="custom-tabs" t-class-content="custom-panel" class="tab-class">
<t-tab-panel label="鍥句功绠�浠�" value="brief" style="{{tabPanelstyle}}">
- <book-brief
- content="{{bookDetail.content}}"
- authorIntroduction="{{bookDetail.authorIntroduction}}"
- wx:if="{{bookDetail.content || bookDetail.authorIntroduction}}"
- ></book-brief>
- <view
- wx:if="{{!bookDetail.content && !bookDetail.authorIntroduction}}"
- class="noData"
- >
+ <book-brief content="{{bookDetail.content}}" authorIntroduction="{{bookDetail.authorIntroduction}}" wx:if="{{bookDetail.content || bookDetail.authorIntroduction}}"></book-brief>
+ <view wx:if="{{!bookDetail.content && !bookDetail.authorIntroduction}}" class="noData">
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
</view>
</t-tab-panel>
- <t-tab-panel
- label="鐢靛瓙涔�"
- value="jsek_eBook"
- style="{{tabPanelstyle}}"
- >
- <epub-view
- fileInfo="{{fileInfo}}"
- id="eBook"
- class="webView"
- ></epub-view>
+ <t-tab-panel label="鐢靛瓙涔�" value="jsek_eBook" style="{{tabPanelstyle}}">
+ <epub-view fileInfo="{{fileInfo}}" id="eBook" class="webView"></epub-view>
</t-tab-panel>
- <t-tab-panel
- label="鏁欏璧勬簮"
- value="jsek_teachingResources"
- class="{{loading ? 'loading': ''}}"
- >
+ <t-tab-panel label="鏁欏璧勬簮" value="jsek_teachingResources" class="{{loading ? 'loading': ''}}">
<view wx:if="{{!loading && teach.length && !noResources}}">
- <teach-resource
- applyState="{{applyState}}"
- rejectCause="{{rejectCause}}"
- deadline="{{deadline}}"
- bind:applyResource="applyResource"
- applyResourceLoading="{{applyResourceLoading}}"
- ></teach-resource>
- <tree
- openIds="{{openTeachids}}"
- bookInfo="{{bookDetail}}"
- treeList="{{teach}}"
- tab="{{tabValue}}"
- applyState="{{applyState}}"
- bind:downloadTeach="downloadTeach"
- openTeachids="{{openTeachids}}"
- wx:if="{{teach.length}}"
- ></tree>
+ <teach-resource applyState="{{applyState}}" rejectCause="{{rejectCause}}" deadline="{{deadline}}" bind:applyResource="applyResource" applyResourceLoading="{{applyResourceLoading}}"></teach-resource>
+ <tree openIds="{{openTeachids}}" bookInfo="{{bookDetail}}" treeList="{{teach}}" tab="{{tabValue}}" applyState="{{applyState}}" bind:downloadTeach="downloadTeach" openTeachids="{{openTeachids}}" wx:if="{{teach.length}}"></tree>
</view>
- <t-loading
- theme="circular"
- size="60rpx"
- class="loading"
- loading="{{loading }}"
- />
+ <t-loading theme="circular" size="60rpx" class="loading" loading="{{loading }}" />
<view wx:if="{{noResources}}" class="noData">
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
</view>
</t-tab-panel>
- <t-tab-panel
- label="浜戝涔�"
- value="jsek_cloudLearning"
- style="{{tabPanelstyle}}"
- >
+ <t-tab-panel label="浜戝涔�" value="jsek_cloudLearning" style="{{tabPanelstyle}}">
<view wx:if="{{!loading && learn.length}}">
- <learn-resource
- bind:getFreeResource="getFreeResource"
- bind:allAddShoppiingCar="allAddShoppiingCar"
- id="learn-resource"
- buyResourceData="{{buyResourceData}}"
- bookId="{{bookDetail.id}}"
- ></learn-resource>
- <tree
- id="tree"
- openIds="{{openLearnids}}"
- bookInfo="{{bookDetail}}"
- tab="{{tabValue}}"
- treeList="{{learn}}"
- buyIds="{{buyIdList}}"
- openLearnids="{{openLearnids}}"
- ></tree>
+ <learn-resource bind:getFreeResource="getFreeResource" bind:allAddShoppiingCar="allAddShoppiingCar" id="learn-resource" buyResourceData="{{buyResourceData}}" bookId="{{bookDetail.id}}"></learn-resource>
+ <tree id="tree" openIds="{{openLearnids}}" bookInfo="{{bookDetail}}" tab="{{tabValue}}" treeList="{{learn}}" buyIds="{{buyIdList}}" openLearnids="{{openLearnids}}"></tree>
</view>
<view wx:if="{{noResources}}" class="noData">
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
</view>
</t-tab-panel>
- <t-tab-panel
- label="浜戞祴璇�"
- value="questionBank"
- style="{{tabPanelstyle}}"
- >
+ <t-tab-panel label="浜戞祴璇�" value="questionBank" style="{{tabPanelstyle}}">
<view wx:if="{{!loading && test.length}}">
- <test-resource
- list="{{test}}"
- bookInfo="{{bookDetail}}"
- mockData="{{mockData}}"
- ></test-resource>
+ <test-resource list="{{test}}" bookInfo="{{bookDetail}}" mockData="{{mockData}}"></test-resource>
</view>
<view wx:if="{{noResources}}" class="noData">
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
@@ -275,78 +141,32 @@
<view class="box-bottom">
<view class="bottom-btn" bind:tap="appplyElectronicBook">
<view>
- <t-image
- loading=""
- src="/static/images/bookService/detail/ebook.png"
- ></t-image>
+ <t-image loading="" src="/static/images/bookService/detail/ebook.png"></t-image>
</view>
<view class="btn-text">鐢靛瓙鏍蜂功鐢宠</view>
</view>
<view class="bottom-btn" bind:tap="appplyPaperBook">
<view>
- <t-image
- src="/static/images/bookService/detail/paper-book.png"
- ></t-image>
+ <t-image src="/static/images/bookService/detail/paper-book.png"></t-image>
</view>
<view class="btn-text">绾歌川鏍蜂功鐢宠</view>
</view>
- <view
- class="shopCar {{(tabValue == 'jsek_teachingResources' || tabValue == 'jsek_note') ? 'disabledColor' : 'shopCarColor' }}"
- bind:tap="addBookShopcCar"
- wx:if="{{tabValue != 'jsek_eBook'}}"
- >鍔犲叆璐墿杞�</view
- >
- <view
- class="buy {{(tabValue == 'jsek_teachingResources' || tabValue == 'jsek_note') ? 'disabledColor' : 'buyColor' }}"
- bind:tap="buyBtn"
- wx:if="{{tabValue != 'jsek_eBook'}}"
- >绔嬪嵆璐拱</view
- >
- <view
- class="shopCar shopCarColor"
- bind:tap="addBookShopcCar"
- wx:if="{{tabValue == 'jsek_eBook' && !bookBuy}}"
- >鍔犲叆璐墿杞�</view
- >
- <view
- class="buy buyColor"
- bind:tap="buyBtn"
- wx:if="{{tabValue == 'jsek_eBook' && !bookBuy}}"
- >绔嬪嵆璐拱</view
- >
- <view
- class="read buyColor"
- bind:tap="goRead"
- wx:if="{{tabValue == 'jsek_eBook' && bookBuy}}"
- >绔嬪嵆鏌ョ湅</view
- >
+ <view class="shopCar {{(tabValue == 'jsek_teachingResources' || tabValue == 'jsek_note') ? 'disabledColor' : 'shopCarColor' }}" bind:tap="addBookShopcCar" wx:if="{{tabValue != 'jsek_eBook'}}">鍔犲叆璐墿杞�</view>
+ <view class="buy {{(tabValue == 'jsek_teachingResources' || tabValue == 'jsek_note') ? 'disabledColor' : 'buyColor' }}" bind:tap="buyBtn" wx:if="{{tabValue != 'jsek_eBook'}}">绔嬪嵆璐拱</view>
+ <view class="shopCar shopCarColor" bind:tap="addBookShopcCar" wx:if="{{tabValue == 'jsek_eBook' && !bookBuy}}">鍔犲叆璐墿杞�</view>
+ <view class="buy buyColor" bind:tap="buyBtn" wx:if="{{tabValue == 'jsek_eBook' && !bookBuy}}">绔嬪嵆璐拱</view>
+ <view class="read buyColor" bind:tap="goRead" wx:if="{{tabValue == 'jsek_eBook' && bookBuy}}">绔嬪嵆鏌ョ湅</view>
</view>
</scroll-view>
<!-- 鎴戣寤鸿寮圭獥 -->
- <suggest
- class="suggest-component"
- id="suggest-component"
- bookIcon="{{bookDetail.icon}}"
- bookName="{{bookDetail.name}}"
- ></suggest>
+ <suggest class="suggest-component" id="suggest-component" bookIcon="{{bookDetail.icon}}" bookName="{{bookDetail.name}}"></suggest>
<!-- 鏁欏璧勬簮涓嬭浇鎻愮ず寮圭獥 -->
- <t-dialog
- class="teachDownloadDialog"
- visible="{{isShowTeachDownload}}"
- title="鎻愮ず"
- content="璇峰墠寰�PC绔笅杞�"
- confirm-btn="{{ confirmBtn }}"
- bind:confirm="closeTeachDownload"
- />
+ <t-dialog class="teachDownloadDialog" visible="{{isShowTeachDownload}}" title="鎻愮ず" content="璇峰墠寰�PC绔笅杞�" confirm-btn="{{ confirmBtn }}" bind:confirm="closeTeachDownload" />
<view class="applyBox" bindtap="goApply">
<view class="box">
- <t-image
- src="/static/images/home/yangshuForm1.png"
- mode="heightFix"
- class="img"
- />
+ <t-image src="/static/images/home/yangshuForm1.png" mode="heightFix" class="img" />
<view class="num" wx:if="{{num > 0}}">{{num}}</view>
</view>
</view>
-</view>
+</view>
\ No newline at end of file
diff --git a/packageDomain/pages/sampleBookList/applicationForm/index.js b/packageDomain/pages/sampleBookList/applicationForm/index.js
index 3153c29..1a33d96 100644
--- a/packageDomain/pages/sampleBookList/applicationForm/index.js
+++ b/packageDomain/pages/sampleBookList/applicationForm/index.js
@@ -102,7 +102,6 @@
'teacherInfo.workInfo': res[0].cmsTypeLinks[0].children,
})
}
- console.log(this.data.teacherInfo.workInfo, 333)
})
},
//鑾峰彇褰撳墠宸茬敵璇锋鏁帮紙鐢靛瓙锛�
@@ -184,7 +183,6 @@
that.setData({
'teacherInfo.detailedAddress': mailAddress
})
- console.log(that.data.teacherInfo.workInfo, 345)
data = {
topicIdOrRefCode: 'applyEntityBook',
diff --git a/packageDomain/pages/sampleBookList/index.js b/packageDomain/pages/sampleBookList/index.js
index c43b0aa..ab27b30 100644
--- a/packageDomain/pages/sampleBookList/index.js
+++ b/packageDomain/pages/sampleBookList/index.js
@@ -352,9 +352,6 @@
},
],
sort,
- coverSize: {
- height: 145,
- },
paging: {
start: that.data.page * that.data.limit - that.data.limit,
size: that.data.limit
diff --git a/packageDomain/pages/sampleBookList/index.wxss b/packageDomain/pages/sampleBookList/index.wxss
index 20b62f8..cd9e157 100644
--- a/packageDomain/pages/sampleBookList/index.wxss
+++ b/packageDomain/pages/sampleBookList/index.wxss
@@ -13,6 +13,7 @@
.bookServices-list {
padding-top: 294rpx;
+ background: #F2F3F8;
}
.content {
@@ -134,9 +135,7 @@
transform: rotate(180deg);
}
-.list-body {
- background: #F2F3F8;
-}
+.list-body {}
.title {
display: flex;
diff --git a/packageDomain/pages/teacherCertification/index.js b/packageDomain/pages/teacherCertification/index.js
index 0979b20..82493b7 100644
--- a/packageDomain/pages/teacherCertification/index.js
+++ b/packageDomain/pages/teacherCertification/index.js
@@ -167,7 +167,6 @@
})
}
let info = getTopicMsgCmsItemFile(this.data.worksInfo, resData.cmsItemDataList)
- console.log(info)
this.setData({
'teacherInfo.fullName': info.fullName,
'teacherInfo.schoolName': info.schoolName,
@@ -351,7 +350,6 @@
sourceType: ['album', 'camera'], // 鍙互鎸囧畾鏉ユ簮鏄浉鍐岃繕鏄浉鏈猴紝榛樿浜岃�呴兘鏈�
success: function (res) {
// 杩斿洖閫夊畾鐓х墖鐨勬湰鍦版枃浠惰矾寰勫垪琛紝tempFilePath涔熷彲浠ヤ綔涓篿mg鏍囩鐨剆rc灞炴�ф樉绀哄浘鐗�
- console.log(res.tempFiles[0], 12);
wx.getFileSystemManager().readFile({
filePath: res.tempFiles[0].tempFilePath, //閫夋嫨鍥剧墖杩斿洖鐨勭浉瀵硅矾寰�
// encoding: 'binary', //缂栫爜鏍煎紡
@@ -446,7 +444,6 @@
})
},
onChange() {
- console.log(this.data.teacherInfo.agree, 12)
if (this.data.teacherInfo.agree) {
this.setData({
'teacherInfo.agree': false,
@@ -547,7 +544,6 @@
that.data.teacherInfo,
that.data.imgPics
);
- console.log(dataRequests, 4)
const data = {
description: '',
icon: '',
diff --git a/packageDomain/pages/teacherCertification/index.wxml b/packageDomain/pages/teacherCertification/index.wxml
index 9c89ca8..1e98df3 100644
--- a/packageDomain/pages/teacherCertification/index.wxml
+++ b/packageDomain/pages/teacherCertification/index.wxml
@@ -75,7 +75,7 @@
<view class="weui-uploader">
<view class='pics' wx:for="{{imgPics}}" wx:for-item="item" wx:key="*this">
<image class='weui-uploader__img' src="{{item.url}}" data-index="{{index}}" mode="aspectFill" bindtap="previewImg">
- <icon type='cancel' class="delete-btn" data-index="{{index}}" catchtap="deleteImg"></icon>
+ <icon type='cancel' class="delete-btn" data-index="{{index}}" catchtap="deleteImg" wx:if="{{editState}}"></icon>
</image>
</view>
<view class="tp_cont {{tj_ycang?'':'hide'}}" bindtap="chooseImg" wx:if="{{editState}}">
diff --git a/packagePersonal/pages/aboutUs/index.js b/packagePersonal/pages/aboutUs/index.js
index b5e5956..bb9c51c 100644
--- a/packagePersonal/pages/aboutUs/index.js
+++ b/packagePersonal/pages/aboutUs/index.js
@@ -104,7 +104,6 @@
bannerList: res.datas[0].icon,
swiperList: res.datas[0].icon
})
- console.log(this.data.bannerList, 789);
})
},
diff --git a/packagePersonal/pages/activateProduct/index.wxml b/packagePersonal/pages/activateProduct/index.wxml
index 6c78965..532aaf1 100644
--- a/packagePersonal/pages/activateProduct/index.wxml
+++ b/packagePersonal/pages/activateProduct/index.wxml
@@ -25,7 +25,7 @@
</view>
<view class="contentBox">
- <view class="list" wx:if="{{list.length > 0}}">
+ <view class="list" wx:if="{{list.length > 0 && !skeletonLoding}}">
<view class="content-item" wx:for="{{list}}" wx:for-item="items" wx:for-index="index" wx:key="index">
<view class="codeInfoBox">
<view>婵�娲荤爜锛歿{items.code}}</view>
@@ -57,7 +57,7 @@
</view>
</view>
</view>
- <view wx:if="{{list.length == 0}}" class="empyt">
+ <view wx:if="{{list.length == 0 && !skeletonLoding}}" class="empyt">
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
</view>
<view class="bottom-loading" wx:if="{{bottomLoading}}">
@@ -66,6 +66,9 @@
<view class="bottom-loading" style="color: #ccc;font-size: 28rpx;" wx:if="{{isMoreData}}">
<text>娌℃湁鏇村浜�</text>
</view>
+ <view class="body-loading" wx:if="{{skeletonLoding}}">
+ <t-loading theme="circular" size="40rpx" text="鍔犺浇涓�..." class="wrapper" />
+ </view>
</view>
</view>
</view>
diff --git a/packagePersonal/pages/activateProduct/index.wxss b/packagePersonal/pages/activateProduct/index.wxss
index 029a009..9ec1c11 100644
--- a/packagePersonal/pages/activateProduct/index.wxss
+++ b/packagePersonal/pages/activateProduct/index.wxss
@@ -155,4 +155,9 @@
.empyt {
padding: 100rpx 0;
background: #fff;
+}
+
+.body-loading {
+ padding: 200rpx 0;
+ text-align: center;
}
\ No newline at end of file
diff --git a/packagePersonal/pages/feedBack/index.js b/packagePersonal/pages/feedBack/index.js
index 9a41106..e1511ec 100644
--- a/packagePersonal/pages/feedBack/index.js
+++ b/packagePersonal/pages/feedBack/index.js
@@ -39,8 +39,7 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad(options) {
- console.log(options);
- this.getDataList(false);
+ console.log(options)
},
/**
@@ -54,7 +53,7 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
*/
onShow() {
-
+ this.getDataList(false);
},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
@@ -64,7 +63,6 @@
},
tabBookClick(item) {
- console.log(item, 1)
let that = this;
let info = this.data.tabList[item.detail.value]
that.setData({
@@ -112,7 +110,6 @@
isMoreData: dataList.length > 0 ? false : true,
skeletonLoding: false,
})
- console.log(this.data.list, 123)
} else {
this.setData({
skeletonLoding: false,
diff --git a/packagePersonal/pages/feedBack/index.wxml b/packagePersonal/pages/feedBack/index.wxml
index 3a54e3b..8a4bad2 100644
--- a/packagePersonal/pages/feedBack/index.wxml
+++ b/packagePersonal/pages/feedBack/index.wxml
@@ -1,8 +1,10 @@
<view class="container">
- <t-tabs t-class="t-tabs" split="{{false}}" defaultValue="{{active}}" bind:change="tabBookClick">
- <t-tab-panel wx:for="{{tabList}}" wx:for-index="index" wx:key="index" label="{{item.label}}" value="{{index}}">
- </t-tab-panel>
- </t-tabs>
+ <view class="page-header">
+ <t-tabs t-class="t-tabs" split="{{false}}" defaultValue="{{active}}" bind:change="tabBookClick">
+ <t-tab-panel wx:for="{{tabList}}" wx:for-index="index" wx:key="index" label="{{item.label}}" value="{{index}}">
+ </t-tab-panel>
+ </t-tabs>
+ </view>
<view class="pageInfo">
<scroll-view class="scroll content" bind:scroll="onPageScroll" model:scroll-top="{{setScrollValue}}" scroll-y refresher-enabled="{{true}}" lower-threshold="{{200}}" refresher-threshold="{{80}}" refresher-default-style="none" refresher-triggered="{{triggered}}" bindrefresherpulling="{{refresh.onPulling}}" bindrefresherrefresh="onPullDownRefresh" bindscrolltolower="onReachBottom">
<view slot="refresher" class="refresh-container">
@@ -28,7 +30,7 @@
<view wx:if="{{activeName == 'feedback'}}" class="backBox">
<view class="content-item" wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index">
<view class="item-con">
- <view class="item-title">{{item.name}}</view>
+ <view class="item-title">{{item.content.content}}</view>
<view class="backCon">
<view>
鍥炲锛歿{item.feedBack}}
diff --git a/packagePersonal/pages/feedBack/index.wxss b/packagePersonal/pages/feedBack/index.wxss
index 96e6e47..812c531 100644
--- a/packagePersonal/pages/feedBack/index.wxss
+++ b/packagePersonal/pages/feedBack/index.wxss
@@ -1,25 +1,28 @@
page {
background-color: #f0f2f5;
-}
-
-.container {
- width: 100vw;
- height: 100vh;
padding: 0 20rpx;
}
-.content {
- height: calc(100vh - env(safe-area-inset-bottom) - 86rpx);
- box-sizing: border-box;
+.container {
+ width: 100%;
+ height: 100vh;
}
.page-header {
- background-color: #F2F3F8;
width: 100%;
position: fixed;
top: 0;
left: 0;
- z-index: 1
+ z-index: 1;
+}
+
+.pageInfo {
+ padding-top: 90rpx;
+}
+
+.content {
+ height: calc(100vh - env(safe-area-inset-bottom) - 96rpx);
+ box-sizing: border-box;
}
.t-tabs__track {
@@ -75,14 +78,6 @@
text-align: center;
}
-.container {
- height: calc(100vh - env(safe-area-inset-bottom));
- box-sizing: border-box;
-}
-
-.pageInfo {
- margin-top: -30rpx;
-}
.content-item {
background: #fff;
diff --git a/packagePersonal/pages/myCollection/index.js b/packagePersonal/pages/myCollection/index.js
index fb1a765..11f17f1 100644
--- a/packagePersonal/pages/myCollection/index.js
+++ b/packagePersonal/pages/myCollection/index.js
@@ -48,7 +48,6 @@
},
tabBookClick(item) {
- console.log(item, 1)
let that = this;
let info = this.data.tabList[item.detail.value]
that.setData({
diff --git a/packagePersonal/pages/myCollection/index.wxml b/packagePersonal/pages/myCollection/index.wxml
index 7a0a3d1..3da41ed 100644
--- a/packagePersonal/pages/myCollection/index.wxml
+++ b/packagePersonal/pages/myCollection/index.wxml
@@ -9,7 +9,7 @@
<t-loading theme="circular" size="40rpx" text="姝ｅ湪鍒锋柊..." class="wrapper" />
</view>
</view>
- <view class="list" wx:if="{{list.length > 0}}">
+ <view class="list" wx:if="{{list.length > 0 && !skeletonLoding}}">
<view wx:if="{{activeName == 'FavoriteBookCity'}}" class="listBox">
<view class="content-item" wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index">
<view class="icon" data-book="{{item}}" bindtap="goBookDetails">
@@ -34,7 +34,7 @@
</view>
</view> -->
</view>
- <view wx:if="{{list.length == 0}}" class="empyt">
+ <view wx:if="{{list.length == 0 && !skeletonLoding}}" class="empyt">
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
</view>
<view class="bottom-loading" wx:if="{{bottomLoading}}">
@@ -43,6 +43,9 @@
<view class="bottom-loading" style="color: #ccc;font-size: 28rpx;" wx:if="{{isMoreData}}">
<text>娌℃湁鏇村浜�</text>
</view>
+ <view class="body-loading" wx:if="{{skeletonLoding}}">
+ <t-loading theme="circular" size="40rpx" text="鍔犺浇涓�..." class="wrapper" />
+ </view>
</scroll-view>
</view>
diff --git a/packagePersonal/pages/myCollection/index.wxss b/packagePersonal/pages/myCollection/index.wxss
index 10d2847..a5221ec 100644
--- a/packagePersonal/pages/myCollection/index.wxss
+++ b/packagePersonal/pages/myCollection/index.wxss
@@ -156,4 +156,9 @@
.empyt {
padding: 200rpx 0;
+}
+
+.body-loading {
+ padding: 200rpx 0;
+ text-align: center;
}
\ No newline at end of file
diff --git a/packagePersonal/pages/myOrder/index.js b/packagePersonal/pages/myOrder/index.js
index 8b502b1..7e8d3c4 100644
--- a/packagePersonal/pages/myOrder/index.js
+++ b/packagePersonal/pages/myOrder/index.js
@@ -56,7 +56,6 @@
},
tabBookClick(item) {
- console.log(item, 1)
let that = this;
let info = this.data.tabList[item.detail.value]
that.setData({
@@ -200,7 +199,6 @@
onCancel(e) {
let { orderNum } = e.currentTarget.dataset
- console.log(orderNum, 12)
wx.showModal({
title: '鎻愮ず', //鎻愮ず鐨勬爣棰�
content: '纭畾瑕佸彇娑堣鍗曪紵', //鎻愮ず鐨勫唴瀹�
diff --git a/packagePersonal/pages/myOrder/index.wxml b/packagePersonal/pages/myOrder/index.wxml
index cee7ffd..b1ca619 100644
--- a/packagePersonal/pages/myOrder/index.wxml
+++ b/packagePersonal/pages/myOrder/index.wxml
@@ -16,7 +16,7 @@
<t-loading theme="circular" size="40rpx" text="姝ｅ湪鍒锋柊..." class="wrapper" />
</view>
</view>
- <view class="list" wx:if="{{list.length > 0}}">
+ <view class="list" wx:if="{{list.length > 0 && !skeletonLoding}}">
<view class="content-item" wx:for="{{list}}" wx:for-item="items" wx:for-index="index" wx:key="index">
<view class="order-cent">
<text class="order-cent-one">璁㈠崟鍙�: {{items.orderNumber}}</text>
@@ -60,7 +60,7 @@
</view>
</view>
</view>
- <view wx:if="{{list.length == 0}}" class="empyt">
+ <view wx:if="{{list.length == 0 && !skeletonLoding}}" class="empyt">
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
</view>
<view class="bottom-loading" wx:if="{{bottomLoading}}">
@@ -69,6 +69,9 @@
<view class="bottom-loading" style="color: #ccc;font-size: 28rpx;" wx:if="{{isMoreData}}">
<text>娌℃湁鏇村浜�</text>
</view>
+ <view class="body-loading" wx:if="{{skeletonLoding }}">
+ <t-loading theme="circular" size="40rpx" text="鍔犺浇涓�..." class="wrapper" />
+ </view>
</scroll-view>
</view>
</view>
diff --git a/packagePersonal/pages/myOrder/index.wxss b/packagePersonal/pages/myOrder/index.wxss
index 4f8c7aa..327f686 100644
--- a/packagePersonal/pages/myOrder/index.wxss
+++ b/packagePersonal/pages/myOrder/index.wxss
@@ -242,5 +242,9 @@
.empyt {
padding: 200rpx 0;
- background: #fff;
+}
+
+.body-loading {
+ padding: 200rpx 0;
+ text-align: center;
}
\ No newline at end of file
diff --git a/packagePersonal/pages/sampleBooks/index.js b/packagePersonal/pages/sampleBooks/index.js
index 0fd34e4..317096f 100644
--- a/packagePersonal/pages/sampleBooks/index.js
+++ b/packagePersonal/pages/sampleBooks/index.js
@@ -51,7 +51,6 @@
active: options.tabActive,
active1: options.stateTab
})
- console.log(this.data.active)
if (this.data.active == '1') {
this.setData({
topicIdOrRefCode: 'applyBook',
diff --git a/packagePersonal/pages/userSetting/index.js b/packagePersonal/pages/userSetting/index.js
index c732fd8..ef9ce44 100644
--- a/packagePersonal/pages/userSetting/index.js
+++ b/packagePersonal/pages/userSetting/index.js
@@ -97,7 +97,6 @@
},
//淇敼鐢ㄦ埛绫诲瀷
editUserInfo(e) {
- console.log(e)
let { info } = e.currentTarget.dataset
if (!this.data.userInfoBox) {
this.setData({
@@ -124,9 +123,7 @@
sourceType: ['album', 'camera'], // 鍙互鎸囧畾鏉ユ簮鏄浉鍐岃繕鏄浉鏈猴紝榛樿浜岃�呴兘鏈�
success: function (res) {
// 杩斿洖閫夊畾鐓х墖鐨勬湰鍦版枃浠惰矾寰勫垪琛紝tempFilePath涔熷彲浠ヤ綔涓篿mg鏍囩鐨剆rc灞炴�ф樉绀哄浘鐗�
- console.log(res.tempFiles[0])
tool.getFileMd5(res.tempFiles[0]).then((e) => {
- console.log(e, 4)
let formData = new FormData();
formData.append('Md5', e);
formData.append('FileName', e);
@@ -150,7 +147,6 @@
},
data: data.buffer,
success(res) {
- console.log(res)
if (res.statusCode == 200) {
resolve(res.data);
if (res.data) {
@@ -198,7 +194,6 @@
},
//杈撳叆鎵嬫満鍙�
onPhoneInput(e) {
- console.log(e)
const { phoneError } = this.data;
const isPhoneNumber = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/.test(e.detail.value);
if (phoneError === isPhoneNumber) {
@@ -296,7 +291,6 @@
},
getEmailCode() {
- console.log(this.data.userInfoForm.email)
if (this.data.userInfoForm.email && this.data.userInfoForm.captcha) {
app.MG.identity
.getEmailCode({
diff --git a/pages/home/home.js b/pages/home/home.js
index 0a15970..a066913 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -23,6 +23,7 @@
courseList: [],
bookTypeList: [],//鍥句功绫诲瀷
activeItem1: 0,
+ bookTypeData: {},
booksList: [],
readBookList: [], //鏁板瓧闃呰
textbookList: [], //鏁板瓧鏁欐潗
@@ -92,7 +93,6 @@
getCurrentUserInfo() {
app.MG.identity.getCurrentAppUser().then(res => {
- console.log(res, "userInfo");
// 鐢ㄦ埛淇℃伅浼樺厛绾э細鏁欏笀璁よ瘉 > 寰俊 > 瀛︾敓锛堟敞鍐屾椂榛樿锛�
if (res) {
let defaultUser = {};
@@ -142,7 +142,6 @@
bannerList: list
})
})
- console.log('杞挱鍥�', this.data.bannerList);
},
@@ -313,7 +312,10 @@
//鍥句功鏈嶅姟
tabBookClick(item) {
let info = this.data.bookTypeList[item.detail.value]
- console.log(info, 123)
+ bookTypeData
+ this.setData({
+ bookTypeData: info,
+ })
this.getBooksList(info)
},
//鏁板瓧闃呰
@@ -409,7 +411,7 @@
wx.showToast({
title: "寤鸿涓�",
icon: 'none',
- duration: 2000
+ duration: 1000
})
},
goCourseDetail(e) {
@@ -417,7 +419,7 @@
wx.showToast({
title: "寤鸿涓�",
icon: 'none',
- duration: 2000
+ duration: 1000
})
},
goReadBookDetail(e) {
@@ -425,7 +427,7 @@
wx.showToast({
title: "寤鸿涓�",
icon: 'none',
- duration: 2000
+ duration: 1000
})
},
goTextBookDetail(e) {
@@ -433,7 +435,7 @@
wx.showToast({
title: "寤鸿涓�",
icon: 'none',
- duration: 2000
+ duration: 1000
})
},
@@ -457,7 +459,12 @@
},
addCart(e) {
const { info } = e.currentTarget.dataset;
- console.log(info)
+ wx.showToast({
+ title: "寤鸿涓�",
+ icon: 'none',
+ duration: 1000
+ })
+ return;
if (wx.getStorageSync(app.config.tokenKey)) {
let query = {
start: 0,
@@ -504,16 +511,15 @@
},
onMoreGuide(e) {
let type = e.currentTarget.dataset.info
- console.log(e, 1)
if (type == "tushufuwu") {
wx.navigateTo({
- url: '/packageBookService/pages/bookServices/list/index'
+ url: '/packageBookService/pages/bookServices/list/index?assorName=' + this.data.bookTypeData.name
})
} else {
wx.showToast({
title: "寤鸿涓�",
icon: 'none',
- duration: 2000
+ duration: 1000
})
}
@@ -527,7 +533,6 @@
})
},
onRetrievalPage() {
- console.log(this.data.searchVal);
wx.navigateTo({
url: '/pages/retrievalPage/index?searchVal=' + this.data.searchVal
})
diff --git a/pages/home/home.wxml b/pages/home/home.wxml
index ff43634..18466b5 100644
--- a/pages/home/home.wxml
+++ b/pages/home/home.wxml
@@ -69,12 +69,12 @@
<view class="listBox1">
<view wx:if="{{courseList.length>0}}">
<view wx:for="{{courseList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="listItemBox">
- <view class="listItem flex" data-book="{{item}}" bindtap="goCourseDetail">
- <view class="specialSubject-img">
+ <view class="listItem flex">
+ <view class="specialSubject-img" data-book="{{item}}" bindtap="goCourseDetail">
<image src="{{item.icon}}" mode="aspectFill" class="img" />
</view>
<view class="body-info">
- <view class="name">{{item.name}}</view>
+ <view class="name" data-book="{{item}}" bindtap="goCourseDetail">{{item.name}}</view>
<view class="flex jc-sb">
<text class="author">{{item.courseLeader}}</text>
<text class="classHours">{{item.classHours}}璇炬椂</text>
@@ -158,13 +158,13 @@
<view class="listBox3">
<view wx:if="{{textbookList.length > 0}}">
<view wx:for="{{textbookList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="textbooksItemBox">
- <view class="listItem flex" bind:tap="goTextBookDetail" data-book="{{item}}">
- <view class="specialSubject-img">
+ <view class="listItem flex">
+ <view class="specialSubject-img" bind:tap="goTextBookDetail" data-book="{{item}}">
<image src="{{item.icon}}" mode="aspectFit" class="img" />
</view>
<view class="body-info">
- <view class="name">{{item.name}}</view>
- <view class="introduction">{{item.description}}</view>
+ <view class="name" bind:tap="goTextBookDetail" data-book="{{item}}">{{item.name}}</view>
+ <view class="introduction" bind:tap="goTextBookDetail" data-book="{{item}}">{{item.description}}</view>
<view class="author">{{item.author}}</view>
<view class="priceBox flex jc-sb">
<text class="price" wx:if="{{item.price == 0}}">鍏嶈垂</text>
@@ -186,15 +186,17 @@
</view>
<view class="rankingList">
<scroll-view class="srcolbox" scroll-x scroll-with-animation='true'>
- <view wx:for="{{rankingList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="booksListItemBox">
- <view class="listItem" bind:tap="goDetail" data-book="{{item}}">
- <view class="specialSubject-img">
- <image src="{{item.icon}}" mode="aspectFit" class="img" wx:if="{{item.icon}}" />
- <image src="/static/images/default-book-img.png" mode="aspectFit" class="img" wx:else />
- </view>
- <view class="body-info">
- <view class="name">{{item.name}}</view>
- <!-- <view class="author">{{item.author}}</view> -->
+ <view class="booksListBox">
+ <view wx:for="{{rankingList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="booksListItemBox">
+ <view class="listItem" bind:tap="goDetail" data-book="{{item}}">
+ <view class="specialSubject-img">
+ <image src="{{item.icon}}" mode="aspectFit" class="img" wx:if="{{item.icon}}" />
+ <image src="/static/images/default-book-img.png" mode="aspectFit" class="img" wx:else />
+ </view>
+ <view class="body-info">
+ <view class="name">{{item.name}}</view>
+ <!-- <view class="author">{{item.author}}</view> -->
+ </view>
</view>
</view>
</view>
diff --git a/pages/home/home.wxss b/pages/home/home.wxss
index 6dcae7a..30146a9 100644
--- a/pages/home/home.wxss
+++ b/pages/home/home.wxss
@@ -29,7 +29,7 @@
}
.home-page-header {
- padding-top: 230rpx;
+ padding-top: 180rpx;
}
.home-page-header .bg {
@@ -97,7 +97,7 @@
margin-top: 20rpx;
display: block;
padding: 0 24rpx;
- padding-bottom: 10vh;
+ margin-bottom: 11vh;
}
.tabCardPublic {
@@ -212,6 +212,7 @@
text-overflow: ellipsis;
/* 瓒呭嚭閮ㄥ垎鏄剧ず鐪佺暐鍙� */
white-space: normal;
+ flex: 1;
}
.body-info .price {
@@ -227,7 +228,7 @@
color: #ff6d00;
font-size: 30rpx;
background-repeat: no-repeat;
- background-size: 34% 64%;
+ background-size: 40% 64%;
background-position: right;
background-image: url(http://182.92.203.7:3007/jsek/website/image/click-icon.png);
}
@@ -343,6 +344,7 @@
.listBox3 .body-info {
width: calc(100% - 190rpx);
+ padding: 10rpx;
}
.listBox3 .name {
@@ -352,7 +354,7 @@
font-weight: bold;
line-height: 40rpx;
display: -webkit-box;
- margin-bottom: 10rpx;
+ margin-bottom: 12rpx;
-webkit-box-orient: vertical;
-webkit-line-clamp: 1;
overflow: hidden;
@@ -364,7 +366,6 @@
color: #B4B6BD;
line-height: 36rpx;
display: -webkit-box;
- margin-bottom: 14rpx;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
overflow: hidden;
@@ -373,7 +374,7 @@
.listBox3 .author {
line-height: 40rpx;
- margin-bottom: 20rpx;
+ margin: 16rpx 0;
}
.readList {
@@ -386,12 +387,15 @@
.srcolbox {
width: 100%;
- height: 420rpx;
+ height: 400rpx;
white-space: nowrap;
}
+.booksListBox {
+ display: flex;
+}
+
.srcolbox .booksListItemBox {
- display: inline-block;
width: 188rpx;
margin-right: 30rpx;
}
diff --git a/pages/personalCenter/feedBackSubmit/index.js b/pages/personalCenter/feedBackSubmit/index.js
index 0762189..202a52c 100644
--- a/pages/personalCenter/feedBackSubmit/index.js
+++ b/pages/personalCenter/feedBackSubmit/index.js
@@ -10,6 +10,7 @@
mannder: "",
content: "",
lock: true,
+ phoneError: false,
},
/**
@@ -64,10 +65,15 @@
userName: e.detail.value,
});
},
- bindTnputBlur1: function (e) {
- this.setData({
- mannder: e.detail.value,
- });
+ onPhoneInput(e) {
+ const { phoneError } = this.data;
+ const isPhoneNumber = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/.test(e.detail.value);
+ if (phoneError === isPhoneNumber) {
+ this.setData({
+ phoneError: !isPhoneNumber,
+ mannder: e.detail.value,
+ });
+ }
},
bindTextAreaBlur: function (e) {
this.setData({
@@ -78,14 +84,14 @@
submit() {
if (this.data.lock) {
this.data.lock = false;
- if (this.data.userName) {
- if (this.data.mannder) {
- if (this.data.content) {
+ if (this.data.userName.replace(/^\s*|\s*$/g, "")) {
+ if (this.data.mannder.replace(/^\s*|\s*$/g, "")) {
+ if (this.data.content.replace(/^\s*|\s*$/g, "")) {
let submitData = {
- content: this.data.content,
- name: this.data.userName,
+ content: this.data.content.replace(/^\s*|\s*$/g, ""),
+ name: this.data.userName.replace(/^\s*|\s*$/g, ""),
email: "",
- phone: this.data.mannder
+ phone: this.data.mannder.replace(/^\s*|\s*$/g, "")
};
var data = {
topicIdOrRefCode: "feedback",
@@ -130,7 +136,7 @@
} else {
this.data.lock = true;
wx.showToast({
- title: "鑱旂郴浜轰笉鑳戒负绌轰笉鑳戒负绌�",
+ title: "鑱旂郴浜轰笉鑳戒负绌�",
icon: 'none',
duration: 1000
})
diff --git a/pages/personalCenter/feedBackSubmit/index.json b/pages/personalCenter/feedBackSubmit/index.json
index 431022f..0a497e1 100644
--- a/pages/personalCenter/feedBackSubmit/index.json
+++ b/pages/personalCenter/feedBackSubmit/index.json
@@ -1,4 +1,6 @@
{
"navigationBarTitleText": "鎰忚鍙嶉",
- "usingComponents": {}
+ "usingComponents": {
+ "t-input": "tdesign-miniprogram/input/input"
+ }
}
\ No newline at end of file
diff --git a/pages/personalCenter/feedBackSubmit/index.wxml b/pages/personalCenter/feedBackSubmit/index.wxml
index b631d1c..7af45bd 100644
--- a/pages/personalCenter/feedBackSubmit/index.wxml
+++ b/pages/personalCenter/feedBackSubmit/index.wxml
@@ -3,13 +3,13 @@
<view class="from-item">
<view class="label"> 鑱旂郴浜猴細 </view>
<view class="item-content">
- <input class="weui-input" name="userName" auto-focus="true" adjust-position="true" value="{{userName}}" placeholder="璇疯緭鍏ヨ仈绯讳汉" bindinput="bindTnputBlur" />
+ <t-input placeholder="璇疯緭鍏ヨ仈绯讳汉" borderless value="{{userName}}" type="number" bindchange="bindTnputBlur" />
</view>
</view>
<view class="from-item">
<view class="label"> 鑱旂郴鏂瑰紡锛� </view>
<view class="item-content">
- <input class="weui-input" name="mannder" auto-focus="true" adjust-position="true" value="{{mannder}}" placeholder="璇疯緭鍏ヨ仈绯绘柟寮�" bindinput="bindTnputBlur1" />
+ <t-input placeholder="杈撳叆鑱旂郴鏂瑰紡" borderless value="{{mannder}}" type="number" tips="{{phoneError ? '鎵嬫満鍙疯緭鍏ヤ笉姝ｇ‘' : ''}}" bindchange="onPhoneInput" />
</view>
</view>
<view class="from-item">
diff --git a/pages/personalCenter/feedBackSubmit/index.wxss b/pages/personalCenter/feedBackSubmit/index.wxss
index 1cd14bb..efe4076 100644
--- a/pages/personalCenter/feedBackSubmit/index.wxss
+++ b/pages/personalCenter/feedBackSubmit/index.wxss
@@ -24,6 +24,14 @@
padding: 10rpx;
}
+.t-input {
+ padding: 0 !important;
+}
+
+.t-input__placeholder {
+ font-size: 28rpx !important
+}
+
.submit {
background: #ff6c00;
color: #fff;
diff --git a/pages/personalCenter/index.js b/pages/personalCenter/index.js
index ff34677..190cc96 100644
--- a/pages/personalCenter/index.js
+++ b/pages/personalCenter/index.js
@@ -281,7 +281,6 @@
});
},
tabUserTypeClick(e) {
- console.log(e)
let { info } = e.currentTarget.dataset;
this.setData({
userTypeActive: info.value,
@@ -320,7 +319,6 @@
//鐐瑰嚮鐩綍
toPages(item) {
- console.log(item)
let info = item.currentTarget.dataset.info
if (info.url) {
wx.navigateTo({
@@ -337,7 +335,7 @@
onScroll(e) {
this.setData({
- isWhite: e.scrollTop > 20 ? true : false
+ isWhite: e.detail.scrollTop > 10 ? true : false
})
},
diff --git a/pages/personalCenter/index.wxss b/pages/personalCenter/index.wxss
index 3ec75fb..5235b34 100644
--- a/pages/personalCenter/index.wxss
+++ b/pages/personalCenter/index.wxss
@@ -35,7 +35,7 @@
.content-wrapper {
position: relative;
padding: 30rpx;
- padding-bottom: calc(env(safe-area-inset-bottom) + 96rpx);
+ padding-bottom: calc(env(safe-area-inset-bottom) + 100rpx);
}
.topBox {
diff --git a/pages/student/index.js b/pages/student/index.js
index 621df7c..f3cc83e 100644
--- a/pages/student/index.js
+++ b/pages/student/index.js
@@ -53,7 +53,6 @@
tabClick(item) {
let that = this;
- console.log(item)
that.setData({
active: item.detail.value,
})
@@ -116,7 +115,6 @@
loading: false
})
}
- console.log(this.data.list)
} catch (error) {
console.log(error)
}
diff --git a/pages/student/index.wxss b/pages/student/index.wxss
index 8477b25..a0be81e 100644
--- a/pages/student/index.wxss
+++ b/pages/student/index.wxss
@@ -106,7 +106,7 @@
}
.content {
- height: calc(100vh - env(safe-area-inset-bottom) - 436rpx);
+ height: calc(100vh - env(safe-area-inset-bottom) - 456rpx);
box-sizing: border-box;
}
@@ -117,7 +117,7 @@
}
.content-item {
- background: #f1f1f1;
+ background: #F7F7F7;
border-radius: 10rpx;
box-sizing: border-box;
width: calc(100%/2 - 10rpx);
diff --git a/static/images/home/home-cart.png b/static/images/home/home-cart.png
index 727403e..9923528 100644
--- a/static/images/home/home-cart.png
+++ b/static/images/home/home-cart.png
Binary files differ
diff --git a/static/images/personal/about.png b/static/images/personal/about.png
index da79664..87f830c 100644
--- a/static/images/personal/about.png
+++ b/static/images/personal/about.png
Binary files differ
diff --git a/static/images/personal/certificate.png b/static/images/personal/certificate.png
index 62ea253..58e972d 100644
--- a/static/images/personal/certificate.png
+++ b/static/images/personal/certificate.png
Binary files differ
diff --git a/static/images/personal/chushu.png b/static/images/personal/chushu.png
index bbc4a66..76f4d9b 100644
--- a/static/images/personal/chushu.png
+++ b/static/images/personal/chushu.png
Binary files differ
diff --git a/static/images/personal/contact.png b/static/images/personal/contact.png
index bbcdf2e..51f2104 100644
--- a/static/images/personal/contact.png
+++ b/static/images/personal/contact.png
Binary files differ
diff --git a/static/images/personal/download.png b/static/images/personal/download.png
index 3e1d52b..52c4b8c 100644
--- a/static/images/personal/download.png
+++ b/static/images/personal/download.png
Binary files differ
diff --git a/static/images/personal/feedback.png b/static/images/personal/feedback.png
index dc59853..d74346b 100644
--- a/static/images/personal/feedback.png
+++ b/static/images/personal/feedback.png
Binary files differ
diff --git a/static/images/personal/jihuo.png b/static/images/personal/jihuo.png
index 9fe88a0..f61f6ca 100644
--- a/static/images/personal/jihuo.png
+++ b/static/images/personal/jihuo.png
Binary files differ
diff --git a/static/images/personal/notification.png b/static/images/personal/notification.png
index 4f5b3aa..d89bc77 100644
--- a/static/images/personal/notification.png
+++ b/static/images/personal/notification.png
Binary files differ
diff --git a/static/images/personal/notification1.png b/static/images/personal/notification1.png
index 8132730..8776800 100644
--- a/static/images/personal/notification1.png
+++ b/static/images/personal/notification1.png
Binary files differ
diff --git a/static/images/personal/order.png b/static/images/personal/order.png
index e6a2315..063e0d3 100644
--- a/static/images/personal/order.png
+++ b/static/images/personal/order.png
Binary files differ
diff --git a/static/images/personal/quxiaoshoucang.png b/static/images/personal/quxiaoshoucang.png
index c9c6227..c215c45 100644
--- a/static/images/personal/quxiaoshoucang.png
+++ b/static/images/personal/quxiaoshoucang.png
Binary files differ
diff --git a/static/images/personal/setting.png b/static/images/personal/setting.png
index b0ae238..b706796 100644
--- a/static/images/personal/setting.png
+++ b/static/images/personal/setting.png
Binary files differ
diff --git a/static/images/personal/suggestion.png b/static/images/personal/suggestion.png
index 530d7b3..a33eeb2 100644
--- a/static/images/personal/suggestion.png
+++ b/static/images/personal/suggestion.png
Binary files differ
diff --git a/static/images/personal/upload.png b/static/images/personal/upload.png
index 442dc5b..681c324 100644
--- a/static/images/personal/upload.png
+++ b/static/images/personal/upload.png
Binary files differ
diff --git a/static/images/personal/wodeshoucang.png b/static/images/personal/wodeshoucang.png
index 51d12ab..b065950 100644
--- a/static/images/personal/wodeshoucang.png
+++ b/static/images/personal/wodeshoucang.png
Binary files differ
diff --git a/static/images/personal/yangshushenqing.png b/static/images/personal/yangshushenqing.png
index ce1370f..3260149 100644
--- a/static/images/personal/yangshushenqing.png
+++ b/static/images/personal/yangshushenqing.png
Binary files differ
--
Gitblit v1.9.1