wwl
/
bk-shop-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix bug

main
wwl 2024-04-09 11:22:15 +08:00
parent 56dbe18a6e
commit 8d5dfbc7b7
9 changed files with 64 additions and 750 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.env.development
View File

@ -3,7 +3,8 @@ VUE_APP_SYSTEM_NAME=platform
VUE_APP_PRODUCT_MODEL=platform VUE_APP_PRODUCT_MODEL=platform
# VUE_APP_BASE_API=https://ecshopx-shop.ex-sandbox.com/api # VUE_APP_BASE_API=https://ecshopx-shop.ex-sandbox.com/api
VUE_APP_BASE_API=/api VUE_APP_BASE_API=/api
VUE_APP_PROXY_API=http://47.103.169.154:8080/api # VUE_APP_PROXY_API=http://47.103.169.154:8080/api
VUE_APP_PROXY_API=https://slb.birkenstock.net.cn/api
# VUE_APP_PUBLIC_PATH=https://ecshopx-vshop.oss-cn-hangzhou.aliyuncs.com/ecshopx-admin # VUE_APP_PUBLIC_PATH=https://ecshopx-vshop.oss-cn-hangzhou.aliyuncs.com/ecshopx-admin
VUE_APP_PUBLIC_PATH=/ VUE_APP_PUBLIC_PATH=/
VUE_APP_WXIMG_URL= VUE_APP_WXIMG_URL=

2
.gitignore vendored
View File

@ -1,6 +1,8 @@
.DS_Store .DS_Store
node_modules/ node_modules/
dist/ dist/
dist-lsb.*
dist-test.*
npm-debug.log* npm-debug.log*
yarn-debug.log* yarn-debug.log*
yarn-error.log* yarn-error.log*

48
package-lock.json generated
View File

@ -9,7 +9,7 @@
"version": "3.13.10", "version": "3.13.10",
"dependencies": { "dependencies": {
"@riophae/vue-treeselect": "0.0.38", "@riophae/vue-treeselect": "0.0.38",
"@shopex/finder": "^1.0.50", "@shopex/finder": "^1.0.54",
"ali-oss": "^6.5.1", "ali-oss": "^6.5.1",
"aws-sdk": "^2.824.0", "aws-sdk": "^2.824.0",
"axios": "^0.19.2", "axios": "^0.19.2",
@ -65,7 +65,6 @@
"eslint-plugin-vue": "^6.2.2", "eslint-plugin-vue": "^6.2.2",
"exec-sh": "^0.4.0", "exec-sh": "^0.4.0",
"lint-staged": "^12.1.5", "lint-staged": "^12.1.5",
"node-sass-js-importer": "^4.0.2",
"prettier": "^2.5.1", "prettier": "^2.5.1",
"prettier-eslint": "^13.0.0", "prettier-eslint": "^13.0.0",
"prettier-eslint-cli": "^5.0.1", "prettier-eslint-cli": "^5.0.1",
@ -2424,9 +2423,9 @@
} }
}, },
"node_modules/@shopex/finder": { "node_modules/@shopex/finder": {
"version": "1.0.50", "version": "1.0.54",
"resolved": "http://registry.npm.ishopex.cn/@shopex%2ffinder/-/finder-1.0.50.tgz", "resolved": "http://registry.npm.ishopex.cn/@shopex%2ffinder/-/finder-1.0.54.tgz",
"integrity": "sha512-G+jIZXq2fvht4yKuX23zmmcejgtPi9S0oz+GuXuy6180d10LtfqkAkmM/aE4lrQVNnil0C4FXBuwUIhTte71Ow==", "integrity": "sha512-45suOmYWdAAp4tQjxdA7kj5eU+Ul562TipvnqzCf3igaSuQfHdHb6k5rQfF32VZJI5kvXE8CeYTvDfFbU4SE1Q==",
"dependencies": { "dependencies": {
"core-js": "^3.6.5", "core-js": "^3.6.5",
"element-ui": "^2.14.1", "element-ui": "^2.14.1",
@ -17240,22 +17239,6 @@
"dev": true, "dev": true,
"license": "MIT" "license": "MIT"
}, },
"node_modules/node-sass-js-importer": {
"version": "4.0.3",
"resolved": "https://registry.npmjs.org/node-sass-js-importer/-/node-sass-js-importer-4.0.3.tgz",
"integrity": "sha512-ychArWXht7YsVjOsbazwi6D0zQyJsebjB23P2PNxi0hCF7mubm9LMKrGq1FVI++IaojYIeoof+iwYL6dPCfBgQ==",
"dev": true,
"license": "MIT",
"dependencies": {
"is-plain-object": "^2.0.4"
},
"engines": {
"node": ">=6.0.0"
},
"peerDependencies": {
"node-sass": ">=3.5.3"
}
},
"node_modules/normalize-package-data": { "node_modules/normalize-package-data": {
"version": "2.5.0", "version": "2.5.0",
"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
@ -25893,8 +25876,8 @@
}, },
"node_modules/vue-reactive-provide": { "node_modules/vue-reactive-provide": {
"version": "0.3.0", "version": "0.3.0",
"resolved": "https://registry.npmmirror.com/vue-reactive-provide/-/vue-reactive-provide-0.3.0.tgz", "resolved": "http://registry.npm.ishopex.cn/vue-reactive-provide/-/vue-reactive-provide-0.3.0.tgz",
"integrity": "sha512-hx2JtRPRvne9NY4s1r7ASsCaO8CIby30qwC1kGQRxsrWApO3he+rziGOzTDSfvmr852zWMb11n6qAwHCz6C/vw==", "integrity": "sha1-/Q6STz2wzlFJ3vzJjbrEw+l6v68=",
"peerDependencies": { "peerDependencies": {
"vue": ">=2.6" "vue": ">=2.6"
} }
@ -29139,9 +29122,9 @@
} }
}, },
"@shopex/finder": { "@shopex/finder": {
"version": "1.0.50", "version": "1.0.54",
"resolved": "http://registry.npm.ishopex.cn/@shopex%2ffinder/-/finder-1.0.50.tgz", "resolved": "http://registry.npm.ishopex.cn/@shopex%2ffinder/-/finder-1.0.54.tgz",
"integrity": "sha512-G+jIZXq2fvht4yKuX23zmmcejgtPi9S0oz+GuXuy6180d10LtfqkAkmM/aE4lrQVNnil0C4FXBuwUIhTte71Ow==", "integrity": "sha512-45suOmYWdAAp4tQjxdA7kj5eU+Ul562TipvnqzCf3igaSuQfHdHb6k5rQfF32VZJI5kvXE8CeYTvDfFbU4SE1Q==",
"requires": { "requires": {
"core-js": "^3.6.5", "core-js": "^3.6.5",
"element-ui": "^2.14.1", "element-ui": "^2.14.1",
@ -40031,15 +40014,6 @@
"integrity": "sha512-XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg==", "integrity": "sha512-XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg==",
"dev": true "dev": true
}, },
"node-sass-js-importer": {
"version": "4.0.3",
"resolved": "https://registry.npmjs.org/node-sass-js-importer/-/node-sass-js-importer-4.0.3.tgz",
"integrity": "sha512-ychArWXht7YsVjOsbazwi6D0zQyJsebjB23P2PNxi0hCF7mubm9LMKrGq1FVI++IaojYIeoof+iwYL6dPCfBgQ==",
"dev": true,
"requires": {
"is-plain-object": "^2.0.4"
}
},
"normalize-package-data": { "normalize-package-data": {
"version": "2.5.0", "version": "2.5.0",
"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
@ -46433,8 +46407,8 @@
}, },
"vue-reactive-provide": { "vue-reactive-provide": {
"version": "0.3.0", "version": "0.3.0",
"resolved": "https://registry.npmmirror.com/vue-reactive-provide/-/vue-reactive-provide-0.3.0.tgz", "resolved": "http://registry.npm.ishopex.cn/vue-reactive-provide/-/vue-reactive-provide-0.3.0.tgz",
"integrity": "sha512-hx2JtRPRvne9NY4s1r7ASsCaO8CIby30qwC1kGQRxsrWApO3he+rziGOzTDSfvmr852zWMb11n6qAwHCz6C/vw==", "integrity": "sha1-/Q6STz2wzlFJ3vzJjbrEw+l6v68=",
"requires": {} "requires": {}
}, },
"vue-router": { "vue-router": {

8
package.json
View File

@ -6,15 +6,16 @@
"private": true, "private": true,
"repository": "https://git.ishopex.cn/ecshopx/ecshopx-admin.git", "repository": "https://git.ishopex.cn/ecshopx/ecshopx-admin.git",
"scripts": { "scripts": {
"build": "vue-cli-service build", "build": "vue-cli-service build --mode slb",
"build:slb": "vue-cli-service build", "build:slb": "vue-cli-service build --mode slb",
"build:test": "vue-cli-service build --mode test",
"dev": "vue-cli-service --model development serve", "dev": "vue-cli-service --model development serve",
"sh": "node ./cli.js", "sh": "node ./cli.js",
"lint": "prettier-eslint --write --list-different 'src/**/*.{js,vue}'" "lint": "prettier-eslint --write --list-different 'src/**/*.{js,vue}'"
}, },
"dependencies": { "dependencies": {
"@riophae/vue-treeselect": "0.0.38", "@riophae/vue-treeselect": "0.0.38",
"@shopex/finder": "^1.0.50", "@shopex/finder": "^1.0.54",
"ali-oss": "^6.5.1", "ali-oss": "^6.5.1",
"aws-sdk": "^2.824.0", "aws-sdk": "^2.824.0",
"axios": "^0.19.2", "axios": "^0.19.2",
@ -70,7 +71,6 @@
"eslint-plugin-vue": "^6.2.2", "eslint-plugin-vue": "^6.2.2",
"exec-sh": "^0.4.0", "exec-sh": "^0.4.0",
"lint-staged": "^12.1.5", "lint-staged": "^12.1.5",
"node-sass-js-importer": "^4.0.2",
"prettier": "^2.5.1", "prettier": "^2.5.1",
"prettier-eslint": "^13.0.0", "prettier-eslint": "^13.0.0",
"prettier-eslint-cli": "^5.0.1", "prettier-eslint-cli": "^5.0.1",

713
pnpm-lock.yaml
View File

File diff suppressed because it is too large Load Diff

14
src/components/sp-picker/pickers/picker-goods.vue
View File

@ -70,6 +70,9 @@
/> />
</el-select> </el-select>
</SpFilterFormItem> </SpFilterFormItem>
<!-- <SpFilterFormItem prop="keywords">
<el-input v-model="formData.item_name_3" placeholder="输入内部货号" />
</SpFilterFormItem> -->
<SpFilterFormItem prop="category"> <SpFilterFormItem prop="category">
<el-cascader <el-cascader
v-model="formData.category" v-model="formData.category"
@ -117,9 +120,18 @@
} }
}) })
]), ]),
h('div', { class: 'item-name' }, row.itemName) h('div', { class: 'flex-col' }, [
h('div', { class: 'item-name' }, row.itemName),
h('div', { class: 'item-name' }, row.item_name_2)
])
]) ])
}, },
{
name: '内部货号',
key: 'item_name_3',
width: 100,
render: (h, { row }) => h('span', {}, row.item_name_3)
},
{ {
name: '价格（¥）', name: '价格（¥）',
key: 'price', key: 'price',

23
src/view/auth/login.vue
View File

@ -90,8 +90,8 @@ export default {
size: 0, size: 0,
activeName: 'first', activeName: 'first',
form: { form: {
account: '15026786768', account: '',
checkPass: 'shopex666' checkPass: ''
}, },
loginType: 'admin', loginType: 'admin',
rules: { rules: {
@ -105,21 +105,30 @@ export default {
}, },
watch: { watch: {
activeName(val) { activeName(val) {
const isLab = process.env.VUE_APP_SLB_MODE
if (val == 'second') { if (val == 'second') {
this.loginType = 'staff' this.loginType = 'staff'
this.form = { this.form = {
account: '15026787266', account: isLab ? '' : '15026787266',
checkPass: '15026787266' checkPass: isLab ? '' : '15026787266'
} }
} else { } else {
this.loginType = 'admin' this.loginType = 'admin'
this.form = { this.form = {
account: '15026786768', account: isLab ? '' : '15026786768',
checkPass: 'shopex666' checkPass: isLab ? '' : 'shopex666'
} }
} }
} }
}, },
created() {
if (!process.env.VUE_APP_SLB_MODE) {
this.form = {
account: '15026786768',
checkPass: 'shopex666'
}
}
},
mounted() { mounted() {
window.addEventListener('resize', this.fnSize()) window.addEventListener('resize', this.fnSize())
this.SET_VERSION_MODE(this.VUE_APP_PRODUCT_MODEL) this.SET_VERSION_MODE(this.VUE_APP_PRODUCT_MODEL)

1
src/view/member/selfservice/registrationactivity.vue
View File

@ -84,6 +84,7 @@
/> --> /> -->
<el-image <el-image
v-for="item in JSON.parse(dataInfo.pics)" v-for="item in JSON.parse(dataInfo.pics)"
:key="item"
class="img-content" class="img-content"
style="width: 100px; height: 100px" style="width: 100px; height: 100px"
:src="item" :src="item"

2
vue.config.js
View File

@ -38,7 +38,7 @@ module.exports = {
} }
}, },
configureWebpack: config => { configureWebpack: config => {
if (process.env.NODE_ENV !== 'production') { if (process.env.NODE_ENV !== 'production' && process.env.NODE_ENV !== 'slb') {
config.devtool = 'eval-source-map' config.devtool = 'eval-source-map'
} }
if (process.env.VUE_APP_OSS_CDN == 'true') { if (process.env.VUE_APP_OSS_CDN == 'true') {