门店名称优化

ghsApp/src/admin/shop/add.vue

@@ -5,9 +5,13 @@
 				<view v-if="id>0" style="color:red;font-weight:bold;text-align:center;font-size:32upx;margin:12upx auto;width:90%;">
 					本页请勿修改任何东西，要改请问过技术，否则出问题自负
 				</view>
+				<tui-list-cell class="line-cell" :hover="false" v-if="merchantName!=''">
+					<view class="tui-title">门店名称</view>
+					<view>{{ merchantName }}</view>
+				</tui-list-cell>
 				<tui-list-cell class="line-cell" :hover="false">
-					<view class="tui-title">名称</view>
-					<input v-model="form.shopName" placeholder-class="phcolor" class="tui-input" name="shopName" placeholder="请输入名称，如同安店" maxlength="50" type="text" />
+					<view class="tui-title">所属分店</view>
+					<input v-model="form.shopName" placeholder-class="phcolor" class="tui-input" name="shopName" placeholder="请输入名称，如雄安店" maxlength="50" type="text" />
 				</tui-list-cell>
 				<tui-list-cell class="line-cell" :hover="false">
 					<view class="tui-title">类型</view>
@@ -90,7 +94,7 @@
 				</tui-list-cell>
 				<tui-list-cell class="line-cell" :hover="false">
 					<view class="tui-title ">门牌</view>
-					<input v-model="form.floor" placeholder-class="phcolor" class="tui-input" name="floor" placeholder="楼号门牌号（建议填写，方便找你）" />
+					<input v-model="form.floor" placeholder-class="phcolor" class="tui-input" name="floor" placeholder="楼号门牌号" />
 				</tui-list-cell>
 
 				<tui-list-cell class="line-cell" :hover="false">
@@ -252,6 +256,7 @@ export default {
 			openTimeVisible: false,
 			start_time: '00:00',
 			end_time: '00:00',
+			merchantName:'',
 			form: {
 				join:0,
 				shopName: '',
@@ -346,6 +351,7 @@ export default {
 							this.form.openEndTime = this.end_time
 						}
 						this.hasMap = data.hasMap || 0
+						this.merchantName = data.merchantName||''
 					})
 					.catch(() => {
 						this.$msg('获取门店详情失败')

ghsApp/src/components/app-address-group.vue

@@ -24,8 +24,8 @@
 		</tui-list-cell>
 		<tui-list-cell v-if="isFloor" class="line-cell" :hover="false">
 			<view class="tui-title ">门牌号</view>
-<!--			<input v-model="form.floor" placeholder-class="phcolor" class="tui-input" name="floor" @input="changeFloor" placeholder="楼号门牌号（建议填写，方便找你）"/>-->
-			<input v-model="form.floor" placeholder-class="phcolor" class="tui-input" name="floor" placeholder="楼号门牌号（建议填写，方便找你）"/>
+<!--			<input v-model="form.floor" placeholder-class="phcolor" class="tui-input" name="floor" @input="changeFloor" placeholder="楼号门牌号"/>-->
+			<input v-model="form.floor" placeholder-class="phcolor" class="tui-input" name="floor" placeholder="楼号门牌号"/>
 		</tui-list-cell>
 		<!-- 选择地区 -->
 		<app-area-sel :show.sync="showRegion" @change="changeAreaFn" :city="form.city"/>

ghsApp/src/components/app-delivery.vue

@@ -59,7 +59,7 @@
 		      placeholder-style="color:#ccc"
           class="tui-input"
           name="receiveFloor"
-          placeholder="楼号门牌号（建议填写，方便找你）"
+          placeholder="楼号门牌号"
         />
       </tui-list-cell>
       <tui-list-cell class="line-cell" :hover="false" :arrow="true">

ghsApp/src/pagesClient/member/add.vue

@@ -45,7 +45,7 @@
 					<!--</tui-list-cell>-->
 					<!--<tui-list-cell class="line-cell" :hover="false">-->
 						<!--<div class="tui-title">门牌号</div>-->
-						<!--<input v-model="form.floor" placeholder-class="phcolor" placeholder-style="color:#CCCCCC" class="tui-input" placeholder="楼号门牌号（建议填写，方便找你）"/>-->
+						<!--<input v-model="form.floor" placeholder-class="phcolor" placeholder-style="color:#CCCCCC" class="tui-input" placeholder="楼号门牌号"/>-->
 					<!--</tui-list-cell>-->
 					<div class="btn-wrap">
 					<!--<button class="admin-button-com blue big" formType="submit">确认</button>-->

ghsApp/src/pagesStorehouse/shop/update.vue

@@ -72,7 +72,7 @@
 						placeholder-class="phcolor"
 						class="tui-input"
 						name="floor"
-						placeholder="楼号门牌号（建议填写，方便找你）"
+						placeholder="楼号门牌号"
 					/>
 				</tui-list-cell>
 				<tui-list-cell class="line-cell remark-wrap" :hover="false">

hdApp/src/admin/member/modify.vue

@@ -20,7 +20,7 @@
 				</tui-list-cell>
 				<tui-list-cell class="line-cell" :hover="false">
 					<view class="tui-title ">门牌</view>
-					<input v-model="form.floor" placeholder-class="phcolor" class="tui-input" name="floor" placeholder="楼号门牌号（建议填写，方便查找）" />
+					<input v-model="form.floor" placeholder-class="phcolor" class="tui-input" name="floor" placeholder="楼号门牌号" />
 				</tui-list-cell>
 			</view>
 			<view class="confirm-btn">

hdApp/src/admin/order/components/app-delivery-modify.vue

@@ -64,7 +64,7 @@
 
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">门牌号</view>
-          <input v-model="form.floor" placeholder-class="phcolor" placeholder-style="color:#ccc" class="tui-input" name="floor" placeholder="楼号门牌号（选填）" @input="changeFloor()" />
+          <input v-model="form.floor" placeholder-class="phcolor" placeholder-style="color:#ccc" class="tui-input" name="floor" placeholder="楼号门牌号" @input="changeFloor()" />
         </tui-list-cell>
 
         <template v-if="form.sendType != 1">

hdApp/src/admin/shop/add.vue

@@ -2,8 +2,12 @@
 	<view class="app-content">
 		<form @submit="formSubmit" @reset="formReset">
 			<view class="module-com input-line-wrap">
+				<tui-list-cell class="line-cell" :hover="false" v-if="merchantName!=''">
+					<view class="tui-title">门店名称</view>
+					<view>{{ merchantName }}</view>
+				</tui-list-cell>
 				<tui-list-cell class="line-cell" :hover="false">
-					<view class="tui-title">分店名称</view>
+					<view class="tui-title">所属分店</view>
 					<input v-model="form.shopName" placeholder-class="phcolor" class="tui-input" name="shopName" placeholder="请输入名称" maxlength="50" type="text" />
 				</tui-list-cell>
 				<tui-list-cell class="line-cell" :hover="false">
@@ -86,7 +90,7 @@
 				</tui-list-cell>
 				<tui-list-cell class="line-cell" :hover="false">
 					<view class="tui-title ">门牌号</view>
-					<input v-model="form.floor" placeholder-class="phcolor" class="tui-input" name="floor" placeholder="楼号门牌号（选填）" />
+					<input v-model="form.floor" placeholder-class="phcolor" class="tui-input" name="floor" placeholder="楼号门牌号" />
 				</tui-list-cell>
 
 				<tui-list-cell class="line-cell remark-wrap" :hover="false">
@@ -145,6 +149,7 @@ export default {
 			openTimeVisible: false,
 			start_time: '00:00',
 			end_time: '00:00',
+			merchantName:'',
 			form: {
 				join:0,
 				stockModel:0,
@@ -247,6 +252,7 @@ export default {
 						this.form.superWx = [data.shortSuperWx]
 					}
 					this.hasMap = data.hasMap || 0
+					this.merchantName = data.merchantName||''
 				})
 			}
 		},

hdApp/src/admin/shop/addressAdd.vue

@@ -18,7 +18,7 @@
 
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">门牌号</view>
-          <input v-model="form.floor" placeholder-class="phcolor" placeholder-style="color:#ccc" class="tui-input" name="floor" placeholder="楼号门牌号（选填）" />
+          <input v-model="form.floor" placeholder-class="phcolor" placeholder-style="color:#ccc" class="tui-input" name="floor" placeholder="楼号门牌号" />
         </tui-list-cell>
 
           <tui-list-cell class="line-cell" :hover="false">

hdApp/src/admin/shop/addressUpdate.vue

@@ -18,7 +18,7 @@
 
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">门牌号</view>
-          <input v-model="form.floor" placeholder-class="phcolor" placeholder-style="color:#ccc" class="tui-input" name="floor" placeholder="楼号门牌号（选填）" />
+          <input v-model="form.floor" placeholder-class="phcolor" placeholder-style="color:#ccc" class="tui-input" name="floor" placeholder="楼号门牌号" />
         </tui-list-cell>
 
           <tui-list-cell class="line-cell" :hover="false">

hdApp/src/components/app-address-group.vue

@@ -32,7 +32,7 @@
 				class="tui-input"
 				name="floor"
 				@input="changeFloor"
-				placeholder="楼号门牌号（选填）"
+				placeholder="楼号门牌号"
 			/>
 		</tui-list-cell>
 		<!-- 选择地区 -->

hdApp/src/pagesClient/member/add.vue

@@ -38,7 +38,7 @@
 							placeholder-class="phcolor"
 							placeholder-style="color:#CCCCCC"
 							class="tui-input"
-							placeholder="楼号门牌号（选填）"
+							placeholder="楼号门牌号"
 						/>
 					</tui-list-cell>
 					<div class="btn-wrap">

hdApp/src/pagesStorehouse/shop/update.vue

@@ -72,7 +72,7 @@
 						placeholder-class="phcolor"
 						class="tui-input"
 						name="floor"
-						placeholder="楼号门牌号（选填）"
+						placeholder="楼号门牌号"
 					/>
 				</tui-list-cell>
 				<tui-list-cell class="line-cell remark-wrap" :hover="false">