Merge remote-tracking branch 'origin/master'

src/common/lang/zh.js

@@ -90,7 +90,7 @@ module.exports = {
         rememberPwd: "记住密码",
         forgetPwd: "忘记密码?",
         login: "登录",
-        registerTitle: "还没账户？",
+        registerTitle: "还没帐号？",
         alreadyRegister: "立即注册",
         placeholderCode: "请输入验证码",
         getCode: "获取验证码",

src/views/saleManage/projectManage/pages/activeStatus.vue

@@ -5,7 +5,7 @@
                 <el-breadcrumb separator="/">
                     <el-breadcrumb-item><a href="/#/salerequire/list">{{$t("workPlace.myworkPlace")}}</a></el-breadcrumb-item>
                     <el-breadcrumb-item>
-                        {{$t("projectInfo.title")}}
+                        <span @click="handleToList">{{$t("projectInfo.title")}}</span>
                     </el-breadcrumb-item>
                 </el-breadcrumb>
             </div>
@@ -232,6 +232,11 @@
             }
         },
         methods: {
+
+            handleToList(){
+              this.$router.push({path:'/saleproject/list',query:{type:this.$route.query.type}})
+            },
+
             handleToProject() {
                 this.$router.push({path:"/viewproject",query:{projectId:this.projectInfo.projectId,state:0}})
             },

src/views/saleManage/projectManage/pages/list.vue

@@ -49,7 +49,7 @@
         },
         data() {
             return {
-                activeName:"first",
+                activeName:!this.$route.query.type||(this.$route.query.type&&this.$route.query.type==0)?"first":"second",
                 currentIndustry: [0],
                 industryChild:[],
                 currentProgress:[-1],

src/views/saleManage/requireManage/pages/requireList.vue

@@ -9,7 +9,7 @@
             </div>
             <div class="statusWrap">
                 <page-screen :isSingle="true" :checkboxGroupstate="currentStatus?[currentStatus]:[]" :screenlist="statusList" :screenchildListIf="true" ref="screenchild" :titleName="$t('saleManage.requireStatus')"  @changecheck="handleChangeStatus"></page-screen>
-                <page-screen :isSingle="true" :screenlist="endTimeList" :screenchildListIf="true" ref="screenchild" :titleName="$t('bigBusiness.detailInfo.endTime')"  @changecheck="handleChangeTime"></page-screen>
+                <page-screen :isSingle="true" :checkboxGroupstate="currentTime?[currentTime]:[]" :screenlist="endTimeList" :screenchildListIf="true" ref="screenchild" :titleName="$t('bigBusiness.detailInfo.endTime')"  @changecheck="handleChangeTime"></page-screen>
             </div>
 
             <div class="wrapperContent">