样式调整

package.json

@@ -55,7 +55,9 @@
     "less-loader": "^4.1.0",
     "node-sass": "^4.11.0",
     "sass-loader": "^7.0.1",
-    "vue-template-compiler": "^2.6.10"
+    "vue-template-compiler": "^2.6.10",
+    "autoprefixer": "9.5.1",
+    "postcss-pxtorem": "^5.1.1"
   },
   "eslintConfig": {
     "root": true,

src/components/layouts/TabLayout.vue

@@ -8,7 +8,6 @@
       v-if="multipage"
       :active-key="activePage"
       class="tab-layout-tabs"
-      style="height:52px"
       :hide-add="true"
       type="editable-card"
       @change="changePage"
@@ -286,6 +285,11 @@
     margin-top: 4px;
   }
 
+  .tab-layout-tabs{
+    height: 52px;
+    margin:0 12px 0 12px!important;
+  }
+
   /* 修改 ant-tabs 样式 */
   .tab-layout-tabs.ant-tabs {
     border-bottom: 1px solid #ccc;

src/components/menu/SideMenu.vue

@@ -1,7 +1,6 @@
 <template>
   <a-layout-sider
     :class="['sider', isDesktop() ? null : 'shadow', theme, fixSiderbar ? 'ant-fixed-sidemenu' : null ]"
-    width='256px'
     :collapsible='collapsible'
     v-model='collapsed'
     :trigger='null'>
@@ -146,6 +145,18 @@ export default {
 
 <!-- update_begin author:sunjianlei date:20190530 for: 选中首页的时候不显示背景颜色 -->
 <style lang='scss'>
+#app .layout .ant-layout-sider{
+  flex: 0 0 256px!important;
+  max-width: 256px!important;
+  min-width: 256px!important;
+  width: 256px!important;
+}
+#app .layout .ant-layout-sider-collapsed{
+  flex: 0 0 80px!important;
+  max-width: 80px!important;
+  min-width: 80px!important;
+  width: 80px!important;
+}
 .ant-menu.ant-menu-root {
   & > .ant-menu-item:first-child {
     background-color: transparent;

src/main.js

@@ -40,6 +40,7 @@ import JeecgComponents from '@/components/jeecg/index'
 import App from './App.vue'
 import router from './router'
 import store from './store/'
+import './rem'
 
 Vue.config.productionTip = false
 Vue.use(Storage, config.storageOptions)

src/rem.js

@@ -0,0 +1,14 @@
+// 此处的16跟上面的16对应，同样是倍数
+const baseSize = 16
+// 设置根节点的font-size大小函数
+function setRem () {
+  const scale = document.documentElement.clientWidth / 1920
+  // 设置页面根节点字体大小
+  document.documentElement.style.fontSize = (baseSize * Math.min(scale, 2)) + 'px'
+}
+// 初始化
+setRem()
+// 改变窗口大小时重新设置根节点的font-size大小
+window.onresize = function () {
+  setRem()
+}

src/views/hwaccount/HwAccountManager.vue

@@ -227,7 +227,7 @@ export default {
         },
         {
           title: '导入付款单',
-          content: '导入付款人员名单进行服务费核算',
+          content: '导入付款人名单进行结算',
           icon: require('../../assets/icon/account/payment.png')
         },
         {
@@ -255,7 +255,7 @@ export default {
         {
           image: require('@/assets/icon/account/paymentCount.png'),
           title: 'paymentCount',
-          content: '已支付订单数'
+          content: '总支付数'
         }
       ],
       accountData: {
@@ -583,7 +583,7 @@ export default {
 
   .step-list-item {
     width: 20%;
-    height: 139px;
+    min-height: 139px;
     padding: 25px 0 25px 25px;
 
     .step-list-item-top {
@@ -619,6 +619,7 @@ export default {
       font-weight: 400;
       color: rgba(0, 0, 0, 0.65);
       padding-left: 55px;
+      padding-right: 25px;
     }
   }
 }
@@ -698,7 +699,7 @@ export default {
   font-size: 12px;
   font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
-  color: rgba(0, 0, 0, 0.65);
+  color: #DA5631;
   margin-bottom: 15px;
 }
 

src/views/hwpayment/HwPaymentList.vue

@@ -26,7 +26,7 @@
             <a-col :md="6" :sm="8">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
 <!--              <a @click="handleToggleSearch">-->
-<!--                {{ toggleSearchStatus ? '收起全部' : '展开全部' }}-->
+<!--                {{ toggleSearchStatus ? '取消' : '展开' }}-->
 <!--                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
 <!--              </a>-->
               <a-button ghost type='primary' @click="searchQuery" icon="search">查询</a-button>

src/views/hwuser/HwUserList.vue

@@ -55,7 +55,7 @@
           <a-col :md="6" :sm="8">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a @click="handleToggleSearch">
-                {{ toggleSearchStatus ? '收起全部' : '展开全部' }}
+                {{ toggleSearchStatus ? '取消' : '展开' }}
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
               </a>
               <a-button ghost type='primary' @click="searchQuery" icon="search" style="margin-left: 8px">查询</a-button>

src/views/ordermanager/HwOrderList.vue

@@ -55,7 +55,7 @@
           <a-col :md="6" :sm="8">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a @click="handleToggleSearch">
-                {{ toggleSearchStatus ? '收起全部' : '展开全部' }}
+                {{ toggleSearchStatus ? '取消' : '展开' }}
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
               </a>
               <a-button ghost type='primary' @click="searchQuery" icon="search" style="margin-left: 8px">查询</a-button>

src/views/requiremanager/HwRequirementList.vue

@@ -63,7 +63,7 @@
             <a-col :md="6" :sm="8" >
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a @click="handleToggleSearch">
-                {{ toggleSearchStatus ? '收起全部' : '展开全部' }}
+                {{ toggleSearchStatus ? '取消' : '展开' }}
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
               </a>
               <a-button ghost type='primary' @click="searchQuery" icon="search" style="margin-left: 8px">查询</a-button>

src/views/saasmanager/HwPlatformCompanyList.vue

@@ -46,7 +46,7 @@
           <a-col :md="6" :sm="8">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a @click="handleToggleSearch">
-                {{ toggleSearchStatus ? '收起全部' : '展开全部' }}
+                {{ toggleSearchStatus ? '取消' : '展开' }}
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
               </a>
               <a-button ghost type='primary' @click="searchQuery" icon="search" style="margin-left: 8px">查询</a-button>

vue.config.js

@@ -4,6 +4,9 @@ function resolve(dir) {
   return path.join(__dirname, dir)
 }
 
+const autoprefixer = require('autoprefixer')
+const pxtorem = require('postcss-pxtorem')
+
 // vue.config.js
 module.exports = {
   /*
@@ -51,18 +54,28 @@ module.exports = {
           */
         },
         javascriptEnabled: true,
-      }
+      },
+      postcss: {
+        plugins: [
+          autoprefixer(),
+          pxtorem({
+            rootValue: 16,
+            propList: ['*'],
+          }),
+        ],
+      },
     }
   },
 
   devServer: {
     port: 8088,
+    open: true,
     proxy: {
       '/happy-boot': {
         target: 'http://localhost:8089', //请求本地 需要happy-boot后台项目
         ws: false,
         changeOrigin: true
-      },
+      }
     }
   },
 

yarn.lock

@@ -1789,6 +1789,18 @@ autoprefixer-loader@^3.2.0:
     postcss "^5.0.4"
     postcss-safe-parser "^1.0.1"
 
+autoprefixer@9.5.1:
+  version "9.5.1"
+  resolved "https://registry.nlark.com/autoprefixer/download/autoprefixer-9.5.1.tgz#243b1267b67e7e947f28919d786b50d3bb0fb357"
+  integrity sha1-JDsSZ7Z+fpR/KJGdeGtQ07sPs1c=
+  dependencies:
+    browserslist "^4.5.4"
+    caniuse-lite "^1.0.30000957"
+    normalize-range "^0.1.2"
+    num2fraction "^1.2.2"
+    postcss "^7.0.14"
+    postcss-value-parser "^3.3.1"
+
 autoprefixer@^6.0.2, autoprefixer@^6.3.1:
   version "6.7.7"
   resolved "https://registry.npm.taobao.org/autoprefixer/download/autoprefixer-6.7.7.tgz?cache=0&sync_timestamp=1579034335808&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fautoprefixer%2Fdownload%2Fautoprefixer-6.7.7.tgz#1dbd1c835658e35ce3f9984099db00585c782014"
@@ -2856,6 +2868,11 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001020, can
   resolved "https://registry.npm.taobao.org/caniuse-lite/download/caniuse-lite-1.0.30001035.tgz#2bb53b8aa4716b2ed08e088d4dc816a5fe089a1e"
   integrity sha1-K7U7iqRxay7QjgiNTcgWpf4Imh4=
 
+caniuse-lite@^1.0.30000957:
+  version "1.0.30001248"
+  resolved "https://registry.nlark.com/caniuse-lite/download/caniuse-lite-1.0.30001248.tgz?cache=0&sync_timestamp=1627455535000&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcaniuse-lite%2Fdownload%2Fcaniuse-lite-1.0.30001248.tgz#26ab45e340f155ea5da2920dadb76a533cb8ebce"
+  integrity sha1-JqtF40DxVepdopINrbdqUzy4684=
+
 case-sensitive-paths-webpack-plugin@^2.2.0:
   version "2.3.0"
   resolved "https://registry.npm.taobao.org/case-sensitive-paths-webpack-plugin/download/case-sensitive-paths-webpack-plugin-2.3.0.tgz#23ac613cc9a856e4f88ff8bb73bbb5e989825cf7"
@@ -8705,6 +8722,13 @@ postcss-ordered-values@^4.1.2:
     postcss "^7.0.0"
     postcss-value-parser "^3.0.0"
 
+postcss-pxtorem@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.npm.taobao.org/postcss-pxtorem/download/postcss-pxtorem-5.1.1.tgz#198a68c10f9ad2d42370ef66299d7b3168f8cffa"
+  integrity sha1-GYpowQ+a0tQjcO9mKZ17MWj4z/o=
+  dependencies:
+    postcss "^7.0.27"
+
 postcss-reduce-idents@^2.2.2:
   version "2.4.0"
   resolved "https://registry.npm.taobao.org/postcss-reduce-idents/download/postcss-reduce-idents-2.4.0.tgz#c2c6d20cc958284f6abfbe63f7609bf409059ad3"
@@ -8821,7 +8845,7 @@ postcss-unique-selectors@^4.0.1:
     postcss "^7.0.0"
     uniqs "^2.0.0"
 
-postcss-value-parser@^3.0.0, postcss-value-parser@^3.0.1, postcss-value-parser@^3.0.2, postcss-value-parser@^3.1.1, postcss-value-parser@^3.1.2, postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0:
+postcss-value-parser@^3.0.0, postcss-value-parser@^3.0.1, postcss-value-parser@^3.0.2, postcss-value-parser@^3.1.1, postcss-value-parser@^3.1.2, postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0, postcss-value-parser@^3.3.1:
   version "3.3.1"
   resolved "https://registry.npm.taobao.org/postcss-value-parser/download/postcss-value-parser-3.3.1.tgz?cache=0&sync_timestamp=1582038102813&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-value-parser%2Fdownload%2Fpostcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
   integrity sha1-n/giVH4okyE88cMO+lGsX9G6goE=