6-6-1

pages.json

@@ -36,6 +36,12 @@
 				"navigationBarTitleText": "记录"
 			}
 		},
+		{
+			"path": "pages/user/myorderDispose",
+			"style": {
+				"navigationBarTitleText": "订单退回"
+			}
+		},
 		{
 			"path": "pages/order/foreignOrder",
 			"style": {
@@ -60,6 +66,18 @@
 				"navigationBarTitleText": "添加检验记录"
 			}
 		},
+		{
+			"path": "pages/salary/mySalary",
+			"style": {
+				"navigationBarTitleText": "工资记录"
+			}
+		},
+		{
+			"path": "pages/salary/infoSalary",
+			"style": {
+				"navigationBarTitleText": "记录"
+			}
+		},
 		{
 			"path": "pages/leader/porder",
 			"style": {

pages/salary/infoSalary.vue

@@ -0,0 +1,94 @@
+<template>
+	<view class="content">
+		<view class="main">
+			<view class="main-item flex" v-for="(item,index) in 10">
+				<view class="main-left">
+					<view class="main-title">
+						标题
+					</view>
+					<view class="main-time">
+						2019-06-09 13:00:00
+					</view>
+				</view>
+				<view class="main-right">
+					￥200
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				type: ''
+			};
+		},
+		onLoad(option) {
+			this.type = option.type;
+			if (option.type == 1) {
+				uni.setNavigationBarTitle({
+					title: '扣款记录'
+				});
+			} else if (option.type == 2) {
+				uni.setNavigationBarTitle({
+					title: '奖励记录'
+				});
+			} else {
+				uni.setNavigationBarTitle({
+					title: '其他记录'
+				});
+			}
+		},
+		onShow() {},
+		onReachBottom() {},
+		onReady() {},
+		methods: {}
+	};
+</script>
+
+<style lang="scss">
+	page,
+	.content {
+		min-height: 100%;
+		height: auto;
+	}
+
+	.main {
+		margin-top: 20rpx;
+		background: #ffffff;
+		padding: 0 32rpx;
+
+		.main-item {
+			padding: 28rpx 0 22rpx;
+			border-bottom: 1px solid #F0F0F0;
+
+			.main-left {
+				line-height: 1;
+
+				.main-title {
+					font-size: 30rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #333333;
+				}
+
+				.main-time {
+					margin-top: 20rpx;
+					font-size: 22rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #999999;
+				}
+			}
+
+			.main-right {
+				font-size: 34rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #FF0000;
+			}
+		}
+	}
+</style>

pages/salary/mySalary.vue

@@ -0,0 +1,260 @@
+<template>
+	<view class="content">
+		<view class="top"></view>
+		<view class="main">
+			<view class="main-title flex">
+				<view class="title-font">发放时间</view>
+				<view class="title-font">实际发放</view>
+			</view>
+			<view class=" " v-for="(item,index) in list" :key="index">
+				<view class="main-list flex" @click="more(item)">
+					<view class="list-left">{{item.time}}</view>
+					<view class="list-right">
+						<view class="list-font red">
+							￥{{item.all}}
+						</view>
+						<image class="jt" v-if="item.more == 0" src="../../static/icon/downxia.png" mode=""></image>
+						<image class="jt" v-if="item.more == 1" src="../../static/icon/downup.png" mode=""></image>
+					</view>
+				</view>
+				<view class="child-list" v-if="item.more == 1">
+					<view class="child-item">
+						<view class="list-left">工资金额</view>
+						<view class="list-right">
+							<view class="list-font">
+								￥{{item.all}}
+							</view>
+						</view>
+					</view>
+					<view class="child-item">
+						<view class="list-left">基本工资</view>
+						<view class="list-right">
+							<view class="list-font">
+								￥{{item.base}}
+							</view>
+						</view>
+					</view>
+					<view class="child-item" @click="navTo('/pages/salary/infoSalary?type=1')">
+						<view class="list-left">扣款</view>
+						<view class="list-right">
+							<view class="list-font">
+								￥{{item.deduct}}
+							</view>
+							<image class="jtr" src="../../static/img/jt.png" mode=""></image>
+						</view>
+					</view>
+					<view class="child-item" @click="navTo('/pages/salary/infoSalary?type=2')">
+						<view class="list-left">奖励</view>
+						<view class="list-right">
+							<view class="list-font">
+								￥{{item.award}}
+							</view>
+							<image class="jtr" src="../../static/img/jt.png" mode=""></image>
+						</view>
+					</view>
+					<view class="child-item" @click="navTo('/pages/salary/infoSalary?type=3')">
+						<view class="list-left">其他</view>
+						<view class="list-right">
+							<view class="list-font">
+								￥{{item.other}}
+							</view>
+							<image class="jtr" src="../../static/img/jt.png" mode=""></image>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				list: [{
+						time: '2022年11月15日',
+						all: 5000,
+						more: 0,
+						base: 3000,
+						deduct: 500,
+						award: 500,
+						other: 500
+					},
+					{
+						time: '2022年11月15日',
+						all: 5000,
+						more: 0,
+						base: 3000,
+						deduct: 500,
+						award: 500,
+						other: 500
+					},
+					{
+						time: '2022年11月15日',
+						all: 5000,
+						more: 0,
+						base: 3000,
+						deduct: 500,
+						award: 500,
+						other: 500
+					},
+					{
+						time: '2022年11月15日',
+						all: 5000,
+						more: 0,
+						base: 3000,
+						deduct: 500,
+						award: 500,
+						other: 500
+					},
+					{
+						time: '2022年11月15日',
+						all: 5000,
+						more: 0,
+						base: 3000,
+						deduct: 500,
+						award: 500,
+						other: 500
+					},
+					{
+						time: '2022年11月15日',
+						all: 5000,
+						more: 0,
+						base: 3000,
+						deduct: 500,
+						award: 500,
+						other: 500
+					},
+					{
+						time: '2022年11月15日',
+						all: 5000,
+						more: 0,
+						base: 3000,
+						deduct: 500,
+						award: 500,
+						other: 500
+					},
+					{
+						time: '2022年11月15日',
+						all: 5000,
+						more: 0,
+						base: 3000,
+						deduct: 500,
+						award: 500,
+						other: 500
+					},
+					{
+						time: '2022年11月15日',
+						all: 5000,
+						more: 0,
+						base: 3000,
+						deduct: 500,
+						award: 500,
+						other: 500
+					}
+				]
+			};
+		},
+		onLoad() {},
+		onShow() {},
+		onReachBottom() {},
+		onReady() {},
+		methods: {
+			more(item) {
+				if (item.more == 0) {
+					item.more = 1
+				} else {
+					item.more = 0
+				}
+			},
+			navTo(url) {
+				uni.navigateTo({
+					url
+				})
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	page,
+	.content {
+		min-height: 100%;
+		height: auto;
+		background: #ffffff;
+	}
+
+	.top {
+		height: 20rpx;
+		width: 750rpx;
+		background: #f8f8f8;
+	}
+
+	.main {
+		padding-bottom: 50rpx;
+
+		.main-title {
+			padding: 32rpx 34rpx 28rpx 28rpx;
+			border-bottom: 1px solid #F2F2F2;
+
+			.title-font {
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #000000;
+			}
+		}
+
+		.child-list {
+			background: #f8f8f8;
+			padding: 0 34rpx 0 28rpx;
+		}
+
+		.child-item {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding: 32rpx 0 28rpx 0;
+			border-bottom: 1px solid #f2f2f2;
+		}
+
+		.main-list {
+			padding: 32rpx 34rpx 28rpx 28rpx;
+		}
+
+		.list-left {
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #000000;
+		}
+
+		.list-right {
+			display: flex;
+			justify-content: flex-end;
+			align-items: center;
+
+			.list-font {
+				font-size: 32rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #333333;
+				margin-right: 10rpx;
+			}
+
+			.red {
+				color: #FF4C4C;
+			}
+
+			.jt {
+				width: 19rpx;
+				height: 11rpx;
+			}
+
+			.jtr {
+				width: 11rpx;
+				height: 19rpx;
+			}
+		}
+	}
+</style>

pages/user/myorder.vue

@@ -30,7 +30,7 @@
 				<view class="box1" @click="navTo('/pages/leader/image')">参考图片</view>
 				<view class="box1" @click="navTo('/pages/user/myorderRecord')">记录</view>
 				<view class="box2" @click="navTo('/pages/user/myorderDispose?type=1')">订单退回</view>
-				<view class="box2">订单提交</view>
+				<view class="box2" @click="navTo('/pages/user/myorderDispose?type=2')">订单提交</view>
 			</view>
 		</view>
 	</view>

pages/user/myorderDispose.vue

@@ -1,24 +1,161 @@
 <template>
-	<view class="content"></view>
+	<view class="content">
+		<view class="main " v-for="(item,index) in list">
+			<view class="main-top">
+				<image class="main-icon" src="../../static/icon/order.png" mode=""></image>
+				<view class="main-font">
+					{{item.name}}
+				</view>
+			</view>
+			<view class="main-bottom flex">
+				<view class="num">
+					{{type==1?'剩余数量：':'可提交数量'}}
+				</view>
+				<view class="main-input red">
+					363
+				</view>
+			</view>
+			<view class="xian"></view>
+			<view class="main-bottom flex">
+				<view class="num">
+					{{type==1?'退回数量：':'数量'}}
+				</view>
+				<view class="main-input">
+					<input type="number" v-model="item.number" placeholder="请填写数量">
+				</view>
+			</view>
+		</view>
+		<view class="btn">
+			{{type==1?'确认退回':'确认提交'}}
+		</view>
+		<view class="" style="height: 80rpx;"></view>
+	</view>
 </template>
 
 <script>
-export default {
-	data() {
-		return {};
-	},
-	onLoad() {},
-	onShow() {},
-	onReachBottom() {},
-	onReady() {},
-	methods: {}
-};
+	export default {
+		data() {
+			return {
+				type: '',
+				list: [{
+					name: '规格1(黄色,37码）',
+					number: '',
+				}, {
+					name: '规格2(黄色,37码）',
+					number: '',
+				}, {
+					name: '规格3(黄色,37码）',
+					number: '',
+				}, {
+					name: '规格4(黄色,37码）',
+					number: '',
+				}, {
+					name: '规格5(黄色,37码）',
+					number: '',
+				}, {
+					name: '规格6(黄色,37码）',
+					number: '',
+				}, {
+					name: '规格7(黄色,37码）',
+					number: '',
+				}, {
+					name: '规格8(黄色,37码）',
+					number: '',
+				}],
+			};
+		},
+		onLoad(option) {
+			this.type = option.type
+			if (option.type == 2) {
+				uni.setNavigationBarTitle({
+					title: '提交订单'
+				});
+			}
+		},
+		onShow() {},
+		onReachBottom() {},
+		onReady() {},
+		methods: {}
+	};
 </script>
 
 <style lang="scss">
-page,
-.content {
-	min-height: 100%;
-	height: auto;
-}
+	page,
+	.content {
+		min-height: 100%;
+		height: auto;
+	}
+
+	.main {
+		margin: 20rpx auto 0;
+		padding: 0 20rpx;
+		width: 700rpx;
+		background: #FFFFFF;
+		border: 2px solid #EAECED;
+		box-shadow: 0rpx 0rpx 20rpx 0rpx rgba(50, 50, 52, 0.06);
+		border-radius: 20rpx;
+
+		.main-top {
+			display: flex;
+			align-items: center;
+			padding: 16rpx 0;
+			border-bottom: 1px solid #EAECED;
+
+			.main-icon {
+				width: 32rpx;
+				height: 37rpx;
+			}
+
+			.main-font {
+				margin-left: 10rpx;
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #333333;
+			}
+		}
+
+		.main-bottom {
+			padding: 20rpx 0;
+
+			.num {
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #666666;
+			}
+
+			.main-input {
+				text-align: right;
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #999999;
+			}
+
+			.red {
+				color: #FF4C4C;
+			}
+		}
+	}
+
+	.btn {
+		text-align: center;
+		margin: 100rpx auto 0;
+		width: 622rpx;
+		height: 85rpx;
+		background: #069CFA;
+		border-radius: 15rpx;
+		line-height: 85rpx;
+		font-size: 32rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #FFFFFF;
+	}
+
+	.xian {
+		width: 100%;
+		height: 2rpx;
+		background: #EAECED;
+	}
 </style>

pages/user/user.vue

@@ -101,7 +101,8 @@
 						icon: '../../static/icon/u5.png',
 						name: '工资记录',
 						tip: '历月工资详情',
-						bg: '../../static/img/user-item1.png'
+						bg: '../../static/img/user-item1.png',
+						src: '/pages/salary/mySalary'
 					},
 					{
 						icon: '../../static/icon/u6.png',