From 0b523220931d70aa752c3beaca5ed32ca85511c5 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期四, 28 三月 2024 11:36:05 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
assets/js/middleGround/api/ugc.js | 23
packageBookService/pages/bookServices/list/index.wxml | 118 ---
pages/home/home.js | 132 ++-
packageBookService/pages/bookServices/detail/buyResource/index.js | 109 ++-
packageBookService/pages/bookServices/list/index.wxss | 1
packageDomain/pages/sampleBookList/index.wxml | 14
packageDomain/pages/sampleBookList/index.wxss | 6
packagePersonal/pages/myCollection/index.js | 8
packagePersonal/pages/myOrder/index.js | 42 +
packageDomain/pages/sampleBookList/applicationForm/index.json | 1
packageDomain/pages/teacherCertification/index.js | 99 +-
pages/personalCenter/index.wxml | 2
packageDomain/pages/teacherCertification/index.wxss | 4
packagePersonal/pages/myOrder/index.wxml | 4
pages/personalCenter/feedBackSubmit/index.js | 71 +
packageBookService/pages/bookServices/detail/components/tree/index.js | 71 +
packageBookService/pages/bookServices/list/index.js | 77 +-
packageBookService/pages/bookServices/detail/buyResource/index.wxml | 2
assets/js/config.js | 17
packageDomain/pages/sampleBookList/index.js | 513 +++++----------
pages/bibliographyList/index.json | 3
packageBookService/pages/bookServices/detail/index.js | 166 ++--
pages/personalCenter/index.js | 46
assets/js/login.js | 9
packagePersonal/pages/activateProduct/index.js | 4
.vscode/settings.json | 4
packageDomain/pages/sampleBookList/applicationForm/index.js | 80 +
pages/bookExhibitionList/index.wxml | 7
pages/retrievalPage/index.wxml | 15
packageDomain/pages/sampleBookList/applicationForm/index.wxss | 28
pages/retrievalPage/index.wxss | 16
static/images/home/yangshuliebiao.png | 0
packageDomain/pages/sampleBookList/applicationForm/index.wxml | 16
app.json | 2
/dev/null | 1
pages/cart/index.js | 72 +
pages/cart/paymentPage/index.js | 5
pages/bibliographyList/index.wxml | 76 +
pages/bibliographyList/index.wxss | 28
packageDomain/pages/resourceDetails/myAudio/index.wxss | 6
pages/personalCenter/feedBackSubmit/index.wxml | 2
41 files changed, 988 insertions(+), 912 deletions(-)
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 22d6d96..ff37bd1 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -8,7 +8,7 @@
},
"[javascript]": {
"editor.formatOnSave": true,
- "editor.defaultFormatter": "vscode.typescript-language-features"
+ "editor.defaultFormatter": "HookyQR.beautify"
},
"[json]": {
"editor.defaultFormatter": "vscode.json-language-features"
@@ -32,7 +32,7 @@
},
"editor.tabSize": 2,
"[wxml]": {
- "editor.defaultFormatter": "esbenp.prettier-vscode"
+ "editor.defaultFormatter": "wechat.miniprogram.wxml-language-features"
},
"[css]": {
"editor.defaultFormatter": "HookyQR.beautify"
diff --git a/app.json b/app.json
index f44c4a5..18e255a 100644
--- a/app.json
+++ b/app.json
@@ -39,7 +39,7 @@
"pages/downloads/index",
"pages/activateProduct/index",
"pages/sampleBooks/index",
- "pages/personalCenter/publishBooks/index",
+ "pages/publishBooks/index",
"pages/feedBack/index",
"pages/aboutUs/index",
"pages/userSetting/index"
diff --git a/assets/js/config.js b/assets/js/config.js
index 82c8347..950f3e7 100644
--- a/assets/js/config.js
+++ b/assets/js/config.js
@@ -1,8 +1,7 @@
-// export const requestCtx = "http://182.92.203.7:3001"; // 璇锋眰鍦板潃
-// export const appId = 27;
-// export const requestCtx = "http://jsysf.bnuic.com"; // 璇锋眰鍦板潃
-export const requestCtx = "https://jsek.bnuic.com" // 璇锋眰鍦板潃
-export const appId = 3;
+export const requestCtx = "http://182.92.203.7:3001"; // 璇锋眰鍦板潃
+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 requestTimeOut = 300000; // 璇锋眰瓒呮椂鏃堕棿
@@ -12,9 +11,9 @@
export const goodsStore = `defaultGoodsStore${appId}`; // 榛樿鍟嗗搧搴�(涔﹀煄)
export const publicStore = `defaultPublicStore${appId}`; // 榛樿璧勬簮寮�鏀句粨鍌�
export const publicRepository = `defaultPublicRepository${appId}`; // 榛樿璧勬簮寮�鏀惧簱
-export const digitalCourses = "jsek_digitalCourses";//鏁板瓧璇剧▼
-export const digitalTextbooks = "jsek_digitalTextbooks";//鏁板瓧鏁欐潗
-export const seminar = "jsek_seminar";//涓撻鐮旇
+export const digitalCourses = "jsek_digitalCourses"; //鏁板瓧璇剧▼
+export const digitalTextbooks = "jsek_digitalTextbooks"; //鏁板瓧鏁欐潗
+export const seminar = "jsek_seminar"; //涓撻鐮旇
// export const seminar ="jsek_seminar";//涔﹀睍
export const reg_tel =
@@ -36,4 +35,4 @@
reg_telphone,
epubUrl
};
-export default config;
+export default config;
\ No newline at end of file
diff --git a/assets/js/login.js b/assets/js/login.js
index ff9d04c..3767405 100644
--- a/assets/js/login.js
+++ b/assets/js/login.js
@@ -1,4 +1,6 @@
-import { setSessionGuid } from "./userAction"
+import {
+ setSessionGuid
+} from "./userAction"
export const loginInfo = (app, callback) => {
@@ -28,7 +30,6 @@
}
url += "?" + option
}
- debugger
console.log(url);
wx.navigateTo({
url: "/pages/bindInfo/index?page=" + encodeURIComponent(url),
@@ -85,12 +86,12 @@
let defaultUser = {};
let WeChatInfo = res.infoList.find((item) => item.type === "WeChat");
let phoneNumber = res.secretList.find(i => i.type == 'MobilePhone')
-
if (WeChatInfo) {
defaultUser = {
nickName: WeChatInfo.name,
avatarUrl: WeChatInfo.icon,
- weChatId: WeChatInfo.id
+ weChatId: WeChatInfo.id,
+ userId: res.userId,
}
}
if (phoneNumber) {
diff --git a/assets/js/middleGround/api/ugc.js b/assets/js/middleGround/api/ugc.js
index 3ccce0d..525e9dd 100644
--- a/assets/js/middleGround/api/ugc.js
+++ b/assets/js/middleGround/api/ugc.js
@@ -1,14 +1,15 @@
import request from "../../../request/index";
-import { tokenKey } from "../../config";
+import {
+ tokenKey
+} from "../../config";
import toolClass from "../../toolClass";
-let token = wx.getStorageSync(tokenKey) ? wx.getStorageSync(tokenKey) : ''
+let token = wx.getStorageSync(tokenKey) ? wx.getStorageSync(tokenKey) : '';
const ugcApi = {
// 鑾峰彇鍟嗗搧鐐硅禐Topic
getProductLikesTopic(data) {
return request({
- url: token
- ? "/ugc/api/ApiAppUserGetProductLikesTopic"
- : "/ugc/api/ApiGetProductLikesTopic",
+ url: token ?
+ "/ugc/api/ApiAppUserGetProductLikesTopic" : "/ugc/api/ApiGetProductLikesTopic",
method: "post",
data,
});
@@ -17,9 +18,8 @@
// 鑾峰彇鍟嗗搧璇勮Topic
getProductCommentTopic(data) {
return request({
- url: token
- ? "/ugc/api/ApiAppUserGetProductCommentTopic"
- : "/ugc/api/ApiGetProductCommentTopic",
+ url: token ?
+ "/ugc/api/ApiAppUserGetProductCommentTopic" : "/ugc/api/ApiGetProductCommentTopic",
method: "post",
data,
});
@@ -28,9 +28,8 @@
// 鑾峰彇MessageList
getTopicMessageList(data) {
return request({
- url: token
- ? "/ugc/api/ApiAppUserGetTopicMessageList"
- : "/ugc/api/ApiGetTopicMessageList",
+ url: token ?
+ "/ugc/api/ApiAppUserGetTopicMessageList" : "/ugc/api/ApiGetTopicMessageList",
method: "post",
data,
});
@@ -96,4 +95,4 @@
// },
};
-export default ugcApi;
+export default ugcApi;
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/detail/buyResource/index.js b/packageBookService/pages/bookServices/detail/buyResource/index.js
index 77e65ca..c0e5b0d 100644
--- a/packageBookService/pages/bookServices/detail/buyResource/index.js
+++ b/packageBookService/pages/bookServices/detail/buyResource/index.js
@@ -14,7 +14,9 @@
loading: false,
shoppingList: [],
shoppingCartGetId: [],
- methodId: []
+ methodId: [],
+ paymentPage: false,
+ superior: false
},
/**
@@ -36,46 +38,7 @@
this.getShoppingCartProductGet()
this.getBookInfo(options.bookId)
},
- batchPurchase() {
- let saleMethodIds = []
- let requests = []
- const child = this.selectComponent('#tree')
- console.log(child.data.superiorPurchaseSaleMethodId, 'superiorPurchaseSaleMethodId');
- const item = child.data.superiorPurchaseSaleMethodId
- if (item) {
- item.forEach(item => {
- if (item.saleMethod != 0) {
- saleMethodIds = item.saleMethod[0].Id
- requests.push({ saleMethodIds, count: 1 })
- }
- })
- console.log(requests, 'saleMethodId');
- let query = {
- remarks: '浜戝涔�',
- requests,
-
-
-
- }
-
- // 鍙戣捣璁㈠崟鍒濆鍖栬姹傚苟绛夊緟缁撴灉
- const res = app.MG.store.initOrder(query)
- let bookOrdersId = res.orderNumber
- // 妫�鏌ヨ鍗曞彿鏄惁瀛樺湪
- if (bookOrdersId) {
- const url = '/pages/cart/paymentPage/index?orderNumber=' + bookOrdersId
- wx.navigateTo({
- url
- })
- }
- }
-
- // console.log(child.data.sonPurchaseSaleMethodId, 'child.data.');
- // this.data.methodId.push(child.data.sonPurchaseSaleMethodId)
-
-
- },
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
*/
@@ -407,5 +370,71 @@
const child = this.selectComponent('#tree')
child.checkAll()
},
+ //璐拱鎸夐挳
+ batchPurchase() {
+ let saleMethodIds = []
+ let requests = []
+ let item = []
+ const child = this.selectComponent('#tree')
+
+ console.log(child.data.superiorPurchaseSaleMethodId, 'superiorPurchaseSaleMethodId');
+ console.log(child.data.sonPurchaseSaleMethodId, 'child.data');
+ item = child.data.superiorPurchaseSaleMethodId
+ const sonItem = child.data.sonPurchaseSaleMethodId
+
+ if (item) {
+ console.log(item, 'sadsdasd');
+ // 鎷垮埌id
+ item.forEach(items => {
+ if (items.saleMethod != 0) {
+ saleMethodIds.push(items.saleMethod[0].Id)
+ }
+ })
+ console.log(saleMethodIds, 'saleMethodIds');
+
+ app.MG.store.initOrder({
+ requests: saleMethodIds.map(id => ({
+ saleMethodId: id,
+ count: 1,
+ })),
+ }).then(res => {
+ if (res) {
+ wx.navigateTo({
+ url: '/pages/cart/paymentPage/index?orderNumber=' + res.orderNumber,
+ })
+ this.setData({
+ superior: true
+ })
+
+ }
+ })
+
+
+ }
+
+
+
+
+ if (item.length == 0 && sonItem) {
+
+
+ app.MG.store.initOrder({
+ requests: sonItem.map(id => ({
+ saleMethodId: id,
+ count: 1,
+ })),
+ }).then(res => {
+ if (res) {
+ wx.navigateTo({
+ url: '/pages/cart/paymentPage/index?orderNumber=' + res.orderNumber,
+ })
+ this.setData({
+ paymentPage: true
+ })
+
+ }
+ })
+ }
+ },
})
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/detail/buyResource/index.wxml b/packageBookService/pages/bookServices/detail/buyResource/index.wxml
index 052aa35..4c34e85 100644
--- a/packageBookService/pages/bookServices/detail/buyResource/index.wxml
+++ b/packageBookService/pages/bookServices/detail/buyResource/index.wxml
@@ -14,7 +14,7 @@
<!-- 鍐呭 -->
<view class="buy-resource" wx:if="{{!loading}}">
- <tree id="tree" treeList="{{learn}}" tab="{{'jsek_cloudLearning'}}" isShowCheck="{{true}}" openIds="{{openLearnids}}" />
+ <tree id="tree" paymentPage="{{paymentPage}}" superior="{{superior}}" treeList="{{learn}}" tab="{{'jsek_cloudLearning'}}" isShowCheck="{{true}}" openIds="{{openLearnids}}" />
</view>
<view class="noData" wx:if="{{loading}}">
diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.js b/packageBookService/pages/bookServices/detail/components/tree/index.js
index 1527680..1486ac7 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.js
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.js
@@ -34,6 +34,14 @@
isShowCheck: {
type: Boolean,
value: false,
+ },
+ paymentPage: {
+ type: Boolean,
+ value: false,
+ },
+ superior: {
+ type: Boolean,
+ value: false,
}
},
data: {
@@ -50,6 +58,15 @@
console.log('鍑嗗');
},
onShow() {
+ debugger
+ this.setData({
+ sonPurchaseSaleMethodId: ''
+ })
+ },
+ onLoad() {
+ this.setData({
+ sonPurchaseSaleMethodId: ''
+ })
},
observers: {
'openIds': function (newValue) {
@@ -301,11 +318,23 @@
treeList: updatedTreeList // 鏇存柊 treeList 鏁版嵁
});
+ if (!list.checked) {
+ if (this.properties.superior) {
+ console.log(852);
- this.setData({
- superiorPurchaseSaleMethodId: list
- })
- console.log(this.data.superiorPurchaseSaleMethodId, 'superiorPurchaseSaleMethodId');
+ this.properties.superior = false
+ this.setData({
+ superiorPurchaseSaleMethodId: []
+ })
+ }
+ if (!this.properties.superior) {
+ this.setData({
+ superiorPurchaseSaleMethodId: list
+ })
+ }
+ }
+
+ // console.log(this.data.superiorPurchaseSaleMethodId, 'superiorPurchaseSaleMethodId');
list.forEach(items => {
console.log(items.checked, 'itesasd');
if (!items.checked) {
@@ -314,21 +343,41 @@
})
}
})
- this.onCloudShoppingCart()
+ // this.onCloudShoppingCart()
},
// 瀛愰」鍕鹃��
checkResource(e) {
const citem = e.currentTarget.dataset.item
- // console.log(e);
-
-
+ console.log(citem, '5648');
const updataList = this.checkResoucrceInfo(this.properties.treeList, citem.id)
- console.log(updataList);
+ console.log(citem.checked, 'citem.checked');
+ if (!citem.checked) {
+ //閫変腑鐨勬椂鍊欐坊鍔爄d
+ let sonPurchaseSaleMethodId = this.data.sonPurchaseSaleMethodId || []
+ console.log(this.properties.paymentPage, 'this.properties.paymentPage');
+ if (this.properties.paymentPage) {
+ console.log(789987);
+ sonPurchaseSaleMethodId = []
+ this.properties.paymentPage = false
+ }
+ if (!this.properties.paymentPage) {
+ sonPurchaseSaleMethodId.push(citem.saleMethod[0].Id)
+ }
+
+
+ this.setData({
+ sonPurchaseSaleMethodId: sonPurchaseSaleMethodId
+ })
+ console.log(this.data.sonPurchaseSaleMethodId);
+ } else {
+ // 鍙栨秷閫変腑鐨勬椂鍊欏垹闄d
+
+ }
+
this.setData({
treeList: updataList,
- sonPurchaseSaleMethodId: citem.saleMethod[0].Id
- })
+ })
},
// 鍔犲叆璐墿杞�
async onCloudShoppingCart() {
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index 88edf9f..6eb4cc2 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -34,17 +34,20 @@
openTeachids: [],
openLearnids: [],
openTestids: [],
- applyResourceState: false, // 鐢宠鏁欏璧勬簮鎸夐挳闃叉姈
+ applyResourceState: false, // 鐢宠鏁欏璧勬簮鎸夐挳闃叉姈
resourceClassList: [], // 璧勬簮鎵�灞炲垎绫�
- applyState: "", // 鏁欏璧勬簮鐢宠鐘舵��
- deadline: "", // 鏁欏璧勬簮鐢宠鏈夋晥鏃ユ湡
- rejectCause: "", // 涓嬭浇鎷掔粷鍘熷洜
+ applyState: "", // 鏁欏璧勬簮鐢宠鐘舵��
+ deadline: "", // 鏁欏璧勬簮鐢宠鏈夋晥鏃ユ湡
+ rejectCause: "", // 涓嬭浇鎷掔粷鍘熷洜
buyIdList: [],
shoppingCartGetId: [], // 宸茶喘涔癷d鍒楄〃
shoppingList: [],
loading: false,
- isShowTeachDownload: false, // 鎻愮ずPC涓嬭浇寮圭獥鐘舵��
- confirmBtn: { content: '鎴戠煡閬撲簡', variant: 'base' },
+ isShowTeachDownload: false, // 鎻愮ずPC涓嬭浇寮圭獥鐘舵��
+ confirmBtn: {
+ content: '鎴戠煡閬撲簡',
+ variant: 'base'
+ },
mockData: {
id: 0, // 閿�鍞甶d
price: 0, // 鍞环
@@ -55,9 +58,9 @@
},
flag: true,
noResources: false,
- selectedIds: "",//鍟嗗搧鎴栧瓙鍟嗗搧閿�鍞柟寮�
+ selectedIds: "", //鍟嗗搧鎴栧瓙鍟嗗搧閿�鍞柟寮�
bookBuy: false, //鍟嗗搧鎴栧瓙鍟嗗搧鏄惁璐拱
- expire: false,//鍟嗗搧鎴栧瓙鍟嗗搧閿�鍞柟寮忔槸鍚﹁繃鏈�
+ expire: false, //鍟嗗搧鎴栧瓙鍟嗗搧閿�鍞柟寮忔槸鍚﹁繃鏈�
noFile: false, //鍟嗗搧鎴栧瓙鍟嗘湁鏃犵數瀛愪功鏂囦欢
num: 0, //鏍蜂功鐢宠鍗曟暟閲�
alreadyPaperBookList: [], //宸茬敵璇风焊璐ㄦ牱涔�
@@ -72,7 +75,7 @@
fileType: "",
md5: "",
freePage: ""
- }, //闃呰鍣ㄦ暟鎹�
+ }, //闃呰鍣ㄦ暟鎹�
buyResourceData: {
productLinkPath: '',
refCode: '',
@@ -157,6 +160,20 @@
userInfo: JSON.parse(wx.getStorageSync(app.config.userInfoKey))
})
}
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
+ */
+ onShow() {
if (wx.getStorageSync("paperBookList")) {
this.setData({
paperBookList: wx.getStorageSync("paperBookList"),
@@ -173,26 +190,14 @@
},
/**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
- */
- onReady() {
-
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
- */
- onShow() { },
-
- /**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
*/
- onHide() { },
+ onHide() {},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
*/
- onUnload() { },
+ onUnload() {},
/**
* 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
@@ -215,7 +220,7 @@
/**
* 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
*/
- onShareAppMessage() { },
+ onShareAppMessage() {},
// 鏍煎紡鍖栨棩鏈�
formatDate(dateString) {
if (!dateString) {
@@ -522,7 +527,9 @@
},
// 璺宠浆缃戝簵
goShop(e) {
- const { link } = e.currentTarget.dataset;
+ const {
+ link
+ } = e.currentTarget.dataset;
wx.navigateTo({
url: `/packageBookService/pages/bookServices/webpage/index?url=${link}`,
})
@@ -541,9 +548,9 @@
'buyResourceData.refCode': checkData.refCode
})
}
- if ((e.detail.value == 'jsek_teachingResources' && !this.data.teach.length)
- || (e.detail.value == 'jsek_cloudLearning' && !this.data.learn.length)
- || (e.detail.value == 'questionBank' && !this.data.test.length)) {
+ if ((e.detail.value == 'jsek_teachingResources' && !this.data.teach.length) ||
+ (e.detail.value == 'jsek_cloudLearning' && !this.data.learn.length) ||
+ (e.detail.value == 'questionBank' && !this.data.test.length)) {
this.getResourceData(checkData)
}
} else {
@@ -799,13 +806,11 @@
console.log(determine);
if (!determine) {
let query = {
- requests: [
- {
- saleMethodId: this.data.selectedIds,
- storeEventId: null,
- agentCode: '鐢靛瓙涔�'
- }
- ]
+ requests: [{
+ saleMethodId: this.data.selectedIds,
+ storeEventId: null,
+ agentCode: '鐢靛瓙涔�'
+ }]
}
const addRes = app.MG.store.addShoppingCart(query)
this.showSuccessToast()
@@ -814,8 +819,8 @@
Toast({
context: this,
selector: '#t-toast',
- message: '宸叉坊鍔�',
- theme: 'success',
+ message: '璇ヤ功宸插湪璐墿杞︼紝璇峰嬁閲嶅娣诲姞',
+ theme: 'warning',
direction: 'column',
});
}
@@ -846,12 +851,10 @@
let bookOrdersId = ''
let query = {
remarks: '鐢靛瓙涔�',
- requests: [
- {
- saleMethodId: this.data.bookItemDetail.defaultSaleMethodId ? this.data.bookItemDetail.defaultSaleMethodId : this.data.bookDetail.defaultSaleMethodId,
- count: 1
- }
- ]
+ requests: [{
+ saleMethodId: this.data.bookItemDetail.defaultSaleMethodId ? this.data.bookItemDetail.defaultSaleMethodId : this.data.bookDetail.defaultSaleMethodId,
+ count: 1
+ }]
}
// 鍙戣捣璁㈠崟鍒濆鍖栬姹傚苟绛夊緟缁撴灉
const res = await app.MG.store.initOrder(query)
@@ -975,14 +978,12 @@
cmsTypeRefCode: '',
newDataListRequest: [],
name: this.data.bookDetail.name, // name涓虹敵璇风殑涔︽湰鍚嶇О
- content: JSON.stringify([
- {
- name: this.data.bookDetail.name,
- id: this.data.bookDetail.id,
- // defaultSaleMethodId: bookData.value.defaultSaleMethodId,
- icon: this.data.bookDetail.icon
- }
- ])
+ content: JSON.stringify([{
+ name: this.data.bookDetail.name,
+ id: this.data.bookDetail.id,
+ // defaultSaleMethodId: bookData.value.defaultSaleMethodId,
+ icon: this.data.bookDetail.icon
+ }])
}
app.MG.ugc.newTopicMessage(query).then(async (res) => {
if (res) {
@@ -1333,9 +1334,9 @@
if (new RegExp('(' + k + ')').test(fmt)) {
fmt = fmt.replace(
RegExp.$1,
- RegExp.$1.length == 1
- ? (o)[k]
- : ('00' + (o)[k]).substr(('' + (o)[k]).length)
+ RegExp.$1.length == 1 ?
+ (o)[k] :
+ ('00' + (o)[k]).substr(('' + (o)[k]).length)
)
}
}
@@ -1388,12 +1389,10 @@
try {
let query = {
remarks: '缁勫嵎',
- requests: [
- {
- saleMethodId: this.data.mockData.id,
- count: 1
- }
- ]
+ requests: [{
+ saleMethodId: this.data.mockData.id,
+ count: 1
+ }]
}
if (this.data.flag) {
this.setData({
@@ -1408,7 +1407,9 @@
} else {
// 0鍏冪洿鎺ラ鍙�
// 纭璁㈠崟
- const confirmOrderRes = await app.MG.store.confirmOrder({ orderNum: res.orderNumber })
+ const confirmOrderRes = await app.MG.store.confirmOrder({
+ orderNum: res.orderNumber
+ })
if (confirmOrderRes) {
wx.showToast({
icon: "success",
@@ -1430,19 +1431,22 @@
const id = tool.uuid(8)
const createDate = this.DateFormat(new Date().getTime(), 'yyyy-MM-dd')
const mockList = this.data.mockData.mockList
- mockList.push({ id, createDate, name: `绗�${num + 1}濂楄瘯鍗穈, state: '0' })
+ mockList.push({
+ id,
+ createDate,
+ name: `绗�${num + 1}濂楄瘯鍗穈,
+ state: '0'
+ })
this.setData({
'mockData.mockList': mockList
})
// 璁板綍璐拱鏃堕棿锛屽苟璁剧姸鎬乻tate涓�1锛岃〃绀哄垰璐拱瀹屾垚缁勫嵎
app.MG.identity.setUserKey({
- setKeyRequests: [
- {
- domain: 'mockData',
- key: this.data.bookDetail.id + '',
- value: JSON.stringify(this.data.mockData.mockList)
- }
- ]
+ setKeyRequests: [{
+ domain: 'mockData',
+ key: this.data.bookDetail.id + '',
+ value: JSON.stringify(this.data.mockData.mockList)
+ }]
})
},
// 搴曢儴璐拱鎸夐挳
@@ -1450,14 +1454,14 @@
if (this.data.tabValue == 'brief' && !this.data.bookBuy) {
this.buyBook()
}
- else if (this.data.tabValue == 'jsek_cloudLearning') {
- const tree = this.selectComponent('#tree')
- tree.onCloudShoppingCart()
- } else if (this.data.tabValue == 'questionBank') {
- this.buyMock()
- } else {
- console.log(this.data.tabValue);
- }
+ // else if (this.data.tabValue == 'jsek_cloudLearning') {
+ // const tree = this.selectComponent('#tree')
+ // tree.onCloudShoppingCart()
+ // } else if (this.data.tabValue == 'questionBank') {
+ // this.buyMock()
+ // } else {
+ // console.log(this.data.tabValue);
+ // }
},
goRead() {
@@ -1502,8 +1506,7 @@
wx.navigateTo({
url: "/packageDomain/pages/teacherCertification/index",
});
- } else if (res.cancel) {
- }
+ } else if (res.cancel) {}
}
})
}
@@ -1532,8 +1535,7 @@
wx.navigateTo({
url: "/packageDomain/pages/teacherCertification/index",
});
- } else if (res.cancel) {
- }
+ } else if (res.cancel) {}
}
})
}
@@ -1787,4 +1789,4 @@
teach: tree
})
},
-})
+})
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/list/index.js b/packageBookService/pages/bookServices/list/index.js
index 018f33d..9731193 100644
--- a/packageBookService/pages/bookServices/list/index.js
+++ b/packageBookService/pages/bookServices/list/index.js
@@ -1,5 +1,7 @@
const app = getApp();
-import { loginInfo } from '../../../../assets/js/login';
+import {
+ loginInfo
+} from '../../../../assets/js/login';
Page({
/**
* 椤甸潰鐨勫垵濮嬫暟鎹�
@@ -22,12 +24,10 @@
bookList: [],
stairList: {
value: '',
- options: [
- {
- value: '',
- label: '涓�绾�',
- },
- ],
+ options: [{
+ value: '',
+ label: '涓�绾�',
+ }, ],
},
secondList: {
value: [],
@@ -55,7 +55,7 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad(options) {
-
+ console.log(options)
const systInfo = wx.getSystemInfoSync();
const menu = wx.getMenuButtonBoundingClientRect(); // 鑳跺泭淇℃伅
const navBarHeight = (menu.top - systInfo.statusBarHeight) * 2 + menu.height; // 瀵艰埅鏍忛珮搴�
@@ -97,8 +97,7 @@
Path: options.secondCode,
Type: '*',
StoreRefCode: app.config.goodsStore,
- }
- ],
+ }],
})
}
// 鑾峰彇浜岀骇鍒嗙被
@@ -112,24 +111,22 @@
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
*/
- onReady() {
- },
+ onReady() {},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
*/
- onShow() {
- },
+ onShow() {},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
*/
- onHide() { },
+ onHide() {},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
*/
- onUnload() { },
+ onUnload() {},
/**
* 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
@@ -165,7 +162,7 @@
/**
* 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
*/
- onShareAppMessage() { },
+ onShareAppMessage() {},
goBack() {
wx.navigateBack();
},
@@ -179,15 +176,16 @@
size: '30',
start: '0',
storeRefCode: app.config.goodsStore,
- sort: { type: 'Asc', field: 'LinkOrder' },
+ sort: {
+ type: 'Asc',
+ field: 'LinkOrder'
+ },
};
app.MG.store.getStoreChannelList(query).then(async (res) => {
- const options = [
- {
- value: '',
- label: '涓�绾�',
- },
- ];
+ const options = [{
+ value: '',
+ label: '涓�绾�',
+ }, ];
for (let index = 0; index < res.datas.length; index++) {
const item = res.datas[index];
options.push({
@@ -212,7 +210,10 @@
size: '30',
start: '0',
storeRefCode: app.config.goodsStore,
- sort: { type: 'Asc', field: 'LinkOrder' },
+ sort: {
+ type: 'Asc',
+ field: 'LinkOrder'
+ },
};
app.MG.store.getStoreChannelList(query).then((res) => {
for (let index = 0; index < res.datas.length; index++) {
@@ -317,12 +318,10 @@
}
const query = {
...pathObj,
- filterList: [
- {
- value: 'Normal',
- field: 'state',
- },
- ],
+ filterList: [{
+ value: 'Normal',
+ field: 'state',
+ }, ],
sort,
paging: {
start: 0,
@@ -353,9 +352,9 @@
},
// 涓�绾у垎绫诲垏鎹�
onChangeStair(e) {
- const path = e.detail.value.length
- ? `${this.data.assortCheck.code}\\${e.detail.value}`
- : this.data.assortCheck.code;
+ const path = e.detail.value.length ?
+ `${this.data.assortCheck.code}\\${e.detail.value}` :
+ this.data.assortCheck.code;
this.setData({
pathList: [],
stairCode: e.detail.value,
@@ -450,13 +449,17 @@
},
// 璺宠浆鍥句功璇︽儏
goDetail(e) {
- const { book } = e.currentTarget.dataset;
+ const {
+ book
+ } = e.currentTarget.dataset;
wx.navigateTo({
url: `/packageBookService/pages/bookServices/detail/index?id=${book.id}&name=${book.name}`,
});
},
onRefresh() {
- this.setData({ enable: true });
+ this.setData({
+ enable: true
+ });
this.getBookList(this.data.path)
},
-});
+});
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/list/index.wxml b/packageBookService/pages/bookServices/list/index.wxml
index 9dd160f..a95f792 100644
--- a/packageBookService/pages/bookServices/list/index.wxml
+++ b/packageBookService/pages/bookServices/list/index.wxml
@@ -2,111 +2,42 @@
<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>
- <t-search
- model:value="{{searchValue}}"
- shape="round"
- placeholder="璇疯緭鍏ュ叧閿瘝/涔﹀悕/ISBN/浣滆��"
- class="navBar-search"
- style="width: 464rpx"
- bind:submit="searchBook"
- />
+ <t-search model:value="{{searchValue}}" shape="round" placeholder="璇疯緭鍏ュ叧閿瘝/涔﹀悕/ISBN/浣滆��" class="navBar-search" style="width: 464rpx" bind:submit="searchBook" />
</view>
<view class="bookServices-list">
<view class="list-header">
- <scroll-view scroll-x="{{true}}" class="header-scroll">
+ <!-- <scroll-view scroll-x="{{true}}" class="header-scroll"> -->
+ <view class="header-scroll">
<t-dropdown-menu style="width: 1000rpx">
- <t-dropdown-item
- options="{{stairList.options}}"
- value="{{stairList.value}}"
- bindchange="onChangeStair"
- />
- <t-dropdown-item
- label="浜岀骇"
- options="{{secondList.options}}"
- optionsColumns="2"
- multiple
- value="{{secondList.value}}"
- bind:confirm="onConfirmSecond"
- bind:change="onChangeSecond"
- />
- <t-dropdown-item
- label="閲嶇偣椤圭洰"
- options="{{majorProjectList.options}}"
- optionsColumns="2"
- multiple
- defaultValue="{{majorProjectList.value}}"
- bind:confirm="changeMajorProject"
- bind:reset="resetMajorProject"
- />
- <t-dropdown-item
- label="鏂板舰鎬佹暀鏉�"
- options="{{newTextBook.options}}"
- optionsColumns="2"
- multiple
- defaultValue="{{newTextBook.value}}"
- bind:confirm="changeNewText"
- bind:reset="resetNewText"
- />
+ <t-dropdown-item options="{{stairList.options}}" value="{{stairList.value}}" bindchange="onChangeStair" />
+ <t-dropdown-item label="浜岀骇" options="{{secondList.options}}" optionsColumns="2" multiple value="{{secondList.value}}" bind:confirm="onConfirmSecond" bind:change="onChangeSecond" />
+ <t-dropdown-item label="閲嶇偣椤圭洰" options="{{majorProjectList.options}}" optionsColumns="2" multiple defaultValue="{{majorProjectList.value}}" bind:confirm="changeMajorProject" bind:reset="resetMajorProject" />
+ <t-dropdown-item label="鏂板舰鎬佹暀鏉�" options="{{newTextBook.options}}" optionsColumns="2" multiple defaultValue="{{newTextBook.value}}" bind:confirm="changeNewText" bind:reset="resetNewText" />
</t-dropdown-menu>
- </scroll-view>
+ </view>
+ <!-- </scroll-view> -->
<view class="header-sort" bind:tap="sortClick">
<text class="sort-name">鎺掑簭</text>
<!-- <view class="sort-icon"> -->
- <t-icon
- name="swap-left"
- size="28rpx"
- class="icon-right"
- color="{{sort == 'Asc' ? '#ff6c00' : ''}}"
- />
- <t-icon
- name="swap-left"
- size="28rpx"
- class="icon-left"
- color="{{sort == 'Desc' ? '#ff6c00' : ''}}"
- />
+ <t-icon name="swap-left" size="28rpx" class="icon-right" color="{{sort == 'Asc' ? '#ff6c00' : ''}}" />
+ <t-icon name="swap-left" size="28rpx" class="icon-left" color="{{sort == 'Desc' ? '#ff6c00' : ''}}" />
<!-- </view> -->
</view>
</view>
- <t-pull-down-refresh
- value="{{enable}}"
- loadingProps="{{loadingProps}}"
- loadingTexts="{{['涓嬫媺鍒锋柊', '鏉炬墜鍒锋柊', '姝ｅ湪鍒锋柊', '鍒锋柊瀹屾垚']}}"
- bind:refresh="onRefresh"
- class="down-refresh"
- >
- <scroll-view
- scroll-y="{{true}}"
- class="list-container"
- bindrefresherrefresh="onPullDownRefresh"
- bindscrolltolower="onReachBottom"
- >
+ <t-pull-down-refresh value="{{enable}}" loadingProps="{{loadingProps}}" loadingTexts="{{['涓嬫媺鍒锋柊', '鏉炬墜鍒锋柊', '姝ｅ湪鍒锋柊', '鍒锋柊瀹屾垚']}}" bind:refresh="onRefresh" class="down-refresh">
+ <scroll-view scroll-y="{{true}}" class="list-container" bindrefresherrefresh="onPullDownRefresh" bindscrolltolower="onReachBottom">
<view class="assort-title">
<view class="title-box"></view>
<view class="title-name">{{assortCheck.name}}</view>
</view>
<view class="page-content">
<view class="book-list" wx:if="{{!loaidng}}">
- <view
- class="book-box"
- wx:for="{{bookList}}"
- wx:key="id"
- bind:tap="goDetail"
- data-book="{{item}}"
- >
+ <view class="book-box" wx:for="{{bookList}}" wx:key="id" bind:tap="goDetail" data-book="{{item}}">
<view class="book-img">
- <image
- src="{{item.icon ? item.icon : '/static/images/default-book-img.png'}}"
- aria-label="{item.name{}}"
- mode="widthFix"
- />
+ <image src="{{item.icon ? item.icon : '/static/images/default-book-img.png'}}" aria-label="{item.name{}}" mode="widthFix" />
</view>
<view class="book-name book-color">{{ item.name}}</view>
<view class="book-author book-color">{{item.author}}</view>
@@ -117,24 +48,13 @@
</view>
<!-- loading -->
<view class="loading-box" wx:if="{{loaidng}}">
- <t-loading
- theme="circular"
- size="60rpx"
- class="wrapper"
- loading="{{loaidng}}"
- wx:if="{{loaidng}}"
- />
+ <t-loading theme="circular" size="60rpx" class="wrapper" loading="{{loaidng}}" wx:if="{{loaidng}}" />
</view>
</view>
<view class="bottom-box">
- <t-loading
- theme="circular"
- size="40rpx"
- class="wrapper"
- wx:if="{{isMore == true}}"
- />
+ <t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" />
<text wx:if="{{isMore == false}}">娌℃湁鏇村浜�</text>
</view>
</scroll-view>
</t-pull-down-refresh>
-</view>
+</view>
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/list/index.wxss b/packageBookService/pages/bookServices/list/index.wxss
index 89598cf..a096e07 100644
--- a/packageBookService/pages/bookServices/list/index.wxss
+++ b/packageBookService/pages/bookServices/list/index.wxss
@@ -68,6 +68,7 @@
.header-scroll {
height: 100%;
width: 85vw;
+ overflow-x: auto;
}
.icon-left {
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.wxss b/packageDomain/pages/resourceDetails/myAudio/index.wxss
index be0bd61..c42317f 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.wxss
+++ b/packageDomain/pages/resourceDetails/myAudio/index.wxss
@@ -310,7 +310,6 @@
.mp-slider-bar {
margin: 0 18rpx;
- /* margin-top: 10rpx; */
}
.t-tabs__item--active {
@@ -341,9 +340,12 @@
.publicText {
display: flex;
-
}
.noData {
margin-top: 150rpx;
+}
+
+.audioIconBox {
+ width: 50rpx;
}
\ No newline at end of file
diff --git a/packageDomain/pages/sampleBookList/applicationForm/index.js b/packageDomain/pages/sampleBookList/applicationForm/index.js
index 1a33d96..3622b8f 100644
--- a/packageDomain/pages/sampleBookList/applicationForm/index.js
+++ b/packageDomain/pages/sampleBookList/applicationForm/index.js
@@ -1,4 +1,6 @@
-import { worksDataBytool } from "../../../../assets/js/toolClass.js";
+import {
+ worksDataBytool
+} from "../../../../assets/js/toolClass.js";
const app = getApp();
Page({
data: {
@@ -16,6 +18,7 @@
phone: "",
detailedAddress: ""
},
+ phoneError: false,
paperBookList: [], //鏍蜂功鍗曠焊璐ㄤ功
electronicBookList: [], //鏍蜂功鍗曠數瀛愪功
ebookCount: 0,
@@ -26,10 +29,10 @@
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
- onLoad() { },
+ onLoad() {},
/**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
- */
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
+ */
onShow() {
if (wx.getStorageSync(app.config.userInfoKey)) {
this.setData({
@@ -58,12 +61,7 @@
this.getSelectBookCount();
this.getSelectPaperBookCount();
this.getPaperType();
- } else {
- wx.navigateTo({
- url: "/pages/testLogin/index",
- });
}
-
},
tabClick(item) {
@@ -84,7 +82,9 @@
},
getElectronType() {
- app.MG.resource.getCmsTypeByRefCode({ refCodes: ['jsek_electronicSampleBook'] }).then((res) => {
+ app.MG.resource.getCmsTypeByRefCode({
+ refCodes: ['jsek_electronicSampleBook']
+ }).then((res) => {
this.setData({
description: res[0].description,
'teacherInfo.workInfo': res[0].cmsTypeLinks[0].children,
@@ -95,22 +95,22 @@
app.MG.resource.getCmsTypeByRefCode({
refCodes: ['jsek_paperVersionSampleBook']
}).
- then((res) => {
- if (res && res.length > 0) {
- this.setData({
- description: res[0].description,
- 'teacherInfo.workInfo': res[0].cmsTypeLinks[0].children,
- })
- }
- })
+ then((res) => {
+ if (res && res.length > 0) {
+ this.setData({
+ description: res[0].description,
+ 'teacherInfo.workInfo': res[0].cmsTypeLinks[0].children,
+ })
+ }
+ })
},
//鑾峰彇褰撳墠宸茬敵璇锋鏁帮紙鐢靛瓙锛�
getSelectBookCount() {
let that = this;
app.MG.app.getTicketResult({
- ticketRefCodeOrGuid: 'electronicSampleBookapplyNum',
- roleId: that.data.userInfo.roleId
- })
+ ticketRefCodeOrGuid: 'electronicSampleBookapplyNum',
+ roleId: that.data.userInfo.roleId
+ })
.then((res) => {
let num = res.totalCount - res.usedCount;
that.setData({
@@ -122,9 +122,9 @@
getSelectPaperBookCount() {
let that = this;
app.MG.app.getTicketResult({
- ticketRefCodeOrGuid: 'paperSampleBookapplyNum',
- roleId: that.data.userInfo.roleId
- })
+ ticketRefCodeOrGuid: 'paperSampleBookapplyNum',
+ roleId: that.data.userInfo.roleId
+ })
.then((res) => {
let count = res.totalCount - res.usedCount;
that.setData({
@@ -132,6 +132,31 @@
})
})
},
+ //濮撳悕
+ onFullNameInput(e) {
+ this.setData({
+ "contactInfo.fullName": 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,
+ "contactInfo.phone": e.detail.value,
+ });
+ }
+ },
+ onAddressInput() {
+ this.setData({
+ "contactInfo.detailedAddress": e.detail.value,
+ });
+ },
+
submit() {
let that = this;
@@ -178,7 +203,6 @@
})
return
}
-
const mailAddress = JSON.stringify(that.data.contactInfo)
that.setData({
'teacherInfo.detailedAddress': mailAddress
@@ -223,8 +247,7 @@
wx.navigateTo({
url: "/packagePersonal/pages/sampleBooks/index?stateTab=1&tabActive=" + that.data.active,
});
- } else if (res.cancel) {
- }
+ } else if (res.cancel) {}
}
})
})
@@ -271,8 +294,7 @@
})
wx.setStorageSync("paperBookList", pList);
}
- } else if (res.cancel) {
- }
+ } else if (res.cancel) {}
}
})
},
diff --git a/packageDomain/pages/sampleBookList/applicationForm/index.json b/packageDomain/pages/sampleBookList/applicationForm/index.json
index c2b591c..8f822aa 100644
--- a/packageDomain/pages/sampleBookList/applicationForm/index.json
+++ b/packageDomain/pages/sampleBookList/applicationForm/index.json
@@ -3,6 +3,7 @@
"usingComponents": {
"t-tabs": "tdesign-miniprogram/tabs/tabs",
"t-tab-panel": "tdesign-miniprogram/tab-panel/tab-panel",
+ "t-input": "tdesign-miniprogram/input/input",
"t-cascader": "tdesign-miniprogram/cascader/cascader",
"t-swipe-cell": "tdesign-miniprogram/swipe-cell/swipe-cell",
"t-empty": "tdesign-miniprogram/empty/empty"
diff --git a/packageDomain/pages/sampleBookList/applicationForm/index.wxml b/packageDomain/pages/sampleBookList/applicationForm/index.wxml
index 9c8dd5f..99a28eb 100644
--- a/packageDomain/pages/sampleBookList/applicationForm/index.wxml
+++ b/packageDomain/pages/sampleBookList/applicationForm/index.wxml
@@ -1,10 +1,8 @@
<view class="container">
- <view class="page-header">
- <t-tabs t-class="t-tabs" defaultValue="{{active}}" split="{{false}}" bind:change="tabClick">
- <t-tab-panel label="绾歌川鏍蜂功" value="0" />
- <t-tab-panel label="鐢靛瓙鏍蜂功" value="1" />
- </t-tabs>
- </view>
+ <t-tabs t-class="t-tabs" defaultValue="{{active}}" split="{{false}}" bind:change="tabClick">
+ <t-tab-panel label="绾歌川鏍蜂功" value="0" />
+ <t-tab-panel label="鐢靛瓙鏍蜂功" value="1" />
+ </t-tabs>
<view class="page-content">
<view class="content">
<view class="bookListBox">
@@ -59,19 +57,19 @@
<view class="item">
<text class="label">濮撳悕锛�</text>
<view class="item-content">
- <input class="weui-input" name="userName" auto-focus="true" adjust-position="true" value="{{contactInfo.fullName}}" placeholder="璇疯緭鍏ュ鍚�" bindinput="bindTnputBlur" adjust-position="{{false}}" />
+ <t-input placeholder="璇疯緭鍏ョ湡瀹炲鍚�" borderless value="{{contactInfo.fullName}}" bindchange="onFullNameInput" />
</view>
</view>
<view class="item">
<text class="label">鑱旂郴鐢佃瘽锛�</text>
<view class="item-content">
- <input class="weui-input" name="userName" auto-focus="true" adjust-position="true" value="{{contactInfo.phone}}" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" bindinput="bindTnputBlur" adjust-position="{{false}}" />
+ <t-input placeholder="杈撳叆鑱旂郴鐢佃瘽" borderless value="{{contactInfo.phone}}" type="number" tips="{{phoneError ? '鎵嬫満鍙疯緭鍏ヤ笉姝ｇ‘' : ''}}" bindchange="onPhoneInput" />
</view>
</view>
<view class="item">
<text class="label">璇︾粏鍦板潃锛�</text>
<view class="item-content">
- <input class="weui-input" name="userName" auto-focus="true" adjust-position="true" value="{{contactInfo.detailedAddress}}" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�" bindinput="bindTnputBlur" adjust-position="{{false}}" />
+ <t-input placeholder="璇疯緭鍏ヨ缁嗗湴鍧�" borderless value="{{contactInfo.detailedAddress}}" bindchange="onAddressInput" />
</view>
</view>
</view>
diff --git a/packageDomain/pages/sampleBookList/applicationForm/index.wxss b/packageDomain/pages/sampleBookList/applicationForm/index.wxss
index b117cc3..cdff08e 100644
--- a/packageDomain/pages/sampleBookList/applicationForm/index.wxss
+++ b/packageDomain/pages/sampleBookList/applicationForm/index.wxss
@@ -7,21 +7,14 @@
height: 100vh;
}
-.page-header {
- width: 100%;
- position: fixed;
- top: 0;
- left: 0;
- z-index: 1;
-}
.page-content {
- padding-top: 96rpx;
+ margin-top: -30rpx;
}
.content {
- height: calc(100vh - env(safe-area-inset-bottom) - 96rpx);
box-sizing: border-box;
+ height: calc(100vh - env(safe-area-inset-bottom) - 86rpx);
overflow-y: auto;
}
@@ -31,8 +24,13 @@
}
.t-tabs {
- margin-top: 20rpx;
+ padding-top: 20rpx;
background: none !important;
+ width: 100%;
+ position: fixed;
+ top: 0rpx;
+ left: 0;
+ z-index: 1
}
.t-tabs__wrapper {
@@ -74,7 +72,7 @@
background: #fff;
min-height: 200rpx;
border-radius: 10rpx;
- margin-top: -30rpx;
+
padding: 60rpx 40rpx 40rpx 40rpx;
}
@@ -187,8 +185,12 @@
flex: 1;
}
-.weui-input {
- height: 60rpx;
+.item-content .t-input {
+ padding: 0 !important;
+}
+
+.t-input__placeholder {
+ font-size: 28rpx !important
}
.btn-area {
diff --git a/packageDomain/pages/sampleBookList/index.js b/packageDomain/pages/sampleBookList/index.js
index b06b523..e01c948 100644
--- a/packageDomain/pages/sampleBookList/index.js
+++ b/packageDomain/pages/sampleBookList/index.js
@@ -1,3 +1,6 @@
+import {
+ loginInfo
+} from '../../../assets/js/login';
const app = getApp();
Page({
@@ -113,27 +116,41 @@
Path: options.secondCode,
Type: '*',
StoreRefCode: app.config.goodsStore,
- }
- ],
+ }],
})
}
this.getIconTypeList();
-
// 鑾峰彇閲嶇偣椤圭洰
this.getProjectList('bookClassification');
//鏂板舰鎬佹暀鏉�
this.getProjectList('newFormsTextbooks');
- if (wx.getStorageSync(app.config.tokenKey)) {
- this.getAlreadyPBookList()
- this.getAlreadyEBookList()
- }
- if (wx.getStorageSync(app.config.userInfoKey)) {
+
+ // 妫�鏌ョ櫥褰曠姸鎬�
+ const token = wx.getStorageSync(app.config.tokenKey)
+ if (!token) {
+ loginInfo(app, (data) => {
+ if (data) {
+ this.setData({
+ userInfo: JSON.parse(wx.getStorageSync(app.config.userInfoKey))
+ })
+ this.getAlreadyPBookList()
+ this.getAlreadyEBookList()
+ // 鑾峰彇鐢宠娆℃暟
+ this.getSelectPaperBookCount()
+ this.getSelectBookCount()
+
+ }
+ })
+ } else {
this.setData({
userInfo: JSON.parse(wx.getStorageSync(app.config.userInfoKey))
})
+ this.getAlreadyPBookList()
+ this.getAlreadyEBookList()
+ // 鑾峰彇鐢宠娆℃暟
+ this.getSelectPaperBookCount()
+ this.getSelectBookCount()
}
- this.getBookList(false);
-
},
/**
@@ -160,31 +177,59 @@
this.setData({
num: this.data.paperBookList.length + this.data.electronicBookList.length
})
-
+ this.getBookList(false);
},
goBack() {
wx.navigateBack();
+ },
+
+ // 鑾峰彇绾歌川涔﹀墿浣欐鏁�
+ getSelectPaperBookCount(item) {
+ app.MG.app
+ .getTicketResult({
+ ticketRefCodeOrGuid: 'paperSampleBookapplyNum',
+ roleId: this.data.userInfo.roleId
+ })
+ .then((res) => {
+ this.setData({
+ paperBookCount: res.totalCount - res.usedCount
+ })
+ })
+ },
+ // 鑾峰彇鐢靛瓙涔﹀墿浣欐鏁�
+ getSelectBookCount(item) {
+ app.MG.app
+ .getTicketResult({
+ ticketRefCodeOrGuid: 'electronicSampleBookapplyNum',
+ roleId: this.data.userInfo.roleId
+ })
+ .then((res) => {
+ this.setData({
+ ebookCount: res.totalCount - res.usedCount
+ })
+ })
},
//鑾峰彇楂樼骇鍒嗙被
getIconTypeList() {
let query = {
path: '*',
- filterList: [
- {
- value: 'Normal',
- field: 'state'
- }
- ],
+ filterList: [{
+ value: 'Normal',
+ field: 'state'
+ }],
queryType: '\\',
searchList: [],
size: '5',
start: '0',
storeRefCode: app.config.goodsStore,
- sort: { type: 'Asc', field: 'LinkOrder' }
+ sort: {
+ type: 'Asc',
+ field: 'LinkOrder'
+ }
}
app.MG.store.getStoreChannelList(query).then((res) => {
let list = [];
- if (res.datas.length > 0) (
+ if (res.datas.length > 0)(
res.datas.forEach((item) => {
item.value = item.refCode;
item.label = item.name;
@@ -213,7 +258,10 @@
size: '30',
start: '0',
storeRefCode: app.config.goodsStore,
- sort: { type: 'Asc', field: 'LinkOrder' },
+ sort: {
+ type: 'Asc',
+ field: 'LinkOrder'
+ },
};
app.MG.store.getStoreChannelList(query).then(async (res) => {
let options = [];
@@ -243,7 +291,10 @@
size: '30',
start: '0',
storeRefCode: app.config.goodsStore,
- sort: { type: 'Asc', field: 'LinkOrder' },
+ sort: {
+ type: 'Asc',
+ field: 'LinkOrder'
+ },
};
app.MG.store.getStoreChannelList(query).then((res) => {
if (res.datas.length > 0) {
@@ -346,12 +397,10 @@
}
const query = {
...pathObj,
- filterList: [
- {
- value: 'Normal',
- field: 'state',
- },
- ],
+ filterList: [{
+ value: 'Normal',
+ field: 'state',
+ }, ],
sort,
paging: {
start: that.data.page * that.data.limit - that.data.limit,
@@ -458,9 +507,9 @@
},
// 涓�绾у垎绫诲垏鎹�
onChangeStair(e) {
- const path = e.detail.value.length
- ? `${this.data.assortCheck.code}\\${e.detail.value}`
- : this.data.assortCheck.code;
+ const path = e.detail.value.length ?
+ `${this.data.assortCheck.code}\\${e.detail.value}` :
+ this.data.assortCheck.code;
this.setData({
pathList: [],
stairCode: e.detail.value,
@@ -556,7 +605,9 @@
},
// 璺宠浆鍥句功璇︽儏
goDetail(e) {
- const { book } = e.currentTarget.dataset;
+ const {
+ book
+ } = e.currentTarget.dataset;
wx.navigateTo({
url: `/packageBookService/pages/bookServices/detail/index?id=${book.id}&name=${book.name}`,
});
@@ -680,17 +731,34 @@
//绾歌川鏍蜂功
onChangePaper(e) {
const item = e.currentTarget.dataset.book;
+ const index = this.data.bookList.findIndex(citem => citem.id == item.id)
let role = this.data.userInfo != null ? this.data.userInfo.role : null
- if (role) {
- if (item.paperDisabled) {
- wx.showToast({
- title: "璇ユ牱涔﹀凡鐢宠",
- icon: 'none',
- duration: 1000,
+ if (role && role == 'Teacher') {
+ // 鏄暀甯�
+ if (e.detail.checked) {
+ // 鐐瑰嚮閫変腑
+ if (this.data.paperBookCount == 0) {
+ wx.showToast({
+ title: "鎮ㄧ殑绾歌川鏍蜂功鐢宠娆℃暟宸茬敤灏斤紝鑻ヨ缁х画锛岃鑱旂郴绠＄悊鍛橈紒",
+ icon: "none",
+ duration: 1000,
+ })
+ return false;
+ }
+ if (this.data.paperBookList.length >= 2) {
+ wx.showToast({
+ title: "姣忔鏈�澶氬彧鍙敵璇�2鏈牱涔�",
+ icon: "none",
+ duration: 1000,
+ })
+ return false;
+ }
+ this.addBookFun(item, "pBook")
+ this.setData({
+ ["bookList[" + index + "].paperChecked"]: e.detail.checked
})
- return
- }
- if (item.paperChecked) {
+ } else {
+ // 鍙栨秷閫変腑
let pList = this.data.paperBookList;
if (pList.length > 0) {
pList.forEach((obj, index) => {
@@ -699,77 +767,64 @@
}
})
}
- item.paperChecked = false;
- if (this.data.bookList.length > 0) {
- this.data.bookList.forEach(i => {
- if (i.id == item.id) {
- i.paperChecked = false;
- }
- })
- }
+ this.setData({
+ paperBookList: pList,
+ num: this.data.num - 1,
+ ["bookList[" + index + "].paperChecked"]: e.detail.checked
+ })
+ wx.setStorageSync("paperBookList", JSON.stringify(pList));
wx.showToast({
title: "宸蹭粠鏍蜂功鐢宠鍗曠Щ闄�",
icon: 'none',
duration: 1000,
})
- this.setData({
- paperBookList: pList,
- num: pList.length + this.data.electronicBookList.length
- })
- wx.setStorageSync("paperBookList", JSON.stringify(pList));
- return
- }
- if (role == 'Teacher') {
- this.getSelectPaperBookCount(item)
- } else {
- item.paperChecked = false
- wx.showModal({
- title: '灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛�', //鎻愮ず鐨勬爣棰�
- content: '璇峰厛杩涜鏁欏笀璁よ瘉锛�', //鎻愮ず鐨勫唴瀹�
- success: function (res) {
- if (res.confirm) {
- wx.navigateTo({
- url: "/packageDomain/pages/teacherCertification/index",
- });
- } else if (res.cancel) {
- item.paperChecked = false
- }
- }
- })
}
} else {
- item.paperChecked = false
- }
- },
- getSelectPaperBookCount(item) {
- app.MG.app
- .getTicketResult({
- ticketRefCodeOrGuid: 'paperSampleBookapplyNum',
- roleId: this.data.userInfo.roleId
- })
- .then((res) => {
- this.setData({
- paperBookCount: res.totalCount - res.usedCount
- })
- if (!item.paperDisabled) {
- this.getAlreadyBookList(item, 'pBook')
+ wx.showModal({
+ title: '灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛�', //鎻愮ず鐨勬爣棰�
+ content: '璇峰厛杩涜鏁欏笀璁よ瘉锛�', //鎻愮ず鐨勫唴瀹�
+ success: function (res) {
+ if (res.confirm) {
+ wx.navigateTo({
+ url: "/packageDomain/pages/teacherCertification/index",
+ });
+ }
}
})
+ }
},
+
//閫夋嫨鐢靛瓙鏍蜂功
onChangeElectron(e) {
const item = e.currentTarget.dataset.book;
- let role = this.data.userInfo != null ? this.data.userInfo.role : null;
- if (role) {
- if (item.electronDisabled) {
- wx.showToast({
- title: "璇ユ牱涔﹀凡鐢宠",
- icon: 'none',
- duration: 1000,
+ const index = this.data.bookList.findIndex(citem => citem.id == item.id)
+ let role = this.data.userInfo != null ? this.data.userInfo.role : null
+ if (role && role == 'Teacher') {
+ // 鏄暀甯�
+ if (e.detail.checked) {
+ // 鐐瑰嚮閫変腑
+ if (this.data.ebookCount == 0) {
+ wx.showToast({
+ title: "鎮ㄧ殑鐢靛瓙鏍蜂功鐢宠娆℃暟宸茬敤灏斤紝鑻ヨ缁х画锛岃鑱旂郴绠＄悊鍛橈紒",
+ icon: "none",
+ duration: 1000,
+ })
+ return false;
+ }
+ if (this.data.electronicBookList.length >= 2) {
+ wx.showToast({
+ title: "姣忔鏈�澶氬彧鍙敵璇�2鏈牱涔�",
+ icon: "none",
+ duration: 1000,
+ })
+ return false;
+ }
+ this.addBookFun(item, "eBook")
+ this.setData({
+ ["bookList[" + index + "].electronChecked"]: e.detail.checked
})
- return
- }
- if (item.electronChecked) {
+ } else {
+ // 鍙栨秷閫変腑
let eList = this.data.electronicBookList;
if (eList.length > 0) {
eList.forEach((obj, index) => {
@@ -778,99 +833,38 @@
}
})
}
- if (this.data.bookList.length > 0) {
- this.data.bookList.forEach(i => {
- if (i.id == item.id) {
- i.electronChecked = false;
- }
- })
- }
- item.electronChecked = false;
+ this.setData({
+ electronicBookList: eList,
+ num: this.data.num - 1,
+ ["bookList[" + index + "].electronChecked"]: e.detail.checked
+ })
+ wx.setStorageSync("electronicBookList", JSON.stringify(eList));
wx.showToast({
title: "宸蹭粠鏍蜂功鐢宠鍗曠Щ闄�",
icon: 'none',
duration: 1000,
})
- this.setData({
- electronicBookList: eList,
- num: eList.length + this.data.paperBookList.length
- })
- wx.setStorageSync("electronicBookList", eList);
- return
- }
- if (role == 'Teacher') {
- //鏈夋棤瀛愬晢鍝侊紝瀛愬晢鍝佹湁鏃犵數瀛愪功鏂囦欢
- const obj = {
- path: '*',
- queryType: 'SubProduct',
- sort: {
- type: 'Desc',
- field: 'CreateDate'
- },
- paging: {
- start: 0,
- size: 6
- },
- mainProductId: item.id,
- fields: {
- bookshelf_pdf: [],
- bookshelf_protectedEpub: [],
- }
- }
- app.MG.store.getProductList(obj).then((res) => {
- if (res.datas.length > 0) {
- if (res.datas[0].bookshelf_pdf || res.datas[0].bookshelf_protectedEpub) {
- this.getSelectBookCount(item)
- } else {
- wx.showToast({
- title: "鏆傛棤鐢靛瓙涔︽枃浠�,璇疯仈绯荤鐞嗗憳!",
- icon: 'none',
- duration: 1000,
- })
- }
- } else {
- this.getSelectBookCount(item)
- }
- })
- } else {
- item.electronChecked = false
- wx.showModal({
- title: '灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛�', //鎻愮ず鐨勬爣棰�
- content: '璇峰厛杩涜鏁欏笀璁よ瘉锛�', //鎻愮ず鐨勫唴瀹�
- success: function (res) {
- if (res.confirm) {
- wx.navigateTo({
- url: "/packageDomain/pages/teacherCertification/index",
- });
- } else if (res.cancel) {
- item.electronChecked = false
- }
- }
- })
}
} else {
- item.electronChecked = false
- }
- },
- getSelectBookCount(item) {
- app.MG.app
- .getTicketResult({
- ticketRefCodeOrGuid: 'electronicSampleBookapplyNum',
- roleId: this.data.userInfo.roleId
- })
- .then((res) => {
- this.setData({
- ebookCount: res.totalCount - res.usedCount
- })
- if (!item.electronDisabled) {
- this.getAlreadyBookList(item, 'eBook')
+ wx.showModal({
+ title: '灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛�', //鎻愮ず鐨勬爣棰�
+ content: '璇峰厛杩涜鏁欏笀璁よ瘉锛�', //鎻愮ず鐨勫唴瀹�
+ success: function (res) {
+ if (res.confirm) {
+ wx.navigateTo({
+ url: "/packageDomain/pages/teacherCertification/index",
+ });
+ }
}
})
+ }
},
- getAlreadyBookList(item, type) {
+ // 娣诲姞鏍蜂功
+ addBookFun(item, type) {
let itemAttr = null
- let isHas = false
+ const eList = this.data.electronicBookList;
+ const pList = this.data.paperBookList;
itemAttr = {
id: item.id,
title: item.name || '-',
@@ -883,154 +877,27 @@
isbn: item.isbn || '-',
publicationDate: item.publicationDate
}
-
if (type == 'eBook') {
- if (this.data.ebookCount > 0) {
- const eBookData = this.data.electronicBookList
- if (eBookData.length == 2) {
- item.electronChecked = false;
- wx.showToast({
- title: "姣忔鏈�澶氬彧鍙敵璇�2鏈牱涔�",
- icon: 'none',
- duration: 1000,
- })
- return false
- }
- if (eBookData.length > 0) {
- for (let i = 0; i < eBookData.length; i++) {
- if (eBookData[i].id == item.id) {
- isHas = true
- }
- }
- if (!isHas) {
- wx.showToast({
- title: "娣诲姞鎴愬姛锛屽湪鏍蜂功鐢宠鍗曠瓑鎮ㄥ摝~",
- icon: "none",
- duration: 1000,
- })
- this.setData({
- electronicBookList: [...this.data.electronicBookList, ...[itemAttr]],
- })
- wx.setStorageSync("electronicBookList", this.data.electronicBookList);
- this.setData({
- num: this.data.electronicBookList.length + this.data.paperBookList.length
- })
- this.getBookList(false);
- } else {
- let list = this.data.electronicBookList;
- list.forEach((obj, index) => {
- if (obj.id == item.id) {
- list.splice(index, 1);
- }
- })
- item.electronChecked = false
- wx.showToast({
- title: "宸蹭粠鏍蜂功鐢宠鍗曠Щ闄�",
- icon: "none",
- duration: 1000,
- })
- this.setData({
- electronicBookList: list,
- num: list.length + this.data.paperBookList.length
- })
- wx.setStorageSync("electronicBookList", list);
- this.getBookList(false);
- }
- } else {
- wx.showToast({
- title: "娣诲姞鎴愬姛锛屽湪鏍蜂功鐢宠鍗曠瓑鎮ㄥ摝~",
- icon: "none",
- duration: 1000,
- })
- this.setData({
- electronicBookList: [itemAttr],
- num: 1 + this.data.paperBookList.length
- })
- wx.setStorageSync("electronicBookList", [itemAttr]);
-
- }
- } else {
- item.electronChecked = false
- wx.showToast({
- title: "鎮ㄧ殑鐢靛瓙鏍蜂功鐢宠娆℃暟宸茬敤灏斤紝鑻ヨ缁х画锛岃鑱旂郴绠＄悊鍛橈紒",
- icon: "none",
- duration: 1000,
- })
- }
+ eList.push(itemAttr)
+ this.setData({
+ electronicBookList: eList,
+ })
+ wx.setStorageSync("electronicBookList", eList);
} else {
- if (this.data.paperBookCount > 0) {
- const pBookData = this.data.paperBookList
- if (pBookData.length == 2) {
- item.paperChecked = false
- wx.showToast({
- title: "姣忔鏈�澶氬彧鍙敵璇�2鏈牱涔�",
- icon: 'none',
- duration: 1000,
- })
- return false
- }
- if (pBookData.length > 0) {
- for (let i = 0; i < pBookData.length; i++) {
- if (pBookData[i].id == item.id) {
- isHas = true
- }
- }
- if (!isHas) {
- item.paperChecked = true
- wx.showToast({
- title: "娣诲姞鎴愬姛锛屽湪鏍蜂功鐢宠鍗曠瓑鎮ㄥ摝~",
- icon: 'none',
- duration: 1000,
- })
- this.setData({
- paperBookList: [...this.data.paperBookList, ...[itemAttr]],
- })
- wx.setStorageSync("paperBookList", this.data.paperBookList);
- this.setData({
- num: this.data.paperBookList.length + this.data.electronicBookList.length
- })
-
- } else {
- let list = this.data.paperBookList;
- list.forEach((obj, index) => {
- if (obj.id == item.id) {
- list.splice(index, 1);
- }
- })
- item.paperChecked = false
- wx.showToast({
- title: "宸蹭粠鏍蜂功鐢宠鍗曠Щ闄�",
- icon: "none",
- duration: 1000,
- })
- this.setData({
- paperChecked: list,
- num: list.length + this.data.electronicBookList.length
- })
- wx.setStorageSync("paperBookList", list);
- }
- } else {
- item.paperChecked = true;
- wx.showToast({
- title: "娣诲姞鎴愬姛锛屽湪鏍蜂功鐢宠鍗曠瓑鎮ㄥ摝~",
- icon: 'none',
- duration: 1000,
- })
- this.setData({
- paperBookList: [itemAttr],
- num: 1 + this.data.electronicBookList.length
- })
- wx.setStorageSync("paperBookList", [itemAttr]);
- }
- } else {
- item.paperChecked = false
- wx.showToast({
- title: "鎮ㄧ殑绾歌川鏍蜂功鐢宠娆℃暟宸茬敤灏斤紝鑻ヨ缁х画锛岃鑱旂郴绠＄悊鍛橈紒",
- icon: 'none',
- duration: 1000,
- })
- }
+ pList.push(itemAttr)
+ this.setData({
+ paperBookList: pList,
+ })
+ wx.setStorageSync("paperBookList", pList);
}
+ this.setData({
+ num: this.data.num + 1
+ })
+ wx.showToast({
+ title: "娣诲姞鎴愬姛锛屽湪鏍蜂功鐢宠鍗曠瓑鎮ㄥ摝~",
+ icon: "none",
+ duration: 1000,
+ })
},
//鍘绘牱涔︾敵璇峰崟
goApply() {
diff --git a/packageDomain/pages/sampleBookList/index.wxml b/packageDomain/pages/sampleBookList/index.wxml
index 2dd041e..ff98b95 100644
--- a/packageDomain/pages/sampleBookList/index.wxml
+++ b/packageDomain/pages/sampleBookList/index.wxml
@@ -10,13 +10,15 @@
</view>
<view class="list-header">
<view class="header-scroll">
- <scroll-view scroll-x scroll-with-animation='true' class="srcolbox">
+ <!-- <scroll-view scroll-x scroll-with-animation='true' class="srcolbox"> -->
+ <view class="srcolbox">
<t-dropdown-menu>
- <t-dropdown-item label="鎬诲垎绫�" options="{{iconList.options}}" default-value="{{iconList.value}}" optionsColumns="2" bindchange="onChangeIcon" arrow-icon="" />
- <t-dropdown-item label="涓�绾�" options="{{stairList.options}}" value="{{stairList.value}}" optionsColumns="2" bindchange="onChangeStair" arrow-icon="" />
+ <t-dropdown-item label="鎬诲垎绫�" options="{{iconList.options}}" value="{{iconList.value}}" optionsColumns="2" bindchange="onChangeIcon" />
+ <t-dropdown-item label="涓�绾�" options="{{stairList.options}}" value="{{stairList.value}}" optionsColumns="2" bindchange="onChangeStair" />
<t-dropdown-item label="浜岀骇" options="{{secondList.options}}" optionsColumns="2" multiple value="{{secondList.value}}" bind:confirm="onConfirmSecond" bind:change="onChangeSecond" />
</t-dropdown-menu>
- </scroll-view>
+ </view>
+ <!-- </scroll-view> -->
</view>
<view class="header-sort" bind:tap="sortClick">
<view class="sort-name">鎺掑簭</view>
@@ -50,8 +52,8 @@
<view class="book-name book-color" bind:tap="goDetail" data-book="{{item}}">{{ item.name}}</view>
<view class="book-author book-color">{{item.author}}</view>
<view class="checkbox">
- <t-checkbox label="绾歌川鏍蜂功" icon="rectangle" borderless='true' default-checked="{{item.paperChecked}}" disabled="{{item.paperDisabled || item.isApplyBook == '1' || item.isApplyBook == '2'}}" data-book="{{item}}" bind:change="onChangePaper" />
- <t-checkbox label="鐢靛瓙鏍蜂功" icon="rectangle" borderless='true' class="eBook" default-checked="{{item.electronChecked}}" disabled="{{item.electronDisabled || item.isApplyBook=='1' || item.isApplyBook=='3' }}" data-book="{{item}}" bind:change="onChangeElectron" />
+ <t-checkbox label="绾歌川鏍蜂功" icon="rectangle" borderless='true' checked="{{item.paperChecked}}" disabled="{{item.paperDisabled || item.isApplyBook == '1' || item.isApplyBook == '2'}}" data-book="{{item}}" bind:change="onChangePaper" />
+ <t-checkbox label="鐢靛瓙鏍蜂功" icon="rectangle" borderless='true' class="eBook" checked="{{item.electronChecked}}" disabled="{{item.electronDisabled || item.isApplyBook=='1' || item.isApplyBook=='3' }}" data-book="{{item}}" bind:change="onChangeElectron" />
</view>
</view>
</view>
diff --git a/packageDomain/pages/sampleBookList/index.wxss b/packageDomain/pages/sampleBookList/index.wxss
index be4402b..bde13fa 100644
--- a/packageDomain/pages/sampleBookList/index.wxss
+++ b/packageDomain/pages/sampleBookList/index.wxss
@@ -92,9 +92,9 @@
}
.t-dropdown-menu__item--active {
- height: 86rpx !important;
+ /* height: 86rpx !important; */
background: #F6F6F6 !important;
- border-radius: 40rpx 40rpx 0 0;
+ /* border-radius: 40rpx 40rpx 0 0; */
}
.t-radio__title {
@@ -151,7 +151,7 @@
.title .icon {
height: 36rpx;
- width: 160rpx;
+ width: 140rpx;
line-height: 60rpx;
}
diff --git a/packageDomain/pages/teacherCertification/index.js b/packageDomain/pages/teacherCertification/index.js
index 82493b7..4079d7d 100644
--- a/packageDomain/pages/teacherCertification/index.js
+++ b/packageDomain/pages/teacherCertification/index.js
@@ -1,8 +1,13 @@
const app = getApp();
import SparkMD5 from 'spark-md5'
import tool from "../../../assets/js/toolClass.js";
-import { getTopicMsgCmsItemFile } from '../../../assets/js/middleGround/tool.js';
+import {
+ getTopicMsgCmsItemFile
+} from '../../../assets/js/middleGround/tool.js';
import FormData from '../../../utils/formdata/index.js';
+import {
+ loginInfo
+} from '../../../assets/js/login';
Page({
/**
@@ -46,10 +51,21 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad() {
+ //鑾峰彇鑱岀О
this.getpositionalTitle();
this.getAgreement();
-
if (wx.getStorageSync(app.config.tokenKey)) {
+ this.getUserRole()
+ }
+ // 妫�鏌ョ櫥褰曠姸鎬�
+ const token = wx.getStorageSync(app.config.tokenKey)
+ if (!token) {
+ loginInfo(app, (data) => {
+ if (data) {
+ this.getUserRole()
+ }
+ })
+ } else {
this.getUserRole()
}
},
@@ -91,7 +107,6 @@
let nickNameData = res.infoList.find((item) => item.type == 'nickName')
let teacherRole = res.roleLinks.find((item) => item.role.refCode == 'teacher')
let teacherInfos = res.infoList.find((item) => item.type == 'teacherInfo')
- let secretData = res.secretList.find(i => i.type == 'LoginNameAndPassword')
let WeChatInfo = res.infoList.find((item) => item.type === "WeChat");
let defaultUser = {};
if (teacherRole && teacherInfos) {
@@ -103,9 +118,6 @@
role: 'Teacher',
roleId: teacherRole.role.id,
}
- this.setData({
- currAuthStep: 2,
- });
} else if (WeChatInfo) {
defaultUser = {
@@ -114,20 +126,13 @@
icon: nickNameData ? JSON.parse(nickNameData.data).icon : WeChatInfo.icon,
userId: res.userId,
}
- this.setData({
- currAuthStep: 3,
- });
- } else if (secretData) {
- defaultUser = {
- nickName: nickNameData ? JSON.parse(nickNameData.data).nickName : secretData.credential,
- icon: nickNameData ? JSON.parse(nickNameData.data).icon : "",
- userId: res.userId,
- }
+
}
wx.setStorageSync(app.config.userInfoKey, JSON.stringify(defaultUser));
}
})
},
+ //鑾峰彇瀛楁
getType() {
app.MG.resource.getCmsTypeByRefCode({
refCodes: ['jsek_teacherCertification']
@@ -139,6 +144,7 @@
this.newGetTeacherInfo()
})
},
+ //鑾峰彇鏁欏笀鐘舵��
newGetTeacherInfo() {
const data = {
start: 0,
@@ -209,8 +215,7 @@
md5: this.data.teacherInfo.relevantCertificates,
linkType: 'LinkFile',
linkProtectType: 'Public',
- url:
- app.config.requestCtx + `/file/GetPreViewImage?md5=` + this.data.teacherInfo.relevantCertificates,
+ url: app.config.requestCtx + `/file/GetPreViewImage?md5=` + this.data.teacherInfo.relevantCertificates,
imgUrl: app.config.requestCtx + `/file/GetPreViewImage?md5=` + this.data.teacherInfo.relevantCertificates,
}
arr.push(imgObj);
@@ -221,11 +226,10 @@
}
}
- } catch (error) {
- }
+ } catch (error) {}
})
},
-
+ //鑾峰彇鑱岀О
getpositionalTitle() {
const data = {
refCodes: ['positionalTitle']
@@ -293,10 +297,14 @@
//閫夋嫨鑱岀О
onTeachPicker() {
- this.setData({ teachVisible: true });
+ this.setData({
+ teachVisible: true
+ });
},
onPickerChange(e) {
- const { label } = e.detail;
+ const {
+ label
+ } = e.detail;
this.setData({
teachVisible: false,
teachText: label[0],
@@ -311,7 +319,9 @@
},
//杈撳叆鎵嬫満鍙�
onPhoneInput(e) {
- const { phoneError } = this.data;
+ 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({
@@ -322,7 +332,9 @@
},
//杈撳叆搴ф満
onTelphoneInput(e) {
- const { telphoneError } = this.data;
+ const {
+ telphoneError
+ } = this.data;
const isPhoneNumber = /^0\d{2}-\d{8}$|^0\d{3}-\d{7}$/.test(e.detail.value);
if (telphoneError === isPhoneNumber) {
this.setData({
@@ -332,7 +344,9 @@
}
},
onEmailInput(e) {
- const { emailError } = this.data;
+ const {
+ emailError
+ } = this.data;
const isPhoneNumber = /^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$/.test(e.detail.value);
if (emailError === isPhoneNumber) {
this.setData({
@@ -345,7 +359,7 @@
chooseImg(e) {
var that = this;
wx.chooseMedia({
- // count: 1, // 榛樿9
+ count: 1,
sizeType: ['original', 'compressed'], // 鍙互鎸囧畾鏄師鍥捐繕鏄帇缂╁浘锛岄粯璁や簩鑰呴兘鏈�
sourceType: ['album', 'camera'], // 鍙互鎸囧畾鏉ユ簮鏄浉鍐岃繕鏄浉鏈猴紝榛樿浜岃�呴兘鏈�
success: function (res) {
@@ -383,14 +397,14 @@
data: data.buffer,
success(res1) {
if (res1.statusCode == 200) {
- resolve(res1.data); if (res1.data) {
+ resolve(res1.data);
+ if (res1.data) {
let arr = [];
let imgObj = {
md5: md5,
linkType: 'LinkFile',
linkProtectType: 'Public',
- url:
- app.config.requestCtx + `/file/GetPreViewImage?md5=` + md5,
+ url: app.config.requestCtx + `/file/GetPreViewImage?md5=` + md5,
imgUrl: res.tempFiles[0].tempFilePath
}
arr = [...that.data.imgPics, ...[imgObj]];
@@ -563,13 +577,11 @@
delete basicInfo.worksInfo
delete basicInfo.state
const userInfo = {
- requests: [
- {
- data: JSON.stringify(basicInfo),
- name: that.data.teacherInfo.fullName + '',
- type: 'newTeacherInfo'
- }
- ]
+ requests: [{
+ data: JSON.stringify(basicInfo),
+ name: that.data.teacherInfo.fullName + '',
+ type: 'newTeacherInfo'
+ }]
}
app.MG.identity.setAppUserInfo(userInfo).then((res) => {
if (res) {
@@ -601,13 +613,11 @@
delete basicInfo.worksInfo
delete basicInfo.state
const userInfo = {
- requests: [
- {
- data: JSON.stringify(basicInfo),
- name: that.data.teacherInfo.fullName + '',
- type: 'teacherInfo'
- }
- ]
+ requests: [{
+ data: JSON.stringify(basicInfo),
+ name: that.data.teacherInfo.fullName + '',
+ type: 'teacherInfo'
+ }]
}
app.MG.identity.setAppUserInfo(userInfo).then((res) => {
app.MG.ugc.newTopicMessage(data).then(() => {
@@ -645,8 +655,7 @@
/**
* 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
*/
- onReachBottom() {
- },
+ onReachBottom() {},
/**
* 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
diff --git a/packageDomain/pages/teacherCertification/index.wxss b/packageDomain/pages/teacherCertification/index.wxss
index e509bb0..a0a5cfb 100644
--- a/packageDomain/pages/teacherCertification/index.wxss
+++ b/packageDomain/pages/teacherCertification/index.wxss
@@ -219,10 +219,6 @@
border-radius: 50rpx;
}
-/* 涓婁紶鍥剧墖鏍峰紡 */
-.weui-uploader {
- height: 152rpx;
-}
.tp_add {
width: 152rpx;
diff --git a/packagePersonal/pages/activateProduct/index.js b/packagePersonal/pages/activateProduct/index.js
index 7b02479..348c9b4 100644
--- a/packagePersonal/pages/activateProduct/index.js
+++ b/packagePersonal/pages/activateProduct/index.js
@@ -1,7 +1,9 @@
const app = getApp();
import moment from 'moment'
import tool2 from "../../../assets/js/toolClass.js"
-import { getPublicImage } from "../../../assets/js/middleGround/tool.js";
+import {
+ getPublicImage
+} from "../../../assets/js/middleGround/tool.js";
Page({
/**
diff --git a/packagePersonal/pages/myCollection/index.js b/packagePersonal/pages/myCollection/index.js
index 11f17f1..57f3507 100644
--- a/packagePersonal/pages/myCollection/index.js
+++ b/packagePersonal/pages/myCollection/index.js
@@ -7,8 +7,7 @@
data: {
active: 0,
activeName: "FavoriteBookCity",
- tabList: [
- {
+ tabList: [{
label: '鍥句功',
key: 0,
linkType: 'FavoriteBookCity',
@@ -91,6 +90,7 @@
})
} else {
this.setData({
+ list: [],
skeletonLoding: false,
loading: false
})
@@ -175,7 +175,9 @@
})
},
goBookDetails(e) {
- const { book } = e.currentTarget.dataset;
+ const {
+ book
+ } = e.currentTarget.dataset;
wx.navigateTo({
url: `/packageBookService/pages/bookServices/detail/index?id=${book.id}&name=${book.name}`,
});
diff --git a/packagePersonal/pages/myOrder/index.js b/packagePersonal/pages/myOrder/index.js
index 7e8d3c4..1794a45 100644
--- a/packagePersonal/pages/myOrder/index.js
+++ b/packagePersonal/pages/myOrder/index.js
@@ -1,7 +1,9 @@
const app = getApp();
import moment from 'moment'
import tool2 from "../../../assets/js/toolClass.js"
-import { getPublicImage } from "../../../assets/js/middleGround/tool.js";
+import {
+ getPublicImage
+} from "../../../assets/js/middleGround/tool.js";
Page({
/**
@@ -9,8 +11,7 @@
*/
data: {
active: 0,
- tabList: [
- {
+ tabList: [{
label: '鍏ㄩ儴',
value: 'all',
},
@@ -27,6 +28,7 @@
value: 'Cancel',
}
],
+ searchText: "",
list: [],
//鍒嗛〉
page: 1,
@@ -61,20 +63,34 @@
that.setData({
skeletonLoding: true,
active: item.detail.value,
- queryFilter: info.value == 'all' ? [] : [{ field: 'State', value: info.value }],
+ queryFilter: info.value == 'all' ? [] : [{
+ field: 'State',
+ value: info.value
+ }],
list: [],
page: 1,
bottomLoading: false,
isMoreData: false,
+ searchText: ""
})
that.getDataList(false);
},
getDataList(isReachBottom) {
+ var searchArr = [];
+ console.log(this.data.searchText, "earch")
+ if (this.data.searchText != undefined && this.data.searchText != "") {
+ searchArr.push({
+ compareType: "Contains",
+ field: "orderNumber",
+ keywords: this.data.searchText,
+ })
+ }
const data = {
start: this.data.page * this.data.limit - this.data.limit,
size: this.data.limit,
filterList: this.data.queryFilter,
+ searchList: searchArr,
sort: {
type: 'Desc',
field: 'CreateDate'
@@ -139,6 +155,7 @@
})
} else {
this.setData({
+ list: false,
skeletonLoding: false,
loading: false
})
@@ -147,6 +164,12 @@
console.log(error)
}
})
+ },
+ onSearchOrder(e) {
+ this.setData({
+ searchText: e.detail.value,
+ })
+ this.getDataList(false);
},
@@ -161,7 +184,8 @@
limit: 12,
pageTotalCount: 0,
bottomLoading: false,
- isMoreData: false
+ isMoreData: false,
+ searchText: ''
})
this._freshing = true;
this.setData({
@@ -198,13 +222,17 @@
},
onCancel(e) {
- let { orderNum } = e.currentTarget.dataset
+ let {
+ orderNum
+ } = e.currentTarget.dataset
wx.showModal({
title: '鎻愮ず', //鎻愮ず鐨勬爣棰�
content: '纭畾瑕佸彇娑堣鍗曪紵', //鎻愮ず鐨勫唴瀹�
success: function (res) {
if (res.confirm) {
- app.MG.store.cancelOrder({ orderNum: orderNum }).then(() => {
+ app.MG.store.cancelOrder({
+ orderNum: orderNum
+ }).then(() => {
wx.showToast({
title: "璁㈠崟宸插彇娑�",
icon: 'success',
diff --git a/packagePersonal/pages/myOrder/index.wxml b/packagePersonal/pages/myOrder/index.wxml
index b1ca619..d5e5868 100644
--- a/packagePersonal/pages/myOrder/index.wxml
+++ b/packagePersonal/pages/myOrder/index.wxml
@@ -1,9 +1,7 @@
<view class="container">
<view class="page-header">
<view class="search">
- <t-search t-class-input="t-search__input" t-class-input-container="t-search__input-container" placeholder="璇疯緭鍏ヨ鍗曠紪鍙�" leftIcon="">
- <t-icon slot="left-icon" prefix="wr" name="search" size="40rpx" color="#bbb" bind:tap="navToSearchPage" />
- </t-search>
+ <t-search model:value="{{searchText}}" shape="round" clearable="{{false}}" placeholder="璇疯緭鍏ヨ鍗曠紪鍙�" class="navBar-search" style="width: 90%" bind:submit="onSearchOrder" />
</view>
<t-tabs t-class="t-tabs" defaultValue="{{active}}" split="{{false}}" bind:change="tabBookClick">
<t-tab-panel wx:for="{{tabList}}" wx:for-index="index" wx:key="index" label="{{item.label}}" value="{{index}}" />
diff --git a/packagePersonal/pages/personalCenter/myMassage/index.js b/packagePersonal/pages/personalCenter/myMassage/index.js
deleted file mode 100644
index 499864a..0000000
--- a/packagePersonal/pages/personalCenter/myMassage/index.js
+++ /dev/null
@@ -1,66 +0,0 @@
-// packagePersonal/pages/personalCenter/myMassage/index.js
-Page({
-
- /**
- * 椤甸潰鐨勫垵濮嬫暟鎹�
- */
- data: {
-
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
- */
- onLoad(options) {
-
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
- */
- onReady() {
-
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
- */
- onShow() {
-
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
- */
- onHide() {
-
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
- */
- onUnload() {
-
- },
-
- /**
- * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
- */
- onPullDownRefresh() {
-
- },
-
- /**
- * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
- */
- onReachBottom() {
-
- },
-
- /**
- * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
- */
- onShareAppMessage() {
-
- }
-})
\ No newline at end of file
diff --git a/packagePersonal/pages/personalCenter/myMassage/index.wxml b/packagePersonal/pages/personalCenter/myMassage/index.wxml
deleted file mode 100644
index 59a53bf..0000000
--- a/packagePersonal/pages/personalCenter/myMassage/index.wxml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!--packagePersonal/pages/personalCenter/myMassage/index.wxml-->
-<text>packagePersonal/pages/personalCenter/myMassage/index.wxml</text>
\ No newline at end of file
diff --git a/packagePersonal/pages/personalCenter/myMassage/massageDetail/index.js b/packagePersonal/pages/personalCenter/myMassage/massageDetail/index.js
deleted file mode 100644
index 9727da0..0000000
--- a/packagePersonal/pages/personalCenter/myMassage/massageDetail/index.js
+++ /dev/null
@@ -1,66 +0,0 @@
-// packagePersonal/pages/personalCenter/myMassage/massageDetail/index.js
-Page({
-
- /**
- * 椤甸潰鐨勫垵濮嬫暟鎹�
- */
- data: {
-
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
- */
- onLoad(options) {
-
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
- */
- onReady() {
-
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
- */
- onShow() {
-
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
- */
- onHide() {
-
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
- */
- onUnload() {
-
- },
-
- /**
- * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
- */
- onPullDownRefresh() {
-
- },
-
- /**
- * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
- */
- onReachBottom() {
-
- },
-
- /**
- * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
- */
- onShareAppMessage() {
-
- }
-})
\ No newline at end of file
diff --git a/packagePersonal/pages/personalCenter/myMassage/massageDetail/index.wxml b/packagePersonal/pages/personalCenter/myMassage/massageDetail/index.wxml
deleted file mode 100644
index c847aff..0000000
--- a/packagePersonal/pages/personalCenter/myMassage/massageDetail/index.wxml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!--packagePersonal/pages/personalCenter/myMassage/massageDetail/index.wxml-->
-<text>packagePersonal/pages/personalCenter/myMassage/massageDetail/index.wxml</text>
\ No newline at end of file
diff --git a/packagePersonal/pages/personalCenter/publishBooks/index.js b/packagePersonal/pages/personalCenter/publishBooks/index.js
deleted file mode 100644
index 0ae96a8..0000000
--- a/packagePersonal/pages/personalCenter/publishBooks/index.js
+++ /dev/null
@@ -1,66 +0,0 @@
-// packagePersonal/pages/personalCenter/publishBooks/index.js
-Page({
-
- /**
- * 椤甸潰鐨勫垵濮嬫暟鎹�
- */
- data: {
-
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
- */
- onLoad(options) {
-
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
- */
- onReady() {
-
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
- */
- onShow() {
-
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
- */
- onHide() {
-
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
- */
- onUnload() {
-
- },
-
- /**
- * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
- */
- onPullDownRefresh() {
-
- },
-
- /**
- * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
- */
- onReachBottom() {
-
- },
-
- /**
- * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
- */
- onShareAppMessage() {
-
- }
-})
\ No newline at end of file
diff --git a/packagePersonal/pages/personalCenter/publishBooks/index.json b/packagePersonal/pages/personalCenter/publishBooks/index.json
deleted file mode 100644
index 8835af0..0000000
--- a/packagePersonal/pages/personalCenter/publishBooks/index.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "usingComponents": {}
-}
\ No newline at end of file
diff --git a/packagePersonal/pages/personalCenter/publishBooks/index.wxml b/packagePersonal/pages/personalCenter/publishBooks/index.wxml
deleted file mode 100644
index 2f08b04..0000000
--- a/packagePersonal/pages/personalCenter/publishBooks/index.wxml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!--packagePersonal/pages/personalCenter/publishBooks/index.wxml-->
-<text>packagePersonal/pages/personalCenter/publishBooks/index.wxml</text>
\ No newline at end of file
diff --git a/packagePersonal/pages/personalCenter/publishBooks/index.wxss b/packagePersonal/pages/personalCenter/publishBooks/index.wxss
deleted file mode 100644
index 627c7d0..0000000
--- a/packagePersonal/pages/personalCenter/publishBooks/index.wxss
+++ /dev/null
@@ -1 +0,0 @@
-/* packagePersonal/pages/personalCenter/publishBooks/index.wxss */
\ No newline at end of file
diff --git a/pages/bibliographyList/index.json b/pages/bibliographyList/index.json
index 66d8036..4a7df72 100644
--- a/pages/bibliographyList/index.json
+++ b/pages/bibliographyList/index.json
@@ -6,7 +6,8 @@
"t-search": "tdesign-miniprogram/search/search",
"t-icon": "tdesign-miniprogram/icon/icon",
"t-loading": "tdesign-miniprogram/loading/loading",
- "t-image": "tdesign-miniprogram/image/image"
+ "t-image": "tdesign-miniprogram/image/image",
+ "t-empty": "tdesign-miniprogram/empty/empty"
},
"navigationStyle": "custom",
"enablePullDownRefresh": true,
diff --git a/pages/bibliographyList/index.wxml b/pages/bibliographyList/index.wxml
index 8355c4b..e55f940 100644
--- a/pages/bibliographyList/index.wxml
+++ b/pages/bibliographyList/index.wxml
@@ -1,28 +1,44 @@
-<!--pages/bibliographyList/index.wxml-->
-<view wx:if="{{downloadLoadin}}" class="loadinBox">
- <t-loading class="colors" theme="circular" size="70rpx" class="wrapper" />
-
-</view>
-<view class="bibliographyListBox">
- <view class="titleBox">
- <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" />
- </view>
-
- <view class="example-search">
- <t-search model:value="{{value}}" placeholder="璇疯緭鍏ヤ功鐩悕绉�" bind:submit="onSearchSubmit" />
- </view>
+<view class="bibliographyList">
+ <view class="titlesBox">
+ <!--pages/bibliographyList/index.wxml-->
+ <view wx:if="{{downloadLoadin}}" class="loadinBox">
+ <t-loading class="colors" theme="circular" size="70rpx" class="wrapper" />
</view>
+ <view class="bibliographyListBox"></view>
+ <view class="titleBox">
+ <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" />
+ </view>
+
+ <view class="example-search">
+ <t-search model:value="{{value}}" placeholder="璇疯緭鍏ヤ功鐩悕绉�" bind:submit="onSearchSubmit">
+
+
+ </t-search>
+ <!-- <t-icon slot="left-icon" prefix="wr" name="search" size="40rpx" color="#bbb" /> -->
+
+
+
+ </view>
+
+ </view>
+ </view>
+
</view>
<t-tabs class="contentBox" defaultValue="{{0}}" bind:change="onTabsChange" bind:click="onTabsClick" t-class="custom-tabs" t-class-content="custom-panel">
<t-tab-panel label="楂樼瓑鏁欒偛({{higherTotal}})" value="0">
- <view class="outsideHigherBox">
+
+ <view wx:if="{{higherList.length <= 0}}" class="noDataBox">
+ <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
+ </view>
+
+ <view wx:else class="outsideHigherBox">
<view class="higherBox" wx:for="{{higherList}}" wx:key="index" wx:for-item="item" wx:for-index="index" bind:tap="downloadData" data-item="{{item}}">
<view class="outsideHigherImageBox">
<image class="higherImageBox" src="{{item.icon}}" mode="" />
@@ -36,14 +52,22 @@
<view class="higherTextBox">{{item.name}}</view>
</view>
+
</view>
- <view class="bottom-box">
+ <view wx:if="{{higherList.length > 0}}" class="bottom-box">
<t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" />
<text wx:if="{{isMore == false}}">娌℃湁鏇村浜�</text>
</view>
+
</t-tab-panel>
<t-tab-panel label="鑱屼笟鏁欒偛({{vocationalTotal}})" value="1">
- <view class="outsideHigherBox">
+ <view wx:if="{{vocationalList.length <= 0}}" class="noDataBox">
+ <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
+ </view>
+
+
+
+ <view wx:else class="outsideHigherBox">
<view class="higherBox" wx:for="{{vocationalList}}" wx:key="index" wx:for-item="item" wx:for-index="index" bind:tap="downloadData" data-item="{{item}}">
<view class="outsideHigherImageBox">
<image class="higherImageBox" src="{{item.icon}}" mode="" />
@@ -57,14 +81,18 @@
</view>
</view>
- <view class="bottom-box">
+
+ <view wx:if="{{vocationalList.length > 0}}" class="bottom-box">
<t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" />
<text wx:if="{{isMore == false}}">娌℃湁鏇村浜�</text>
</view>
-
</t-tab-panel>
<t-tab-panel label="鏁欏笀鏁欒偛({{teacherTotal}})" value="2">
- <view class="outsideHigherBox">
+
+ <view wx:if="{{teacherList.length <= 0}}" class="noDataBox">
+ <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
+ </view>
+ <view wx:else class="outsideHigherBox">
<view class="higherBox" wx:for="{{teacherList}}" wx:key="index" wx:for-item="item" wx:for-index="index" data-item="{{item}}" bind:tap="downloadData">
<view class="outsideHigherImageBox">
<image class="higherImageBox" src="{{item.icon}}" mode="" />
@@ -78,11 +106,11 @@
</view>
</view>
- <view class="bottom-box">
+
+ <view wx:if="{{teacherList.length > 0}}" class="bottom-box">
<t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" />
<text wx:if="{{isMore == false}}">娌℃湁鏇村浜�</text>
</view>
-
</t-tab-panel>
</t-tabs>
diff --git a/pages/bibliographyList/index.wxss b/pages/bibliographyList/index.wxss
index bcbc718..34c5cc1 100644
--- a/pages/bibliographyList/index.wxss
+++ b/pages/bibliographyList/index.wxss
@@ -82,6 +82,7 @@
.example-search {
background-color: #fff;
/* padding: 16rpx 32rpx; */
+
}
@@ -142,6 +143,31 @@
color: #FF6C00;
}
-.t-loading__spinner {
+/* .t-loading__spinner {
color: #FF6C00 !important;
+} */
+
+.bibliographyList {
+ position: relative;
+}
+
+.titlesBox {
+ position: fixed;
+ top: 0;
+ background-color: #fff;
+ width: 100%;
+ z-index: 999;
+ height: 200rpx;
+}
+
+.contentBox {
+ margin-top: 200rpx;
+}
+
+.noDataBox {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ margin: 0 auto;
+ margin-top: 250rpx;
}
\ No newline at end of file
diff --git a/pages/bookExhibitionList/index.wxml b/pages/bookExhibitionList/index.wxml
index 7402a14..b677700 100644
--- a/pages/bookExhibitionList/index.wxml
+++ b/pages/bookExhibitionList/index.wxml
@@ -21,15 +21,8 @@
<t-dropdown-menu class="classification">
<t-dropdown-item options="{{product.options}}" value="{{product.value}}" bindchange="onChange" />
<t-dropdown-item class="{{keynoteDisabled ? 'disableds' : ' '}}" disabled="{{keynoteDisabled}}" label=" 閲嶇偣椤圭洰" options="{{multipleSelect.options}}" value="{{multipleSelect.value}}" bindchange="handleMultipleSelect" multiple bind:confirm="handleConfirm" bind:reset="handleReset" show-overlay="{{true}}">
-
-
-
</t-dropdown-item>
-
</t-dropdown-menu>
-
-
-
<view class="outsideSortBox">
<view class="sortBox" bind:tap="onSwapRight">
<text>鎺掑簭</text>
diff --git a/pages/cart/index.js b/pages/cart/index.js
index 95c0fe5..546e1c1 100644
--- a/pages/cart/index.js
+++ b/pages/cart/index.js
@@ -3,6 +3,7 @@
import { getPublicImage } from '../../assets/js/middleGround/tool';
import Toast from 'tdesign-miniprogram/toast/index';
+import { loginInfo } from '../../assets/js/login';
Page({
data: {
onDisabled: false,
@@ -139,33 +140,62 @@
totalPrice: totalPrice.toFixed(2)
});
},
+
+
+
+
+
goPaymentPage() {
- const selectedItems = this.data.shoppingCartData.filter(item => item.checked);
- // console.log(selectedItems, 789);
- const selectedIds = selectedItems.map(item => item.id);
- console.log('閫変腑鐨勫晢鍝� id:', selectedIds);
- if (selectedIds.length) {
- let data = {
- linkIds: selectedIds
- }
- app.MG.store.shoppingCartCreateOrder(data).then(res => {
- // console.log(res, 456);
- const url = '/pages/cart/paymentPage/index?orderNumber=' + res.orderNumber
- wx.navigateTo({
- url
- });
+ // 棣栭〉娴嬭瘯鐧诲綍鍔熻兘锛屽悗缁敞閲�
+ // 妫�鏌ョ櫥褰曠姸鎬�
+ const token = wx.getStorageSync(app.config.tokenKey)
+ if (!token) {
+ loginInfo(app, (data) => {
+ // 濡傛灉涓嶆槸绗竴娆＄櫥褰曪紝浼氭墽琛屽洖璋�
+ if (data) {
+
+
+ const selectedItems = this.data.shoppingCartData.filter(item => item.checked);
+ // console.log(selectedItems, 789);
+ const selectedIds = selectedItems.map(item => item.id);
+ console.log('閫変腑鐨勫晢鍝� id:', selectedIds);
+ if (selectedIds.length) {
+ let data = {
+ linkIds: selectedIds
+ }
+ app.MG.store.shoppingCartCreateOrder(data).then(res => {
+ // console.log(res, 456);
+
+
+ const url = '/pages/cart/paymentPage/index?orderNumber=' + res.orderNumber
+ wx.navigateTo({
+ url
+ });
+ })
+ } else {
+ Toast({
+ context: this,
+ selector: '#t-toast',
+ message: '璇烽�夋嫨鍟嗗搧',
+ theme: 'warning',
+ direction: 'column',
+ });
+ }
+ } else {
+ // 鍑虹幇閿欒锛岃繑鍥瀎alse
+ }
})
} else {
- Toast({
- context: this,
- selector: '#t-toast',
- message: '璇烽�夋嫨鍟嗗搧',
- theme: 'warning',
- direction: 'column',
- });
+ // 濡傛灉鏄涓�娆＄櫥褰曪紝浼氳烦杞嚦缁戝畾鐢ㄦ埛淇℃伅椤甸潰锛屽～鍐欏畬鐢ㄦ埛淇℃伅鍚庤繘琛岀櫥褰曞苟鍌ㄥ瓨token鍜岀敤鎴蜂俊鎭紝缁撴潫鍚庤烦杞洖褰撳墠椤甸潰锛堟惡甯﹂〉闈㈠弬鏁帮級
}
+
+
+
+
+
+
},
onLogin() {
wx.navigateTo({
diff --git a/pages/cart/paymentPage/index.js b/pages/cart/paymentPage/index.js
index 6742356..37b34e9 100644
--- a/pages/cart/paymentPage/index.js
+++ b/pages/cart/paymentPage/index.js
@@ -132,12 +132,13 @@
app.MG.store.confirmOrder(query).then(res => {
console.log(res.orderNumber, 'res');
if (res.orderNumber) {
- const resOrderNum = {
+ let resOrderNum = {
orderNum: res.orderNumber,
};
-
+ console.log(resOrderNum, 'resOrderNum');
// 鐢ㄦ埛鏈粦瀹氬井淇� 鎶�500
app.MG.store.makeWeChatPay(resOrderNum).then(payRes => {
+ console.log(payRes, 'payRes');
const payVal = JSON.parse(payRes);
wx.requestPayment({
"appId": payVal.appId,
diff --git a/pages/home/home.js b/pages/home/home.js
index 6b539a6..fcd8dad 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -1,6 +1,10 @@
-import { fetchHome } from '../../services/home/home';
+import {
+ fetchHome
+} from '../../services/home/home';
import moment from 'moment'
-import { loginInfo } from '../../assets/js/login';
+import {
+ loginInfo
+} from '../../assets/js/login';
const app = getApp()
Page({
data: {
@@ -10,23 +14,25 @@
isWhite: false,
userInfo: {},
tabList: [], //鐩綍
- current: 1,//杞挱鍥惧弬鏁�
+ current: 1, //杞挱鍥惧弬鏁�
autoplay: true, //杞挱鍥惧弬鏁�
- duration: '500',//杞挱鍥惧弬鏁�
- interval: 5000,//杞挱鍥惧弬鏁�
- navigation: { type: 'dots' },//杞挱鍥惧弬鏁�
+ duration: '500', //杞挱鍥惧弬鏁�
+ interval: 5000, //杞挱鍥惧弬鏁�
+ navigation: {
+ type: 'dots'
+ }, //杞挱鍥惧弬鏁�
bannerList: [], //杞挱鍥惧垪琛�
- specialSubjectList: [],//涓撻璁ㄨ
- activeItem: 0,//绮鹃�夎绋嬮粯璁ら�変腑
- courseTypeList: [],//绮鹃�夎绋嬪垎绫�
+ specialSubjectList: [], //涓撻璁ㄨ
+ activeItem: 0, //绮鹃�夎绋嬮粯璁ら�変腑
+ courseTypeList: [], //绮鹃�夎绋嬪垎绫�
courseList: [],
- bookTypeList: [],//鍥句功绫诲瀷
+ bookTypeList: [], //鍥句功绫诲瀷
activeItem1: 0,
bookTypeData: {},
booksList: [],
readBookList: [], //鏁板瓧闃呰
textbookList: [], //鏁板瓧鏁欐潗
- rankingList: [],//鎺掕姒�
+ rankingList: [], //鎺掕姒�
shoppingCartGetId: [],
baseRefresh: {
value: false
@@ -49,24 +55,23 @@
// 棣栭〉娴嬭瘯鐧诲綍鍔熻兘锛屽悗缁敞閲�
// 妫�鏌ョ櫥褰曠姸鎬�
- // const token = wx.getStorageSync(app.config.tokenKey)
- // if (!token) {
- // loginInfo(app, (data) => {
- // // 濡傛灉涓嶆槸绗竴娆＄櫥褰曪紝浼氭墽琛屽洖璋�
- // if (data) {
- // // 鐧诲綍鎴愬姛锛岃嚜鍔ㄨ褰晅oken鍜岀敤鎴蜂俊鎭紝骞惰繑鍥瀟rue
- // } else {
- // // 鍑虹幇閿欒锛岃繑鍥瀎alse
- // }
- // })
- // } else {
- // // 濡傛灉鏄涓�娆＄櫥褰曪紝浼氳烦杞嚦缁戝畾鐢ㄦ埛淇℃伅椤甸潰锛屽～鍐欏畬鐢ㄦ埛淇℃伅鍚庤繘琛岀櫥褰曞苟鍌ㄥ瓨token鍜岀敤鎴蜂俊鎭紝缁撴潫鍚庤烦杞洖褰撳墠椤甸潰锛堟惡甯﹂〉闈㈠弬鏁帮級
- // }
+ const token = wx.getStorageSync(app.config.tokenKey)
+ if (!token) {
+ loginInfo(app, (data) => {
+ // 濡傛灉涓嶆槸绗竴娆＄櫥褰曪紝浼氭墽琛屽洖璋�
+ if (data) {
+ // 鐧诲綍鎴愬姛锛岃嚜鍔ㄨ褰晅oken鍜岀敤鎴蜂俊鎭紝骞惰繑鍥瀟rue
+ } else {
+ // 鍑虹幇閿欒锛岃繑鍥瀎alse
+ }
+ })
+ } else {
+ // 濡傛灉鏄涓�娆＄櫥褰曪紝浼氳烦杞嚦缁戝畾鐢ㄦ埛淇℃伅椤甸潰锛屽～鍐欏畬鐢ㄦ埛淇℃伅鍚庤繘琛岀櫥褰曞苟鍌ㄥ瓨token鍜岀敤鎴蜂俊鎭紝缁撴潫鍚庤烦杞洖褰撳墠椤甸潰锛堟惡甯﹂〉闈㈠弬鏁帮級
+ }
this.init();
},
- onReachBottom() {
- },
+ onReachBottom() {},
onPullDownRefresh() {
this.setData({
'baseRefresh.value': true,
@@ -92,8 +97,13 @@
const list = []
app.MG.resource.getItem({
path: 'jsek_banner\\jsek_homeBannerApplet',
- fields: { jsek_link: [] },
- paging: { start: 0, size: 9 }
+ fields: {
+ jsek_link: []
+ },
+ paging: {
+ start: 0,
+ size: 9
+ }
}).then(res => {
for (let i = 0; i < res.datas.length; i++) {
const item = res.datas[i]
@@ -110,7 +120,9 @@
loadHomePage() {
- fetchHome().then(({ tabList }) => {
+ fetchHome().then(({
+ tabList
+ }) => {
this.setData({
tabList,
});
@@ -180,7 +192,10 @@
size: '20',
start: '0',
storeRefCode: app.config.digitalCourses,
- sort: { type: 'Asc', field: 'LinkOrder' }
+ sort: {
+ type: 'Asc',
+ field: 'LinkOrder'
+ }
}
app.MG.store.getStoreChannelList(data).then((res) => {
if (res.datas && res.datas.length > 0) {
@@ -236,7 +251,10 @@
size: '20',
start: '0',
storeRefCode: app.config.goodsStore,
- sort: { type: 'Asc', field: 'LinkOrder' }
+ sort: {
+ type: 'Asc',
+ field: 'LinkOrder'
+ }
}
app.MG.store.getStoreChannelList(data).then((res) => {
if (res.datas && res.datas.length > 0) {
@@ -244,7 +262,8 @@
dataList.push(...res.datas)
this.setData({
bookTypeList: dataList,
- activeItem1: 0
+ activeItem1: 0,
+ bookTypeData: dataList[0],
})
this.getBooksList(dataList[0])
}
@@ -276,7 +295,6 @@
//鍥句功鏈嶅姟
tabBookClick(item) {
let info = this.data.bookTypeList[item.detail.value]
- bookTypeData
this.setData({
bookTypeData: info,
})
@@ -345,12 +363,10 @@
fields: {
author: [],
},
- filterList: [
- {
- value: 'Normal',
- field: 'state'
- }
- ],
+ filterList: [{
+ value: 'Normal',
+ field: 'state'
+ }],
sort: {
Name: 'Asc',
BaseType: ''
@@ -365,13 +381,17 @@
},
// 璺宠浆鍥句功璇︽儏
goDetail(e) {
- const { book } = e.currentTarget.dataset;
+ const {
+ book
+ } = e.currentTarget.dataset;
wx.navigateTo({
url: `/packageBookService/pages/bookServices/detail/index?id=${book.id}&name=${book.name}`,
});
},
goSubjectDetail(e) {
- const { book } = e.currentTarget.dataset;
+ const {
+ book
+ } = e.currentTarget.dataset;
wx.showToast({
title: "寤鸿涓�",
icon: 'none',
@@ -379,7 +399,9 @@
})
},
goCourseDetail(e) {
- const { book } = e.currentTarget.dataset;
+ const {
+ book
+ } = e.currentTarget.dataset;
wx.showToast({
title: "寤鸿涓�",
icon: 'none',
@@ -387,7 +409,9 @@
})
},
goReadBookDetail(e) {
- const { book } = e.currentTarget.dataset;
+ const {
+ book
+ } = e.currentTarget.dataset;
wx.showToast({
title: "寤鸿涓�",
icon: 'none',
@@ -395,7 +419,9 @@
})
},
goTextBookDetail(e) {
- const { book } = e.currentTarget.dataset;
+ const {
+ book
+ } = e.currentTarget.dataset;
wx.showToast({
title: "寤鸿涓�",
icon: 'none',
@@ -422,7 +448,9 @@
})
},
addCart(e) {
- const { info } = e.currentTarget.dataset;
+ const {
+ info
+ } = e.currentTarget.dataset;
wx.showToast({
title: "寤鸿涓�",
icon: 'none',
@@ -449,13 +477,11 @@
})
} else {
let query = {
- requests: [
- {
- saleMethodId: info.defaultSaleMethodId,
- storeEventId: null,
- agentCode: '鐢靛瓙涔�'
- }
- ]
+ requests: [{
+ saleMethodId: info.defaultSaleMethodId,
+ storeEventId: null,
+ agentCode: '鐢靛瓙涔�'
+ }]
}
const addRes = app.MG.store.addShoppingCart(query)
if (addRes) {
@@ -501,4 +527,4 @@
url: '/pages/retrievalPage/index?searchVal=' + this.data.searchVal
})
},
-});
+});
\ No newline at end of file
diff --git a/pages/personalCenter/feedBackSubmit/index.js b/pages/personalCenter/feedBackSubmit/index.js
index 202a52c..5536346 100644
--- a/pages/personalCenter/feedBackSubmit/index.js
+++ b/pages/personalCenter/feedBackSubmit/index.js
@@ -86,41 +86,50 @@
this.data.lock = false;
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.replace(/^\s*|\s*$/g, ""),
- name: this.data.userName.replace(/^\s*|\s*$/g, ""),
- email: "",
- phone: this.data.mannder.replace(/^\s*|\s*$/g, "")
- };
- var data = {
- topicIdOrRefCode: "feedback",
- name: "鎰忚鍙嶉",
- content: JSON.stringify(submitData),
- type: "opinionFeedback",
- state: "WaitAudit",
- cmsTypeRefCode: "",
- newDataListRequest: []
- };
- app.MG.ugc.newTopicMessage(data).then(res => {
+ if (!this.data.phoneError) {
+ if (this.data.content.replace(/^\s*|\s*$/g, "")) {
+ let submitData = {
+ content: this.data.content.replace(/^\s*|\s*$/g, ""),
+ name: this.data.userName.replace(/^\s*|\s*$/g, ""),
+ email: "",
+ phone: this.data.mannder.replace(/^\s*|\s*$/g, "")
+ };
+ var data = {
+ topicIdOrRefCode: "feedback",
+ name: "鎰忚鍙嶉",
+ content: JSON.stringify(submitData),
+ type: "opinionFeedback",
+ state: "WaitAudit",
+ cmsTypeRefCode: "",
+ newDataListRequest: []
+ };
+ app.MG.ugc.newTopicMessage(data).then(res => {
+ this.data.lock = true;
+ if (res) {
+ wx.showToast({
+ title: "鎻愪氦鎴愬姛",
+ icon: 'success',
+ duration: 1000,
+ success: function () {
+ setTimeout(function () {
+ wx.navigateBack();
+ }, 1000) //寤惰繜鏃堕棿
+ }
+ })
+ }
+ });
+ } else {
this.data.lock = true;
- if (res) {
- wx.showToast({
- title: "鎻愪氦鎴愬姛",
- icon: 'success',
- duration: 1000,
- success: function () {
- setTimeout(function () {
- wx.navigateBack();
- }, 1000) //寤惰繜鏃堕棿
- }
- })
- }
- });
+ wx.showToast({
+ title: "鍙嶉鍐呭涓嶈兘涓虹┖",
+ icon: 'none',
+ duration: 1000
+ })
+ }
} else {
this.data.lock = true;
wx.showToast({
- title: "鍙嶉鍐呭涓嶈兘涓虹┖",
+ title: "鑱旂郴鏂瑰紡鏍煎紡涓嶆纭�",
icon: 'none',
duration: 1000
})
diff --git a/pages/personalCenter/feedBackSubmit/index.wxml b/pages/personalCenter/feedBackSubmit/index.wxml
index 7af45bd..e152533 100644
--- a/pages/personalCenter/feedBackSubmit/index.wxml
+++ b/pages/personalCenter/feedBackSubmit/index.wxml
@@ -3,7 +3,7 @@
<view class="from-item">
<view class="label"> 鑱旂郴浜猴細 </view>
<view class="item-content">
- <t-input placeholder="璇疯緭鍏ヨ仈绯讳汉" borderless value="{{userName}}" type="number" bindchange="bindTnputBlur" />
+ <t-input placeholder="璇疯緭鍏ヨ仈绯讳汉" borderless value="{{userName}}" bindchange="bindTnputBlur" />
</view>
</view>
<view class="from-item">
diff --git a/pages/personalCenter/index.js b/pages/personalCenter/index.js
index 190cc96..a6682bd 100644
--- a/pages/personalCenter/index.js
+++ b/pages/personalCenter/index.js
@@ -1,6 +1,5 @@
const app = getApp()
-const menuData = [
- {
+const menuData = [{
title: '鎴戠殑璁㈠崟',
icon: '/static/images/personal/order.png',
url: '/packagePersonal/pages/myOrder/index',
@@ -49,8 +48,7 @@
type: 'publishBooks',
}
];
-const moreMenu = [
- {
+const moreMenu = [{
title: '鎴戠殑娑堟伅',
icon: '/static/images/personal/notification.png',
url: '/packagePersonal/pages/myMassage/index',
@@ -63,8 +61,7 @@
type: 'feedback',
}
];
-const moreMenu1 = [
- {
+const moreMenu1 = [{
title: '鍏充簬鎴戜滑',
icon: '/static/images/personal/about.png',
url: '/packagePersonal/pages/aboutUs/index?types=jsek_aboutUs',
@@ -77,8 +74,7 @@
type: 'contact',
}
];
-const userTypeList = [
- {
+const userTypeList = [{
lable: '涓亴鏁欏笀',
value: 'vocSchoolTeachers'
},
@@ -119,7 +115,11 @@
visible: false,
baseRefresh: {
value: false
- }
+ },
+ loadingProps: {
+ size: '50rpx',
+ },
+ scrollTop: 0,
},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
@@ -165,8 +165,7 @@
/**
* 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
*/
- onReachBottom() {
- },
+ onReachBottom() {},
// 鑾峰彇鐧诲綍鐢ㄦ埛韬唤
getUserInfo() {
app.MG.identity.getCurrentAppUser().then(res => {
@@ -281,20 +280,22 @@
});
},
tabUserTypeClick(e) {
- let { info } = e.currentTarget.dataset;
+ let {
+ info
+ } = e.currentTarget.dataset;
this.setData({
userTypeActive: info.value,
});
},
submit() {
let userTypeInfo = {
- requests: [
- {
- data: JSON.stringify({ userType: this.data.userTypeActive }),
- name: '鐢ㄦ埛绫诲瀷',
- type: 'userType'
- }
- ]
+ requests: [{
+ data: JSON.stringify({
+ userType: this.data.userTypeActive
+ }),
+ name: '鐢ㄦ埛绫诲瀷',
+ type: 'userType'
+ }]
}
app.MG.identity.setAppUserInfo(userTypeInfo).then((res) => {
if (res) {
@@ -337,8 +338,15 @@
this.setData({
isWhite: e.detail.scrollTop > 10 ? true : false
})
+ const {
+ scrollTop
+ } = e.detail;
+ this.setData({
+ scrollTop
+ });
},
+
/**
* 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
*/
diff --git a/pages/personalCenter/index.wxml b/pages/personalCenter/index.wxml
index 50cd24b..9e03e35 100644
--- a/pages/personalCenter/index.wxml
+++ b/pages/personalCenter/index.wxml
@@ -1,5 +1,5 @@
<view>
- <t-pull-down-refresh value="{{baseRefresh.value}}" loadingTexts="{{['涓嬫媺鍒锋柊', '鏉炬墜鍒锋柊', '姝ｅ湪鍒锋柊', '鍒锋柊瀹屾垚']}}" bind:refresh="onPullDownRefresh" bind:scroll="onScroll">
+ <t-pull-down-refresh value="{{baseRefresh.value}}" loadingProps="{{loadingProps}}" loadingTexts="{{['涓嬫媺鍒锋柊', '鏉炬墜鍒锋柊', '姝ｅ湪鍒锋柊', '鍒锋柊瀹屾垚']}}" bind:refresh="onPullDownRefresh" bind:scroll="onScroll">
<view style="width: 100%; height: {{barHeight}}px;"></view>
<view class="background {{ isWhite ? 'white':''}}" style="padding-top: {{barHeight}}px">
<text class="text">涓汉涓績</text>
diff --git a/pages/retrievalPage/index.wxml b/pages/retrievalPage/index.wxml
index c08b358..e4c71a6 100644
--- a/pages/retrievalPage/index.wxml
+++ b/pages/retrievalPage/index.wxml
@@ -1,5 +1,7 @@
-<!--pages/retrievalPage/index.wxml-->
-<view style="width: 100%; height: {{barHeight}}px; "></view>
+<view class="outsideRetrievalPageBox">
+
+ <view class="retrievalPageBox">
+ <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" />
@@ -13,10 +15,14 @@
<view class="cancellation" bind:tap="onCancellation">鍙栨秷</view>
</view>
+ </view>
+<!--pages/retrievalPage/index.wxml-->
-<t-tabs defaultValue="{{0}}" bind:change="onTabsChange" bind:click="onTabsClick" t-class="custom-tabs" t-class-content="custom-panel">
+
+
+<t-tabs class="tabsBox" defaultValue="{{0}}" bind:change="onTabsChange" bind:click="onTabsClick" t-class="custom-tabs" t-class-content="custom-panel">
<t-tab-panel label="鍥句功({{bookTotal}})" value="0">
<view wx:if="{{bookData.length <= 0}}" class="noDataBox">
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
@@ -196,4 +202,5 @@
</view>
</t-tab-panel>
-</t-tabs>
\ No newline at end of file
+</t-tabs>
+</view>
\ No newline at end of file
diff --git a/pages/retrievalPage/index.wxss b/pages/retrievalPage/index.wxss
index a1a329c..c0ff82d 100644
--- a/pages/retrievalPage/index.wxss
+++ b/pages/retrievalPage/index.wxss
@@ -330,4 +330,20 @@
.t-tabs__item--evenly {
flex: 1 0 auto !important;
+}
+
+.outsideRetrievalPageBox {
+ position: relative;
+}
+
+.retrievalPageBox {
+ position: fixed;
+ top: 0px;
+ background-color: #fff;
+ height: 150px;
+ z-index: 999;
+}
+
+.tabsBox {
+ margin-top: 300rpx;
}
\ No newline at end of file
diff --git a/static/images/home/yangshuliebiao.png b/static/images/home/yangshuliebiao.png
index 12a4d5a..8a70564 100644
--- a/static/images/home/yangshuliebiao.png
+++ b/static/images/home/yangshuliebiao.png
Binary files differ
--
Gitblit v1.9.1