1

src/pages/login/index.vue

@@ -69,8 +69,8 @@ export default {
   data() {
     return {
       formData: {
-        zhanghu: 'admin',
+        zhanghu: '',
-        password: 'qinze731344.',
+        password: '',
       },
       FORM_RULES: {
         zhanghu: [{required: true, message: '账号必填', type: 'error'}],

src/pages/news/news_index.vue

@@ -35,8 +35,8 @@
     <t-dialog :header="isEdit?'编辑新闻':'新增新闻'" :visible="addMode" :onClose="onCloseMy" @confirm="onSubmit"
               width="45%" top="20px">
       <t-form>
-        <t-form-item label="新闻标题" name="news_title">
+        <t-form-item label="文章标题" name="news_title">
-          <t-input placeholder="请输入新闻标题" v-model="addForm.news_title"/>
+          <t-input placeholder="请输入文章标题" v-model="addForm.news_title"/>
         </t-form-item>
         <t-form-item label="简短标题" name="news_titleshort">
           <t-input placeholder="请输入简短标题" v-model="addForm.news_titleshort"/>
@@ -52,7 +52,7 @@
         <t-form-item label="来源" name="news_source">
           <t-input placeholder="请输入来源" v-model="addForm.news_source"/>
         </t-form-item>
-        <t-form-item label="新闻详情" name="news_content">
+        <t-form-item label="新闻内容" name="news_content">
           <div style="border: 1px solid #ccc;z-index: 99">
             <!-- 工具栏 -->
             <Toolbar

src/pages/user/user_edit.vue

@@ -23,6 +23,11 @@
               <t-option v-for="(item,index) in industry_list" :label="item.industry_name" :value="item.id"></t-option>
             </t-select>
           </t-form-item>
+          <t-form-item label="区域" name="region_id">
+            <t-select v-model="formData.region_id" :style="{ width: '200px' }">
+              <t-option v-for="(item,index) in region_list" :label="item.region_name" :value="item.id"></t-option>
+            </t-select>
+          </t-form-item>
         </t-form>
       </div>
       <div style="padding: 20px">
@@ -150,6 +155,16 @@
               :format-response="(response) => formatResponse(response, 3)"
             ></t-upload>
           </t-form-item>
+          <t-form-item label="公司Logo">
+            <t-upload
+              :action="$store.state.user.apiUrl+'/api/common/upload'"
+              v-model="formData.company_image_show"
+              theme="image"
+              tips="请选择营业执照"
+              accept="image/*"
+              :format-response="(response) => formatResponse(response, 5)"
+            ></t-upload>
+          </t-form-item>
           <t-form-item label="统一社会信用代码" name="unified_code">
             <t-input v-model="formData.unified_code" placeholder="请输入统一社会信用代码"></t-input>
           </t-form-item>
@@ -363,10 +378,14 @@ export default {
         documents_file_show: [],
         introduction: '',
         enterprise_name: '',
+        company_image:'',
+        company_image_show:[],
+        region_id:null,
       },
       id: 0,
       info: '',
       plan_list: [],
+      region_list:[],
       industry_list: []
     };
   },
@@ -375,6 +394,7 @@ export default {
     this.getInfo();
     this.getPlan();
     this.getIndustry();
+    this.getRegion();
   },
   methods: {
     onSubmit() {
@@ -460,12 +480,27 @@ export default {
         this.formData.cardf_image = res.data.url;
       } else if (type == 3) {
         this.formData.business_license_image = res.data.url;
-      } else {
+      } else if(type==4){
         this.formData.documents_file = res.data.url;
+      }else{
+        this.formData.company_image = res.data.url;
       }
 
       return {url: res.data.fullurl};
     },
+getRegion() {
+  this.$request
+    .post("/region")
+    .then((res) => {
+      console.log(res);
+      if (res.code == 1) {
+        this.region_list = res.data;
+      }
+    })
+    .catch((e) => {
+      console.log(e);
+    });
+},
     getIndustry() {
       this.$request
         .post("/industry")
@@ -502,6 +537,7 @@ export default {
           this.formData.phone = res.data.phone;
           this.formData.position_id = res.data.position_id;
           this.formData.industry_id = res.data.industry_id;
+          this.formData.region_id = res.data.region_id;
           this.formData.password = res.data.password;
           this.formData.nikename = res.data.nikename;
           this.formData.gender = res.data.gender;
@@ -537,7 +573,11 @@ export default {
           } else {
             this.formData.photo_image_show = [{url: store.state.user.apiUrl + res.data.photo_image}];
           }
-
+          if (res.data.company_image == '') {
+            this.formData.company_image_show = [];
+          } else {
+            this.formData.company_image_show = [{url: store.state.user.apiUrl + res.data.company_image}];
+          }
           this.formData.cardf_image = res.data.cardf_image;
           this.formData.cardz_image = res.data.cardz_image;
           this.formData.photo_image = res.data.photo_image;

src/pages/user/user_edit_shen.vue

@@ -40,24 +40,24 @@
       </div>
     </div>
     <t-dialog header="信息审核" :confirmBtn="null" :visible="ShenMode" :onClose="onCloseMy" :cancelBtn="null"
-              width="800px" top="50px">
+              width="1000px" top="50px">
-      <div style="text-align: center;width: 700px;height: 700px;margin: 0 auto;position: relative;overflow-y: scroll;">
+      <div style="text-align: center;width: 900px;height: 700px;margin: 0 auto;position: relative;overflow-y: scroll;">
         <t-space direction="vertical">
           <t-row>
-            <t-col :span="3">
+            <t-col :span="2">
               <div style="font-size: 16px;font-weight: 600">类别</div>
             </t-col>
-            <t-col :span="3">
+            <t-col :span="4">
               <div style="font-size: 16px;font-weight: 600">原信息</div>
             </t-col>
-            <t-col :span="3">
+            <t-col :span="2">
             </t-col>
-            <t-col :span="3">
+            <t-col :span="4">
               <div style="font-size: 16px;font-weight: 600">新信息</div>
             </t-col>
           </t-row>
           <t-row style="font-size: 16px">
-            <t-col :span="3">
+            <t-col :span="2">
               <t-space direction="vertical">
                 <div style="height: 100px;text-align: center;line-height: 100px" v-if="typeof (updateInfo.member_log.background_image) !='undefined'">名片背景图：</div>
                 <div style="height: 100px;text-align: center;line-height: 100px" v-if="typeof (updateInfo.member_log.photo_image) !='undefined'">形象照：</div>
@@ -70,10 +70,10 @@
                 <div v-if="typeof (updateInfo.member_log.enterprise_name) !='undefined'">公司名称：</div>
                 <div v-if="typeof (updateInfo.member_log.industry_name) !='undefined'">公司行业：</div>
                 <div v-if="typeof (updateInfo.member_log.enterprise_location) !='undefined'">公司地址：</div>
-                <div v-if="typeof (updateInfo.member_log.enterprise_Introduction) !='undefined'">公司介绍：</div>
+                <div style="height: 200px" v-if="typeof (updateInfo.member_log.enterprise_Introduction) !='undefined'">公司介绍：</div>
               </t-space>
             </t-col>
-            <t-col :span="3">
+            <t-col :span="4">
               <t-space direction="vertical">
                 <div v-if="typeof (updateInfo.member.background_image) !='undefined'" style="height: 100px;">
                   <img v-if="updateInfo.member.background_image!=''"
@@ -91,7 +91,7 @@
                 <div v-if="typeof (updateInfo.member.nikename) !='undefined'">{{ updateInfo.member.nikename }}</div>
                 <div v-if="typeof (updateInfo.member.gender_name) !='undefined'">{{ updateInfo.member.gender_name }}</div>
                 <div v-if="typeof (updateInfo.member.phone) !='undefined'">{{ updateInfo.member.phone }}</div>
-                <div style="height: 200px" v-if="typeof (updateInfo.member.introduction) !='undefined'">{{ updateInfo.member.introduction }}</div>
+                <div style="height: 200px;overflow: scroll;" v-if="typeof (updateInfo.member.introduction) !='undefined'">{{ updateInfo.member.introduction }}</div>
                 <div v-if="typeof (updateInfo.member.company_image) !='undefined'" style="height: 100px;">
                   <img v-if="updateInfo.member.company_image!=''"
                        :src="$store.state.user.apiUrl+updateInfo.member.company_image"
@@ -104,15 +104,15 @@
                 <div v-if="typeof (updateInfo.member.enterprise_name) !='undefined'">{{ updateInfo.member.enterprise_name }}</div>
                 <div v-if="typeof (updateInfo.member.industry_name) !='undefined'">{{ updateInfo.member.industry_name }}</div>
                 <div v-if="typeof (updateInfo.member.enterprise_location) !='undefined'">{{ updateInfo.member.enterprise_location==''?'无':updateInfo.member.enterprise_location }}</div>
-                <div v-if="typeof (updateInfo.member.enterprise_Introduction) !='undefined'">{{ updateInfo.member.enterprise_Introduction }}</div>
+                <div style="height: 200px;overflow: scroll;" v-if="typeof (updateInfo.member.enterprise_Introduction) !='undefined'">{{ updateInfo.member.enterprise_Introduction }}</div>
               </t-space>
             </t-col>
-            <t-col :span="3">
+            <t-col :span="2">
               <div style="position: absolute;width: 100%;">
                 <SwapRightIcon size="2em"/>
               </div>
             </t-col>
-            <t-col :span="3">
+            <t-col :span="4">
               <t-space direction="vertical">
                 <div v-if="updateInfo.member_log.background_image" style="height: 100px;"><img
                   :src="$store.state.user.apiUrl+updateInfo.member_log.background_image"
@@ -124,7 +124,7 @@
                 <div v-if="typeof (updateInfo.member_log.nikename) !='undefined'">{{ updateInfo.member_log.nikename }}</div>
                 <div v-if="typeof (updateInfo.member_log.gender_name) !='undefined'">{{ updateInfo.member_log.gender_name }}</div>
                 <div v-if="typeof (updateInfo.member_log.phone) !='undefined'">{{ updateInfo.member_log.phone }}</div>
-                <div style="height: 200px" v-if="typeof (updateInfo.member_log.introduction) !='undefined'">{{ updateInfo.member_log.introduction }}</div>
+                <div style="height: 200px;overflow: scroll;" v-if="typeof (updateInfo.member_log.introduction) !='undefined'">{{ updateInfo.member_log.introduction }}</div>
                 <div v-if="typeof (updateInfo.member_log.company_image) !='undefined'" style="height: 100px;">
                   <img v-if="updateInfo.member_log.company_image!=''"
                        :src="$store.state.user.apiUrl+updateInfo.member_log.company_image"
@@ -137,7 +137,7 @@
                 <div v-if="typeof (updateInfo.member_log.enterprise_name) !='undefined'">{{ updateInfo.member_log.enterprise_name }}</div>
                 <div v-if="typeof (updateInfo.member_log.industry_name) !='undefined'">{{ updateInfo.member_log.industry_name }}</div>
                 <div v-if="typeof (updateInfo.member_log.enterprise_location) !='undefined'">{{ updateInfo.member_log.enterprise_location }}</div>
-                <div v-if="typeof (updateInfo.member_log.enterprise_Introduction) !='undefined'">{{ updateInfo.member_log.enterprise_Introduction }}</div>
+                <div style="height: 200px;overflow: scroll;" v-if="typeof (updateInfo.member_log.enterprise_Introduction) !='undefined'">{{ updateInfo.member_log.enterprise_Introduction }}</div>
               </t-space>
             </t-col>
           </t-row>
@@ -271,6 +271,22 @@ export default {
 </script>
 <style scoped lang="less">
 ::-webkit-scrollbar {
-  display: none;
+  width: 2px;
+}
+
+/* 滚动条轨道 */
+::-webkit-scrollbar-track {
+  background: transparent; /* 可以设置轨道的颜色 */
+}
+
+/* 滚动条 thumb（可拖动的部分） */
+::-webkit-scrollbar-thumb {
+  background: rgba(0, 0, 0, 0.5); /* 可以设置 thumb 的颜色 */
+  border-radius: 4px; /* 可以设置 thumb 的圆角 */
+}
+
+/* 滚动条 hover 状态 */
+::-webkit-scrollbar-thumb:hover {
+  background: rgba(0, 0, 0, 0.8);
 }
 </style>

src/pages/user/user_index.vue

@@ -9,7 +9,7 @@
         :style="{ marginBottom: '30px' }"
       >
         <t-row>
-          <t-col :span="6">
+          <t-col :span="8">
             <t-row :gutter="[16, 24]">
               <t-col :flex="2">
                 <t-form-item label="会员姓名" name="nikename">
@@ -41,6 +41,14 @@
                   </t-select>
                 </t-form-item>
               </t-col>
+              <t-col :flex="3">
+                <t-form-item label="区域" name="phone">
+                  <t-select v-model="formData.region_id" style="width: 200px">
+                    <t-option label="全部" value="" />
+                    <t-option v-for="(item,index) in region_list" :label="item.region_name" :value="item.id" />
+                  </t-select>
+                </t-form-item>
+              </t-col>
             </t-row>
           </t-col>
           <t-col :span="2" class="operation-container">
@@ -111,6 +119,7 @@ export default {
         { colKey: 'photo_image', title: '形象照'},
         { colKey: 'nikename', title: '会员姓名'},
         { colKey: 'position_name', title: '职位'},
+        { colKey: 'region_name', title: '区域'},
         { colKey: 'phone', title: '手机号'},
         { colKey: 'nation', title: '民族'},
         { colKey: 'if_xianshi', title: '状态'},
@@ -121,10 +130,12 @@ export default {
       size:10,
       formData:{
         position_id:'',
+        region_id:'',
         nikename: '',
         phone: ''
       },
       positionList:[],
+      region_list:[],
     }
   },
   mounted() {
@@ -135,8 +146,22 @@ export default {
     }
     this.getList();
     this.getPositionList();
+    this.getRegion();
   },
   methods: {
+    getRegion() {
+      this.$request
+        .post("/region")
+        .then((res) => {
+          console.log(res);
+          if (res.code == 1) {
+            this.region_list = res.data;
+          }
+        })
+        .catch((e) => {
+          console.log(e);
+        });
+    },
     getPositionList() {
       this.$request
         .post("/position")

src/pages/user/user_info.vue

@@ -16,6 +16,7 @@
         <t-descriptions-item label="会员姓名" :content="info.nikename"></t-descriptions-item>
         <t-descriptions-item label="职位" :content="info.position_name"></t-descriptions-item>
         <t-descriptions-item label="行业" :content="info.industry_id==0?'其他行业':info.industry_name"></t-descriptions-item>
+        <t-descriptions-item label="区域" :content="info.region_name"></t-descriptions-item>
         <t-descriptions-item label="手机号" :content="info.phone"></t-descriptions-item>
         <t-descriptions-item label="性别">
           <div slot="content">
@@ -29,7 +30,11 @@
         <t-descriptions-item label="毕业院校" :content="info.institution"></t-descriptions-item>
         <t-descriptions-item label="学历" :content="info.education"></t-descriptions-item>
         <t-descriptions-item label="学位" :content="info.academic_degree"></t-descriptions-item>
-        <t-descriptions-item label="自我介绍" :content="info.introduction"></t-descriptions-item>
+        <t-descriptions-item label="自我介绍">
+          <div slot="content" style="width: 600px;">
+            {{info.introduction}}
+          </div>
+        </t-descriptions-item>
       </t-descriptions>
     </t-card>
     <t-card title="个人信息" :bordered="false" class="info-block">
@@ -80,6 +85,17 @@
             </t-image-viewer>
           </div>
         </t-descriptions-item>
+        <t-descriptions-item label="公司Logo">
+          <div slot="content">
+            <t-image-viewer v-model="visiblelogo" :draggable="true" mode="modeless" :images="[$store.state.user.apiUrl+info.company_image]">
+              <template #trigger="{ open }">
+                <div class="tdesign-demo-image-viewer__ui-image" @click="open">
+                  <img alt="" :src="$store.state.user.apiUrl+info.company_image" style="width: 150px;" class="tdesign-demo-image-viewer__ui-image--img" />
+                </div>
+              </template>
+            </t-image-viewer>
+          </div>
+        </t-descriptions-item>
         <t-descriptions-item label="统一社会信用代码" :content="info.unified_code"></t-descriptions-item>
         <t-descriptions-item label="公司名称" :content="info.enterprise_name"></t-descriptions-item>
         <t-descriptions-item label="企业性质" :content="info.enterprise_nature"></t-descriptions-item>
@@ -94,7 +110,11 @@
         <t-descriptions-item label="上年度纳税额" :content="!info.previous_tax?'':info.previous_tax+'万'"></t-descriptions-item>
         <t-descriptions-item label="上年度净利润" :content="!info.previous_profit?'':info.previous_profit+'万'"></t-descriptions-item>
         <t-descriptions-item label="上年度公益性捐赠支出" :content="!info.previous_donation?'':info.previous_donation+'万'"></t-descriptions-item>
-        <t-descriptions-item label="企业介绍" :content="info.enterprise_Introduction"></t-descriptions-item>
+          <t-descriptions-item label="企业介绍" >
+            <div slot="content"  style="width: 300px;">
+              {{info.enterprise_Introduction}}
+            </div>
+          </t-descriptions-item>
         <t-descriptions-item label="业务介绍" :content="info.introdiction"></t-descriptions-item>
         <t-descriptions-item label="企业所获荣誉以及专利" :content="info.enterorise_honor"></t-descriptions-item>
         <t-descriptions-item label="其他企业任职情况" :content="info.qitaqiyerenzhiqingkuang"></t-descriptions-item>
@@ -147,6 +167,7 @@ export default {
       visibleZm:false,
       visibleFm:false,
       visiblePf:false,
+      visiblelogo:false,
       info:{},
       member_id:0,
     }

src/pages/user/user_region.vue

@@ -0,0 +1,128 @@
+<template>
+  <t-card :bordered="false">
+    <div class="form-step-container">
+      <t-button @click="add">新增</t-button>
+      <t-table
+        rowKey="index"
+        :data="list"
+        :columns="columns"
+        :stripe="false"
+        :bordered="false"
+        :hover="true"
+        size="large"
+        table-layout="auto"
+        cellEmptyContent="-"
+      >
+        <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-button theme="danger" >删除</t-button>
+            </t-popconfirm>
+          </t-space>
+        </template>
+      </t-table>
+    </div>
+    <t-dialog header="新增区域" :visible="addMode" :onClose="onCloseMy" @confirm="onSubmit">
+      <t-form>
+        <t-form-item label="区域名称" name="region_name">
+          <t-input placeholder="请输入区域名称" v-model="region_name"/>
+        </t-form-item>
+      </t-form>
+    </t-dialog>
+  </t-card>
+
+</template>
+<script lang="ts">
+export default {
+  data() {
+    return {
+      region_name: '',
+      addMode: false,
+      isEdit: false,
+      editID:0,
+      list: [],
+      columns: [
+        {colKey: 'region_name', title: '区域名称'},
+        {colKey: 'select', title: '操作', width: 200},
+      ],
+    }
+  },
+  mounted() {
+    //this.member_id=this.$route.query.id;
+    this.getList();
+  },
+  methods: {
+    del(d){
+      console.log(d);
+      this.$request
+        .post('/region/del',{id:d.id})
+        .then((res) => {
+          if(res.code==1){
+            this.$message.success(res.msg);
+            this.getList();
+          }else {
+            this.$message.error(res.msg);
+          }
+          console.log(res);
+        })
+        .catch((e) => {
+          console.log(e);
+        });
+    },
+    add(){
+      this.region_name= '';
+      this.addMode=true;
+      this.isEdit=false;
+    },
+    edit(d){
+      this.editID=d.id;
+      this.region_name=d.region_name;
+      this.addMode=true;
+      this.isEdit=true;
+    },
+    getList() {
+      this.$request
+        .post("/region")
+        .then((res) => {
+          console.log(res);
+          this.list = res.data;
+        })
+        .catch((e) => {
+          console.log(e);
+        });
+    },
+    onSubmit() {
+      if (this.region_name == '') {
+        this.$message.error('区域名称不能为空');
+        return;
+      }
+      var url='/region/add';
+      if(this.isEdit){
+        url='/region/update';
+      }
+      this.$request
+        .post(url,{region_name:this.region_name,id:this.editID})
+        .then((res) => {
+          if(res.code==1){
+            this.$message.success(res.msg);
+            this.addMode=false;
+            this.getList();
+          }else {
+            this.$message.error(res.msg);
+          }
+          console.log(res);
+        })
+        .catch((e) => {
+          console.log(e);
+        });
+    },
+    onCloseMy() {
+      this.addMode = false;
+    }
+  }
+}
+</script>
+<style scoped lang="less">
+
+</style>

src/router/modules/components.ts

@@ -28,6 +28,12 @@ export default [
         component: () => import('@/pages/user/user_line.vue'),
         meta: { title: '行业管理' },
       },
+      {
+        path: 'user_region',
+        name: 'userRegion',
+        component: () => import('@/pages/user/user_region.vue'),
+        meta: { title: '区域管理' },
+      },
       {
         path: 'user_info',
         name: 'userInfo',
@@ -68,13 +74,13 @@ export default [
     name: 'news',
     component: Layout,
     redirect: '/news/news_index',
-    meta: { title: '新闻管理', icon: ViewListIcon },
+    meta: { title: '新闻文章', icon: ViewListIcon },
     children: [
       {
         path: 'news_index',
         name: 'newsIndex',
         component: () => import('@/pages/news/news_index.vue'),
-        meta: { title: '新闻列表' },
+        meta: { title: '新闻内容管理' },
       }
     ],
   },{