LAPTOP-FO2T5SIU\35838 преди 5 месеца
родител
ревизия
71c3298a09
променени са 3 файла, в които са добавени 8 реда и са изтрити 4 реда
  1. 1 1
      src/store/modules/user.js
  2. 3 2
      src/views/singleLogin/ssoLogin.vue
  3. 4 1
      src/views/workflow/components/myProcess/applyBuyingMoreConfirm.vue

+ 1 - 1
src/store/modules/user.js

@@ -163,7 +163,7 @@ const actions = {
             if (captchaId) {
                 postData.captchaId = captchaId
             }
-            channel.baseRequest(controller || 'pub', url, postData, 'loginSecret').then((res) => {
+            channel.baseRequest(controller || 'wx/pub', url, postData, 'loginSecret').then((res) => {
                 if (res.data[constant.KEY_RESULT]) {
                     const { data } = res
                     const user = data[constant.KEY_USER]

+ 3 - 2
src/views/singleLogin/ssoLogin.vue

@@ -18,6 +18,7 @@ export default {
     created() {
         // console.log('this.$route', this.$route)
         // console.log('window.location.href', window.location.href)
+        window.localStorage.clear()
         // 第三方平台登录
         this.getLoginByToken()
     },
@@ -26,8 +27,8 @@ export default {
         getLoginByToken() {
             // 获取地址栏中的token
             var token = this.$route.query
-            console.log('token===', token)
-            console.log('loginid===', token.loginid)
+            // console.log('token===', token)
+            // console.log('loginid===', token.loginid)
             // 调用登录的接口
             if (token == '' || token == undefined || token == null) {
                 // 无token,跳转到登录页面

+ 4 - 1
src/views/workflow/components/myProcess/applyBuyingMoreConfirm.vue

@@ -181,6 +181,7 @@
     <div slot="footer">
       <el-button @click="dialogVisible=false">取消</el-button>
       <el-button :loading="loading" type="primary" @click="handelConfirm">确定</el-button>
+      <el-button :loading="loading" type="primary" @click="handelConfirmOA">OA测试</el-button>
     </div>
   </el-dialog>
 
@@ -403,7 +404,9 @@ export default {
         baseRequest1(prefix, opUrl, postData) {
             return this.$channel.globleRequest(prefix, opUrl, postData, 'project task')
         },
-
+        handelConfirmOA() {
+            window.location.href = 'http://112.25.69.137:8088/workflow/request/ViewRequestOS.jsp?reflush=1'
+        },
         async handelConfirm() {
             this.$refs['elForm'].validate(async valid => {
                 // if (!valid) return