新增二级市场收购商支付和边民缴各项费用

pages/market/two/leader/order.vue

@@ -6,7 +6,9 @@
 		<view class="goodsList">
 			<view class="item" v-for="(item, index) in list" :key="index" @click="detail(item)">
 				<view class="title">{{ item.createName }}</view>
-				<view class="state" style="color: #4581fb" v-if="item.orderFinish == 0">已确认</view>
+				<view class="state" style="color: red" v-if="item.isPay == 0">待下单</view>
+				<view class="state" style="color: #4581fb" v-if="item.isPay == 1 && item.payTax == 0">已支付</view>
+				<view class="state" style="color: #13ce66" v-if="item.payTax == 1 && item.orderFinish == 1">已完成</view>
 				<image src="../../../../static/news.jpg" mode="aspectFill" class="pic"></image>
 				<view class="con">
 					<view class="productName omit">{{ item.goodsName }}</view>
@@ -14,12 +16,12 @@
 						<text>数量：{{ item.goodsQuantity }}</text>
 						<text>{{ item.tradeAreaName }}</text>
 					</view>
-					<view class="price">¥ {{ item.quotation }}</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">查看物流</view>
+					<view class="an" style="color: #4581fb" @click.stop="payTax(item.id)" v-if="item.isPay == 1 && item.payTax == 0">去缴费税</view>
 				</view>
 			</view>
 			<view class="loading" v-if="loadMore"><u-loadmore :status="loadMore ? 'loading' : 'nomore'" /></view>
@@ -65,16 +67,16 @@ export default {
 			this.param.goodsStatus = e.goodsStatus;
 			this.refresh();
 		},
-		del(id) {
+		payTax(id) {
 			uni.showModal({
 				title: '提示',
-				content: '确定删除?',
+				content: '确定缴费?',
 				success: res => {
 					if (res.confirm) {
 						this.http.request({
-							url: '/level-one-server/app/TbGoodsTransit/deleteById?id=' + id,
+							url: '/level-two-server/app/TbOrders/payTax?id=' + id,
 							success: res => {
-								uni.showToast({ title: '删除成功' });
+								uni.showToast({ title: '缴费成功' });
 								this.refresh();
 							}
 						});

pages/market/two/purchaser/order/list.vue

@@ -6,28 +6,28 @@
 		<view class="goodsList">
 			<view class="item" v-for="(item, index) in list" :key="index" @click="detail(item)">
 				<view class="title">{{ item.purchaserName }}</view>
-				<view class="state" v-if="item.isDelivery == 1">
+				<view class="state" v-if="item.isPay == 1 && item.payTax == 0">
+					<text class="icon" style="color: #4581fb">&#xe830;</text>
+					<text>已支付</text>
+				</view>
+				<view class="state" v-if="item.orderFinish == 1">
 					<text class="icon" style="color: #13ce66">&#xe830;</text>
 					<text>已完成</text>
 				</view>
-				<view class="state" v-else>
-					<text class="icon" style="color: #f44336">&#xe622;</text>
-					<text>待收货</text>
-				</view>
 				<image src="../../../../../static/news.jpg" mode="aspectFill" class="pic"></image>
 				<view class="con">
 					<view class="productName omit">{{ item.goodsName }}</view>
 					<view class="desc omit">
-						<text>{{ item.goodsQuantity }}  {{ item.goodsUnit }}</text>
+						<text>{{ item.goodsQuantity }} {{ item.goodsUnit }}</text>
 						<text>{{ item.tradeAreaName }}</text>
 					</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: #f44336" v-if="item.isDelivery == 0" @click.stop="toDelivery(item.id)">确认收货</view>
-					<view class="an" style="color: #4581fb">物流详情</view>
+					<view class="date">{{ item.createTime }}</view>
+					<!-- 					<view class="an" style="color: #f44336" v-if="item.isDelivery == 0" @click.stop="toDelivery(item.id)">确认收货</view>
+					<view class="an" style="color: #4581fb">物流详情</view> -->
 				</view>
 			</view>
 			<view class="loading" v-if="loadMore"><u-loadmore :status="loadMore ? 'loading' : 'nomore'" /></view>
@@ -41,9 +41,9 @@ export default {
 	data() {
 		return {
 			tab: [
-				{ name: '全部', 	 orderFinish: '' ,isDelivery: ''},
-				{ name: '待收货', orderFinish: 0 ,isDelivery: 0},
-				{ name: '已完成', orderFinish: 1 ,isDelivery: 1}
+				{ name: '全部', orderFinish: '', isDelivery: '' },
+				{ name: '待收货', orderFinish: 0, isDelivery: 0 },
+				{ name: '已完成', orderFinish: 1, isDelivery: 1 }
 			],
 			param: { pageNo: 1, pageSize: 10 },
 			list: [],
@@ -78,7 +78,7 @@ export default {
 			this.http.request({
 				url: '/level-two-server/app/TbOrders/toDelivery',
 				loading: 'false',
-				data: {id: id,orderFinish: 1,isDelivery: 1},
+				data: { id: id, orderFinish: 1, isDelivery: 1 },
 				success: res => {
 					this.refresh();
 				}