页面优化

pages/market/one/leader/noPayOrder.vue

@@ -14,18 +14,14 @@
 						<text class="icon">&#xe830;</text>
 						<text>未申报</text>
 					</view>
-					<view class="state" v-else-if="item.finishStatus == 0 && item.Sxb010Status == 1">
+					<!-- <view class="state" v-else-if="item.finishStatus == 0 && item.Sxb010Status == 1">
 						<text class="icon" style="color: #13ce66">&#xe830;</text>
 						<text>扣款成功</text>
-					</view>
+					</view> -->
 					<view class="state" v-else-if="item.finishStatus == 0 && item.Sxb010Status == 2">
 						<text class="icon">&#xe830;</text>
 						<text>扣款失败</text>
 					</view>
-					<view class="state" v-else>
-						<text class="icon">&#xe830;</text>
-						<text>扣款中</text>
-					</view>
 				</view>
 				<view class="title">{{ item.phone }}</view>
 				<view>
@@ -40,7 +36,7 @@
 				<view class="clear"></view>
 				<view class="op">
 					<view class="date">{{ item.createTime }}</view>
-					<template v-if="item.phone">
+					<template v-if="item.phone && item.Sxb010Status != 1">
 						<!-- <view class="state" style="color: #3c9cff;" @click="callNumber(item.phone)">拨打电话</view> -->
 						<a :href="'tel:'+item.phone" class="an down_btn">拨打电话</a>
 					</template>
@@ -58,7 +54,8 @@
 		data() {
 			return {
 				user: {},
-				tab: [{
+				tab: [
+					/* {
 						name: '全部',
 						peopleConfirmStatus: '', //边民确认状态
 						cooperEntrustStatus: '', //互助委托申报确认状态
@@ -67,7 +64,7 @@
 						upStatus: '', 	  //订单上架状态
 						resaleStatus: '', //订单转售状态
 						Sxb010Status: '', //扣款回执状态
-					},
+					}, */
 					{
 						name: '未支付',
 						peopleConfirmStatus: 0,
@@ -80,20 +77,21 @@
 						finishStatus: 0,
 					},
 					{
-						name: '扣款成功',
-						Sxb010Status: 1,
+						name: '扣款失败',
+						Sxb010Status: 2,
 						finishStatus: 0,
 					},
 					{
-						name: '扣款失败',
-						Sxb010Status: 2,
+						name: '扣款成功',
+						Sxb010Status: 1,
 						finishStatus: 0,
-					}
+					},
 				],
 				param: {
 					pageNo: 1,
 					pageSize: 10,
-					finishStatus: 0
+					finishStatus: 0,
+					peopleConfirmStatus: 0,
 				},
 				list: [],
 				loadMore: true,

pages/market/one/leader/noUpOrder.vue

@@ -54,7 +54,8 @@
 	export default {
 		data() {
 			return {
-				tab: [{
+				tab: [
+					/* {
 						name: '全部',
 						peopleConfirmStatus: '', //边民确认状态
 						cooperEntrustStatus: '', //互助委托申报确认状态
@@ -63,7 +64,7 @@
 						upStatus: '', 	  //订单上架状态(1=未上架，2=上架,3=已下架）
 						resaleStatus: '', //订单转售状态
 						Sxb010Status: '', //扣款回执状态
-					},
+					}, */
 					{
 						name: '未上架',
 						finishStatus: 1,
@@ -84,7 +85,8 @@
 				param: {
 					pageNo: 1,
 					pageSize: 10,
-					finishStatus: 1
+					finishStatus: 1,
+					upStatus: 1,
 				},
 				list: [],
 				loadMore: true,

pages/market/one/leader/order.vue

@@ -30,14 +30,14 @@
 					</view> -->
 				</view>
 
-				<image src="../../../../static/news.jpg" mode="aspectFill" class="pic"></image>
+				<!-- <image src="../../../../static/news.jpg" mode="aspectFill" class="pic"></image> -->
 				<view class="con">
 					<view class="productName omit">{{ item.goodsNames }}</view>
 					<view class="desc omit">
 						<text>重量 {{ item.totalWeight }}{{ item.goodsUnit }}</text>
 						<text>{{ item.tradeAreaName }}</text>
 					</view>
-					<view class="price">¥ {{ item.totalPrice }}</view>
+					<view class="price">申报金额 ¥ {{ item.totalPrice }}</view>
 				</view>
 				<view class="clear"></view>
 				<view class="op">

pages/market/order/order.vue

@@ -27,7 +27,10 @@
 						<text>重量 {{ item.totalWeight }}{{ item.goodsUnit }}</text>
 						<text>{{ item.veNo }}</text>
 					</view>
-					<view class="price">¥ {{ item.totalPrice }}</view>
+					<view class="price">
+						<span>申报金额 ¥ {{ item.totalPrice }}</span>
+						<span v-if="item.upPrice&&item.upStatus==2" style="margin-left: 16px;">上架金额 ¥ {{ item.upPrice }}</span>
+					</view>
 				</view>
 				<view class="clear"></view>
 				<view class="op">

pages/market/two/detail.vue

@@ -1,30 +1,50 @@
 <template>
 	<view>
 		<view class="product_detail">
-			<image src="../../../static/news.jpg" mode="widthFix" class="pic"></image>
+			<!-- <image src="../../../static/news.jpg" mode="widthFix" class="pic"></image> -->
 			<view class="box">
 				<view class="title">{{ item.goodsName }}</view>
 				<view class="clear"></view>
 				<u-divider text="规格参数"></u-divider>
 				<view class="item">
-					<text class="desc">商品价格：</text>
-					<text>{{ item.resalePrice }}</text>
+					<text class="desc">上架金额：</text>
+					<text>￥ {{ item.resalePrice }}</text>
 					<view class="clear"></view>
 				</view>
 				<view class="item">
+					<text class="desc">计价单位</text>
+					<text>{{ item.goodsUnit }}</text>
+				</view>
+				<view class="item">
+					<text class="desc">商品重量</text>
+					<text>{{ item.netWet }}</text>
+				</view>
+				<view class="item">
+					<text class="desc">单价</text>
+					<text>{{ item.singlePrice }}</text>
+				</view>
+				<view class="item">
 					<text class="desc">车牌号：</text>
 					<text>{{ item.veNo }}</text>
 					<view class="clear"></view>
 				</view>
 				<view class="item">
 					<text class="desc">发布商：</text>
-					<text>{{ item.createName }}</text>
+					<text>{{ item.leaderName }}</text>
+				</view>
+				<view class="item">
+					<text class="desc">联系号码</text>
+					<text>{{item.leaderPhone}}</text>
 				</view>
 				<view class="item">
 					<text class="desc">互市区：</text>
 					<text>{{ item.tradeAreaName }}</text>
 					<view class="clear"></view>
 				</view>
+				<view class="item" style="padding-top: 0px">
+					<text class="desc">订单编号</text>
+					<text>{{ item.orderNo }}</text>
+				</view>
 				<view class="item">
 					<text class="desc">发布时间：</text>
 					<text>{{ item.createTime }}</text>

pages/market/two/leader/detail.vue

@@ -11,34 +11,34 @@
 					<text class="desc">{{ item.goodsName }}</text>
 				</view>
 				<view class="item">
-					<text class="label">价格</text>
+					<text class="label">上架金额</text>
 					<text class="desc omit">{{ item.resalePrice}}元</text>
 				</view>
 				<view class="item">
+					<text class="label">单价</text>
+					<text class="desc">{{ item.singlePrice }}</text>
+				</view>
+				<view class="item">
+					<text class="label">计价单位</text>
+					<text class="desc">{{ item.goodsUnit }}</text>
+				</view>
+				<view class="item">
+					<text class="label">商品重量</text>
+					<text class="desc">{{ item.netWet }}</text>
+				</view>
+				<view class="item" v-if="item.purchaserName">
 					<text class="label">收购商</text>
 					<text class="desc">{{ item.purchaserName }}</text>
 				</view>
+				<view class="item">
+					<text class="label">车牌</text>
+					<text class="desc">{{ item.veNo }}</text>
+				</view>
 				<view class="item" v-if="item.createTime">
-					<text class="label">转售时间</text>
+					<text class="label">上架时间</text>
 					<text class="desc">{{ item.createTime }}</text>
 				</view>
 			</view>
-			<!-- <u-divider text="费项明细"></u-divider>
-			<view class="box">
-				<u-collapse v-for="(fee,index) in feeItemList" :key="index">
-					<u-collapse-item :title="fee.name" class="cell_title" >
-						<view class="itm">1、收费企业：{{ fee.companyName }}</view>
-						<view class="itm" v-if="fee.feeType ==1">2、收费类型：按交易额收取</view>
-						<view class="itm" v-if="fee.feeType ==2">2、收费类型：按次收取</view>
-						<view class="itm" v-if="fee.feeType ==1">3、收费%(按交易额)：<span style="color: coral;">{{ fee.percent }} %</span></view>
-						<view class="itm" v-if="fee.feeType ==1">4、当前订单收取金额：<span style="color: coral;">{{ (fee.percent * item.resalePrice)/100}} 元</span></view>
-						<view class="itm" v-if="fee.feeType ==2">3、收费金额(按次收)：<span style="color: coral;">{{ fee.feeMoney }} 元</span></view>
-						<view class="itm" v-if="fee.feeType ==2">4、当前订单收取金额：<span style="color: coral;">{{ fee.feeMoney }} 元</span></view>
-						</br>
-						<view class="itm">当前费项收取金额以最后结算时为准</view>
-					</u-collapse-item>
-				</u-collapse>
-			</view> -->
 		</view>
 	</view>
 </template>
@@ -48,7 +48,6 @@ export default {
 	data() {
 		return {
 			item: {},
-			feeItemList: []
 		};
 	},
 	onLoad(e) {
@@ -62,19 +61,9 @@ export default {
 				}
 			});
 		}
-		this.getFeeItem();
 	},
 	methods: {
-		//费项明细
-		getFeeItem(){
-			this.http.request({
-				url: '/level-two-server/app/TbFeeItem/getList',
-				success: res => {
-					this.feeItemList = res.data.data
-					console.log("feeItemList",this.feeItemList)
-				}
-			});
-		},
+		
 	}
 };
 </script>

pages/market/two/leader/order.vue

@@ -1,8 +1,8 @@
 <template>
 	<view>
-		<!--<view class="tab">
+		<view class="tab">
 			<u-tabs :list="tab" @click="click" :lineHeight="5"></u-tabs>
-		</view>-->
+		</view>
 		<view class="goodsList">
 			<view class="item" v-for="(item, index) in list" :key="index" @click="detail(item)">
 				<view class="title" style="width: 97%;font-size: 17px;">
@@ -12,20 +12,18 @@
 						<view class="state" v-if="item.purchaserId === null || item.purchaserId === '' || item.purchaserId === undefined"><text class="icon">&#xe830;</text>待下单</view>
 						<view class="state" v-else><text class="icon" style="color: #13ce66">&#xe830;</text>已下单</view>
 					</span>
-					<span class="state" style="color: #4581fb" v-if="item.isPay == 1 && item.payTax == 0">已支付</span>
-					<span class="state" style="color: #13ce66" v-if="item.payTax == 1 && item.orderFinish == 1">已完成</span>
 				</view>
 				<view class="con">
 					<view class="productName omit">{{ item.goodsName }}</view>
 					<view class="desc omit">
 						<text>{{ item.tradeAreaName }}</text>
 					</view>
-					<view class="price">¥ {{ item.resalePrice }}</view>
+					<view class="price">上架金额 ¥ {{ item.resalePrice }}</view>
 				</view>
 				<view class="clear"></view>
 				<view class="op">
 					<view class="date">{{ item.createTime }}</view>
-					<view class="an" style="color: #4581fb" @click.stop="payTax(item)" v-if="item.isPay == 1 && item.payTax == 0">去缴费税</view>
+					<!-- <view class="an" style="color: #4581fb" @click.stop="payTax(item)" v-if="item.isPay == 1 && item.payTax == 0">去缴费税</view> -->
 				</view>
 			</view>
 			<view class="loading" v-if="loadMore"><u-loadmore :status="loadMore ? 'loading' : 'nomore'" /></view>
@@ -39,12 +37,14 @@ export default {
 	data() {
 		return {
 			tab: [
-				{ name: '全部', isPay: '', payTax: '', orderFinish: ''},
-				{ name: '已支付', isPay: 1, payTax: 0, orderFinish: 0},
-				{ name: '已完成', isPay: 1, payTax: 1, orderFinish: 1}
+				{ name: '全部'},
+				{ name: '待下单'},
+				{ name: '已下单'},
 			],
 			param: { pageNo: 1, pageSize: 10 },
 			list: [],
+			isOrderList: [],
+			noOrderList: [],
 			loadMore: true
 		};
 	},
@@ -55,7 +55,7 @@ export default {
 		});
 	},
 	methods: {
-		getData() {
+		getData(e) {
 			this.http.request({
 				url: '/level-two-server/app/TbOrders/getLeaderOrderList',
 				loading: 'false',
@@ -63,16 +63,21 @@ export default {
 				success: res => {
 					this.loadMore = parseInt(res.data.pageCount) > this.param.pageNo;
 					this.list.push(...res.data.data);
-					console.log("purchaserId="+this.list[0].purchaserId)
+					this.noOrderList = this.list.filter(item => item.purchaserId === null || item.purchaserId === '' || item.purchaserId === undefined);
+					this.isOrderList = this.list.filter(item => !this.noOrderList.includes(item));
+
+					if(e != undefined && e.name == '待下单') {
+						this.list = this.noOrderList;
+					}
+					if(e != undefined && e.name == '已下单') {
+						this.list = this.isOrderList;
+					}
 				}
 			});
 		},
 		//点击tab切换
 		click(e) {
-			this.param.isPay = e.isPay;
-			this.param.payTax = e.payTax;
-			this.param.orderFinish = e.orderFinish;
-			this.refresh();
+			this.refresh(e);
 		},
 		payTax(item) {
 			uni.navigateTo({ url: '/pages/market/two/leader/feeDetail?resalePrice=' + item.resalePrice +'&id=' + item.id});
@@ -81,11 +86,13 @@ export default {
 			uni.navigateTo({ url: '/pages/market/two/leader/detail?id=' + item.id });
 		},
 		//刷新数据
-		refresh() {
+		refresh(e) {
 			this.loadMore = true;
 			this.param.pageNo = 1;
 			this.list = [];
-			this.getData();
+			this.noOrderList = [];
+			this.isOrderList = [];
+			this.getData(e);
 		}
 	},
 	//下拉刷新

pages/market/two/leader/resale.vue

@@ -27,7 +27,7 @@
 					<text class="desc">{{ item.goodsUnit }}</text>
 				</view>
 				<view class="item">
-					<text class="label">订单金额</text>
+					<text class="label">申报金额</text>
 					<text class="desc">¥ {{ item.totalPrice }}</text>
 				</view>
 				<view class="item">

pages/market/two/list.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="search">
-			<u-search placeholder="搜索商品或车牌号" v-model="param.goodsName" bgColor="white" @search="refresh()" :animation="true" actionText="取消" @clear="refresh()"></u-search>
+			<u-search placeholder="搜索商品名或车牌号" v-model="param.goodsName" bgColor="white" @search="refresh()" :animation="true" actionText="取消" @clear="refresh()"></u-search>
 			<view class="clear"></view>
 		</view>
 		<view class="goodsList">
@@ -17,17 +17,26 @@
 				</view>
 			</view>
 			<view class="item" v-for="(item, index) in list" :key="index" @click="detail(item)">
-				<view class="title">{{ item.LeaderName }}</view>
+				<view class="title">{{ item.leaderName }}</view>
 				<view class="check" @click.stop="selected(item)" v-if="user.userType == 3">
 					<text class="check icon" v-if="item.check" style="color: #4581fb">&#xe631;</text>
 					<text class="check icon" v-else>&#xe60c;</text>
 				</view>
 				<view class="con">
 					<view class="productName omit">{{ item.goodsName }}</view>
-					<view class="price">¥ {{ item.resalePrice }}</view>
-					<view class="desc">车牌号：{{ item.veNo }}</view>
-					<view class="icon btn" v-if="user.userType == 3" @click.stop="addCar(item)">&#xe600;</view>
-					<view class="btn" v-if="user.userType == 3" @click.stop="buy(item)">购买</view>
+					<view class="desc">车牌号 {{ item.veNo }}</view>
+					<view class="desc omit">
+						<text>重量 {{ item.totalWeight }}{{ item.goodsUnit }}</text>
+						<text>{{ item.tradeAreaName }}</text>
+					</view>
+					<view class="price">上架金额 ¥ {{ item.resalePrice }}</view>
+					<view class="op">
+						<view class="date">{{ item.createTime }}</view>
+						<template>
+							<view class="icon btn" v-if="user.userType == 3" @click.stop="addCar(item)">&#xe600;</view>
+							<view class="btn"      v-if="user.userType == 3" @click.stop="buy(item)">购买</view>
+						</template>
+					</view>
 				</view>
 			</view>
 			<view class="loading" v-if="loadMore"><u-loadmore :status="loadMore ? 'loading' : 'nomore'" /></view>
@@ -60,7 +69,7 @@ export default {
 			sort: [
 				{ name: '综合', sortName: 'id', isAsc: 'desc', check: false },
 				{ name: '日期', sortName: 'create_time', isAsc: 'desc', check: false },
-				{ name: '数量', sortName: 'goods_quantity', isAsc: 'desc', check: false }
+				{ name: '金额', sortName: 'resale_price', isAsc: 'desc', check: false }
 			],
 			list: [],
 			param: { pageNo: 1, pageSize: 10 },
@@ -68,9 +77,6 @@ export default {
 			selects: []
 		};
 	},
-	/* onShow(){
-		this.refresh();
-	}, */
 	onLoad(e) {
 		this.getData();
 		//选择商品分类
@@ -174,11 +180,13 @@ export default {
 page {
 	background-color: $pg;
 }
+.goodsList .item .con {
+    width: 98%;
+}
 .con {
 	.btn {
 		float: right;
 		background-color: $main-color;
-		color: #000;
 		height: 20px;
 		position: relative;
 		color: white;
@@ -186,7 +194,6 @@ page {
 		margin-left: 10px;
 	}
 	.icon {
-		line-height: 30px;
 		line-height: 20px;
 	}
 }