重构app

App.vue

@@ -50,7 +50,7 @@ button::after {
 /**挂载iconfont字体图标*/
 @font-face {
 	font-family: 'iconfont';
-	src: url('https://at.alicdn.com/t/c/font_4191999_lhmrkxi7l3t.ttf?t=1691050336877') format('truetype');
+	src: url('https://at.alicdn.com/t/c/font_4191999_iwlclbsmm7.ttf?t=1691268694703') format('truetype');
 	/* src: url('~@/static/font/iconfont.ttf') format('truetype'); */
 }
 .icon {

common/http.js

@@ -1,4 +1,4 @@
-const ip = 'http://192.168.88.12:8080'; //线下
+const ip = 'http://192.168.88.42:8080'; //线下
 //const ip = 'http://114.118.9.159:8080/prod-api'; //线上
 /**
  * 封装的http请求

common/style.scss

@@ -23,12 +23,21 @@
 	.f {
 		flex: 1;
 		overflow: hidden;
+		.icon {
+			padding-right: 7px;
+		}
 	}
 }
+.left {
+	text-align: left;
+}
+.rline {
+	border-right: 1px solid $line;
+}
 .btn {
 	color: white;
 	background-color: $main-color;
-	border-radius: 8px;
+	border-radius: 25px;
 	font-size: 15px;
 	text-align: center;
 	padding: 5px 5px;
@@ -126,107 +135,10 @@
 		margin-top: 12px;
 		height: 90px;
 		width: 93%;
-		border: 1px solid #d0d0d0;
+		background-color: #f6f6f6;
 		color: $font-c;
 	}
 }
-/**标签**/
-.tabs {
-	background-color: white;
-	padding: 5px;
-	.label {
-		display: none;
-	}
-	.search {
-		display: none;
-	}
-}
-/**PC端产品列表**/
-.goods {
-	.list {
-		margin-top: 10px;
-		padding-left: 10px;
-		.fimg {
-			width: 100%;
-		}
-		.item {
-			float: left;
-			width: 50%;
-			overflow: hidden;
-			text-align: center;
-			position: relative;
-			.out {
-				padding: 0px 12px 10px 0px;
-				.inside {
-					background-color: white;
-					padding: 0px 0px 3px 0px;
-					border-radius: 5px;
-					overflow: hidden;
-					box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.05);
-					position: relative;
-					.img {
-						width: 100%;
-						height: 164px;
-						background-color: #e0e0e0;
-					}
-					.title {
-						font-size: 14px;
-						font-weight: 400;
-						color: #333;
-						padding: 8px 10px 0px 10px;
-						text-align: left;
-					}
-					.time {
-						padding: 8px 10px 10px 10px;
-						float: left;
-						color: #919191;
-						font-size: 13px;
-					}
-					.price {
-						padding: 8px 10px 10px 10px;
-						float: left;
-						color: $main-color;
-						font-size: 14px;
-					}
-					.kc {
-						padding: 8px 10px 10px 10px;
-						float: right;
-						color: #919191;
-						font-size: 13px;
-					}
-				}
-			}
-		}
-	}
-	.detail {
-		background-color: white;
-		.content {
-			padding-bottom: 30px;
-			.right {
-				text-align: left;
-				padding: 15px 15px 0px 15px;
-				.title {
-					font-size: 18px;
-					line-height: 1.6;
-				}
-				.price {
-					font-size: 20px;
-					font-weight: bold;
-					color: $main-color;
-					margin-top: 10px;
-					.m {
-						float: right;
-						font-size: 15px;
-						font-weight: normal;
-						color: #545555;
-						padding-top: 5px;
-						padding-left: 5px;
-					}
-				}
-			}
-		}
-	}
-}
 /*****设置**********/
 .cmd {
 	margin-top: 10px;
@@ -262,12 +174,18 @@
 		}
 	}
 }
+.forms {
+	background-color: white;
+	padding: 10px 13px 70px 13px;
+}
 /**底部按钮操作******/
 .mfooter {
 	position: fixed;
 	width: 100%;
 	bottom: 0px;
 	text-align: center;
+	background-color: white;
+	border-top: 1px solid $line;
 	.flex {
 		padding: 5px 10px 5px 10px;
 		.f {
@@ -276,12 +194,17 @@
 		.s2 {
 			flex: 0.5;
 		}
-		.btn {
-			border-radius: 5px;
-			font-weight: bold;
-			.icon {
-				padding-right: 5px;
-			}
+		.save {
+			background-color: #f5f6fa;
+			color: $font-c;
+		}
+	}
+	.btn {
+		border-radius: 25px;
+		width: 80%;
+		position: relative;
+		.icon {
+			padding-right: 5px;
 		}
 	}
 }
@@ -417,21 +340,19 @@
 			color: #121212;
 			line-height: 1.6;
 		}
-		.date {
+		.source {
 			margin-top: 5px;
 			font-size: 13px;
 			bottom: 0px;
 			position: absolute;
-			.icon {
-				padding-right: 5px;
-			}
+			width: 120px;
 		}
 		.releaseTime {
-			margin-top: 5px;
 			font-size: 13px;
 			bottom: 0px;
 			position: absolute;
 			right: 0px;
+			right: -17px;
 		}
 	}
 	.look {
@@ -441,6 +362,15 @@
 		padding: 10px 30px;
 	}
 }
+.mt0 {
+	margin-top: 0px !important;
+}
+.mt5 {
+	margin-top: 5px !important;
+}
+.p0 {
+	padding-top: 0px;
+}
 .menu {
 	background-color: white;
 	padding-top: 3px;
@@ -463,7 +393,7 @@
 					border-radius: 40%;
 					margin: 0 auto;
 					line-height: 46px;
-					font-size: 25px
+					font-size: 25px;
 				}
 				.tit {
 					font-size: 13px;
@@ -535,3 +465,274 @@
 		font-size: 14px;
 	}
 }
+.common_list {
+	padding: 13px;
+	.item {
+		padding: 12px;
+		color: $font-c;
+		background-color: white;
+		border-radius: 10px;
+		.title {
+			font-size: 15px;
+			margin-bottom: 10px;
+			color: #192b20;
+		}
+		.pic {
+			float: left;
+			width: 80px;
+			height: 80px;
+			border-radius: 3px;
+		}
+		.con {
+			float: left;
+			width: 60%;
+			padding-left: 10px;
+		}
+	}
+}
+.address {
+	background-color: white;
+	padding: 15px;
+	.con {
+		float: left;
+		width: 85%;
+		color: $font-c;
+		.title {
+			color: #192b20;
+		}
+		.desc {
+			font-size: 14px;
+			padding-top: 5px;
+			color: #898f94;
+			text {
+				padding-right: 10px;
+			}
+		}
+	}
+	.icon {
+		float: right;
+		margin-top: 12px;
+	}
+}
+.search {
+	padding: 12px;
+}
+.tab {
+	position: relative;
+	.length {
+		position: absolute;
+		right: 14px;
+		top: 13px;
+		font-size: 14px;
+		color: $font-c;
+	}
+}
+.goodsManageList {
+	padding: 12px;
+	.item {
+		padding: 12px;
+		color: $font-c;
+		background-color: white;
+		border-radius: 10px;
+		margin-bottom: 10px;
+		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.08);
+		.top {
+			.title {
+				font-size: 15px;
+				margin-bottom: 10px;
+				color: #192b20;
+				float: left;
+				width: 80%;
+			}
+			.state {
+				float: right;
+				font-size: 14px;
+				.icon {
+					color: #abacb0;
+					font-weight: bold;
+				}
+			}
+		}
+		.con {
+			padding-bottom: 10px;
+			.fs {
+				font-size: 14px;
+				.tag {
+					color: #abacb0;
+					padding-bottom: 3px;
+				}
+			}
+		}
+		.op {
+			border-top: 1px solid $line;
+			padding: 10px 10px 0px 10px;
+			color: #192b20;
+			font-size: 15px;
+		}
+	}
+}
+.sort-list {
+	padding: 0px 0px 10px 0px;
+	color: #424242;
+	.sort-item {
+		float: left;
+		cursor: pointer;
+		font-size: 14px;
+		padding: 5px 10px;
+		text-align: center;
+		border-left: 1px solid #e0e0e0;
+		&.active {
+			color: $main-color;
+		}
+		&:first-child {
+			border: 0px;
+		}
+	}
+	.type {
+		float: right;
+		padding-top: 5px;
+		color: $font-c;
+		font-size: 14px;
+	}
+}
+.goodsList {
+	padding: 12px;
+	.item {
+		background-color: white;
+		padding: 12px;
+		border-radius: 10px;
+		font-size: 14px;
+		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.08);
+		margin-bottom: 10px;
+		overflow: hidden;
+		.title {
+			margin-bottom: 9px;
+			float: left;
+			width: 80%;
+		}
+		.state {
+			float: right;
+			font-size: 14px;
+			.icon {
+				color: #abacb0;
+				font-weight: bold;
+			}
+		}
+		.pic {
+			float: left;
+			width: 75px;
+			height: 75px;
+			border-radius: 3px;
+		}
+		.con {
+			float: left;
+			width: 70%;
+			padding-left: 10px;
+			color: $font-c;
+			.desc {
+				padding-top: 7px;
+				color: #a0a2a6;
+				text {
+					padding-right: 15px;
+				}
+			}
+			.price {
+				padding-top: 7px;
+				font-size: 16px;
+				color: #ff5722;
+				font-weight: bold;
+			}
+			.buy {
+				float: right;
+				width: 32px;
+				height: 32px;
+				border-radius: 50%;
+				background-color: $main-color;
+				color: white;
+				text-align: center;
+				line-height: 33px;
+				font-size: 18px;
+				margin-top: -32px;
+				margin-right: -11px;
+			}
+		}
+		.op{
+			margin-top: 12px;
+			border-top: 1px solid $line;
+			color: #a0a2a6;
+			padding-top: 10px;
+			.an{
+				float: right;
+				margin-left: 15px;
+				margin-top: -17px;
+				font-weight: bold;
+			}
+			
+		}
+	}
+}
+.box {
+	margin-top: 10px;
+	border-radius: 10px;
+	padding: 1px 12px 0px 12px;
+	background-color: white;
+	color: $font-c;
+}
+.order_detail {
+	.item {
+		padding: 12px 8px 12px 8px;
+		border-bottom: 1px solid $line;
+		overflow: hidden;
+		&:last-child {
+			border: 0px;
+		}
+		.label {
+			float: left;
+		}
+		.desc {
+			float: right;
+		}
+		input {
+			text-align: right;
+			font-size: 15px;
+		}
+	}
+}
+.product_detail {
+	padding: 12px 12px 90px 12px;
+	.pic {
+		width: 100%;
+		border-radius: 10px;
+	}
+	.box {
+		margin-top: 10px;
+		padding: 14px;
+		.title {
+			float: left;
+			width: 70%;
+			font-weight: bold;
+			color: #192b20;
+		}
+		.price {
+			float: right;
+			font-size: 16px;
+			color: #ff5722;
+			font-weight: bold;
+		}
+		.item {
+			padding-bottom: 10px;
+			overflow: hidden;
+			text {
+				float: left;
+				font-size: 14px;
+			}
+			.desc {
+				width: 100px;
+			}
+		}
+		.contents {
+			font-size: 14px;
+			line-height: 25px;
+		}
+	}
+}

components/noData/noData.vue

@@ -1,39 +0,0 @@
-<template>
-	<view>
-		<view class="nodata">
-			<image class="n-img" src="../../static/noData.png"></image>
-			<text class="n-text">暂无数据</text>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		name:"noData",
-		data() {
-			return {
-				
-			};
-		}
-	}
-</script>
-
-<style lang="scss">
-	.nodata{
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-		width: 100%;
-		height: 750rpx;
-		.n-img{
-			width: 300rpx;
-			height: 300rpx;
-		}
-		.n-text{
-			font-size: 28rpx;
-			color: #666;
-			margin-top: 20rpx;
-		}
-	}
-</style>

components/productType/productType.vue

@@ -0,0 +1,91 @@
+<template>
+	<view class="select">
+		<u-popup :show="value" @close="close()" round="15">
+			<view class="ppopup">
+				<u-divider :text="desc"></u-divider>
+				<scroll-view scroll-y="true" style="height: 350px">
+					<view class="items" v-for="(item, index) in list" :key="index" @click="check(item)">
+						<view class="check">
+							<text class="icon xz" v-if="item.check">&#xe600;</text>
+							<text class="icon" v-else>&#xe8bb;</text>
+						</view>
+						<view class="title omit">{{ item[rangeKey] }}</view>
+						<view class="clear"></view>
+					</view>
+				</scroll-view>
+				<button class="btn" @click="confirm()">确定</button>
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script>
+export default {
+	name: 'type',
+	props: {
+		value: {
+			type: Boolean,
+			default: true
+		},
+		list: {
+			type: Array
+		},
+		rangeKey: {
+			type: String,
+			default: 'province'
+		},
+		desc: {
+			type: String,
+			default: '选择发货区域'
+		},
+		multiple: {
+			type: Boolean,
+			default: false
+		}
+	},
+	data() {
+		return {
+			show: true
+		};
+	},
+	watch: {
+		value(newValue) {
+			this.show = newValue;
+		}
+	},
+	methods: {
+		check(item) {
+			if (this.multiple) {
+				item.check = !item.check;
+			} else {
+				this.list.forEach(i => {
+					i.check = false;
+				});
+				item.check = true;
+			}
+			this.$forceUpdate();
+		},
+		confirm() {
+			this.$emit('input', false);
+			let check = this.list.filter(item => item.check);
+			this.$emit('confirm', check);
+		},
+		close() {
+			this.show = false;
+			this.$emit('input', false);
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.select {
+	.ppopup {
+		padding: 10px 20px 30px 20px;
+		border-radius: 15px 15px 0px 0px;
+		.btn {
+			margin-top: 20px;
+		}
+	}
+}
+</style>

components/statusBar/statusBar.vue

@@ -1,17 +0,0 @@
-<template>
-	<view :style="{height: SBH}"></view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				// 获取手机状态栏的高度,状态栏就是手机上面时间信号电池等那一栏,安卓苹果各不相同,所以得通过js获取系统信息进行计算
-				SBH: uni.getSystemInfoSync().statusBarHeight + 'px'
-			}
-		}
-	}
-</script>
-
-<style>
-</style>

main.js

@@ -14,6 +14,19 @@ Vue.prototype.$api = api
 Vue.prototype.$common = common
 Vue.prototype.verify = verify;
 Vue.prototype.http = http;
+
+Vue.prototype.getUser = function() {
+	return uni.getStorageSync('info');
+}
+
+Vue.prototype.hasLogin = () => {
+	if (uni.getStorageSync('info') === '' || uni.getStorageSync('info') === null) {
+		return false
+	} else {
+		return true
+	}
+}
+
 const app = new Vue({
     ...App
 })

pages.json

@@ -85,169 +85,240 @@
 				"navigationStyle": "custom"
 			}
 
+		},
+		{
+			"path": "pages/authentication/index",
+			"style": {
+				"navigationBarTitleText": "实人认证",
+				"enablePullDownRefresh": false
+			}
+
 		}, {
-			"path": "pages/twoMarket/twoMarket",
+			"path": "pages/authentication/face",
 			"style": {
-				"navigationBarTitleText": "",
+				"navigationBarTitleText": "人脸认证",
 				"enablePullDownRefresh": false
 			}
 
-		},{
-			"path": "pages/goodsManage/oneMarket/goodsHandle",
+		}, {
+			"path": "pages/authentication/info",
 			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": true,
-				"navigationStyle": "custom",
-				"app-plus": {
-					"titleNView": {
-						"autoBackButton": false
-					}
-				}
-				/*"app-plus": {
-					"titleNView": {
-						"buttons": [{
-							"text": "新增商品",
-							"type": "none",
-							"color": "#fff",
-							"fontSize": "15px",
-							"float": "right",
-							"width": "80px"
-						}]
-					}
-				} */
+				"navigationBarTitleText": "完善资料",
+				"enablePullDownRefresh": false
 			}
-		},
-		{
-			"path": "pages/goodsManage/oneMarket/addGoods",
+
+		}, {
+			"path": "pages/authentication/audit",
 			"style": {
-				"navigationBarTitleText": "新增商品",
+				"navigationBarTitleText": "审核中",
 				"enablePullDownRefresh": false
 			}
+
 		},
 		{
-			"path": "pages/goodsManage/oneMarket/editGoods",
+			"path": "components/cropper/cropper",
 			"style": {
-				"navigationBarTitleText": "编辑商品",
-				"enablePullDownRefresh": false
+				"navigationBarTitleText": "图片裁剪",
+				"navigationBarBackgroundColor": "#000000"
 			}
-		}
-		, {
-			"path": "pages/twoMarket/purchaser/product/list",
+		}, {
+			"path": "pages/news/list",
 			"style": {
-				"navigationBarTitleText": "二级市场 (收购商) ",
+				"navigationBarTitleText": "资讯列表",
 				"enablePullDownRefresh": true
 			}
 
 		}, {
-			"path": "pages/twoMarket/purchaser/product/detail",
+			"path": "pages/news/detail",
 			"style": {
-				"navigationBarTitleText": "商品详情",
+				"navigationBarTitleText": "资讯详情",
 				"enablePullDownRefresh": false
 			}
 
 		}, {
-			"path": "pages/twoMarket/purchaser/product/cart",
+			"path": "pages/oneMarket/cart/cart",
 			"style": {
-				"navigationBarTitleText": "购物车",
-				"enablePullDownRefresh": true
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
 			}
 
-		}, {
-			"path": "pages/twoMarket/purchaser/order/list",
+		},
+		{
+			"path": "pages/market/two/purchaser/buy/list",
 			"style": {
-				"navigationBarTitleText": "订单列表",
-				"enablePullDownRefresh": true
+				"navigationBarTitleText": "商品采购",
+				"enablePullDownRefresh": true,
+				"app-plus": {
+					"titleNView": {
+						"buttons": [{
+							"text": "新增",
+							"fontSize": "14px"
+						}]
+					}
+				}
 			}
 
 		}, {
-			"path": "pages/twoMarket/purchaser/order/confirm",
+			"path": "pages/market/two/purchaser/buy/add",
 			"style": {
-				"navigationBarTitleText": "确认订单",
+				"navigationBarTitleText": "新增采购商品",
 				"enablePullDownRefresh": false
 			}
 
 		}, {
-			"path": "pages/twoMarket/purchaser/order/success",
+			"path": "pages/market/two/purchaser/buy/detail",
 			"style": {
-				"navigationBarTitleText": "下单成功",
+				"navigationBarTitleText": "收购详情",
 				"enablePullDownRefresh": false
 			}
 
 		}, {
-			"path": "pages/twoMarket/purchaser/order/detail",
+			"path": "pages/market/two/purchaser/address/list",
 			"style": {
-				"navigationBarTitleText": "订单详情",
-				"enablePullDownRefresh": false
+				"navigationBarTitleText": "选择地址",
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"titleNView": {
+						"buttons": [{
+							"text": "新增",
+							"fontSize": "14px"
+						}]
+					}
+				}
 			}
 
 		}, {
-			"path": "pages/twoMarket/purchaser/order/logistics",
+			"path": "pages/market/two/purchaser/address/add",
 			"style": {
-				"navigationBarTitleText": "订单物流",
+				"navigationBarTitleText": "新增地址",
 				"enablePullDownRefresh": false
 			}
 
 		}, {
-			"path": "pages/authentication/index",
+			"path": "pages/market/two/list",
 			"style": {
-				"navigationBarTitleText": "实人认证",
+				"navigationBarTitleText": "二级市场",
+				"enablePullDownRefresh": true
+			}
+
+		}, {
+			"path": "pages/market/two/detail",
+			"style": {
+				"navigationBarTitleText": "商品详情",
 				"enablePullDownRefresh": false
 			}
 
 		}, {
-			"path": "pages/authentication/face",
+			"path": "pages/market/two/leader/confirm",
 			"style": {
-				"navigationBarTitleText": "人脸认证",
+				"navigationBarTitleText": "接单确认",
 				"enablePullDownRefresh": false
 			}
 
 		}, {
-			"path": "pages/authentication/info",
+			"path": "pages/market/two/leader/success",
 			"style": {
-				"navigationBarTitleText": "完善资料",
+				"navigationBarTitleText": "接单成功",
 				"enablePullDownRefresh": false
 			}
 
 		}, {
-			"path": "pages/authentication/audit",
+			"path": "pages/market/two/leader/order",
 			"style": {
-				"navigationBarTitleText": "审核中",
+				"navigationBarTitleText": "订单列表",
+				"enablePullDownRefresh": true
+			}
+
+		}, {
+			"path": "pages/market/two/leader/detail",
+			"style": {
+				"navigationBarTitleText": "订单详情",
 				"enablePullDownRefresh": false
 			}
 
-		},
-		{
-			"path": "components/cropper/cropper",
+		}, {
+			"path": "pages/market/one/merchant/goods/list",
 			"style": {
-				"navigationBarTitleText": "图片裁剪",
-				"navigationBarBackgroundColor": "#000000"
+				"navigationBarTitleText": "商品管理",
+				"enablePullDownRefresh": true,
+				"app-plus": {
+					"titleNView": {
+						"buttons": [{
+							"text": "新增",
+							"fontSize": "14px"
+						}]
+					}
+				}
 			}
+
 		}, {
-			"path": "pages/news/list",
+			"path": "pages/market/one/merchant/goods/add",
 			"style": {
-				"navigationBarTitleText": "资讯列表",
+				"navigationBarTitleText": "新增商品",
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"titleNView": {
+						"buttons": [{
+							"text": "保存",
+							"fontSize": "14px"
+						}]
+					}
+				}
+			}
+
+		}, {
+			"path": "pages/market/one/merchant/order/list",
+			"style": {
+				"navigationBarTitleText": "订单列表",
 				"enablePullDownRefresh": true
 			}
 
 		}, {
-			"path": "pages/news/detail",
+			"path": "pages/market/one/merchant/order/detail",
 			"style": {
-				"navigationBarTitleText": "资讯详情",
+				"navigationBarTitleText": "订单详情",
 				"enablePullDownRefresh": false
 			}
 
 		}
 	    ,{
-            "path" : "pages/oneMarket/cart/cart",
+            "path" : "pages/market/two/purchaser/order/list",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "订单列表",
+                "enablePullDownRefresh": true
+            }
+            
+        }
+        ,{
+            "path" : "pages/market/two/purchaser/order/detail",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "订单详情",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/market/one/list",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                "navigationBarTitleText": "一级市场",
+                "enablePullDownRefresh": true
+            }
+            
+        }
+        ,{
+            "path" : "pages/market/one/detail",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "商品详情",
                 "enablePullDownRefresh": false
             }
             
         }
         ,{
-            "path" : "pages/goodsManage/oneMarket/goodsOrders",
+            "path" : "pages/market/one/leader/order",
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "订单列表",
@@ -255,6 +326,15 @@
             }
             
         }
+        ,{
+            "path" : "pages/market/one/leader/cart",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "购物车",
+                "enablePullDownRefresh": true
+            }
+            
+        }
     ],
 	"tabBar": {
 		"color": "#7A7E83",
@@ -284,6 +364,6 @@
 	"globalStyle": {
 		"navigationBarTextStyle": "white",
 		"navigationBarTitleText": "边民互市贸易",
-		"navigationBarBackgroundColor": "#0081FF"
+		"navigationBarBackgroundColor": "#4581fb"
 	}
-}
+}

pages/goodsManage/oneMarket/addGoods.vue

@@ -1,128 +0,0 @@
-<template>
-	<view class="cmain">
-		<view class="form_group">
-			<view class="lable re">监管商品类型</view>
-			<input type="text" placeholder="请输入" v-model="item.id" />
-		</view>
-		<view class="form_group">
-			<view class="lable re">商品名称</view>
-			<input type="text" placeholder="请输入" v-model="item.goodsName" />
-		</view>
-		<view class="form_group">
-			<view class="lable re">商品产地</view>
-			<input type="text" placeholder="请输入" v-model="item.placeOrigin" />
-		</view>
-		<view class="form_group">
-			<view class="lable re">商品类型</view>
-			<picker @change="pickerChangeGoodsTypes" :value="index1" :range="goodsTypes" range-key="label">
-				<view >{{goodsTypes[index1].label}}</view>
-			</picker>
-			<!-- <input type="text" placeholder="请输入" v-model="item.goodsType" /> -->
-			<!-- <u-input type="select" v-model="item.goodsType" border="false" placeholder="请选择商品类型" @click="show = true"/>
-			<u-action-sheet :list="goodsTypes" v-model="show" @click="actionSheetCallback"/> -->
-		</view>
-		<view class="form_group">
-			<view class="lable re">商品单位</view>
-			<input type="text" placeholder="请输入" v-model="item.goodsUnits" />
-		</view>
-		<view class="form_group">
-			<view class="lable re">商品价格</view><!-- (0=下架,1=在售) -->
-			<input type="text" placeholder="请输入" v-model="item.price" />
-		</view>
-		<view class="form_group">
-			<view class="lable re">商品数量</view>
-			<input type="text" placeholder="请输入" v-model="item.stock" />
-		</view>
-		<view class="form_group">
-			<view class="lable re">净重</view>
-			<input type="text" placeholder="请输入" v-model="item.netWeight" />
-		</view>
-		<view class="form_group">
-			<view class="lable re">毛重</view>
-			<input type="text" placeholder="请输入" v-model="item.grossWeight" />
-		</view>
-		<view class="form_group">
-			<view class="lable re">商品状态</view>
-			<picker @change="pickerChangeGoodsStatus" :value="index2" :range="goodsStatus" range-key="label">
-				<view >{{goodsStatus[index2].label}}</view>
-			</picker>
-			<!-- <input type="text" placeholder="请输入" v-model="item.goodsStatus" /> -->
-		</view>
-		<view class="form_group">
-			<view class="lable re">商品描述</view>
-			<input type="text" placeholder="请输入" v-model="item.description" />
-		</view>
-		<view class="form_group">
-			<view class="lable re">商品图片</view>
-			<card v-model="item.goodsImg" pic="../../static/images/yyzz.png"></card>
-		</view>
-		<button class="btn" @click="save()">新增商品提交</button>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				id: 0,
-				item: {goodsType:''},
-				index1: 0,
-				index2: 1,
-				goodsTypes: [
-					{label:'请选择',value:0},
-					{label:'水果',value:1},
-					{label:'药品',value:2},
-					{label:'茶叶',value:3},
-				],
-				goodsStatus: [
-					{label:'下架',value:0},
-					{label:'在售',value:1}
-				],
-				show: false,
-			}
-		},
-		methods: {
-			pickerChangeGoodsTypes: function(e) { //商品类型选择器
-				this.index1 = e.detail.value;
-			},
-			pickerChangeGoodsStatus: function(e) { //商品状态选择器
-				this.index2 = e.detail.value;
-			},
-			// 点击actionSheet回调
-			actionSheetCallback(index) {
-				console.log('index',index)
-				this.item.goodsType = this.goodsTypes[index].label;
-			},
-			save() {
-				/* let rule = [
-					{ name: 'typeCode', checkType: 'notnull', errorMsg: '请输入编码' },
-					{ name: 'typeName', checkType: 'notnull', errorMsg: '请输入名称' },
-					{ name: 'status', checkType: 'notnull', errorMsg: '请选择状态' }
-				]; */
-				/* if (!this.verify.check(this.item, rule)) {
-					uni.showModal({ content: this.verify.error, showCancel: false });
-					return false;
-				} */
-				this.http.request({
-					url: '/level-one-server/app/TbGoodsTransit/transactionGoods',
-					method:'POST',
-					data: this.item,
-					success: res => {
-						uni.showToast({ title: '操作成功' });
-						setTimeout(() => {
-							uni.$emit('ctype');
-							uni.navigateBack();
-						}, 1000);
-					}
-				});
-			}
-
-		}
-	}
-</script>
-
-<style lang="scss">
-.btn {
-	margin-top: 25px;
-}
-</style>

pages/goodsManage/oneMarket/editGoods.vue

@@ -1,129 +0,0 @@
-<template>
-	<view class="cmain">
-		<view class="form_group">
-			<view class="lable re">监管商品类型</view>
-			<input type="text" placeholder="请输入" v-model="item.declareOdd" />
-		</view>
-		<view class="form_group">
-			<view class="lable re">商品名称</view>
-			<input type="text" placeholder="请输入" v-model="item.goodsName" />
-		</view>
-		<view class="form_group">
-			<view class="lable re">商品产地</view>
-			<input type="text" placeholder="请输入" v-model="item.placeOrigin" />
-		</view>
-		<view class="form_group">
-			<view class="lable re">商品类型</view>
-			<input type="text" placeholder="请输入" v-model="item.goodsType" />
-			<!-- <u-input type="select" v-model="item.goodsType" border="false" placeholder="请选择商品类型" @click="show = true"/>
-			<u-action-sheet :list="goodsTypes" v-model="show" @click="actionSheetCallback"/> -->
-		</view>
-		<view class="form_group">
-			<view class="lable re">商品单位</view>
-			<input type="text" placeholder="请输入" v-model="item.goodsUnits" />
-		</view>
-		<view class="form_group">
-			<view class="lable re">商品价格</view>
-			<input type="text" placeholder="请输入" v-model="item.price" />
-		</view>
-		<view class="form_group">
-			<view class="lable re">商品数量</view>
-			<input type="text" placeholder="请输入" v-model="item.stock" />
-		</view>
-		<view class="form_group">
-			<view class="lable re">净重</view>
-			<input type="text" placeholder="请输入" v-model="item.netWeight" />
-		</view>
-		<view class="form_group">
-			<view class="lable re">毛重</view>
-			<input type="text" placeholder="请输入" v-model="item.grossWeight" />
-		</view>
-		<view class="form_group">
-			<view class="lable re">商品状态</view>
-			<input type="text" placeholder="请输入" v-model="item.goodsStatus" />
-		</view>
-		<view class="form_group">
-			<view class="lable re">商品描述</view>
-			<input type="text" placeholder="请输入" v-model="item.description" />
-		</view>
-		<view class="form_group">
-			<view class="lable re">商品图片</view>
-			<card v-model="item.goodsImg" pic="../../static/images/yyzz.png"></card>
-		</view>
-		<button class="btn" @click="save()">修改商品提交</button>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				id: 0,
-				item: {goodsType:''},
-				goodsTypes: [
-					{label:'水果'},
-					{label:'药品'},
-					{label:'茶叶'},
-				],
-				show: false,
-			}
-		},
-		onLoad(option) {
-			console.log('111111',option.id)
-			this.id = option.id
-			if(undefined != this.id && null != this.id && 0 != this.id) {
-				this.getGoodsTransitDetail();
-			}
-		},
-		methods: {
-			// 获取商品详情
-			getGoodsTransitDetail(){
-				this.http.request({
-					url: '/level-one-server/app/TbGoodsTransit/getById',
-					method:'POST',
-					data: {id:this.id},
-					success: res => {
-						this.item = res.data.data;
-						//uni.showToast({ title: '操作成功' });
-						
-					}
-				});
-			},
-			// 点击actionSheet回调
-			actionSheetCallback(index) {
-				console.log('index',index)
-				this.item.goodsType = this.goodsTypes[index].label;
-			},
-			save() {
-				/* let rule = [
-					{ name: 'typeCode', checkType: 'notnull', errorMsg: '请输入编码' },
-					{ name: 'typeName', checkType: 'notnull', errorMsg: '请输入名称' },
-					{ name: 'status', checkType: 'notnull', errorMsg: '请选择状态' }
-				]; */
-				/* if (!this.verify.check(this.item, rule)) {
-					uni.showModal({ content: this.verify.error, showCancel: false });
-					return false;
-				} */
-				this.http.request({
-					url: '/level-one-server/app/TbGoodsTransit/transactionGoods',
-					method:'POST',
-					data: this.item,
-					success: res => {
-						uni.showToast({ title: '操作成功' });
-						setTimeout(() => {
-							uni.$emit('ctype');
-							uni.navigateBack();
-						}, 1000);
-					}
-				});
-			}
-
-		}
-	}
-</script>
-
-<style lang="scss">
-.btn {
-	margin-top: 25px;
-}
-</style>

pages/goodsManage/oneMarket/goodsHandle.vue

@@ -1,225 +0,0 @@
-<template>
-	<view>
-		<uni-nav-bar color="#fff" height="60" left-icon="back" @clickLeft="back()" @clickRight="rightClick()"
-			 right-text="新增商品" :border="false" backgroundColor="#0081ff" title="商品管理" />
-		</u-navbar>
-		
-		<u-list class="list" width="100%" @scrolltolower="scrolltolower">
-			<u-list-item v-for="(item, index) in goods" :key="index">
-				<view class="item-box">
-					<view class="goods-item">
-						<u-row>
-							<u-col span="5" @click="toDetails(item.id)">
-								<u--image :showLoading="true" src="" width="270rpx" height="220rpx"></u--image>
-							</u-col>
-							<u-col span="7">
-								<view class="t1 txt" @click="toDetails(item.id)">
-									<text>{{item.goodsName}}</text>
-								</view>
-								<view class="txt">
-									<text v-if="item.grossWeight">{{item.grossWeight}}吨</text>
-								</view>
-								<view class="txt" v-if="item.tradeAreaName">
-									<u-tag style="width: 250rpx" :text="item.tradeAreaName" plain size="mini"></u-tag>
-								</view>
-								<view class="t4">
-									<view class="price">￥{{item.price}}</view>
-									<view class="edit" @click="editGoods(item.id)">
-										<u-icon color="#fff" name="edit-pen-fill" size="30"></u-icon>
-									</view>
-									<view class="delete" @click="deleteGoods(item.id)">
-										<u-icon color="#fff" name="warning-fill" size="30"></u-icon>
-									</view>
-								</view>
-							</u-col>
-						</u-row>
-					</view>
-				</view>
-			</u-list-item>
-		</u-list>
-		
-		
-		<view class="tab">
-			<!-- <view class="tabBtn" @click="BtnClick(1)">
-				<u-icon label="商品列表" size="30" color="#ef732a" labelColor="#ef732a" name="shopping"></u-icon>
-			</view> -->
-			<view class="tabBtn" @click="BtnClick()">
-				<u-icon label="订单列表" size="30" color="#1E90FF" labelColor="#1E90FF" name="order"></u-icon>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				loadmoreStatus: 'loadmore',
-				form: {},
-				goods: [],
-				orders: [],
-				item: {},
-				
-
-			}
-		},
-		onLoad() {
-			this.getTransitList()
-		},
-		methods: {
-			// 商品列表
-			getTransitList() {
-				this.form = {
-					isOrders: 0,//是否已被下单[0=未被下单,1=已被下单]
-					//enterpriseConfirm: ,//商铺确认情况[0=待确认,1=已确认,2=拒绝]
-					goodsStatus: 1,//商品状态(0=下架,1=在售)
-				}
-				this.http.request({
-					url: '/level-one-server/app/TbGoodsTransit/getTransitList',
-					data: this.form,
-					//method: 'POST',
-					success: resp => {
-						console.log('resp',resp)
-						this.goods = resp.data.data;
-						this.goods.forEach((item, index) => {
-							if (index === this.goods.length - 1) {
-								this.loadmoreStatus = 'nomore'
-							} else {
-								this.loadmoreStatus = 'loadmore'
-							}
-						})
-					}
-				});
-			},
-			// 删除商品
-			deleteGoods(id) {
-				console.log('id',id)
-				this.http.request({
-					url: '/level-one-server/app/TbGoodsTransit/deleteById',
-					data: {id : id},
-					method: 'POST',
-					success: resp => {
-						console.log('删除商品',resp)
-					}
-				});
-			},
-			// 编辑商品
-			editGoods(id) {
-				this.$common.to('/pages/goodsManage/oneMarket/editGoods?id='+id)
-			},
-			scrolltolower() {
-				this.getTransitList()
-			},
-			BtnClick(type) {
-				uni.navigateTo({
-					url: '/pages/goodsManage/oneMarket/goodsOrders'
-				})
-			},
-			back() {
-				uni.switchTab({
-					url: '/pages/index/index'
-				});
-			},
-			rightClick() {
-				this.$common.to('/pages/goodsManage/oneMarket/addGoods')
-			},
-
-			
-		}/* ,
-		onNavigationBarButtonTap(e) { //导航栏新增商品按钮
-			this.$common.to('/pages/goodsManage/oneMarket/addGoods')
-		} */
-	}
-</script>
-
-<style lang="scss">
-
-	.list {
-		height: auto;
-		border-radius: 10rpx;
-		margin: 15rpx;
-	}
-
-	.goods-item {
-		margin-bottom: 8rpx;
-	}
-
-	.item-box {
-		height: 230rpx;
-		width: 90%;
-		padding: 20rpx;
-		background-color: #fff;
-		border: 1rpx #FFF solid;
-		margin: 10rpx 0rpx;
-		border-radius: 10rpx;
-	}
-
-	.txt {
-		/* height: 50rpx; */
-		margin-bottom: 20rpx;
-	}
-
-	.t1 {
-		font-size: 32rpx;
-		font-weight: bold;
-		word-wrap: break-word;
-		position: relative;
-		top: 1rpx;
-		right: 5rpx;
-	}
-
-	.t4 {
-		display: flex;
-		position: relative;
-		bottom: 1rpx;
-		right: 5rpx;
-	}
-	
-	.price {
-		color: #ef732a;
-		width: 400rpx;
-		font-weight: bold;
-	}
-
-	.edit {
-		background-color: #0081ff;
-		width: 60rpx;
-		height: 60rpx;
-		border-radius: 30rpx;
-		text-align: center;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
-	.delete {
-		background-color: indianred;
-		width: 60rpx;
-		height: 60rpx;
-		border-radius: 30rpx;
-		text-align: center;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
-	.tab {
-		position: fixed;
-		bottom: 1rpx;
-		width: 100%;
-		height: 100rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		border-top: #ffffff 1rpx solid;
-		background-color: #ffffff;
-	}
-	
-
-	.tabBtn {
-		width: 35%;
-		height: 100%;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		margin: 0 30rpx;
-	}
-</style>

pages/goodsManage/oneMarket/goodsOrders.vue

@@ -1,173 +0,0 @@
-<template>
-	<view>
-		
-		<u-list class="list" width="100%" @scrolltolower="scrolltolower">
-			<u-list-item v-for="(item, index) in orders" :key="index">
-				<view class="item-box">
-					<view class="goods-item">
-						<u-row>
-							<u-col span="5" @click="toDetails(item.id)">
-								<u--image :showLoading="true" src="" width="270rpx" height="220rpx"></u--image>
-							</u-col>
-							<u-col span="7">
-								<view class="t1 txt" @click="toDetails(item.id)">
-									<text>{{item.goodsName}}</text>
-								</view>
-								<view class="txt">
-									<text v-if="item.grossWeight">{{item.grossWeight}}吨</text>
-								</view>
-								<view class="txt" v-if="item.tradeAreaName">
-									<u-tag style="width: 250rpx" :text="item.tradeAreaName" plain size="mini"></u-tag>
-								</view>
-								<view class="t4">
-									<view class="price">￥{{item.price}}</view>
-									<!-- 接受 商铺确认情况[0=待确认,1=已确认,2=拒绝]-->
-									<view class="edit" @click="orderConfirm(item.id,1)">
-										<u-icon color="#fff" name="edit-pen-fill" size="30"></u-icon>
-									</view>
-									<!-- 拒绝 -->
-									<view class="delete" @click="orderConfirm(item.id,2)">
-										<u-icon color="#fff" name="edit-pen-fill" size="30"></u-icon>
-									</view>
-								</view>
-							</u-col>
-						</u-row>
-					</view>
-				</view>
-			</u-list-item>
-		</u-list>
-		
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				loadmoreStatus: 'loadmore',
-				form: {},
-				orders: [],
-			}
-		},
-		onLoad() {
-			this.getOrderTransitList()
-		},
-		methods: {
-			// 订单列表
-			getOrderTransitList() {
-				this.form = {
-					isOrders: 1,//是否已被下单[0=未被下单,1=已被下单]
-					enterpriseConfirm: 0,//商铺确认情况[0=待确认,1=已确认,2=拒绝]
-					goodsStatus: 1,//商品状态(0=下架,1=在售)
-				}
-				this.http.request({
-					url: '/level-one-server/app/TbGoodsTransit/getTransitList',
-					data: this.form,
-					method: 'POST',
-					success: resp => {
-						console.log('resp',resp)
-						this.orders = resp.data.data;
-						this.orders.forEach((item, index) => {
-							if (index === this.orders.length - 1) {
-								this.loadmoreStatus = 'nomore'
-							} else {
-								this.loadmoreStatus = 'loadmore'
-							}
-						})
-					}
-				});
-			},
-			// 商家确认
-			orderConfirm(id,status) {
-				this.form = {
-					id: id,
-					//isOrders: 0,//是否已被下单[0=未被下单,1=已被下单]
-					enterpriseConfirm: status,//商铺确认情况[0=待确认,1=已确认,2=拒绝]
-					//goodsStatus: 1,//商品状态(0=下架,1=在售)
-				}
-				this.http.request({
-					url: '/level-one-server/app/TbGoodsTransit/update',
-					data: this.form,
-					method: 'POST',
-					success: resp => {
-						console.log('resp',resp)
-						uni.showToast({ title: '操作成功' });
-					}
-				});
-			},
-			scrolltolower() {
-				this.getOrderTransitList()
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.list {
-		height: auto;
-		border-radius: 10rpx;
-		margin: 15rpx;
-	}
-
-	.goods-item {
-		margin-bottom: 8rpx;
-	}
-
-	.item-box {
-		height: 230rpx;
-		width: 90%;
-		padding: 20rpx;
-		background-color: #fff;
-		border: 1rpx #FFF solid;
-		margin: 10rpx 0rpx;
-		border-radius: 10rpx;
-	}
-
-	.txt {
-		/* height: 50rpx; */
-		margin-bottom: 20rpx;
-	}
-
-	.t1 {
-		font-size: 32rpx;
-		font-weight: bold;
-		word-wrap: break-word;
-		position: relative;
-		top: 1rpx;
-		right: 5rpx;
-	}
-
-	.t4 {
-		display: flex;
-		position: relative;
-		bottom: 1rpx;
-		right: 5rpx;
-	}
-	
-	.price {
-		color: #ef732a;
-		width: 400rpx;
-		font-weight: bold;
-	}
-
-	.edit {
-		background-color: #0081ff;
-		width: 60rpx;
-		height: 60rpx;
-		border-radius: 30rpx;
-		text-align: center;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
-	.delete {
-		background-color: indianred;
-		width: 60rpx;
-		height: 60rpx;
-		border-radius: 30rpx;
-		text-align: center;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
-</style>

pages/index/index.vue

@@ -68,7 +68,7 @@ export default {
 	onLoad() {
 		this.getBannerList();
 		this.getNewsList();
-		// this.getRoleMenu();
+		this.getRoleMenu();
 		this.getMenu();
 	},
 	methods: {
@@ -82,15 +82,18 @@ export default {
 		},
 		getRoleMenu() {
 			let menu = uni.getStorageSync('menu');
-			this.$api.getRoleMenu().then(res => {
-				res.data.map((item1, index) => {
-					menu.map((item2, index1) => {
-						if (item1.appRoleId == item2) {
-							this.roleMenu.push(item1.appMenuId);
-						}
+			this.http.request({
+				url: '/sp-admin/ReRoleMenu/getList',
+				success: res => {
+					res.data.data.map((item1, index) => {
+						menu.map((item2, index1) => {
+							if (item1.appRoleId == item2) {
+								this.roleMenu.push(item1.appMenuId);
+							}
+						});
 					});
-				});
-				this.getMenu();
+					this.getMenu();
+				}
 			});
 		},
 		getMenu() {
@@ -118,8 +121,14 @@ export default {
 				}
 			});
 		},
-		navTo(path) {
-			uni.navigateTo({ url: path });
+		navTo(url) {
+			uni.navigateTo({
+				url: url,
+				fail: res => {
+					console.log('zx:' + JSON.stringify(res));
+					uni.showModal({ content: '功能还在开发中', showCancel: false });
+				}
+			});
 		}
 	}
 };

pages/login/login.vue

@@ -21,12 +21,12 @@
 				<u-checkbox-group class="checkbox" v-model="form.checked">
 					<u-checkbox size="15" shape="circle" label="我已阅读并同意" labelSize="13" name="true"></u-checkbox>
 				</u-checkbox-group>
-				<text class="a" @click="getAgreement(1)">《用户协议》</text>
+				<text class="a" @click="go('/pages/login/userAgreement?id=1')">《用户协议》</text>
 				<text>和</text>
-				<text class="a" @click="getAgreement(2)">《隐私政策》</text>
+				<text class="a" @click="go('/pages/login/userAgreement?id=2')">《隐私政策》</text>
 			</view>
 			<button class="btn" @click="submit()">登录</button>
-			<button class="btn register" @click="toRegister()">注册</button>
+			<button class="btn register" @click="go('/pages/login/chooseRole')">注册</button>
 		</view>
 	</view>
 </template>
@@ -39,6 +39,13 @@ export default {
 			form: {}
 		};
 	},
+	onLoad() {
+		//自动登陆
+		if (uni.getStorageSync('token')) {
+			uni.switchTab({ url: '/pages/index/index' });
+			return;
+		}
+	},
 	methods: {
 		submit() {
 			let rule = [
@@ -56,7 +63,7 @@ export default {
 				method: 'POST',
 				success: resp => {
 					let data = resp.data.data;
-					console.log(data)
+					console.log(data);
 					uni.setStorageSync('token', data.tokenInfo.tokenValue);
 					uni.setStorageSync('info', data.appUser);
 					uni.setStorageSync('menu', data.per_list);
@@ -64,11 +71,8 @@ export default {
 				}
 			});
 		},
-		toRegister() {
-			this.$common.to('/pages/login/chooseRole');
-		},
-		getAgreement(id) {
-			this.$common.to('/pages/login/userAgreement?id=' + id);
+		go(url) {
+			uni.navigateTo({ url: url });
 		}
 	}
 };

pages/market/one/detail.vue

@@ -0,0 +1,123 @@
+<template>
+	<view>
+		<view class="product_detail">
+			<image src="../../../static/news.jpg" mode="widthFix" class="pic"></image>
+			<view class="box">
+				<view class="title">{{ item.goodsName }}</view>
+				<view class="price">¥ {{ item.price }}</view>
+				<view class="clear"></view>
+				<u-divider text="规格参数"></u-divider>
+				<view class="item">
+					<text class="desc">净重：</text>
+					<text>25吨</text>
+				</view>
+				<view class="item">
+					<text class="desc">毛重：</text>
+					<text>25吨</text>
+				</view>
+				<view class="item">
+					<text class="desc">净重：</text>
+					<text>25吨</text>
+				</view>
+				<view class="item">
+					<text class="desc">商户：</text>
+					<text>基栋收购商</text>
+				</view>
+				<view class="item">
+					<text class="desc">互市区：</text>
+					<text>东兴一桥互市区</text>
+				</view>
+				<view class="item">
+					<text class="desc">发布时间：</text>
+					<text>2023-08 15:35</text>
+				</view>
+				<u-divider text="商品介绍"></u-divider>
+				<view class="contents">八角茴香是木兰科八角属的常绿乔木。树皮灰褐色或红褐色；叶互生或叶簇生于枝端；叶片革质，椭圆状倒卵</view>
+			</view>
+		</view>
+		<view class="mfooter">
+			<view class="flex">
+				<view class="f">
+					<button class="save btn" @click="addCar()">加入购物车</button>
+				</view>
+				<view class="f">
+					<button class="btn" @click="buy()">立即购买</button>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			user: this.getUser(),
+			item: {}
+		};
+	},
+	onLoad(e) {
+		if (e.id) {
+			this.http.request({
+				url: '/level-one-server/TbGoodsTransit/getById?id=' + e.id,
+				success: res => {
+					this.item = res.data.data;
+				}
+			});
+		}
+	},
+	methods: {
+		addCar() {
+			let params = {
+				buyUserId: this.user.id,
+				enterpriseId: this.goods.merchantId,
+				shopId: this.goods.shopId,
+				tradeAreaId: this.goods.tradeAreaId,
+				saleGoodsInfoId: this.goods.id,
+				goodsImg: this.goods.goodsImg,
+				goodsName: this.goods.goodsName
+				// buyNum: parseInt(this.num)
+			};
+			this.http.request({
+				url: '/level-one-server/app/TbGoodsCart/addGoodsInShopCart',
+				data: params,
+				contentType: 'application/json; charset=utf-8',
+				method: 'POST',
+				success: res => {
+					setTimeout(function () {
+						uni.showToast({
+							title: res.data.msg
+						});
+					}, 1000);
+				}
+			});
+		},
+		// 立即购买
+		buy() {
+			this.http.request({
+				url: '/level-one-server/app/TbGoodsTransit/purchaseLevelOntGoodsTransit',
+				data: { goodsTransitId: this.item.id },
+				method: 'POST',
+				contentType: 'application/json; charset=utf-8',
+				success: res => {
+					uni.showToast({ title: '操作成功' });
+					setTimeout(() => {
+						uni.$emit('purchaser_buy_list');
+						uni.navigateBack();
+					}, 1000);
+				}
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background-color: $pg;
+}
+.btn {
+	width: 100%;
+	border-radius: 5px;
+}
+</style>

pages/market/one/leader/success.vue

@@ -0,0 +1,41 @@
+<template>
+	<view class="cmain">
+		<view class="icon">&#xe602;</view>
+		<view class="desc">你的订单已提交成功，</view>
+		<view class="desc">正在等待商家确认。</view>
+		<button class="btn" @click="go()">前往订单</button>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {};
+	},
+	methods: {
+		go() {
+			uni.redirectTo({
+				url: '/pages/market/one/leader/order'
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.cmain {
+	text-align: center;
+	padding: 40px;
+	color: $font-c;
+	.icon {
+		font-size: 150px;
+		color: $main-color;
+	}
+	.desc {
+		margin-top: 7px;
+	}
+	.btn {
+		margin-top: 50px;
+	}
+}
+</style>

pages/market/one/list.vue

@@ -0,0 +1,120 @@
+<template>
+	<view>
+		<view class="search">
+			<u-search placeholder="搜索商品名称" v-model="param.customerName" bgColor="white" @search="refresh()" :animation="true" actionText="取消" @clear="refresh()"></u-search>
+			<view class="clear"></view>
+		</view>
+		<view class="goodsList">
+			<view class="sort-list">
+				<view class="sort-item" :class="{ active: item.check }" v-for="(item, index) in sort" :key="index" @click="select(item, index)">
+					<text>{{ item.name }}</text>
+					<text v-if="index > 0 && item.isAsc == 'desc'" class="icon">&#xeb0a;</text>
+					<text v-if="index > 0 && item.isAsc == 'asc'" class="icon">&#xeb0b;</text>
+				</view>
+				<view class="type" @click="show = true">
+					<text>分类</text>
+					<text class="icon">&#xe8f2;</text>
+				</view>
+				<view class="clear"></view>
+			</view>
+			<view class="item" v-for="(item, index) in list" :key="index" @click="detail(item.id)">
+				<view class="title">广西京东自营店南宁分店</view>
+				<image src="../../../static/news.jpg" mode="aspectFill" class="pic"></image>
+				<view class="con">
+					<view class="productName omit">{{ item.goodsName }}</view>
+					<view class="desc">
+						<text>50吨</text>
+						<text>{{ item.tradeAreaName }}</text>
+					</view>
+					<view class="price">¥ {{ item.price }}</view>
+					<view class="icon buy" @click.stop="addCar(item)">&#xe604;</view>
+				</view>
+				<view class="clear"></view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			show: false,
+			user: this.getUser(),
+			sort: [
+				{
+					name: '综合',
+					key: 1,
+					isAsc: 'desc',
+					check: false
+				},
+				{
+					name: '日期',
+					key: 2,
+					isAsc: 'desc',
+					check: false
+				},
+				{
+					name: '价格',
+					key: 3,
+					isAsc: 'desc',
+					check: false
+				}
+			],
+			list: [],
+			param: { pageNo: 1, pageSize: 10 },
+			loadMore: true
+		};
+	},
+	onLoad() {
+		this.getData();
+	},
+	methods: {
+		getData() {
+			this.http.request({
+				url: '/level-one-server/TbGoodsTransit/getTransitList',
+				data: this.param,
+				loading: 'false',
+				success: res => {
+					this.loadMore = parseInt(res.data.pageCount) > this.param.pageNo;
+					this.list.push(...res.data.data);
+				}
+			});
+		},
+		// 添加购物车
+		addCar(goods) {
+			let params = {
+				buyUserId: this.user.id,
+				enterpriseId: goods.merchantId,
+				shopId: goods.shopId,
+				tradeAreaId: goods.tradeAreaId,
+				saleGoodsInfoId: goods.id,
+				goodsImg: goods.goodsImg,
+				goodsName: goods.goodsName
+				// buyNum: parseInt(this.num)
+			};
+			this.http.request({
+				url: '/level-one-server/app/TbGoodsCart/addGoodsInShopCart',
+				data: params,
+				contentType: 'application/json; charset=utf-8',
+				method: 'POST',
+				success: res => {
+					uni.showToast({ title: '添加成功' });
+				}
+			});
+		},
+		detail(id) {
+			uni.navigateTo({ url: '/pages/market/one/detail?id=' + id });
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background-color: $pg;
+}
+.search {
+	padding: 12px 12px 0px 12px;
+}
+</style>

pages/market/one/merchant/goods/add.vue

@@ -0,0 +1,120 @@
+<template>
+	<view>
+		<view class="cmain">
+			<view class="form_group">
+				<view class="lable re">海关申报单号</view>
+				<input placeholder="请输入" v-model="item.declareOdd" />
+			</view>
+			<view class="form_group">
+				<view class="lable re">商品名称</view>
+				<input placeholder="请输入" v-model="item.goodsName" />
+			</view>
+			<view class="form_group">
+				<view class="lable re">商品产地</view>
+				<input placeholder="请输入" v-model="item.placeOrigin" />
+			</view>
+			<view class="form_group">
+				<view class="lable re">商品类型</view>
+				<picker :range="dict.goodsType" @change="picker($event, 'goodsType')">
+					<input placeholder="请选择" v-model="item.goodsType" :disabled="true" />
+					<view class="icon more">&#xe8f2;</view>
+				</picker>
+			</view>
+			<view class="form_group">
+				<view class="lable re">商品单位</view>
+				<picker :range="dict.goodsUnits" @change="picker($event, 'goodsUnits')">
+					<input placeholder="请选择" v-model="item.goodsUnits" :disabled="true" />
+					<view class="icon more">&#xe8f2;</view>
+				</picker>
+			</view>
+			<view class="form_group">
+				<view class="lable re">商品价格</view>
+				<input type="number" placeholder="请输入" v-model="item.price" />
+				<view class="ops">元</view>
+			</view>
+			<view class="form_group">
+				<view class="lable re">商品数量</view>
+				<input type="number" placeholder="请输入" v-model="item.stock" />
+				<view class="ops">{{ item.goodsUnits }}</view>
+			</view>
+			<view class="form_group">
+				<view class="lable re">净重</view>
+				<input placeholder="请输入" v-model="item.netWeight" />
+				<view class="ops">吨</view>
+			</view>
+			<view class="form_group">
+				<view class="lable re">毛重</view>
+				<input placeholder="请输入" v-model="item.grossWeight" />
+				<view class="ops">吨</view>
+			</view>
+			<view class="form_group">
+				<view class="lable re">商品状态</view>
+				<picker :range="dict.goodsStatus" @change="picker($event, 'goodsStatus')">
+					<input placeholder="请选择" :value="item.goodsStatus == 1 ? '在售' : '下架'" :disabled="true" />
+					<view class="icon more">&#xe8f2;</view>
+				</picker>
+			</view>
+			<view class="form_group">
+				<view class="lable re">商品描述</view>
+				<textarea v-model="item.description" placeholder="请输入"></textarea>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			item: {},
+			dict: {
+				goodsType: ['水果', '药品', '茶叶'],
+				goodsUnits: ['吨', '个', '柜'],
+				goodsStatus: ['在售', '下架']
+			}
+		};
+	},
+	onLoad(e) {
+		if (e.id) {
+			this.http.request({
+				url: '/level-one-server/app/TbGoodsTransit/getById?id=' + e.id,
+				success: res => {
+					this.item = res.data.data;
+					uni.setNavigationBarTitle({ title: '编辑商品' });
+				}
+			});
+		}
+	},
+	methods: {
+		picker(e, tag) {
+			this.item[tag] = this.dict[tag][e.detail.value];
+			this.$forceUpdate();
+		}
+	},
+	onNavigationBarButtonTap() {
+		let rule = [
+			{ name: 'goodsName', checkType: 'notnull', errorMsg: '请输入商品名称' },
+			{ name: 'placeOrigin', checkType: 'notnull', errorMsg: '请输入商品产地' },
+			{ name: 'goodsStatus', checkType: 'notnull', errorMsg: '请选择状态' }
+		];
+		if (!this.verify.check(this.item, rule)) {
+			uni.showModal({ content: this.verify.error, showCancel: false });
+			return false;
+		}
+		this.http.request({
+			url: '/level-one-server/app/TbGoodsTransit/transactionGoods',
+			method: 'POST',
+			data: this.item,
+			success: res => {
+				uni.showToast({ title: '操作成功' });
+				setTimeout(() => {
+					uni.$emit('goodsHandle');
+					uni.navigateBack();
+				}, 1000);
+			}
+		});
+	}
+};
+</script>
+
+<style lang="scss"></style>

pages/market/one/merchant/goods/list.vue

@@ -0,0 +1,193 @@
+<template>
+	<view>
+		<view class="tab">
+			<u-tabs :list="tab" @click="click" :lineHeight="5"></u-tabs>
+			<view class="length">{{ dataCount }}件商品</view>
+		</view>
+		<view class="goodsManageList">
+			<view class="item" v-for="(item, index) in list" :key="index">
+				<view class="top">
+					<view class="title omit">{{ item.goodsName }}</view>
+					<view class="state" v-if="item.goodsStatus == 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>
+					<view class="clear"></view>
+				</view>
+				<view class="con">
+					<view class="flex fs">
+						<view class="f">
+							<view class="tag">类型</view>
+							<view class="v omit">{{ item.goodsType }}</view>
+						</view>
+						<view class="f">
+							<view class="tag">单位</view>
+							<view class="v omit">{{ item.goodsUnits || '吨' }}</view>
+						</view>
+						<view class="f">
+							<view class="tag">价格</view>
+							<view class="v omit">￥{{ item.price }}</view>
+						</view>
+						<view class="f">
+							<view class="tag">库存</view>
+							<view class="v omit">{{ item.stock }}吨</view>
+						</view>
+					</view>
+				</view>
+				<view class="op">
+					<view class="flex">
+						<view class="f rline" style="color: #0081ff" @click.stop="edit(item.id)">
+							<text class="icon">&#xe668;</text>
+							<text>编辑</text>
+						</view>
+						<view class="f" style="color: #f44336" @click.stop="del(item.id)">
+							<text class="icon">&#xe852;</text>
+							<text>删除</text>
+						</view>
+					</view>
+				</view>
+				<view class="clear"></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 class="mfooter">
+			<view class="order">
+				<view class="f bage">
+					<text class="icon">&#xe830;</text>
+					<text>你有新的订单待处理</text>
+				</view>
+				<view class="f op" @click="order()">
+					<text class="icon">&#xe67b;</text>
+					<text>查看订单</text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			tab: [
+				{ name: '全部', goodsStatus: '' },
+				{ name: '在售', goodsStatus: 1 },
+				{ name: '下架', goodsStatus: 0 }
+			],
+			param: { pageNo: 1, pageSize: 10, isOrders: 0 },
+			list: [],
+			loadMore: true,
+			dataCount: 0
+		};
+	},
+	onLoad() {
+		this.getData();
+		uni.$on('goodsHandle', res => {
+			this.refresh();
+		});
+	},
+	methods: {
+		getData() {
+			this.http.request({
+				url: '/level-one-server/app/TbGoodsTransit/getTransitList',
+				loading: 'false',
+				data: this.param,
+				success: res => {
+					this.dataCount = res.data.dataCount;
+					this.loadMore = parseInt(res.data.pageCount) > this.param.pageNo;
+					this.list.push(...res.data.data);
+				}
+			});
+		},
+		//点击tab切换
+		click(e) {
+			this.param.goodsStatus = e.goodsStatus;
+			this.refresh();
+		},
+		del(id) {
+			uni.showModal({
+				title: '提示',
+				content: '确定删除?',
+				success: res => {
+					if (res.confirm) {
+						this.http.request({
+							url: '/level-one-server/app/TbGoodsTransit/deleteById?id=' + id,
+							success: res => {
+								uni.showToast({ title: '删除成功' });
+								this.refresh();
+							}
+						});
+					}
+				}
+			});
+		},
+		edit(id) {
+			uni.navigateTo({ url: '/pages/market/one/merchant/goods/add?id=' + id });
+		},
+		order() {
+			uni.navigateTo({ url:'/pages/market/one/merchant/order/list' });
+		},
+		//刷新数据
+		refresh() {
+			this.loadMore = true;
+			this.param.pageNo = 1;
+			this.list = [];
+			this.getData();
+		}
+	},
+	//下拉刷新
+	onPullDownRefresh() {
+		setTimeout(() => {
+			this.refresh();
+			uni.stopPullDownRefresh();
+		}, 1000);
+	},
+	//上拉加载
+	onReachBottom() {
+		if (this.loadMore) {
+			this.param.pageNo++;
+			this.getData();
+		}
+	},
+	onNavigationBarButtonTap() {
+		uni.navigateTo({ url: '/pages/market/one/merchant/goods/add' });
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background-color: $pg;
+}
+.goodsManageList {
+	padding-bottom: 55px;
+}
+.mfooter {
+	.order {
+		display: flex;
+		.f {
+			flex: 1;
+			padding: 16px;
+		}
+		.bage {
+			color: #f44336;
+			text-align: left;
+			font-size: 14px;
+		}
+		.op {
+			background-color: $main-color;
+			color: white;
+			flex: 0.5;
+		}
+		.icon {
+			padding-right: 5px;
+		}
+	}
+}
+</style>
+s

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

@@ -0,0 +1,96 @@
+<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">13454334567</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">胡椒粉</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>
+
+<script>
+export default {
+	data() {
+		return {
+			item: {}
+		};
+	},
+	onLoad(e) {
+		if (e.id) {
+			/* 			this.http.request({
+				url: '/level-one-server/app/TbPortNews/getPortNewsDetails?id=' + e.id,
+				success: res => {
+					this.item = res.data.data;
+				}
+			}); */
+		}
+	},
+	methods: {}
+};
+</script>
+
+<style lang="scss">
+page {
+	background-color: $pg;
+}
+</style>

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

@@ -0,0 +1,132 @@
+<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">广西京东自营店南宁分店</view>
+				<view class="state" v-if="item.enterpriseConfirm == 0">
+					<text class="icon">&#xe830;</text>
+					<text>待确认</text>
+				</view>
+				<view class="state" v-if="item.enterpriseConfirm == 1">
+					<text class="icon" style="color: #13ce66">&#xe830;</text>
+					<text>已确认</text>
+				</view>
+				<view class="state" v-if="item.enterpriseConfirm == 2">
+					<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">越南巴沙鱼</view>
+					<view class="desc omit">
+						<text>50吨</text>
+						<text>{{ item.tradeAreaName }}</text>
+					</view>
+					<view class="price">¥ {{ item.price }}</view>
+				</view>
+				<view class="clear"></view>
+				<view class="op">
+					<view class="date">2022-12-12:12:12</view>
+					<template v-if="item.enterpriseConfirm == 0">
+						<view class="an" style="color: #f44336" @click.stop="confirm(item.id, 2, '确认拒绝？')">取消订单</view>
+						<view class="an" style="color: #4581fb" @click.stop="confirm(item.id, 1, '确认接单？')">确认订单</view>
+					</template>
+				</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: [
+				{ name: '全部', enterpriseConfirm: '' },
+				{ name: '待确认', enterpriseConfirm: 0 },
+				{ name: '已确认', enterpriseConfirm: 1 },
+				{ name: '已拒绝', enterpriseConfirm: 2 }
+			],
+			param: { pageNo: 1, pageSize: 10, isOrders: 1 },
+			list: [],
+			loadMore: true
+		};
+	},
+	onLoad() {
+		this.getData();
+	},
+	methods: {
+		getData() {
+			this.http.request({
+				url: '/level-one-server/app/TbGoodsTransit/getTransitList',
+				loading: 'false',
+				data: this.param,
+				success: res => {
+					this.loadMore = parseInt(res.data.pageCount) > this.param.pageNo;
+					this.list.push(...res.data.data);
+				}
+			});
+		},
+		//点击tab切换
+		click(e) {
+			this.param.enterpriseConfirm = e.enterpriseConfirm;
+			this.refresh();
+		},
+		detail(item) {
+			uni.navigateTo({ url: '/pages/market/one/merchant/order/detail?id=' + item.id });
+		},
+		//刷新数据
+		refresh() {
+			this.loadMore = true;
+			this.param.pageNo = 1;
+			this.list = [];
+			this.getData();
+		},
+		// 商家确认
+		confirm(id, status, content) {
+			uni.showModal({
+				title: '提示',
+				content: content,
+				success: res => {
+					if (res.confirm) {
+						this.http.request({
+							url: '/level-one-server/app/TbGoodsTransit/update',
+							data: { id: id, enterpriseConfirm: status },
+							method: 'POST',
+							success: resp => {
+								uni.showToast({ title: '操作成功' });
+								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/two/detail.vue

@@ -0,0 +1,84 @@
+<template>
+	<view>
+		<view class="product_detail">
+			<image src="../../../static/news.jpg" mode="widthFix" class="pic"></image>
+			<view class="box">
+				<view class="title">八角茴香（未磨）（可食用）</view>
+				<view class="price">¥ 5000</view>
+				<view class="clear"></view>
+				<u-divider text="规格参数"></u-divider>
+				<view class="item">
+					<text class="desc">净重：</text>
+					<text>25吨</text>
+					<view class="clear"></view>
+				</view>
+				<view class="item">
+					<text class="desc">毛重：</text>
+					<text>25吨</text>
+					<view class="clear"></view>
+				</view>
+				<view class="item">
+					<text class="desc">净重：</text>
+					<text>25吨</text>
+					<view class="clear"></view>
+				</view>
+				<view class="item">
+					<text class="desc">商户：</text>
+					<text>基栋收购商</text>
+					<view class="clear"></view>
+				</view>
+				<view class="item">
+					<text class="desc">互市区：</text>
+					<text>东兴一桥互市区</text>
+					<view class="clear"></view>
+				</view>
+				<view class="item">
+					<text class="desc">发布时间：</text>
+					<text>2023-08 15:35</text>
+					<view class="clear"></view>
+				</view>
+				<u-divider text="商品介绍"></u-divider>
+				<view class="contents">八角茴香是木兰科八角属的常绿乔木。树皮灰褐色或红褐色；叶互生或叶簇生于枝端；叶片革质，椭圆状倒卵</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 {
+			user: this.getUser(),
+			item: {}
+		};
+	},
+	onLoad(e) {
+		if (e.id) {
+			/* this.http.request({
+				url: '/level-one-server/app/TbPortNews/getPortNewsDetails?id=' + e.id,
+				success: res => {
+					this.content = res.data.data;
+				}
+			}); */
+		}
+	},
+	methods: {
+		pay() {
+			uni.navigateTo({ url: '/pages/market/two/leader/confirm' });
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background-color: $pg;
+}
+</style>

pages/market/two/leader/confirm.vue

@@ -0,0 +1,96 @@
+<template>
+	<view>
+		<view class="cmain">
+			<view class="box" style="padding: 12px; margin-top: 0px">
+				<u-steps :current="0">
+					<u-steps-item title="接单确认"></u-steps-item>
+					<u-steps-item title="收购商确认"></u-steps-item>
+					<u-steps-item title="完成交易"></u-steps-item>
+				</u-steps>
+			</view>
+			<view class="box order_detail">
+				<u-divider text="订单信息"></u-divider>
+				<view class="item" style="padding-top: 0px">
+					<text class="label">收购商品</text>
+					<text class="desc">越南榴莲</text>
+				</view>
+				<view class="item">
+					<text class="label">商品编号</text>
+					<text class="desc">25吨</text>
+				</view>
+				<view class="item">
+					<text class="label">计价单位</text>
+					<text class="desc">吨</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">2023-08 15:35</text>
+				</view>
+				<view class="item">
+					<text class="label">订单状态</text>
+					<text class="desc">待接单</text>
+				</view>
+				<view class="item">
+					<text class="label">接单人</text>
+					<text class="desc">张三</text>
+				</view>
+				<view class="item">
+					<text class="label">出价金额（必填）</text>
+					<text class="desc">
+						<input type="number" placeholder="请输入" />
+					</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 {
+			item: {}
+		};
+	},
+	onLoad(e) {
+		if (e.id) {
+			/* this.http.request({
+				url: '/level-one-server/app/TbPortNews/getPortNewsDetails',
+				success: res => {
+					this.content = res.data.data;
+				}
+			}); */
+		}
+	},
+	methods: {
+		pay() {
+			uni.showModal({
+				title: '提示',
+				content: '我已核对订单信息无误',
+				success: res => {
+					if (res.confirm) {
+						uni.navigateTo({ url: '/pages/market/two/leader/success' });
+					}
+				}
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background-color: $pg;
+}
+</style>

pages/market/two/leader/detail.vue

@@ -0,0 +1,93 @@
+<template>
+	<view>
+		<view class="cmain">
+			<view class="box order_detail" style="margin-top: 0px">
+				<view class="item">
+					<text class="label">订单状态</text>
+					<text class="desc">
+						<text class="icon">&#xe830;</text>
+						<text>待确认</text>
+					</text>
+				</view>
+			</view>
+			<view class="box order_detail">
+				<u-divider text="订单信息"></u-divider>
+				<view class="item" style="padding-top: 0px">
+					<text class="label">订单编号</text>
+					<text class="desc">13454334567</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">貔貅</text>
+				</view>
+				<view class="item">
+					<text class="label">联系号码</text>
+					<text class="desc">13097850971</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">34吨</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>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			item: {}
+		};
+	},
+	onLoad(e) {
+		if (e.id) {
+			/* 			this.http.request({
+				url: '/level-one-server/app/TbPortNews/getPortNewsDetails?id=' + e.id,
+				success: res => {
+					this.item = res.data.data;
+				}
+			}); */
+		}
+	},
+	methods: {}
+};
+</script>
+
+<style lang="scss">
+page {
+	background-color: $pg;
+}
+</style>

pages/market/two/leader/order.vue

@@ -0,0 +1,130 @@
+<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">广西京东自营店南宁分店</view>
+				<view class="state" v-if="item.goodsStatus == 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">八角茴香（未磨）（可食用）</view>
+					<view class="desc omit">
+						<text>50吨</text>
+						<text>云南互市区云南互市区云南互市区云南互市区云南互市区</text>
+					</view>
+					<view class="price">¥ 5000</view>
+				</view>
+				<view class="clear"></view>
+				<view class="op">
+					<view class="date">2022-12-12:12:12</view>
+					<view class="an" style="color: #f44336">取消订单</view>
+					<view class="an" style="color: #4581fb">通知确认</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: [
+				{ name: '全部', goodsStatus: '' },
+				{ name: '待确认', goodsStatus: 1 },
+				{ name: '已确认', goodsStatus: 0 },
+				{ name: '已完成', goodsStatus: 0 },
+				{ name: '已取消', goodsStatus: 0 }
+			],
+			param: { pageNo: 1, pageSize: 10, isOrders: 0 },
+			list: [],
+			loadMore: true
+		};
+	},
+	onLoad() {
+		this.getData();
+		uni.$on('goodsHandle', res => {
+			this.refresh();
+		});
+	},
+	methods: {
+		getData() {
+			this.http.request({
+				url: '/level-one-server/app/TbGoodsTransit/getTransitList',
+				loading: 'false',
+				data: this.param,
+				success: res => {
+					this.loadMore = parseInt(res.data.pageCount) > this.param.pageNo;
+					this.list.push(...res.data.data);
+				}
+			});
+		},
+		//点击tab切换
+		click(e) {
+			this.param.goodsStatus = e.goodsStatus;
+			this.refresh();
+		},
+		del(id) {
+			uni.showModal({
+				title: '提示',
+				content: '确定删除?',
+				success: res => {
+					if (res.confirm) {
+						this.http.request({
+							url: '/level-one-server/app/TbGoodsTransit/deleteById?id=' + id,
+							success: res => {
+								uni.showToast({ title: '删除成功' });
+								this.refresh();
+							}
+						});
+					}
+				}
+			});
+		},
+		detail(id) {
+			uni.navigateTo({ url: '/pages/market/two/leader/detail' });
+		},
+		//刷新数据
+		refresh() {
+			this.loadMore = true;
+			this.param.pageNo = 1;
+			this.list = [];
+			this.getData();
+		}
+	},
+	//下拉刷新
+	onPullDownRefresh() {
+		setTimeout(() => {
+			this.refresh();
+			uni.stopPullDownRefresh();
+		}, 1000);
+	},
+	//上拉加载
+	onReachBottom() {
+		if (this.loadMore) {
+			this.param.pageNo++;
+			this.getData();
+		}
+	},
+	onNavigationBarButtonTap() {
+		uni.navigateTo({ url: '/pages/goodsManage/oneMarket/editGoods' });
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background-color: $pg;
+}
+</style>

pages/market/two/leader/success.vue

@@ -0,0 +1,41 @@
+<template>
+	<view class="cmain">
+		<view class="icon">&#xe602;</view>
+		<view class="desc">接单成功，</view>
+		<view class="desc">请等待收购商进行接单确认。</view>
+		<button class="btn" @click="go()">前往订单</button>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {};
+	},
+	methods: {
+		go() {
+			uni.redirectTo({
+				url: '/pages/market/two/leader/order'
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.cmain {
+	text-align: center;
+	padding: 40px;
+	color: $font-c;
+	.icon {
+		font-size: 150px;
+		color: $main-color;
+	}
+	.desc {
+		margin-top: 7px;
+	}
+	.btn {
+		margin-top: 50px;
+	}
+}
+</style>

pages/market/two/list.vue

@@ -0,0 +1,117 @@
+<template>
+	<view>
+		<view class="search">
+			<u-search placeholder="搜索商品名称" v-model="param.customerName" bgColor="white" @search="refresh()" :animation="true" actionText="取消" @clear="refresh()"></u-search>
+			<view class="clear"></view>
+		</view>
+		<view class="goodsList">
+			<view class="sort-list">
+				<view class="sort-item" :class="{ active: item.check }" v-for="(item, index) in sort" :key="index" @click="select(item, index)">
+					<text>{{ item.name }}</text>
+					<text v-if="index > 0 && item.isAsc == 'desc'" class="icon">&#xeb0a;</text>
+					<text v-if="index > 0 && item.isAsc == 'asc'" class="icon">&#xeb0b;</text>
+				</view>
+				<view class="type" @click="show = true">
+					<text>分类</text>
+					<text class="icon">&#xe8f2;</text>
+				</view>
+				<view class="clear"></view>
+			</view>
+			<view class="item" v-for="(item, index) in list" :key="index" @click="detail(item)">
+				<view class="title">广西京东自营店南宁分店</view>
+				<image src="../../../static/news.jpg" mode="aspectFill" class="pic"></image>
+				<view class="con">
+					<view class="productName omit">八角茴香（未磨）（可食用）</view>
+					<view class="desc">50吨</view>
+					<view class="price">¥ 5000</view>
+					<view class="icon buy" v-if="user.userType == 2">&#xe604;</view>
+				</view>
+				<view class="clear"></view>
+			</view>
+		</view>
+		<productType v-model="show"></productType>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			user: this.getUser(),
+			show: false,
+			sort: [
+				{
+					name: '综合',
+					key: 1,
+					isAsc: 'desc',
+					check: false
+				},
+				{
+					name: '日期',
+					key: 2,
+					isAsc: 'desc',
+					check: false
+				},
+				{
+					name: '价格',
+					key: 3,
+					isAsc: 'desc',
+					check: false
+				}
+			],
+			list: [{}, {}, {}, {}],
+			param: { pageNo: 1, pageSize: 10 },
+			loadMore: true
+		};
+	},
+	onLoad(e) {
+		//this.getData();
+	},
+	methods: {
+		getData() {
+			this.http.request({
+				url: '/level-one-server/app/TbGoodsTransit/getTransitList',
+				data: this.param,
+				loading: 'false',
+				success: res => {
+					this.loadMore = parseInt(res.data.pageCount) > this.param.pageNo;
+					this.list.push(...res.data.data);
+				}
+			});
+		},
+		detail(item) {
+			uni.navigateTo({ url: '/pages/market/two/detail?id=' + item.id });
+		},
+		//刷新数据
+		refresh() {
+			this.loadMore = true;
+			this.param.pageNum = 1;
+			this.list = [];
+			this.getData();
+		}
+	},
+	//下拉刷新
+	onPullDownRefresh() {
+		setTimeout(() => {
+			this.refresh();
+			uni.stopPullDownRefresh();
+		}, 1000);
+	},
+	//上拉加载
+	onReachBottom() {
+		if (this.loadMore) {
+			this.param.pageNum++;
+			this.getData();
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background-color: $pg;
+}
+.search {
+	padding: 12px 12px 0px 12px;
+}
+</style>

pages/market/two/purchaser/address/add.vue

@@ -0,0 +1,98 @@
+<template>
+	<view>
+		<view class="forms">
+			<view class="form_group pt0">
+				<view class="lable re">收件人</view>
+				<input placeholder="请输入" v-model="item.typeCode" />
+			</view>
+			<view class="form_group">
+				<view class="lable re">联系电话</view>
+				<input placeholder="请输入" v-model="item.typeCode" />
+			</view>
+			<view class="form_group">
+				<view class="lable re">详细地址</view>
+				<textarea v-model="item.remarks" placeholder="请输入"></textarea>
+			</view>
+		</view>
+		<view class="mfooter">
+			<view class="flex">
+				<view class="f" v-if="item.id">
+					<button class="save btn" @click="del()">删除</button>
+				</view>
+				<view class="f">
+					<button class="btn" @click="save()">保存</button>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			item: {}
+		};
+	},
+	onLoad(e) {
+		if (e.id) {
+			this.http.request({
+				url: '/level-one-server/app/TbPortNews/getPortNewsDetails',
+				data: { id: e.id },
+				success: res => {
+					this.item = res.data.data;
+				}
+			});
+		}
+	},
+	methods: {
+		save() {
+			let rule = [
+				{ name: 'typeCode', checkType: 'notnull', errorMsg: '请输入编码' },
+				{ name: 'typeName', checkType: 'notnull', errorMsg: '请输入名称' },
+				{ name: 'status', checkType: 'notnull', errorMsg: '请选择状态' }
+			];
+			if (!this.verify.check(this.item, rule)) {
+				uni.showModal({ content: this.verify.error, showCancel: false });
+				return false;
+			}
+			this.http.request({
+				url: '/project/projectType',
+				method: 'POST',
+				data: this.item,
+				success: res => {
+					uni.showToast({ title: '操作成功' });
+					setTimeout(() => {
+						uni.$emit('address');
+						uni.navigateBack();
+					}, 1000);
+				}
+			});
+		},
+		del(id) {
+			uni.showModal({
+				title: '提示',
+				content: '确定删除该数据?',
+				success: res => {
+					if (res.confirm) {
+						this.http.request({
+							url: '/customer/customerType',
+							data: { id: this.item.id },
+							method: 'POST',
+							success: res => {
+								uni.showToast({ title: '删除成功' });
+								setTimeout(() => {
+									uni.$emit('address');
+									uni.navigateBack();
+								}, 1000);
+							}
+						});
+					}
+				}
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss"></style>

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

@@ -0,0 +1,89 @@
+<template>
+	<view class="list">
+		<view class="item" v-for="(item, index) in list" :key="index" @click="select(item)">
+			<view class="address">
+				<view class="con">
+					<view class="title omit">云南省普洱市思茅区普洱路云南省普洱市思茅区普洱路36号云南省普洱市思茅区普洱路云南省普洱市思茅区普洱路</view>
+					<view class="desc">
+						<text>陈晓东</text>
+						<text>13481076556</text>
+					</view>
+				</view>
+				<view class="icon">&#xe8f2;</view>
+				<view class="clear"></view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			list: [{}, {}, {}, {}, {}],
+			param: { pageNo: 1, pageSize: 10 },
+			loadMore: true
+		};
+	},
+	onLoad(e) {
+		//this.getData();
+	},
+	methods: {
+		getData() {
+			this.http.request({
+				url: '/level-one-server/app/TbPortNews/getPortNewsList',
+				data: this.param,
+				loading: 'false',
+				success: res => {
+					this.loadMore = parseInt(res.data.pageCount) > this.param.pageNo;
+					this.list.push(...res.data.data);
+				}
+			});
+		},
+		select(item) {
+			uni.$emit('selectAddress', item);
+			uni.navigateBack();
+		},
+		//刷新数据
+		refresh() {
+			this.loadMore = true;
+			this.param.pageNo = 1;
+			this.list = [];
+			this.getData();
+		}
+	},
+	//下拉刷新
+	onPullDownRefresh() {
+		setTimeout(() => {
+			this.refresh();
+			uni.stopPullDownRefresh();
+		}, 1000);
+	},
+	//上拉加载
+	onReachBottom() {
+		if (this.loadMore) {
+			this.param.pageNo++;
+			this.getData();
+		}
+	},
+	onNavigationBarButtonTap() {
+		uni.navigateTo({ url: 'add' });
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background-color: $pg;
+}
+.list {
+	padding: 12px;
+	.item {
+		padding: 5px;
+		color: $font-c;
+		background-color: white;
+		border-radius: 10px;
+		margin-bottom: 10px;
+	}
+}
+</style>

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

@@ -0,0 +1,135 @@
+<template>
+	<view>
+		<view class="address" @click="address()">
+			<view class="con">
+				<view class="title omit">云南省普洱市思茅区普洱路云南省普洱市思茅区普洱路36号云南省普洱市思茅区普洱路云南省普洱市思茅区普洱路</view>
+				<view class="desc">
+					<text>陈晓东</text>
+					<text>13481076556</text>
+				</view>
+			</view>
+			<view class="icon">&#xe8f2;</view>
+			<view class="clear"></view>
+		</view>
+		<view class="forms">
+			<view class="form_group">
+				<view class="lable re">互市区</view>
+				<picker :range="dict.city" @change="picker($event, 'city')">
+					<input placeholder="请选择" v-model="item.city" :disabled="true" />
+					<view class="icon more">&#xe8f2;</view>
+				</picker>
+			</view>
+			<view class="form_group">
+				<view class="lable re">收购商品</view>
+				<picker :range="dict.city" @change="picker($event, 'city')">
+					<input placeholder="请选择" v-model="item.city" :disabled="true" />
+					<view class="icon more">&#xe8f2;</view>
+				</picker>
+			</view>
+			<view class="form_group">
+				<view class="lable">商品编号</view>
+				<input placeholder="请输入" v-model="item.typeCode" />
+			</view>
+			<view class="form_group">
+				<view class="lable re">计价单位</view>
+				<picker :range="dict.city" @change="picker($event, 'city')">
+					<input placeholder="请选择" v-model="item.city" :disabled="true" />
+					<view class="icon more">&#xe8f2;</view>
+				</picker>
+			</view>
+			<view class="form_group">
+				<view class="lable re">数量</view>
+				<input placeholder="请输入" v-model="item.typeCode" />
+			</view>
+			<view class="form_group">
+				<view class="lable re">到货日期</view>
+				<picker mode="date" @change="picker($event, 'date')">
+					<input placeholder="请选择" v-model="item.date" :disabled="true" />
+					<view class="icon more">&#xe8f2;</view>
+				</picker>
+			</view>
+		</view>
+		<view class="mfooter">
+			<view class="flex">
+				<view class="f">
+					<button class="save btn" @click="save()">保存</button>
+				</view>
+				<view class="f">
+					<button class="btn" @click="save()">一键发布</button>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			item: {},
+			dict: {
+				city: ['东兴市', '贵港市']
+			}
+		};
+	},
+	onLoad(e) {
+		if (e.id) {
+			this.http.request({
+				url: '/level-one-server/app/TbPortNews/getPortNewsDetails',
+				data: { id: e.id },
+				success: res => {
+					this.item = res.data.data;
+				}
+			});
+		}
+		uni.$on('selectAddress', res => {});
+	},
+	methods: {
+		//选择地址
+		address() {
+			uni.navigateTo({ url:'/pages/market/two/purchaser/address/list' });
+		},
+		picker(e, tag) {
+			if (tag == 'date') {
+				this.item[tag] = e.detail.value;
+			} else {
+				this.item[tag] = this.dict[tag][e.detail.value];
+			}
+			this.$forceUpdate();
+		},
+		save() {
+			/* let rule = [
+				{ name: 'typeCode', checkType: 'notnull', errorMsg: '请输入编码' },
+				{ name: 'typeName', checkType: 'notnull', errorMsg: '请输入名称' },
+				{ name: 'status', checkType: 'notnull', errorMsg: '请选择状态' }
+			];
+			if (!this.verify.check(this.item, rule)) {
+				uni.showModal({ content: this.verify.error, showCancel: false });
+				return false;
+			}
+			this.http.request({
+				url: '/project/projectType',
+				method: 'POST',
+				data: this.item,
+				success: res => {
+					uni.showToast({ title: '操作成功' });
+					setTimeout(() => {
+						uni.$emit('purchaser_buy_list');
+						uni.navigateBack();
+					}, 1000);
+				}
+			}); */
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.address {
+	border-bottom: 1px solid $line;
+}
+.btn {
+	width: 100%;
+	border-radius: 5px;
+}
+</style>

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

@@ -0,0 +1,88 @@
+<template>
+	<view>
+		<view class="cmain">
+			<view class="box order_detail" style="margin-top: 0px">
+				<view class="item">
+					<text class="label">收购状态</text>
+					<text class="desc">
+						<text class="icon">&#xe830;</text>
+						<text>未接单</text>
+					</text>
+				</view>
+			</view>
+			<view class="box order_detail">
+				<view class="item">
+					<text class="label">收购商品</text>
+					<text class="desc">越南榴莲</text>
+				</view>
+				<view class="item">
+					<text class="label">商品编号</text>
+					<text class="desc">xxx093</text>
+				</view>
+				<view class="item">
+					<text class="label">商品名称</text>
+					<text class="desc">胡椒粉</text>
+				</view>
+				<view class="item">
+					<text class="label">计价单位</text>
+					<text class="desc">吨</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">2023-07-20</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">350000元</text>
+				</view>
+				<view class="item">
+					<text class="label">接单时间</text>
+					<text class="desc">2023-07-20 11:38</text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			item: {}
+		};
+	},
+	onLoad(e) {
+		if (e.id) {
+			/* 			this.http.request({
+				url: '/level-one-server/app/TbPortNews/getPortNewsDetails?id=' + e.id,
+				success: res => {
+					this.item = res.data.data;
+				}
+			}); */
+		}
+	},
+	methods: {}
+};
+</script>
+
+<style lang="scss">
+page {
+	background-color: $pg;
+}
+</style>

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

@@ -0,0 +1,114 @@
+<template>
+	<view>
+		<view class="tab">
+			<u-tabs :list="tab" @click="click" :lineHeight="5"></u-tabs>
+		</view>
+		<view class="goodsManageList">
+			<view class="item" v-for="(item, index) in list" :key="index" @click="detail(item)">
+				<view class="top">
+					<view class="title omit">八角茴香(未磨) (可食用)八角茴香(未磨) (可食用)八角茴香(未磨) (可食用)</view>
+					<view class="icon">&#xe852;</view>
+					<view class="clear"></view>
+				</view>
+				<view class="con">
+					
+					<view class="flex fs">
+						<view class="f left" style="flex: 0.5">
+							<view class="tag">净重：50吨</view>
+						</view>
+						<view class="f left">
+							<view class="tag">2023-08-03 22:37:02</view>
+						</view>
+					</view>
+				</view>
+				<view class="op">
+					<view class="flex">
+						<view class="f rline">
+							<text class="icon" style="color: #ff660d">&#xe668;</text>
+							<text>编辑</text>
+						</view>
+						<view class="f">
+							<text class="icon" style="color: #0081ff">&#xe743;</text>
+							<text>发布</text>
+						</view>
+					</view>
+				</view>
+				<view class="clear"></view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			tab: [
+				{ name: '全部', goodsStatus: '' },
+				{ name: '待发布', goodsStatus: 1 },
+				{ name: '发布中', goodsStatus: 0 },
+				{ name: '已接单', goodsStatus: 0 },
+				{ name: '已确认', goodsStatus: 0 },
+				{ name: '已完成', goodsStatus: 0 }
+			],
+			list: [{}, {}, {}, {}, {}],
+			param: { pageNo: 1, pageSize: 10 },
+			loadMore: true
+		};
+	},
+	onLoad(e) {
+		//this.getData();
+	},
+	methods: {
+		getData() {
+			this.http.request({
+				url: '/level-one-server/app/TbGoodsTransit/getTransitList',
+				data: this.param,
+				loading: 'false',
+				success: res => {
+					this.loadMore = parseInt(res.data.pageCount) > this.param.pageNo;
+					this.list.push(...res.data.data);
+				}
+			});
+		},
+		//点击tab切换
+		click(e) {
+			this.param.goodsStatus = e.goodsStatus;
+			this.refresh();
+		},
+		detail(item) {
+			uni.navigateTo({ url: '/pages/market/two/purchaser/buy/detail?id=' + item.id });
+		},
+		//刷新数据
+		refresh() {
+			this.loadMore = true;
+			this.param.pageNo = 1;
+			this.list = [];
+			this.getData();
+		}
+	},
+	//下拉刷新
+	onPullDownRefresh() {
+		setTimeout(() => {
+			this.refresh();
+			uni.stopPullDownRefresh();
+		}, 1000);
+	},
+	//上拉加载
+	onReachBottom() {
+		if (this.loadMore) {
+			this.param.pageNo++;
+			this.getData();
+		}
+	},
+	onNavigationBarButtonTap() {
+		uni.navigateTo({ url: '/pages/market/two/purchaser/buy/add' });
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background-color: $pg;
+}
+</style>

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

@@ -0,0 +1,93 @@
+<template>
+	<view>
+		<view class="cmain">
+			<view class="box order_detail" style="margin-top: 0px">
+				<view class="item">
+					<text class="label">订单状态</text>
+					<text class="desc">
+						<text class="icon">&#xe830;</text>
+						<text>待收货</text>
+					</text>
+				</view>
+			</view>
+			<view class="box order_detail">
+				<u-divider text="订单信息"></u-divider>
+				<view class="item" style="padding-top: 0px">
+					<text class="label">订单编号</text>
+					<text class="desc">13454334567</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">貔貅(组长)</text>
+				</view>
+				<view class="item">
+					<text class="label">联系号码</text>
+					<text class="desc">13097850971</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">34吨</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>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			item: {}
+		};
+	},
+	onLoad(e) {
+		if (e.id) {
+			/* 			this.http.request({
+				url: '/level-one-server/app/TbPortNews/getPortNewsDetails?id=' + e.id,
+				success: res => {
+					this.item = res.data.data;
+				}
+			}); */
+		}
+	},
+	methods: {}
+};
+</script>
+
+<style lang="scss">
+page {
+	background-color: $pg;
+}
+</style>

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

@@ -0,0 +1,125 @@
+<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">广西京东自营店南宁分店</view>
+				<view class="state" v-if="item.goodsStatus == 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">八角茴香（未磨）（可食用）</view>
+					<view class="desc omit">
+						<text>50吨</text>
+						<text>云南互市区云南互市区云南互市区云南互市区云南互市区</text>
+					</view>
+					<view class="price">¥ 5000</view>
+				</view>
+				<view class="clear"></view>
+				<view class="op">
+					<view class="date">2022-12-12:12:12</view>
+					<view class="an" style="color: #f44336">取消订单</view>
+					<view class="an" style="color: #4581fb">通知确认</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: [
+				{ name: '全部', goodsStatus: '' },
+				{ name: '待收货', goodsStatus: 1 },
+				{ name: '已完成', goodsStatus: 0 }
+			],
+			param: { pageNo: 1, pageSize: 10, isOrders: 0 },
+			list: [],
+			loadMore: true
+		};
+	},
+	onLoad() {
+		this.getData();
+		uni.$on('goodsHandle', res => {
+			this.refresh();
+		});
+	},
+	methods: {
+		getData() {
+			this.http.request({
+				url: '/level-one-server/app/TbGoodsTransit/getTransitList',
+				loading: 'false',
+				data: this.param,
+				success: res => {
+					this.loadMore = parseInt(res.data.pageCount) > this.param.pageNo;
+					this.list.push(...res.data.data);
+				}
+			});
+		},
+		//点击tab切换
+		click(e) {
+			this.param.goodsStatus = e.goodsStatus;
+			this.refresh();
+		},
+		del(id) {
+			uni.showModal({
+				title: '提示',
+				content: '确定删除?',
+				success: res => {
+					if (res.confirm) {
+						this.http.request({
+							url: '/level-one-server/app/TbGoodsTransit/deleteById?id=' + id,
+							success: res => {
+								uni.showToast({ title: '删除成功' });
+								this.refresh();
+							}
+						});
+					}
+				}
+			});
+		},
+		detail(item) {
+			uni.navigateTo({ url: '/pages/market/two/purchaser/order/detail?id=' + item.id });
+		},
+		//刷新数据
+		refresh() {
+			this.loadMore = true;
+			this.param.pageNo = 1;
+			this.list = [];
+			this.getData();
+		}
+	},
+	//下拉刷新
+	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/news/list.vue

@@ -1,18 +1,20 @@
 <template>
 	<view>
+		<view class="search">
+			<u-search placeholder="搜索资讯" v-model="param.title" @search="refresh()" :animation="true" actionText="取消" @clear="refresh()"></u-search>
+		</view>
 		<view class="list">
 			<view class="news_item" v-for="(item, index) in list" :key="index" @click="detail(item)">
 				<image src="../../static/news.jpg" mode="aspectFill" class="img"></image>
 				<view class="con">
-					<view class="title ellip">广西边境口岸城市年中经济新观察边贸旺 旅游热 产业稳广西边境口岸城市年中经济新观察边贸旺 旅游热 产业稳</view>
-					<view class="date">
-						<text class="icon">&#xe65c;</text>
-						<text>{{ item.readCount }}</text>
-					</view>
+					<view class="title ellip">{{ item.title }}</view>
+					<view class="source omit">{{ item.source }}</view>
 					<text class="releaseTime">{{ item.releaseTime }}</text>
 				</view>
 				<view class="clear"></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>
@@ -22,7 +24,7 @@ export default {
 	data() {
 		return {
 			list: [],
-			param: { pageNum: 1, pageSize: 10, orderByColumn: 'createTime', isAsc: 'desc' },
+			param: { pageNo: 1, pageSize: 10 },
 			loadMore: true
 		};
 	},
@@ -36,19 +38,18 @@ export default {
 				data: this.param,
 				loading: 'false',
 				success: res => {
+					this.loadMore = parseInt(res.data.pageCount) > this.param.pageNo;
 					this.list.push(...res.data.data);
 				}
 			});
 		},
 		detail(item) {
-			uni.navigateTo({
-				url: '/pages/news/detail?id=' + item.id
-			});
+			uni.navigateTo({ url: '/pages/news/detail?id=' + item.id });
 		},
 		//刷新数据
 		refresh() {
 			this.loadMore = true;
-			this.param.pageNum = 1;
+			this.param.pageNo = 1;
 			this.list = [];
 			this.getData();
 		}
@@ -63,7 +64,7 @@ export default {
 	//上拉加载
 	onReachBottom() {
 		if (this.loadMore) {
-			this.param.pageNum++;
+			this.param.pageNo++;
 			this.getData();
 		}
 	}
@@ -72,7 +73,7 @@ export default {
 
 <style lang="scss">
 page {
-	background-color: #f5f5f5;
+	background-color: $pg;
 }
 .list {
 	padding: 12px;

pages/personal/personal.vue

@@ -10,45 +10,46 @@
 			<view class="user">
 				<image src="../../static/icon/user.png" mode="widthFix" class="head"></image>
 				<view class="con">
-					<view class="nickName omit">用户134****6556用户134****6556用户134****6556</view>
-					<view class="tag">
-						<text class="icon"></text>
-						<text>普通边民</text>
-					</view>
+					<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 == 4">收购商</view>
+					<view class="tag" v-if="user.userType == 1">司机</view>
 				</view>
 				<text class="icon edit">&#xe645;</text>
 				<view class="clear"></view>
 			</view>
 			<!--菜单-->
 			<view class="menu">
-				<view class="msn">
+				<view class="msn" @click="go()" v-if="user.userType == 2">
 					<view class="out">
 						<view class="int">
-							<view class="icon ioc" style="background-color: #fff6e0; color: #f1ba41">&#xe686;</view>
-							<view class="tit">我的订单</view>
+							<view class="icon ioc" style="background-color: #fff6e0; color: #f1ba41">&#xe604;</view>
+							<view class="tit">购物车</view>
 						</view>
 					</view>
 				</view>
-				<view class="msn">
+				<view class="msn" @click="go('/pages/market/one/merchant/goods/list')" v-if="user.userType == 3">
 					<view class="out">
 						<view class="int">
-							<view class="icon ioc" style="background-color: #e1f6e9; color: #47cf74">&#xe686;</view>
-							<view class="tit">我的订单</view>
+							<view class="icon ioc" style="background-color: #e1f6e9; color: #47cf74">&#xe634;</view>
+							<view class="tit">商品管理</view>
 						</view>
 					</view>
 				</view>
-				<view class="msn">
+				<view class="msn" @click="go('/pages/market/two/purchaser/buy/list')" v-if="user.userType == 4">
 					<view class="out">
 						<view class="int">
-							<view class="icon ioc" style="background-color: #eaf1fe; color: #2a95fe">&#xe686;</view>
-							<view class="tit">我的订单</view>
+							<view class="icon ioc" style="background-color: #eaf1fe; color: #2a95fe">&#xe64f;</view>
+							<view class="tit">收购管理</view>
 						</view>
 					</view>
 				</view>
-				<view class="msn">
+				<view class="msn" @click="order()">
 					<view class="out">
 						<view class="int">
-							<view class="icon ioc" style="background-color: #f0dcfc; color: #b064d8">&#xe686;</view>
+							<view class="icon ioc" style="background-color: #f0dcfc; color: #b064d8">&#xe628;</view>
 							<view class="tit">我的订单</view>
 						</view>
 					</view>
@@ -94,7 +95,31 @@ export default {
 			user: {}
 		};
 	},
+	onShow() {
+		if (this.hasLogin()) {
+			this.user = this.getUser();
+		} else {
+			uni.redirectTo({ url: '/pages/login/login' });
+		}
+	},
 	methods: {
+		order() {
+			//组长
+			if (this.user.userType == 2) {
+				uni.navigateTo({url: '/pages/market/one/merchant/order/list'});
+			}
+			//外籍商户
+			if (this.user.userType == 3) {
+				uni.navigateTo({url: '/pages/market/one/merchant/order/list'});
+			}
+			//外籍商户
+			if (this.user.userType == 4) {
+				uni.navigateTo({url: '/pages/market/two/purchaser/order/list'});
+			}
+		},
+		go(url) {
+			uni.navigateTo({ url: url });
+		},
 		exitLogin() {
 			uni.removeStorageSync('token');
 			uni.removeStorageSync('info');

pages/twoMarket/purchaser/order/detail.vue

@@ -1,19 +0,0 @@
-<template>
-	<view>
-		
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			};
-		}
-	}
-</script>
-
-<style lang="scss">
-
-</style>

pages/twoMarket/purchaser/order/list.vue

@@ -1,19 +0,0 @@
-<template>
-	<view>
-		
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			};
-		}
-	}
-</script>
-
-<style lang="scss">
-
-</style>

pages/twoMarket/purchaser/order/logistics.vue

@@ -1,19 +0,0 @@
-<template>
-	<view>
-		
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			};
-		}
-	}
-</script>
-
-<style lang="scss">
-
-</style>

pages/twoMarket/purchaser/order/success.vue

@@ -1,19 +0,0 @@
-<template>
-	<view>
-		
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			};
-		}
-	}
-</script>
-
-<style lang="scss">
-
-</style>

pages/twoMarket/purchaser/product/detail.vue

@@ -1,19 +0,0 @@
-<template>
-	<view>
-		
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			};
-		}
-	}
-</script>
-
-<style lang="scss">
-
-</style>

pages/twoMarket/purchaser/product/list.vue

@@ -1,103 +0,0 @@
-<template>
-	<view>
-		<view class="list">
-			<view class="search">
-				<u-search placeholder="搜索商品名称" v-model="param.customerName" @search="refresh()" :animation="true" actionText="取消" @clear="refresh()"></u-search>
-			</view>
-			<view class="item">
-				<view class="title">广西京东自营店南宁分店</view>
-				<image src="../../../../static/news.jpg" mode="aspectFill" class="pic"></image>
-				<view class="con">
-					<view class="productName">八角茴香（未磨）（可食用）</view>
-					<view class="spec">50吨</view>
-					<view class="clear"></view>
-				</view>
-			</view>
-		</view>
-		<view class="mfooter">
-			<view class="flex">
-				<view class="f"><button class="btn" @click="save()">市场</button></view>
-				<view class="f"><button class="btn" @click="save()">购物车</button></view>
-				<view class="f"><button class="btn" @click="save()">订单列表</button></view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-export default {
-	data() {
-		return {
-			list: [],
-			param: { pageNum: 1, pageSize: 10, orderByColumn: 'createTime', isAsc: 'desc' },
-			loadMore: true
-		};
-	},
-	onLoad(e) {
-		//this.getData();
-	},
-	methods: {
-		getData() {
-			this.http.request({
-				url: this.http.urls.help_list,
-				data: this.param,
-				loading: 'false',
-				success: res => {
-					this.loadMore = res.data.pages > this.param.pageNum ? true : false;
-				}
-			});
-		},
-		detail(item) {
-			uni.navigateTo({
-				url: '/pages/help/detail?id=' + item.id
-			});
-		},
-		//刷新数据
-		refresh() {
-			this.loadMore = true;
-			this.param.pageNum = 1;
-			this.list = [];
-			this.getData();
-		}
-	},
-	//下拉刷新
-	onPullDownRefresh() {
-		setTimeout(() => {
-			this.refresh();
-			uni.stopPullDownRefresh();
-		}, 1000);
-	},
-	//上拉加载
-	onReachBottom() {
-		if (this.loadMore) {
-			this.param.pageNum++;
-			this.getData();
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-.list {
-	padding: 10px;
-	.item {
-		padding: 10px;
-		color: $font-c;
-		.title {
-			font-size: 15px;
-			margin-bottom: 10px;
-		}
-		.pic {
-			float: left;
-			width: 80px;
-			height: 80px;
-			border-radius: 3px;
-		}
-		.con {
-			float: left;
-			width: 60%;
-			padding-left: 10px;
-		}
-	}
-}
-</style>

pages/twoMarket/twoMarket.vue

@@ -1,87 +0,0 @@
-<template>
-	<view>
-		<view class="list">
-			<view class="search">
-				<u-search placeholder="搜索商品名称" v-model="param.customerName" @search="refresh()" :animation="true" actionText="取消" @clear="refresh()"></u-search>
-			</view>
-			<view class="item">
-				<view class="title">广西京东自营店南宁分店</view>
-				<image src="../../static/news.jpg" mode="widthFix" class="pic"></image>
-				<view class="con">
-					<view class="productName">八角茴香（未磨）（可食用）</view>
-					<view class="spec">50吨</view>
-					<view class="price">￥50000</view>
-					<view class=""></view>
-				</view>
-			</view>
-		</view>
-		<view class="mfooter">
-			<view class="flex">
-				<view class="f"><button class="btn" @click="save()">市场</button></view>
-				<view class="f"><button class="btn" @click="save()">购物车</button></view>
-				<view class="f"><button class="btn" @click="save()">订单列表</button></view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-export default {
-	data() {
-		return {
-			list: [],
-			param: { pageNum: 1, pageSize: 10, orderByColumn: 'createTime', isAsc: 'desc' },
-			loadMore: true
-		};
-	},
-	onLoad(e) {
-		//this.getData();
-	},
-	methods: {
-		getData() {
-			this.http.request({
-				url: this.http.urls.help_list,
-				data: this.param,
-				loading: 'false',
-				success: res => {
-					this.loadMore = res.data.pages > this.param.pageNum ? true : false;
-				}
-			});
-		},
-		detail(item) {
-			uni.navigateTo({
-				url: '/pages/help/detail?id=' + item.id
-			});
-		},
-		//刷新数据
-		refresh() {
-			this.loadMore = true;
-			this.param.pageNum = 1;
-			this.list = [];
-			this.getData();
-		}
-	},
-	//下拉刷新
-	onPullDownRefresh() {
-		setTimeout(() => {
-			this.refresh();
-			uni.stopPullDownRefresh();
-		}, 1000);
-	},
-	//上拉加载
-	onReachBottom() {
-		if (this.loadMore) {
-			this.param.pageNum++;
-			this.getData();
-		}
-	}
-};
-</script>
-
-<style>
-.list {
-	padding: 10px;
-	.item {
-	}
-}
-</style>

uni.scss

@@ -1,11 +1,11 @@
 /**
  * 常用样式变量
  */
-$line: #eeeeee;
-$main-color: #0081FF;
+$line: #e8e8e8;
+$main-color: #4581fb;
 $font-c: #545555;
 $font-c1: #333;
 $border-radius: 5px;
-
+$pg:#F5F5F5;
 // uView的全局SCSS主题文件
 @import 'uview-ui/theme.scss';

uview-ui/components/u-steps-item/u-steps-item.vue

@@ -31,8 +31,7 @@
 		</view>
 		<view class="u-steps-item__content" :class="[`u-steps-item__content--${parentData.direction}`]"
 			:style="[contentStyle]">
-			<u--text :text="title" :type="parentData.current == index ? 'main' : 'content'" lineHeight="20px"
-				:size="parentData.current == index ? 14 : 13"></u--text>
+			<text style="font-size: 13px;" :style="{color:parentData.current == index ? '#3c9cff' :'#838383'}">{{title}}</text>
 			<slot name="desc">
 				<u--text :text="desc" type="tips" size="12"></u--text>
 			</slot>