修改bug

src/services/api/config.ts

@@ -13,7 +13,7 @@ service.interceptors.request.use(
   config => {
     const token = sessionStorage.getItem('token')
     if (token) {
-      config.headers = { 'Authorization': `${token}` , ...config.headers }
+      config.headers = { 'Authorization': `${token}`, ...config.headers }
     }
     return config
   }
@@ -25,7 +25,7 @@ service.interceptors.response.use(
     // 数据请求成功后 相应操作
     const responseData = res.data
     if (responseData.code !== 200) {
-      ElMessage.error(responseData.message)
+      ElMessage.error(responseData.msg)
     }
     return responseData
   },

src/views/commodityManage/components/mainConfig.vue

@@ -5,8 +5,8 @@
             <el-button type="primary" size="small" @click="handlemainConfigShow">添加</el-button>
         </div>
         <el-table :data="mainConfigurationsData.mainConfigurationsList" border>
-            <el-table-column property="name" label="名称" />
-            <el-table-column property="brand" label="品牌" />
+            <el-table-column prop="name" label="名称" />
+            <el-table-column prop="brand" label="品牌" />
             <el-table-column align="center" label="操作" width="100" class-name="small-padding fixed-width">
                 <template #default="scope">
                     <el-button type="warning" size="small" @click="handlemainConfigDelete(scope.row)">删除

src/views/commodityManage/edit.vue

@@ -122,15 +122,15 @@
                 </el-row>
 
                 <el-table :data="specifications">
-                    <el-table-column property="specification" label="规格名" />
-                    <el-table-column property="value" label="规格值" align="center">
+                    <el-table-column prop="specification" label="规格名" />
+                    <el-table-column prop="value" label="规格值" align="center">
                         <template #default="scope">
                             <el-tag type="primary">
                                 {{ scope.row.value }}
                             </el-tag>
                         </template>
                     </el-table-column>
-                    <el-table-column property="customSpec" label="自定义规格" align="center">
+                    <el-table-column prop="customSpec" label="自定义规格" align="center">
                         <template #default="scope">
                             <el-tag v-if="scope.row.customSpec" type="primary">
                                 {{ scope.row.customSpec }}

src/views/commodityManage/list.vue

@@ -22,7 +22,7 @@
         <el-table v-loading="listLoading" :data="list" element-loading-text="正在查询中。。。" border fit highlight-current-row>
             <el-table-column type="expand">
                 <template #default="props">
-                    <el-form label-position="left" style="padding-left: 3%;">
+                    <el-form label-position="left" style="padding-left: 3%">
                         <el-form-item label="商品编号">
                             <span>{{ props.row.goodsSn }}</span>
                         </el-form-item>
@@ -53,7 +53,7 @@
 
             <el-table-column align="center" min-width="100" label="名称" prop="name" />
 
-            <el-table-column align="center" property="iconUrl" label="图片">
+            <el-table-column align="center" prop="iconUrl" label="图片">
                 <template #default="scope">
                     <el-image v-if="scope.row.picUrl.split('http').length > 1" :src="scope.row.picUrl"
                         style="width: 40px; height: 40px"></el-image>
@@ -61,7 +61,7 @@
                 </template>
             </el-table-column>
 
-            <el-table-column align="center" property="iconUrl" label="分享图">
+            <el-table-column align="center" prop="iconUrl" label="分享图">
                 <template #default="scope">
                     <img :src="scope.row.shareUrl" width="40" />
                 </template>
@@ -80,7 +80,7 @@
             <el-table-column align="center" label="是否新品" prop="isNew">
                 <template #default="scope">
                     <el-tag :type="scope.row.isNew ? 'success' : 'error'">{{
-                            scope.row.isNew ? "新品" : "非新品"
+                            scope.row.isNew ? '新品' : '非新品'
                     }}</el-tag>
                 </template>
             </el-table-column>
@@ -88,7 +88,7 @@
             <el-table-column align="center" label="是否热品" prop="isHot">
                 <template #default="scope">
                     <el-tag :type="scope.row.isHot ? 'success' : 'error'">{{
-                            scope.row.isHot ? "热品" : "非热品"
+                            scope.row.isHot ? '热品' : '非热品'
                     }}</el-tag>
                 </template>
             </el-table-column>
@@ -96,7 +96,7 @@
             <el-table-column align="center" label="是否在售" prop="isOnSale">
                 <template #default="scope">
                     <el-tag :type="scope.row.isOnSale ? 'success' : 'error'">{{
-                            scope.row.isOnSale ? "在售" : "未售"
+                            scope.row.isOnSale ? '在售' : '未售'
                     }}</el-tag>
                 </template>
             </el-table-column>
@@ -119,50 +119,50 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from "vue";
-import { ElMessage, ElMessageBox, ElNotification } from "element-plus";
-import { listGoods, deleteGoods } from "@/services/api/commodityManage/list";
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox, ElNotification } from 'element-plus'
+import { listGoods, deleteGoods } from '@/services/api/commodityManage/list'
 import htmlDetails from '@/components/htmlDetails.vue'
-import LitemallPage from "@/components/pagination/litemallPage.vue";
+import LitemallPage from '@/components/pagination/litemallPage.vue'
 import shelves from './shelves.vue'
 import edit from './edit.vue'
 
-let list = ref([]);
-let total = ref(0);
-let listLoading = ref(true);
-let shelvesRef = ref();
-let editRef = ref();
-let editId = ref();
+let list = ref([])
+let total = ref(0)
+let listLoading = ref(true)
+let shelvesRef = ref()
+let editRef = ref()
+let editId = ref()
 let listQuery = ref({
     page: 1,
     limit: 10,
     goodsSn: undefined,
     name: undefined,
-    sort: "add_time",
-    order: "desc",
-} as any);
+    sort: 'add_time',
+    order: 'desc',
+} as any)
 let action = ref(import.meta.env.VITE_APP_BASE_URL + '/goods/upload')
-let headers = ref({ 'Authorization': sessionStorage.getItem("token") })
-let downloadLoading = ref(false);
+let headers = ref({ Authorization: sessionStorage.getItem('token') })
+let downloadLoading = ref(false)
 let htmlData = ref({
     htmlVisible: false,
     title: '商品详情',
-    details: ''
+    details: '',
 })
 let getList = () => {
-    listLoading.value = true;
+    listLoading.value = true
     listGoods(listQuery.value)
         .then((res: any) => {
-            list.value = res.data.list;
-            total.value = res.data.total;
-            listLoading.value = false;
+            list.value = res.data.list
+            total.value = res.data.total
+            listLoading.value = false
         })
         .catch(() => {
-            list.value = [];
-            total.value = 0;
-            listLoading.value = false;
-        });
-};
+            list.value = []
+            total.value = 0
+            listLoading.value = false
+        })
+}
 getList()
 
 let sizeChange = (val: number) => {
@@ -176,47 +176,47 @@ let currentChange = (val: number) => {
 }
 
 let handleFilter = () => {
-    listQuery.value.page = 1;
-    getList();
-};
+    listQuery.value.page = 1
+    getList()
+}
 let handleCreate = () => {
     shelvesRef.value.shelvesDrawer = true
-};
+}
 let handleUpdate = (row: any) => {
     editRef.value.init(row.id)
     editRef.value.editDrawer = true
-};
+}
 let showDetail = (detail: any) => {
     htmlData.value.htmlVisible = true
     htmlData.value.details = detail
-};
+}
 let handleDelete = (row: any) => {
-    ElMessageBox.confirm("确定删除?", "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
+    ElMessageBox.confirm('确定删除?', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
         center: true,
     })
         .then(() => {
             deleteGoods(row)
                 .then((res: any) => {
                     ElNotification({
-                        type: "success",
-                        title: "成功",
-                        message: "删除成功",
-                    });
-                    getList();
+                        type: 'success',
+                        title: '成功',
+                        message: '删除成功',
+                    })
+                    getList()
                 })
                 .catch((res: any) => {
                     ElNotification({
-                        type: "error",
-                        title: "失败",
+                        type: 'error',
+                        title: '失败',
                         message: res.data.errmsg,
-                    });
-                });
+                    })
+                })
         })
-        .catch(() => { });
-};
+        .catch(() => { })
+}
 
 // 导入文件删除
 let handleRemove = (uploadFile: any, uploadFiles: any) => {
@@ -274,9 +274,9 @@ let handleDownload = () => {
     //     "brandId",
     //   ];
     //   excel.export_json_to_excel2(tHeader, list, filterVal, "商品信息");
-    downloadLoading.value = false;
+    downloadLoading.value = false
     // });
-};
+}
 </script>
 
 <style lang="scss" scoped>
@@ -307,4 +307,4 @@ let handleDownload = () => {
 :deep(.el-upload-list--text) {
     display: none;
 }
-</style>
+</style>
\ No newline at end of file

src/views/commodityManage/shelves.vue

@@ -120,15 +120,15 @@
                 </el-row>
 
                 <el-table :data="specifications">
-                    <el-table-column property="specification" label="规格名" align="left" />
-                    <el-table-column property="value" label="规格值" align="center">
+                    <el-table-column prop="specification" label="规格名" align="left" />
+                    <el-table-column prop="value" label="规格值" align="center">
                         <template #default="scope">
                             <el-tag type="primary">
                                 {{ scope.row.value }}
                             </el-tag>
                         </template>
                     </el-table-column>
-                    <el-table-column property="customSpec" label="自定义规格" align="center">
+                    <el-table-column prop="customSpec" label="自定义规格" align="center">
                         <template #default="scope">
                             <el-tag v-if="scope.row.customSpec" type="primary">
                                 {{ scope.row.customSpec }}
@@ -138,11 +138,6 @@
                             </el-tag>
                         </template>
                     </el-table-column>
-                    <!-- <el-table-column property="picUrl" label="规格图片">
-                        <template #default="scope">
-                            <img v-if="scope.row.picUrl" :src="scope.row.picUrl" width="40" />
-                        </template>
-                    </el-table-column> -->
                     <el-table-column align="center" label="操作" width="250" class-name="small-padding fixed-width">
                         <template #default="scope">
                             <el-button type="primary" size="small"
@@ -176,17 +171,6 @@
                         <el-form-item label="自定义规格">
                             <el-switch v-model="specForm.customSpec" @change="dictSwitchChange" />
                         </el-form-item>
-                        <!-- <el-form-item label="规格图片" prop="picUrl">
-                            <el-upload :action="uploadPath" :show-file-list="false" :headers="headers"
-                                :on-success="uploadSpecPicUrl" class="avatar-uploader" accept=".jpg,.jpeg,.png,.gif">
-                                <div v-if="specForm.picUrl">
-                                    <img :src="specForm.picUrl" class="avatar" />
-                                </div>
-                                <el-icon v-else class="avatar-uploader-icon">
-                                    <Plus />
-                                </el-icon>
-                            </el-upload>
-                        </el-form-item> -->
                     </el-form>
                     <template #footer class="dialog-footer">
                         <el-button @click="handleSpecificationClose">取消</el-button>
@@ -209,12 +193,11 @@
 import { ref } from "vue";
 import { publishGoods, listCatAndBrand } from "@/services/api/commodityManage/list";
 import { uploadPath } from "@/services/api/storage";
-import { ElMessageBox, ElMessage, ElNotification } from "element-plus";
+import { ElMessageBox, ElMessage } from "element-plus";
 import { listGoods } from "@/services/api/commodityManage/list";
 import { getDictList, getDictItemList } from '@/services/api/market/auxiliary'
 import richTextEditor from '@/components/richTextEditor.vue'
 import selectSpec from './components/selectSpec.vue'
-import { AnyColumn } from "element-plus/lib/components/table-v2/src/common";
 
 let shelvesDrawer = ref(false)
 let newKeywordVisible = ref(false);
@@ -310,10 +293,8 @@ let handleCancel = () => {
 
 let deleteData = [] as any //记录删除数据
 // deleteIndexData 记录被删除的数据， deleteIndex 记录被删除数据的索引
-let productsData = (data: any, deleteIndex: any, deleteIndexData: any) => {
+let productsData = (data: any) => {
     products.value = data
-    console.log(data, deleteIndex, deleteIndexData);
-
 }
 let handlePublish = () => {
     const finalGoods = {
@@ -325,9 +306,8 @@ let handlePublish = () => {
     publishGoods(finalGoods)
         .then((res: any) => {
             if (res.code === 200) {
-                ElNotification({
+                ElMessage({
                     type: 'success',
-                    title: "成功",
                     message: "创建成功",
                 });
                 emits('initShelves')
@@ -335,10 +315,8 @@ let handlePublish = () => {
             }
         })
         .catch((res) => {
-            ElMessageBox.alert("业务错误：" + res.msg, "警告", {
-                confirmButtonText: "确定",
-                type: "error",
-            });
+            console.log(res, '上架错误');
+
         });
 }
 let handleClose = (tag: any) => {
@@ -437,6 +415,7 @@ let handleSpecificationAdd = () => {
             }
             specForm.value.customSpec = false
             specVisiable.value = false;
+            dictSwitch.value = false
         } else {
             ElMessage({
                 type: 'warning',

src/views/marketManage/category.vue

@@ -12,13 +12,13 @@
 
             <el-table-column align="center" label="类目名" prop="name" />
 
-            <el-table-column align="center" property="iconUrl" label="类目图标">
+            <el-table-column align="center" prop="iconUrl" label="类目图标">
                 <template #default="scope">
                     <img v-if="scope.row.iconUrl" :src="scope.row.iconUrl" width="40" />
                 </template>
             </el-table-column>
 
-            <el-table-column align="center" property="picUrl" label="类目图片">
+            <el-table-column align="center" prop="picUrl" label="类目图片">
                 <template #default="scope">
                     <el-image :src="scope.row.picUrl" style="width: 100px; height: 40px" :preview-src-list="srcList"
                         preview-teleported :initial-index="scope.$index" />

src/views/marketManage/order.vue

@@ -194,18 +194,13 @@
                 </el-form-item>
             </el-form>
             <el-table :data="payForm.goodsList">
-                <el-table-column property="goodsName" label="商品" />
+                <el-table-column prop="goodsName" label="商品" />
                 <el-table-column label="规格">
                     <template #default="scope">
                         {{ scope.row.specifications.join('-') }}
                     </template>
                 </el-table-column>
-                <el-table-column property="onumber" width="100" label="下单数量" />
-                <!-- <el-table-column label="实际数量" width="100">
-                    <template #default="scope">
-                    <el-input-number v-model="scope.row.number" :min="0" :controls="false" />
-                    </template>
-                </el-table-column> -->
+                <el-table-column prop="onumber" width="100" label="下单数量" />
             </el-table>
             <template #footer class="dialog-footer">
                 <el-button @click="payDialogVisible = false">取消</el-button>
@@ -251,8 +246,7 @@
 
 <script setup lang='ts'>
 import { ref, reactive, nextTick } from 'vue'
-import moment from 'moment'
-import { ElMessage, ElMessageBox, ElNotification } from 'element-plus';
+import { ElMessageBox, ElNotification } from 'element-plus';
 import { detailOrder, listOrder, listChannel, refundOrder, payOrder, deleteOrder, shipOrder } from '@/services/api/market/order'
 import LitemallPage from "@/components/pagination/litemallPage.vue";
 
@@ -346,7 +340,6 @@ let getList = () => {
     }
     if (listQuery.orderId) {
         detailOrder(listQuery.orderId).then((res: any) => {
-            console.log(res, '订单');
             list.value = []
             if (res.data.order) {
                 list.value.push(res.data.order)
@@ -361,7 +354,6 @@ let getList = () => {
     } else {
         Reflect.deleteProperty(listQuery, 'timeArray')
         listOrder(listQuery).then((res: any) => {
-            console.log(res, '数据');
             list.value = res.data.list
             total.value = res.data.total
             listLoading.value = false

src/views/promotion/topic.vue

@@ -30,7 +30,7 @@
 
             <el-table-column align="center" label="专题子标题" min-width="200" prop="subtitle" />
 
-            <el-table-column align="center" property="picUrl" label="图片">
+            <el-table-column align="center" prop="picUrl" label="图片">
                 <template #default="scope">
                     <el-image :src="scope.row.picUrl" :preview-src-list="srcList" style="width: 40px; height: 40px"
                         preview-teleported :initial-index="scope.$index" />

src/views/promotion/topicCreate.vue

@@ -36,7 +36,7 @@
                 <el-table :data="goodsList" border fit highlight-current-row>
 
                     <el-table-column align="center" label="商品ID" prop="id" />
-                    <el-table-column align="center" property="picUrl" label="图片">
+                    <el-table-column align="center" prop="picUrl" label="图片">
                         <template #default="scope">
                             <img :src="scope.row.picUrl" width="60">
                         </template>
@@ -70,7 +70,7 @@
                 highlight-current-row @selection-change="handleSelectionChange">
                 <el-table-column type="selection" width="55" />
                 <el-table-column align="center" label="商品ID" prop="id" />
-                <el-table-column align="center" property="picUrl" label="图片">
+                <el-table-column align="center" prop="picUrl" label="图片">
                     <template #default="scope">
                         <img :src="scope.row.picUrl" width="40">
                     </template>

src/views/promotion/topicEdit.vue

@@ -36,7 +36,7 @@
                 <el-table :data="goodsList" border fit highlight-current-row>
 
                     <el-table-column align="center" label="商品ID" prop="id" />
-                    <el-table-column align="center" property="picUrl" label="图片">
+                    <el-table-column align="center" prop="picUrl" label="图片">
                         <template #default="scope">
                             <img :src="scope.row.picUrl" width="60">
                         </template>
@@ -70,7 +70,7 @@
                 highlight-current-row @selection-change="handleSelectionChange">
                 <el-table-column type="selection" width="55" />
                 <el-table-column align="center" label="商品ID" prop="id" />
-                <el-table-column align="center" property="picUrl" label="图片">
+                <el-table-column align="center" prop="picUrl" label="图片">
                     <template #default="scope">
                         <img :src="scope.row.picUrl" width="40">
                     </template>

vite.config.ts

@@ -89,11 +89,11 @@ export default ({ command, mode }) => {
         // '/foo': '',
         // 选项写法
         "/admin": {
-          target: "http://192.168.0.9:8089/",
+          target: "http://192.168.0.60:82/",
           //  rewrite: (path) => path.replace(/^\/api/, '') http://192.168.0.9:8089/
         },
         "/wx": {
-          target: "http://192.168.0.9:8089/",
+          target: "http://192.168.0.60:82/",
           //  rewrite: (path) => path.replace(/^\/api/, '')
         },
         // 正则表达式写法