8.1.8_2

src/okr/view/okrHome.vue

@@ -108,7 +108,7 @@
                 <van-circle
                   layer-color="#E5E9F2"
                   v-model="item.currentRate"
-                  :color="item.day<0 ? '#f56c6c' : ' #2879ff'"
+                  :color="barColor(item)"
                   :rate="item.process"
                   :key="index"
                   size="50px"
@@ -167,6 +167,13 @@ export default {
     this.getTaskList();
     this.getProjectList();
   },
+  computed:{
+    barColor(){
+      return function (item) { 
+        return item.day<0 ? (item.composite_state == 4?'#2879ff':'#f56c6c'):'#2879ff'
+       }
+    },
+  },
   methods: {
     getUnitList(){
       this.$axiosUser('get', '/api/pro/okr/kr/unit_list').then(res => {

src/okr/view/project/projectList.vue

@@ -40,7 +40,7 @@
                 @click.stop="openDetail(item)"
                 layer-color="#E5E9F2"
                 v-model="item.currentRate"
-                :color="item.day<0 ? (item.composite_state == 4?'#2879ff':'#f56c6c'):'#2879ff'"
+                :color="barColor(item)"
                 :rate="item.process"
                 :key="index"
                 size="50px"
@@ -166,6 +166,13 @@ export default {
 
     },
   },
+  computed:{
+    barColor(){
+      return function (item) { 
+        return item.day<0 ? (item.composite_state == 4?'#2879ff':'#f56c6c'):'#2879ff'
+       }
+    },
+  },
   methods: {
     confirmDept(val){
       this.selected_data=val;

src/view/user/iosIntercept.vue

@@ -101,7 +101,7 @@ export default {
     applyButton() {
       let self = this;
       let data = {
-        account_id: this.$store.getters.account_info.id,
+        account_id: this.$getCache('account').id,
         source_type: 1,
         apply_type: 2
       };

src/view/user/login.vue

@@ -305,6 +305,7 @@ export default {
         if (res.data.code == 1) {
           this.$setCache("account", res.data.data.account);
           localStorage.setItem("a-token-temp", res.data.data.token); // 保存平台账号登录的token
+          localStorage.setItem("a-token-tel", res.data.data.account.tel); // 保存平台账号登录的token
           this.registrationExperience(); //进入体验账号
         } else {
           this.$toast(res.data.msg);
@@ -406,6 +407,7 @@ export default {
             })
             .then(res => {
               if (res.code == 1) {
+                this.$setCache("account", res.data.account);
                 localStorage.setItem('a-token-tel',this.formData.username)
                 localStorage.setItem("a-token-temp", res.data.token); // 保存平台账号登录的token
                 // if (window.plus) {
@@ -510,6 +512,7 @@ export default {
           this.$setCache("account", res.data.data.account);
           if (res.data.data.account_id !== 0) {
             localStorage.setItem("a-token-temp", res.data.data.token); // 保存平台账号登录的token
+            localStorage.setItem("a-token-tel", res.data.data.account.tel); // 保存平台账号登录的token
             // 已绑定平台账号
             this.openUrl2(
               res.data.data.account_site,

src/view/user/regWx.vue

@@ -139,6 +139,7 @@ export default {
             let data=res.data.data;
             this.$toast("已绑定")
             localStorage.setItem('a-token-temp', data.token); // 保存平台账号登录的token
+            localStorage.setItem('a-token-tel', data.account.tel);
             this.openUrl(data.account_site,data.invitation_wait_count);
          }).finally(() => {this.reg_loading = false})
       }else{ //未绑定
@@ -190,6 +191,7 @@ export default {
           this.$toast("已注册")
           let data=res.data.data;
           localStorage.setItem('a-token-temp', data.token); // 保存平台账号登录的token
+          localStorage.setItem('a-token-tel', data.account.tel); // 保存平台账号登录的手机号
           this.openUrl(data.account_site,data.invitation_wait_count);
       }).finally(() => {this.reg_loading = false})
     },

src/view/user/wxInit.vue

@@ -58,6 +58,7 @@ export default {
                 this.openUrl(data);
               } else {
                 localStorage.setItem("a-token-temp", data.token); // 保存平台账号登录的token
+                localStorage.setItem("a-token-tel", data.account.tel); // 保存平台账号的手机号
                 this.openUrl2(data.account_site, data.invitation_wait_count);
               }
             });