Merge branch 'master' of http://git.cc-lotus.info/service-platform/web-test

src/views/notice/index.vue

@@ -1,14 +1,16 @@
 <template>
   <div id="index">
     <el-row>
-      <el-col :span="24">
+      <el-col :span="24" class="main">
         <div class="w_1200">
-          <el-col class="bt">{{ noticeInfo.title }}</el-col>
-          <el-col :span="5" class="ly">来源：{{ noticeInfo.source }}</el-col>
-          <el-col :span="5" class="time">时间：{{ noticeInfo.create_time }}</el-col>
+          <el-col :span="24" class="bt">{{ noticeInfo.title }}</el-col>
+          <el-col :span="24" class="date">
+            <span>来源：{{ noticeInfo.source }}</span>
+            <span>发布时间：{{ noticeInfo.create_time }}</span>
+          </el-col>
           <el-col :span="24" class="content" v-html="noticeInfo.content"></el-col>
-          <el-col :span="24">
-            <el-button type="primary" @click="click">信息申报</el-button>
+          <el-col :span="24" class="sb">
+            <el-button type="primary" size="mini" @click="click(noticeInfo.id)">技术需求%科技成果信息征集填报</el-button>
           </el-col>
         </div>
       </el-col>
@@ -18,7 +20,6 @@
 
 <script>
 import { mapState, createNamespacedHelpers } from 'vuex';
-import productForm from './productForm.vue';
 const { mapActions: notice } = createNamespacedHelpers('notice');
 export default {
   name: 'index',
@@ -60,21 +61,22 @@ export default {
   width: 80%;
   margin: 0 auto;
 }
+.main {
+  margin: 0 0 30px 0;
+}
 .bt {
-  font-size: 36px;
+  font-size: 30px;
   text-align: center;
-  margin-top: 50px;
+  padding: 60px 0 20px 0;
 }
-.ly {
-  margin: 20px 120px 0 480px;
-  font-size: 24px;
-}
-.time {
-  margin-top: 20px;
-  font-size: 24px;
+.date {
+  text-align: center;
+  font-size: 18px;
+  span {
+    margin: 0 10px;
+  }
 }
 .content {
-  margin-top: 20px;
-  text-indent: 5em;
+  margin: 15px 0;
 }
 </style>

src/views/notice/productForm.vue

@@ -146,12 +146,92 @@
           <el-col :span="24" class="down">
             <el-tabs v-model="activeName" type="card">
               <el-tab-pane label="技术需求" name="first">
-                <el-col :span="24">
-                  <el-col :span="24">
+                <el-col :span="24" class="first">
+                  <el-col :span="24" class="company">
                     <h3>企业信息</h3>
+                    <el-col :span="24">
+                      <el-col :span="24">
+                        <span>企业名称：</span>
+                        <el-input v-model="technologyForm.company" placeholder="请输入企业名称"></el-input>
+                      </el-col>
+                      <el-col :span="12">
+                        <span>注册类型：</span>
+                        <el-input v-model="technologyForm.company" placeholder="请输入企业名称"></el-input>
+                      </el-col>
+                      <el-col :span="12">
+                        <span>注册类型：</span>
+                        <el-input v-model="technologyForm.company" placeholder="请输入企业名称"></el-input>
+                      </el-col>
+                      <el-col :span="12">
+                        <span>注册类型：</span>
+                        <el-input v-model="technologyForm.company" placeholder="请输入企业名称"></el-input>
+                      </el-col>
+                      <el-col :span="12">
+                        <span>注册类型：</span>
+                        <el-input v-model="technologyForm.company" placeholder="请输入企业名称"></el-input>
+                      </el-col>
+                      <el-col :span="12">
+                        <span>注册类型：</span>
+                        <el-input v-model="technologyForm.company" placeholder="请输入企业名称"></el-input>
+                      </el-col>
+                      <el-col :span="12">
+                        <span>注册类型：</span>
+                        <el-input v-model="technologyForm.company" placeholder="请输入企业名称"></el-input>
+                      </el-col>
+                      <el-col :span="12">
+                        <span>注册类型：</span>
+                        <el-input v-model="technologyForm.company" placeholder="请输入企业名称"></el-input>
+                      </el-col>
+                      <el-col :span="12">
+                        <span>注册类型：</span>
+                        <el-input v-model="technologyForm.company" placeholder="请输入企业名称"></el-input>
+                      </el-col>
+                      <el-col :span="12">
+                        <span>注册类型：</span>
+                        <el-input v-model="technologyForm.company" placeholder="请输入企业名称"></el-input>
+                      </el-col>
+                      <el-col :span="12">
+                        <span>注册类型：</span>
+                        <el-input v-model="technologyForm.company" placeholder="请输入企业名称"></el-input>
+                      </el-col>
+                      <el-col :span="12">
+                        <span>注册类型：</span>
+                        <el-input v-model="technologyForm.company" placeholder="请输入企业名称"></el-input>
+                      </el-col>
+                      <el-col :span="12">
+                        <span>注册类型：</span>
+                        <el-input v-model="technologyForm.company" placeholder="请输入企业名称"></el-input>
+                      </el-col>
+                      <el-col :span="12">
+                        <span>注册类型：</span>
+                        <el-input v-model="technologyForm.company" placeholder="请输入企业名称"></el-input>
+                      </el-col>
+                      <el-col :span="12">
+                        <span>注册类型：</span>
+                        <el-input v-model="technologyForm.company" placeholder="请输入企业名称"></el-input>
+                      </el-col>
+                      <el-col :span="24">
+                        <p>企业简介</p>
+                        <el-input v-model="technologyForm.company" placeholder="请输入企业名称"></el-input>
+                      </el-col>
+                      <el-col :span="24">
+                        <p>企业简介</p>
+                        <el-input v-model="technologyForm.company" placeholder="请输入企业名称"></el-input>
+                      </el-col>
+                      <el-col :span="24">
+                        <p>企业简介</p>
+                        <el-input v-model="technologyForm.company" placeholder="请输入企业名称"></el-input>
+                      </el-col>
+                    </el-col>
                   </el-col>
-                  <el-col :span="24">
+                  <el-col :span="24" class="product">
                     <h3>技术需求</h3>
+                    <el-col :span="24">
+                      技术需求
+                    </el-col>
+                  </el-col>
+                  <el-col :span="24" class="btn">
+                    <el-button type="primary" size="mini">保存</el-button>
                   </el-col>
                 </el-col>
               </el-tab-pane>
@@ -174,6 +254,8 @@ export default {
     return {
       list: [],
       activeName: 'first',
+      // 技术需求
+      technologyForm: {},
     };
   },
   created() {},
@@ -203,5 +285,16 @@ export default {
 }
 .down {
   margin: 15px 0;
+  .first {
+    .company {
+      border: 1px solid #ccc;
+    }
+    .product {
+      border: 1px solid #ccc;
+    }
+    .btn {
+      text-align: center;
+    }
+  }
 }
 </style>