From 22d3edd68b236001179e54a8edda52a390a6c4d5 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Fri, 8 Mar 2024 11:40:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue          |  2 +-
 pages/news/recycling/order.vue | 21 ++++++---------------
 pages/news/user/index.vue      |  2 +-
 pages/news3/shopOrder.vue      |  2 +-
 pages/order/index.vue          |  2 +-
 5 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index c203ff4..b56d0e4 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1965,7 +1965,7 @@
 
 				.serviceItem {
 					width: 202rpx;
-					height: 246rpx;
+					height: 202rpx;
 					display: inline-block;
 					position: relative;
 					margin-right: 26rpx;
diff --git a/pages/news/recycling/order.vue b/pages/news/recycling/order.vue
index 71ef8cb..1adebd5 100644
--- a/pages/news/recycling/order.vue
+++ b/pages/news/recycling/order.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="order">
 		<view class="order-navbar">
-			<u-navbar title="订单详情" :border-bottom="false" :background="isScroll?background:background1"></u-navbar>
+			<u-navbar title="订单详情" :border-bottom="false"></u-navbar>
 		</view>
 		<view class="order-hd">
 			<view class="l">
@@ -146,8 +146,6 @@
 </template>
 
 <script>
-	// import img from "@/static/news/refund-bg.png"
-	// import img1 from "@/static/news/login-bg.png"
 	import * as newFunApi from '@/api/newFun'
 	export default {
 		data() {
@@ -155,16 +153,6 @@
 				isScroll: true,
 				isShow: false,
 				currentIndex: 0,
-				background: {
-					background: `url(${this.$picUrl}/static/news/refund-bg.png) center -44px no-repeat`,
-					// background: 'url(' + img + ') center -44px no-repeat',
-					backgroundSize: '100%',
-				},
-				background1: {
-					background: `url(${this.$picUrl}/static/news/login-bg.png) center -44px no-repeat`,
-					// background: 'url(' + img1 + ') center -44px no-repeat',
-					backgroundSize: '100%',
-				},
 				recovery_id: '',
 				order_id: '',
 				infor: '',
@@ -297,14 +285,17 @@
 </script>
 
 <style lang="scss" scoped>
+	::v-deep .u-navbar-fixed{
+		background: none !important;
+	}
 	.order {
 		width: 100%;
 		padding: 0 0 150rpx;
 		box-sizing: border-box;
-		overflow: hidden;
+		background: url(https://www.royaum.com.cn/static/news/login-bg.png?t=2) center top no-repeat;
+		background-size: 100% auto;
 
 		&-hd {
-			background: linear-gradient(180deg, #FCE2E7 0%, #FFFFFF 100%);
 			overflow: hidden;
 
 			.l {
diff --git a/pages/news/user/index.vue b/pages/news/user/index.vue
index 17dba02..2009757 100644
--- a/pages/news/user/index.vue
+++ b/pages/news/user/index.vue
@@ -154,7 +154,7 @@
 			goJump(){
 				if(this.title=='会员管理'){
 					uni.navigateTo({
-						url:"/pages/news3/shopOrder?user_id="+this.form.user_id
+						url:"/pages/news3/shopOrder?user_id="+this.form.user_id+'&dataType='+'all'
 					})
 				}else{
 					uni.navigateTo({
diff --git a/pages/news3/shopOrder.vue b/pages/news3/shopOrder.vue
index 7f036a5..d14adf0 100644
--- a/pages/news3/shopOrder.vue
+++ b/pages/news3/shopOrder.vue
@@ -5,7 +5,7 @@
 			<view class="searchContent">
 				<u-search bg-color="#fafafa" :is-scroll="true" height="120" font-size="32" :current="curTab"
 					bar-width="56" bar-height="6" active-color="#3B3B3B" :show-bar='true' :duration="0.2"
-					@search="getListAfter" action-text='筛选' @custom="getListAfter" placeholder="输入订单编号/收件人名字/电话/商品名称"
+					@search="getListAfter" action-text='筛选' @custom="getListAfter" placeholder="输入订单编号"
 					v-model="keyword">
 				</u-search>
 			</view>
diff --git a/pages/order/index.vue b/pages/order/index.vue
index 8d73b87..a8b8114 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -3,7 +3,7 @@
 		<view class="search">
 			<view class="box">
 				<u-icon name="search" size="30" color="#8D8D8D"></u-icon>
-				<input type="search" @confirm="confirm" v-model='keyWords' placeholder="搜索订单" />
+				<input type="search" @confirm="confirm" v-model='keyWords' placeholder="输入订单编号" />
 			</view>
 		</view>
 		<!-- tab栏 -->