Merge remote-tracking branch 'origin/master'

# Conflicts:
#	components/footer.vue

assets/scss/cus-client/cus-client-common.scss

@@ -765,7 +765,7 @@ h1,h2,h3,h4,h5,h6,p{font-weight:normal;margin: 0;}
 
 /* 底部跳转 */
 .bottom-btn-box{
-  height: 50px;position: fixed;bottom: 0;left: 0;right: 0;font-size: 0;background: #fff;z-index: 99999;
+  height: 50px;position: fixed;bottom: 0;left: 0;right: 0;font-size: 0;background: #fff;z-index: 99999;border-top: 1px solid #ccc;
   i{width:22px;height: 22px;background-size:cover;display: block;margin: 0 auto 3px;}
   a{width: 25%;display: inline-block;text-align: center;font-size: 13px;color: #333;margin: 6px 0;}
   a:nth-child(1) i{background-image: url("~static/images/icons/shouye.svg");}

components/footer.vue

@@ -65,6 +65,11 @@
       <p>大连栋科软件工程有限公司 版权所有</p>
       <a href="https://beian.miit.gov.cn/#/Integrated/index">辽ICP备09022904号-18</a>
     </div>
+    <div class="bottom-btn-box">
+      <a :href="item.url" v-for="(item,index) in footerData" :key="index">
+        <i></i><span>{{item.name}}</span>
+      </a>
+    </div>
   </div>
 </template>