Merge branch 'master' of https://git.banshouhui.com/lijundan/self-support

src/components/complete-check/complete-check.vue

@@ -24,13 +24,14 @@
 				'color': '#FFFFFF',
 			}"
 			:confirm-text="confirmText"
-			@confirm="confirmModel" ref="checkModel"
+			@cancel="cancel"
+			@confirm="confirm" ref="checkModel"
 			:show-cancel-button="true"
 			:show-title="false">
 			<view class="slot-content">
 				<view class="check-status">
 					<u-image width="224rpx" height="224rpx" :src="statusImage"></u-image>
-					<text class="check-status-txt">{{statusTxt}}</text>
+					<text :class="['status-txt', { 'pass-color': pass }]">{{statusTxt}}</text>
 				</view>
 				<view class="check-list">
 					<view class="u-flex u-row-between list-title">
@@ -50,7 +51,7 @@
 								size="32"></u-icon>
 						</view>
 						<view class="item-txt">{{item.submitted}}/{{item.required}}</view>
-						<view class="item-txt" :class="item.pass ? 'pass-color' : 'no-pass-color'">
+						<view :class="['item-txt', item.pass ? 'pass-color' : 'no-pass-color']">
 							{{item.pass ? "通过" : "未通过"}}
 						</view>
 					</view>
@@ -76,7 +77,7 @@
 				type: Array,
 				default(){
 					return [
-						{label: '基本信息', submitted: 3, required: 3, pass: false},
+						{label: '基本信息', submitted: 3, required: 3, pass: true},
 						{label: '勘察信息', submitted: 20, required: 20, pass: true},
 						{label: '安装信息', submitted: 15, required: 20, pass: false}
 					]
@@ -105,6 +106,9 @@
 			noPassIcon() { return process.uniEnv.qn_base_url + 'icon/no-pass.png'},
 		},
 		methods: {
+			cancel() {
+				this.$emit('close')
+			},
 			confirm() {
 				if(this.pass) {
 					uni.navigateTo({
@@ -117,6 +121,7 @@
 					this.$emit('handle-problem', data)
 				}
 			}
+			
 		},
 	}
 </script>
@@ -130,7 +135,7 @@
 		flex-direction: column;
 		justify-content: center;
 		align-items: center;
-		.check-status-txt {
+		.status-txt {
 			height: 46rpx;
 			font-size: 40rpx;
 			font-weight: bold;
@@ -162,10 +167,10 @@
 	line-height: 32rpx;
 }
 .pass-color {
-	color: #2272FF;
+	color: #2272FF !important;
 }
 .no-pass-color {
-	color: #FA5A49;
+	color: #FA5A49 !important;;
 }
 
 .u-border-top {

src/components/createCom/XhFiles.vue

@@ -7,14 +7,14 @@
 		</view> -->
 		<view class="pics u-flex u-flex-wrap">
 			<view class="img-list" v-for="(item,index) in imgList" :key="index">
-				<u-image class="pic" width="170" height="170" :src="item.path" @click.stop="prviewImage(item.path,index)"></u-image>
+				<u-image class="pic" width="170" height="170" :src="item.path" :border-radius="10" @click.stop="prviewImage(item.path,index)"></u-image>
 				<view class="icon-del-box" @click.stop="delFile(index)">
 					<view class="icon-del"></view>
 					<view class="icon-del rotate"></view>
 				</view>
 			</view>
 			<view class="img-list">
-				<u-image class="pic" width="170rpx" height="170"  @click="selectUpload" src="https://gitee.com/xuqu/uView/blob/master/static/uview/example/min_button.png"></u-image>
+				<u-image class="pic" width="170rpx" height="170rpx" :border-radius="10" @click="selectUpload" :src="uploadImage"></u-image>
 			</view>
 			<!-- <u-image class="pic" v-for="item in 6" width="170rpx" height="170" src="'https://cdn.uviewui.com/uview/example/fade.jpg"></u-image> -->
 		</view>
@@ -52,7 +52,10 @@
 		computed: {
 			settings() {
 				return this.item.settings || []
-			}
+			},
+			uploadImage() {
+				return process.uniEnv.qn_base_url + 'upload-file.png'
+			},
 		},
 		watch: {
 			'takeStatus': function(val, oldVal){
@@ -135,6 +138,14 @@
 	}
 </script>
 <style lang="scss" scoped>
+	
+	
+	.img-list {
+		position: relative;
+		margin: 8rpx;
+		width: 170rpx;
+		height: 170rpx;
+		
 		.pic{
 			// margin-right: 15rpx;
 			// margin-bottom: 15rpx;
@@ -143,12 +154,6 @@
 			}
 		}
 		
-	.img-list {
-		position: relative;
-		margin: 8rpx;
-		border: 1px solid #eee;
-		width: 170rpx;
-		height: 170rpx;
 		.icon-del-box {
 			/* #ifndef APP-NVUE */
 			display: flex;