diff --git a/src/layout/components/richTextUtil.vue b/src/layout/components/richTextUtil.vue
index 26d4e42..b8520c5 100644
--- a/src/layout/components/richTextUtil.vue
+++ b/src/layout/components/richTextUtil.vue
@@ -42,7 +42,7 @@ const editorConfig = {
}
editorConfig.readOnly = props.disableRich //控制富文本是否启用
-editorConfig.autoFocus = false
+editorConfig.autoFocus = false //默认不对焦
editorConfig.MENU_CONF['uploadImage'] = {
allowedFileTypes: ['image/*'], //限定只能上传图片格式
maxFileSize: 1024 * 1024 * 10, //最大图片10M
@@ -73,7 +73,6 @@ onBeforeUnmount(() => {
const handleCreated = (editor) => {
editorRef.value = editor // 记录 editor 实例,重要!
- console.log(editor.getAllMenuKeys())
}
const handleChange = (editor) => { //当选项改变时触发emit传值
diff --git a/src/views/Commodity/EntityProductDetail.vue b/src/views/Commodity/EntityProductDetail.vue
index 3daf8fa..b28545c 100644
--- a/src/views/Commodity/EntityProductDetail.vue
+++ b/src/views/Commodity/EntityProductDetail.vue
@@ -37,7 +37,7 @@
-
+
@@ -137,12 +137,12 @@ const getFestivalArr = async () => {
const getProductInfo = async () => { //商品信息
const res = await myAxios.post('/goods/getById',{ id: route.params.id })
- console.log('后端查询商品--->',res.data.data)
+ console.log('后端查询商品--->',res.data)
if(res.data.code === 1) {
previewImgUrl.value = res.data.data.goodImg
detailFrom.value = res.data.data
previewRichText.value = res.data.data.richText
- detailFrom.value.festivalName = res.data.data.festivalName.substring(0,1)
+ detailFrom.value.festivalName = res.data.data.festivalName.split(';')[0]
labelList.value = res.data.data.label.split(';')
}
}
@@ -156,7 +156,7 @@ const getTypeList = async () => { //获取类别列表作为可选项
//提交表单
const onSubmit = async () => {
- console.log('提交前的表格',detailFrom.value)
+ // console.log('提交前的表格',detailFrom.value)
const values = Object.values(detailFrom.value );
// 使用some()方法来检查是否有任何值为空
if (values.some((value: any) => value === null || value === undefined || value === '' || value === 'PHA+PGJyPjwvcD4=')) {
diff --git a/src/views/Commodity/MerchandiseCenter.vue b/src/views/Commodity/MerchandiseCenter.vue
index 60bfef1..2fc6663 100644
--- a/src/views/Commodity/MerchandiseCenter.vue
+++ b/src/views/Commodity/MerchandiseCenter.vue
@@ -126,7 +126,7 @@ onMounted(() => { //页面加载时获取商品列表和分类页表
const getProductList = async () => {
try {
const res = await myAxios.post('/goods/list/page', {...searchParams.value});
- console.log('res--->', res.data)
+ // console.log('res--->', res.data)
if (res.data.code === 1) {
tableData.value = res.data.data.records;
total.value = parseInt(res.data.data.total) //总数据量,用于分页
diff --git a/src/views/CostumeAppointments/AppointmentOrder.vue b/src/views/CostumeAppointments/AppointmentOrder.vue
index b6ef4d4..8d3df32 100644
--- a/src/views/CostumeAppointments/AppointmentOrder.vue
+++ b/src/views/CostumeAppointments/AppointmentOrder.vue
@@ -34,7 +34,7 @@
+ title="拍摄是否完成?" @confirm="changeOrderStatus(scope.row,'交易成功')" width=180 v-if="['待发货'].includes(scope.row.orderStatus)">
拍摄完成
@@ -99,7 +99,7 @@ const getOrderList = async () => {
if (res.data.code === 1) {
tableData.value = res.data.data.records;
total.value = parseInt(res.data.data.total)
- console.log('表单信息--->', tableData.value);
+ // console.log('表单信息--->', tableData.value);
} else {
ElMessage({
message: '获取数据失败',
@@ -120,30 +120,31 @@ const showDetail = (row: any) => {
}
})
};
-const changeOrderStatus = async (row: any) => { //改变订单状态
+const changeOrderStatus = async (row: any,msg: string) => { //改变订单状态
const res = await myAxios.post('/advanceOrder/update/orderStatus',{
id: row.id,
- orderStatus: '交易成功'
+ orderStatus: msg
})
if(res.data.code === 1) {
await getOrderList()
- SuccessInfo('订单确认完成')
+ SuccessInfo(msg)
} else {
WarnInfo(res.data.message)
}
}
const deleteOrder = async (row: any) => { //微信退款
loading.value = true
- console.log('row-->', row)
- const res = await myAxios.post('/wechat/refund/create', { id: row.id }) //传入订单号取消订单并退款
- console.log(res)
- setTimeout(() => {
+ // console.log('row-->', row)
+ const res = await myAxios.post('/wechat/refund/photo/create', { id: row.id }) //传入订单号取消订单并退款
+ // console.log(res)
+ setTimeout(async () => {
if (res.data.code === 1) {
SuccessInfo('退款成功')
- getOrderList()
+ await changeOrderStatus(row,'已退款')
+ await getOrderList()
loading.value = false
}
- }, 10000)
+ }, 3000)
}
const reset = () => { //重置搜索框
orderNumber.value = ''
diff --git a/src/views/Login.vue b/src/views/Login.vue
index 2cba877..85c8bb5 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -20,15 +20,16 @@
-
登录
+ background-color: #AC7352;
+ "
+ @click="Login()" @keydown.enter="keyDown" size="large" >
登录
@@ -41,8 +42,7 @@