liffID 删除

.env.production

@@ -7,5 +7,4 @@ ENV = 'production'
 # 徳瑞昇消防服务管理系统/生产环境
 VUE_APP_BASE_API = '/oneDayApi'
 
-#liff id
-VUE_APP_LIFF_ID = '1657344394-LBE9V9k9'
+VUE_CLI_BABEL_TRANSPILE_MODULES = true

.env.staging

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 一日游
+VUE_APP_TITLE = 日帰り旅行
 
 NODE_ENV = production
 

src/App.vue

@@ -71,10 +71,9 @@ export default {
     userId: "",
     pictureUrl: "",
     loading: true,
+    parmLiffId:"",
   }),
   created: function() {
-    console.log(`process.env.ENV: ${process.env.ENV}`)
-    console.log(`process.env.VUE_APP_LIFF_ID: ${process.env.VUE_APP_LIFF_ID}`)
   },
   mounted: function() {
     setTimeout(() => {
@@ -87,10 +86,16 @@ export default {
   },
   methods: {
     initializeLiff: function () {
+      this.parmLiffId = this.getQueryString("liffId");
+      if (this.parmLiffId) {
+          Cookies.set('liffId', this.parmLiffId);
+      } else {
+         this.parmLiffId = Cookies.get('liffId');
+      }
       this.api_loading = true
       liff.init(
         {
-          liffId: process.env.VUE_APP_LIFF_ID,
+          liffId: this.parmLiffId,
           withLoginOnExternalBrowser: true,
         },
         data => {
@@ -110,9 +115,6 @@ export default {
              this.name = profile.displayName
              this.pictureUrl = profile.pictureUrl
              this.userId = profile.userId
-             //application login
-             //console.log(`profile.userId: ${this.userId}`)
-             //console.log(`AccessToken: ${liff.getAccessToken()}`)
              this.logins()
            }).catch(err => {
              console.log(`Error at getProfile: ${err}`)
@@ -144,7 +146,7 @@ export default {
            username: this.userId,
            password: '',
            name : this.name,
-           deptId : this.$route.query.busid,
+           liffId : this.parmLiffId,
          };
         //获取token
         this.$store
@@ -165,6 +167,15 @@ export default {
             });
     },
 
+    getQueryString(name) {
+      var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i');
+      var r = window.location.search.substr(1).match(reg);
+      if (r != null) {
+        return unescape(r[2]);
+      }
+      return null;
+    },
+
   },
   components: {
       Loading,

src/store/modules/app.js

@@ -15,7 +15,8 @@ const mutations = {
   TOOGLE_NAVBAR_TYPE: (state, data) => {
     //String
     state.navbarType = data
-  }
+  },
+
 }
 
 const actions = {}

src/store/modules/user.js

@@ -18,6 +18,7 @@ const state = {
   deptId: 101, //全局deptId home页面未登录状态使用
   distributionId:null,//分销人ID
   language:'ja',//语言
+  companyinfo:{},
 }
 
 const mutations = {
@@ -49,6 +50,9 @@ const mutations = {
   SET_LANGUAGE: (state, data) => {
     state.language = data
   },
+  SET_COMPANY_INFO_DATA: (state, data) => {
+      state.companyinfo = data
+  },
 }
 
 const actions = {
@@ -74,11 +78,12 @@ const actions = {
     const username = userInfo.username.trim()
     const password = userInfo.password
     const name = userInfo.name
-    const deptId = userInfo.deptId
+    const liffId = userInfo.liffId
     return new Promise((resolve, reject) => {
-      lineLogin({username, password, name, deptId}).then(res => {
-        setToken(res.msg)
-        commit('SET_TOKEN', res.msg)
+      lineLogin({username, password, name, liffId}).then(res => {
+        setToken(res.data.token)
+        commit('SET_TOKEN', res.data.token)
+        commit('SET_COMPANY_INFO_DATA', res.data.companyinfo)
         resolve(res)
       }).catch(error => {
         reject(error)

src/views/home/home.vue

@@ -87,46 +87,42 @@
         </div>
         <div id="box">
             <ul>
-                <li class="box_div" id="box_one">
+                <li class="box_div" id="box_one" v-show='companyinfo.safety!=""'>
                   <a href="#box_one">シートベル着用のお願い</a>
                   <span></span>
-                  <div class="box_cont"><p>っっっっっっっっっっd<br>
-            っっっっっっっっdっっっっっっっっっっd<br>っっっっっっっっっっd<br>っっっっっっっっっっd<br>
-                    </p></div>
+                  <div class="box_cont" v-html="companyinfo.safety"></div>
                 </li>
-                <li class="box_div" id="box_two">
+                <li class="box_div" id="box_two" v-show='companyinfo.process!=""'>
                   <a href="#box_two">出発までの流れ</a>
                   <span></span>
-                  <div class="box_cont"><p>1.乒乓球世锦赛即将召开<br/>2.我国运动员在世锦赛中表现突出<br/>3.北京市体育运动会召开<br/>4.北京市启动空气重污染橙色预警1.乒乓球世锦赛即将召开<br/>2.我国运动员在世锦赛中表现突出<br/>3.北京市体育运动会召开<br/>4.北京市启动空气重污染橙色预警1.乒乓球世锦赛即将召开<br/>2.我国运动员在世锦赛中表现突出<br/>3.北京市体育运动会召开<br/>4.北京市启动空气重污染橙色预警1.乒乓球世锦赛即将召开<br/>2.我国运动员在世锦赛中表现突出<br/>3.北京市体育运动会召开<br/>4.北京市启动空气重污染橙色预警1.乒乓球世锦赛即将召开<br/>2.我国运动员在世锦赛中表现突出<br/>3.北京市体育运动会召开<br/>4.北京市启动空气重污染橙色预警1.乒乓球世锦赛即将召开<br/>2.我国运动员在世锦赛中表现突出<br/>3.北京市体育运动会召开<br/>4.北京市启动空气重污染橙色预警1.乒乓球世锦赛即将召开<br/>2.我国运动员在世锦赛中表现突出<br/>3.北京市体育运动会召开<br/>4.北京市启动空气重污染橙色预警1.乒乓球世锦赛即将召开<br/>2.我国运动员在世锦赛中表现突出<br/>3.北京市体育运动会召开<br/>4.北京市启动空气重污染橙色预警1.乒乓球世锦赛即将召开<br/>2.我国运动员在世锦赛中表现突出<br/>3.北京市体育运动会召开<br/>4.北京市启动空气重污染橙色预警1.乒乓球世锦赛即将召开<br/>2.我国运动员在世锦赛中表现突出<br/>3.北京市体育运动会召开<br/>4.北京市启动空气重污染橙色预警</p></div>
+                  <div class="box_cont" v-html="companyinfo.process"></div>
                 </li>
-                <li class="box_div" id="box_three">
+                <li class="box_div" id="box_three" v-show='companyinfo.cancel!=""'>
                   <a href="#box_three">変更・キャンセル手数料</a>
                   <span></span>
-                  <div class="box_cont"><p>1.乒乓球世锦赛即将召开<br/>2.我国运动员在世锦赛中表现突出<br/>3.北京市体育运动会召开<br/>4.北京市启动空气重污染橙色预警</p></div>
+                  <div class="box_cont" v-html="companyinfo.cancel"></div>
                 </li>
-                <li class="box_div" id="box_four">
+                <li class="box_div" id="box_four" v-show='companyinfo.about!=""'>
                   <a href="#box_four">ご利用案内</a>
                   <span></span>
-                  <div class="box_cont"><p>1.乒乓球世锦赛即将召开<br/>2.我国运动员在世锦赛中表现突出<br/>3.北京市体育运动会召开<br/>4.北京市启动空气重污染橙色预警</p></div>
+                  <div class="box_cont" v-html="companyinfo.about"></div>
                 </li>
-                <li class="box_div" id="box_five">
+                <li class="box_div" id="box_five" v-show='companyinfo.mark!=""'>
                   <a href="#box_five">標識・約款</a>
                   <span></span>
-                  <div class="box_cont"><p>1.乒乓球世锦赛即将召开<br/>2.我国运动员在世锦赛中表现突出<br/>3.北京市体育运动会召开<br/>4.北京市启动空气重污染橙色预警</p></div>
+                  <div class="box_cont" v-html="companyinfo.mark"></div>
                 </li>
-                <li class="box_div" id="box_six">
+                <li class="box_div" id="box_six" v-show='companyinfo.privacy!=""'>
                   <a href="#box_six">プライバシーポリシー</a>
                   <span></span>
-                  <div class="box_cont"><p>1.乒乓球世锦赛即将召开<br/>2.我国运动员在世锦赛中表现突出<br/>3.北京市体育运动会召开<br/>4.北京市启动空气重污染橙色预警</p></div>
+                  <div class="box_cont" v-html="companyinfo.privacy"></div>
                 </li>
-                <li class="box_div" id="box_seven">
+                <li class="box_div" id="box_seven" v-show='companyinfo.agreement!=""'>
                   <a href="#box_seven">親権者同意書</a>
                   <span></span>
-                  <div class="box_cont"><p>1.乒乓球世锦赛即将召开<br/>2.我国运动员在世锦赛中表现突出<br/>3.北京市体育运动会召开<br/>4.北京市启动空气重污染橙色预警</p></div>
+                  <div class="box_cont" v-html="companyinfo.agreement"></div>
                 </li>
-
             </ul>
-
         </div>
         <van-overlay :show="loading" @click="loading = false">
             <div class="wrapper" @click.stop>
@@ -155,6 +151,7 @@ export default {
             excellentList: [],
             requestUrl: process.env.VUE_APP_BASE_API,
             loading: true,
+            companyinfo: this.$store.state.user.companyinfo,
         };
     },
     mounted() {