Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/App.vue

@@ -12,7 +12,7 @@ export default {
 
 <style>
 @import url('~assets/css/font.css');
-@import url('//at.alicdn.com/t/font_2077629_madzhlq9km.css');
+@import url('//at.alicdn.com/t/font_2077629_lvmqshn6xor.css');
 
 html,
 body,

src/pages/system/document.vue

@@ -54,15 +54,15 @@
           </template>
           <template v-slot:body-cell-optioned="props">
             <q-td :props="props">
-              <q-btn flat size="xs" icon="iconfont icon-ziyuan" color="warning" style="font-weight:400" class="q-mr-xs"
+              <q-btn flat size="xs" icon="iconfont icon-zhiding"  style="font-weight:400;color: #789CFF" class="q-mr-xs"
                      label="置顶" @click="setNoticeOtion(props.row.Id,1)" v-if="props.row.NoticeState==1&&props.row.Is_Top==2" />
-              <q-btn flat size="xs" icon="iconfont icon-ziyuan" color="warning" style="font-weight:400" class="q-mr-xs"
+              <q-btn flat size="xs" icon="iconfont icon-quxiaozhiding1"  style="font-weight:400;color:#FF7C93;" class="q-mr-xs"
                      label="取消置顶" @click="setNoticeOtion(props.row.Id,2)" v-if="props.row.NoticeState==1&&props.row.Is_Top==1" />
-              <q-btn flat size="xs" icon="iconfont icon-xiangqing-" color="primary" style="font-weight:400" class="q-mr-xs"
+              <q-btn flat size="xs" icon="iconfont icon-xiangqing-"  style="font-weight:400;color: #3FC4FF" class="q-mr-xs"
                      label="详情" @click="EditConfig(props.row.Id)" />
               <q-btn flat size="xs" icon="iconfont icon-chehui4" color="deep-orange" style="font-weight:400" class="q-mr-xs"
                      label="撤回" @click="setNoticeOtion(props.row.Id,3)" v-if="props.row.NoticeState==1"  />
-              <q-btn flat size="xs" icon="iconfont icon-xiugai1" color="secondary" style="font-weight:400" class="q-mr-xs"
+              <q-btn flat size="xs" icon="iconfont icon-xiugai1"  style="font-weight:400;color: #02C499" class="q-mr-xs"
                      label="修改" v-if="props.row.NoticeState!=1"  @click="addDoc(props.row.Id)"  />
             </q-td>
           </template>