From 7fac5f7b7c0d87ec0946e322aede77929c5cb039 Mon Sep 17 00:00:00 2001
From: "Mr.jiang" <714156421@qq.com>
Date: Thu, 4 Jul 2024 16:25:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E5=95=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/t-refresh/t-refresh.vue |  2 --
 my/hongbao/xinrenhongbao.vue       |  7 ++++--
 my/order/pay.vue                   | 39 +++++++++++++++++-------------
 pages/my/fuwuxiangm.vue            |  1 +
 pages/my/historyMy.vue             | 15 +-----------
 pages/my/indextaociliaoList.vue    | 21 +++++++++++++---
 6 files changed, 46 insertions(+), 39 deletions(-)

diff --git a/components/t-refresh/t-refresh.vue b/components/t-refresh/t-refresh.vue
index a258d96..1d8c654 100644
--- a/components/t-refresh/t-refresh.vue
+++ b/components/t-refresh/t-refresh.vue
@@ -2,9 +2,7 @@
 	<view style="width: 100%;" class="refresh-body" @touchmove.stop.prevent>
 	  <scroll-view scroll-y @scroll="scroll" @touchstart="touchstart" @scrolltolower="loadMore" @touchmove="touchmove" @touchend="touchend" class="refresh-scroll">
 		   <view class="content">
-			    <!-- 内容 -->
 				<slot name="content"></slot>
-				<!-- 上拉加载 -->
 				<view class="t-loading-box" v-if="loadingType!=3&&openLoadMore" @click="loadMore">
 					<view class="t-line"></view>
 					<view class="t-loading-text">
diff --git a/my/hongbao/xinrenhongbao.vue b/my/hongbao/xinrenhongbao.vue
index 69b2aa0..62ce118 100644
--- a/my/hongbao/xinrenhongbao.vue
+++ b/my/hongbao/xinrenhongbao.vue
@@ -1,5 +1,5 @@
 <template>
-	<view style="height: 100vh;">
+	<view style="height: 100vh;width: 100%;overflow: scroll;">
 		<!-- <view class="flex align-center justify-between you-nav">
 			<view v-for="(item,index) in tab" :key="index" class="text-center box"
 				:class="tabIndex == index?'tanColor':''" @click="bindTab(item.state)">
@@ -7,7 +7,7 @@
 				<view class="" :class="tabIndex == index?'line':''"></view>
 			</view>
 		</view> -->
-		<t-refresh ref="refresh" style="margin-bottom: 150px;" v-if="hongbao.length>0"  @refresh="refresh" @loadMore="loadMore" :loadingType="loadingType"   :tPadding="0">
+		<t-refresh ref="refresh" v-if="hongbao.length>0"  @refresh="refresh" @loadMore="loadMore" :loadingType="loadingType"   :tPadding="0">
 			<template slot="content">
 				<checkbox-group @change="checkboxChange">
 					<view>
@@ -146,6 +146,9 @@
 </script>
 
 <style scoped>
+	/deep/.refresh-body{
+		height: 870px !important;
+	}
 	.que-btn{
 		display: inline-block;
 		width: 90%;
diff --git a/my/order/pay.vue b/my/order/pay.vue
index 6cebb89..d976c78 100644
--- a/my/order/pay.vue
+++ b/my/order/pay.vue
@@ -290,16 +290,19 @@
 			</view>
 			<view class="showBtn" v-if="order.status==6" :style="{'justify-content':order.status ==6||order.status ==1?'space-between':'flex-end'}">
 				<view class="gengduo" @click.stop="gengBtn">更多</view>
-				<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"
-					>
-					取消订单
-				</u-button>
 				<u-button
 					shape="circle" :plain="true"
-					@click="goNav('/my/wallet/index?artificerId='+order.artificerId)"
+					@click="toggle('center',order)"
 					class="btns">
-					充值
+					提前结束
 				</u-button>
+				<u-button  v-if="order.oldOrdersId==null && order.status == 6&&order.addNum==null"
+					shape="circle" :plain="true"
+					@tap="saveJZS(order.artificerId)"
+					class="btns">
+					服务升级
+				</u-button>
+				
 				<u-button
 					 v-if="order.addNum ==null"
 					shape="circle" :plain="true"
@@ -310,11 +313,15 @@
 				<view class="showBtn-view" v-if="gengBtnShow==true" :style="gengNum==index?{display:'inline-block'}:{display:'none'}">
 					<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
 						class="dingshi">联系客服</u-button>
-					<u-button  v-if="order.oldOrdersId==null && order.status == 6&&order.addNum==null"
+					<u-button @click="cancelOrder(order)" shape="circle" class="btns" :hair-line="false"
+						>
+						取消订单
+					</u-button>
+					<u-button
 						shape="circle" :plain="true"
-						@tap="saveJZS(order.artificerId)"
+						@click="goNav('/my/wallet/index?artificerId='+order.artificerId)"
 						class="btns">
-						服务升级
+						充值
 					</u-button>
 					<u-button :custom-style="customStyle2"
 						shape="circle" :plain="true"
@@ -322,12 +329,7 @@
 						class="dingshi">
 						去投诉
 					</u-button>
-					<u-button
-						shape="circle" :plain="true"
-						@click="toggle('center',order)"
-						class="btns">
-						提前结束
-					</u-button>
+					
 				</view>
 			</view>
 			<view class="showBtn" v-if="order.status ==7">
@@ -363,7 +365,7 @@
 					class="dingshi">联系客服</u-button>
 			</view>
 			<view class="showBtn" v-if="order.status ==9">
-				<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"
+				<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle2" :hair-line="false"
 					>
 					取消订单
 				</u-button>
@@ -1637,6 +1639,9 @@
 </script>
 
 <style lang="scss" scoped>
+	/deep/.u-size-default{
+		width: 80px !important;
+	}
 	/deep/.padding-bottom{
 		padding-bottom: 20rpx;
 	}
@@ -1821,7 +1826,7 @@
 		color: #fff !important;
 	}
 	/deep/.u-size-default{
-		margin: 5px 0px 0px 0px;
+		// margin: 5px 0px 0px 0px;
 	}
 	
 	.showBtn-mian{
diff --git a/pages/my/fuwuxiangm.vue b/pages/my/fuwuxiangm.vue
index b4fc1f9..a657705 100644
--- a/pages/my/fuwuxiangm.vue
+++ b/pages/my/fuwuxiangm.vue
@@ -179,6 +179,7 @@
 	.content-view{
 		width: 100%;
 		height: 100vh;
+		padding-bottom: 100px;
 		overflow: hidden;
 		background-color: #f7f7f7;
 	}
diff --git a/pages/my/historyMy.vue b/pages/my/historyMy.vue
index 448d8a1..f87d398 100644
--- a/pages/my/historyMy.vue
+++ b/pages/my/historyMy.vue
@@ -1,20 +1,7 @@
 <!-- 自定义下拉刷新与上拉加载演示(vue) -->
 <template>
 	<view class="content-view">
-		<view class="service-head-top">
-			<view class="service-head-top-left">
-				<image @click="backImg" src="../../static/fanhui.png" mode="widthFix"></image>
-				<span>浏览历史</span>
-			</view>
-			<!-- <view>
-				<uni-search-bar @service="serviceTrue" @confirm="search" :cancelext="'取消'" v-model="searchValue" @input="input"
-				 @clear="clear">
-				</uni-search-bar>
-				<view class="search-btn" @click="searchBtn">
-					搜索
-				</view>
-			</view> -->
-		</view>
+		
 		<t-refresh ref="refresh"  v-if="dataList.length>0"  @refresh="refresh" @loadMore="loadMore" :loadingType="loadingType"   :tPadding="0">
 			<template slot="content">
 				<view class="item" v-for="(item,index) in dataList" :key="index" @click="itemClick(item)">
diff --git a/pages/my/indextaociliaoList.vue b/pages/my/indextaociliaoList.vue
index 8510ca0..27c650b 100644
--- a/pages/my/indextaociliaoList.vue
+++ b/pages/my/indextaociliaoList.vue
@@ -72,6 +72,7 @@
 				titleNmae:'',
 				classifyId:'',
 				getName:'',
+				scrollTop: false,
 			}
 		},
 		onLoad(e){
@@ -84,6 +85,17 @@
 			this.page = 1;
 			this.getData()
 		},
+		onPageScroll: function(e) {
+			this.scrollTop = e.scrollTop > 200;
+		},
+		onReachBottom: function() {
+			this.page = this.page + 1;
+			this.getData('');
+		},
+		onPullDownRefresh: function() {
+			this.page = 1;
+			this.getData('Refresh');
+		},
 		methods: {
 			// 加载更多
 			loadMore: async function() {
@@ -162,14 +174,15 @@
 		background-color: #f7f7f7;
 	}
 	/deep/.refresh-body{
-		height: 100% !important;
-		border-top: 2px solid #f7f7f7;
-		margin: 50px 0px;
+		border-top: 2px solid #f7f7f7;  
+		margin-top: 50px;
+		height: 800px !important;
+		overflow: scroll;
 	}
 	.content-view{
 		width: 100%;
 		height: 100vh;
-		overflow: auto;
+		overflow: scroll;
 		background-color: #f7f7f7;
 		position: relative;
 	}