1

src/pages/activity/activity_index.vue

@@ -198,7 +198,7 @@
         </table>
       </div>
     </t-dialog>
-    <t-dialog header="捐赠详情" :confirmBtn="null" :visible="JuanMode" :onClose="onCloseMy" width="65%" top="50px">
+    <t-dialog :header="getType==3?'捐赠详情':'付费详情'" :confirmBtn="null" :visible="JuanMode" :onClose="onCloseMy" width="65%" top="50px">
       <div style="height: 600px;overflow-y: scroll;">
         <table class="layui-table" style="margin: 10px 0px">
           <thead>
@@ -532,6 +532,7 @@ export default {
         autoFocus: true,
         MENU_CONF: {
           uploadImage: {
+            maxFileSize: 50 * 1024 * 1024,
             server: store.state.user.apiUrl + '/api/common/upload',
             fieldName: 'file',
             metaWithUrl: false,
@@ -545,6 +546,11 @@ export default {
               // 从 res 中找到 url alt href ，然后插入图片
               insertFn(res.data.fullurl, '', '')
             },
+            onError:(file, err, res)=>{
+              if(err.message.indexOf('exceeds maximum allowed size') !== -1){
+                this.$message.error('限制为50M，请调整好再上传！',2000);
+              }
+            },
           }
         }
       },
@@ -977,6 +983,9 @@ export default {
           if (res.code == 1) {
             this.list = res.data.ret;
             this.pagination.total = res.data.count;
+          }else{
+            this.list = [];
+            this.pagination.total =0;
           }
 
         })

src/pages/association/index.vue

@@ -151,6 +151,7 @@ export default {
         autoFocus: true,
         MENU_CONF: {
           uploadImage: {
+            maxFileSize: 50 * 1024 * 1024,
             server: store.state.user.apiUrl + '/api/common/upload',
             fieldName: 'file',
             meta:{

src/pages/business/index.vue

@@ -144,6 +144,7 @@ export default {
         autoFocus: true,
         MENU_CONF: {
           uploadImage: {
+            maxFileSize: 50 * 1024 * 1024,
             server: store.state.user.apiUrl + '/api/common/upload',
             fieldName: 'file',
             meta:{

src/pages/news/news_index.vue

@@ -59,6 +59,9 @@
         <t-form-item label="点击量" name="news_source">
           <t-input placeholder="请输入自定义点击量" v-model="addForm.news_hits"/>
         </t-form-item>
+        <t-form-item label="微信文章链接" name="wx_url">
+          <t-input placeholder="请输入微信文章链接" v-model="addForm.wx_url"/>
+        </t-form-item>
         <t-form-item label="新闻内容" name="news_content">
           <div style="border: 1px solid #ccc;z-index: 99">
             <!-- 工具栏 -->
@@ -122,6 +125,7 @@ export default {
         news_image_show:[],
         showtime:'',
         news_hits:0,
+        wx_url:'',
       },
       addMode: false,
       isEdit: false,
@@ -161,6 +165,7 @@ export default {
         autoFocus: true,
         MENU_CONF: {
           uploadImage: {
+            maxFileSize: 50 * 1024 * 1024,
             server: store.state.user.apiUrl + '/api/common/upload',
             fieldName: 'file',
             meta:{
@@ -283,6 +288,7 @@ export default {
           news_image_show:[],
           showtime:'',
         news_hits:0,
+        wx_url:'',
       };
     },
     edit(d) {
@@ -298,6 +304,7 @@ export default {
       this.addForm.news_content = d.news_content;
       this.addForm.showtime = d.showtime
       this.addForm.news_hits = d.news_hits;
+      this.addForm.wx_url=d.wx_url;
       this.addMode = true;
       this.isEdit = true;
     },
@@ -351,10 +358,10 @@ export default {
         this.$message.error('来源不能为空');
         return;
       }
-      if (this.addForm.news_content == '') {
+      // if (this.addForm.news_content == '') {
-        this.$message.error('详情不能为空');
+      //   this.$message.error('详情不能为空');
-        return;
+      //   return;
-      }
+      // }
       if (this.addForm.news_image=='') {
         this.$message.error('新闻主图不能为空');
         return;

src/pages/news/news_type.vue

@@ -47,6 +47,7 @@ export default {
       editID:0,
       list: [],
       columns: [
+        {colKey: 'id', title: 'ID'},
         {colKey: 'weigh', title: '排序'},
         {colKey: 'name', title: '类目名称'},
         {colKey: 'createtime', title: '添加时间'},

src/pages/news/wechat_index.vue

@@ -160,6 +160,7 @@ export default {
         autoFocus: true,
         MENU_CONF: {
           uploadImage: {
+            maxFileSize: 50 * 1024 * 1024,
             //server: store.state.user.apiUrl + '/api/wx_news/wxuploadimg',
             server:'/api/wx_news/wxuploadimg',
             fieldName: 'file',

src/pages/pc/pc_news.vue

@@ -3,13 +3,13 @@
     <div class="form-step-container">
       <t-form
         ref="form"
-        :data="formData"
+        :data="ser"
         :label-width="80"
         @submit="onSubmit"
       >
         <t-row>
           <t-form-item name="nikename">
-            <t-button @click="add">新增</t-button>
+            <t-button @click="add">添加新闻</t-button>
           </t-form-item>
           <t-form-item label="标题">
             <t-input
@@ -20,7 +20,7 @@
               style="width: 150px"
             />
           </t-form-item>
-          <t-form-item label="所属类目">
+          <t-form-item label="所属类目" style="margin-left: 20px;">
             <t-select  v-model="ser.category_id">
               <t-option :key="0" label="全部" value=""></t-option>
               <t-option v-for="(item,index) in gory_list" :key="index" :label="item.category_name" :value="item.id" />
@@ -52,6 +52,10 @@
             </t-popconfirm>
           </t-space>
         </template>
+        <template #top="{ row }">
+          <t-button theme="success" size="small" v-if="row.if_recommend==1" @click="topNews(row)">点击置顶</t-button>
+          <t-button theme="warning" size="small" v-if="row.if_recommend==2" @click="topNewsDel(row)">取消置顶</t-button>
+        </template>
       </t-table>
       <div style="margin-top: 30px">
         <t-pagination
@@ -79,6 +83,9 @@
         <t-form-item label="点击量" name="news_source">
           <t-input placeholder="请输入自定义点击量" v-model="addForm.number_of_views"/>
         </t-form-item>
+        <t-form-item label="微信文章链接" name="wx_url">
+          <t-input placeholder="请输入微信文章链接" v-model="addForm.wx_url"/>
+        </t-form-item>
         <t-form-item label="新闻内容" name="news_content">
           <div style="border: 1px solid #ccc;z-index: 99">
             <!-- 工具栏 -->
@@ -143,6 +150,7 @@ export default {
         image_show:[],
         number_of_views:0,
         display_time:'',
+        wx_url:'',
       },
       addMode: false,
       isEdit: false,
@@ -155,6 +163,7 @@ export default {
         {colKey: 'number_of_views', title: '点击量', align: 'center'},
         {colKey: 'article_source', title: '来源', align: 'center'},
         {colKey: 'display_time', title: '展示时间', align: 'center'},
+        // {colKey: 'top', title: '首页置顶', align: 'center'},
         {colKey: 'select', title: '操作', width: 200, align: 'center'},
       ],
       pagination: {
@@ -180,6 +189,7 @@ export default {
         autoFocus: true,
         MENU_CONF: {
           uploadImage: {
+            maxFileSize: 50 * 1024 * 1024,
             server: store.state.user.apiUrl + '/api/common/upload',
             fieldName: 'file',
             meta:{
@@ -192,6 +202,11 @@ export default {
               // 从 res 中找到 url alt href ，然后插入图片
               insertFn(res.data.fullurl, '', '')
             },
+            onError:(file, err, res)=>{
+              if(err.message.indexOf('exceeds maximum allowed size') !== -1){
+                this.$message.error('限制为50M，请调整好再上传！',2000);
+              }
+            },
           },
           uploadVideo: {
             server: store.state.user.apiUrl + '/api/common/upload',
@@ -266,6 +281,7 @@ export default {
         image_show:[],
         number_of_views:0,
         display_time:'',
+        wx_url:'',
       };
     },
     edit(d) {
@@ -279,6 +295,7 @@ export default {
       this.addForm.content = d.content;
       this.addForm.number_of_views = d.number_of_views;
       this.addForm.display_time=d.display_time;
+      this.addForm.wx_url=d.wx_url;
       this.addMode = true;
       this.isEdit = true;
     },
@@ -294,6 +311,9 @@ export default {
           if (res.code == 1) {
             this.list = res.data.ret;
             this.pagination.total = res.data.count;
+          }else{
+            this.list = [];
+            this.pagination.total =0;
           }
 
         })
@@ -328,10 +348,10 @@ export default {
         this.$message.error('来源不能为空');
         return;
       }
-      if (this.addForm.content == '') {
+      // if (this.addForm.content == '') {
-        this.$message.error('详情不能为空');
+      //   this.$message.error('详情不能为空');
-        return;
+      //   return;
-      }
+      // }
       if (this.addForm.image=='') {
         this.$message.error('新闻主图不能为空');
         return;
@@ -356,6 +376,40 @@ export default {
           console.log(e);
         });
     },
+    topNews(row){
+      console.log(row);
+      this.$request
+        .post('/common/listtopping', {id: row.id,type:'pcactivity'})
+        .then((res) => {
+          if (res.code == 1) {
+            this.$message.success('置顶成功');
+            this.getList();
+          } else {
+            this.$message.error(res.msg);
+          }
+          console.log(res);
+        })
+        .catch((e) => {
+          console.log(e);
+        });
+    },
+    topNewsDel(row){
+      console.log(row);
+      this.$request
+        .post('/common/listcancel', {id: row.id,type:'pcactivity'})
+        .then((res) => {
+          if (res.code == 1) {
+            this.$message.success('取消置顶成功');
+            this.getList();
+          } else {
+            this.$message.error(res.msg);
+          }
+          console.log(res);
+        })
+        .catch((e) => {
+          console.log(e);
+        });
+    },
     onCloseMy() {
       this.addMode = false;
       this.infoMode = false;

src/pages/pc/pc_news_type.vue

@@ -16,9 +16,9 @@
         <template #select="{ row }">
           <t-space size="24px" v-if="row.id!=0">
             <t-button theme="warning" @click="edit(row)">编辑</t-button>
-            <t-popconfirm  content="确认删除吗，类目下的新闻将不再显示！" @confirm="del(row)">
+<!--            <t-popconfirm  content="确认删除吗，类目下的新闻将不再显示！" @confirm="del(row)">-->
-              <t-button theme="danger" >删除</t-button>
+<!--              <t-button theme="danger" >删除</t-button>-->
-            </t-popconfirm>
+<!--            </t-popconfirm>-->
           </t-space>
         </template>
       </t-table>
@@ -54,23 +54,23 @@ export default {
     this.getList();
   },
   methods: {
-    del(d){
+    // del(d){
-      console.log(d);
+    //   console.log(d);
-      this.$request
+    //   this.$request
-        .post('/pc_news/gorydeletetime',{id:d.id})
+    //     .post('/pc_news/gorydeletetime',{id:d.id})
-        .then((res) => {
+    //     .then((res) => {
-          if(res.code==1){
+    //       if(res.code==1){
-            this.$message.success('删除成功！');
+    //         this.$message.success('删除成功！');
-            this.getList();
+    //         this.getList();
-          }else {
+    //       }else {
-            this.$message.error(res.msg);
+    //         this.$message.error(res.msg);
-          }
+    //       }
-          console.log(res);
+    //       console.log(res);
-        })
+    //     })
-        .catch((e) => {
+    //     .catch((e) => {
-          console.log(e);
+    //       console.log(e);
-        });
+    //     });
-    },
+    // },
     add(){
       this.category_name= '';
       this.addMode=true;

src/pages/user/user_edit.vue

@@ -60,9 +60,9 @@
                 <div class="t-upload" @click="openCai" style="margin-top: 20px;">
                   <div style="cursor: pointer;text-align: center;width: 200px;height: 200px;line-height: 200px;border: 1px dashed #999999;">
                     <img :src="$store.state.user.apiUrl+formData.photo_image" style="width: 200px;display: block"
-                         v-if="formData.photo_image!=''">
+                         v-if="formData.photo_image!=''&&formData.photo_image!=null">
                     <svg style="    font-size: 35px;" fill="none" viewBox="0 0 24 24" width="100px" height="100px" class="t-icon t-icon-add"
-                         v-if="formData.photo_image==''">
+                         v-if="formData.photo_image==''||formData.photo_image==null">
                       <path fill="currentColor" d="M13 4v7h7v2h-7v7h-2v-7H4v-2h7V4h2z"></path>
                     </svg>
                   </div>
@@ -81,6 +81,11 @@
                         <t-option :key="1" label="男" :value="1"></t-option>
                       </t-select>
                     </t-form-item>
+                    <t-form-item label="协会职务">
+                      <t-select size="large" v-model="formData.position_id" placeholder="请选择协会职务" :style="{ width: '200px' }">
+                        <t-option v-for="item in plan_list" :value="item.id" :label="item.position_name" :key="item.id"></t-option>
+                      </t-select>
+                    </t-form-item>
                     <t-form-item label="出生年月日">
                       <t-date-picker size="large" :style="{ width: '200px' }" v-model="formData.birth_time"/>
                     </t-form-item>
@@ -167,11 +172,11 @@
               <div style="display: flex;justify-items: center;padding: 30px 0px">
                 <div style="text-align: center">
                   <div class="sfz">
-                  <span v-if="formData.cardz_image==''"><svg style=" font-size: 30px;" fill="none" viewBox="0 0 24 24" width="100px" height="100px" class="t-icon t-icon-add"
+                  <span v-if="formData.cardz_image==''||formData.cardz_image==null"><svg style=" font-size: 30px;" fill="none" viewBox="0 0 24 24" width="100px" height="100px" class="t-icon t-icon-add"
-                                                             v-if="formData.cardz_image==''">
+                                                             >
                     <path fill="currentColor" d="M13 4v7h7v2h-7v7h-2v-7H4v-2h7V4h2z"></path>
                   </svg></span>
-                    <img v-if="formData.cardz_image!=''" :src="$store.state.user.apiUrl+formData.cardz_image"
+                    <img v-if="formData.cardz_image!=''&&formData.cardz_image!=null" :src="$store.state.user.apiUrl+formData.cardz_image"
                          style="width: 100%;max-height: 200px;">
                   </div>
                   <div style="margin: 10px 0px;">请上传身份证正面照片</div>
@@ -188,11 +193,11 @@
                 </div>
                 <div style="margin-left: 100px;text-align: center">
                   <div class="sfz">
-                  <span v-if="formData.cardf_image==''"><svg style=" font-size: 30px;" fill="none" viewBox="0 0 24 24" width="100px" height="100px" class="t-icon t-icon-add"
+                  <span v-if="formData.cardf_image==''||formData.cardf_image==null"><svg style=" font-size: 30px;" fill="none" viewBox="0 0 24 24" width="100px" height="100px" class="t-icon t-icon-add"
-                                                             v-if="formData.cardf_image==''">
+                                                             >
                     <path fill="currentColor" d="M13 4v7h7v2h-7v7h-2v-7H4v-2h7V4h2z"></path>
                   </svg></span>
-                    <img v-if="formData.cardf_image!=''" :src="$store.state.user.apiUrl+formData.cardf_image"
+                    <img v-if="formData.cardf_image!=''&&formData.cardf_image!=null" :src="$store.state.user.apiUrl+formData.cardf_image"
                          style="width: 100%;max-height: 200px;">
                   </div>
                   <div style="margin: 10px 0px;">请上传身份证背面照片</div>
@@ -445,11 +450,11 @@
               <div style="display: flex;justify-items: center;padding: 30px 0px">
                 <div style="text-align: center">
                   <div class="sfz">
-                  <span v-if="formData.business_license_image==''"><svg style=" font-size: 30px;" fill="none" viewBox="0 0 24 24" width="100px" height="100px" class="t-icon t-icon-add"
+                  <span v-if="formData.business_license_image==''||formData.business_license_image==null"><svg style=" font-size: 30px;" fill="none" viewBox="0 0 24 24" width="100px" height="100px" class="t-icon t-icon-add"
-                                                                        v-if="formData.business_license_image==''">
+                                                                       >
                     <path fill="currentColor" d="M13 4v7h7v2h-7v7h-2v-7H4v-2h7V4h2z"></path>
                   </svg></span>
-                    <img v-if="formData.business_license_image!=''"
+                    <img v-if="formData.business_license_image!=''&&formData.business_license_image!=null"
                          :src="$store.state.user.apiUrl+formData.business_license_image"
                          style="width: 100%;max-height: 200px;">
                   </div>
@@ -467,11 +472,11 @@
                 </div>
                 <div style="margin-left: 100px;text-align: center">
                   <div class="sfz">
-                  <span v-if="formData.company_image==''"><svg style=" font-size: 30px;" fill="none" viewBox="0 0 24 24" width="100px" height="100px" class="t-icon t-icon-add"
+                  <span v-if="formData.company_image==''||formData.company_image==null"><svg style=" font-size: 30px;" fill="none" viewBox="0 0 24 24" width="100px" height="100px" class="t-icon t-icon-add"
-                                                               v-if="formData.company_image==''">
+                                                               >
                     <path fill="currentColor" d="M13 4v7h7v2h-7v7h-2v-7H4v-2h7V4h2z"></path>
                   </svg></span>
-                    <img v-if="formData.company_image!=''" :src="$store.state.user.apiUrl+formData.company_image"
+                    <img v-if="formData.company_image!=''&&formData.company_image!=null" :src="$store.state.user.apiUrl+formData.company_image"
                          style="width: 200px;max-height: 200px;">
                   </div>
                   <div style="margin: 10px 0px">请上传公司LOGO</div>
@@ -665,13 +670,13 @@
                     <div>
                       <div style="text-align: center">
                         <div class="sfz">
-                  <span v-if="formData.documents_file==''"><svg style=" font-size: 30px;" fill="none"
+                  <span v-if="formData.documents_file==''||formData.documents_file==null"><svg style=" font-size: 30px;" fill="none"
                                                                 viewBox="0 0 24 24" width="100px" height="100px"
                                                                 class="t-icon t-icon-add"
-                                                                v-if="formData.documents_file==''">
+                                                                >
                     <path fill="currentColor" d="M13 4v7h7v2h-7v7h-2v-7H4v-2h7V4h2z"></path>
                   </svg></span>
-                          <img v-if="formData.documents_file!=''"
+                          <img v-if="formData.documents_file!=''&&formData.documents_file!=null"
                                :src="$store.state.user.apiUrl+formData.documents_file"
                                style="width: 100%;max-height: 200px;">
                         </div>
@@ -1254,6 +1259,7 @@ export default {
           this.formData.previous_donation = res.data.previous_donation;
           this.formData.qitaqiyerenzhiqingkuang = res.data.qitaqiyerenzhiqingkuang;
           this.formData.enterprise_Introduction = res.data.enterprise_Introduction;
+          this.formData.enterprise_lvxingzeren=res.data.enterprise_lvxingzeren;
           this.formData.introdiction = res.data.introdiction;
           this.formData.enterprise_honor = res.data.enterprise_honor;
           this.formData.if_organization = res.data.if_organization+'';
@@ -1290,7 +1296,7 @@ export default {
           this.formData.zip_code=res.data.zip_code;
           this.formData.registered_capital=res.data.registered_capital;
           this.tuan_list = JSON.parse(res.data.tuanweifuzerenxinxi);
-          this.formData.enterprise_lvxingzeren=res.data.enterprise_lvxingzeren;
+
         })
         .catch((e) => {
           console.log(e);

src/pages/user/user_index.vue

@@ -88,8 +88,11 @@
             <t-button theme="default" v-if="row.if_xianshi==0||row.if_xianshi==3" @click="openUrl(row.member_id)">审核
             </t-button>
             <t-button @click="()=>$router.push('/user/user_edit?id='+row.member_id)">编辑</t-button>
+            <t-popconfirm v-if="row.if_xianshi==1" content="确认要改为待审核状态吗？" @confirm="hidden(row)">
+              <t-button theme="warning">隐藏</t-button>
+            </t-popconfirm>
             <t-popconfirm content="确认要删除吗？" @confirm="del(row)">
-              <t-button theme="warning">删除</t-button>
+              <t-button theme="danger">删除</t-button>
             </t-popconfirm>
           </t-space>
         </template>
@@ -182,6 +185,21 @@ export default {
       var token = store.state.user.token;
       window.location.href = "https://hnyea.0rui.cn/api/excel_controller/memberexport?token=" + token + "&ids=" + ids+"&if_xianshi="+this.tabIndex;
     },
+    hidden(row){
+      console.log(row);
+      this.$request
+        .post("/member/examinelist",{member_id:row.member_id,if_xianshi:0})
+        .then((res) => {
+          console.log(res);
+          this.page = 1;
+          this.total = 0;
+          this.list = [];
+          this.getList();
+        })
+        .catch((e) => {
+          console.log(e);
+        });
+    },
     getRegion() {
       this.$request
         .post("/region")

src/pages/user/user_info.vue

@@ -52,7 +52,8 @@
                                   :closeOnEscKeydown="false">
                     <template #trigger="{ open }">
                       <div style="cursor: pointer" @click="open">
-                        <img :src="$store.state.user.apiUrl+info.photo_image" style="width: 200px;height: 200px;">
+                        <img v-if="info.photo_image!=''&&info.photo_image!=null"  :src="$store.state.user.apiUrl+info.photo_image" style="width: 200px;height: 200px;">
+                        <span v-if="info.photo_image==''||info.photo_image==null">未上传</span>
                       </div>
                     </template>
                   </t-image-viewer>
@@ -61,6 +62,8 @@
                 <td>{{ info.nikename }}</td>
                 <td>性别</td>
                 <td>{{ info.gender == 0 ? '女' : '男' }}</td>
+                <td>协会职务</td>
+                <td>{{ info.position_name}}</td>
                 <td>出生年月日</td>
                 <td>{{ info.birth_time }}</td>
                 <td>民族</td>
@@ -75,34 +78,33 @@
                 <td>{{ info.work_unit }}</td>
                 <td>单位职务</td>
                 <td>{{ info.unit_position }}</td>
-              </tr>
-              <tr>
                 <td>通讯地址</td>
                 <td>{{ info.mail_address }}</td>
+              </tr>
+              <tr>
+
                 <td>籍贯</td>
                 <td>{{ info.jiguan }}</td>
                 <td>毕业院校</td>
                 <td>{{ info.institution }}</td>
                 <td>学历</td>
                 <td>{{ info.education }}</td>
-              </tr>
-              <tr>
                 <td>学位</td>
                 <td>{{ info.academic_degree }}</td>
                 <td>邮编</td>
                 <td>{{ info.zip_code }}</td>
+              </tr>
+              <tr>
                 <td>手机号</td>
                 <td>{{ info.phone }}</td>
                 <td>邮箱</td>
                 <td>{{ info.mailbox }}</td>
-              </tr>
-              <tr>
                 <td>微信</td>
                 <td>{{ info.wx_number }}</td>
                 <td>固定电话</td>
                 <td>{{ info.fixed_telephone }}</td>
                 <td>所在区域</td>
-                <td colspan="3">{{ info.region_name }}</td>
+                <td>{{ info.region_name }}</td>
               </tr>
               <tr align="center">
                 <td>身份证正面照</td>
@@ -111,7 +113,8 @@
                                   :closeOnEscKeydown="false">
                     <template #trigger="{ open }">
                       <div style="cursor: pointer" @click="open">
-                        <img :src="$store.state.user.apiUrl+info.cardz_image" style="height: 150px;">
+                        <img v-if="info.cardz_image!=''&&info.cardz_image!=null" :src="$store.state.user.apiUrl+info.cardz_image" style="height: 150px;">
+                        <span v-if="info.cardz_image==''||info.cardz_image==null">未上传</span>
                       </div>
                     </template>
                   </t-image-viewer>
@@ -122,38 +125,39 @@
                                   :closeOnEscKeydown="false">
                     <template #trigger="{ open }">
                       <div style="cursor: pointer" @click="open">
-                        <img :src="$store.state.user.apiUrl+info.cardf_image" style="height: 150px;">
+                        <img v-if="info.cardf_image!=''&&info.cardf_image!=null" :src="$store.state.user.apiUrl+info.cardf_image" style="height: 150px;">
+                        <span v-if="info.cardf_image==''||info.cardf_image==null">未上传</span>
                       </div>
                     </template>
                   </t-image-viewer>
                 </td>
               </tr>
               <tr align="center">
-                <td colspan="5">
+                <td colspan="6">
                   <div style="font-size: 18px;font-weight: 600;">个人简介</div>
                 </td>
-                <td colspan="5">
+                <td colspan="6">
                   <div style="font-size: 18px;font-weight: 600">主要成就以及获奖情况</div>
                 </td>
               </tr>
               <tr >
-                <td colspan="5">
+                <td colspan="6">
                   <div style="text-align: left" v-html="info.introduction"></div>
                 </td>
-                <td colspan="5">
+                <td colspan="6">
                   <div style="text-align: left" v-html="info.achievement_award"></div>
                 </td>
               </tr>
               <tr align="center">
-                <td colspan="5">
+                <td colspan="6">
                   <div style="font-size: 18px;font-weight: 600">学习工作经历</div>
                 </td>
-                <td colspan="5">
+                <td colspan="6">
                   <div style="font-size: 18px;font-weight: 600">社会职务资料</div>
                 </td>
               </tr>
               <tr align="center">
-                <td colspan="5">
+                <td colspan="6">
                   <table style="width: 100%; text-align: center; border-collapse: collapse;">
                     <thead>
                     <tr>
@@ -171,17 +175,17 @@
                     </tbody>
                   </table>
                 </td>
-                <td colspan="5">
+                <td colspan="6">
                   {{ info.main_social_positions }},{{ info.other_social_positions }}
                 </td>
               </tr>
               <tr align="center">
-                <td colspan="5">
+                <td colspan="6">
                   <div style="font-size: 18px;font-weight: 600">紧急（助理）联系人</div>
                 </td>
               </tr>
               <tr align="center">
-                <td colspan="5">
+                <td colspan="6">
                   <table style="width: 100%; text-align: center; border-collapse: collapse;">
                     <thead>
                     <tr>
@@ -249,7 +253,8 @@
                                   :closeOnEscKeydown="false">
                     <template #trigger="{ open }">
                       <div style="cursor: pointer" @click="open">
-                        <img :src="$store.state.user.apiUrl + info.business_license_image" style="height: 150px; ">
+                        <img v-if="info.business_license_image!=''&&info.business_license_image!=null" :src="$store.state.user.apiUrl + info.business_license_image" style="height: 150px; ">
+                        <span v-if="info.business_license_image==''||info.business_license_image==null">未上传</span>
                       </div>
                     </template>
                   </t-image-viewer>
@@ -262,7 +267,8 @@
                                   :closeOnEscKeydown="false">
                     <template #trigger="{ open }">
                       <div style="cursor: pointer" @click="open">
-                        <img :src="$store.state.user.apiUrl + info.company_image" style="height: 150px; ">
+                        <img v-if="info.company_image!=''&&info.company_image!=null" :src="$store.state.user.apiUrl + info.company_image" style="height: 150px; ">
+                        <span v-if="info.company_image==''||info.company_image==null">未上传</span>
                       </div>
                     </template>
                   </t-image-viewer>
@@ -344,7 +350,8 @@
                                     :closeOnEscKeydown="false">
                       <template #trigger="{ open }">
                         <div style="cursor: pointer" @click="open">
-                          <img :src="$store.state.user.apiUrl + info.documents_file" style="height: 150px; ">
+                          <img v-if="info.documents_file!=''&&info.documents_file!=null" :src="$store.state.user.apiUrl + info.documents_file" style="height: 150px; ">
+                          <span v-if="info.documents_file==''||info.documents_file==null">未上传</span>
                         </div>
                       </template>
                     </t-image-viewer>
@@ -432,9 +439,10 @@ export default {
         .post("/member/find", {member_id: this.member_id})
         .then((res) => {
           var key = res.data;
-          key.work_experience = JSON.parse(key.work_experience);
+          console.log(key);
-          key.other_contacts = JSON.parse(key.other_contacts);
+          key.work_experience =key.work_experience!=''?JSON.parse(key.work_experience):'';
-          key.tuanweifuzerenxinxi = JSON.parse(key.tuanweifuzerenxinxi);
+          key.other_contacts = key.other_contacts!=''?JSON.parse(key.other_contacts):'';
+          key.tuanweifuzerenxinxi = key.tuanweifuzerenxinxi!=''?JSON.parse(key.tuanweifuzerenxinxi):'';
           this.info = key;
           console.log(key);
 

src/pages/user/user_invoice.vue

@@ -146,6 +146,8 @@ export default {
     },
     tabIndexChange(d) {
       console.log(d);
+      this.tabIndex = d;
+      this.getList();
     },
     onSubmit(this_if_ssue){
       if(this_if_ssue==1){

src/router/modules/components.ts

@@ -171,11 +171,12 @@ export default [
       //   meta: {title: '系统设置'},
       // }
     ],
-  }, {
+  },
+  {
     path: '/pc',
     name: 'pc',
     component: Layout,
-    meta: {title: '官网内容管理', icon: HomeIcon},
+    meta: {title: '官网内容管理', icon: ViewModuleIcon},
     children: [
       {
         path: 'pc_news_type',
@@ -189,12 +190,6 @@ export default [
         component: () => import('@/pages/pc/pc_news.vue'),
         meta: {title: '新闻列表'},
       },
-      {
-        path: 'pc_swiper',
-        name: 'pcSwiper',
-        component: () => import('@/pages/pc/pc_swiper.vue'),
-        meta: {title: '轮播管理'},
-      },
       {
         path: 'pc_message',
         name: 'pcSwiper',