From 733e29ec262812a07b30734ae75d88117cbc8691 Mon Sep 17 00:00:00 2001
From: zhangtianning <573515615@qq.com>
Date: Mon, 26 Feb 2024 00:50:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=94=80=E8=AE=A2=E5=8D=95=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/model/dealer/Setting.js  |   2 +-
 pages.json                      |   8 +
 pages/dealer/order.vue          |  56 ++-
 pages/news3/shopDealerOrder.vue | 676 ++++++++++++++++++++++++++++++++
 pages/user/index.vue            |   3 +-
 5 files changed, 734 insertions(+), 11 deletions(-)
 create mode 100644 pages/news3/shopDealerOrder.vue

diff --git a/common/model/dealer/Setting.js b/common/model/dealer/Setting.js
index 0d043e1..71867c6 100644
--- a/common/model/dealer/Setting.js
+++ b/common/model/dealer/Setting.js
@@ -29,7 +29,7 @@ const getApiData = () => {
  * 有缓存的情况下返回缓存, 没有缓存从后端api获取
  * @param {bool} isCache 是否从缓存中获取
  */
-const data = (isCache = false) => {
+const data = (key,isCache = false) => {console.log(key);console.log('...............');
   return new Promise((resolve, reject) => {
     const cacheData = getStorage()
     if (isCache && cacheData) {
diff --git a/pages.json b/pages.json
index 9afd9da..4de9488 100644
--- a/pages.json
+++ b/pages.json
@@ -1065,6 +1065,14 @@
 						"navigationBarTitleText": "商品订单"
 					}
 				},
+				{
+					"path": "shopDealerOrder",
+					"style": {
+						"navigationStyle": "default",
+						"navigationBarTextStyle": "black",
+						"navigationBarTitleText": "分销商品"
+					}
+				},
 				{
 					"path": "shopOrderDetails",
 					"style": {
diff --git a/pages/dealer/order.vue b/pages/dealer/order.vue
index 996d188..83563e2 100644
--- a/pages/dealer/order.vue
+++ b/pages/dealer/order.vue
@@ -1,20 +1,52 @@
 <template>
-  <view class="container" :style="appThemeStyle">
+  <view class="container" :style="appThemeStyle" style="background: #F8F8F8;">
     <mescroll-body ref="mescrollRef" :sticky="true" @init="mescrollInit" :down="{ use: false }" :up="upOption" @up="upCallback">
 
       <!-- tab栏 -->
       <u-tabs :list="tabList" :is-scroll="false" :current="curTab" active-color="#786cff" :duration="0.2" @change="onChangeTab" />
-
+		<view style="padding: 15rpx 36rpx;">
+			<u-search bgColor="#fff" placeholder="输入订单编号/收件人名字/电话商品名称" v-model="keyword"></u-search>
+		</view>
       <!-- 列表数据 -->
-      <view class="widget-list b-f">
+      <view class="widget-list b-f" v-show="list.data.length>0">
         <view class="widget__detail" v-for="(item, index) in list.data" :key="index">
-          <view class="detail__row dis-flex flex-x-between">
+          <view class="detail__row dis-flex flex-x-between" style="margin-bottom: 18rpx;">
             <view class="detail__left f-24">订单号：{{ item.order.order_no }}</view>
             <view class="detail__right f-24 c-violet">
               {{ item.order.state_text }}
             </view>
           </view>
-          <view class="detail__row m-top10 dis-flex flex-x-between">
+		  
+		  <view class="detail__row m-top10 dis-flex flex-x-between" @click="onTargetDetail(goodsItem.goods_id)" v-for="(goodsItem,goodsIndex) in item.goods">
+		    <view class="detail__left dis-flex flex-y-center">
+		      <view class="user-avatar">
+		        <avatar-image :url="goodsItem.goods_image" :width="100" :borderWidth="4" :borderColor="`#fff`" />
+		      </view>
+		      <view class="user-info dis-flex flex-dir-column flex-x-center" style="justify-content: flex-end">
+		        <!-- <view class="user-nickName f-28">
+				 {{ item.user.nick_name }} 
+				</view> -->
+		        <view class="user-time f-24 c-80">x{{ goodsItem.total_num }}</view>
+		      </view>
+		    </view>
+		    <view class="detail__right dis-flex flex-dir-column flex-x-center flex-y-center">
+		      <view class="detail__money t-r col-m" style="color: #F21A1C;">
+		        <text class="f-26">¥ </text>
+		        <text class="f-28">{{ goodsItem.goods_price }}</text>
+		      </view>
+			  
+		    </view>
+		  </view>
+		  <view class="dis-flex flex-dir-row flex-x-end flex-y-center">
+			  <view class="detail__time f-22 c-80">
+				  含运费：{{item.order.express_price}}
+			  </view>
+			  <view class="f-28" style="color: #3B3B3B;margin-left: 10rpx;font-weight: 600;">
+				  共计：<text style="color: #F21A1C;">¥{{ item.order.total_price }}</text>
+			  </view>
+		  </view>
+		  
+          <!-- <view class="detail__row m-top10 dis-flex flex-x-between">
             <view class="detail__left dis-flex flex-y-center">
               <view class="user-avatar">
                 <avatar-image :url="item.user.avatar_url" :width="100" :borderWidth="4" :borderColor="`#fff`" />
@@ -31,7 +63,7 @@
               </view>
               <view class="detail__time f-22 c-80">{{ item.create_time }}</view>
             </view>
-          </view>
+          </view> -->
         </view>
       </view>
     </mescroll-body>
@@ -54,6 +86,7 @@
     mixins: [MescrollMixin],
     data() {
       return {
+		keyword:'',
         // 选项卡列表
         tabList: [],
         // 当前选项
@@ -84,11 +117,15 @@
     },
 
     methods: {
-
+		onTargetDetail(goodsId) {
+			this.$navTo('pages/goods/detail', {
+				goodsId
+			})
+		},
       // 获取分销设置
       getSetting() {
         const app = this
-        SettingModel.data()
+        SettingModel.data({keyword:app.keyword})
           .then(setting => {
             const words = setting.words.order
             app.setPageTitle(words.title)
@@ -181,7 +218,8 @@
 </style>
 <style lang="scss" scoped>
   .c-violet {
-    color: #786cff;
+    // color: #786cff;
+	color:#FF6813;
   }
 
   .c-80 {
diff --git a/pages/news3/shopDealerOrder.vue b/pages/news3/shopDealerOrder.vue
new file mode 100644
index 0000000..b29d644
--- /dev/null
+++ b/pages/news3/shopDealerOrder.vue
@@ -0,0 +1,676 @@
+<template>
+	<view>
+		<view class="head-info">
+			<!-- 搜索 -->
+			<view class="searchContent">
+				<u-search height="50" @search="getListAfter" @custom="getListAfter" placeholder="输入订单编号/收件人名字/电话商品名称" v-model="keyword"></u-search>
+				<!-- <u-input v-model="keyword" placeholder="输入订单编号/收件人名字/电话商品名称"/> -->
+				<!-- <u-icon name="search" class="search"></u-icon> -->
+				<!-- <view class="filter" @click="getFilterHandle">
+					<image src=":src="$picUrl+'/static/news3/filter.png" mode="widthFix"></image>
+					<text>筛选</text>
+				</view> -->
+			</view>
+		</view>
+		<!-- 分类列表 -->
+		<view class="container">
+			<view class="classify-list">
+				<view class="list" v-for="(item,index) in classList"
+				:class="{'action':classifyShow==item.id}"
+				@click="onClassify(item,index)"
+				:key="index">
+					<text>{{item.name}}</text>
+					<text class="line" v-show="classifyShow==item.id"></text>
+				</view>
+			</view>
+		</view>
+		<view class="shopContent">
+			<view class="shopItem" v-for="(item,index) in goodsList" :key="index">
+				<view class="orderInfo">
+					<text>订单号：{{item.order_no}}</text>
+					<text class="statusText">{{item.state_text}}</text>
+				</view>
+				<view class="shopItemInfo" v-for="(p,i) in item.goods" :key="i">
+					<image :src="p.goods_image"></image>
+					<view class="priceCon">
+						<text class="num">x{{p.total_num}}</text>
+						<view class="priceText">
+							<text style="font-size: 26upx;">¥</text>
+							<text>{{p.total_price}}</text>
+						</view>
+					</view>
+				</view>
+				<view class="totalNum">
+					<text>含运费¥{{item.third_money}}</text>
+					<text>共计：</text>
+					<text>¥{{item.order_price}}</text>
+				</view>
+				<view class="remark">
+					<view class="remarkTitle">
+						收件人姓名： {{item.address_name}}
+					</view>
+					<view class="remarkContent">
+						{{item.remark}}
+					</view>
+				</view>
+				<view class="btnGroup">
+					<view class="btn info" v-show="item.state_text=='待发货'||item.state_text=='待付款'">修改地址</view>
+					<view class="btn primary" v-show="item.state_text=='待发货'||item.state_text=='待付款'" @click="goJump('/pages/news3/updatePrice',item)">修改价格</view>
+					<view class="btn primary" v-show="item.state_text=='待发货'" @click="goJump('/pages/news3/sendOutGoods',item)">发货</view>
+					<view class="btn info" v-show="item.state_text=='refund'">拒绝</view>
+					<view class="btn primary" v-show="item.state_text=='refund'">同意</view>
+					<view class="btn info" v-show="item.state_text=='cancel'||item.state_text=='complete'">删除订单</view>
+					<view class="btn info" @click="afterSale=true" v-show="item.state_text=='receipt'">转至售后</view>
+					<view class="btn primary"  v-show="item.state_text=='receipt'">修改物流</view>
+				</view>
+			</view>
+		</view>
+		<u-popup v-model="show" mode="bottom" border-radius="10" :closeable="true">
+			<view class="filterContent">
+				<view class="filterTitle">
+					订单筛选
+				</view>
+				<view class="filterItem">
+					<view class="filterItemContent">
+						<view class="itemTitle">
+							下单时间
+						</view>
+						<view class="timeContainer">
+							<u-input v-model="startTime" type="select" @click="getTime('start')"  disabled placeholder="起始时间"/>
+							<text>-</text>
+							<u-input v-model="endTime" type="select" @click="getTime('end')" disabled placeholder="终止时间"/>
+						</view>
+					</view>
+					<view class="filterItemContent">
+						<view class="itemTitle">
+							来源
+						</view>
+						<view class="selectContainer">
+							<view @click="setResourceIndex(index)" :class="sourceIndex==index?'selectItem active':'selectItem'" v-for="(item,index) in selectList" :key="item.id">
+								{{item.name}}
+							</view>
+						</view>
+					</view>
+					<view class="filterItemContent">
+						<view class="itemTitle">
+							支付方式
+						</view>
+						<view class="selectContainer">
+							<view @click="setpayIndex(index)" :class="payIndex==index?'selectItem active':'selectItem'" v-for="(item,index) in payList" :key="item.id">
+								{{item.name}}
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="btnGroup">
+					<view class="resetBtn">
+						重置
+					</view>
+					<view class="confrim">
+						确定
+					</view>
+				</view>
+			</view>
+			<u-picker mode="time" z-index="99999" v-model="timeShow"></u-picker>
+		</u-popup>
+		<u-popup v-model="afterSale" width="80%" border-radius="10" :closeable="true" mode="center">
+			<view class="afterSales">
+				<view class="filterTitle">
+					确定转移至售后
+				</view>
+				<view class="filterItem">
+					<view class="filterItemContent">
+						<view class="itemTitle">
+							上传照片 <text style="color:#FF5042">*</text><text>最多可传5张图片</text>
+						</view>
+						<u-upload
+							:fileList="finishImageList"
+							:previewFullImage="true" 
+							@afterRead="afterRead"
+							:maxCount="8" width="180" height="180"
+							upload-text="上传照片"
+							@delete="deletePic"
+							name="1"
+							multiple
+						></u-upload>
+					</view>
+					<view class="filterItemContent">
+						<view class="itemTitle">
+							备注
+						</view>
+						<u-input v-model="remark" placeholder="请输入您的留言" type="textarea"  :auto-height="true" />
+					</view>
+					
+				</view>
+				<view class="submit">
+					确定
+				</view>
+			</view>
+		</u-popup>
+		<afterSale ref='afterSales'></afterSale>
+	</view>
+</template>
+
+<script>
+import afterSale from './components/afterSales.vue'
+	import * as newFunApi from '@/api/newFun'
+	import * as Api from '@/api/dealer/order'
+export default {
+    components:{afterSale},
+	data(){
+		return{
+			classifyShow: 'all',
+			classList: [
+				{
+					id: 'all',
+					name: '全部',
+				},{
+					id: 'delivery',
+					name: '待发货',
+				},{
+					id: 'receipt',
+					name: '待验收',
+				},{
+					id: 'pay',
+					name: '待付款',
+				},{
+					id: 'complete',
+					name: '已完成',
+				},{
+					id: 'refund',
+					name: '售后订单',
+				},{
+					id: 'apply_cancel',
+					name: '待取消',
+				},{
+					id: 'cancel',
+					name: '已取消',
+				},
+				
+			],
+			goodsList:[
+				
+			],
+			show:false,
+			timeShow:false,
+			selectList:[
+				{id:1,name:'预售'},
+				{id:2,name:'秒杀'},
+				{id:3,name:'拼团'},
+				{id:4,name:'砍价'},
+			],
+			payList:[
+				{id:1,name:'微信支付'},
+				{id:2,name:'好友代付'},
+				{id:3,name:'线下支付'},
+			],
+			sourceIndex:0,
+			payIndex:0,
+			startTime:null,
+			endTime:null,
+			pageNum:1,
+			keyword: "",
+			total: 1,
+			pageNum: 1,
+			// classList: [
+			// 	{
+			// 		id: 0,
+			// 		name: '全部',
+			// 	},{
+			// 		id: 1,
+			// 		name: '待付款',
+			// 	},{
+			// 		id: 2,
+			// 		name: '待发货',
+			// 	},{
+			// 		id: 3,
+			// 		name: '售后订单',
+			// 	},{
+			// 		id: 4,
+			// 		name: '已退款',
+			// 	},{
+			// 		id: 5,
+			// 		name: '已完成',
+			// 	},{
+			// 		id: 6,
+			// 		name: '已删除',
+			// 	},
+			// 	{
+			// 		id: 7,
+			// 		name: '待收货',
+			// 	}
+			// ],
+			
+		}
+	},
+	onReady() {
+		this.getList()
+		
+	},
+	onLoad() {
+
+	},
+	onPageScroll(e){
+		
+	},
+	
+	methods:{
+		// 获取当前标签项的值
+		// getTabValue() {
+		//   const app = this
+		//   if (app.classList.length) {
+		//     return app.classList[app.curTab].id
+		//   }
+		//   return -1
+		// },
+		// 获取提现列表
+		async getList() {
+			uni.showLoading({
+				title:"加载中"
+			})
+		  const app = this
+		  return new Promise((resolve, reject) => {
+		    Api.list({ dataType: app.classifyShow, page: app.pageNum })
+		      .then(result => {console.log(result);
+		        // 合并新数据
+		        // const newList = result.data.list
+		        // app.list.data = getMoreListData(newList, app.list, pageNo)
+				uni.hideLoading();
+				app.goodsList = app.goodsList.concat(result.data.list.data)
+				app.total = result.data.list.total
+		        resolve(app.goodsList)
+		      })
+		  })
+		},
+		// async getList() {
+		// 	uni.showLoading({
+		// 		title:"加载中"
+		// 	})
+		// 	let {status, message, data} = await newFunApi.shopOrderList({
+		// 		dataType: this.classifyShow, 
+		// 		page: this.pageNum,
+		// 		searchValue: this.keyword
+		// 	});
+		// 	if(status == 200){
+		// 		uni.hideLoading();
+		// 		this.goodsList = this.goodsList.concat(data.list.data)
+		// 		this.total = data.list.total
+		// 	}
+		// },
+		
+		goJump(path,value){
+			uni.navigateTo({
+				url: path+'?item='+JSON.stringify(value),
+			})
+		},
+		getListAfter(){
+			this.goodsList = [];
+			this.getList()
+		},
+		getLable(val){
+			// let arr = this.classList.filter(item=>{
+			// 	return val==item.id
+			// })
+			// return arr[0].name
+		},
+		onSearch(){
+			uni.navigateTo({url:''})
+		},
+		onClassify(item,index){
+			this.classifyShow = item.id;
+			this.getListAfter()
+		},
+		setResourceIndex(index){
+			this.sourceIndex = index;
+		},
+		setpayIndex(index){
+			this.payIndex = index;
+		},
+		getTime(val){
+			console.log("ooo")
+			this.timeShow = true;
+		},
+		getFilterHandle(){
+			console.log("uu")
+			this.$refs.afterSales.afterSale = true;
+		}
+		
+	},
+	onReachBottom() {
+		if(this.goodsList.length <= this.total){
+			this.pageNum ++;
+			this.getList();
+		}
+	},
+};
+</script>
+
+<style scoped lang="scss">
+page{
+	background-color: #F7F8FA;
+	min-height:100%;
+}
+.head-info{
+	padding:22upx 20upx;
+	.searchContent{
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		position: relative;
+		::v-deep .uni-input-placeholder{
+			margin-left:90upx;
+			z-index:10;
+		}
+		.search{
+			position: absolute;
+			top:20upx;
+			left:26upx;
+			z-index:9;
+		}
+		::v-deep .u-input{
+			flex:1;
+			margin-right:28upx;
+		}
+		::v-deep .uni-input-input{
+			
+			background: #FFFFFF;
+			border-radius: 30px 30px 30px 30px;
+			opacity: 1;
+			padding-left:80upx;
+			width:calc(100% - 80upx);
+			
+		}
+		.filter{
+			display: flex;
+			width: 100upx;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+			image{
+				width:34upx;
+				height:auto;
+			}
+			text{
+				font-size: 24upx;
+				font-family: PingFang SC, PingFang SC;
+				font-weight: 400;
+				color: #616161;
+				
+			}
+		}
+	}
+}
+.container{
+	background-color: #fff;
+}
+.classify-list{
+	white-space:nowrap;
+	width: 100%;
+	height: 100rpx;
+	overflow-x: auto;
+	overflow-y: hidden;
+	.list{
+		position: relative;
+		display:inline-block;
+		width: 18%;
+		height: 100%;
+		line-height: 100rpx;
+		text-align: center;
+		text{
+			font-size: 28rpx;
+			color: #3B3B3B;
+			
+		}
+		.line{
+			position: absolute;
+			left: 50%;
+			bottom: 10rpx;
+			// width: 60%;
+			// height: 8rpx;
+			background: linear-gradient(to right,#f8f893,#fe9d00);
+			// border-radius: 10rpx;
+			transform: translate(-50%,0);
+			
+			width: 60upx;
+			height: 8upx;
+			background: #FF6257;
+			border-radius: 29px 29px 29px 29px;
+			opacity: 1;
+		}
+	}
+	.action{
+		text{
+			font-size: 32rpx;
+			opacity: 1;
+		}
+	}
+}
+.shopContent{
+	
+	
+	.shopItem{
+		margin-bottom:14upx;
+		padding:36upx;
+		background-color: #fff;
+		.orderInfo{
+			display: flex;
+			align-items: center;
+			justify-content:space-between;
+			text{
+				font-size: 28upx;
+				color: #707070;
+				
+			}
+		}
+		.shopItemInfo{
+			display: flex;
+			margin-top:40upx;
+			image{
+				width:180upx;
+				height:180upx;
+				flex-shrink: 0;
+			}
+			.priceCon{
+				flex:1;
+				display: flex;
+				align-items: flex-end;
+				justify-content: space-between;
+				margin-left:40upx;
+				.num{
+					font-size: 28upx;
+					font-family: PingFang SC, PingFang SC;
+					font-weight: 500;
+					color: #1E1E1E;
+					
+				}
+				.priceText{
+					display: flex;
+					align-items: center;
+					text{
+						font-size: 32upx;
+						font-family: PingFang SC, PingFang SC;
+						font-weight: 500;
+						color: #F21A1C;
+						font-weight: bold;
+					}
+					
+				}
+			}
+		}
+		.totalNum{
+			text-align: right;
+			margin-top:70upx;
+			text:first-child{
+				font-size: 24upx;
+				font-family: PingFang SC, PingFang SC;
+				font-weight: 500;
+				color: #B7B7B7;
+				
+			}
+			text:nth-child(2){
+				font-size: 32upx;
+				font-family: PingFang SC, PingFang SC;
+				font-weight: 500;
+				color: #3B3B3B;
+				margin:0 10upx;
+				
+			}
+			text:nth-child(3){
+				font-size: 32upx;
+				font-family: PingFang SC, PingFang SC;
+				font-weight: 600;
+				color: #F21A1C;
+			
+			}
+		}
+		.remark{
+			background: #F8F8F8;
+			border-radius: 0px 0px 0px 0px;
+			opacity: 1;
+			padding:20upx;
+			margin-top:20upx;
+			.remarkTitle{
+				font-size: 28upx;
+				font-family: PingFang SC, PingFang SC;
+				font-weight: 500;
+				color: #3B3B3B;
+				
+			}
+			.remarkContent{
+				font-size: 28upx;
+				font-family: PingFang SC, PingFang SC;
+				font-weight: 500;
+				color: #939393;
+				margin-top:8upx;
+			}
+		}
+		.btnGroup{
+			display: flex;
+			margin-top:28upx;
+			flex-wrap: wrap;
+			justify-content: flex-end;
+			.btn{
+				width: 180upx;
+				height: 56upx;
+				background: #FFFFFF;
+				border-radius: 50px 50px 50px 50px;
+				opacity: 1;
+				font-size: 14px;
+				line-height: 56upx;
+				text-align: center;
+				margin-left:12upx;
+			}
+			.info{
+				border: 1px solid #9F9F9F;
+				color: #8B8B8B;
+				
+			}
+			.primary{
+				border: 1px solid #F63116;
+				color: #F83F11;
+				
+			}
+		}
+	}
+}
+.filterContent{
+	padding:32upx;
+	.filterTitle{
+		font-size: 32upx;
+		font-family: PingFang SC, PingFang SC;
+		font-weight: 500;
+		color: #303030;
+		text-align: center;
+	}
+	.filterItem{
+		.filterItemContent{
+			margin-top:40upx;
+			.itemTitle{
+				
+				font-size: 28upx;
+				font-family: PingFang SC, PingFang SC;
+				font-weight: 500;
+				color: #303030;
+				margin-bottom:20upx;
+				
+			}
+			.timeContainer{
+				display: flex;
+				align-items: center;
+				::v-deep .uni-input-wrapper{
+					background: #F3F3F3;
+					border-radius: 22px 22px 22px 22px;
+					opacity: 1;
+					text-align: center;
+				}
+				::v-deep .u-input__right-icon{
+					display: none;
+				}
+				text{
+					margin:16upx;
+				}
+			}
+			.selectContainer{
+				display: flex;
+				.selectItem{
+					flex:1;
+					margin:0 10upx;
+					height: 70upx;
+					line-height: 66upx;
+					text-align: center;
+					background: #F3F3F3;
+					border-radius: 22px 22px 22px 22px;
+					opacity: 1;
+				
+					font-size: 28upx;
+					font-family: PingFang SC, PingFang SC;
+					font-weight: 500;
+					color: #A1A1A1;
+				
+				}
+				.active{
+					border: 1px solid #F83F11;
+					color:#F21A1C;
+					background-color: #fff;
+				}
+			}
+		}
+	}
+	.btnGroup{
+		display: flex;
+		justify-content: center;
+		margin-top:100upx;
+		padding-bottom:60upx;
+		.resetBtn{
+			width: 216upx;
+			height: 70upx;
+			line-height: 66upx;
+			background: #DBDBDB;
+			border-radius: 22px 22px 22px 22px;
+			opacity: 1;
+		
+			font-size: 28upx;
+			font-family: PingFang SC, PingFang SC;
+			font-weight: 500;
+			color: #585858;
+			text-align: center;
+			
+		}
+		.confrim{
+			width: 216upx;
+			height: 70upx;
+			text-align: center;
+			background: linear-gradient(180deg, #FD5D06 0%, #F3211A 100%);
+			border-radius: 50px 50px 50px 50px;
+			opacity: 1;
+			line-height: 66upx;
+			font-size: 28upx;
+			font-family: PingFang SC, PingFang SC;
+			font-weight: 500;
+			color: #FFFFFF;
+			margin-left:24upx;
+			
+		}
+	}
+}
+</style>
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 600959f..cad8dac 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -238,7 +238,8 @@
 			<view class="goodsManage" v-if="userInfo.user_type == 30">
 				<view class="manageTitle">
 					<text lines="1" class="text_5 titleLeft">分销订单</text>
-					<text lines="1" class="text_6 titleRight" @click="goJump('/pages/news3/fenxiao')">查看全部</text>
+					<!-- <text lines="1" class="text_6 titleRight" @click="goJump('/pages/news3/fenxiao')">查看全部</text> -->
+					<text lines="1" class="text_6 titleRight" @click="goJump('/pages/news3/shopDealerOrder')">查看全部</text>
 					<u-icon @click="goJump('/pages/news3/fenxiao')" style="margin-left: 5rpx; color: #909090; margin-top: -5rpx;" name="arrow-right"></u-icon>
 				</view>
 				<view class="grounding goodsOrder">