Commit d425e767 authored by 罗成兵's avatar 罗成兵

更换域名

parent 886f7d42
...@@ -29,5 +29,8 @@ ...@@ -29,5 +29,8 @@
/node_modules/* /node_modules/*
/folacin-app/node_modules/ /folacin-app/node_modules/
/folacin-pc/node_modules/ /folacin-pc/node_modules/
/folacin-app/dist/ /folacin-app/folacin-app-dist/
/folacin-pc/dist/ /folacin-app/folacin-app-dist.zip
/folacin-pc/folacin-pc-dist/
/folacin-pc/folacin-pc-dist.zip
NODE_ENV = dev NODE_ENV = dev
VUE_APP_BASE_URL222 = https://beta-ysservice.yiboshi.com VUE_APP_BASE_URL222 = https://beta-ysservice.zmnyjk.com
VUE_APP_BASE_URL= http://127.0.0.1:8083 VUE_APP_BASE_URL= http://127.0.0.1:8083
\ No newline at end of file
NODE_ENV = test NODE_ENV = test
VUE_APP_BASE_URL = https://beta-ysservice.yiboshi.com VUE_APP_BASE_URL = https://beta-ysservice.zmnyjk.com
This diff is collapsed.
...@@ -124,12 +124,17 @@ export default { ...@@ -124,12 +124,17 @@ export default {
handleBack() { handleBack() {
callMobile('goIndex', {}); callMobile('goIndex', {});
}, },
scanQRCallBack(unitId) { scanQRCallBack(qrContent) {
if (!unitId) { if (!qrContent) {
this.$toast.success('无效的二维码'); this.$toast.success('无效的二维码');
return; return;
} }
getProvideUnitById(unitId).then(res => { let qrContentArr = qrContent.split("?");
if (qrContentArr.length < 2) {
this.$toast.success('无效的二维码');
return;
}
getProvideUnitById(qrContentArr[1]).then(res => {
if (res.code === 'SUCCESS') { if (res.code === 'SUCCESS') {
if (res.data) { if (res.data) {
let areaFullName = res.data.areaFullName ? res.data.areaFullName : ""; let areaFullName = res.data.areaFullName ? res.data.areaFullName : "";
...@@ -164,43 +169,43 @@ export default { ...@@ -164,43 +169,43 @@ export default {
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.provideUnit { .provideUnit {
padding-top: 52px; padding-top: 52px;
.flex_block { .flex_block {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
margin: 24px 24px 24px 16px; margin: 24px 24px 24px 16px;
.flex_block_title { .flex_block_title {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
width: 90%; width: 90%;
.top { .top {
color: #262626; color: #262626;
font-size: 14px; font-size: 14px;
} }
.bottom { .bottom {
color: #595959; color: #595959;
font-size: 12px; font-size: 12px;
margin-top: 7px; margin-top: 7px;
} }
} }
.flex_block_btn { .flex_block_btn {
width: 48px; width: 48px;
height: 25px; height: 25px;
border: 1px solid #F5222D; border: 1px solid #F5222D;
border-radius: 24px; border-radius: 24px;
font-size: 12px; font-size: 12px;
color: #F5222D; color: #F5222D;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
margin-left: 8px; margin-left: 8px;
}
} }
}
} }
</style> </style>
\ No newline at end of file
...@@ -5,7 +5,7 @@ module.exports = { ...@@ -5,7 +5,7 @@ module.exports = {
runtimeCompiler: true, runtimeCompiler: true,
indexPath: "index.html", indexPath: "index.html",
publicPath: '/', publicPath: '/',
outputDir: 'dist', outputDir: 'folacin-app-dist',
configureWebpack: { configureWebpack: {
performance: { performance: {
hints: false, hints: false,
......
This diff is collapsed.
NODE_ENV = test NODE_ENV = test
VUE_APP_BASE_URL1 = http://123.56.183.13:8083 VUE_APP_BASE_URL1 = http://123.56.183.13:8083
VUE_APP_BASE_URL = https://beta-ysservice.yiboshi.com VUE_APP_BASE_URL = https://beta-ysservice.zmnyjk.com
VUE_APP_LOCATION = https://beta-yesuan.yiboshi.com/#/ VUE_APP_LOCATION = https://beta-yesuan.zmnyjk.com/#/
VUE_APP_BASE_PATH = https://beta-yac.yiboshi.com VUE_APP_BASE_PATH = https://beta-yac.zmnyjk.com
VUE_APP_KEY_WORD = 'XwKsGlMcdPMEhR1B' VUE_APP_KEY_WORD = 'XwKsGlMcdPMEhR1B'
This diff is collapsed.
...@@ -444,7 +444,9 @@ export default { ...@@ -444,7 +444,9 @@ export default {
}, },
share() { share() {
this.qrCodeShow = true; this.qrCodeShow = true;
QRCode.toDataURL(this.unitInfo.id + "", {width: 500, height: 400, margin: 2}) //不是一个链接APP不给回调,就用一下公司域名吧
let url="https://www.yiboshi.com?"+this.unitInfo.id;
QRCode.toDataURL(url, {width: 500, height: 400, margin: 2})
.then(qrCodeUrl => { .then(qrCodeUrl => {
this.qrCodeUrl = qrCodeUrl; this.qrCodeUrl = qrCodeUrl;
}).catch(err => { }).catch(err => {
......
...@@ -17,7 +17,7 @@ module.exports = { ...@@ -17,7 +17,7 @@ module.exports = {
runtimeCompiler: true, runtimeCompiler: true,
indexPath: "index.html", indexPath: "index.html",
publicPath: '/', // 设置打包文件相对路径 publicPath: '/', // 设置打包文件相对路径
outputDir: 'dist', outputDir: 'folacin-pc-dist',
/* configureWebpack: { /* configureWebpack: {
//关闭 webpack 的性能提示 //关闭 webpack 的性能提示
performance: { performance: {
......
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment