Merge pull request '修改中等按钮边框、增加表格内悬浮提示样式' (#30) from zq-popup into master

Reviewed-on: #30

src/style/theme/common.scss

@@ -277,12 +277,31 @@ body {
 .el-button--system {
     color: #006AFF;
     background: #FFFFFF;
-    border: 1px solid #DFE2E6;
+    border: 1px solid #006AFF;
     &:hover{
         background: #F2F7FF;
         border: 1px solid #006AFF;
     }
 }
+
+.el-button--text,.el-button--grey {
+    padding: 0;
+    color: #006AFF;
+    width: auto !important;
+    height: auto !important;
+    border: none !important;
+    background: transparent !important;
+    &:hover{
+        opacity: 0.7;
+    }
+}
+.el-button--grey {
+    color: #8A9099;
+    &:hover{
+        color: #006AFF;
+        opacity: 1;
+    }
+}
 .el-button--ignore{
     color: #626573;
     background: #FFFFFF;
@@ -390,6 +409,7 @@ body {
 .el-input {
     border-radius: 2px;
     border: 1px solid transparent;
+    font-family: Microsoft YaHei UI;
 }
 
 .el-input:focus-within {
@@ -466,6 +486,11 @@ body {
     width: 100%;
     transition: all .5s;
 }
+// 应用在表格表头上的下拉开框 统一类名修改 字体效果
+.tableHeaderSelect ::v-deep .el-input__inner{
+    font-weight: normal;
+    font-family: Microsoft YaHei UI;
+}
 
 .el-select:hover .el-input__inner {
     transition: all .5s;
@@ -664,11 +689,12 @@ body {
     border: 1px solid#EAECF0;
 }
 
-.el-button--text {
-    padding: 0;
-    width: auto !important;
-    height: auto !important;
-}
+// .el-button--text {
+//     padding: 0;
+//     width: auto !important;
+//     height: auto !important;
+//     background: transparent !important;
+// }
 
 .el-table th.el-table__cell {
     background: #F6F7FA;
@@ -693,7 +719,7 @@ body {
 }
 
 // 表格行内小图标 默认隐藏
-.svg-icon-wrapper{
+.el-table .svg-icon-wrapper{
     display: none !important;
 }
   //划过时 显示

src/views/elementGroups.vue

@@ -40,18 +40,36 @@
                         <el-table-column prop="created_at" label="时间" width="200">
                             <template slot-scope="scope">
                                 <div class="flex cell_render">
-                                    <GuipToolTip content="点击编辑">
+                                    <GuipToolTip content="文字居中">
                                         <span :class="(scope.row.payment == '0' ? 'normal_payment' : 'self_payment')">{{
                                             scope.row.payment
                                                 ==
-                                            '0' ? '默认站点支付' : '自定义支付' }}</span>
+                                            '0' ? '文字居中' : '文字居中' }}</span>
                                     </GuipToolTip>
-                                    <svg-icon :path="require('@/assets/register/tableEdit.svg')" :color="'#8A9099'"
+                                    <GuipToolTip content="图标居中">
+                                        <svg-icon :path="require('@/assets/register/tableEdit.svg')" :color="'#8A9099'"
                                         :hoverColor="'#006AFF'" />
+                                    </GuipToolTip>
+
                                 </div>
                             </template>
                         </el-table-column>
-                        <el-table-column prop="unit_num" label="数量" width="150"></el-table-column>
+                        <el-table-column prop="unit_num" label="数量" width="180">
+                            <template slot-scope="scope">
+                                <GuipToolTip content="单元格局中">
+                                    <div class="flex">
+                                        <span :class="(scope.row.payment == '0' ? 'normal_payment' : 'self_payment')">{{
+                                            scope.row.payment
+                                                ==
+                                            '0' ? '单元格局中' : '单元格局中' }}</span>
+                                             <svg-icon :path="require('@/assets/register/tableEdit.svg')" :color="'#8A9099'"
+                                             :hoverColor="'#006AFF'" />
+                                    </div>
+
+                                    </GuipToolTip>
+                            </template>
+
+                        </el-table-column>
                         <el-table-column prop="name2" label="姓名" width="150"></el-table-column>
                         <el-table-column prop="price" label="价格" width="150">
                             <!-- <template slot-scope="scope">
@@ -76,7 +94,7 @@
                                     prop="card" :options="options" defaultValue="选项1" />
                             </template>
                         </el-table-column>
-                        <el-table-column label="操作" width="100" fixed>
+                        <el-table-column label="操作" width="200" fixed>
                             <template slot-scope="scope">
                                 <div class="flex">
                                     <el-button @click="handleClick(scope.row)" type="text">查看</el-button>
@@ -203,6 +221,11 @@
                 <GuipButton type="system" disabled>按钮</GuipButton>
             </div>
             <div class="ele-item">
+                <label for="">文字按钮：</label>
+                <GuipButton type="text" >强引导</GuipButton>
+                <GuipButton type="grey" >弱引导</GuipButton>
+            </div>
+            <div class="ele-item">
                 <label for="">独特按钮：</label>
                 <hover-button button-text="上传文件" :default-icon="require('../assets/upLoad_grey.svg')"
                     :hover-icon="require('../assets/upLoad_active.svg')" default-text-color="#23242B"