更新

app/common/common.scss

@@ -34,10 +34,10 @@
 	color: #666666;
 }
 .mt10 {
-	margin-top: 10px!important;
+	margin-top: 10px !important;
 }
 .mt20 {
-	margin-top: 20px!important;
+	margin-top: 20px !important;
 }
 .pl5 {
 	padding-left: 5px;
@@ -224,36 +224,41 @@
 		padding-right: 3px;
 	}
 }
-.cen{
+.cen {
 	text-align: center;
 }
 .popup {
 	padding: 15px;
 	background-color: white;
 	border-radius: 10px;
-	.mtt{
+	.mtt {
 		text-align: center;
 		font-size: 18px;
-		padding-top: 25px;
+		padding-top: 15px;
 	}
-	.money{
+	.money {
 		text-align: center;
 		font-size: 30px;
 		padding-top: 5px;
 		font-weight: bold;
 	}
-	.item{
+	.item {
 		overflow: hidden;
 		border-bottom: 1px solid $line;
 		padding: 10px;
-		&:last-child{
+		&:first-child{
+			margin-top: 10px;
+		}
+		&:last-child {
 			border: 0px;
 		}
-		.tt{
+		.tt {
 			float: left;
 		}
-		.la{
+		.la {
 			float: right;
+			width: 70%;
+			text-align: right;
 		}
 	}
 }
@@ -693,8 +698,8 @@
 .wte {
 	background-color: white !important;
 }
-.mb0{
-	margin-bottom: 0px!important;
+.mb0 {
+	margin-bottom: 0px !important;
 }
 .ms {
 	margin-top: 20px;
@@ -756,10 +761,10 @@
 		width: 60%;
 	}
 }
-.mb15{
-	margin-bottom: 15px
+.mb15 {
+	margin-bottom: 15px;
 }
-.mt0{
+.mt0 {
 	margin-top: 0px;
 }
 .bbg {
@@ -788,9 +793,22 @@
 		}
 	}
 }
-.pd0{
+.pd0 {
 	padding-bottom: 0px;
 }
-.pl0{
+.pl0 {
 	padding-left: 0px;
 }
+.xy {
+	color: $font-c;
+	padding-top: 15px;
+	font-size: 14px;
+	.checkbox {
+		float: left;
+		font-size: 14px;
+		margin-top: 1px;
+	}
+	.a {
+		color: blue;
+	}
+}

app/pages/job/detail.vue

@@ -1,5 +1,5 @@
 <template>
-	<view style="padding-bottom: 100px;">
+	<view style="padding-bottom: 100px">
 		<view class="dtop">
 			<view class="title">{{ item.title || '' }}</view>
 			<view class="price" v-if="item.type == 0">{{ item.salary == '面议' ? item.salary : item.salary + '/月' }}</view>
@@ -65,6 +65,17 @@
 				</button>
 			</view>
 		</view>
+		<u-popup :show="show" round="15" mode="center" :closeable="true" :closeOnClickOverlay="false" :customStyle="{ width: '85%' }" @close="show = false">
+			<view class="popup">
+				<view class="xy mt10 mb15">
+					<u-checkbox-group class="checkbox" v-model="item.checked">
+						<u-checkbox size="15" shape="circle" label="我已阅读并同意" labelSize="14" name="true"></u-checkbox>
+					</u-checkbox-group>
+					<text class="a" @click="go('/pages/other/agreement?title=兼职协议')">《兼职协议》</text>
+				</view>
+				<button class="btn" @click="ok()">确定</button>
+			</view>
+		</u-popup>
 	</view>
 </template>
 
@@ -75,7 +86,8 @@ export default {
 			item: {},
 			enterprise: {},
 			covers: [],
-			flag: false
+			flag: false,
+			show: false
 		};
 	},
 	onLoad(e) {
@@ -105,6 +117,21 @@ export default {
 		},
 		//投递简历
 		send() {
+			if (this.item.type == 1) {
+				this.show = true;
+			} else {
+				this.ok();
+			}
+		},
+		ok() {
+			if (this.item.type == 1) {
+				let rule = [{ name: 'checked', checkType: 'notnull', errorMsg: '请同意并勾选协议' }];
+				if (!this.verify.check(this.item, rule)) {
+					uni.showModal({ content: this.verify.error, showCancel: false });
+					return false;
+				}
+			}
+			this.show = false;
 			this.http.request({
 				url: '/app/deliver/send/' + this.item.id,
 				success: (res) => {
@@ -148,16 +175,15 @@ export default {
 					});
 				}
 			});
-		},
-		//分享
-		onShareAppMessage: function (res) {
-			return {
-				title: this.item.title,
-				path: '/pages/job/detail?id=' + this.item.id,
-				success: (res) => {},
-				fail: (res) => {}
-			};
 		}
+	},
+	onShareAppMessage(res) {
+		return {
+			title: this.item.title,
+			path: '/pages/job/detail?id=' + this.item.id,
+			success: (res) => {},
+			fail: (res) => {}
+		};
 	}
 };
 </script>

app/pages/user/login.vue

@@ -83,22 +83,5 @@ export default {
 			border-radius: 50%;
 		}
 	}
-	.xy {
-		color: $font-c;
-		padding-top: 15px;
-		font-size: 14px;
-		.checkbox {
-			float: left;
-			font-size: 14px;
-			margin-top: 1px;
-		}
-		.a {
-			color: blue;
-		}
-	}
-	.btn {
-		margin-top: 20px;
-		border-radius: 30px;
-	}
 }
 </style>

app/pages/user/money/index.vue

@@ -26,7 +26,7 @@
 			<u-tabs :list="type" @click="click($event, 'type')"></u-tabs>
 		</view>
 		<view class="list">
-			<view class="item" v-for="(item, index) in list" :key="index">
+			<view class="item" v-for="(item, index) in list" :key="index" @click="popup(item)">
 				<view class="title">{{ item.title }}</view>
 				<view class="desc">
 					<text v-if="item.state == 0 && item.type == 0" style="color: #f44336">未支付</text>
@@ -35,7 +35,7 @@
 					<text v-if="item.state == 0 && item.type == 2" style="color: #f44336">提现审核中...</text>
 					<text v-if="item.state == 1 && item.type == 2" style="color: #4caf50">提现成功</text>
 					<text v-if="item.state == 1 && item.type == 3" style="color: #4caf50">兼职收入</text>
-					<text v-if="item.state == 2 && item.type == 2" style="color: #f44336" @click="popup(item.msg)">
+					<text v-if="item.state == 2 && item.type == 2" style="color: #f44336">
 						<text class="icon" style="padding-right: 5px">&#xe610;</text>
 						<text>提现失败，退回余额</text>
 					</text>
@@ -53,6 +53,68 @@
 			<view class="loading" v-if="loadMore"><u-loadmore :status="loadMore ? 'loading' : 'nomore'" /></view>
 			<u-empty v-if="!loadMore && list.length == 0"></u-empty>
 		</view>
+		<u-popup :show="show" round="15" mode="center" :closeable="true" :customStyle="{ width: '85%' }" @close="show = false">
+			<view class="popup">
+				<view class="mtt" v-if="item.type == 0">在线充值</view>
+				<view class="mtt" v-if="item.type == 1">兼职支出</view>
+				<view class="mtt" v-if="item.type == 2">余额提现</view>
+				<view class="mtt" v-if="item.type == 3">兼职收入</view>
+				<view class="mtt" v-if="item.type == 4">余额退款</view>
+				<view>
+					<view class="item">
+						<text class="tt">操作内容</text>
+						<text class="la">{{ item.title }}</text>
+					</view>
+					<view class="item" v-if="item.type == 0">
+						<text class="tt">充值金额</text>
+						<text class="la">¥{{ item.money }}</text>
+					</view>
+					<view class="item" v-if="item.type == 1">
+						<text class="tt">兼职金额</text>
+						<text class="la">¥{{ (item.money - item.serviceMoney).toFixed(2) }}</text>
+					</view>
+					<view class="item" v-if="item.type == 2">
+						<text class="tt">提现金额</text>
+						<text class="la">¥{{ (item.money + item.serviceMoney).toFixed(2) }}</text>
+					</view>
+					<view class="item" v-if="item.serviceMoney">
+						<text class="tt">服务费</text>
+						<text class="la">¥{{ item.serviceMoney }}</text>
+					</view>
+					<view class="item" v-if="item.rate">
+						<text class="tt">{{ item.type == 1 ? '兼职费率' : '提现费率' }}</text>
+						<text class="la">{{ item.rate }}%</text>
+					</view>
+					<view class="item" v-if="item.type == 1">
+						<text class="tt">实际扣除</text>
+						<text class="la">¥{{ item.money }}</text>
+					</view>
+					<view class="item" v-if="item.type == 2">
+						<text class="tt">实际到账</text>
+						<text class="la">¥{{ item.money }}</text>
+					</view>
+					<view class="item">
+						<text class="tt">操作状态</text>
+						<text class="la" v-if="item.state == 0 && item.type == 0" style="color: #f44336">未支付</text>
+						<text class="la" v-if="item.state == 1 && item.type == 0" style="color: #4caf50">充值成功</text>
+						<text class="la" v-if="item.state == 1 && item.type == 1" style="color: #4caf50">支出成功</text>
+						<text class="la" v-if="item.state == 0 && item.type == 2" style="color: #f44336">提现审核中...</text>
+						<text class="la" v-if="item.state == 1 && item.type == 2" style="color: #4caf50">提现成功</text>
+						<text class="la" v-if="item.state == 1 && item.type == 3" style="color: #4caf50">兼职收入</text>
+						<text class="la" v-if="item.state == 2 && item.type == 2" style="color: #f44336">提现失败，退回余额</text>
+						<text class="la" v-if="item.state == 1 && item.type == 4" style="color: #4caf50">退款成功</text>
+					</view>
+					<view class="item">
+						<text class="tt">创建时间</text>
+						<text class="la">{{ item.createTime }}</text>
+					</view>
+					<view class="item" v-if="item.completeTime">
+						<text class="tt">审核时间</text>
+						<text class="la">{{ item.completeTime }}</text>
+					</view>
+				</view>
+			</view>
+		</u-popup>
 	</view>
 </template>
 
@@ -72,7 +134,9 @@ export default {
 			],
 			list: [],
 			param: { pageNum: 1, pageSize: 10 },
-			loadMore: true
+			loadMore: true,
+			show: false,
+			item: {}
 		};
 	},
 	onLoad(e) {
@@ -108,8 +172,9 @@ export default {
 			this.param.type = e.value;
 			this.refresh();
 		},
-		popup(msg) {
-			uni.showModal({ title: '提示', content: msg, showCancel: false });
+		popup(item) {
+			this.item = item;
+			this.show = true;
 		},
 		go(url) {
 			uni.navigateTo({ url: url });

ruoyi-admin/src/main/java/com/ruoyi/web/work/api/Api_CommonController.java

@@ -74,6 +74,9 @@ public class Api_CommonController extends BaseController {
         if (title.equals("隐私政策")) {
             return AjaxResult.success(platform.getPrivacy());
         }
+        if (title.equals("兼职协议")) {
+            return AjaxResult.success(platform.getGuide());
+        }
         return AjaxResult.error();
     }