一级市场与二级市场订单详情修改

pages.json

@@ -432,6 +432,14 @@
 
 		},
 		{
+			"path": "pages/market/two/leader/feeDetail",
+			"style": {
+				"navigationBarTitleText": "缴税费",
+				"enablePullDownRefresh": false
+			}
+
+		},
+		{
 			"path": "pages/market/two/purchaser/buy/buy",
 			"style": {
 				"navigationBarTitleText": "收购商购买",
@@ -464,21 +472,21 @@
 		}
 	    ,{
             "path" : "pages/market/one/confirm/people",
-            "style" :                                                                                    
+            "style" :
             {
                 "navigationBarTitleText": "边民确认",
                 "enablePullDownRefresh": false
             }
-            
+
         }
         ,{
             "path" : "pages/market/one/confirm/apply",
-            "style" :                                                                                    
+            "style" :
             {
                 "navigationBarTitleText": "申报确认",
                 "enablePullDownRefresh": false
             }
-            
+
         }
     ],
 	"tabBar": {
@@ -511,4 +519,4 @@
 		"navigationBarTitleText": "边民互市贸易",
 		"navigationBarBackgroundColor": "#4581fb"
 	}
-}
+}

pages/market/one/leader/detail.vue

@@ -5,9 +5,9 @@
 				<u-divider text="订单信息"></u-divider>
 				<view class="item" style="padding-top: 0px">
 					<text class="label">订单编号</text>
-					<text class="desc">{{param.orderId}}</text>
+					<text class="desc">{{item.tradeNo}}</text>
 				</view>
-			<!-- 	<view class="item">
+				<!-- <view class="item">
 					<text class="label">申报单号</text>
 					<text class="desc">13454334567</text>
 				</view> -->
@@ -39,10 +39,10 @@
 					<text class="label">价格</text>
 					<text class="desc">{{item.totalPrice}}</text>
 				</view>
-				<view class="item">
+				<!-- <view class="item">
 					<text class="label">边民</text>
 					<text class="desc" style="color: blue;" @click="members(item.orderId)">查看</text>
-				</view>
+				</view> -->
 				<view class="item">
 					<text class="label">发布时间</text>
 					<text class="desc">{{item.goodsTransitCreateTime}}</text>
@@ -88,25 +88,15 @@ export default {
 		if (e.id) {
 			this.param.orderId = e.id
 			this.http.request({
-				url: '/level-one-server/app/TbOrder/getById?id=' + e.id,
-				success: res => {
-					// this.item = res.data.data;
-					console.log('asd:' + JSON.stringify(res));
-				}
-			});
-		}
-		this.orderDetail()
-	},
-	methods: {
-		orderDetail() {
-			this.http.request({
 				url: '/level-one-server/app/TbOrder/orderDetail',
 				data: this.param,
 				success: res => {
 					this.item = res.data.data;
 				}
 			});
-		},
+		}
+	},
+	methods: {
 		//查看边民
 		members(id) {
 			uni.navigateTo({

pages/market/one/merchant/order/detail.vue

@@ -2,68 +2,72 @@
 	<view>
 		<view class="cmain">
 			<view class="box order_detail" style="margin-top: 0px">
-				<u-divider text="订单信息"></u-divider>
-				<view class="item" style="padding-top: 0px">
-					<text class="label">订单编号</text>
-					<text class="desc">13454334567</text>
+					<u-divider text="订单信息"></u-divider>
+					<view class="item" style="padding-top: 0px">
+						<text class="label">订单编号</text>
+						<text class="desc">{{item.tradeNo}}</text>
+					</view>
+					<!-- <view class="item">
+						<text class="label">申报单号</text>
+						<text class="desc">13454334567</text>
+					</view> -->
+					<view class="item">
+						<text class="label">商家名称</text>
+						<text class="desc">{{item.enterpriseName}}</text>
+					</view>
+					<view class="item">
+						<text class="label">联系号码</text>
+						<text class="desc">{{item.concat}}</text>
+					</view>
+					<view class="item">
+						<text class="label">商品名称</text>
+						<text class="desc">{{item.goodsTransitName}}</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.netWeight}}</text>
+					</view>
+					<view class="item">
+						<text class="label">毛重</text>
+						<text class="desc">{{item.grossWeight}}</text>
+					</view>
+					<view class="item">
+						<text class="label">价格</text>
+						<text class="desc">{{item.totalPrice}}</text>
+					</view>
+					<view class="item">
+						<text class="label">发布时间</text>
+						<text class="desc">{{item.goodsTransitCreateTime}}</text>
+					</view>
+					<view class="item">
+						<text class="label">下单时间</text>
+						<text class="desc">{{item.orderCreateTime}}</text>
+					</view>
+					<view class="item">
+						<text class="label">购买边民组</text>
+						<text class="desc">{{item.groupName}}</text>
+					</view>
+					<view class="item">
+						<text class="label">确认时间</text>
+						<text class="desc">{{item.enterpriseConfirmTime}}</text>
+					</view>
+					<view class="item">
+						<text class="label">进境时间</text>
+						<text class="desc">{{item.entrantTime}}</text>
+					</view>
+					<view class="item">
+						<text class="label">进口时间</text>
+						<text class="desc">{{item.importTime}}</text>
+					</view>
+					<view class="item">
+						<text class="label">出互市区时间</text>
+						<text class="desc">{{item.outFrontierTradeTime}}</text>
+					</view>
 				</view>
-				<view class="item">
-					<text class="label">申报单号</text>
-					<text class="desc">13454334567</text>
-				</view>
-				<view class="item">
-					<text class="label">商品名称</text>
-					<text class="desc">胡椒粉</text>
-				</view>
-				<view class="item">
-					<text class="label">计价单位</text>
-					<text class="desc">元/kg</text>
-				</view>
-				<view class="item">
-					<text class="label">净重</text>
-					<text class="desc">34吨</text>
-				</view>
-				<view class="item">
-					<text class="label">毛重</text>
-					<text class="desc">35吨</text>
-				</view>
-				<view class="item">
-					<text class="label">价格</text>
-					<text class="desc">400000元</text>
-				</view>
-				<view class="item">
-					<text class="label">来源国</text>
-					<text class="desc">越南</text>
-				</view>
-				<view class="item">
-					<text class="label">发布时间</text>
-					<text class="desc">2023-07-20 11:38</text>
-				</view>
-				<view class="item">
-					<text class="label">下单时间</text>
-					<text class="desc">2023-07-20 11:38</text>
-				</view>
-				<view class="item">
-					<text class="label">购买边民组</text>
-					<text class="desc">貔貅互助组</text>
-				</view>
-				<view class="item">
-					<text class="label">确认时间</text>
-					<text class="desc">2023-07-20 11:38</text>
-				</view>
-				<view class="item">
-					<text class="label">进境时间</text>
-					<text class="desc">2023-07-20 11:38</text>
-				</view>
-				<view class="item">
-					<text class="label">进口时间</text>
-					<text class="desc">2023-07-20 11:38</text>
-				</view>
-				<view class="item">
-					<text class="label">出互市区时间</text>
-					<text class="desc">2023-07-20 11:38</text>
-				</view>
-			</view>
 		</view>
 	</view>
 </template>
@@ -72,17 +76,20 @@
 export default {
 	data() {
 		return {
-			item: {}
+			item: {},
+			param: {},
 		};
 	},
 	onLoad(e) {
 		if (e.id) {
-			/* 			this.http.request({
-				url: '/level-one-server/app/TbPortNews/getPortNewsDetails?id=' + e.id,
+			this.param.orderId = e.id
+			this.http.request({
+				url: '/level-one-server/app/TbOrder/orderDetail',
+				data: this.param,
 				success: res => {
 					this.item = res.data.data;
 				}
-			}); */
+			});
 		}
 	},
 	methods: {}

pages/market/two/leader/detail.vue

@@ -7,53 +7,38 @@
 					<text class="desc">{{ item.orderNo }}</text>
 				</view>
 				<view class="item">
-					<text class="label">收购商</text>
-					<text class="desc">{{ item.acquirerName }}</text>
-				</view>
-				<view class="item">
-					<text class="label">联系号码</text>
-					<text class="desc">{{ item.consigneePhone }}</text>
-				</view>
-				<view class="item">
 					<text class="label">商品名称</text>
-					<text class="desc omit">{{ item.goodsName }}</text>
+					<text class="desc">{{ item.goodsName }}</text>
 				</view>
 				<view class="item">
-					<text class="label">计价单位</text>
-					<text class="desc omit">{{ item.goodsUnit }}</text>
-				</view>
-				<view class="item" v-if="item.quotation">
 					<text class="label">价格</text>
-					<text class="desc" style="color: #f44336; font-weight: bold">¥ {{ item.quotation }}</text>
-				</view>
-				<view class="item">
-					<text class="label">来源国</text>
-					<text class="desc">{{ item.goodsFrom }}</text>
+					<text class="desc omit">{{ item.resalePrice}}元</text>
 				</view>
 				<view class="item">
-					<text class="label">状态</text>
-					<text class="desc" v-if="item.orderFinish == 0">已确认</text>
+					<text class="label">收购商</text>
+					<text class="desc">{{ item.purchaserName }}</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 order_detail">
-				<view class="item">
-					<text class="label">收件人</text>
-					<text class="desc omit">{{ item.consigneeName }}</text>
-				</view>
-				<view class="item">
-					<text class="label">联系电话</text>
-					<text class="desc">{{ item.consigneePhone }}</text>
-				</view>
-				<view class="item">
-					<text class="label">收件地址</text>
-					<text class="desc">{{ item.unloadingAddress }}</text>
+			<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>
 	</view>
 </template>
@@ -62,20 +47,34 @@
 export default {
 	data() {
 		return {
-			item: {}
+			item: {},
+			feeItemList: []
 		};
 	},
 	onLoad(e) {
 		if (e.id) {
 			this.http.request({
-				url: '/level-two-server/app/TbOrders/getDetailById?id=' + e.id,
+				url: '/level-two-server/app/TbOrders/getDetailById',
+				data: { ids: e.id },
 				success: res => {
-					this.item = res.data.data;
+					let data = res.data.data;
+					this.item = data[0];
 				}
 			});
 		}
+		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/feeDetail.vue

@@ -0,0 +1,86 @@
+<template>
+	<view>
+		<view class="cmain" v-for="(item,index) in feeItemList">
+			<view class="box order_detail">
+				<view class="item">
+					<text class="label">收费企业：</text>
+					<text class="desc">{{ item.companyName }}</text>
+				</view>
+				<view class="item">
+					<text class="label">收费类型：</text>
+					<text class="desc" v-if="item.feeType ==1">按交易额收取</text>
+					<text class="desc" v-if="item.feeType ==2">按次收取</text>
+				</view>
+				<view class="item" v-if="item.feeType ==1">
+					<text class="label">收费%(按交易额)：</text>
+					<text class="desc"><span style="color: coral;">{{ item.percent }} %</span></text>
+				</view>
+				<view class="item" v-if="item.feeType ==2">
+					<text class="label">收费金额(按次收)：</text>
+					<text class="desc"><span style="color: coral;">{{ item.feeMoney }} 元</span></text>
+				</view>
+				<view class="item">
+					<text class="label">当前订单收取金额：</text>
+					<text class="desc" v-if="item.feeType ==1"><span style="color: coral;">{{ (item.percent * resalePrice)/100}} 元</span></text>
+					<text class="desc" v-if="item.feeType ==2"><span style="color: coral;">{{ item.feeMoney }} 元</span></text>
+				</view>
+			</view>
+		</view>
+		<view class="mfooter">
+			<view class="flex">
+				<view class="f">
+					<button class="btn" @click="pay()">立即缴费</button>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			resalePrice: '',// 金额
+			id: '',// 订单id
+			feeItemList: [],
+		};
+	},
+	onLoad(e) {
+		if (e.id && e.resalePrice) {
+			this.resalePrice = e.resalePrice;
+			this.id = e.id;
+			this.http.request({
+				url: '/level-two-server/app/TbFeeItem/getList',
+				success: res => {
+					this.feeItemList = res.data.data
+				}
+			});
+		}
+	},
+	methods: {
+		pay() {
+			uni.showModal({
+				title: '提示',
+				content: '确定缴费?',
+				success: res => {
+					if (res.confirm) {
+						this.http.request({
+							url: '/level-two-server/app/TbOrders/payTax?id=' + this.id,
+							success: res => {
+								uni.showToast({ title: '缴费成功' });
+								uni.navigateBack();
+							}
+						});
+					}
+				}
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background-color: $pg;
+}
+</style>

pages/market/two/leader/order.vue

@@ -21,7 +21,7 @@
 				<view class="clear"></view>
 				<view class="op">
 					<view class="date">{{ item.createTime }}</view>
-					<view class="an" style="color: #4581fb" @click.stop="payTax(item.id)" 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>
@@ -35,9 +35,9 @@ export default {
 	data() {
 		return {
 			tab: [
-				{ name: '全部', goodsStatus: '' },
-				{ name: '已确认', goodsStatus: 0 },
-				{ name: '已完成', goodsStatus: 0 }
+				{ name: '全部', isPay: '', payTax: '', orderFinish: ''},
+				{ name: '已支付', isPay: 1, payTax: 0, orderFinish: 0},
+				{ name: '已完成', isPay: 1, payTax: 1, orderFinish: 1}
 			],
 			param: { pageNo: 1, pageSize: 10 },
 			list: [],
@@ -64,25 +64,13 @@ export default {
 		},
 		//点击tab切换
 		click(e) {
-			this.param.goodsStatus = e.goodsStatus;
+			this.param.isPay = e.isPay;
+			this.param.payTax = e.payTax;
+			this.param.orderFinish = e.orderFinish;
 			this.refresh();
 		},
-		payTax(id) {
-			uni.showModal({
-				title: '提示',
-				content: '确定缴费?',
-				success: res => {
-					if (res.confirm) {
-						this.http.request({
-							url: '/level-two-server/app/TbOrders/payTax?id=' + id,
-							success: res => {
-								uni.showToast({ title: '缴费成功' });
-								this.refresh();
-							}
-						});
-					}
-				}
-			});
+		payTax(item) {
+			uni.navigateTo({ url: '/pages/market/two/leader/feeDetail?resalePrice=' + item.resalePrice +'&id=' + item.id});
 		},
 		detail(item) {
 			uni.navigateTo({ url: '/pages/market/two/leader/detail?id=' + item.id });

pages/market/two/leader/resale.vue

@@ -39,27 +39,13 @@
 						</br>
 						<view class="itm">当前费项收取金额以最后结算时为准</view>
 					</u-collapse-item>
-					<!-- <u-collapse-item title="会员有什么用?" class="cell_title">
-						<view class="itm">1、普能会员：只浏览平台信息，不可下载平台上的相关附件。</view>
-						<view class="itm">2、专业会员：上传展示产品与服务内容、上传相关附件，后台审核方可在平台展示。可下载其他专业会员上传的附件。</view>
-						<view class="itm">3、专家会员：只有专家会员才能接受评测邀请。</view>
-					</u-collapse-item>
-					<u-collapse-item title="积分如何使用?" class="cell_title"><text class="coll">获得的积分可以去线下店铺使用享受折扣哦</text></u-collapse-item>
-					<u-collapse-item title="如何申请高级会员?" class="cell_title">
-						<view class="itm">1、普能会员：只浏览平台信息，不可下载平台上的相关附件。</view>
-						<view class="itm">2、专业会员：上传展示产品与服务内容、上传相关附件，后台审核方可在平台展示。可下载其他专业会员上传的附件。</view>
-						<view class="itm">3、专家会员：只有专家会员才能接受评测邀请。</view>
-					</u-collapse-item>
-					<u-collapse-item title="如何购买产品?" class="cell_title">
-						<text class="coll">目前无法在线购买产品，如你想购买某款产品，可以去线下的店购买</text>
-					</u-collapse-item> -->
 				</u-collapse>
 			</view>
 		</view>
 		<view class="mfooter" v-if="item.resaleStatus != 1">
 			<view class="flex">
 				<view class="f">
-					<button class="btn" @click="ok()">提交</button>
+					<button class="btn" @click="ok()">确定</button>
 				</view>
 			</view>
 		</view>
@@ -94,7 +80,6 @@ export default {
 			this.order.tradeAreaId = this.item.tradeAreaId;
 			this.order.tradeAreaName = this.item.tradeAreaName;
 		}
-		console.log("this.item",this.item)
 		this.getFeeItem();
 	},
 	methods: {

pages/market/two/purchaser/buy/buy.vue

@@ -43,7 +43,7 @@ export default {
 	data() {
 		return {
 			user: this.getUser(),
-			list: {},
+			list: [],
 			orderIds: ''
 		};
 	},
@@ -58,7 +58,7 @@ export default {
 					this.list = res.data.data;
 				}
 			});
-			
+
 		}
 	},
 	methods: {

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

@@ -76,9 +76,10 @@ export default {
 		if (e.id) {
 			this.http.request({
 				url: '/level-two-server/app/TbOrders/getDetailById',
-				data: {id: e.id},
+				data: { ids: e.id },
 				success: res => {
-					this.item = res.data.data;
+					let data = res.data.data;
+					this.item = data[0];
 				}
 			});
 		}