diff --git a/.env.development b/.env.development index b77ccb9..c4939ef 100644 --- a/.env.development +++ b/.env.development @@ -1,12 +1,12 @@ # 页面标题 -VUE_APP_TITLE = 全医通护理站管理平台 +VUE_APP_TITLE = 泉医通护理站管理平台 # 开发环境配置 ENV = 'development' -# 全医通护理站管理平台/开发环境 +# 泉医通护理站管理平台/开发环境 # VUE_APP_BASE_API = '/dev-api' -VUE_APP_BASE_API = 'http://192.168.16.49:8080' +VUE_APP_BASE_API = 'http://192.168.16.30:8080' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/.env.production b/.env.production index efbafa1..a07777e 100644 --- a/.env.production +++ b/.env.production @@ -1,8 +1,8 @@ # 页面标题 -VUE_APP_TITLE = 全医通护理站管理平台 +VUE_APP_TITLE = 泉医通护理站管理平台 # 生产环境配置 ENV = 'production' -# 全医通护理站管理平台/生产环境 +# 泉医通护理站管理平台/生产环境 VUE_APP_BASE_API = '/prod-api' diff --git a/.env.staging b/.env.staging index af99706..ad9db97 100644 --- a/.env.staging +++ b/.env.staging @@ -1,10 +1,10 @@ # 页面标题 -VUE_APP_TITLE = 全医通护理站管理平台 +VUE_APP_TITLE = 泉医通护理站管理平台 NODE_ENV = production # 测试环境配置 ENV = 'staging' -# 全医通护理站管理平台/测试环境 +# 泉医通护理站管理平台/测试环境 VUE_APP_BASE_API = '/stage-api' diff --git a/src/api/baseurl.js b/src/api/baseurl.js index 6dfdae9..8998a23 100644 --- a/src/api/baseurl.js +++ b/src/api/baseurl.js @@ -1,3 +1,3 @@ -var baseurl = "http://192.168.16.49:8080"; +var baseurl = "http://192.168.16.30:8080"; -export default baseurl +export default baseurl \ No newline at end of file diff --git a/src/api/system/goodsCategory.js b/src/api/system/goodsCategory.js new file mode 100644 index 0000000..afa3b3f --- /dev/null +++ b/src/api/system/goodsCategory.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询商品分类信息列表 +export function listGoodsCategory(query) { + return request({ + url: '/system/goodsCategory/list', + method: 'get', + params: query + }) +} + +// 查询商品分类信息详细 +export function getGoodsCategory(id) { + return request({ + url: '/system/goodsCategory/' + id, + method: 'get' + }) +} + +// 新增商品分类信息 +export function addGoodsCategory(data) { + return request({ + url: '/system/goodsCategory/add', + method: 'post', + data: data + }) +} + +// 修改商品分类信息 +export function updateGoodsCategory(data) { + return request({ + url: '/system/goodsCategory/edit', + method: 'POST', + data: data + }) +} + +// 删除商品分类信息 +export function delGoodsCategory(id) { + return request({ + url: '/system/goodsCategory/' + id, + method: 'POST' + }) +} \ No newline at end of file diff --git a/src/views/system/goodsCategory/index.vue b/src/views/system/goodsCategory/index.vue new file mode 100644 index 0000000..f6e03c5 --- /dev/null +++ b/src/views/system/goodsCategory/index.vue @@ -0,0 +1,389 @@ + + + diff --git a/src/views/system/goodsInfo/index.vue b/src/views/system/goodsInfo/index.vue index 482c0e3..9e3ab19 100644 --- a/src/views/system/goodsInfo/index.vue +++ b/src/views/system/goodsInfo/index.vue @@ -128,7 +128,7 @@ @selection-change="handleSelectionChange" > - - - + + 修改 - @@ -339,16 +333,17 @@ @@ -800,6 +795,15 @@ export default { updateBy: null, updateTime: null, }; + this.goodDetailsLists = [ + { + attributePitureUrl: "", + goodsPrice: "", + goodsStock: "", + sort: "", + ids: 9999999, + }, + ]; this.resetForm("form"); }, /** 搜索按钮操作 */ @@ -823,7 +827,6 @@ export default { handleAdd() { this.reset(); this.title = "商品基本信息"; - console.log(this.ids); this.goodDetailsLists = [ { attributePitureUrl: "", @@ -841,7 +844,9 @@ export default { const id = row.goodsInfoId || this.ids; getGoodsInfo(id).then((response) => { this.form = response.data[0]; - this.goodDetailsLists = response.data[0].goodAttributeDetailsLists; + if (response.data[0].goodAttributeDetailsLists) { + this.goodDetailsLists = response.data[0].goodAttributeDetailsLists; + } this.open = true; this.title = "修改商品基本信息"; }); @@ -885,17 +890,13 @@ export default { }); }, /** 删除按钮操作 */ - handleDelete(row) { - console.log('row :>> ', row); - this.$confirm( - '是否确认删除订单信息的数据项？', - "提示", - { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - } - ) + handleDelete(row) { + console.log("row :>> ", row); + this.$confirm("是否确认删除订单信息的数据项？", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) .then(() => { delGoodsInfo(row.goodsInfoId).then((res) => { this.$message.success("删除成功"); diff --git a/src/views/system/station/index.vue b/src/views/system/station/index.vue index 8bdd9d5..f753c20 100644 --- a/src/views/system/station/index.vue +++ b/src/views/system/station/index.vue @@ -145,7 +145,7 @@ >修改 - + { - config - .plugin('ScriptExtHtmlWebpackPlugin') - .after('html') - .use('script-ext-html-webpack-plugin', [{ - // `runtime` must same as runtimeChunk name. default is `runtime` - inline: /runtime\..*\.js$/ - }]) - .end() - config - .optimization.splitChunks({ - chunks: 'all', - cacheGroups: { - libs: { - name: 'chunk-libs', - test: /[\\/]node_modules[\\/]/, - priority: 10, - chunks: 'initial' // only package third parties that are initially dependent - }, - elementUI: { - name: 'chunk-elementUI', // split elementUI into a single package - priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app - test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm - }, - commons: { - name: 'chunk-commons', - test: resolve('src/components'), // can customize your rules - minChunks: 3, // minimum common number - priority: 5, - reuseExistingChunk: true + // 部署生产环境和开发环境下的URL。 + // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上 + // 例如 https://www.xinyilu.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.xinyilu.vip/admin/，则设置 baseUrl 为 /admin/。 + publicPath: process.env.NODE_ENV === "production" ? "/" : "/", + // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist） + outputDir: 'dist', + // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下） + assetsDir: 'static', + // 是否开启eslint保存检测，有效值：ture | false | 'error' + lintOnSave: process.env.NODE_ENV === 'development', + // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。 + productionSourceMap: false, + // webpack-dev-server 相关配置 + devServer: { + host: '0.0.0.0', + port: port, + open: true, + proxy: { + // detail: https://cli.vuejs.org/config/#devserver-proxy + [process.env.VUE_APP_BASE_API]: { + target: `http://localhost:8080`, + changeOrigin: true, + pathRewrite: { + ['^' + process.env.VUE_APP_BASE_API]: '' } - } - }) - config.optimization.runtimeChunk('single'), - { - from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件 - to: './' //到根目录下 - } + } + }, + disableHostCheck: true + }, + css: { + loaderOptions: { + sass: { + sassOptions: { outputStyle: "expanded" } + } } - ) - } -} + }, + configureWebpack: { + name: name, + resolve: { + alias: { + '@': resolve('src') + } + }, + plugins: [ + // http://doc.xinyilu.vip/xinyilu-vue/other/faq.html#使用gzip解压缩静态文件 + new CompressionPlugin({ + cache: false, // 不启用文件缓存 + test: /\.(js|css|html)?$/i, // 压缩文件格式 + filename: '[path].gz[query]', // 压缩后的文件名 + algorithm: 'gzip', // 使用gzip压缩 + minRatio: 0.8 // 压缩率小于1才会压缩 + }) + ], + }, + chainWebpack(config) { + config.plugins.delete('preload') // TODO: need test + config.plugins.delete('prefetch') // TODO: need test + + // set svg-sprite-loader + config.module + .rule('svg') + .exclude.add(resolve('src/assets/icons')) + .end() + config.module + .rule('icons') + .test(/\.svg$/) + .include.add(resolve('src/assets/icons')) + .end() + .use('svg-sprite-loader') + .loader('svg-sprite-loader') + .options({ + symbolId: 'icon-[name]' + }) + .end() + + config + .when(process.env.NODE_ENV !== 'development', + config => { + config + .plugin('ScriptExtHtmlWebpackPlugin') + .after('html') + .use('script-ext-html-webpack-plugin', [{ + // `runtime` must same as runtimeChunk name. default is `runtime` + inline: /runtime\..*\.js$/ + }]) + .end() + config + .optimization.splitChunks({ + chunks: 'all', + cacheGroups: { + libs: { + name: 'chunk-libs', + test: /[\\/]node_modules[\\/]/, + priority: 10, + chunks: 'initial' // only package third parties that are initially dependent + }, + elementUI: { + name: 'chunk-elementUI', // split elementUI into a single package + priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app + test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm + }, + commons: { + name: 'chunk-commons', + test: resolve('src/components'), // can customize your rules + minChunks: 3, // minimum common number + priority: 5, + reuseExistingChunk: true + } + } + }) + config.optimization.runtimeChunk('single'), { + from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件 + to: './' //到根目录下 + } + } + ) + } +} \ No newline at end of file