Merge branch 'master' of http://git.cc-lotus.info/live/web-achieve

src/views/Login.vue

@@ -11,7 +11,7 @@
               <el-col :span="24" class="tabs">
                 <el-tabs v-model="active" type="card">
                   <el-tab-pane label="个人用户" name="first">
-                    <el-col :span="24" class="one">
+                    <el-col :span="24" class="two">
                       <el-form :model="webForm" :rules="rules" ref="webForm" label-width="100px">
                         <el-form-item label="账号" prop="phone">
                           <el-input v-model="webForm.phone" placeholder="请输入账号"></el-input>
@@ -19,12 +19,6 @@
                         <el-form-item label="密码" prop="password">
                           <el-input v-model="webForm.password" placeholder="请输入密码" show-password></el-input>
                         </el-form-item>
-                        <el-form-item label="用户类别" prop="type">
-                          <el-radio-group v-model="webForm.type">
-                            <el-radio label="4">个人用户</el-radio>
-                            <el-radio label="5">企业用户</el-radio>
-                          </el-radio-group>
-                        </el-form-item>
                         <el-col :span="24" class="btn">
                           <el-button type="primary" @click="webLogin('webForm')">确认登录</el-button>
                         </el-col>
@@ -116,6 +110,7 @@ export default {
       this.$refs[formName].validate(async valid => {
         if (valid) {
           let data = this.webForm;
+          data.type = '4';
           if (data.type == '4') {
             let res = await this.perLogin({ user: data });
             if (this.$checkRes(res)) {

src/views/userDeclare/parts/datalists.vue

@@ -4,7 +4,7 @@
       <el-col :span="24" class="datalist">
         <el-form :model="datalistForm" :rules="rules" ref="datalistForm" label-width="0">
           <el-col :span="24" class="text">
-            <el-col :span="24" class="title" style="color:#ff0000">
+            <el-col :span="24" class="title">
               研究工作报告（必备）：
             </el-col>
             <el-col :span="24" class="file">
@@ -22,7 +22,7 @@
             </el-col>
           </el-col>
           <el-col :span="24" class="text">
-            <el-col :span="24" class="title" style="color:#ff0000">
+            <el-col :span="24" class="title">
               研究技术报告（必备）：
             </el-col>
             <el-col :span="24" class="file">
@@ -40,7 +40,7 @@
             </el-col>
           </el-col>
           <el-col :span="24" class="text">
-            <el-col :span="24" class="title" style="color:#ff0000">
+            <el-col :span="24" class="title">
               经济效益分析（必备）：
             </el-col>
             <el-col :span="24" class="file">
@@ -58,7 +58,7 @@
             </el-col>
           </el-col>
           <el-col :span="24" class="text">
-            <el-col :span="24" class="title" style="color:#ff0000">
+            <el-col :span="24" class="title">
               科技查新报告（科技项目成果，必备）：
             </el-col>
             <el-col :span="24" class="file">
@@ -76,7 +76,7 @@
             </el-col>
           </el-col>
           <el-col :span="24" class="text">
-            <el-col :span="24" class="title" style="color:#ff0000">
+            <el-col :span="24" class="title">
               法律价值评估报告（专利成果，必备）：
             </el-col>
             <el-col :span="24" class="file">
@@ -94,7 +94,7 @@
             </el-col>
           </el-col>
           <el-col :span="24" class="text">
-            <el-col :span="24" class="title" style="color:#ff0000">
+            <el-col :span="24" class="title">
               推广应用证明（两家以上应用单位，必备）：
             </el-col>
             <el-col :span="24" class="file">
@@ -112,7 +112,7 @@
             </el-col>
           </el-col>
           <el-col :span="24" class="text">
-            <el-col :span="24" class="title" style="color:#ff0000">
+            <el-col :span="24" class="title">
               成果技术汇报PPT（必备）：
             </el-col>
             <el-col :span="24" class="file">