From 74139f2bc6bdc8147dd570ac1d774245f67e4f9f Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期一, 01 四月 2024 14:05:45 +0800
Subject: [PATCH] 样式修改
---
pages/home/home.js | 22 ++-
custom-tab-bar/index.wxss | 33 +++++
custom-tab-bar/index.wxml | 6
packageDomain/pages/resourceDetails/document/index.wxml | 2
pages/testLogin/index.js | 6
packagePersonal/pages/myOrder/index.js | 8
packageBookService/pages/components/webView/index.js | 38 ++++--
packageDomain/pages/sampleBookList/applicationForm/index.wxml | 6
pages/personalCenter/index.wxml | 4
packageBookService/pages/components/webView/index.wxml | 7 +
static/images/home/learn@2x.png | 0
packageDomain/pages/teacherCertification/index.wxml | 14 +-
static/images/home/learn-click@2x.png | 0
assets/js/config.js | 4
pages/home/home.wxml | 2
assets/js/login.js | 143 ++++++++++++-----------
packageDomain/pages/resourceDetails/myAudio/index.wxml | 18 --
pages/home/home.wxss | 6
packageBookService/pages/components/webView/index.wxss | 10 +
19 files changed, 191 insertions(+), 138 deletions(-)
diff --git a/assets/js/config.js b/assets/js/config.js
index e8f0417..e24b5cb 100644
--- a/assets/js/config.js
+++ b/assets/js/config.js
@@ -2,8 +2,8 @@
export const appId = 27;
// export const requestCtx = "https://jsek.bnuic.com" // 璇锋眰鍦板潃
// export const appId = 3;
-// export const epubUrl = "http://182.92.203.7:3007/epubReadMobile/";
-export const epubUrl = "http://jsysf.bnuic.com/epubReadMobile/#/";
+export const epubUrl = "http://182.92.203.7:3007/epubReadMobile/";
+// export const epubUrl = "http://jsysf.bnuic.com/epubReadMobile/#/";
export const pdfUrl = "http://182.92.203.7:3007/pdfRead/"
export const requestTimeOut = 300000; // 璇锋眰瓒呮椂鏃堕棿
export const tokenKey = "jsek-token";
diff --git a/assets/js/login.js b/assets/js/login.js
index 1ddfc12..10e49ae 100644
--- a/assets/js/login.js
+++ b/assets/js/login.js
@@ -4,78 +4,85 @@
export const loginInfo = (app, callback) => {
- wx.login({
- success: (res) => {
- wx.getUserInfo({
- success: (infoRes) => {
- app.MG.identity.checkWeChatAppAccount({
- code: res.code,
- appCode: app.config.appRefCode,
- encryptedData: infoRes.encryptedData,
- iv: infoRes.iv
- }).then(loginRes => {
- if (!loginRes) {
- const pages = getCurrentPages();
- const currentPage = pages[pages.length - 1];
- let url = `/${currentPage.route}`;
- if (Object.keys(currentPage.options).length) {
- let option = "";
- for (const key in currentPage.options) {
- if (currentPage.options[key]) {
- if (option) {
- option += "&"
+ if (app.config.appId == 27) {
+ wx.navigateTo({
+ url: "/pages/testLogin/index",
+ });
+ } else {
+ wx.login({
+ success: (res) => {
+ wx.getUserInfo({
+ success: (infoRes) => {
+ app.MG.identity.checkWeChatAppAccount({
+ code: res.code,
+ appCode: app.config.appRefCode,
+ encryptedData: infoRes.encryptedData,
+ iv: infoRes.iv
+ }).then(loginRes => {
+ if (!loginRes) {
+ const pages = getCurrentPages();
+ const currentPage = pages[pages.length - 1];
+ let url = `/${currentPage.route}`;
+ if (Object.keys(currentPage.options).length) {
+ let option = "";
+ for (const key in currentPage.options) {
+ if (currentPage.options[key]) {
+ if (option) {
+ option += "&"
+ }
+ option += key + "=" + currentPage.options[key]
}
- option += key + "=" + currentPage.options[key]
}
+ url += "?" + option
}
- url += "?" + option
+ console.log(url);
+ wx.navigateTo({
+ url: "/pages/bindInfo/index?page=" + encodeURIComponent(url),
+ });
+ } else {
+ wx.login({
+ success: (res) => {
+ app.MG.identity.loginByWeChatAppCode({
+ code: res.code,
+ appRefCode: app.config.appRefCode,
+ platform: "WeChatAppCustom",
+ encryptedData: infoRes.encryptedData,
+ iv: infoRes.iv
+ }).then(res => {
+ if (res && res.status == "Ok") {
+ // 鍌ㄥ瓨token
+ wx.setStorageSync(app.config.tokenKey, res.token);
+ // 鑾峰彇鐢ㄦ埛淇℃伅
+ getUserInfo(app, callback, res.token)
+ // 璁板綍鐧诲綍缁熻
+ setSessionGuid()
+ } else {
+ console.log(res);
+ callback(false)
+ }
+ })
+ },
+ fail: (err) => {
+ console.log(err);
+ callback(false)
+ }
+ })
}
- console.log(url);
- wx.navigateTo({
- url: "/pages/bindInfo/index?page=" + encodeURIComponent(url),
- });
- } else {
- wx.login({
- success: (res) => {
- app.MG.identity.loginByWeChatAppCode({
- code: res.code,
- appRefCode: app.config.appRefCode,
- platform: "WeChatAppCustom",
- encryptedData: infoRes.encryptedData,
- iv: infoRes.iv
- }).then(res => {
- if (res && res.status == "Ok") {
- // 鍌ㄥ瓨token
- wx.setStorageSync(app.config.tokenKey, res.token);
- // 鑾峰彇鐢ㄦ埛淇℃伅
- getUserInfo(app, callback, res.token)
- // 璁板綍鐧诲綍缁熻
- setSessionGuid()
- } else {
- console.log(res);
- callback(false)
- }
- })
- },
- fail: (err) => {
- console.log(err);
- callback(false)
- }
- })
- }
- })
- },
- fail: (err) => {
- console.log(err);
- callback(false)
- }
- })
- },
- fail: (err) => {
- console.log(err);
- callback(false)
- }
- })
+ })
+
+ },
+ fail: (err) => {
+ console.log(err);
+ callback(false)
+ }
+ })
+ },
+ fail: (err) => {
+ console.log(err);
+ callback(false)
+ }
+ })
+ }
}
// 鑾峰彇鐧诲綍鐢ㄦ埛韬唤
diff --git a/custom-tab-bar/index.wxml b/custom-tab-bar/index.wxml
index 5b38995..f96ce3b 100644
--- a/custom-tab-bar/index.wxml
+++ b/custom-tab-bar/index.wxml
@@ -10,8 +10,10 @@
<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="aspectFit" width="22" height="22" />
- <t-image wx:else class="tabImg" src="{{item.activeIcon}}" mode="aspectFit" width="22" height="22" />
+ <view class="tab-images">
+ <image wx:if="{{active !== index}}" class="tabImg" src="{{item.icon}}" mode="aspectFit" />
+ <image wx:else class="tabImg" src="{{item.activeIcon}}" mode="aspectFit" />
+ </view>
<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 a15f4a0..b700af1 100644
--- a/custom-tab-bar/index.wxss
+++ b/custom-tab-bar/index.wxss
@@ -4,6 +4,8 @@
align-items: center;
}
+
+
.custom-tab-bar-wrapper .text {
font-size: 20rpx;
margin-top: 10rpx;
@@ -29,6 +31,37 @@
padding-top: 20rpx;
}
+.tabItem:nth-child(1) .tab-images {
+ width: 52rpx;
+ height: 44rpx;
+}
+
+.tabItem:nth-child(2) .tab-images {
+ width: 38rpx;
+ height: 44rpx;
+}
+
+.tabItem:nth-child(3) .tab-images {
+ width: 57rpx;
+ height: 44rpx;
+}
+
+.tabItem:nth-child(4) .tab-images {
+ width: 45rpx;
+ height: 44rpx;
+}
+
+.tabItem:nth-child(5) .tab-images {
+ width: 43rpx;
+ height: 44rpx;
+}
+
+.tab-images .tabImg {
+ width: 100%;
+ height: 100%;
+ margin: 0 auto;
+}
+
.text {
font-size: 20rpx;
text-align: center;
diff --git a/packageBookService/pages/components/webView/index.js b/packageBookService/pages/components/webView/index.js
index 02bafaa..87254fe 100644
--- a/packageBookService/pages/components/webView/index.js
+++ b/packageBookService/pages/components/webView/index.js
@@ -10,6 +10,7 @@
link: false,
epubObj: null,
currentPage: '',
+ pdfList: []
},
/**
@@ -44,6 +45,7 @@
},
setWebViewSrc: function (data) {
+ let that = this;
var url = "";
if (data.fileType == 'epub') {
if (data.bookBuy) {
@@ -69,21 +71,31 @@
"&recordLocation=" +
this.data.currentPage + "&freeEpubPage=" + data.freePage
}
+ this.setData({
+ src: url
+ })
} else {
- url = app.config.pdfUrl +
- "?md5=" +
- data.md5 +
- "&bookName=" +
- data.fileName +
- "&url=" + app.config.requestCtx +
- "&token=" +
- wx.getStorageSync(app.config.tokenKey) +
- "&recordLocation=" +
- this.data.currentPage;
+ this.setData({
+ navigationBarTitleText: data.fileName
+ })
+ app.MG.file.getPdfInfo({
+ md5: data.md5
+ }).then((res) => {
+ let pageCount = data.bookBuy ? res.totalPages : data.freePage
+ if (res && pageCount) {
+ let list = [];
+ for (let i = 0; i < pageCount; i++) {
+ const src = app.config.requestCtx + '/file/GetPdfPageImage?md5=' + data.md5 + '&index=' + (i + 1) + '&dpi=300'
+ list.push(src)
+ }
+ this.setData({
+ pdfList: list
+ })
+
+ }
+ })
}
- this.setData({
- src: url
- })
+
},
diff --git a/packageBookService/pages/components/webView/index.wxml b/packageBookService/pages/components/webView/index.wxml
index 5013daf..e8f83a3 100644
--- a/packageBookService/pages/components/webView/index.wxml
+++ b/packageBookService/pages/components/webView/index.wxml
@@ -1,4 +1,9 @@
<!--packageBookService/pages/components/webView/index.wxml-->
<view class="page-body">
- <web-view bind:message="drawBack" binderror="onError" bindload="onLoadWeb" src="{{src}}" id="webView"></web-view>
+ <view wx:if="{{epubObj.fileType == 'pdf'}}" class="pdfBox">
+ <view wx:for="{{pdfList}}" wx:key="index" wx:for-item="item" wx:for-index="index" class="pdfItem">
+ <image src="{{item}}" alt="" mode="widthFix"></image>
+ </view>
+ </view>
+ <web-view bind:message="drawBack" binderror="onError" bindload="onLoadWeb" src="{{src}}" id="webView" wx:else></web-view>
</view>
\ No newline at end of file
diff --git a/packageBookService/pages/components/webView/index.wxss b/packageBookService/pages/components/webView/index.wxss
index 2a6a458..3589438 100644
--- a/packageBookService/pages/components/webView/index.wxss
+++ b/packageBookService/pages/components/webView/index.wxss
@@ -3,4 +3,14 @@
width: 100vw;
height: calc(100vh - env(safe-area-inset-bottom));
overflow: hidden;
+}
+
+.pdfBox {
+ box-sizing: border-box;
+ height: calc(100vh - env(safe-area-inset-bottom));
+ overflow-y: auto;
+}
+
+.pdfItem {
+ text-align: center;
}
\ No newline at end of file
diff --git a/packageDomain/pages/resourceDetails/document/index.wxml b/packageDomain/pages/resourceDetails/document/index.wxml
index 0d962cc..6ba0a7c 100644
--- a/packageDomain/pages/resourceDetails/document/index.wxml
+++ b/packageDomain/pages/resourceDetails/document/index.wxml
@@ -34,11 +34,9 @@
<view wx:if="{{selectType == 'pdf' || selectType == 'document'}}">
<view wx:for="{{naturalResources}}" wx:key="index" wx:for-item="item" wx:for-index="index">
-
<image src="{{item}}" alt="" style="min-height: 550px;"></image>
<view class="divider">绗� {{index + 1}} 椤�</view>
</view>
-
</view>
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.wxml b/packageDomain/pages/resourceDetails/myAudio/index.wxml
index 76ccfc2..bd50100 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.wxml
+++ b/packageDomain/pages/resourceDetails/myAudio/index.wxml
@@ -19,29 +19,13 @@
</view> -->
<!-- 鏆傚仠鎾斁 -->
-<<<<<<< Updated upstream
- <view
- class="audioIconBox color"
- style="margin-left: 30rpx; margin-right: 10rpx"
- >
- <view wx:if="{{!isplay}}" bind:tap="play" class="pauseCircleBox">
- <!-- <t-icon name="play-circle-stroke" size="24" /> -->
- <image
- src="/static/images/resourceDetailsMyAudio/play@2x.png"
- mode=""
- />
-=======
<view class="audioIconBox color" style="margin-left: 30rpx; margin-right: 10rpx">
<view wx:if="{{!isplay}}" bind:tap="play">
<t-icon name="play-circle-stroke" size="24" />
->>>>>>> Stashed changes
</view>
<view wx:else bind:tap="stop" class="pauseCircleBox">
<!-- <t-icon name="pause-circle-stroke" size="24" /> -->
- <image
- src="/static/images/resourceDetailsMyAudio/zanting@2x.png"
- mode=""
- />
+ <image src="/static/images/resourceDetailsMyAudio/zanting@2x.png" mode="" />
</view>
</view>
<slider style="width: 300rpx" activeColor="#FF6C00" class="mp-slider-bar" block-size="16" value="{{myAudioPos}}" bindchange="hanle_slider_change"></slider>
diff --git a/packageDomain/pages/sampleBookList/applicationForm/index.wxml b/packageDomain/pages/sampleBookList/applicationForm/index.wxml
index 88e03cb..4024024 100644
--- a/packageDomain/pages/sampleBookList/applicationForm/index.wxml
+++ b/packageDomain/pages/sampleBookList/applicationForm/index.wxml
@@ -58,19 +58,19 @@
<view class="item">
<text class="label">濮撳悕锛�</text>
<view class="item-content">
- <t-input placeholder="璇疯緭鍏ョ湡瀹炲鍚�" borderless value="{{contactInfo.fullName}}" bindchange="onFullNameInput" />
+ <t-input placeholder="璇疯緭鍏ョ湡瀹炲鍚�" borderless adjust-position="false" value="{{contactInfo.fullName}}" bindchange="onFullNameInput" />
</view>
</view>
<view class="item">
<text class="label">鑱旂郴鐢佃瘽锛�</text>
<view class="item-content">
- <t-input placeholder="杈撳叆鑱旂郴鐢佃瘽" borderless value="{{contactInfo.phone}}" type="number" tips="{{phoneError ? '鎵嬫満鍙疯緭鍏ヤ笉姝ｇ‘' : ''}}" bindchange="onPhoneInput" />
+ <t-input placeholder="杈撳叆鑱旂郴鐢佃瘽" borderless adjust-position="false" value="{{contactInfo.phone}}" type="number" tips="{{phoneError ? '鎵嬫満鍙疯緭鍏ヤ笉姝ｇ‘' : ''}}" bindchange="onPhoneInput" />
</view>
</view>
<view class="item">
<text class="label">璇︾粏鍦板潃锛�</text>
<view class="item-content">
- <t-input placeholder="璇疯緭鍏ヨ缁嗗湴鍧�" borderless value="{{contactInfo.detailedAddress}}" bindchange="onAddressInput" />
+ <t-input placeholder="璇疯緭鍏ヨ缁嗗湴鍧�" borderless adjust-position="false" value="{{contactInfo.detailedAddress}}" bindchange="onAddressInput" />
</view>
</view>
</view>
diff --git a/packageDomain/pages/teacherCertification/index.wxml b/packageDomain/pages/teacherCertification/index.wxml
index a08d60e..706689c 100644
--- a/packageDomain/pages/teacherCertification/index.wxml
+++ b/packageDomain/pages/teacherCertification/index.wxml
@@ -16,13 +16,13 @@
<view class="from-item">
<view class="label"> 瀛︽牎锛� </view>
<view class="item-content">
- <t-input placeholder="璇疯緭鍏ュ鏍�" borderless value="{{teacherInfo.schoolName}}" disabled="{{!editState}}" bindchange="onSchoolNameInput" />
+ <t-input placeholder="璇疯緭鍏ュ鏍�" borderless adjust-position="false" value="{{teacherInfo.schoolName}}" disabled="{{!editState}}" bindchange="onSchoolNameInput" />
</view>
</view>
<view class="from-item">
<view class="label"> 鐪熷疄濮撳悕锛� </view>
<view class="item-content">
- <t-input placeholder="璇疯緭鍏ョ湡瀹炲鍚�" borderless value="{{teacherInfo.fullName}}" disabled="{{!editState}}" bindchange="onFullNameInput" />
+ <t-input placeholder="璇疯緭鍏ョ湡瀹炲鍚�" borderless adjust-position="false" value="{{teacherInfo.fullName}}" disabled="{{!editState}}" bindchange="onFullNameInput" />
</view>
</view>
<view class="from-item">
@@ -40,31 +40,31 @@
<view class="from-item">
<view class="label"> 浠绘暀璇剧▼锛� </view>
<view class="item-content">
- <t-input placeholder="璇疯緭鍏ヤ换鏁欒绋�" borderless value="{{teacherInfo.courseName}}" bindchange="onCourseNameInput" disabled="{{!editState}}" />
+ <t-input placeholder="璇疯緭鍏ヤ换鏁欒绋�" borderless adjust-position="false" value="{{teacherInfo.courseName}}" bindchange="onCourseNameInput" disabled="{{!editState}}" />
</view>
</view>
<view class="from-item">
<view class="label"> 鎵嬫満鍙凤細 </view>
<view class="item-content">
- <t-input placeholder="杈撳叆鎵嬫満鍙风爜" borderless value="{{teacherInfo.phone}}" type="number" tips="{{phoneError ? '鎵嬫満鍙疯緭鍏ヤ笉姝ｇ‘' : ''}}" bindchange="onPhoneInput" disabled="{{!editState}}" />
+ <t-input placeholder="杈撳叆鎵嬫満鍙风爜" borderless adjust-position="false" value="{{teacherInfo.phone}}" type="number" tips="{{phoneError ? '鎵嬫満鍙疯緭鍏ヤ笉姝ｇ‘' : ''}}" bindchange="onPhoneInput" disabled="{{!editState}}" />
</view>
</view>
<view class="from-item">
<view class="label"> 搴ф満锛� </view>
<view class="item-content">
- <t-input placeholder="杈撳叆搴ф満鍙�" borderless value="{{teacherInfo.telphone}}" tips="{{telphoneError ? '搴ф満鍙疯緭鍏ヤ笉姝ｇ‘' : ''}}" bindchange="onTelphoneInput" disabled="{{!editState}}" />
+ <t-input placeholder="杈撳叆搴ф満鍙�" borderless value="{{teacherInfo.telphone}}" adjust-position="false" tips="{{telphoneError ? '搴ф満鍙疯緭鍏ヤ笉姝ｇ‘' : ''}}" bindchange="onTelphoneInput" disabled="{{!editState}}" />
</view>
</view>
<view class="from-item">
<view class="label"> 閭锛� </view>
<view class="item-content">
- <t-input placeholder="杈撳叆閭" borderless value="{{teacherInfo.email}}" tips="{{emailError ? '閭杈撳叆涓嶆纭�' : ''}}" bindchange="onEmailInput" disabled="{{!editState}}" />
+ <t-input placeholder="杈撳叆閭" borderless adjust-position="false" value="{{teacherInfo.email}}" tips="{{emailError ? '閭杈撳叆涓嶆纭�' : ''}}" bindchange="onEmailInput" disabled="{{!editState}}" />
</view>
</view>
<view class="from-item">
<view class="label"> 璇︾粏鍦板潃锛� </view>
<view class="item-content">
- <t-input placeholder="璇疯緭鍏ヨ缁嗗湴鍧�" borderless value="{{teacherInfo.detailedAddress}}" bindchange="onAddressInput" disabled="{{!editState}}" />
+ <t-input placeholder="璇疯緭鍏ヨ缁嗗湴鍧�" borderless adjust-position="false" value="{{teacherInfo.detailedAddress}}" bindchange="onAddressInput" disabled="{{!editState}}" />
</view>
</view>
</view>
diff --git a/packagePersonal/pages/myOrder/index.js b/packagePersonal/pages/myOrder/index.js
index 0559897..f89f220 100644
--- a/packagePersonal/pages/myOrder/index.js
+++ b/packagePersonal/pages/myOrder/index.js
@@ -40,7 +40,9 @@
isBackTop: false,
setScrollValue: 0,
skeletonLoding: true,
- queryFilter: []
+ queryFilter: [],
+ isPaySuccess: false,
+ isPayComplete: false,
},
/**
@@ -290,9 +292,7 @@
},
"complete": function (res) {
if (res.errMsg == 'requestPayment:ok') {
- that.setData({
- isPayComplete: true
- })
+ that.getDataList(false)
}
if (that.data.isPaySuccess && that.data.isPayComplete) {
that.navToBack()
diff --git a/pages/home/home.js b/pages/home/home.js
index 39bb7c2..f037922 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -117,7 +117,15 @@
})
})
},
-
+ navToActivityDetail(e) {
+ console.log(item)
+ let {
+ info
+ } = e.currentTarget.dataset
+ wx.navigateTo({
+ url: info.link,
+ });
+ },
loadHomePage() {
fetchHome().then(({
@@ -545,18 +553,12 @@
// 鐩戝惉婊氬姩鏉�
onScroll(e) {
- console.log(e)
this.setData({
isWhite: true
})
- if (e.detail.scrollTop == 0) {
- this.setData({
- isWhite: false
- })
- }
- // this.setData({
- // isWhite: e.detail.scrollTop > 20 ? true : false
- // })
+ this.setData({
+ isWhite: e.detail.scrollTop > 20 ? true : false
+ })
},
onScrollToTop(e) {
diff --git a/pages/home/home.wxml b/pages/home/home.wxml
index d965282..cc37881 100644
--- a/pages/home/home.wxml
+++ b/pages/home/home.wxml
@@ -17,7 +17,7 @@
<swiper interval="5000" indicator-dots="true" autoplay="true" circular="true" class="swiper" wx:if="{{bannerList.length > 0}}">
<swiper-item wx:for="{{bannerList}}" wx:for-index="index" wx:key="index" data-info="{{item}}" bindtap="navToActivityDetail">
<view class="swiperItem">
- <image src="{{item.value}}" mode="aspectFill" class="img" />
+ <image src="{{item.value}}" mode="widthFix" class="img" />
</view>
</swiper-item>
</swiper>
diff --git a/pages/home/home.wxss b/pages/home/home.wxss
index 54fd68c..fba2bb6 100644
--- a/pages/home/home.wxss
+++ b/pages/home/home.wxss
@@ -80,10 +80,10 @@
}
.swiper .img {
- width: auto !important;
- height: auto !important;
max-width: 100% !important;
- max-height: 100% !important;
+ /* max-height: 100% !important; */
+ width: auto !important;
+ /* height: auto !important; */
position: absolute !important;
top: 0 !important;
left: 0 !important;
diff --git a/pages/personalCenter/index.wxml b/pages/personalCenter/index.wxml
index 9e03e35..d7d9d6f 100644
--- a/pages/personalCenter/index.wxml
+++ b/pages/personalCenter/index.wxml
@@ -51,7 +51,7 @@
<view class="domainList1">
<view wx:for="{{moreMenu}}" wx:for-item="item" wx:for-index="index" wx:key="index" bindtap="toPages" data-info="{{item}}" class="listItem">
<view class="icon">
- <image src="{{item.icon}}" mode="aspectFit" class="img" />
+ <image src="{{item.icon}}" mode="aspectFill" class="img" />
</view>
<view class="label">
<text>{{item.title}}</text>
@@ -61,7 +61,7 @@
<view class="domainList2">
<view wx:for="{{moreMenu1}}" wx:for-item="item" wx:for-index="index" wx:key="index" bindtap="toPages" data-info="{{item}}" class="listItem">
<view class="icon">
- <image src="{{item.icon}}" mode="aspectFit" class="img" />
+ <image src="{{item.icon}}" mode="aspectFill" class="img" />
</view>
<view class="label">
<text>{{item.title}}</text>
diff --git a/pages/testLogin/index.js b/pages/testLogin/index.js
index 4c0e7be..01c8a86 100644
--- a/pages/testLogin/index.js
+++ b/pages/testLogin/index.js
@@ -63,7 +63,7 @@
defaultUser = {
...teacherInfos,
nickName: teacherInfos.fullName,
- avatarUrl: teacherInfos.icon,
+ icon: teacherInfos.icon,
userId: res.userId,
role: 'Teacher',
roleId: teacherRole.role.id
@@ -71,13 +71,13 @@
} else if (WeChatInfo) {
defaultUser = {
nickName: WeChatInfo.name,
- avatarUrl: WeChatInfo.icon,
+ icon: WeChatInfo.icon,
userId: res.userId,
}
} else if (secretData) {
defaultUser = {
nickName: secretData.credential,
- avatarUrl: "",
+ icon: "",
userId: res.userId
}
}
diff --git a/static/images/home/learn-click@2x.png b/static/images/home/learn-click@2x.png
index c64aa44..5b627e9 100644
--- a/static/images/home/learn-click@2x.png
+++ b/static/images/home/learn-click@2x.png
Binary files differ
diff --git a/static/images/home/learn@2x.png b/static/images/home/learn@2x.png
index e75981e..28ac928 100644
--- a/static/images/home/learn@2x.png
+++ b/static/images/home/learn@2x.png
Binary files differ
--
Gitblit v1.9.1