From 4ef1826180997bac879913bf17867bd3e390c29d Mon Sep 17 00:00:00 2001
From: yiming <m13691596795@163.com>
Date: 星期四, 28 三月 2024 09:24:46 +0800
Subject: [PATCH] 微信支付修改
---
pages/home/home.js | 26 +-
packageBookService/pages/bookServices/detail/buyResource/index.js | 109 ++++++++-----
pages/retrievalPage/index.wxml | 15 +
pages/retrievalPage/index.wxss | 16 ++
pages/cart/index.js | 72 ++++++--
pages/cart/paymentPage/index.js | 5
packageBookService/pages/bookServices/detail/components/tree/index.js | 71 +++++++-
pages/bibliographyList/index.wxml | 76 ++++++---
packageBookService/pages/bookServices/detail/buyResource/index.wxml | 2
pages/bibliographyList/index.wxss | 28 +++
pages/bibliographyList/index.json | 3
packageBookService/pages/bookServices/detail/index.js | 19 +-
packageDomain/pages/resourceDetails/myAudio/index.wxss | 6
13 files changed, 319 insertions(+), 129 deletions(-)
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 803cff1..6eb4cc2 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -819,8 +819,8 @@
Toast({
context: this,
selector: '#t-toast',
- message: '宸叉坊鍔�',
- theme: 'success',
+ message: '璇ヤ功宸插湪璐墿杞︼紝璇峰嬁閲嶅娣诲姞',
+ theme: 'warning',
direction: 'column',
});
}
@@ -1453,14 +1453,15 @@
buyBtn() {
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() {
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/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/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 135cfca..fcd8dad 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -55,19 +55,19 @@
// 棣栭〉娴嬭瘯鐧诲綍鍔熻兘锛屽悗缁敞閲�
// 妫�鏌ョ櫥褰曠姸鎬�
- // 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();
},
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
--
Gitblit v1.9.1