فهرست منبع

删除功能调整, 截图优化

zhengkaixin 3 سال پیش
والد
کامیت
93bbef8af1

+ 6 - 1
src/components/Cropper.vue

@@ -81,7 +81,12 @@
 		methods: {
 			//点击裁剪,这一步是可以拿到处理后的地址
 			finish() {
-				this.$refs.cropper.goAutoCrop();
+				if(!this.cropper.autoCrop){
+						this.$refs.cropper.goAutoCrop();
+				}else{
+					this.$refs.cropper.startCrop()
+				}
+			
 				this.$refs.cropper.getCropData((data) => {
 					this.modelSrc = data
 					this.model = false;

+ 9 - 5
src/projects/business/views/Master/Family/Add.vue

@@ -84,7 +84,7 @@
 				isLoading: false,
 
 				rightLink: {
-					show: false,
+					show: true,
 					icon: 'mui-icon-trash',
 					style: 'color:#FF6666',
 					title: ''
@@ -113,7 +113,7 @@
 					size: 1,
 					outputType: 'jpeg',
 					canScale: false,
-					autoCrop: false,
+					autoCrop: true,
 					// 只有自动截图开启 宽度高度才生效
 					autoCropWidth: 250,
 					autoCropHeight: 350,
@@ -140,7 +140,7 @@
 					this.isLoading = false;
 					
 					this.subForm = response;
-					this.subForm.structureName = this.person_popedom.structureName;
+					//this.subForm.structureName = this.person_popedom.structureName;
 					
 				}).catch(error => {
 					this.isLoading = false;
@@ -182,6 +182,9 @@
 					})
 				}
 			},
+			chooseImageTest(field){
+				this.showCropper(field);
+			},
 			//微信选择图片
 			chooseImage(field) {
 				WxJsApi.chooseImage().then(res => {
@@ -233,9 +236,10 @@
 			valert() {
 				mui.alert("照片将用于人脸识别设备,请上传清晰的免冠登记照或肩部以上近照。", '   ', ['知道了'])
 			},
+		
 			del() {
 				this.isLoading = true;
-				API_Family.delPerson(this.subForm.id).then(response => {
+				API_Family.delPerson(this.subForm.popedomId).then(response => {
 					this.isLoading = false;
 
 					mui.toast('删除成功');
@@ -249,7 +253,7 @@
 			doRightLink() {
 				var _this = this;
 				var btnArray = ['否', '是'];
-				mui.confirm('确认删除此家庭成员?删除后系统将清除该家庭成员的帐号信息,该名家庭成员将无法以此身份登录本系统。', '确认删除', btnArray, function(e) {
+				mui.confirm('确认删除此家庭成员?', '确认删除', btnArray, function(e) {
 					if (e.index == 1) {
 						_this.del();
 					}

+ 1 - 2
src/projects/business/views/Master/Family/Home.vue

@@ -16,8 +16,7 @@
 						</div>
 						<!-- <span class=" mui-badge vongi-badge-primary">家属</span> -->
 					</router-link>
-				<button type="button" @click="del(item.popedomId)" class="mui-btn mui-btn-danger ">删除</button>
-				</li>
+ 				</li>
 			</ul>
 		</div>
 		<div class="fyy-footer">

+ 4 - 4
src/projects/business/views/Master/Tenant/Add.vue

@@ -84,7 +84,7 @@
 				isLoading: false,
 
 				rightLink: {
-					show: false,
+					show: true,
 					icon: 'mui-icon-trash',
 					style: 'color:#FF6666',
 					title: ''
@@ -113,7 +113,7 @@
 					size: 1,
 					outputType: 'jpeg',
 					canScale: false,
-					autoCrop: false,
+					autoCrop: true,
 					// 只有自动截图开启 宽度高度才生效
 					autoCropWidth: 250,
 					autoCropHeight: 350,
@@ -233,7 +233,7 @@
 			},
 			del() {
 				this.isLoading = true;
-				API_Family.delPerson(this.subForm.id).then(response => {
+				API_Family.delPerson(this.subForm.popedomId).then(response => {
 					this.isLoading = false;
 
 					mui.toast('删除成功');
@@ -247,7 +247,7 @@
 			doRightLink() {
 				var _this = this;
 				var btnArray = ['否', '是'];
-				mui.confirm('确认删除此家庭成员?删除后系统将清除该家庭成员的帐号信息,该名家庭成员将无法以此身份登录本系统。', '确认删除', btnArray, function(e) {
+				mui.confirm('确认删除此租户?', '确认删除', btnArray, function(e) {
 					if (e.index == 1) {
 						_this.del();
 					}

+ 2 - 2
src/projects/business/views/Master/Tenant/Home.vue

@@ -14,8 +14,8 @@
 								<p class='mui-ellipsis' v-text="item.phone"></p>
 							</div>
 						</div>
-						<button type="button" @click="del(item.popedomId)" class="mui-btn mui-btn-danger ">删除</button>
-						
+<!-- 						<button type="button" @click="del(item.popedomId)" class="mui-btn mui-btn-danger ">删除</button>
+ -->						
 						<!-- <span class=" mui-badge vongi-badge-primary">家属</span> -->
 					</router-link>
 				</li>

+ 28 - 27
src/projects/home/views/Register/Residence/Step3.vue

@@ -21,34 +21,35 @@
 						
 					</div>
 				</form>
-			</div>
-			<div id="popover" class="mui-popover">
-				
-				<div class="mui-scroll-wrapper">
+				<div id="popover" class="mui-popover">
 					
-					<div class="mui-scroll">
-						<div class="address-title">
-							<h4>请选择房号</h4>
-							<i class="mui-icon mui-icon-closeempty" @click="openPopover"></i>
-						</div>
-						<div class="address-table">
-							<ul>
-								<li v-for="(item,i) in selectDataJson"
-								 :class="{active:i==selectIndex}" 
-								 :key="i"  @click="changeIndex(i)">{{item.name}}</li>
-							 
-							</ul>
-						</div>
-							<!--这里放置真实显示的DOM内容-->
-							<ul class="mui-table-view">
-								<li class="mui-table-view-cell " v-for="(item,i) in sz1" 
-								@click="clickLi(item)"
-								
-								:key="i">{{item.name}}</li>
-							 
-							</ul>
+					<div class="mui-scroll-wrapper">
+						
+						<div class="mui-scroll">
+							<div class="address-title">
+								<h4>请选择房号</h4>
+								<i class="mui-icon mui-icon-closeempty" @click="openPopover"></i>
+							</div>
+							<div class="address-table">
+								<ul>
+									<li v-for="(item,i) in selectDataJson"
+									 :class="{active:i==selectIndex}" 
+									 :key="i"  @click="changeIndex(i)">{{item.name}}</li>
+								 
+								</ul>
+							</div>
+								<!--这里放置真实显示的DOM内容-->
+								<ul class="mui-table-view">
+									<li class="mui-table-view-cell " v-for="(item,i) in sz1" 
+									@click="clickLi(item)"
+									
+									:key="i">{{item.name}}</li>
+								 
+								</ul>
+							</div>
 						</div>
-					</div>
+					
+				</div>
 				
 			</div>
 			
@@ -334,7 +335,7 @@
 <style lang="scss" scoped>
 	 .mui-popover {
 	 	.mui-table-view{
-	 		max-height: 500px;
+	 		//max-height: 500px;
 	 	}
 	 	.mui-table-view-cell{
 	 		position: relative;