11.20

pages.json

@@ -538,6 +538,14 @@
 					"navigationBarTitleText" : "",
 					"enablePullDownRefresh" : false
 				}
+			},
+			{
+				"path" : "dakuan",
+				"style" : 
+				{
+					"navigationBarTitleText" : "",
+					"enablePullDownRefresh" : false
+				}
 			}]
 		}
 	],

pagesA/teach.vue

@@ -109,7 +109,7 @@
 		</view>
 		<!-- 选择器 -->
 		<!-- 选择器 -->
-		<u-datetime-picker title="上学时间" :minDate="minDate1" @confirm="entryConfirm" :show="entryShow" mode="year-month"
+		<u-datetime-picker  title="上学时间" :minDate="minDate1" @confirm="entryConfirm" :show="entryShow" mode="year-month"
 			@cancel='close()'></u-datetime-picker>
 		<u-datetime-picker title="毕业时间" :minDate="minDate" @confirm="dimissionConfirm" :show="dimissionShow"
 			mode="year-month" @cancel='close()'></u-datetime-picker>

pagesD/change-name.vue

@@ -5,9 +5,12 @@
 			<text>12</text>
 		</view>
 		<view class="name-tips u-flex">
-			<u-checkbox v-model="value" size="26" active-color="#0C66C2" shape="circle">
+			<u-checkbox-group>
+				<u-checkbox v-model="value" size="26" active-color="#0C66C2" shape="circle">
+
+				</u-checkbox>
 				<text class="text">显示先生/女士</text>
-			</u-checkbox>
+			</u-checkbox-group>
 		</view>
 		<view class="user-down">
 			<view class="down-btn u-flex">

pagesD/dakuan.vue

@@ -0,0 +1,293 @@
+<template>
+	<view class="dakuan-pages">
+		<view class="dakuan-header u-flex-col u-col-center u-row-center">
+			<text class="text1">{{detail.time || ''}}日应支付金额</text>
+			<view class="text2 u-flex">
+				<text :style="{color: detail.status == 'overdue' ? '#F2413A' : '#000'}">¥{{detail.amount || '0'}}</text>
+				<text v-if="detail.status == 'overdue'">已逾期</text>
+			</view>
+		</view>
+		<view class="dakuan-body">
+			<view class="body-top u-flex">
+				<text class="text1">抵扣金余额：</text>
+				<view class="text2 u-flex">
+					<text>¥{{detail.deduction_balance || 0}}</text>
+				</view>
+			</view>
+			<view class="body-input u-flex">
+				<text class="text1">¥</text>
+				<input class="input" type="digit" placeholder="请输入抵扣金额" v-model="allprice" @blur="changeprice">
+				<text class="text2" @click="setall">全部抵扣</text>
+			</view>
+			<view class="body-item u-flex u-row-between">
+				<text class="text1">抵扣金抵扣</text>
+				<text class="text2 u-flex-1">-¥{{price || '0'}}</text>
+			</view>
+			<view class="body-item u-flex u-row-between">
+				<text class="text1">提前还款优惠</text>
+				<text class="text2 u-flex-1">-¥{{detail.discount_amount || '0'}}</text>
+			</view>
+			<view class="body-item u-flex u-row-between">
+				<text class="text1">实付佣金</text>
+				<text class="text2 u-flex-1" style="color: #000;">¥{{(detail.amount - price) || '0'}}</text>
+			</view>
+			<view class="body-beizhu u-flex u-row-between">
+				<text>转账备注</text>
+				<input type="text" placeholder="请填写转账成功后的交易流水号" v-model="beizhu">
+			</view>
+		</view>
+		<view class="dakuan-down">
+			<view class="dakuan-btn u-flex u-row-center">
+				<text @click="tijiao">提交</text>
+			</view>
+			<view class="safe-area-inset-bottom"></view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				id: '',
+				detail: {},
+				price: '',
+				beizhu: '',
+				money: '',
+				allprice:''
+			}
+		},
+		onLoad(option) {
+			this.id = option.id
+			this.getdata()
+			this.getuser()
+		},
+		methods: {
+			setall(){
+				if (Number(this.detail.deduction_balance) > 0) {
+					if(Number(this.detail.deduction_balance) < Number(this.detail.amount)){
+						this.price = Number(this.detail.deduction_balance)
+						this.allprice = Number(this.detail.deduction_balance)
+					}else{
+						this.price = Number(this.detail.amount)
+						this.allprice = Number(this.detail.amount)
+					}
+				}
+			},
+			tijiao() {
+				uni.showLoading({
+					mask: true,
+					title: "请稍后"
+				})
+				this.$u.post('/api/hr.order/pay', {
+					period_id: this.id,
+					deduction: this.price,
+					transaction_no: this.beizhu
+				}).then(res => {
+					this.$u.toast(res.msg)
+					if (res.code == 1) {
+						setTimeout(() => {
+							uni.navigateBack()
+						}, 800)
+					}
+				})
+			},
+			getuser() {
+				this.$u.post('/api/hr.user/index').then(res => {
+					this.money = res.data.money
+				})
+			},
+			changeprice(e) {
+				if (e.detail.value > 0) {
+					var price = Number(Number(e.detail.value).toFixed(2))
+					if (price > Number(this.detail.amount)) {
+						price = Number(this.detail.amount)
+					}
+					if (price > this.detail.deduction_balance) {
+						this.$u.toast("抵扣金不足")
+						price = this.detail.deduction_balance > 0 ? this.detail.deduction_balance : ''
+					}
+					this.price = price
+					this.allprice = price
+				} else {
+					this.price = ''
+					this.allprice = ''
+				}
+			},
+			getdata() {
+				this.$u.post('/api/hr.order/pay_pre', {
+					period_id: this.id
+				}).then(res => {
+					if (res.code == 1) {
+						
+						// status.状态:unpaid=未支付,paying=支付中,paid=已支付,refunding=退款中,refunded=已退款,overdue.已逾期, discount_amount.折扣金额
+
+						this.detail = res.data
+					} else {
+						this.$u.toast(res.msg)
+						setTimeout(() => {
+							uni.navigateBack()
+						}, 800)
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.dakuan-pages {
+		.dakuan-down {
+			position: fixed;
+			bottom: 0;
+			left: 0;
+			width: 750rpx;
+			background: #FDFDFD;
+			box-shadow: 0rpx 0rpx 0rpx 0rpx rgba(0, 0, 0, 0.2);
+			z-index: 99;
+
+			.dakuan-btn {
+				padding: 12rpx 0;
+
+				text {
+					width: 686rpx;
+					line-height: 88rpx;
+					background: #0C66C2;
+					border-radius: 12rpx;
+					text-align: center;
+					font-size: 32rpx;
+					font-family: PingFangSC-Medium, PingFang SC;
+					font-weight: 500;
+					color: #FFFFFF;
+				}
+			}
+		}
+
+		.dakuan-body {
+			width: 686rpx;
+			background: #FFFFFF;
+			border-radius: 20rpx;
+			margin: 0 auto;
+			padding: 0 20rpx;
+
+			.body-beizhu {
+				height: 96rpx;
+				border-top: 2rpx solid #F4F4F4;
+				margin-top: 14rpx;
+
+				text {
+					font-size: 26rpx;
+					font-family: PingFangSC-Regular, PingFang SC;
+					font-weight: 400;
+					color: #1A1C24;
+				}
+
+				input {
+					font-size: 26rpx;
+					flex: 1;
+					text-align: right;
+				}
+			}
+
+			.body-item {
+				padding: 14rpx 0;
+
+				.text1 {
+					font-size: 26rpx;
+					font-family: PingFangSC-Regular, PingFang SC;
+					font-weight: 400;
+					color: #1A1C24;
+				}
+
+				.text2 {
+					font-size: 26rpx;
+					font-family: JDZhengHT-Regular, JDZhengHT;
+					font-weight: 400;
+					color: #F2413A;
+					text-align: right;
+				}
+			}
+
+			.body-input {
+				height: 110rpx;
+				border-bottom: 2rpx solid #F4F4F4;
+				margin-bottom: 14rpx;
+
+				.text1 {
+					font-size: 52rpx;
+					font-family: JDZhengHT-Regular, JDZhengHT;
+					font-weight: 400;
+					color: #222222;
+				}
+
+				.input {
+					flex: 1;
+					margin: 0 12rpx;
+					font-size: 32rpx;
+					height: 110rpx;
+				}
+
+				.text2 {
+					font-size: 24rpx;
+					font-family: PingFangSC-Regular, PingFang SC;
+					font-weight: 400;
+					color: #0C66C2;
+				}
+			}
+
+			.body-top {
+				padding: 30rpx 0;
+
+				.text1 {
+					font-size: 24rpx;
+					font-family: PingFangSC-Regular, PingFang SC;
+					font-weight: 400;
+					color: #777777;
+				}
+
+				.text2 {
+					font-size: 24rpx;
+					font-family: JDZhengHT-Light, JDZhengHT;
+					font-weight: 300;
+					color: #222222;
+				}
+			}
+		}
+
+		.dakuan-header {
+			height: 218rpx;
+
+			.text1 {
+				font-size: 28rpx;
+				font-family: SFPro-Regular, SFPro;
+				font-weight: 400;
+				color: #777777;
+				margin-bottom: 20rpx;
+			}
+
+			.text2 {
+				font-size: 52rpx;
+				font-family: JDZhengHT-Regular, JDZhengHT;
+				font-weight: 400;
+				color: #141414;
+
+				text:nth-child(2) {
+					width: 68rpx;
+					line-height: 32rpx;
+					background: #F3E2E0;
+					border-radius: 6rpx;
+					text-align: center;
+					font-size: 20rpx;
+					font-family: PingFangSC-Regular, PingFang SC;
+					font-weight: 400;
+					color: #F2413A;
+					margin-left: 12rpx;
+				}
+			}
+		}
+	}
+
+	page {
+		background-color: #F4F4F4;
+	}
+</style>

pagesD/renzheng.vue

@@ -16,18 +16,18 @@
 			<view class="item-name">
 				学历
 			</view>
-			<view class="item-input u-flex">
-				<input type="text" placeholder="请选择学历" :disabled="true" v-model="userinfo.sex_text">
+			<view class="item-input u-flex" @click="show=true">
+				<input type="text" placeholder="请选择学历" :disabled="true" v-model="info.education_name">
 				<u-icon name="arrow-right"></u-icon>
 			</view>
 		</view>
-		<view class="user-item" @click="changehangye">
+		<view class="user-item">
 			<view class="item-name">
 				毕业院校
 			</view>
 			<view class="item-input u-flex">
-				<input type="text" placeholder="请填写毕业院校" :disabled="true" v-model="userinfo.industry_name">
-				<u-icon name="arrow-right"></u-icon>
+				<input type="text" placeholder="请填写毕业院校" v-model="info.name">
+				<!-- <u-icon name="arrow-right"></u-icon> -->
 			</view>
 		</view>
 		<view class="user-item" @click="">
@@ -35,19 +35,34 @@
 				专业类别
 			</view>
 			<view class="item-input u-flex">
-				<input type="text" placeholder="请填写专业类别" :disabled="true" v-model="userinfo.experience_name">
-				<u-icon name="arrow-right"></u-icon>
+				<input type="text" placeholder="请填写专业类别" v-model="info.major">
+				<!-- <u-icon name="arrow-right"></u-icon> -->
 			</view>
 		</view>
-		<view class="user-item" @click="workShow=true">
+		<view class="user-item" @click="recruit_show = true">
 			<view class="item-name">
-				毕业年份
+				是否统招
 			</view>
 			<view class="item-input u-flex">
-				<input type="text" placeholder="请选择毕业年份" :disabled="true">
+				<input type="text" :disabled="true" placeholder="请选择" v-model="is_recruit">
 				<u-icon name="arrow-right"></u-icon>
 			</view>
 		</view>
+		<view class="user-item u-flex-col u-row-center">
+			<text class="item-name">时间</text>
+			<view class="u-flex u-row-between">
+				<view class="item-input" @click="start()">
+					<u--input :disabled="true" disabledColor="#fff" customStyle="padding:0 !important" type="text"
+						placeholder="上学时间" border placeholderClass='input-style' v-model="info.start_time"></u--input>
+				</view>
+				<view class="">-</view>
+				<view class="" @click="end()">
+					<u--input :disabled="true" disabledColor="#fff" customStyle="padding:0 !important" type="text"
+						placeholder="毕业时间" inputAlign="center" border placeholderClass='input-style'
+						v-model="info.end_time"></u--input>
+				</view>
+			</view>
+		</view>
 		<view style="height: 150rpx;"></view>
 		<view class="safe-area-inset-bottom"></view>
 		<view class="user-down">
@@ -56,8 +71,14 @@
 			</view>
 			<view class="safe-area-inset-bottom"></view>
 		</view>
-		<u-datetime-picker ref="pickers" title="毕业年份" :minDate="minDate1" @confirm="workConfirm" :show="workShow"
-			mode="date" @cancel='close()'></u-datetime-picker>
+		<u-picker :show="show" @cancel="show = false" title="学历" keyName="name" :columns="education"
+			@confirm="education_confirm"></u-picker>
+		<u-picker :show="recruit_show" title= "是否统招" @cancel="recruit_show = false" keyName="name" :columns="is_recruitlist"
+			@confirm="recruit"></u-picker>
+		<u-datetime-picker ref="pickers" title="上学时间" :minDate="minDate1" @confirm="entryConfirm" :show="entryShow" mode="year-month"
+			@cancel='entryShow = false'></u-datetime-picker>
+		<u-datetime-picker ref="pickers1" title="毕业时间" :minDate="minDate" @confirm="dimissionConfirm" :show="dimissionShow"
+			mode="year-month" @cancel='dimissionShow = false'></u-datetime-picker>
 	</view>
 </template>
 
@@ -67,33 +88,119 @@
 		get_experience,
 		getareacity,
 		get_sex,
-		index
+		index,
+		activityauth,
+		is_auth,
+		get_education
 	} from "@/units/inquire.js"
+import { get } from "https"
 	import fuxing from "../common/fuxing.js"
 	export default {
 		data() {
 			return {
-				workShow:false,
+				dimissionShow: false,
+				entryShow: false,
+				education: [
+					[]
+				],
+				recruit_show:false,
+				show: false,
+				workShow: false,
 				userinfo: {},
 				sexlist: [],
 				citylist: [],
 				qiye: '',
 				jingyanlist: [],
-				worklist: [{
-					label: 'soho猎头',
-					value: 'soho'
-				}, {
-					label: '就职猎头',
-					value: 'job'
-				}]
+				is_recruit:'',
+				is_recruitid:'',
+				is_recruitlist:[[
+					{
+						"name":'统招',
+						num:1
+					},
+					{
+						"name":"非统招",
+						num:0
+					}
+				]],
+				// worklist: [{
+				// 	label: 'soho猎头',
+				// 	value: 'soho'
+				// }, {
+				// 	label: '就职猎头',
+				// 	value: 'job'
+				// }],
+				info: {
+					id: "", //	integer	学校认证ID
+					school_id: "", //	integer	学校ID
+					name: "", //	string	学校名称
+					education_id: "", //	integer	学历ID
+					major: "", //	string	专业
+					start_time: "", //	string	开始时间
+					end_time: "", //	string	毕业时间
+					education_name: "", //	string	学历名称
+				}
 			}
 		},
 		onLoad() {
 			this.getuser()
 			this.getconfig()
-			this.minDate1 = Number(new Date('1980-01-01'));
+			this.minDate = Number(new Date('2000-01-01'));
+			this.minDate1 = Number(new Date('2000-01-01'));
+			this.is_auth()
+			this.get_education()
 		},
 		methods: {
+			recruit(e){
+				// console.log(e);
+				this.is_recruit = e.value[0].name
+				this.is_recruitid = e.value[0].num
+				// console.log(this.is_recruit);
+				this.recruit_show = false
+			},
+			async dimissionConfirm(e) {
+				const timeFormat = uni.$u.timeFormat;
+				let timeValue = await timeFormat(e.value, 'yyyy-mm');
+				this.info.end_time = timeValue
+				this.dimissionShow = false
+			},
+			start(){
+				this.entryShow = true
+				this.$refs.pickers.innerValue = new Date(1577808000000).getTime()
+			},
+			end(){
+				this.dimissionShow = true
+				this.$refs.pickers1.innerValue = new Date(1672502400000).getTime()
+			},
+			async entryConfirm(e) {
+				
+				const timeFormat = uni.$u.timeFormat;
+				console.log(e.value);
+				let timeValue = await timeFormat(e.value, 'yyyy-mm');
+				this.info.start_time = timeValue;
+				this.entryShow = false
+			},
+			education_confirm(e) {
+				console.log(e);
+				console.log(this.info);
+				this.info.education_name = e.value[0].name
+
+				this.info.education_id = e.value[0].id
+				this.show = false
+			},
+			get_education() {
+				get_education().then(res => {
+					this.education[0] = res.data
+				})
+			},
+			is_auth() {
+				is_auth().then(res => {
+					if (res.data.is_auth == 1) {
+						this.info = res.data.info
+					}
+				})
+			},
+
 			//参加工作时间
 			async workConfirm(e) {
 				const timeFormat = uni.$u.timeFormat;
@@ -117,39 +224,39 @@
 					this.$u.toast("请输入真实名字")
 					return
 				}
-				if (!this.userinfo.sex) {
-					this.$u.toast("请选择性别")
+				if (!this.info.education_name) {
+					this.$u.toast("请选择学历")
 					return
 				}
-				if (!this.userinfo.industry_name) {
-					this.$u.toast("请选择猎头行业")
+				if (!this.info.name) {
+					this.$u.toast("请填写毕业院校")
 					return
 				}
-				if (!this.userinfo.experience_name) {
-					this.$u.toast("请选择经验")
+				if (!this.info.major) {
+					this.$u.toast("请填写专业类别")
 					return
 				}
-				if (!this.userinfo.work_status) {
-					this.$u.toast("请选择就职状态")
+				if (!this.info.start_time) {
+					this.$u.toast("请选择上学时间")
 					return
 				}
-				if (!this.userinfo.work_address) {
-					this.$u.toast("请选择工作地址")
+				if (!this.info.end_time) {
+					this.$u.toast("请选择毕业时间")
 					return
 				}
 				uni.showLoading({
 					mask: true,
 					title: "请稍后"
 				})
-				profile({
-					avatar: this.userinfo.avatar,
-					name: this.userinfo.name,
-					industry_first: this.userinfo.industry_first,
-					industry_id: this.userinfo.industry_id,
-					experience_id: this.userinfo.experience_id,
-					work_status: this.userinfo.work_status,
-					work_address: this.userinfo.work_address,
-					realname: this.userinfo.virtual_name,
+
+
+				activityauth({
+					name: this.info.name, //学校名称
+					is_recruit: this.is_recruitid, //是否统招:0=非统招,1=统招
+					education_id: this.info.education_id, //学历ID
+					major: this.info.major, //专业
+					start_time: this.info.start_time, //	开始时间 例：2023-01
+					end_time: this.info.end_time //	毕业时间
 				}).then(res => {
 					if (res.code == 1) {
 						this.$u.toast("修改成功")
@@ -160,6 +267,26 @@
 						this.$u.toast(res.msg)
 					}
 				})
+
+				// profile({
+				// 	avatar: this.userinfo.avatar,
+				// 	name: this.userinfo.name,
+				// 	industry_first: this.userinfo.industry_first,
+				// 	industry_id: this.userinfo.industry_id,
+				// 	experience_id: this.userinfo.experience_id,
+				// 	work_status: this.userinfo.work_status,
+				// 	work_address: this.userinfo.work_address,
+				// 	realname: this.userinfo.virtual_name,
+				// }).then(res => {
+				// 	if (res.code == 1) {
+				// 		this.$u.toast("修改成功")
+				// 		setTimeout(() => {
+				// 			uni.navigateBack()
+				// 		}, 800)
+				// 	} else {
+				// 		this.$u.toast(res.msg)
+				// 	}
+				// })
 			},
 			changecity(e) {
 				this.userinfo.work_address = `${e[0].label} ${e[1].label}`
@@ -228,6 +355,7 @@
 						'female': '女',
 						'secret': '保密'
 					} [this.userinfo.sex]
+					console.log(this.userinfo);
 				})
 			},
 			tochangename() {

pagesD/tixian1.vue

@@ -4,54 +4,55 @@
 			<view class="">
 				<u-subsection mode="subsection" :list="list2" :current="current" @change="change"
 					keyName="label"></u-subsection>
-				<view class="yong" v-if="current==0" style="margin-top: 20rpx;">
-					<u-checkbox-group v-model="checkboxValue1" placement="column" @change="checkboxChange">
+				<u-checkbox-group v-model="checkboxValue1" placement="column" @change="checkboxChange">
+					<view class="yong" v-if="current==0" style="margin-top: 20rpx;" v-for="(item,index) in list"
+						:key="index">
 						<view class="u-flex">
-							<u-checkbox :customStyle="{marginBottom: '8px'}">
+							<u-checkbox :customStyle="{marginBottom: '8px'}" :name="item.id">
 							</u-checkbox>
 							<view class="" style="flex: 1;">
 								<view class="">
-									订单编号：287910109281003
+									订单编号:{{item.order.order_no}}
 								</view>
 								<view class="u-flex u-row-between"
 									style="margin-top: 20rpx; border-top:2rpx solid #F6F6F6;padding-top: -18rpx;box-sizing: border-box;">
 									<view class="left">
 										<view class="top">
 											<text class="left">
-												陈昂
+												{{item.order.recommend_info.username}}
 											</text>
 											<text class="right">
-												Java高级工程师
+												{{item.order.job.job_name}}
 											</text>
 										</view>
 										<view class="concent">
 											<text class="left">佣金内容</text>
-											<text class="right">协助完成面试</text>
+											<text class="right">{{item.type_name}}</text>
 										</view>
 										<view class="concent u-flex">
 											<text class="left">佣金金额</text>
 											<view class="money">
 												<text style="font: 24rpx;">¥</text>
-												<text style="font-size: 32rpx;">200.00</text>
+												<text style="font-size: 32rpx;">{{item.amount}}</text>
 											</view>
 										</view>
 									</view>
 									<view class="right">
-										<view class="top">
+										<view class="top u-flex">
 											<text class="left">
-												职位负责人
+												职位负责人-
 											</text>
 											<text class="right">
-												林景宁
+												{{item.order.hr.name }}
 											</text>
 										</view>
 										<view class="concent">
 											<text class="left">offer时间</text>
-											<text class="right">2023.03.12 12:43</text>
+											<text class="right">{{item.order.offered_time.slice(0,-3).replaceAll("-",".")}}</text>
 										</view>
 										<view class="concent">
 											<text class="left">过保时间</text>
-											<text class="right">2023.03.12 12:43</text>
+											<text class="right">{{item.order.over_protected_time.slice(0,-3).replaceAll("-",".")}}</text>
 										</view>
 									</view>
 								</view>
@@ -59,18 +60,19 @@
 						</view>
 						<view class="bottom u-flex u-row-between">
 							<view class="left">
-								<text>推荐时间：2023.03.23 12:30</text>
+								<text>推荐时间:{{item.order.recommended_time}}</text>
 							</view>
 							<view class="right">
-								<text>回款时间:2023.03.12 12:3</text>
+								<text v-if="item.is_confirm==1">回款时间:{{item.confirm_time.slice(0,-3).replaceAll("-",".")}}</text>
+								<text v-if="item.is_confirm==0">回款时间:未回款</text>
 							</view>
 						</view>
-					</u-checkbox-group>
-				</view>
-				<view class="yong" v-if="current == 1" style="margin-top: 20rpx;">
-					<u-checkbox-group v-model="checkboxValue1" placement="column" @change="checkboxChange">
+					</view>
+				</u-checkbox-group>
+				<u-checkbox-group v-model="checkboxValue1" placement="column" @change="checkboxChange">
+					<view class="yong" v-if="current == 1" style="margin-top: 20rpx;" v-for="(item,index) in list"
+						:key="index">
 						<view class="u-flex">
-						
 							<view class="" style="flex: 1;">
 								<view class="u-flex u-row-between">
 									<view class="order">
@@ -80,9 +82,9 @@
 										未提现
 									</view>
 								</view>
-								<view class="u-flex u-row-between dan" style="margin-top: 18rpx;" >
+								<view class="u-flex u-row-between dan" style="margin-top: 18rpx;">
 									<view class="u-flex">
-										<u-checkbox  :name="item.name">
+										<u-checkbox :name="item.name">
 										</u-checkbox>
 										<view class="lietou">猎头成单</view>
 									</view>
@@ -97,12 +99,38 @@
 							<text class="date">邀请日期 2023.03.12 12:4</text>
 							<text class="date1">回款时间:2023.03.12 23:1</text>
 						</view>
-					</u-checkbox-group>
-				</view>
+
+					</view>
+				</u-checkbox-group>
 			</view>
-			<view style="height: 88vh;justify-content: center;" class="u-flex" v-if="list.length == 0 ">
+			<!-- 			<view style="height: 88vh;justify-content: center;" class="u-flex" v-if="list.length == 0 ">
 				<u-empty text="暂无数据" mode="list"></u-empty>
-			</view>
+			</view> -->
+		</view>
+		<view class="" style="height: 186rpx;background: #F3F3F3;"></view>
+		<!-- <view class="safe-area-inset-bottom"></view> -->
+		<view class="bottom-end">
+			<u-checkbox-group @change="arraly" v-model="arralylist">
+				<view class="u-flex u-row-between" style="width: 100%;">
+					<view class="u-flex">
+						<u-checkbox name=1>
+						</u-checkbox>
+						<view class="">全选</view>
+					</view>
+					<view class="u-flex">
+						<view class="">
+							<text class="jine">金额</text>
+							<text class="red" style="font-size: 24rpx;margin-left: 12rpx;">￥</text>
+							<text class="red" style="font-size: 36rpx;">{{alla}}</text>
+							<text class="red" style="font-size: 24rpx;">.{{00}}</text>
+						</view>
+						<view class="btn" style="margin-left: 20rpx;">
+							立即提现
+						</view>
+					</view>
+				</view>
+				<view class="safe-area-inset-bottom"></view>
+			</u-checkbox-group>
 		</view>
 		<u-datetime-picker :show="showtime" mode="year-month" @confirm="changetime"
 			@cancel="showtime = false"></u-datetime-picker>
@@ -117,10 +145,15 @@
 	export default {
 		data() {
 			return {
+				arralylist: [],
+				checkboxValue1: [],
+				money: 200.00,
 				show: false,
 				showtime: false,
 				current: 0,
 				date: "",
+				all:"",
+				moneylist:[],
 				list: [],
 				list2: [{
 					label: '订单佣金',
@@ -130,6 +163,7 @@
 					label: '邀请佣金',
 					source_type: "invite"
 				}],
+				alllll:0,
 				source_type: "order",
 				label: "订单佣金",
 				columns: [
@@ -162,14 +196,51 @@
 			this.commission_list()
 		},
 		computed: {
+			alla(){
+				// var all = ""
+				return this.alllll+=Number(this.all)
+			},
 			bgImage() {
 				return `url(${require('@/static/images/juxing.png')}) 100% 100%`
 			}
 		},
 		methods: {
+			arraly(n) {
+				if (n.length > 0) {
+					this.list.forEach(item=>{
+						this.checkboxValue1.push(item.id)
+						this.moneylist.push(item.amount)
+						this.arralylist = this.checkboxValue1
+						this.sum()
+					})
+					if(this.arralylist!=this.checkboxValue1){
+						n.length = 0
+					}
+				}
+				if (n.length == 0) {
+					this.checkboxValue1 = []
+					this.moneylist = []
+					this.sum()
+				}
+			},
+			checkboxChange(n) {
+				this.arralylist = n
+				this.list.forEach(item=>{
+					if(n[n.length-1] == item.id){
+						this.moneylist.push(item.amount)
+					}
+				})
+				this.sum()
+			},
 			return1() {
 				uni.navigateBack()
 			},
+			sum(){
+				this.moneylist.forEach(item=>{
+					this.all += Number(item)
+				})
+				console.log(this.all);
+			},
 			change(e) {
 				this.current = e
 			},
@@ -196,11 +267,9 @@
 					begin_time: "",
 					end_time: "",
 					time_type: "",
-					status: ""
+					status: "unapplied"
 				}).then(res => {
-					console.log(res);
 					this.list = res.data.data
-					console.log(this.list.length);
 				})
 			}
 		}
@@ -208,35 +277,77 @@
 </script>
 
 <style lang="scss" scoped>
-	.date{
+	.btn {
+		width: 184rpx;
+		height: 72rpx;
+		background: #0C66C2;
+		border-radius: 12rpx;
+		font-size: 30rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		color: #FFFFFF;
+		line-height: 72rpx;
+		text-align: center;
+	}
+
+	.jine {
+		font-size: 24rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		color: #444444;
+	}
+
+	.red {
+		font-family: JDZhengHT, JDZhengHT;
+		font-weight: 400;
+		color: #F2413A;
+	}
+
+	.bottom-end {
+		width: 750rpx;
+		height: 166rpx;
+		background: #FFFFFF;
+		padding: 16rpx 32rpx 0;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		box-sizing: border-box;
+	}
+
+	.date {
 		font-size: 24rpx;
 		font-family: PingFangSC-Regular, PingFang SC;
 		font-weight: 400;
 		color: #888888;
 	}
-	.date1{
+
+	.date1 {
 		font-size: 24rpx;
 		font-family: SFPro-Regular, SFPro;
 		font-weight: 400;
 		color: #222222;
 	}
-	.red{
+
+	.red {
 		font-family: JDZhengHT-Regular, JDZhengHT;
 		font-weight: 400;
 		color: #F2413A;
 	}
-	.lietou{
+
+	.lietou {
 		font-size: 32rpx;
 		font-family: PingFangSC-Medium, PingFang SC;
 		font-weight: 500;
 		color: #222222;
 	}
-	.dan{
-		margin-top:20rpx ;
-		border-top:2rpx solid #F6F6F6 ;
+
+	.dan {
+		margin-top: 20rpx;
+		border-top: 2rpx solid #F6F6F6;
 		padding-top: 18rpx;
 	}
-	.deposit{
+
+	.deposit {
 		border-radius: 6rpx;
 		background-color: rgba(12, 102, 194, 0.1);
 		font-size: 24rpx;
@@ -245,12 +356,14 @@
 		color: #0C66C2;
 		padding: 4rpx;
 	}
-	.order{
+
+	.order {
 		font-size: 24rpx;
 		font-family: SFPro-Regular, SFPro;
 		font-weight: 400;
 		color: #666666;
 	}
+
 	.yong {
 		background: #FFFFFF;
 		border-radius: 16rpx;
@@ -337,21 +450,6 @@
 		}
 	}
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 	.page {
 		height: 100vh;
 
@@ -360,6 +458,8 @@
 			background: #F3F3F3;
 			min-height: 78vh;
 			padding-top: 20rpx;
+			min-height: 100vh;
+			box-sizing: border-box;
 
 
 			.list {
@@ -415,6 +515,7 @@
 				font-family: PingFangSC-Regular, PingFang SC;
 				font-weight: 400;
 				color: #555555;
+				
 			}
 		}
 
@@ -431,11 +532,20 @@
 				font-family: PingFangSC-Regular, PingFang SC;
 				font-weight: 400;
 				color: #555555;
+				display: inline-block;
+				width: 170rpx;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
 			}
 		}
 	}
 
 	.left {
+		// width: 300rpx;
+		// overflow: hidden;
+		// text-overflow: ellipsis;
+		// white-space: nowrap;
 		.concent {
 			.left {
 				font-size: 24rpx;
@@ -462,6 +572,7 @@
 		}
 
 		.top {
+
 			.left {
 				height: 44rpx;
 				font-size: 32rpx;
@@ -476,6 +587,11 @@
 				font-family: PingFangSC-Regular, PingFang SC;
 				font-weight: 400;
 				color: #141414;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+				width: 220rpx;
+				display: inline-block;
 			}
 		}
 	}

pagesD/yongjin.vue

@@ -2,17 +2,24 @@
 	<view class="dikou">
 		<view class="dikou-header u-flex u-row-between u-col-top">
 			<image src="static/images/yjbg.png" class="header-img" mode=""></image>
+			<text class="top-font" @click="tobank">银行卡</text>
 			<view class="header-item u-flex-1 u-flex-col">
 				<view class="item-top u-flex">
 					<text>佣金余额</text>
 					<image style="margin-left: 10rpx;" src="static/images/dikou-tips.png" mode=""></image>
 				</view>
-				<view class="item-price u-flex">
-					{{sum || '0.00'}}
+				<view class="item-price u-flex u-row-between"
+					style="border-bottom: 2rpx solid rgba(255,255,255,0.2);padding-bottom: 32rpx;">
+					<view class="u-flex">
+						{{sum || '0.00'}}
+						<text style="margin-left: 20rpx;margin-right: 8rpx;" @click.stop="mingxi"
+							class="fontm">佣金明细</text>
+						<u-icon name="arrow-right" size="9" color="#fff"></u-icon>
+					</view>
 					<image style="margin-left: 20rpx;" @click="totixian" src="static/images/dikou-tixian.png"
 						class="item-tixian" mode=""></image>
 				</view>
-				<view class="u-flex">
+				<!-- 				<view class="u-flex">
 					<view class="left">
 						<text class="top">订单佣金</text>
 						<view class="bottom">
@@ -25,9 +32,37 @@
 							{{invite || '0.00'}}
 						</view>
 					</view>
+				</view> -->
+				<view class="u-flex" style="margin-top: 30rpx;">
+					<view class="" style="border-right: 1rpx solid rgba(255,255,255, 0.2);min-width: 170rpx;">
+						<view class="fontm">订单佣金</view>
+						<view class="bottom">{{order || '0.00'}}</view>
+					</view>
+					<view class="" style="margin-left: 70rpx;">
+						<view class="fontm">待结算订单佣金</view>
+						<view class="bottom">{{order_un_confirm||'0.00'}}</view>
+					</view>
+					<view class="" style="margin-left: 60rpx;">
+						<view class="fontm">已结算订单佣金</view>
+						<view class="bottom">{{order_confirm||'0.00'}}</view>
+					</view>
+				</view>
+				<view class="u-flex" style="margin-top: 30rpx;">
+					<view class="" style="border-right: 1rpx solid rgba(255,255,255, 0.2);min-width: 170rpx;">
+						<view class="fontm">邀请佣金</view>
+						<view class="bottom">{{invite || '0.00'}}</view>
+					</view>
+					<view class="" style="margin-left: 70rpx;">
+						<view class="fontm">待结算邀请佣金</view>
+						<view class="bottom">{{invite_un_confirm ||'0.00'}}</view>
+					</view>
+					<view class="" style="margin-left: 60rpx;">
+						<view class="fontm">已结算邀请佣金</view>
+						<view class="bottom">{{ invite_confirm||'0.00'}}</view>
+					</view>
 				</view>
 			</view>
-			<view class="header-item u-flex-1 u-flex-col " style="justify-content: center;">
+			<!-- 			<view class="header-item u-flex-1 u-flex-col " style="justify-content: center;">
 				<view class="box">
 					<view class="u-flex top1" style="">
 						<text class="fontm" style="margin-right: 8rpx;min-width: 100rpx;"
@@ -40,32 +75,35 @@
 						<u-icon name="play-right-fill" color="#fff" size="12"></u-icon>
 					</view>
 				</view>
-			</view>
+			</view> -->
 		</view>
+		<view class="" style="height: 120rpx;"></view>
 		<view class="dikou-list">
 			<view class="list-header u-flex u-row-between">
 				<view class="header-title u-flex-col">
 					<text>收支明细</text>
 					<text></text>
 				</view>
-				<view class="list-time u-flex" @click="showtime = true">
+				<view class="list-time u-flex" @click="workBtn()">
 					<text class="text1">{{date || '选择时间'}}</text>
 					<u-icon name="arrow-down-fill" size="9"></u-icon>
 				</view>
 			</view>
-			<view class="list-item u-flex u-row-between" v-for="(item,index) in list" :key="index">
+			<view class="list-item u-flex u-row-between" v-for="(item,index) in list" :key="index"
+				v-if="list.length > 0">
 				<view class="u-flex-col">
+					<view class=""></view>
 					<text class="text1">{{item.remark}}</text>
 					<text class="text2">{{item.createtime}}</text>
 				</view>
-				<text class="text3" style="color: #E02020;" v-if="item.amount < 0">{{item.amount}}</text>
-				<text class="text3" v-else style="color: #35AA1F;">{{item.amount}}</text>
+				<text class="text3" style="color: #E02020;" v-if="item.amount < 0">-{{item.amount}}</text>
+				<text class="text3" v-else style="color: #35AA1F;">+{{item.amount}}</text>
 			</view>
-			<view style="height: 70vh;justify-content: center;" class="u-flex" v-if="list.length == 0">
+			<view style="height: 61vh;justify-content: center;" class="u-flex" v-if="list.length == 0">
 				<u-empty text="暂无数据" mode="list"></u-empty>
 			</view>
 		</view>
-		<u-datetime-picker :show="showtime" mode="year-month" @confirm="changetime"
+		<u-datetime-picker ref="pickers" :show="showtime" mode="year-month" @confirm="changetime"
 			@cancel="close()"></u-datetime-picker>
 	</view>
 </template>
@@ -80,6 +118,10 @@
 	export default {
 		data() {
 			return {
+				order_un_confirm: "", //rm //订单待结算佣金
+				order_confirm: "", ////订单已经结算佣金
+				invite_un_confirm: "", //irm //订单待结算佣金
+				invite_confirm: "", // //订单待结算佣金
 				order: '0.00',
 				sum: '0.00',
 				invite: '0.00',
@@ -107,6 +149,10 @@
 			}
 		},
 		methods: {
+			workBtn() {
+				this.showtime = true
+				this.$refs.pickers.innerValue = new Date(1672502400000).getTime()
+			},
 			mingxi() {
 				uni.navigateTo({
 					url: "/pagesD/mingxi"
@@ -137,6 +183,10 @@
 						this.invite = res.data.invite //邀请
 						this.order = res.data.order //订单
 						this.sum = res.data.sum //余额
+						this.order_un_confirm = res.data.order_un_confirm //订单待结算佣金
+						this.order_confirm = res.data.order_confirm //订单已经结算佣金
+						this.invite_un_confirm = res.data.invite_un_confirm //订单待结算佣金
+						this.invite_confirm = res.data.invite_confirm //订单待结算佣金
 					} else {
 						this.$u.toast(res.msg)
 					}
@@ -144,8 +194,7 @@
 			},
 			getlist() {
 				commission_list({
-					begin_time: "",
-					end_time: "",
+					date: this.date,
 				}).then(res => {
 					this.list = this.list.concat(res.data.data)
 					this.total = res.data.total
@@ -171,6 +220,16 @@
 </script>
 
 <style lang="scss">
+	.top-font {
+		font-size: 20rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		color: #FFFFFF;
+		position: absolute;
+		top: 8rpx;
+		left: 610rpx;
+	}
+
 	.box {
 		width: 172rpx;
 		height: 188rpx;
@@ -185,8 +244,8 @@
 	}
 
 	.fontm {
-		font-size: 24rpx;
-		font-family: PingFangSC-Regular, PingFang SC;
+		font-size: 20rpx;
+		font-family: PingFangSC, PingFang SC;
 		font-weight: 400;
 		color: #FFFFFF;
 	}
@@ -201,17 +260,21 @@
 	}
 
 	.dikou {
+		padding: 0 20rpx;
+		box-sizing: border-box;
+
 		.dikou-list {
-			width: 686rpx;
+			// width: 686rpx;
 			background: #FFFFFF;
 			border-radius: 20rpx;
-			margin: 20rpx auto;
+			margin-top: 20rpx;
 			padding: 0 28rpx;
 
 
 			.list-item {
 				padding: 30rpx 0;
 				border-bottom: 2rpx solid #F0F0F0;
+				min-height: 61rpx;
 
 				.text3 {
 					font-size: 32rpx;
@@ -269,6 +332,13 @@
 			}
 		}
 
+		.bottom {
+			font-size: 28rpx;
+			font-family: JDZhengHT-Regular, JDZhengHT;
+			font-weight: 400;
+			color: #FFFFFF;
+		}
+
 		.dikou-header {
 			margin: 20rpx auto;
 			width: 686rpx;
@@ -278,7 +348,7 @@
 			padding: 32rpx 0 0 0;
 
 			.header-item {
-				padding: 0 0 0 32rpx;
+				padding: 0 32rpx 0 32rpx;
 
 				.left {
 					.top {
@@ -347,7 +417,7 @@
 
 			.header-img {
 				width: 686rpx;
-				height: 264rpx;
+				height: 416rpx;
 				position: absolute;
 				top: 0;
 				left: 0;

units/inquire.js

@@ -397,4 +397,9 @@ export function ocr(param){
 //性别列表
 export function get_sex(param){
 	return request.post('/api/commons/get_sex', param)
-}
+}
+
+//学生认证
+export function activityauth(param){
+	return request.post('/api/candidate.activity/auth', param)
+}