8.1.8细节_1

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 ? '#f56c6c' : ' #2879ff'"
+                :color="item.day<0 ? (item.composite_state == 4?'#2879ff':'#f56c6c'):'#2879ff'"
                 :rate="item.process"
                 :key="index"
                 size="50px"

src/view/user/accountSet.vue

@@ -1,9 +1,23 @@
 <template>
   <div class="per-info__container">
-    <van-nav-bar class="headerbar no-down-icon" title="账号管理" left-text="返回" @click-left="$route_back" left-arrow>
+    <van-nav-bar
+      class="headerbar no-down-icon"
+      title="账号密码"
+      left-text="返回"
+      @click-left="$route_back"
+      left-arrow
+    >
       <template slot="right" class="department_right_nav">
-        <van-dropdown-menu  duration="0.3" text="text"  class="head_dropdown_menu">
-          <van-dropdown-item title="更多"  @change="plus_menu" :options="option" />
+        <van-dropdown-menu
+          duration="0.3"
+          text="text"
+          class="head_dropdown_menu"
+        >
+          <van-dropdown-item
+            title="更多"
+            @change="plus_menu"
+            :options="option"
+          />
         </van-dropdown-menu>
       </template>
     </van-nav-bar>
@@ -14,47 +28,56 @@
 </template>
 
 <script>
-import Vue from 'vue'
-import { Cell, CellGroup, DropdownMenu, DropdownItem} from 'vant'
+import Vue from "vue";
+import { Cell, CellGroup, DropdownMenu, DropdownItem } from "vant";
 
-Vue.use(Cell).use(CellGroup).use(DropdownMenu).use(DropdownItem)
+Vue.use(Cell)
+  .use(CellGroup)
+  .use(DropdownMenu)
+  .use(DropdownItem);
 
 export default {
-  name: 'accountSet',
-  data () {
+  name: "accountSet",
+  data() {
     return {
-      option: [{ text: '账号注销', value: 1 }],
-    }
+      option: [{ text: "账号注销", value: 1 }]
+    };
   },
   methods: {
-    plus_menu (val) {
+    plus_menu(val) {
       if (val) {
         this.$router.push({
-          path:'/verify',
-          query:{
-            type:2
+          path: "/verify",
+          query: {
+            type: 2
           }
-        })
+        });
       }
-    },
+    }
   }
-}
+};
 </script>
 
 <style scoped lang="less">
-  .text{
-    text-align: center;
-    color: #969799;
-    font-size: 0.28rem;
-    padding: 0.2rem 0;
-  }
-  .headerbar /deep/.van-dropdown-menu__title {
-      padding: 0;
-      padding-right: 0rem;
-      font-size: 0.3rem;
-      color: #fff;
-  }
-  /deep/ .van-dropdown-menu__bar {
-    background-color: transparent;
-  }
+.text {
+  text-align: center;
+  color: #969799;
+  font-size: 0.28rem;
+  padding: 0.2rem 0;
+}
+.headerbar /deep/.van-dropdown-menu__title {
+  padding: 0;
+  padding-right: 0rem;
+  font-size: 0.3rem;
+  color: #fff;
+}
+/deep/ .van-dropdown-menu__bar {
+  background-color: transparent;
+}
+/deep/ .van-nav-bar__right{
+  overflow: hidden;
+}
+/deep/ .van-dropdown-menu__title--active {
+  color: #fff !important;
+}
 </style>

src/view/user/create_company.vue

@@ -286,4 +286,7 @@ export default {
 /deep/ .van-nav-bar__right{
   overflow: hidden;
 }
+/deep/ .van-dropdown-menu__title--active{
+  color: #FFF!important;
+}
 </style>

src/view/user/iosIntercept.vue

@@ -90,15 +90,6 @@ export default {
   },
   created() {},
   methods: {
-    returnImg(index) {
-      let arr = [
-        "static/images/s-jifen.jpg",
-        "static/images/s-mubiao.jpg",
-        "static/images/s-jixiao.jpg",
-        "static/images/s-xunjian.jpg"
-      ];
-      return arr[index];
-    },
     plus_menu(val) {
       if (val) {
         this.$router.push({
@@ -106,7 +97,6 @@ export default {
         });
       }
     },
-    // end元素拖拽
     getItemBuyPopupPage() {
       this.buyPopupPage = false;
     },
@@ -142,22 +132,26 @@ img {
 .page {
   background-color: #fff;
   .pageContent {
-    height: calc(100vh - 3.32rem);
+    height: calc(100vh - 3.9rem);
     position: relative;
   }
   .pageBtm {
     width: 100%;
-    height: 1.5rem;
+    height: 1.8rem;
     display: flex;
     justify-content: space-around;
     align-items: center;
+    position: absolute;
+    bottom: 0;
+    left: 0;
     .a_btn{
-        color: #fff;
-        background-color: #26A2FF;
-        display: block;
-        line-height: .88rem;
-        padding: 0 0.6rem;
-        border-radius: 0.1rem;
+      font-size: .28rem;
+      color: #fff;
+      background-color: #26A2FF;
+      display: block;
+      line-height: .88rem;
+      padding: 0 0.6rem;
+      border-radius: 0.04rem;
     }
   }
   .buyPopupBody {
@@ -210,4 +204,7 @@ img {
 /deep/ .van-nav-bar__right{
   overflow: hidden;
 }
+/deep/ .van-dropdown-menu__title--active{
+  color: #FFF!important;
+}
 </style>

src/view/user/login.vue

@@ -67,7 +67,7 @@
                 <div class="blue" @click="openUrl(1)">找回密码</div>
               </van-col>
               <van-col span="12" style="text-align: right;">
-                <div @click="openUrl(2)">注册免费试用</div>
+                <div @click="openUrl(2)">注册账号</div>
               </van-col>
             </van-row>
           </div>
@@ -156,7 +156,7 @@
             绑定已有账号
           </div>
           <div style="font-size: 0.28rem;color: #666" @click="wxLogin">
-            创建新账号
+            注册账号
           </div>
         </div>
       </div>

src/view/user/login_company_list.vue

@@ -1,11 +1,11 @@
 <template>
   <div>
     <van-nav-bar title="我的组织" left-text="返回" @click-left="$route_back" left-arrow>
-      <template slot="right" class="department_right_nav">
+      <!-- <template slot="right" class="department_right_nav">
         <van-dropdown-menu  duration="0.3" text="text"  class="head_dropdown_menu">
           <van-dropdown-item title="•••"  @change="plus_menu" :options="option" />
         </van-dropdown-menu>
-      </template>
+      </template> -->
     </van-nav-bar>
     <div class="body_com has_header">
       <scroller>
@@ -123,4 +123,7 @@ export default {
 /deep/ .van-nav-bar__right{
   overflow: hidden;
 }
+/deep/ .van-dropdown-menu__title--active{
+  color: #FFF!important;
+}
 </style>

src/view/user/regWx.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="login-box-parent" style="background:#fff;">
-    <van-nav-bar title="手机号验证">
+    <van-nav-bar left-text="返回" @click-left="$router.push('/login')" left-arrow title="手机号验证">
       <div slot="right" @click="$router.push({ name: 'login' })" style="display:none;">登录</div>
     </van-nav-bar>
 

src/view/user/registration_experience.vue

@@ -118,7 +118,11 @@ export default {
         if (this.$route.query.iscompany) {
           this.$router.replace({ name: 'login_company_list' });
         } else {
-          this.$router.replace({name:'create_company'})
+          if (window.plus&&(navigator.userAgent.indexOf('iPhone') > 0)) {
+            this.$router.replace({name:'login'})
+          } else {
+            this.$router.replace({name:'create_company'})
+          }
         }
       });
     },

src/view/user/verify.vue

@@ -1,6 +1,6 @@
 <template>
   <div style="height: 100vh;background-color: #fff;">
-    <van-nav-bar title="注销账号" left-text="返回" @click-left="$route_back" left-arrow/>
+    <van-nav-bar title="账号注销" left-text="返回" @click-left="$route_back" left-arrow/>
     <div class="all">
       <div style="text-align: center;margin-bottom: 0.3rem;"><img src="static/images/e66f.jpg" class="img" /></div>
       <div class="text">