guhongwei 3 years ago
parent
commit
d1c96184e0
3 changed files with 27 additions and 16 deletions
  1. 1 1
      src/views/news/detail.vue
  2. 15 11
      src/views/news/index.vue
  3. 11 4
      src/views/viewPoint/detail.vue

+ 1 - 1
src/views/news/detail.vue

@@ -82,7 +82,7 @@ export default {
       form: {},
       // 栏目列表
       columnList: [],
-      loading: true,
+      loading: false,
     };
   },
   async created() {

+ 15 - 11
src/views/news/index.vue

@@ -98,19 +98,23 @@ export default {
       form: {},
       // 位置信息
       siteList: [
-        { name: '问卷调查', site: 'wjdc' },
-        { name: '行业研究', site: 'hyyj' },
-        { name: '科技咨讯', site: 'kjzx' },
-        { name: '工作动态', site: 'gzdt' },
-        { name: '通知通告', site: 'tgtg' },
-        { name: '技术前沿', site: 'jsqy' },
-        { name: '政策解读', site: 'zcjd' },
-        { name: '科技培训', site: 'kjpx' },
-        { name: '科研动态', site: 'kydt' },
+        { name: '咨询服务', site: 'zxfw' },
+        { name: '科企观察', site: 'kqgc' },
+        { name: '政策信息', site: 'zcxx' },
+        { name: '医药资讯', site: 'yyzx' },
         { name: '学术交流', site: 'xsjl' },
         { name: '院地合作', site: 'ydhz' },
-        { name: '热点事件', site: 'rdsj' },
-        { name: '省内动态', site: 'sndt' },
+        { name: '科研动态', site: 'kydt' },
+        { name: '科技培训', site: 'kjpx' },
+        { name: '政策解读', site: 'zcjd' },
+        { name: '技术前沿', site: 'jsqy' },
+        { name: '通知通告', site: 'tgtg' },
+        { name: '工作动态', site: 'gzdt' },
+        { name: '科技咨讯', site: 'kjzx' },
+        { name: '行业研究', site: 'hyyj' },
+        { name: '问卷调查', site: 'wjdc' },
+        // { name: '热点事件', site: 'rdsj' },
+        // { name: '省内动态', site: 'sndt' },
       ],
       // 信息列表
       newsopera: [

+ 11 - 4
src/views/viewPoint/detail.vue

@@ -6,7 +6,7 @@
           <el-button type="primary" size="mini" @click="back">返回</el-button>
         </el-col>
         <el-col :span="24" class="down" v-loading="loading">
-          <data-form :data="form" :fields="fields" :rules="{}" @save="toSave">
+          <data-form :data="form" :fields="fields" :rules="{}" @save="toSave" v-if="!loading">
             <template #custom="{item,form}">
               <template v-if="item.model == 'picture'">
                 <upload :limit="1" :data="form.picture" type="picture" :url="'/files/picture/upload'" @upload="uploadSuccess" @delete="uploadDelete"></upload>
@@ -36,8 +36,15 @@
               <template v-else-if="item.model == 'is_money'">
                 <el-switch v-model="form.is_money" active-color="#13ce66" inactive-color="#ff4949"> </el-switch>
               </template>
-              <template v-else-if="item.model == 'money'">
-                <el-input v-model="form.money" placeholder="请输入金额" :disabled="form.is_money == true ? false : true" @keyup.native="number"></el-input>
+              <template v-else-if="item.model == 'money_url'">
+                <upload
+                  :limit="1"
+                  :data="form.money_url"
+                  type="money_url"
+                  :url="'/files/moneyurl/upload'"
+                  @upload="uploadSuccess"
+                  @delete="uploadDelete"
+                ></upload>
               </template>
             </template>
           </data-form>
@@ -67,7 +74,7 @@ export default {
         { label: '信息来源', model: 'origin' },
         { label: '信息简介', model: 'brief', type: 'textarea' },
         { label: '是否收费', model: 'is_money', custom: true },
-        { label: '输入金额(元)', model: 'money', custom: true },
+        { label: '上传收款图片', model: 'money_url', custom: true },
         { label: '图片文件', model: 'picture', custom: true },
         { label: '视频文件', model: 'video', custom: true },
         { label: '附件文件', model: 'filepath', custom: true },