Merge branch 'master' into dev1.0

书文修改后合并

app/common/common.scss

@@ -194,4 +194,92 @@
 			padding-right: 5px;
 		}
 	}
+}
+.form_group {
+	padding: 9px 0px 9px 0px;
+	overflow: hidden;
+	position: relative;
+	&.form_group:last-child {
+		border-bottom: 0px;
+	}
+	.lable {
+		font-size: 17px;
+		text-align: left;
+		position: relative;
+		font-weight: bold;
+	}
+	.re {
+		&::before {
+			content: '*';
+			width: 0px;
+			height: 0px;
+			color: red;
+			position: absolute;
+			top: -11px;
+			font-weight: bold;
+		}
+	}
+	.bgm {
+		border: 1px solid $line;
+		border-radius: 5px;
+		margin-top: 12px;
+		position: relative;
+		background-color: white;
+		.input {
+			border: 0px;
+			width: 75%;
+			margin-top: 0px;
+		}
+		.msg {
+			position: absolute;
+			right: 10px;
+			top: 9px;
+			color: $main-color;
+		}
+	}
+	.avatar {
+		position: absolute;
+		top: 0px;
+		right: 0px;
+		width: 55px;
+		height: 55px;
+		border-radius: 50%;
+	}
+	picker {
+		position: relative;
+		.more {
+			position: absolute;
+			right: 7px;
+			top: 13px;
+			font-weight: normal;
+		}
+	}
+	input {
+		font-size: 15px;
+		border-radius: 5px;
+		padding: 10px;
+		margin-top: 12px;
+		border: 1px solid $line;
+		background-color: white;
+	}
+	textarea {
+		font-size: 15px;
+		border-radius: 5px;
+		padding: 10px;
+		margin-top: 12px;
+		height: 120px;
+		width: 93%;
+		border: 1px solid $line;
+		background-color: white;
+	}
+	.start {
+		flex: 1;
+		margin-top: -17px;
+		text-align: left;
+	}
+	.hor {
+		flex: 0.7;
+		text-align: center;
+		padding-top: 5px;
+	}
 }

app/pages/user/bind/add.vue

@@ -1,19 +1,33 @@
 <template>
-	<view>
-		
+	<view class="main">
+		<view class="form_group">
+			<view class="lable re">手机号</view>
+			<input type="digit" v-model="item.money" placeholder="请输入手机号" />
+		</view>
+		<button class="btn" @click="add()">确认</button>
 	</view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				
-			};
+export default {
+	data() {
+		return {
+			item: {}
+		};
+	},
+	methods: {
+		add() {
+			this.http.request({
+				url: '/app/user/bind',
+				method: 'POST',
+				data: this.item,
+				success: (res) => {
+					
+				}
+			});
 		}
 	}
+};
 </script>
 
-<style lang="scss">
-
-</style>
+<style lang="scss"></style>

app/pages/user/bind/index.vue

@@ -14,7 +14,7 @@
 			<u-empty v-if="list.length == 0" text="你还未绑定就诊人"></u-empty>
 		</view>
 		<view class="mfooter">
-			<button class="btn" @click="go('/pages/job/position/manage/full_time_push')">
+			<button class="btn" @click="go('/pages/user/bind/add')">
 				<text class="icon">&#xe8d5;</text>
 				<text>去绑定</text>
 			</button>

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

@@ -3,6 +3,7 @@ package com.ruoyi.web.work.api;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.web.work.api.config.BaseController;
 import com.ruoyi.web.work.domain.BindUser;
+import com.ruoyi.web.work.domain.dto.BindDto;
 import com.ruoyi.web.work.domain.dto.LoginDto;
 import com.ruoyi.web.work.domain.dto.UserEditDto;
 import com.ruoyi.web.work.service.IBindUserService;
@@ -33,6 +34,11 @@ public class Api_UserController extends BaseController {
         return userService.login(dto);
     }
 
+    @PostMapping("/bind")
+    public AjaxResult bind(@Validated @RequestBody BindDto dto) {
+        return bindUserService.bind(dto);
+    }
+
     @GetMapping("/bind/list")
     public AjaxResult list(BindUser bindUser) {
         bindUser.setUserId(getUser().getId());

ruoyi-admin/src/main/java/com/ruoyi/web/work/domain/dto/BindDto.java

@@ -0,0 +1,14 @@
+package com.ruoyi.web.work.domain.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class BindDto {
+
+    @NotBlank(message = "手机号不能为空")
+    @ApiModelProperty(value = "预留手机号")
+    private String phone;
+}

ruoyi-admin/src/main/java/com/ruoyi/web/work/mapper/BindUserMapper.java

@@ -1,8 +1,9 @@
 package com.ruoyi.web.work.mapper;
 
-import java.util.List;
-import com.ruoyi.web.work.domain.BindUser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.web.work.domain.BindUser;
+
+import java.util.List;
 
 /**
  * @author lsw
@@ -10,4 +11,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface BindUserMapper extends BaseMapper<BindUser> {
     List<BindUser> selectList(BindUser bindUser);
+
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/IBindUserService.java

@@ -1,8 +1,11 @@
 package com.ruoyi.web.work.service;
 
-import java.util.List;
-import com.ruoyi.web.work.domain.BindUser;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.work.domain.BindUser;
+import com.ruoyi.web.work.domain.dto.BindDto;
+
+import java.util.List;
 
 /**
  * @author lsw
@@ -10,4 +13,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IBindUserService extends IService<BindUser>{
     List<BindUser> selectList(BindUser bindUser);
+
+    /**
+     * 绑定就诊人
+     * @param dto
+     * @return
+     */
+    AjaxResult bind(BindDto dto);
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/impl/BindUserServiceImpl.java

@@ -1,12 +1,15 @@
 package com.ruoyi.web.work.service.impl;
 
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.web.work.mapper.BindUserMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.web.work.domain.BindUser;
+import com.ruoyi.web.work.domain.dto.BindDto;
+import com.ruoyi.web.work.mapper.BindUserMapper;
 import com.ruoyi.web.work.service.IBindUserService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * @author lsw
@@ -21,4 +24,9 @@ public class BindUserServiceImpl extends ServiceImpl<BindUserMapper, BindUser> i
     public List<BindUser> selectList(BindUser bindUser) {
         return bindUserMapper.selectList(bindUser);
     }
+
+    @Override
+    public AjaxResult bind(BindDto dto) {
+        return null;
+    }
 }