Merge branch 'master' of http://git.cc-lotus.info/shuiTou/web

src/App.vue

@@ -20,6 +20,5 @@ p {
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
-  font-family: 'PingFangSC-Regular';
 }
 </style>

src/assets/base.css

@@ -19,6 +19,7 @@
   --vt-c-text-light-2: rgba(60, 60, 60, 0.66);
   --vt-c-text-dark-1: var(--vt-c-white);
   --vt-c-text-dark-2: rgba(235, 235, 235, 0.64);
+  font-family: 'PingFang SC';
 }
 
 /* semantic color variables for this project */
@@ -77,6 +78,7 @@ body {
     'Droid Sans',
     'Helvetica Neue',
     sans-serif; */
+  font-family: 'PingFang SC';
   font-size: 15px;
   text-rendering: optimizeLegibility;
   -webkit-font-smoothing: antialiased;

src/assets/font.css

@@ -5,8 +5,8 @@
   font-style: normal;
 }
 body {
-  font-family: 'PingFangSC-Regular', sans-serif !important;
+  font-family: 'PingFangSC-Regular', sans-serif;
 }
 :root {
-  font-family: 'PingFangSC-Regular', sans-serif !important;
+  font-family: 'PingFangSC-Regular', sans-serif;
 }

src/main.ts

@@ -1,12 +1,12 @@
 import { createApp } from 'vue'
 import { createPinia } from 'pinia'
-import './assets/font.css'
 import App from './App.vue'
 import router from './router'
 
 import './permission'
 
 import './assets/main.css'
+import './assets/font.css'
 
 import ElementPlus from 'element-plus'
 import 'element-plus/dist/index.css'

src/views/win/popularwillParts/formIndex.vue

@@ -89,9 +89,9 @@
             </el-form>
           </el-col>
         </el-col>
-        <el-col :span="24" class="list" v-else-if="tabActive == '2'">
+        <!-- <el-col :span="24" class="list" v-else-if="tabActive == '2'">
           <suggestion-index />
-        </el-col>
+        </el-col> -->
         <el-col :span="24" class="back" v-else-if="tabActive == '3'">
           <respond-index />
         </el-col>
@@ -116,10 +116,10 @@ const tabList = ref([
     id: '1',
     title: '投诉与建议',
   },
-  {
-    id: '2',
-    title: '投诉与建议记录',
-  },
+  // {
+  //   id: '2',
+  //   title: '投诉与建议记录',
+  // },
   {
     id: '3',
     title: '热点回应',
@@ -268,7 +268,7 @@ const resetForm = () => {
 
         .formMess {
           border-radius: 10px;
-          background: rgba(238, 250, 255, 0.5);
+          background: rgba(238, 227, 70, 0.5);
           padding: 40px 70px;
         }