修改打包配置,调试退料接收

This commit is contained in:
BianLzhaoMin 2024-06-04 17:02:36 +08:00
parent 24b6c7be6e
commit 55a471f328
4 changed files with 24 additions and 19 deletions

View File

@ -1,7 +1,7 @@
import { login, logout, getInfo, refreshToken, checkCode, loginByMall } from '@/api/login' import { login, logout, getInfo, refreshToken, checkCode, loginByMall } from '@/api/login'
import { getToken, setToken, setExpiresIn, removeToken } from '@/utils/auth' import { getToken, setToken, setExpiresIn, removeToken } from '@/utils/auth'
import { Notification, MessageBox, Message, Loading } from 'element-ui' import { Notification, MessageBox, Message, Loading } from 'element-ui'
import { encrypt} from '@/utils/jsencrypt' import { encrypt } from '@/utils/jsencrypt'
const user = { const user = {
state: { state: {
@ -42,6 +42,7 @@ const user = {
async Login({ commit }, userInfo) { async Login({ commit }, userInfo) {
const username = userInfo.username.trim() const username = userInfo.username.trim()
const password = encrypt(userInfo.password) const password = encrypt(userInfo.password)
// const password = userInfo.password
const code = userInfo.code const code = userInfo.code
const uuid = userInfo.uuid const uuid = userInfo.uuid
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {

View File

@ -4,7 +4,7 @@
// const qrUrl = 'http://112.29.103.165:21624/qrCode/qrCodePage?qrCode='; //宁夏 // const qrUrl = 'http://112.29.103.165:21624/qrCode/qrCodePage?qrCode='; //宁夏
// const qrUrl = 'https://z.csgmall.com.cn/gl/qrCode/qrCodePage?qrCode='; //南网 // const qrUrl = 'https://z.csgmall.com.cn/gl/qrCode/qrCodePage?qrCode='; //南网
const qrUrl = process.env.NODE_ENV === 'production' ? 'https://z.csgmall.com.cn/gl/qrCode/qrCodePage?qrCode=' : 'http://192.168.0.14:21624/qrCode/qrCodePage?qrCode=' const qrUrl = process.env.NODE_ENV === 'production' ? 'http://192.168.0.14:18866/qrCode/qrCodePage?qrCode=' : 'http://192.168.0.14:21624/qrCode/qrCodePage?qrCode='
export default { export default {
qrUrl, qrUrl,

View File

@ -1,23 +1,27 @@
<template> <template>
<div></div> <div></div>
<!-- <router-link :to="url" target="_blank"></router-link> --> <!-- <router-link :to="url" target="_blank"></router-link> -->
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
// url: '/new-page' // // url: '/new-page' //
}; }
}, },
created () { created() {
this.openNewWindow() this.openNewWindow()
this.$tab.closePage().then(() => { }); this.$tab.closePage().then(() => {})
}, },
methods: { methods: {
openNewWindow() { openNewWindow() {
window.open('http://192.168.0.14:21624/index01.html?token='+localStorage.getItem('token'), '_blank'); window.open(
} 'http://192.168.0.14:18866/index01.html?token=' +
} localStorage.getItem('token'),
}; '_blank',
</script> )
},
},
}
</script>

View File

@ -42,11 +42,11 @@ module.exports = {
// target: `https://test-cc.zhgkxt.com`,//线上环境-南网 // target: `https://test-cc.zhgkxt.com`,//线上环境-南网
// target: `https://z.csgmall.com.cn`, // target: `https://z.csgmall.com.cn`,
target: `http://10.40.92.52:28080`, //超 // target: `http://10.40.92.52:28080`, //超
// target: `http://10.40.92.81:8080`, //韩/ // target: `http://10.40.92.81:8080`, //韩/
// target: `http://10.40.92.74:8080`,//旭/ // target: `http://10.40.92.74:8080`,//旭/
// target: `http://10.40.92.140:28080`, //帅 // target: `http://10.40.92.140:28080`, //帅
// target: `http://10.40.92.14:28080`, //福 target: `http://10.40.92.253:28080`, //福
//******** 注意事项 ********* */ //******** 注意事项 ********* */
//1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址target; //1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址target;