Merge branch 'master' of http://git.huaml.com/zhh/front-end

mobile-code-back/src/components/app-delivery.vue

@@ -24,7 +24,7 @@
 				<div class="tui-title">详细地址</div>
 				<div class="tui-input" v-if="form.receiveFullAddress">{{ form.receiveFullAddress }}</div>
 				<div class="tui-placeholder" v-else>请选择详细地址</div>
-				<!-- <input v-model="form.receiveFullAddress" placeholder-class="phcolor" class="tui-input" name="receiveFullAddress" placeholder="小区、大厦或街道名称，如金尚小区" /> -->
+				<!-- <input v-model="form.receiveFullAddress" placeholder-class="phcolor" class="tui-input" name="receiveFullAddress" placeholder="小区、大厦或街道名称" /> -->
 			</tui-list-cell>
 			<tui-list-cell class="line-cell" :hover="false">
 				<div class="tui-title">门牌号</div>
@@ -64,7 +64,7 @@
 						<span class="need-gift">需要贺卡</span>
 					</div>
 					<div class="gitf-textarea">
-						<textarea v-model="form.cardInfo" class="tui-textarea" placeholder-class="phcolor" name="cardInfo" placeholder="请填写贺卡内容" auto-height />
+						<textarea v-model="form.cardInfo" class="tui-textarea" placeholder-class="phcolor" name="cardInfo" placeholder="请填写贺卡内容，留空将寄出空白贺卡" auto-height />
 						<!-- <app-textarea v-model="form.cardInfo" placeholder="请填写贺卡内容" @blur="blursave('blur')" /> -->
 					</div>
 				</div>
@@ -73,8 +73,8 @@
 		<!-- 备注 -->
 		<div class="module-com">
 			<tui-list-cell class="line-cell" :hover="false">
-				<div class="tui-title">备注</div>
-				<input v-model="form.remark" placeholder-class="phcolor" class="tui-input" name="remark" placeholder="(选填)" />
+				<div class="tui-title">其它备注</div>
+				<input v-model="form.remark" placeholder-class="phcolor" class="tui-input" name="remark" placeholder="（选填）" />
 			</tui-list-cell>
 		</div>
 		<!-- 省市联动 -->

mobile-code/src/components/app-delivery.vue

@@ -24,7 +24,7 @@
 				<div class="tui-title">详细地址</div>
 				<div class="tui-input" v-if="form.receiveAddress">{{ form.receiveAddress }}</div>
 				<div class="tui-placeholder" v-else>请选择详细地址</div>
-				<!-- <input v-model="form.receiveFullAddress" placeholder-class="phcolor" class="tui-input" name="receiveFullAddress" placeholder="小区、大厦或街道名称，如金尚小区" /> -->
+				<!-- <input v-model="form.receiveFullAddress" placeholder-class="phcolor" class="tui-input" name="receiveFullAddress" placeholder="小区、大厦或街道名称" /> -->
 			</tui-list-cell>
 			<tui-list-cell class="line-cell" :hover="false">
 				<div class="tui-title">门牌号</div>
@@ -35,7 +35,7 @@
 		<div class="module-com">
 			<!-- <tui-list-cell class="line-cell" :hover="false">
 				<div class="tui-title">订花人姓名</div>
-				<input v-model="form.bookName" placeholder-class="phcolor" class="tui-input" name="bookName" placeholder="请输入姓名 (选填)" />
+				<input v-model="form.bookName" placeholder-class="phcolor" class="tui-input" name="bookName" placeholder="请输入姓名（选填）" />
 			</tui-list-cell>-->
 			<tui-list-cell class="line-cell" :hover="false">
 				<div class="tui-title">订花人电话</div>
@@ -64,7 +64,7 @@
 						<label for="needGift" class="need-gift">需要贺卡</label>
 					</div>
 					<div class="gitf-textarea">
-						<textarea v-model="form.cardInfo" class="tui-textarea" placeholder-class="phcolor" name="cardInfo" placeholder="请填写贺卡内容" auto-height />
+						<textarea v-model="form.cardInfo" class="tui-textarea" placeholder-class="phcolor" name="cardInfo" placeholder="请填写贺卡内容，留空将寄出空白贺卡" auto-height />
 						<!-- <app-textarea v-model="form.cardInfo" placeholder="请填写贺卡内容" @blur="blursave('blur')" /> -->
 					</div>
 				</div>
@@ -81,8 +81,8 @@
 		<!-- 备注 -->
 		<div class="module-com remark-wrap">
 			<tui-list-cell class="line-cell" :hover="false">
-				<div class="tui-title">备注</div>
-				<input v-model="form.remark" placeholder-class="phcolor" class="tui-input" name="remark" placeholder="(选填)" />
+				<div class="tui-title">其它备注</div>
+				<input v-model="form.remark" placeholder-class="phcolor" class="tui-input" name="remark" placeholder="（选填）" />
 			</tui-list-cell>
 		</div>
 		<!-- 省市联动 -->