Merge remote-tracking branch 'origin/master'

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;