Merge branch 'master' of http://60.204.229.151:20080/chenkangxu/merchant-web
continuous-integration/drone/push Build was killed
Details
continuous-integration/drone/push Build was killed
Details
This commit is contained in:
KangKang0928
commit
b9c0ae1499
|
|
@ -0,0 +1,38 @@
|
|||
kind: pipeline
|
||||
type: docker
|
||||
name: build
|
||||
|
||||
steps:
|
||||
- name: build
|
||||
image: node:18.20.3-alpine
|
||||
pull: if-not-exists
|
||||
volumes:
|
||||
- name: cache
|
||||
path: /drone/src/.pnpm-store
|
||||
- name: node-build
|
||||
path: /app/build
|
||||
commands: ## 此处自己定义项目工程的构建命令
|
||||
- npm install -g pnpm
|
||||
- pnpm i
|
||||
- pnpm run build:prod
|
||||
- ls -l
|
||||
- cp -r dist /app/build/
|
||||
when: ## 定义在什么情况下触发构建任务
|
||||
branch: master #定义在哪个分支触发构建任务
|
||||
- name: scp
|
||||
image: appleboy/drone-scp
|
||||
volumes:
|
||||
- name: node-build
|
||||
path: /app/build
|
||||
settings:
|
||||
host: 60.204.138.3
|
||||
username: root
|
||||
password: 5xhqamyZ
|
||||
port: 22
|
||||
target: /data/app/dmjs-merchant-admin
|
||||
source: /app/build/dist
|
||||
overwrite: true
|
||||
volumes:
|
||||
- name: node-build
|
||||
host:
|
||||
path: /data/app/dmjs-merchant-admin
|
||||
|
|
@ -38,6 +38,7 @@
|
|||
"dependencies": {
|
||||
"@micro-zoe/micro-app": "^1.0.0-rc.5",
|
||||
"@riophae/vue-treeselect": "0.4.0",
|
||||
"@vue/babel-helper-vue-jsx-merge-props": "^1.4.0",
|
||||
"axios": "0.24.0",
|
||||
"clipboard": "2.0.8",
|
||||
"compressorjs": "^1.1.1",
|
||||
|
|
@ -52,14 +53,17 @@
|
|||
"js-beautify": "1.13.0",
|
||||
"js-cookie": "3.0.1",
|
||||
"jsencrypt": "3.0.0-rc.1",
|
||||
"lodash": "^4.17.21",
|
||||
"mockjs": "^1.1.0",
|
||||
"nprogress": "0.2.0",
|
||||
"obj-modal": "^1.2.2",
|
||||
"obj-table-plus": "^2.4.0",
|
||||
"qs": "^6.13.0",
|
||||
"quill": "1.3.7",
|
||||
"screenfull": "5.0.2",
|
||||
"signature_pad": "^3.0.0-beta.4",
|
||||
"sortablejs": "1.10.2",
|
||||
"throttle-debounce": "^5.0.2",
|
||||
"video.js": "^7.20.3",
|
||||
"vue": "^2.7.16",
|
||||
"vue-amap": "^0.5.10",
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
window.SITE_CONFIG = {};
|
||||
|
||||
// 在线api接口请求地址
|
||||
window.SITE_CONFIG['baseUrl'] ="http://admin-test.damajishi.cn:8899"
|
||||
window.SITE_CONFIG['baseUrl'] ="https://admin-test.damajishi.cn"
|
||||
|
||||
// cdn地址 = 域名 + 版本号
|
||||
window.SITE_CONFIG['domain'] = './'; // 域名
|
||||
|
|
|
|||
|
|
@ -118,13 +118,6 @@ export default {
|
|||
></el-input-number>
|
||||
<span> 提示： 请输入≤9.9数字 如:8折=售价*0.8</span>
|
||||
</div>
|
||||
// <el-input
|
||||
// type="number"
|
||||
// min={0}
|
||||
// max={9.9}
|
||||
// v-model={this.modalData.discount}
|
||||
// placeholder="请输入≤9.9数字 如:8折=售价*0.8"
|
||||
// ></el-input>
|
||||
);
|
||||
},
|
||||
},
|
||||
|
|
@ -133,7 +126,7 @@ export default {
|
|||
prop: "limitCount",
|
||||
type: "Input",
|
||||
width: "300px",
|
||||
// rules: { required: true, message: "请输入价格" },
|
||||
rules: { required: true, message: "请输入价格" },
|
||||
type: "jsx",
|
||||
render: () => {
|
||||
return (
|
||||
|
|
|
|||
|
|
@ -288,6 +288,8 @@ export default {
|
|||
},
|
||||
//获取属性
|
||||
getSpecs(tableData, AttributeData, salePrice, stockNum) {
|
||||
console.log(tableData);
|
||||
|
||||
this.modalData.specType = 1;
|
||||
let AttributeList = AttributeData.map((item) => {
|
||||
return {
|
||||
|
|
|
|||
|
|
@ -189,6 +189,7 @@ export default {
|
|||
this.AttributeData[index].attributeValue.indexOf(tag),
|
||||
1
|
||||
);
|
||||
this.calculation();
|
||||
},
|
||||
//聚焦
|
||||
showInput(index) {
|
||||
|
|
@ -230,13 +231,31 @@ export default {
|
|||
for (let i = 0; i < this.AttributeData.length; i++) {
|
||||
if (i == 0) {
|
||||
data = this.AttributeData[i].attributeValue.map((item) => {
|
||||
return this.AttributeData[i].attributeName + item;
|
||||
return {
|
||||
attributeList: [
|
||||
{
|
||||
attributeName: this.AttributeData[i].attributeName,
|
||||
attributeValue: item,
|
||||
},
|
||||
],
|
||||
name: item,
|
||||
};
|
||||
});
|
||||
} else {
|
||||
data.forEach((it) => {
|
||||
this.AttributeData[i].attributeValue.forEach((e) => {
|
||||
let name = this.AttributeData[i].attributeName;
|
||||
list.push(it + "/" + name + e);
|
||||
console.log(it.attributeList);
|
||||
let attributeList = JSON.parse(JSON.stringify(it.attributeList));
|
||||
attributeList.push({
|
||||
attributeName: this.AttributeData[i].attributeName,
|
||||
attributeValue: e,
|
||||
});
|
||||
list.push({
|
||||
attributeList,
|
||||
name: it.name + e,
|
||||
});
|
||||
console.log(list);
|
||||
// list.push(it + e);
|
||||
});
|
||||
});
|
||||
data = list;
|
||||
|
|
@ -245,7 +264,8 @@ export default {
|
|||
}
|
||||
this.tableData = data.map((item) => {
|
||||
return {
|
||||
attributeValue: item,
|
||||
attributeList: item.attributeList,
|
||||
attributeValue: item.name,
|
||||
salePrice: 0,
|
||||
costPrice: 0,
|
||||
stockNum: 0,
|
||||
|
|
@ -398,8 +418,8 @@ export default {
|
|||
disabled: () => this.tableData.length <= 0,
|
||||
// submit: true,
|
||||
handle: () => {
|
||||
let volume = "" //重量
|
||||
let weight = "" //体积
|
||||
let volume = ""; //重量
|
||||
let weight = ""; //体积
|
||||
let salePrice = ""; //价格范围
|
||||
let stockNum = ""; //库存范围
|
||||
let minSalePrice = Math.min.apply(
|
||||
|
|
|
|||
262
vue.config.js
262
vue.config.js
|
|
@ -1,131 +1,131 @@
|
|||
'use strict'
|
||||
const path = require('path')
|
||||
|
||||
function resolve(dir) {
|
||||
return path.join(__dirname, dir)
|
||||
}
|
||||
|
||||
const CompressionPlugin = require('compression-webpack-plugin')
|
||||
|
||||
const name = process.env.VUE_APP_TITLE || '大妈集市商户端' // 网页标题
|
||||
|
||||
const port = process.env.port || process.env.npm_config_port || 80 // 端口
|
||||
|
||||
// vue.config.js 配置说明
|
||||
//官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
|
||||
// 这里只列一部分，具体配置参考文档
|
||||
module.exports = {
|
||||
// 部署生产环境和开发环境下的URL。
|
||||
// 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
|
||||
// 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.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,
|
||||
runtimeCompiler: true,
|
||||
// webpack-dev-server 相关配置
|
||||
devServer: {
|
||||
host: '0.0.0.0',
|
||||
port: 4000,
|
||||
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]: ''
|
||||
}
|
||||
}
|
||||
},
|
||||
disableHostCheck: true
|
||||
},
|
||||
css: {
|
||||
loaderOptions: {
|
||||
sass: {
|
||||
sassOptions: { outputStyle: "expanded" }
|
||||
}
|
||||
}
|
||||
},
|
||||
configureWebpack: {
|
||||
name: name,
|
||||
resolve: {
|
||||
alias: {
|
||||
'@': resolve('src')
|
||||
}
|
||||
},
|
||||
plugins: [
|
||||
// http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#使用gzip解压缩静态文件
|
||||
new CompressionPlugin({
|
||||
cache: false, // 不启用文件缓存
|
||||
test: /\.(js|css|html|jpe?g|png|gif|svg)?$/i, // 压缩文件格式
|
||||
filename: '[path][base].gz[query]', // 压缩后的文件名
|
||||
algorithm: 'gzip', // 使用gzip压缩
|
||||
minRatio: 0.8, // 压缩比例，小于 80% 的文件不会被压缩
|
||||
deleteOriginalAssets: false // 压缩后删除原文件
|
||||
})
|
||||
],
|
||||
},
|
||||
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/icons'))
|
||||
.end()
|
||||
config.module
|
||||
.rule('icons')
|
||||
.test(/\.svg$/)
|
||||
.include.add(resolve('src/icons'))
|
||||
.end()
|
||||
.use('svg-sprite-loader')
|
||||
.loader('svg-sprite-loader')
|
||||
.options({
|
||||
symbolId: '[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
|
||||
test: /[\\/]node_modules[\\/]_?element-ui(.*)/, // in order to adapt to cnpm
|
||||
priority: 20 // the weight needs to be larger than libs and app or it will be packaged into libs or app
|
||||
},
|
||||
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')
|
||||
})
|
||||
}
|
||||
}
|
||||
'use strict'
|
||||
const path = require('path')
|
||||
|
||||
function resolve(dir) {
|
||||
return path.join(__dirname, dir)
|
||||
}
|
||||
|
||||
const CompressionPlugin = require('compression-webpack-plugin')
|
||||
|
||||
const name = process.env.VUE_APP_TITLE || '大妈集市商户端' // 网页标题
|
||||
|
||||
const port = process.env.port || process.env.npm_config_port || 80 // 端口
|
||||
|
||||
// vue.config.js 配置说明
|
||||
//官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
|
||||
// 这里只列一部分，具体配置参考文档
|
||||
module.exports = {
|
||||
// 部署生产环境和开发环境下的URL。
|
||||
// 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
|
||||
// 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
|
||||
publicPath: process.env.NODE_ENV === "production" ? "/merchant-admin" : "/",
|
||||
// 在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,
|
||||
runtimeCompiler: true,
|
||||
// webpack-dev-server 相关配置
|
||||
devServer: {
|
||||
host: '0.0.0.0',
|
||||
port: 4000,
|
||||
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]: ''
|
||||
}
|
||||
}
|
||||
},
|
||||
disableHostCheck: true
|
||||
},
|
||||
css: {
|
||||
loaderOptions: {
|
||||
sass: {
|
||||
sassOptions: { outputStyle: "expanded" }
|
||||
}
|
||||
}
|
||||
},
|
||||
configureWebpack: {
|
||||
name: name,
|
||||
resolve: {
|
||||
alias: {
|
||||
'@': resolve('src')
|
||||
}
|
||||
},
|
||||
plugins: [
|
||||
// http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#使用gzip解压缩静态文件
|
||||
new CompressionPlugin({
|
||||
cache: false, // 不启用文件缓存
|
||||
test: /\.(js|css|html|jpe?g|png|gif|svg)?$/i, // 压缩文件格式
|
||||
filename: '[path][base].gz[query]', // 压缩后的文件名
|
||||
algorithm: 'gzip', // 使用gzip压缩
|
||||
minRatio: 0.8, // 压缩比例，小于 80% 的文件不会被压缩
|
||||
deleteOriginalAssets: false // 压缩后删除原文件
|
||||
})
|
||||
],
|
||||
},
|
||||
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/icons'))
|
||||
.end()
|
||||
config.module
|
||||
.rule('icons')
|
||||
.test(/\.svg$/)
|
||||
.include.add(resolve('src/icons'))
|
||||
.end()
|
||||
.use('svg-sprite-loader')
|
||||
.loader('svg-sprite-loader')
|
||||
.options({
|
||||
symbolId: '[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
|
||||
test: /[\\/]node_modules[\\/]_?element-ui(.*)/, // in order to adapt to cnpm
|
||||
priority: 20 // the weight needs to be larger than libs and app or it will be packaged into libs or app
|
||||
},
|
||||
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')
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue