update

mobile-code/src/admin/order/detail.vue

@@ -221,6 +221,10 @@ export default {
 				this.modalCancel()
 			} else {
 				this.data.status = 2
+				freeShipping({ id: this.data.id }).then(res => {
+					this.$msg('操作成功！')
+					this.modalCancel()
+				})
 			}
 		},
 		// 查看配送
@@ -255,8 +259,7 @@ export default {
 		modalCancel() {
 			this.form.price = ''
 			this.freeShipModal = false
-			this.freeShippingModal = false
-			this.freeShipModal = false
+			this.updatePriceModal = false
 		}
 	}
 }

mobile-code/src/admin/order/fill-form.vue

@@ -50,10 +50,12 @@ export default {
 		},
 		confirmFn() {
 			let form = this.$refs.appDelivery.form ? this.$refs.appDelivery.form : {}
+			let region = this.$refs.appDelivery.region ? this.$refs.appDelivery.region : {}
 			updateSheet({
 				id: this.option.id,
 				...this.form,
-				...form
+				...form,
+				...region
 			}).then(res => {
 				this.$util.pageTo({
 					url: '/admin/order/ship',

mobile-code/src/admin/staff/add.vue

@@ -27,7 +27,7 @@
 							<div>{{ memberData.mobile }}</div>
 						</div>
 					</div>
-					<div class="tui-placeholder">请选择</div>
+					<div v-else class="tui-placeholder">请选择</div>
 				</tui-list-cell>
 			</div>
 			<div class="prompt-text">注: 关联的微信号要注册会员并关注公从号</div>