diff --git a/.prettierrc.js b/.prettierrc.js deleted file mode 100644 index cf9b8f56..00000000 --- a/.prettierrc.js +++ /dev/null @@ -1,33 +0,0 @@ -/** @type {import('prettier').Config} */ -module.exports = { - // 打印宽度 - printWidth: 100, - // 使用 4 空格缩进 - tabWidth: 4, - // 使用 4 空格缩进,不使用制表符 - useTabs: true, - // 行尾使用 LF (Unix 风格) - endOfLine: 'lf', - // 语句末尾使用分号 - semi: false, - // 使用单引号 - singleQuote: false, - // 对象和数组末尾不添加尾随逗号 - trailingComma: 'none', - // JSX 引号使用单引号 - jsxSingleQuote: false, - // 括号内侧空格 - bracketSpacing: true, - // JSX 标签不换行 - bracketSameLine: false, - // 箭头函数参数始终使用括号 - arrowParens: 'always', - // HTML、Vue、Angular 和 Markdown 使用 LF - htmlWhitespaceSensitivity: 'css', - // Vue 文件脚本和样式缩进 - vueIndentScriptAndStyle: false, - // 行注释位置在注释上方,不加空格 - proseWrap: 'preserve', - // 根据文件类型自动推断 - embeddedLanguageFormatting: 'auto', -}; \ No newline at end of file diff --git a/.prettierrc.json b/.prettierrc.json new file mode 100644 index 00000000..71409922 --- /dev/null +++ b/.prettierrc.json @@ -0,0 +1,17 @@ +{ + "printWidth": 100, + "tabWidth": 4, + "useTabs": true, + "endOfLine": "lf", + "semi": false, + "singleQuote": false, + "trailingComma": "none", + "jsxSingleQuote": false, + "bracketSpacing": true, + "bracketSameLine": false, + "arrowParens": "always", + "htmlWhitespaceSensitivity": "css", + "vueIndentScriptAndStyle": true, + "proseWrap": "preserve", + "embeddedLanguageFormatting": "auto" +} diff --git a/src/store/seller/index.ts b/src/store/seller/index.ts index 3ca93278..a72b3227 100644 --- a/src/store/seller/index.ts +++ b/src/store/seller/index.ts @@ -49,8 +49,11 @@ const seller: Module = { }, set_designerInfo(state: Seller, value: DesignerInfo) { state.designerInfo = { + ...state.designerInfo, ...value, - socialLinks: JSON.parse(value.socialLinks) + } + if (value.socialLinks) { + state.designerInfo.socialLinks = JSON.parse(value.socialLinks) } }, }, diff --git a/src/tool/https.js b/src/tool/https.js index 3c734e5a..f88c16ca 100644 --- a/src/tool/https.js +++ b/src/tool/https.js @@ -474,6 +474,7 @@ export const Https = { // 卖家端接口 + sellerUploadFile: '/seller/file/upload', // 卖家上传文件 checkSellerDesigner: '/seller/designer/check', // 检查卖家是否为设计师 getSellerApplyStatus: '/seller/designer/apply/status', // 获取卖家申请状态 submitSellerApply: '/seller/designer/apply', // 提交卖家申请 @@ -483,7 +484,8 @@ export const Https = { getSellerOrderList: '/seller/order/page', // 获取卖家订单列表 getListingPopup: '/seller/listing/popup/check', // 获取是否勾选发布作品提示 setListingPopup: '/seller/listing/popup/set', // 设置是否勾选发布作品提示 - + getListingList: '/seller/listing/page', // 获取商品列表,发布和未发布 + putListingStatus: '/seller/listing/status', // 更新商品状态 }, axiosGet(url, config, pathParams) { diff --git a/src/views/SellerDashboard/BrandProfile/image-clip.vue b/src/views/SellerDashboard/BrandProfile/image-clip.vue index 14ce35b3..ffeb2f9f 100644 --- a/src/views/SellerDashboard/BrandProfile/image-clip.vue +++ b/src/views/SellerDashboard/BrandProfile/image-clip.vue @@ -12,7 +12,6 @@ centerBox @realTime="onChange" outputType="png" - v-bind="bindProps" >
@@ -35,357 +34,351 @@
diff --git a/src/views/SellerDashboard/BrandProfile/index.vue b/src/views/SellerDashboard/BrandProfile/index.vue index aed75777..cfc73960 100644 --- a/src/views/SellerDashboard/BrandProfile/index.vue +++ b/src/views/SellerDashboard/BrandProfile/index.vue @@ -25,8 +25,8 @@
- +
@@ -234,725 +238,730 @@ diff --git a/src/views/SellerDashboard/MyOrders/index.vue b/src/views/SellerDashboard/MyOrders/index.vue index 53e5f93b..23293aea 100644 --- a/src/views/SellerDashboard/MyOrders/index.vue +++ b/src/views/SellerDashboard/MyOrders/index.vue @@ -65,7 +65,9 @@
-
no data
+
+ +