From bdd295f3d44d8d61a8e877223e8aed2fa069dd19 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Wed, 19 Jun 2024 09:17:08 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E5=94=AE=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/market/presale/modules/EditForm.vue | 210 ++++++++----------
 src/views/user/order/Index.vue                |   2 +-
 2 files changed, 99 insertions(+), 113 deletions(-)

diff --git a/src/views/market/presale/modules/EditForm.vue b/src/views/market/presale/modules/EditForm.vue
index 258cfda..224423b 100644
--- a/src/views/market/presale/modules/EditForm.vue
+++ b/src/views/market/presale/modules/EditForm.vue
@@ -1,45 +1,28 @@
 <template>
-  <a-modal
-    :title="title"
-    :width="780"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    :maskClosable="false"
-    :destroyOnClose="true"
-    @ok="handleSubmit"
-    @cancel="handleCancel"
-  >
-    <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
-        <a-form-item label="预售名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input v-decorator="['name', { rules: [{ required: true, message: '请输入预售名称' }] }]" placeholder="请输入预售名称" />
-        </a-form-item>
-        <a-form-item label="预售商品" :labelCol="labelCol" :wrapperCol="wrapperCol" required>
-          <div style="width: 100%; overflow-x: auto;">
-            <SelectGoods
-              :defaultList="selectGoodsList"
-              :multiple="true"
-              v-decorator="['goods_list', { rules: [{ required: true, message: '请选择预售商品' }] }]"
-            />
-          </div>
-        </a-form-item>
-        <a-form-item label="预售时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-date-picker
-            show-time
-            format="YYYY-MM-DD HH:mm:ss"
-            v-decorator="['p_time', { rules: [{ required: true, message: '请输入预售时间' }] }]"
-          />
-        </a-form-item>
+	<a-modal :title="title" :width="780" :visible="visible" :confirmLoading="confirmLoading" :maskClosable="false" :destroyOnClose="true" @ok="handleSubmit" @cancel="handleCancel">
+		<a-spin :spinning="confirmLoading">
+			<a-form :form="form">
+				<a-form-item label="预售名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+					<a-input v-decorator="['name', { rules: [{ required: true, message: '请输入预售名称' }] }]" placeholder="请输入预售名称" />
+				</a-form-item>
+				<a-form-item label="预售商品" :labelCol="labelCol" :wrapperCol="wrapperCol" required>
+					<div style="width: 100%; overflow-x: auto;">
+						<SelectGoods :defaultList="selectGoodsList" :multiple="true" v-decorator="['goods_list', { rules: [{ required: true, message: '请选择预售商品' }] }]" />
+					</div>
+				</a-form-item>
+				<a-form-item label="预售时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
+					<a-date-picker show-time format="YYYY-MM-DD HH:mm:ss" v-decorator="['p_time', { rules: [{ required: true, message: '请输入预售时间' }] }]" />
+				</a-form-item>
 
-        <a-form-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-radio-group v-decorator="['status', { initialValue: 1, rules: [{ required: true }] }]">
-            <a-radio :value="1">开启</a-radio>
-            <a-radio :value="0">关闭</a-radio>
-          </a-radio-group>
-        </a-form-item>
-      </a-form>
-    </a-spin>
-  </a-modal>
+				<a-form-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
+					<a-radio-group v-decorator="['status', { initialValue: 1, rules: [{ required: true }] }]">
+						<a-radio :value="1">开启</a-radio>
+						<a-radio :value="0">关闭</a-radio>
+					</a-radio-group>
+				</a-form-item>
+			</a-form>
+		</a-spin>
+	</a-modal>
 </template>
 
 <script>
@@ -48,85 +31,88 @@ import * as Api from '@/api/market/presale'
 import { SelectImage, SelectGoods } from '@/components'
 
 export default {
-  components: {
-    SelectImage,
-    SelectGoods
-  },
-  data () {
-    return {
-      // 对话框标题
-      title: '编辑预售',
-      // 标签布局属性
-      labelCol: { span: 3 },
-      // 输入框布局属性
-      wrapperCol: { span: 19 },
-      // modal(对话框)是否可见
-      visible: false,
-      // modal(对话框)确定按钮 loading
-      confirmLoading: false,
-      // 当前表单元素
-      form: this.$form.createForm(this),
-      // 当前记录
-      record: {},
-      // 关联商品列表
-      selectGoodsList: []
-    }
-  },
-  methods: {
+	components: {
+		SelectImage,
+		SelectGoods
+	},
+	data() {
+		return {
+			// 对话框标题
+			title: '编辑预售',
+			// 标签布局属性
+			labelCol: { span: 3 },
+			// 输入框布局属性
+			wrapperCol: { span: 19 },
+			// modal(对话框)是否可见
+			visible: false,
+			// modal(对话框)确定按钮 loading
+			confirmLoading: false,
+			// 当前表单元素
+			form: this.$form.createForm(this),
+			// 当前记录
+			record: {},
+			// 关联商品列表
+			selectGoodsList: []
+		}
+	},
+	methods: {
 
-    // 显示对话框
-    edit (record) {
-      // 显示窗口
-      this.visible = true
-      // 当前记录
-      this.record = record
+		// 显示对话框
+		edit(record) {
+			// 显示窗口
+			this.visible = true
+			// 当前记录
+			this.record = record
 
-      this.selectGoodsList = record.goods_list || []
+			this.selectGoodsList = record.goods_list || []
 
-      // 设置默认值
-      this.setFieldsValue()
-    },
+			// 设置默认值
+			this.setFieldsValue()
+		},
 
-    // 设置默认值
-    setFieldsValue () {
-      const { record, form: { setFieldsValue } } = this
-      this.$nextTick(() => {
-        setFieldsValue(pick(record, ['name', 'goods_list', 'p_time', 'status']))
-      })
-    },
+		// 设置默认值
+		setFieldsValue() {
+			const { record, form: { setFieldsValue } } = this
+			this.$nextTick(() => {
+				setFieldsValue(pick(record, ['name', 'goods_list', 'p_time', 'status']))
+			})
+		},
 
-    // 确认按钮
-    handleSubmit (e) {
-      e.preventDefault()
-      // 表单验证
-      const { form: { validateFields } } = this
-      validateFields((errors, values) => {
-        // 提交到后端api
-        !errors && this.onFormSubmit(values)
-      })
-    },
+		// 确认按钮
+		handleSubmit(e) {
+			e.preventDefault()
+			// 表单验证
+			const { form: { validateFields } } = this
+			validateFields((errors, values) => {
+				// 提交到后端api
+				!errors && this.onFormSubmit(values)
+			})
+		},
 
-    // 关闭对话框事件
-    handleCancel () {
-      this.visible = false
-      this.form.resetFields()
-    },
-
-    // 提交到后端api
-    onFormSubmit (values) {
+		// 关闭对话框事件
+		handleCancel() {
+			this.visible = false
+			this.form.resetFields()
+		},
+		hasObject(arr) {
+			return arr.some(item => typeof item === 'object' && item !== null);
+		},
+		// 提交到后端api
+		onFormSubmit(values) {
       this.confirmLoading = true
-      Api.edit({ id: this.record.id, form: { ...values, goods_list: values.goods_list.join(',') } })
-        .then(result => {
-          // 显示成功
-          this.$message.success(result.message, 1.5)
-          // 关闭对话框事件
-          this.handleCancel()
-          // 通知父端组件提交完成了
-          this.$emit('handleSubmit', values)
-        })
-        .finally(() => this.confirmLoading = false)
-    }
+      let arrType=this.hasObject(values.goods_list)
+			Api.edit({ id: this.record.id, form: { ...values, goods_list: arrType?values.goods_list.map(item => item.goods_id).join(","):values.goods_list.join(',') } })
+				.then(result => {
+					// 显示成功
+					this.$message.success(result.message, 1.5)
+					// 关闭对话框事件
+					this.handleCancel()
+					// 通知父端组件提交完成了
+					this.$emit('handleSubmit', values)
+				})
+				.finally(() => this.confirmLoading = false)
+		}
 
-  }
+	}
 }
 </script>
diff --git a/src/views/user/order/Index.vue b/src/views/user/order/Index.vue
index c670bac..df4776c 100644
--- a/src/views/user/order/Index.vue
+++ b/src/views/user/order/Index.vue
@@ -24,7 +24,7 @@
 					</a-form-item>
 					<a-form-item label="支付方式">
 						<a-select v-decorator="['pay_method', { initialValue: 0 }]">
-							<a-select-option :value="''">全部</a-select-option>
+							<a-select-option :value="0">全部</a-select-option>
 							<a-select-option :value="'wechat'">会员</a-select-option>
 							<a-select-option :value="'balance'">分销商 </a-select-option>
 						</a-select>