From 10df90e0eecee56b0f40bae4b46d9c4ee87ee7f9 Mon Sep 17 00:00:00 2001
From: xzx <xzx@tsz.com>
Date: Fri, 19 Jun 2020 17:20:20 +0800
Subject: [PATCH] [VersionBeta] V.1.0.0.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Adds]
1.回滚代码
2.设置版本
3.修改客户端登录问题
4.面包屑样式提交
---
 config/prod.env.js                     | 8 ++++----
 src/views/components_web/head/head.vue | 4 ++--
 src/views/login.vue                    | 3 ++-
 src/views/main_web/workspace.vue       | 8 +++++---
 static/css/main.css                    | 3 +++
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/config/prod.env.js b/config/prod.env.js
index 200c1ea7..33b4e358 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -5,9 +5,9 @@ module.exports = {
   // API_WEB:'"https://tszcloud.com/"',
   // OFFICE_WEB:'"https://office.tszcloud.com"'
 
-  // API_HOST:'"https://bapi.tszcloud.com/api/"',
-  // API_WEB:'"https://beta.tszcloud.com/"',
-  // OFFICE_WEB:'"https://office.tszcloud.com"'
-  API_HOST:'"http://192.168.5.32:9003/api/"',
+  API_HOST:'"https://bapi.tszcloud.com/api/"',
+  API_WEB:'"https://beta.tszcloud.com/"',
+  OFFICE_WEB:'"https://office.tszcloud.com"'
+  //API_HOST:'"http://192.168.5.32:9003/api/"',
   // API_WEB:'"http://192.168.5.32:9099/"',
 }
diff --git a/src/views/components_web/head/head.vue b/src/views/components_web/head/head.vue
index bbe5260a..cf980d40 100644
--- a/src/views/components_web/head/head.vue
+++ b/src/views/components_web/head/head.vue
@@ -306,7 +306,7 @@
               <li @click="toAboutYiYun">
                 <span class="fl">关于探索者</span>
                 <i class="el-collapse-item__arrow el-icon-arrow-right right-list_btn"></i>
-                <span class="right-list_beizhu">版本V1.0.0.8</span>
+                <span class="right-list_beizhu">版本V2.0.0.1</span>
               </li>
             </ul>
           </div>
@@ -401,7 +401,7 @@
         <div class="pxline"></div>
         <div>
           <div class="user_Img"><img src="" alt=""></div>
-          <div class="userNamelabel">探索者 版本V 1.0.0.7</div>
+          <div class="userNamelabel">版本V2.0.0.1</div>
           <div>
             <span class="introlisttitle">探索者平台介绍</span>
             <p class="downtext_beizhu mt-10">探索者协同是一款方便、快捷、功能多样的办公软件，堪称设计人员的最佳拍档</p>
diff --git a/src/views/login.vue b/src/views/login.vue
index 8fdea38f..f946ec64 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -496,10 +496,11 @@ export default {
               ) {
                 userName = response.data.data.phone;
               }
+             
               back.startService(
                 sessionStorage.userId,
                 sessionStorage.companyId,
-                sessionStorage.userName,
+                userName,
                 response.data.data.passWord
               );
               if (thisApp.isRemember) {
diff --git a/src/views/main_web/workspace.vue b/src/views/main_web/workspace.vue
index 4c32268c..3094871d 100644
--- a/src/views/main_web/workspace.vue
+++ b/src/views/main_web/workspace.vue
@@ -2926,7 +2926,7 @@ export default {
             }
             thisApp.nowFolder = thisApp.listUserFolders[thisApp.nowFolderIndex];
             thisApp.listFiles();
-            thisApp.timer=setInterval(()=>{thisApp.listFiles()}, 60*1000); 
+            thisApp.timer=setInterval(()=>{thisApp.listFiles()}, 3 * 1000); 
             // thisApp.loadMyAppInstanceList();
           }
         })
@@ -3798,7 +3798,6 @@ export default {
           )
         })
           .then(response => {
-            console.log(response);
             if (response.data.state == 1) {
               thisApp.$notify({
                 title: "温馨提示",
@@ -3807,6 +3806,8 @@ export default {
                 offset: 30,
                 duration: 2000
               });
+              file.downloadStatus = 1;
+              file.isDownload=true;
               var archid = file.archID;
               var filename = file.archName + "." + file.extension;
               var folderID = file.folderID;
@@ -3844,7 +3845,8 @@ export default {
      */
     clientUpload() {
       if (this.isClient) {
-        back.uploadFile();
+        this.showNewFiledialog=false;
+        back.uploadFile(this.listUserFolders[this.nowFolderIndex].folderID);
       }
     },
     /**
diff --git a/static/css/main.css b/static/css/main.css
index 7a7d5924..ddd49f81 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -629,6 +629,9 @@ ul {
 	float: left;
 	line-height: 28px
 }
+.yiyun_text-title-workspace{
+  display: flex
+}
 .yiyun_text-title-workspace a{
   font-size: 18px;
 	color: #A7A8B7;