fuwei 5 лет назад
Родитель
Сommit
2cfa24a7ce
2 измененных файлов с 100 добавлено и 101 удалено
  1. 92 93
      ghs/src/admin/billing/affirm.vue
  2. 8 8
      ghs/src/pagesClient/member/add.vue

+ 92 - 93
ghs/src/admin/billing/affirm.vue

@@ -63,66 +63,46 @@
 						<view class="tui-placeholder" v-else>请选择客户</view>
 						<input v-model="form.province" name="province" hidden />
 					</tui-list-cell>
-					<tui-list-cell
-						class="line-cell"
-						:hover="false"
-						:arrow="true"
-						@click="openAddres"
-					>
-						<view class="tui-title ">仓库</view>
-						<view class="tui-input" v-if="form.province || form.city">
-							{{ form.province + "-" + form.city }}
+					 <tui-list-cell 
+						class="line-cell code-wrap" :hover="false">
+						<view class="tui-title">配送方式</view>
+						<view>
+							<button 
+								@click="changeWay(0)"
+								:class="['admin-button-com','mini-btn',waySele==0?'blue':'default']">
+								自取
+							</button>
+							<button 
+								@click="changeWay(1)"
+								style="margin-left:10px;"
+								:class="['admin-button-com','mini-btn',waySele==1?'blue':'default']">
+								本店送
+							</button>
+							<button
+								@click="changeWay(2)"
+								style="margin-left:10px;" :class="['admin-button-com','mini-btn',waySele==2?'blue':'default']">
+								快递送
+							</button>
 						</view>
-						<view class="tui-placeholder" v-else>请选择仓库</view>
-						<input v-model="form.province" name="province" hidden />
 					</tui-list-cell>
 					<tui-list-cell
 						class="line-cell"
 						:hover="false"
 						:arrow="true"
-						@click="openAddres"
-					>
-						<view class="tui-title ">发货日期</view>
-						<view class="tui-input" v-if="form.province || form.city">
-							{{ form.province + "-" + form.city }}
-						</view>
-						<view class="tui-placeholder" v-else>请选择</view>
-						<input v-model="form.province" name="province" hidden />
-					</tui-list-cell>
-					<tui-list-cell
-						class="line-cell"
-						:hover="false"
-						:arrow="false"
-						@click="openAddres"
 					>
-						<view class="tui-title ">配送方式</view>
-					</tui-list-cell>
-					<!-- <tui-list-cell class="line-cell" :hover="false">
-						<view class="tui-title ">联系电话</view>
-						<input
-							v-model="form.telephone"
-							placeholder-class="phcolor"
-							class="tui-input"
-							name="telephone"
-							placeholder="请输入联系电话"
-							maxlength="50"
-							type="text"
-						/>
-					</tui-list-cell> -->
-					<tui-list-cell
-						class="line-cell"
-						:hover="false"
-						:arrow="true"
-						@click="openAddres"
-					>
-						<view class="tui-title ">配送方</view>
-						<view class="tui-input" v-if="form.province || form.city">
-							{{ form.province + "-" + form.city }}
-						</view>
-						<view class="tui-placeholder" v-else>请选择仓库</view>
-						<input v-model="form.province" name="province" hidden />
+						<view class="tui-title ">快递</view>
+							<picker
+								mode="selector"
+								:range="deliveryList"
+								@change="changeDeliveryFn"
+								range-key="text"
+								class="inp-select"
+							>
+								<view v-if="sendSideText">{{ sendSideText }}</view>
+								<view class="tui-placeholder" v-else>请选择</view>
+							</picker>
 					</tui-list-cell>
-					<tui-list-cell
+					 <tui-list-cell
 						class="line-cell"
 						:hover="false"
 						:arrow="true"
@@ -136,15 +116,15 @@
 						<input v-model="form.province" name="province" hidden />
 					</tui-list-cell>
 					<tui-list-cell
-						class="line-cell"
-						:hover="false"
-						:arrow="true"
-						@click="selRegionFn"
-					>
-						<view class="tui-title ">地址</view>
-						<view class="tui-input" v-if="form.address">{{ form.address }}</view>
-						<view class="tui-placeholder" v-else>请填写详细地址</view>
-						<input v-model="form.address" name="address" hidden />
+							class="line-cell"
+							:hover="false"
+							:arrow="true"
+							@click="selRegionFn"
+						>
+							<view class="tui-title ">地址</view>
+							<view class="tui-input" v-if="form.address">{{ form.address }}</view>
+							<view class="tui-placeholder" v-else>请填写详细地址</view>
+							<input v-model="form.address" name="address" hidden />
 					</tui-list-cell>
 					<tui-list-cell class="line-cell" :hover="false">
 						<view class="tui-title ">门牌号</view>
@@ -156,44 +136,32 @@
 							placeholder="楼号门牌号(选填)"
 						/>
 					</tui-list-cell>
-					<tui-list-cell
-						class="line-cell"
-						:hover="false"
-						:arrow="true"
-						@click="openAddres"
-					>
-						<view class="tui-title ">配送时间</view>
-						<view class="tui-input" v-if="form.province || form.city">
-							{{ form.province + "-" + form.city }}
-						</view>
-						<view class="tui-placeholder" v-else>留空默认20分钟后配送</view>
-						<input v-model="form.province" name="province" hidden />
+					<tui-list-cell class="line-cell" :hover="false" :arrow="true">
+						<div class="tui-title">配送日期</div>
+							<picker mode="date" :value="form.reachTime" @change="selTimeFn" class="tui-input">
+							<div v-if="form.reachTime">{{ form.reachTime }}</div>
+							<div class="tui-placeholder" v-else>请选择送达时间</div>
+						</picker>
+					</tui-list-cell>
+					<tui-list-cell class="line-cell" :hover="false" :arrow="true">
+						<div class="tui-title">具体时间</div>
+							<picker mode="time" :value="form.reachTime" @change="selTimeFn" class="tui-input">
+							<div v-if="form.reachTime">{{ form.reachTime }}</div>
+							<div class="tui-placeholder" v-else>请选择具体时间</div>
+						</picker>
 					</tui-list-cell>
 					<tui-list-cell
 						class="line-cell"
 						:hover="false"
 						:arrow="false"
-						@click="openAddres"
 					>
-						<view class="tui-title ">运费</view>
-						<view class="tui-input" v-if="form.province || form.city">
-							{{ form.province + "-" + form.city }}
+						<view class="tui-title">运费</view>
+						<view v-if="form.sendCost" class="tui-input"  >
+							20
 						</view>
-						<view class="tui-placeholder" v-else></view>
+						<view v-else class="tui-placeholder" >留空表示免运费</view>
 						<input v-model="form.province" name="province" hidden />
-					</tui-list-cell>
-
-					<!-- <tui-list-cell class="line-cell remark-wrap" :hover="false">
-						<view class="tui-title">简介</view>
-						<view class="tui-input">
-							<textarea
-								v-model="form.introduction"
-								class="tui-textarea remark"
-								placeholder-class="phcolor"
-								placeholder="请输入简介"
-							/>
-						</view>
-					</tui-list-cell> -->
+					</tui-list-cell> 
 				</view>
 			</form>
 		</view>
@@ -260,7 +228,9 @@ export default {
 				openTime: "8:00 - 22:00",
 				introduction: "",
 				telephone: "",
-				customer: ""
+				customer: "",
+				reachTime:'',
+				sendCost:''
 			},
 			// 详细地址
 			showRegion: false,
@@ -271,10 +241,39 @@ export default {
 			},
 			// 省市联动
 			regionData: [],
-			cityPickerValueDefault: [0, 0]
+			cityPickerValueDefault: [0, 0],
+			waySele: 2,   // 0 自取  1 本店送 2快递送
+			sendSideText:'达达配送',
+            deliveryList: [
+                    {
+                    text: "达达配送",
+                    key: 2
+					},
+					{
+                    text: "顺丰同城",
+                    key: 3
+					},
+					{
+                    text: "闪送",
+                    key: 4
+					},
+					{
+                    text: "美团",
+                    key: 5
+                    }
+				],
 		};
 	},
 	methods: {
+		selTimeFn(e){
+			this.form.reachTime = e.detail.value;
+		},
+		changeDeliveryFn(e){
+			this.sendSideText = this.deliveryList[e.detail.value].text;
+		},
+		changeWay(val){
+			this.waySele = val
+		},
 		init() {
 			this._getDet();
 		},

+ 8 - 8
ghs/src/pagesClient/member/add.vue

@@ -32,14 +32,14 @@
 					<div class="tui-placeholder" v-else>请填写详细地址</div>
 					</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="楼号门牌号(选填)"
-					/>
+						<div class="tui-title">门牌号</div>
+						<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>