13

src/components/HeadNav/HeadNav.vue

@@ -58,7 +58,10 @@
       </a-dropdown>
       <div style="color:#fff;text-align:center;margin:1.4rem auto" @click="showNav = false">
         <router-link tag="span" to="/login" v-if="!nickName">
-          <a-icon class="icon-head pointer" style="right: 50px;color:#fff" type="user" />
+          <div class="circle">
+            <a-icon class="icon-head pointer" style="right: 50px;color:#fff" type="user" />
+
+          </div>
         </router-link>
         <div class="icon-head" v-else>{{ nickName }}</div>
         <div class="text-white font-14">登录</div>
@@ -329,5 +332,11 @@ export default {
   height 1px
 
   
+}
+.circle{
+  border 2px solid #fff
+  border-radius 50%
+  padding 6px
+
 }
 </style>

src/views/About/Children/Introduce.vue

@@ -13,8 +13,8 @@
     </div> -->
     <banner :show-page="showPage" />
     <div class="">
-      <div class="white my-5 d-flex flex-nowrap flex-column">
+      <div class="white my-1 d-flex flex-nowrap flex-column">
-        <div><img src="~assets/gywm01.jpg" style="height:10rem;width:30rem" /></div>
+        <div class="md-camera"><img src="~assets/gywm01.jpg" /></div>
 
       
         <div class="inner-x"><img class="mb-3" src="~assets/gywm02.png" style="width: 96px; height: 41px" /></div>
@@ -66,4 +66,28 @@ export default {
 .inner-x{
   margin auto 1rem
 }
+
+
+.md-camera {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  width:100%;
+  height: 120px;
+  overflow: hidden;
+  position: relative;
+  background: #5cb589;
+  margin: auto;
+  
+}
+.box img {
+    position: absolute;
+    // top: 0;
+    // left: 50%;
+    // margin-left: -50%;
+    transform: translate(-50%, 0);
+    width: 100%;
+    height: 120px;
+}
 </style>

src/views/Activity/Activity.vue

@@ -7,18 +7,18 @@
 <template>
   <div>
     <div class="search-list">
-      <div>
+      <div style="margin: 0 1rem ">
         <a-input-search
         @search="getData"
         class="search"
         enter-button
         placeholder="请输入..."
-        style="width: 90%"
+        style="width: 100%"
         v-model="iptCon"
       />
 
       </div>
-      <div>
+      <div style="margin: 0 1rem ">
         <span>
           <a-checkbox :checked="sta.ly === 1" @click="cSta('ly')">路演</a-checkbox>
           <a-checkbox :checked="sta.jz === 1" @click="cSta('jz')">讲座</a-checkbox>
@@ -215,7 +215,7 @@ export default {
 .search-list {
   height: 6rem;
 
-  padding-left: 24px;
+  // padding-left: 24px;
   background: #fff;
 }
 

src/views/Cart/Cart.vue

@@ -9,15 +9,15 @@
     <bread-crumb :arr="arr" class="my-1" />
     <div class="white pa-5 mb-5 d-flex flex-column flex-nowrap align-start justify-space-between">
       <div>
-        <span class="font-16 textColor" style="margin-right:1rem">联系人：</span>
+        <span class="font-bold-16 textColor" style="margin-right:1rem">联系人：</span>
         <a-input style="width: 200px" v-model="name" />
       </div>
-      <div>
+      <div class="mt-1">
-        <span class="font-16 textColor">联系电话：</span>
+        <span class="font-bold-16 textColor">联系电话：</span>
         <a-input @change="onChange" style="width: 200px" v-model="phone" />
       </div>
-      <div>
+      <div class="mt-1">
-        <span class="font-16 textColor">公司名称：</span>
+        <span class="font-bold-16 textColor">公司名称：</span>
         <a-input style="width: 200px" v-model="company" />
       </div>
     </div>
@@ -158,7 +158,7 @@ export default {
 
 <style scoped lang="stylus">
 .inner {
-  margin: 40px auto;
+  margin: 26px 1rem;
 }
 
 .cart-box {

src/views/Challenge/Children/Solicitation.vue

@@ -21,7 +21,11 @@
         <div style="margin-left: 1rem">挑战流程</div>
       </div>
       <div class="center-txt">
-        <img class="fill-weight" src="../../../assets/solicitation.png" />
+        <div class="move">
+          <img style="height:100%;width:1200px" src="../../../assets/solicitation.png" />
+
+        </div>
+
       </div>
     </div>
     <div class="center-box" style="margin-bottom: 100px">
@@ -115,11 +119,25 @@ export default {
   padding-bottom 0.5rem
   margin: 0.3rem auto ;
   width: 100%;
+  overflow : hidden
   line-height: 1.5rem;
   font-size: 16px;
+
 }
 
 .center-title {
   // top: 30% !important;
 }
+.move{
+    position: relative;
+    
+
+    left: 0;
+    top: 0;
+    right: -17px;
+    bottom: 0;
+    overflow-x: scroll;
+    overflow-y: hidden;
+}
+
 </style>

src/views/Challenge/components/Enroll.vue

@@ -105,6 +105,9 @@ export default {
   },
 
   methods: {
+    onChange(){
+
+    },
     // 需求截止时间
     changeNeedTime(date, dateString) {
       this.platform.buildTime = this.$moment(date).unix() * 1000;

src/views/Community/Community.vue

@@ -6,25 +6,36 @@
 
 <template>
   <div>
-    <div class="search-list">
+    <div class="search-list d-flex flex-column">
       <!-- <a-radio-group v-model="value">
         <a-radio :style="radioStyle" :value="1">主题论坛</a-radio>
         <a-radio :style="radioStyle" :value="2">创新社区</a-radio>
         <a-radio :style="radioStyle" :value="3">孵化社区</a-radio>
         <a-radio :style="radioStyle" :value="4">产业社区</a-radio>
       </a-radio-group> -->
-      <div>
+    <div class="mt-2">
+      <a-input-group compact style="margin: 1rem auto ">
+        <a-select
+          style="width:30%"
+          v-model="value"
+        >
+          <a-select-option :value="1">主题论坛</a-select-option>
+          <a-select-option :value="2">创新社区</a-select-option>
+          <a-select-option :value="3">孵化社区</a-select-option>
+          <a-select-option :value="4">产业社区</a-select-option>
+        </a-select>
          <a-input-search
           @search="searchData"
           class="search"
           enter-button
           placeholder="请输入..."
-          style="width: 60%"
+          style="width: 70%"
           v-model="iptCon"
         />
-      </div> 
+      </a-input-group>
+    </div> 
       <div>
-        <a-button @click="jumpPost()" class="btn " type="primary">发帖</a-button>
+        <a-button @click="jumpPost()" class="btn mt-2" type="primary">发帖</a-button>
       </div>
       
     </div>
@@ -180,26 +191,23 @@ export default {
 }
 
 .search-list {
-  height: 72px;
+  // height: 72px;
-  line-height: 72px;
+  line-height: 1.8px;
-  padding: 0 24px;
+  padding: 0.8rem auto ;
-  position: relative;
+  width: 90%
+  margin 0 auto 
   background: #fff;
   // box-shadow: 0 0 10px #ccc;
 }
 
-.search {
+
-  position: absolute;
-  right: 110px;
-  top: 20px;
-}
 
 .btn {
-  width: 75px;
+  width: 100%;
   height: 32px;
-  position: absolute;
+  // position: absolute;
-  right: 25px;
+  // right: 25px;
-  top: 20px;
+  // top: 20px;
 }
 
 .post {

src/views/IncubationPlatform/Children/Products.vue

@@ -21,14 +21,14 @@
               <a-input-search
                 @search="searchProduct"
                 class="item-search"
-                enter-button="搜索"
+                enter-button
                 placeholder="请输入"
                 v-model="productIpt"
               />
             </div>
         </div>
       </div>
-      <p class="font-bold-24">产品展示</p>
+      <p class="font-bold-24" style="margin-left:1rem">产品展示</p>
     </div>
     <platform-list />
   </div>

src/views/IncubationPlatform/components/HNav.vue

@@ -60,7 +60,7 @@ export default {
   width 100%
   height 2rem
   // border 1px solid pink
-  border-bottom 1px solid #4C5660
+  // border-bottom 1px solid #4C5660
   font-size: 16px;
   padding-left 1.2rem
   padding-top 0.2rem

src/views/Knowledge/Knowledge.vue

@@ -35,7 +35,7 @@ export default {
 
 <style lang="stylus" scoped>
 .inner {
-  margin: 20px auto;
+  margin: 20px 1.1rem;
 }
 
 .dev-box {

src/views/Policy/components/PolicyList.vue

@@ -8,10 +8,10 @@
   <div class="box">
     <div class="search-list">
       <!-- <search-list @iptCon="getInput" /> -->
-      <a-input-group class="search" compact style="margin: auto 1rem">
+      <a-input-group class="search" compact>
         <a-select
           @change="changeCode"
-          style="width:20%"
+          style="width:30%"
           v-model="pStatus.policyText[pStatus.value - 1]"
         >
           <a-select-option value="1">标题</a-select-option>
@@ -22,18 +22,19 @@
           @search="getPolicy"
           enter-button
           placeholder="请输入..."
-          style="width: 45%"
+          style="width: 70%"
           v-model="pStatus.iptCon"
         />
       </a-input-group>
       <span>
-        <div style="margin-top:2rem">
+        <div style="margin-top:1rem;margin-bottom:0.5rem">
             <a-checkbox :checked="pStatus.bw - 0 === 1" @click="changeStatus('bw')">国家</a-checkbox>
             <a-checkbox :checked="pStatus.sx - 0 === 1" @click="changeStatus('sx')">山西省</a-checkbox>
+             <a-checkbox :checked="pStatus.zg - 0 === 1" @click="changeStatus('zg')">山西省综改区</a-checkbox>
+          <a-checkbox :checked="pStatus.ty - 0 === 1" @click="changeStatus('ty')">太原市</a-checkbox>
         </div>
         <div>
-          <a-checkbox :checked="pStatus.zg - 0 === 1" @click="changeStatus('zg')">山西省综改区</a-checkbox>
+         
-          <a-checkbox :checked="pStatus.ty - 0 === 1" @click="changeStatus('ty')">太原市</a-checkbox>
         </div>
       
       
@@ -196,18 +197,17 @@ export default {
 }
 
 .search-list {
-  height: 7.5em;
+
   line-height: 1rem;
   background: #fff;
   padding: 0 1rem;
+  margin-bottom: 0.2rem
   position: relative;
 }
 
 .search {
-  width: 500px;
+  width: 100%;
-  // position: absolute;
+  margin 0 auto
-  right: 25px;
-  top: 20px;
 }
 
 .policy-box {

src/views/User/ForgetPassword.vue

@@ -171,4 +171,8 @@ export default {
   width: 102px !important;
   height: 32px !important;
 }
+
+/deep/ .ant-form-item{
+  margin-bottom: 0.8rem!important;
+}
 </style>

src/views/User/Login.vue

@@ -95,7 +95,7 @@
             </a-form-item>-->
 
             <div class="d-flex flex-row-reverse">
-              <a-button block class="my-5" html-type="submit" style="width: 100%" type="primary">现在登录</a-button>
+              <a-button block class="my-2" html-type="submit" style="width: 100%" type="primary">现在登录</a-button>
             </div>
           </a-form>
           <div class="d-flex flex-row-reverse mt-1">
@@ -148,7 +148,7 @@
               </a-select>
             </a-form-item>-->
             <div class="d-flex flex-row-reverse">
-              <a-button block class="my-5" html-type="submit" style="width: 100%" type="primary">现在登录</a-button>
+              <a-button block class="my-2" html-type="submit" style="width: 100%" type="primary">现在登录</a-button>
             </div>
           </a-form>
           <div class="d-flex flex-row-reverse mt-1">
@@ -297,4 +297,7 @@ export default {
   width: 102px !important;
   height: 32px !important;
 }
+/deep/ .ant-form-item{
+  margin-bottom: 0.8rem!important;
+}
 </style>

src/views/User/Register.vue

@@ -108,4 +108,8 @@ export default {
   width: 102px !important;
   height: 32px !important;
 }
+
+/deep/ .ant-form-item{
+  margin-bottom: 0.8rem!important;
+}
 </style>