外籍商户的订单

common/http.js

@@ -1,6 +1,6 @@
 
-// const ip = 'http://127.0.0.1:8080'; //线下
-const ip = 'http://hs-server.aseanbusiness.cn'; //线上
+const ip = 'http://127.0.0.1:8080'; //线下
+// const ip = 'http://hs-server.aseanbusiness.cn'; //线上
 
 //const ip = 'http://192.168.88.36:8080'; //线下
 

pages.json

@@ -359,14 +359,40 @@
 				}
 			}
 
-		}, {
+		},
+		{
 			"path": "pages/market/one/merchant/contacts/add",
 			"style": {
 				"navigationBarTitleText": "新增地址",
 				"enablePullDownRefresh": false
 			}
 
-		}, {
+		}, 
+		{
+			"path": "pages/market/one/enterprise/Order",
+			"style": {
+				"navigationBarTitleText": "销售订单",
+				"enablePullDownRefresh": false
+			}
+		
+		},
+		{
+			"path": "pages/market/one/enterprise/detail",
+			"style": {
+				"navigationBarTitleText": "订单详情",
+				"enablePullDownRefresh": false
+			}
+		
+		}, 
+		{
+			"path": "pages/market/one/enterprise/person-list",
+			"style": {
+				"navigationBarTitleText": "购买边民列表",
+				"enablePullDownRefresh": false
+			}
+		
+		}, 
+		{
 			"path": "pages/market/one/merchant/order/vehice",
 			"style": {
 				"navigationBarTitleText": "车辆展示界面",

pages/index/index.vue

@@ -88,10 +88,12 @@ export default {
 			menuList: [],
 			count: 0,
 			show: false,
-			order: {}
+			order: {},
+			user:{}
 		};
 	},
 	onLoad() {
+		this.user=this.getUser();
 		this.getBannerList();
 		this.getNewsList();
 		this.getMenu();
@@ -107,6 +109,11 @@ export default {
 	methods: {
 		//获取待处理的订单弹出
 		getOrderConfirm() {
+			let user=this.getUser();
+			console.log(user);
+			if(user.userType>2){
+				return;
+			}
 			this.http.request({
 				url: '/level-one-server/app/TbOrder/getNoConfirmOrder',
 				loading: 'false',

pages/market/one/enterprise/Order.vue

@@ -0,0 +1,151 @@
+<template>
+	<view>
+		<view class="tab">
+			<u-tabs :list="tab" @click="click" :lineHeight="5"></u-tabs>
+		</view>
+		<view class="goodsList">
+			<view class="item" v-for="(item, index) in list" :key="index" @click="detail(item)">
+				<view class="title">{{item.shopName}}</view>
+				<view class="con">
+					<view class="productName omit">{{ item.goodsNames }}</view>
+					<view class="desc omit">
+						<text>{{ item.sumGrossWt }} kg</text>
+						<text>{{ item.fieldName }}</text>
+					</view>
+					<view class="price">¥ {{ item.sumAmt }}</view>
+				</view>
+				<view class="clear"></view>
+				<view class="op">
+					<view class="date">{{ item.declTime }}</view>
+
+				</view>
+			</view>
+			<view class="loading" v-if="loadMore"><u-loadmore :status="loadMore ? 'loading' : 'nomore'" /></view>
+			<u-empty v-if="!loadMore && list.length == 0"></u-empty>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				tab: [
+				],
+				param: {
+					pageNo: 1,
+					pageSize: 10
+				},
+				list: [],
+				loadMore: true,
+				show: false,
+				value: 0
+			};
+		},
+		onLoad() {
+			
+			this.getData();
+			uni.$on("refreshPage", res => {
+				this.refresh();
+			})
+		},
+		methods: {
+			getData() {
+				this.http.request({
+					url: '/level-one-server/app/HtTradeSettlement/getList',
+					loading: 'false',
+					data: this.param,
+					success: res => {
+						this.loadMore = parseInt(res.data.pageCount) > this.param.pageNo;
+						if (res.data.data) {
+							this.list.push(...res.data.data);
+						}
+						this.list.map(item => {
+							if (item.callCarStatus == 1) {
+								item.enterpriseConfirm = 3
+							} else if (item.callCarStatus == 2) {
+								item.enterpriseConfirm = 4
+							}
+						})
+					}
+				});
+			},
+			// 商家确认
+			confirm(id, goodsId, status, content) {
+				//enterprise_confirm：'商铺确认情况[0=待确认,1=已确认,2=拒绝]'
+				uni.showModal({
+					title: '提示',
+					content: content,
+					success: res => {
+						if (res.confirm) {
+							this.http.request({
+								url: '/level-one-server/app/TbOrder/updateEnterpriseConfirm',
+								data: {
+									id: id,
+									goodsId: goodsId,
+									enterpriseConfirm: status
+								},
+								method: 'POST',
+								success: resp => {
+									uni.showToast({
+										title: '操作成功'
+									});
+									this.refresh();
+								}
+							});
+						}
+					}
+				});
+			},
+			//点击tab切换
+			click(e) {
+				this.param.enterpriseConfirm = e.enterpriseConfirm;
+				this.param.isOrders = e.isOrders;
+				this.refresh();
+			},
+			detail(item) {
+				uni.navigateTo({
+					url: '/pages/market/one/enterprise/detail?id=' + item.id
+				});
+			},
+			//刷新数据
+			refresh() {
+				this.loadMore = true;
+				this.param.pageNo = 1;
+				this.list = [];
+				this.getData();
+			},
+			// 弹窗显示司机信息
+			showPop(item) {
+				// this.show = !this.show
+				uni.navigateTo({
+					url: '/pages/market/one/merchant/order/vehice?item=' + JSON.stringify(item)
+				})
+			},
+			close() {
+				this.show = false
+				this.refresh()
+			},
+		},
+		//下拉刷新
+		onPullDownRefresh() {
+			setTimeout(() => {
+				this.refresh();
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+		//上拉加载
+		onReachBottom() {
+			if (this.loadMore) {
+				this.param.pageNo++;
+				this.getData();
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	page {
+		background-color: $pg;
+	}
+</style>

pages/market/one/enterprise/detail.vue

@@ -0,0 +1,95 @@
+<template>
+	<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">{{item.declareId}}</text>
+					</view>
+					<view class="item">
+						<text class="label">互市区</text>
+						<text class="desc">{{item.fieldName}}</text>
+					</view>
+					<view class="item" style="padding-top: 0px">
+						<text class="label">申报人</text>
+						<text class="desc">{{item.declareName}}</text>
+					</view>
+					<view class="item" style="padding-top: 0px">
+						<text class="label">申报时间</text>
+						<text class="desc">{{item.declTime}}</text>
+					</view>
+					<view class="item">
+						<text class="label">运输工具</text>
+						<text class="desc">{{item.veNo}}</text>
+					</view>
+					<view class="item">
+						<text class="label">商品名称</text>
+						<text class="desc">{{item.goodsNames}}</text>
+					</view>
+					<view class="item">
+						<text class="label">净重(kg)</text>
+						<text class="desc">{{item.sumNetWt}}</text>
+					</view>
+					<view class="item">
+						<text class="label">毛重(kg)</text>
+						<text class="desc">{{item.sumGrossWt}}</text>
+					</view>
+					<view class="item">
+						<text class="label">价格(元)</text>
+						<text class="desc">{{item.sumAmt}}</text>
+					</view>
+					<view class="item">
+						<text class="label">状态</text>
+						<text class="desc" v-if="item.finishStatus==0">监管中</text>
+						<text class="desc" v-if="item.finishStatus==1">已完成</text>
+					</view>
+					<view class="item">
+						<text class="label">完成时间</text>
+						<text class="desc">{{item.finishTime}}</text>
+					</view>
+					<view class="item">
+						<text class="label">边民信息</text>
+						<text class="desc" style="color: blue;" @click="toPersonDetail(item.id)">详情</text>
+					</view>
+				</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			item: {},
+			param: {},
+		};
+	},
+	onLoad(e) {
+		if (e.id) {
+			this.param.id = e.id
+			this.http.request({
+				url: '/level-one-server/app/HtTradeSettlement/getById',
+				data: this.param,
+				success: res => {
+					this.item = res.data.data;
+				}
+			});
+		}
+		
+	},
+	methods: {
+		toPersonDetail(id){
+			uni.navigateTo({
+				url: '/pages/market/one/enterprise/person-list?id=' + id
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background-color: $pg;
+}
+</style>

pages/market/one/enterprise/person-list.vue

@@ -0,0 +1,73 @@
+<template>
+	<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" v-for="(item,index) in list">
+					<text class="label" style="line-height: 50rpx;">
+						{{item.borderName}}
+						<view style="font-size: 30rpx;color: #9c9999;">
+							订单确认：
+							<text v-if="item.peopleConfirmStatus==0">未确认</text>
+							<text v-if="item.peopleConfirmStatus==1">已确认</text>
+							<view v-if="item.peopleConfirmTime">时间:{{item.peopleConfirmTime}}</view>
+						</view>
+					</text>
+					<text class="desc" style="width: 120rpx;">{{item.buyAmount}}</text>
+				</view>
+				<view class="loading" v-if="loadMore"><u-loadmore :status="loadMore ? 'loading' : 'nomore'" /></view>
+				<u-empty v-if="!loadMore && list.length == 0"></u-empty>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				list: [],
+				param: {
+					pageNo: 1,
+					pageSize: 10,
+					saleMainId: ''
+				},
+				loadMore: true,
+			};
+		},
+		onLoad(e) {
+			this.param.saleMainId = e.id
+			this.getData();
+			uni.$on("refreshPage", res => {
+				this.refresh();
+			})
+
+		},
+		methods: {
+			getData() {
+				this.http.request({
+					url: '/level-one-server/app/TbOrder/getList',
+					data: this.param,
+					success: res => {
+						this.loadMore = parseInt(res.data.pageCount) > this.param.pageNo;
+						if (res.data.data) {
+							this.list.push(...res.data.data);
+						}
+					}
+				});
+			},
+			refresh() {
+				this.loadMore = true;
+				this.param.pageNo = 1;
+				this.list = [];
+				this.getData();
+			},
+		}
+	};
+</script>
+
+<style lang="scss">
+	page {
+		background-color: $pg;
+	}
+</style>

pages/personal/personal.vue

@@ -29,9 +29,9 @@
 					<view class="nickName omit">{{ user.phone }}</view>
 					<view class="tag" v-if="user.userType == 1">普通边民</view>
 					<view class="tag" v-if="user.userType == 2">互市组长</view>
-					<view class="tag" v-if="user.userType == 3">收购商</view>
+					<view class="tag" v-if="user.userType == 3">采购商</view>
 					<view class="tag" v-if="user.userType == 4">司机</view>
-					<view class="tag" v-if="user.userType == 5">外籍商户</view>
+					<view class="tag" v-if="user.userType == 5">商户</view>
 					<view class="tag" v-if="user.userType == 6">合作社</view>
 				</view>
 				<text class="icon edit" @click="go('/pages/personal/my')">&#xe645;</text>
@@ -119,7 +119,7 @@
 				</view>
 			</view>
 			<!--外籍商户-->
-			<view class="menu" v-if="user.userType == 5">
+			<!-- <view class="menu" v-if="user.userType == 5">
 				<view class="msn" @click="go('/pages/market/one/merchant/goods/list')">
 					<view class="out">
 						<view class="int">
@@ -132,7 +132,7 @@
 					<view class="out">
 						<view class="int">
 							<view class="icon ioc" style="background-color: #f0dcfc; color: #b064d8">&#xe628;</view>
-							<view class="tit">我的订单</view>
+							<view class="tit">交易订单</view>
 						</view>
 					</view>
 				</view>
@@ -144,14 +144,14 @@
 						</view>
 					</view>
 				</view>
-			</view>
+			</view> -->
 			<!--合作社-->
 			<view class="menu" v-if="user.userType == 6">
 				<view class="msn" @click="go('/pages/market/one/cooperative/order')">
 					<view class="out">
 						<view class="int">
 							<view class="icon ioc" style="background-color: #e1f6e9; color: #47cf74">&#xe634;</view>
-							<view class="tit">大订单</view>
+							<view class="tit">结算单</view>
 						</view>
 					</view>
 				</view>
@@ -172,10 +172,15 @@
 					<text class="title">隐私协议</text>
 					<text class="icon arrow">&#xe8f2;</text>
 				</view>
-				<view class="s_item" @click="go('/pages/personal/setting')">
+				<!-- <view class="s_item" @click="go('/pages/personal/setting')">
 					<text class="icon ic">&#xe817;</text>
 					<text class="title">设置</text>
 					<text class="icon arrow">&#xe8f2;</text>
+				</view> -->
+				<view class="s_item" @click="go('/pages/personal/editPassword')">
+					<text class="icon ic">&#xe817;</text>
+					<text class="title">修改密码</text>
+					<text class="icon arrow">&#xe8f2;</text>
 				</view>
 			</view>
 			<button class="btn exit" @click="exitLogin()">退出登录</button>

pages/personal/setting.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="cmd">
-			<view class="s_item" @click="go('')">
+			<!-- <view class="s_item" @click="go('')">
 				<text class="title">账号信息</text>
 				<text class="icon arrow">&#xe8f2;</text>
 			</view>
@@ -16,7 +16,7 @@
 			<view class="s_item" @click="go('')">
 				<text class="title">帮助与反馈</text>
 				<text class="icon arrow">&#xe8f2;</text>
-			</view>
+			</view> -->
 			<view class="s_item" @click="go('/pages/personal/editPassword')">
 				<text class="title">修改密码</text>
 				<text class="icon arrow">&#xe8f2;</text>

pages/shop/shop.vue

@@ -1,12 +1,12 @@
 <template>
 	<view>
 		<view class="goodsManageList">
-			<view class="item" v-for="(item, index) in list" :key="index" >
+			<view class="item" v-for="(item, index) in list" :key="index" @click="detail(item.id)">
 				<view class="top">
 					<view class="title omit">{{ item.shopName }}</view>
-					<view class="state">
+					<!-- <view class="state">
 						<text style="color: lightskyblue;font-weight: bold;" @click="detail(item.id)">详情></text>
-					</view>
+					</view> -->
 					<view class="clear"></view>
 				</view>
 				<view class="con">