样式调整

config/uat.env.js

@@ -11,5 +11,5 @@ module.exports = {
   ocrPath:'"http://180.104.121.66:8088/r/api"',
   fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="',
   appId: '"com.xcmg.app.dev"',
-  currentVersion: '"2.6.8"'
+  currentVersion: '"2.6.9"'
 }

src/pages/contractCreate/sales-info.vue

@@ -7,7 +7,7 @@
         <span>合同创建</span>
       </div>
     </h-header>
-    <h-content class="scroll-content">
+    <h-content>
       <list-item :item-height="44" class="second-part">
         <item :showArrow="true" @click.native="picker">
           <div slot="name" class="font-color required">承租人</div>
@@ -115,7 +115,7 @@
           <input type="text" placeholder="请输入承租人名称/证件号码">
         </div>
         <scroll
-          ref="scroll"
+          ref="scroll" class="scroll-content"
         >
           <div class="wrap">
             <div v-for="(item,index) in showLists" :key="index" class="contract-lists" >
@@ -572,8 +572,12 @@ export default {
 
 <style lang="less" type="text/less">
 #sales-info {
+  .content{
+      margin-top:0;
+    }
   .scroll-content{
-    margin-top:60px;
+    margin-top:0;
+    top:100px;
   }
     .date-pic {
       height: 17px;
@@ -627,7 +631,6 @@ export default {
     .wrap {
       width: 100%;
       padding: 8px;
-      margin-top: 50px;
       .contract-lists {
         width: 100%;
         background: #fff;
@@ -671,7 +674,6 @@ export default {
     }
     .content{
       position: absolute;
-      top:0;
     }
     .scrollContent{
       padding-top: 0 !important;

src/pages/myInfo/setting.vue

 <template>
-  <h-view class="setting" title="设置">
+  <h-view id="setting" class="public-style" title="设置">
     <h-header :proportion="[5,1,1]" class="bar-custom">
       <div slot="left" class="h-header-btn">
         <img src="@/assets/userBind/arrow.png" @click="$routeGo()">
@@ -15,7 +15,7 @@
           </item>
         </list-item>
         <list-item :item-height="50" class="list">
-              <item :show-arrow="true" @click.native="changePageHead()">
+          <item @click.native="changePageHead()">
             <div slot="name" style="color:#656464;">修改信息</div>
             <div class="arrow_right"><img src="@/assets/myinfo/arrow_right.png"></div>
           </item>
@@ -29,9 +29,9 @@
           </item>
           <item @click.native="updateVersion()">
             <div slot="name" style="color:#656464;width:100%;">版本更新&nbsp;&nbsp;&nbsp;
-                    <span class="updateSign" v-if="version > currentVersion">NEW</span>
-                    <span style="float:right;color:#383F45;opacity:0.4;">当前版本&nbsp;&nbsp;{{currentVersion}}</span>
+              <!-- <span v-if="version" class="updateSign">NEW</span> -->
             </div>
+            <div slot="right-icon" style="float:right;color:#383F45;opacity:0.4;">当前版本&nbsp;&nbsp;{{ currentVersion }}</div>
           </item>
           <item @click.native="unBind()">
             <div slot="name" style="color:#656464;">解除绑定</div>
@@ -56,7 +56,7 @@ import defaultImg from '../../assets/myInfo/1.png'
 export default {
   components: {
     roleSwitch,
-    defaultImg
+    defaultImg,
   },
   data () {
     return {
@@ -80,7 +80,7 @@ export default {
   },
   computed: {
     roleList () {
-      let roleObj = {'TENANT':'主承租人','GUTA':'担保人','FACTORY':'主机厂','AGENT':'经销商','OFFICE':'办事处'}
+      let roleObj = {'TENANT': '主承租人', 'GUTA': '担保人', 'FACTORY': '主机厂', 'AGENT': '经销商', 'OFFICE': '办事处'}
       let obj = {
         bp_type: this.user_bp_type,
         bp_type_n: roleObj[this.user_bp_type],
@@ -146,7 +146,7 @@ export default {
     },
     hote_update_version (content, url) {
       hlsPopup.showConfirm({
-        title: '版本更新'+ this.version,
+        title: '版本更新' + this.version,
         content: content,
         onConfirm: function (index) {
           if (index === 1) {
@@ -344,7 +344,7 @@ export default {
     changePageHead () {
       let vm = this
       if (vm.bp_id) {
-        if (vm.user_bp_status === 'NEW' ||vm.user_bp_status === 'RETURN') {
+        if (vm.user_bp_status === 'NEW' || vm.user_bp_status === 'RETURN') {
           vm.flag = true
           if (vm.user_bp_class === 'NP') {
             vm.$router.push({
@@ -542,12 +542,16 @@ export default {
         hlsPopup.hideLoading()
       }
     },
-  }
+  },
 }
 </script>
 
 <style lang="less">
-.updateSign {
+#setting{
+  .content{
+    margin-top:0 ;
+  }
+  .updateSign {
   background: red;
   color: white;
   padding: 0 5px;
@@ -560,4 +564,5 @@ export default {
     height: 20px;
   }
 }
+}
 </style>

src/pages/news/newslist.vue

-<!--
-   * @Descrip: 主页
- * @Author: your name
- * @Date: 2019-10-10 14:25:15
- * @LastEditTime: 2019-11-14 09:56:22
- * @LastEditors: Please set LastEditors
-   -->
 <template>
   <h-view id="newList" class="public-style" title="资讯动态">
-    <h-header :proportion="[5,1,1]" class="bar-custom">
+    <h-header :proportion="[5, 1, 1]" class="bar-custom">
       <div slot="left" class="h-header-btn">
-        <img src="@/assets/userBind/arrow.png" @click="$routeGo()">
+        <img src="@/assets/userBind/arrow.png" @click="$routeGo()" >
         <span>资讯动态</span>
       </div>
     </h-header>
     <div class="search has-header">
-      <input v-model="searchInput" type="text" v-on:input="searchList()" placeholder="请输入标题名称">
+      <input
+        v-model="searchInput"
+        type="text"
+        placeholder="请输入标题名称"
+        @input="searchList()"
+      >
     </div>
     <div v-if="newsList.length === 0">
       <div class="display">
-        <img src="@/assets/messageCenter/noMsg.png" alt="">
+        <img src="@/assets/messageCenter/noMsg.png" alt="" >
       </div>
     </div>
     <scroll
@@ -27,13 +25,29 @@
       :pullUp="true"
       :autoUpdate="true"
       :listenScroll="true"
+      class="scroll-content"
       @pullingUp="loadMore()"
     >
-      <div class="pay-content" v-for="(item,index) in newsList" :key="index" @click="newsInfo(item.new_id)">
+      <div
+        v-for="(item, index) in newsList"
+        :key="index"
+        class="pay-content"
+        @click="newsInfo(item.new_id)"
+      >
         <ul>
-          <li><img class="title_logo" src="@/assets/homePage/inform.png">{{item.new_title}}</li>
-          <li>{{item.new_note}}</li>
-          <li>{{item.new_date}}<span>查看详情<img src="@/assets/functionCenter/in@2x.png"></span></li>
+          <li>
+            <img class="title_logo" src="@/assets/homePage/inform.png" >{{
+              item.new_title
+            }}
+          </li>
+          <li>{{ item.new_note }}</li>
+          <li>
+            {{ item.new_date
+            }}<span
+            >查看详情<img
+              src="@/assets/functionCenter/in@2x.png"
+            ></span>
+          </li>
         </ul>
       </div>
     </scroll>
@@ -49,13 +63,12 @@ export default {
       searchInput: '',
       newsList: [],
       pageNum: 1,
-        mysetTimeout: null
+      mysetTimeout: null,
     }
   },
-  watch: {
-  },
+  watch: {},
   beforeRouteEnter (to, from, next) {
-    next(vm => {
+    next((vm) => {
       vm.searchInput = ''
       vm.pageNum = 1
       vm.getNewsList()
@@ -113,7 +126,7 @@ export default {
       })
     },
     loadMore () {
-      this.pageNum ++
+      this.pageNum++
       let url
       let param
       url = $config.basePath + 'news_query_list'
@@ -150,8 +163,8 @@ export default {
 }
 </script>
 <style lang='less'>
-  @import "../../styles/vue-1px";
-  .display {
+@import "../../styles/vue-1px";
+.display {
   position: fixed;
   top: 0;
   img {
@@ -159,9 +172,12 @@ export default {
     height: 100%;
     // margin-top: -70px;
   }
+}
+#newList {
+  background: #efefef;
+  .scroll-content {
+    top: 50px;
   }
-  #newList {
-    background: #EFEFEF;
   .pay-content {
     width: 96%;
     margin: 10px auto;
@@ -188,22 +204,22 @@ export default {
           width: 15px;
         }
         &:nth-child(2) {
-            border-bottom: 1px solid #F1F0F5;
+          border-bottom: 1px solid #f1f0f5;
         }
         span {
-            color: #1D3FFF;
+          color: #1d3fff;
           float: right;
         }
         &:nth-child(2) {
           font-family: PingFangSC-Regular;
           font-size: 14px;
-            color: rgba(56,63,69,0.60);
+          color: rgba(56, 63, 69, 0.6);
           letter-spacing: 0;
         }
         &:nth-child(3) {
           font-family: PingFangSC-Regular;
           font-size: 14px;
-            color: rgba(56,63,69,0.60);
+          color: rgba(56, 63, 69, 0.6);
           letter-spacing: 0;
         }
       }
@@ -232,7 +248,7 @@ export default {
     input::placeholder {
       font-family: PingFangSC-Regular;
       font-size: 14px;
-        color: #888C8F;
+      color: #888c8f;
       letter-spacing: 0;
     }
     input:focus {
@@ -242,5 +258,5 @@ export default {
       border: 2px solid #bcc6ff;
     }
   }
-  }
+}
 </style>

src/pages/productQuery/product-list.vue

-<!--
-   * @Description: 产品展示列表
- * @Author: y/>e: 2019-10-16 14:39:07
- * @LastEditors  : Please set LastEditors
- -->
 <template>
   <h-view id="prolist" class="public-style" title="产品线">
-    <h-header :proportion="[5,1,1]" class="bar-custom">
+    <h-header :proportion="[5, 1, 1]" class="bar-custom">
       <div slot="left" class="h-header-btn">
-        <img src="@/assets/userBind/arrow.png" @click="$routeGo()">
+        <img src="@/assets/userBind/arrow.png" @click="$routeGo()" >
         <span>产品线</span>
       </div>
     </h-header>
     <!-- 搜索 -->
     <div class="search has-header">
-      <input v-model="searchInput" type="text" placeholder="请输入经销商/产品名称/产品型号">
+      <input
+        v-model="searchInput"
+        type="text"
+        placeholder="请输入经销商/产品名称/产品型号"
+      >
     </div>
     <scroll
       ref="scroll"
       :updateData="lists"
       :pullUp="true"
+      class="scroll-content"
       @pullingUp="loadMore"
     >
       <div class="division-box">
-        <div v-for="(item,index) in lists" :key="index" class="item-pic" @click="goDetailed(item.division)">
-          <img :src="item.url" alt="">
+        <div
+          v-for="(item, index) in lists"
+          :key="index"
+          class="item-pic"
+          @click="goDetailed(item.division)"
+        >
+          <img :src="item.url" alt="" >
           <p>{{ item.product_line }}</p>
         </div>
       </div>
     </scroll>
-    <div v-if="lists.length===0">
+    <div v-if="lists.length === 0">
       <div class="display">
-        <img src="@/assets/messageCenter/noMsg.png" alt="">
+        <img src="@/assets/messageCenter/noMsg.png" alt="" >
       </div>
     </div>
   </h-view>
@@ -60,7 +65,7 @@ export default {
     },
   },
   beforeRouteEnter (to, from, next) {
-    next(vm => {
+    next((vm) => {
       if (from.name === 'QueryHome' || from.name === 'TabQueryHome') {
         vm.factory_bp_id = vm.$route.params.factory_bp_id
         vm.pagenum = 1
@@ -71,8 +76,7 @@ export default {
       }
     })
   },
-  methods:
- {
+  methods: {
     // 根据产品名称查询列表
     proQuery () {
       let vm = this
@@ -93,13 +97,25 @@ export default {
           if (vm.lists.length === 0) {
             vm.$refs.scroll.update(true)
           } else if (vm.lists.length > 0 && vm.lists.length < 10) {
-           vm.lists.forEach(item => {
-             item['url'] = item.division_attachment_id ? process.env.filePath + 'attachment_id=' + item.division_attachment_id + '&access_token=' + window.localStorage.access_token : noImg
+            vm.lists.forEach((item) => {
+              item['url'] = item.division_attachment_id
+                ? process.env.filePath +
+                  'attachment_id=' +
+                  item.division_attachment_id +
+                  '&access_token=' +
+                  window.localStorage.access_token
+                : noImg
             })
             vm.$refs.scroll.update(true)
           } else if (vm.lists.length === 10) {
-           vm.lists.forEach(item => {
-             item['url'] = item.division_attachment_id ? process.env.filePath + 'attachment_id=' + item.division_attachment_id + '&access_token=' + window.localStorage.access_token : noImg
+            vm.lists.forEach((item) => {
+              item['url'] = item.division_attachment_id
+                ? process.env.filePath +
+                  'attachment_id=' +
+                  item.division_attachment_id +
+                  '&access_token=' +
+                  window.localStorage.access_token
+                : noImg
             })
             vm.$refs.scroll.update(false)
           }
@@ -128,16 +144,28 @@ export default {
           if (returnData.length === 0) {
             vm.$refs.scroll.update(true)
           } else if (returnData.length > 0 && returnData.length < 10) {
-           returnData.forEach(item => {
-             item['url'] = item.division_attachment_id ? process.env.filePath + 'attachment_id=' + item.division_attachment_id + '&access_token=' + window.localStorage.access_token : noImg
+            returnData.forEach((item) => {
+              item['url'] = item.division_attachment_id
+                ? process.env.filePath +
+                  'attachment_id=' +
+                  item.division_attachment_id +
+                  '&access_token=' +
+                  window.localStorage.access_token
+                : noImg
             })
             returnData.forEach((data, index, array) => {
               vm.lists.push(array[index])
             })
             vm.$refs.scroll.update(true)
           } else if (returnData.length === 10) {
-           returnData.forEach(item => {
-             item['url'] = item.division_attachment_id ? process.env.filePath + 'attachment_id=' + item.division_attachment_id + '&access_token=' + window.localStorage.access_token : noImg
+            returnData.forEach((item) => {
+              item['url'] = item.division_attachment_id
+                ? process.env.filePath +
+                  'attachment_id=' +
+                  item.division_attachment_id +
+                  '&access_token=' +
+                  window.localStorage.access_token
+                : noImg
             })
             returnData.forEach((data, index, array) => {
               vm.lists.push(array[index])
@@ -167,8 +195,14 @@ export default {
       vm.hlsHttp.post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
         vm.lists = res.lists
-       vm.lists.forEach(item => {
-         item['url'] = item.division_attachment_id ? process.env.filePath + 'attachment_id=' + item.division_attachment_id + '&access_token=' + window.localStorage.access_token : noImg
+        vm.lists.forEach((item) => {
+          item['url'] = item.division_attachment_id
+            ? process.env.filePath +
+              'attachment_id=' +
+              item.division_attachment_id +
+              '&access_token=' +
+              window.localStorage.access_token
+            : noImg
         })
         if (vm.lists.length >= 0 && vm.lists.length < 10) {
           vm.$refs.scroll.update(true)
@@ -191,7 +225,10 @@ export default {
 </script>
 <style lang='less' scoped>
 #prolist {
-  background:rgba(239, 239, 239, 0.55);
+  background: rgba(239, 239, 239, 0.55);
+  .scroll-content {
+    top: 50px;
+  }
   .display {
     position: fixed;
     top: 0;
@@ -228,7 +265,7 @@ export default {
     input::placeholder {
       font-family: PingFangSC-Regular;
       font-size: 14px;
-      color: #888C8F;
+      color: #888c8f;
       letter-spacing: 0;
     }