From 71cbd933c77c364102d85f80e2123a1dfc801bea Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Mon, 27 Sep 2021 15:57:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BA=E4=BE=A7?=
 =?UTF-8?q?=E8=BE=B9=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/form/preview/ProjectForm.vue |  2 +-
 src/views/form/theme/index.vue         | 86 ++++++++++++++++++++++----
 2 files changed, 76 insertions(+), 12 deletions(-)

diff --git a/src/views/form/preview/ProjectForm.vue b/src/views/form/preview/ProjectForm.vue
index 0e565a4..231714c 100644
--- a/src/views/form/preview/ProjectForm.vue
+++ b/src/views/form/preview/ProjectForm.vue
@@ -295,7 +295,7 @@ export default {
 @import "@/assets/styles/elementui-mobile.scss";
 .project-form {
   margin: 15px auto;
-  width: 800px;
+  width: 100%;
   padding: 15px;
   background-repeat: repeat;
   background-color: rgba(229, 239, 247, 0.87);
diff --git a/src/views/form/theme/index.vue b/src/views/form/theme/index.vue
index db1a4fa..fa96b6b 100644
--- a/src/views/form/theme/index.vue
+++ b/src/views/form/theme/index.vue
@@ -3,23 +3,41 @@
     <div class="left-container">
       <el-scrollbar class="left-scrollbar-container">
         <p class="theme-title">外观主题</p>
-        <el-row>
-          <el-col :span="3">
+        <div class="tag-wr">
+          <div class="tag-title">风格</div>
+          <div class="tag-list">
+            <div v-for="item in styleList" :key="item.key" class="tag-item"
+            :class="{'tag-item-on':activeStyle==item.key}" @click="activeStyleHandle(item)">
+              {{ item.label }}</div>
+          </div>
+        </div>
+        <!-- <el-row>
+          <el-col :span="6">
             <span class="theme-prompt-text">风格</span>
           </el-col>
           <el-col v-for="item in styleList"
                   :key="item.key"
-                  :span="3">
+                  :span="6">
             <span :class="{'style-btn-active':activeStyle==item.key}"
                   class="style-btn"
                   @click="activeStyleHandle(item)">{{ item.label }}</span>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="3">
+        </el-row> -->
+        <div class="tag-wr">
+          <div class="tag-title">颜色</div>
+          <div class="tag-list">
+            <div class="tag-item"
+            :class="{'tag-item-on':activeColor==''}" @click="activeColorHandle('')">全部</div>
+            <div v-for="c in colorList" :key="c" class="tag-item tag-c"
+            :style="{backgroundColor: c}"
+            :class="{'tag-item-on':activeColor==c}" @click="activeColorHandle(c)"></div>
+          </div>
+        </div>
+        <!-- <el-row>
+          <el-col :span="6">
             <span class="theme-prompt-text">颜色</span>
           </el-col>
-          <el-col :span="3">
+          <el-col :span="6">
             <span :class="{'style-btn-active':activeColor==''}"
                   class="style-btn"
                   @click="activeColorHandle('')">全部</span>
@@ -27,11 +45,11 @@
           <el-col v-for="c in colorList"
                   :key="c"
                   :class="{'style-btn-active':activeColor==c}"
-                  :span="3"
+                  :span="6"
                   :style="{backgroundColor: c}"
                   class="color-btn"
                   @click.native="activeColorHandle(c)" />
-        </el-row>
+        </el-row> -->
         <el-row>
           <el-col v-for="t in themeList"
                   :key="t.id"
@@ -411,7 +429,7 @@ export default {
 }
 .left-scrollbar-container {
   height: 100%;
-  margin: 20px;
+  margin: 20px 10px 20px 10px;
 }
 ::v-deep .el-scrollbar__wrap {
   overflow-x: hidden !important;
@@ -426,7 +444,7 @@ export default {
   border: 1px solid #eaeaea;
 }
 .preview-container {
-  width: 70%;
+  width: 60%;
 }
 .theme-title {
   color: rgba(16, 16, 16, 100);
@@ -519,3 +537,49 @@ export default {
   text-align: left;
 }
 </style>
+
+<style lang="scss" scoped>
+.tag-wr {
+  width: 100%;
+  display: flex;
+  margin-bottom: 10px;
+  .tag-title {
+    flex-shrink: 0;
+    width: 50px;
+    font-size: 16px;
+    font-weight: 500;
+  }
+  .tag-list {
+    // flex: 1;
+    display: flex;
+    flex-wrap: wrap;
+    .tag-item {
+      box-sizing: border-box;
+      margin: 0px 6px 6px 0;
+      // line-height: 30px;
+      border-radius: 4px;
+      padding: 3px;
+      color: #707070;
+      font-size: 14px;
+      text-align: center;
+      cursor: pointer;
+      border: 1px solid #eaeaea;
+    }
+    .tag-item:nth-child(4n) {
+      margin-right: 0;
+    }
+    
+    .tag-c {
+      width: 40px;
+      height: 20px;
+      border: 0;
+    }
+    .tag-c:hover {
+      border: 1px solid rgba(11, 141, 213, 100);
+    }
+    .tag-item-on {
+      border: 1px solid rgba(11, 141, 213, 100);
+    }
+  }
+}
+</style>