Merge branch 'master' of http://175.178.51.79:3000/hly/recruitment-wechat-uniapp-241012

pages.json

@@ -141,7 +141,10 @@
 				"path": "mine/redeemCode"
 			},
 			{
-				"path": "work/bossDetail"
+				"path": "kepp/addPriceEntryRecords"
+			},
+			{
+				"path": "kepp/addWorkEntryRecords"
 			}
 		]
 	}],

pages/index/keepAccounts.vue

@@ -67,10 +67,12 @@
 						设置
 					</view>
 					<view class="right">
-						<view class="b1">
+						<view class="b1"
+						@click="$utils.navigateTo('/pages_order/kepp/addWorkEntryRecords?id=' + item.id)">
 							记工
 						</view>
-						<view class="b2">
+						<view class="b2"
+						@click="$utils.navigateTo('/pages_order/kepp/addPriceEntryRecords?id=' + item.id)">
 							记账
 						</view>
 					</view>

pages_order/kepp/addPriceEntryRecords.vue

@@ -0,0 +1,146 @@
+<template>
+	<!-- 记工记账 -->
+	<view class="page">
+		<navbar title="记账" 
+		bgColor="#F9FEFE"
+		leftClick @leftClick="$utils.navigateBack" />
+		
+		<uv-cell
+		title="选择日期"
+		rightIconStyle="fontSize: 30rpx;"
+		:value="form.date || '请选择选择日期'"
+		@click="$refs.datetimePicker.open()"
+		isLink
+		></uv-cell>
+		
+		
+		<view class="form-sheet-cell">
+			<view class="label">
+				类型
+			</view>
+			<uv-radio-group v-model="form.type">
+				<view class="price">
+					<uv-radio
+						:customStyle="{margin: '8px'}" 
+						v-for="(item, index) in typeList" 
+						:key="index" 
+						iconSize="30rpx"
+						size="40rpx"
+						labelSize="26rpx"
+						:label="item.name" 
+						:name="item.name">
+					</uv-radio>
+				</view>
+			</uv-radio-group>
+		</view>
+		
+		<view class="form-sheet-cell">
+			<view class="label">
+				金额
+			</view>
+			<input placeholder="请输入金额" 
+			type="number"
+			v-model="form.phone" />
+		</view>
+		
+		<view class="form-sheet-cell">
+			<view class="label">
+				备注
+			</view>
+			<uv-textarea
+			v-model="form.workDetail" 
+			count 
+			:maxlength="300" 
+			autoHeight
+			placeholder="请输入备注"></uv-textarea>
+		</view>
+		
+		<view class="uni-color-btn"
+		@click="submit">
+			确认
+		</view>
+		
+		<uv-datetime-picker 
+		ref="datetimePicker" 
+		mode="date" 
+		v-model="dateValue"
+		@confirm="datetimePickerConfim"/>
+		
+	</view>
+</template>
+
+<script>
+	import mixinList from '@/mixins/list.js'
+	export default {
+		mixins : [mixinList],
+		data() {
+			return {
+				form : {
+					date : '',
+					time : 0.5,
+					type : '收入',
+				},
+				id : 0,
+				dateValue : new Date().getTime(),
+				typeList : [
+					{
+						name : '收入',
+					},
+					{
+						name : '支出',
+					},
+				],
+			}
+		},
+		onLoad({id}) {
+			this.id = id
+		},
+		onShow() {},
+		methods: {
+			datetimePickerConfim(e){
+				this.form.date = this.$dayjs(e.value).format('YYYY-MM-DD')
+			},
+			submit(){
+				
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.page {
+		background-color: #fff;
+		
+		.form-sheet-cell{
+			display: flex;
+			background-color: #fff;
+			padding: 20rpx 30rpx;
+			align-items: center;
+			.label{
+				width: 160rpx;
+			}
+			.price{
+				display: flex;
+				text-align: center;
+				input{
+					width: 150rpx;
+					border: 1px solid $uni-color;
+					margin: 0 10rpx;
+				}
+			}
+			input{
+				flex: 1;
+				background-color: rgba($uni-color, 0.1);
+				padding: 10rpx 20rpx;
+				border-radius: 10rpx;
+			}
+			.right-icon{
+				margin-left: auto;
+			}
+		}
+		/deep/ .uv-textarea{
+			background-color: rgba($uni-color, 0.1) !important;
+			min-height: 400rpx;
+		}
+	}
+</style>

pages_order/kepp/addWorkEntryRecords.vue

@@ -0,0 +1,121 @@
+<template>
+	<!-- 记工记账 -->
+	<view class="page">
+		<navbar title="记工" 
+		bgColor="#F9FEFE"
+		leftClick @leftClick="$utils.navigateBack" />
+		
+		<uv-cell
+		title="选择日期"
+		rightIconStyle="fontSize: 30rpx;"
+		:value="form.date || '请选择选择日期'"
+		@click="$refs.datetimePicker.open()"
+		isLink
+		></uv-cell>
+		
+		<view class="form-sheet-cell">
+			<view class="label">
+				上班时间
+			</view>
+			<!-- <input placeholder="请输入上班时间" 
+			type="number"
+			v-model="form.phone" /> -->
+			
+			<uv-number-box v-model="form.time"
+			:step="0.5"
+			:min="0.5"
+			></uv-number-box>
+		</view>
+		
+		<view class="form-sheet-cell">
+			<view class="label">
+				备注
+			</view>
+			<uv-textarea
+			v-model="form.workDetail" 
+			count 
+			:maxlength="300" 
+			autoHeight
+			placeholder="请输入备注"></uv-textarea>
+		</view>
+		
+		<view class="uni-color-btn"
+		@click="submit">
+			确认
+		</view>
+		
+		<uv-datetime-picker 
+		ref="datetimePicker" 
+		mode="date" 
+		v-model="dateValue"
+		@confirm="datetimePickerConfim"/>
+		
+	</view>
+</template>
+
+<script>
+	import mixinList from '@/mixins/list.js'
+	export default {
+		mixins : [mixinList],
+		data() {
+			return {
+				form : {
+					date : '',
+					time : 0.5,
+				},
+				id : 0,
+				dateValue : new Date().getTime()
+			}
+		},
+		onLoad({id}) {
+			this.id = id
+		},
+		onShow() {},
+		methods: {
+			datetimePickerConfim(e){
+				this.form.date = this.$dayjs(e.value).format('YYYY-MM-DD')
+			},
+			submit(){
+				
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.page {
+		background-color: #fff;
+		
+		.form-sheet-cell{
+			display: flex;
+			background-color: #fff;
+			padding: 20rpx 30rpx;
+			align-items: center;
+			.label{
+				width: 160rpx;
+			}
+			.price{
+				display: flex;
+				text-align: center;
+				input{
+					width: 150rpx;
+					border: 1px solid $uni-color;
+					margin: 0 10rpx;
+				}
+			}
+			input{
+				flex: 1;
+				background-color: rgba($uni-color, 0.1);
+				padding: 10rpx 20rpx;
+				border-radius: 10rpx;
+			}
+			.right-icon{
+				margin-left: auto;
+			}
+		}
+		/deep/ .uv-textarea{
+			background-color: rgba($uni-color, 0.1) !important;
+			min-height: 400rpx;
+		}
+	}
+</style>

pages_order/kepp/keepAccountsDetail.vue

@@ -13,6 +13,7 @@
 			
 			<view class="cell" style="margin-top: 40rpx;">
 				<uv-cell v-for="(item,index) in list" 
+				:key="index"
 				:label="item.billDate" 
 				title="佣金收入" 
 				:value="item.amount"></uv-cell>

uni_modules/uv-number-box/components/uv-number-box/props.js

@@ -51,7 +51,7 @@ export default {
 		// 输入框宽度，单位为px
 		inputWidth: {
 			type: [String, Number],
-			default: 35
+			default: 100
 		},
 		// 是否显示减少按钮
 		showMinus: {
@@ -81,7 +81,7 @@ export default {
 		// 按钮大小，宽高等于此值，单位px，输入框高度和此值保持一致
 		buttonSize: {
 			type: [String, Number],
-			default: 30
+			default: 60
 		},
 		// 输入框和按钮的背景颜色
 		bgColor: {