begmoon 2 gadi atpakaļ
vecāks
revīzija
e59ca7125a

+ 15 - 15
src/router.js

@@ -138,12 +138,12 @@ export default new Router({
                         import ('./views/comments/stockNBComments.vue'),
                     name: '牛人点评'
                 },
-                {
-                    path: '/famous/list',
-                    component: () =>
-                        import ('./views/comments/famousUserList.vue'),
-                    name: '名人堂'
-                }
+                // {
+                //     path: '/famous/list',
+                //     component: () =>
+                //         import ('./views/comments/famousUserList.vue'),
+                //     name: '名人堂'
+                // }
             ]
         },
         {
@@ -182,16 +182,16 @@ export default new Router({
                     path: '/championsay',
                     component: () =>
                         import ('./views/match/championSay.vue'),
-                    name: '冠军心得'
-                },
-                {
-                    path: '/addChampionSay',
-                    component: () =>
-                        import ('./views/match/addChampionSay.vue'),
-                    name: '新增冠军心得',
-                    hide: 1,
-                    isLeaf: 1
+                    name: '文章数据'
                 },
+                // {
+                //     path: '/addChampionSay',
+                //     component: () =>
+                //         import ('./views/match/addChampionSay.vue'),
+                //     name: '新增冠军心得',
+                //     hide: 1,
+                //     isLeaf: 1
+                // },
                 {
                     path: '/stock',
                     component: () =>

+ 6 - 3
src/views/baike/Index.vue

@@ -248,13 +248,16 @@
         <el-form-item label="词条简介">
             <el-input v-model="baikeDetailForm.intro" placeholder="" type="textarea" rows=10></el-input>
           </el-form-item>
-        <el-form-item label="词条解释">
+        <!-- <el-form-item label="词条解释">
           <fuEditor
             v-model="baikeDetailForm.content"
             :isClear="isClear"
           ></fuEditor>
-          <!-- <el-input v-model="baikeDetailForm.content" placeholder="" type="textarea" rows="10"></el-input> -->
-        </el-form-item>
+        </el-form-item> -->
+        <el-form-item label="词条解释">
+        <vue-ueditor-wrap ref="editor" v-model="baikeDetailForm.content" :config="myConfig"></vue-ueditor-wrap>
+      </el-form-item>
+
         <el-form-item label="作者">
           <el-input v-model="baikeDetailForm.editor" placeholder=""></el-input>
         </el-form-item>

+ 2 - 3
src/views/match/addChampionSay.vue

@@ -28,7 +28,7 @@
 </style>
 <template>
   <section class="content">
-    <h4>新增冠军心得</h4>
+    <h4>新增文章</h4>
     <el-divider></el-divider>
     <el-form label-width="80px">
       <el-form-item label="分类">
@@ -127,10 +127,9 @@ export default {
 	      serverUrl: '/api/admin/ueditor/upload',
 	    },
       categoryList:[
-        {label:"腰斩专场",value:"腰斩专场"},
+        {label:"游资专场",value:"游资专场"},
         {label:"冠军交割",value:"冠军交割"},
         {label:"牛人专场",value:"牛人专场"},
-        {label:"游资列传",value:"游资列传"},
         {label:"妖股列传",value:"妖股列传"}
       ],
       bannerList:[

+ 35 - 6
src/views/match/championSay.vue

@@ -1,6 +1,6 @@
 <template>
   <section class="content">
-    <h4>冠军心得</h4>
+    <h4>文章数据</h4>
     <el-divider></el-divider>
     <el-form label-width="80px" class="filter-form">
       <el-row>
@@ -27,6 +27,25 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="5">
+          <el-form-item label="是否置顶">
+            <el-select
+              v-model="queryParams.isbanner"
+              placeholder="请选择是否置顶"
+              @change="getData()"
+              size="mini"
+              clearable
+            >
+              <el-option
+                v-for="item in bannerList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
         <el-col :span="4">
           <el-form-item label-width="10" style="margin-left: 10px">
             <el-button type="primary" @click="getData" size="mini"
@@ -56,6 +75,12 @@
             <img :src="scope.row.img" width="180" height="80" alt="">
         </template>
       </el-table-column>
+      <el-table-column align="center" prop="isbanner" label="置顶">
+        <template slot-scope="scope">
+          <span v-if="scope.row.isbanner == 0">未置顶</span>
+          <span v-if="scope.row.isbanner == 1">已置顶</span>
+        </template>
+      </el-table-column>
       <el-table-column align="center" prop="date" label="状态">
         <template slot-scope="scope">
           <span v-if="scope.row.status == 1">编辑中</span>
@@ -155,11 +180,15 @@ export default {
       groupList: [],
       userList: [],
       categoryList:[
-        {label:"每日点评",value:"每日点评"},
-        {label:"冠军心得",value:"冠军心得"},
-        {label:"腰斩心得",value:"腰斩心得"},
-        {label:"牛人专访",value:"牛人专访"}
-      ]
+        {label:"游资专场",value:"游资专场"},
+        {label:"冠军交割",value:"冠军交割"},
+        {label:"牛人专场",value:"牛人专场"},
+        {label:"妖股列传",value:"妖股列传"}
+      ],
+      bannerList: [
+        { label: "未置顶", value: 0 },
+        { label: "已置顶", value: 1 },
+      ],
     };
   },
   methods: {

+ 3 - 3
src/views/sys/Version.vue

@@ -17,9 +17,9 @@
       </el-row>
     </el-form>
     <el-table v-loading="loading" :data="list" style="width: 100%; margin-top: 10px" height="50vh">
-      <el-table-column align="center" prop="version" label="版本号" />
-      <el-table-column align="center" prop="android_version" label="android版本" />
-      <el-table-column align="center" prop="android_url" label="andorid安装包地址" />
+      <el-table-column align="center" prop="name" label="更新内容" />
+      <el-table-column align="center" prop="version" label="iOS版本号" />
+      <el-table-column align="center" prop="android_version" label="android版本号" />
       <el-table-column align="center" prop="ios_url" label="ios安装包地址" />
       <el-table-column align="center" prop="force" label="状态">
         <template slot-scope="scope">