Merge remote-tracking branch 'origin/master'

src/components/createCom/XhInput.vue

@@ -2,7 +2,7 @@
 <template>
 	<view>
 		<u-input :type="type" class="input-item" v-model="dataValue" @input="valueChange" :placeholder="placeholder" :placeholder-style="placeholderStyle"
-		:custom-style="customStyle" :clearable="false"/>
+		:custom-style="customStyle" :clearable="false" :border="border"/>
 	</view>
 </template>
 
@@ -38,14 +38,23 @@
 			},
 			customStyle() {
 				return {
-					'background-color': '#F4F5F7',
+					'background-color': this.backgroundColor,
 					'border-radius': '12rpx',
 					'color': '#333333',
-					'padding-left': '20rpx',
+					'padding-left': this.textarea ? '0rpx' : '20rpx',
 					'width': this.width,
 					'font-size':'26rpx',
 					'height': '76rpx'
 				}
+			},
+			border() {
+				return this.textarea
+			},
+			textarea() {
+				return this.type == 'textarea'
+			},
+			backgroundColor() {
+				return this.textarea ? '#FFFFFF' : '#F4F5F7'
 			}
 		},
 		watch: {},