下单优化

ghs/src/admin/billing/affirm.vue

@@ -59,28 +59,6 @@
 						>
 					</tui-list-cell>
 					<appFormSend :form.sync="form"> </appFormSend>
-					<!-- <appFormRadioBtn
-						title="配送方式"
-						:currenSelect.sync="sendSide"
-						:selectOptions="selectOptionsWay"
-					/>
-					<appAddressGroup
-						cityTitle="配送城市"
-						@selectAdress="selectAdress"
-					></appAddressGroup>
-					<appSendTime
-						:sendDate.sync="form.sendDate"
-						:sendTime.sync="form.sendTime"
-					></appSendTime>
-
-					<tui-list-cell class="line-cell" :hover="false" :arrow="false">
-						<view class="tui-title">运费</view>
-						<view v-if="form.sendCost" class="tui-input">
-							20
-						</view>
-						<view v-else class="tui-placeholder">留空表示免运费</view>
-						<input v-model="form.province" name="province" hidden />
-					</tui-list-cell> -->
 				</view>
 			</form>
 		</view>
@@ -142,6 +120,7 @@ export default {
 				receiveLong: "",
 				receiveLat: "",
 				sendType: "3",
+				sendSide: "2",
 				sendDate: "",
 				sendTime: "",
 				sendCost: "",
@@ -172,25 +151,6 @@ export default {
 	},
 	methods: {
 		...mapActions(["initMerchantInfo"]),
-		selectAdress(info) {
-			this.form.receiveProvince = info.province;
-			this.form.receiveCity = info.city;
-			this.form.receiveFloor = info.floor;
-			this.form.receiveAddress = info.address;
-			this.form.receiveLong = info.longitude;
-			this.form.receiveLat = info.latitude;
-
-			// this.$nextTick(() => {
-			// 	let params = {
-			// 		sendSide: this.sendSide,
-			// 		receiveLong: info.longitude,
-			// 		receiveLat: info.latitude
-			// 	};
-			// });
-		},
-		selTimeFn(e) {
-			this.form.sendTime = e.detail.value;
-		},
 		init() {
 			this._getDet();
 		},
@@ -260,7 +220,6 @@ export default {
 				// 进行表单检查
 				let formData = this.form;
 
-				formData.sendSide = this.sendSide;
 				const product = this.selectList.map(ele => {
 					return { productId: ele.id, num: ele.bigCount, smallNum: ele.smallCount };
 				});

ghs/src/components/app-form-send.vue

@@ -35,7 +35,7 @@
 		></appAddressGroup>
 		<appSendTime
 			:sendDate.sync="formData.sendDate"
-			:sendTime.sync="sendTime"
+			:sendTime.sync="formData.sendTime"
 		></appSendTime>
 
 		<tui-list-cell class="line-cell" :hover="false" :arrow="false">
@@ -79,7 +79,8 @@ export default {
 				receiveLat: "",
 				sendSide: "2",
 				sendType: "3", //1自取 2本店送 3快递送
-				sendDate: ""
+				sendDate: "",
+				sendTime: ""
 			},
 			deliveryList: [
 				{
@@ -98,8 +99,7 @@ export default {
 					name: "美团",
 					value: "5"
 				}
-			],
-			sendTime: ""
+			]
 		};
 	},
 	created() {
@@ -155,6 +155,7 @@ export default {
 			const {
 				detail: { value }
 			} = event;
+			console.log(2222, value, this.deliveryList[value].value);
 			this.sendSideIndex = value;
 			this.formData.sendSide = this.deliveryList[value].value;
 		}
@@ -164,8 +165,8 @@ export default {
 			handler(val) {
 				if (val) {
 					let info = { ...this.form, ...val };
-					if (this.sendTime) {
-						info.sendTime = `${this.formData.sendDate} ${this.sendTime}`;
+					if (this.formData.sendTime) {
+						info.sendTime = `${this.formData.sendDate} ${this.formData.sendTime}`;
 					}
 					console.log(2222, info);
 					this.$emit("update:form", info);

ghs/src/pagesStorehouse/inventory/update.vue

@@ -181,6 +181,7 @@ export default {
 		return {
 			orderSn: null,
 			infoData: null,
+			autoLoad: false,
 			remark: "",
 			pageType: "inventory",
 			columns: [