更换域名

.gitignore

@@ -29,5 +29,8 @@
 /node_modules/*
 /folacin-app/node_modules/
 /folacin-pc/node_modules/
-/folacin-app/dist/
-/folacin-pc/dist/
+/folacin-app/folacin-app-dist/
+/folacin-app/folacin-app-dist.zip
+/folacin-pc/folacin-pc-dist/
+/folacin-pc/folacin-pc-dist.zip
+

folacin-app/.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
\ No newline at end of file

folacin-app/.env.test

 NODE_ENV = test
-VUE_APP_BASE_URL = https://beta-ysservice.yiboshi.com
+VUE_APP_BASE_URL = https://beta-ysservice.zmnyjk.com

folacin-app/src/views/provideUnit/provideUnit.vue

@@ -124,12 +124,17 @@ export default {
         handleBack() {
             callMobile('goIndex', {});
         },
-        scanQRCallBack(unitId) {
-            if (!unitId) {
+        scanQRCallBack(qrContent) {
+            if (!qrContent) {
                 this.$toast.success('无效的二维码');
                 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.data) {
                         let areaFullName = res.data.areaFullName ? res.data.areaFullName : "";

folacin-app/vue.config.js

@@ -5,7 +5,7 @@ module.exports = {
     runtimeCompiler: true,
     indexPath: "index.html",
     publicPath: '/',
-    outputDir: 'dist',
+    outputDir: 'folacin-app-dist',
     configureWebpack: {
         performance: {
             hints: false,

folacin-pc/.env.test

 NODE_ENV = test
 VUE_APP_BASE_URL1 = http://123.56.183.13:8083
-VUE_APP_BASE_URL = https://beta-ysservice.yiboshi.com
-VUE_APP_LOCATION = https://beta-yesuan.yiboshi.com/#/
-VUE_APP_BASE_PATH = https://beta-yac.yiboshi.com
+VUE_APP_BASE_URL = https://beta-ysservice.zmnyjk.com
+VUE_APP_LOCATION = https://beta-yesuan.zmnyjk.com/#/
+VUE_APP_BASE_PATH = https://beta-yac.zmnyjk.com
 VUE_APP_KEY_WORD = 'XwKsGlMcdPMEhR1B'

folacin-pc/src/views/indexComponent/folviteDistribution/folviteDistribution.vue

@@ -444,7 +444,9 @@ export default {
         },
         share() {
             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 => {
                     this.qrCodeUrl = qrCodeUrl;
                 }).catch(err => {

folacin-pc/vue.config.js

@@ -17,7 +17,7 @@ module.exports = {
     runtimeCompiler: true,
     indexPath: "index.html",
     publicPath: '/', // 设置打包文件相对路径
-    outputDir: 'dist',
+    outputDir: 'folacin-pc-dist',
 /*    configureWebpack: {
         //关闭 webpack 的性能提示
         performance: {