甲方问题修改

src/components/Introduce/IntentionModel.vue

@@ -38,7 +38,14 @@
           label="上传附件"
           v-show="typeData.type === 0"
         >
-          <a-upload :action="action" :default-file-list="fileList" @change="fileChange" list-type="picture" name="files">
+          <a-upload
+            :action="action"
+            :default-file-list="fileList"
+            :before-upload="beforeUpload"
+            @change="fileChange"
+            list-type="picture"
+            name="files"
+          >
             <a-button> <a-icon type="upload" />点击上传附件 </a-button>
           </a-upload>
         </a-form-item>
@@ -220,7 +227,18 @@ export default {
     changePicCode() {
       this.sendPicCode();
     },
+    beforeUpload(file) {
+      return new Promise((resolve, reject) => {
+        const isLt5M = file.size / 1024 / 1024 < 5;
+        if (!isLt5M) {
+          this.$message.warning('上传附件大小不能超过5m！');
+          return reject(false);
+        }
+        return resolve(true);
+      });
+    },
     fileChange(info) {
+      // console.log(info)
       this.fileList = info.fileList;
     },
   },

src/components/Introduce/SettledModel.vue

@@ -68,7 +68,14 @@
           <a-input v-model.trim="platform.friendCompany" placeholder="请输入合作单位..." />
         </a-form-item>
         <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="上传附件">
-          <a-upload :action="action" :default-file-list="fileList" @change="fileChange" list-type="picture" name="files">
+          <a-upload
+            :action="action"
+            :default-file-list="fileList"
+            :before-upload="beforeUpload"
+            @change="fileChange"
+            list-type="picture"
+            name="files"
+          >
             <p>1.营业执照复印件（尚无注册的无需梯控）</p>
             <p>2.法定代表或授权代表身份证复印件</p>
             <p>3.主导产品或技术简介</p>
@@ -138,7 +145,7 @@
 </template>
 
 <script>
-import { mapState, mapActions } from 'vuex';
+import { mapState, mapActions, mapMutations } from 'vuex';
 import { Settled, upload } from 'config/api';
 const formItemLayout = {
   labelCol: { span: 5 },
@@ -155,6 +162,10 @@ export default {
       type: Number,
       default: 1,
     },
+    isShowModel: {
+      type: Number,
+      default: 0,
+    },
   },
   data() {
     return {
@@ -227,7 +238,16 @@ export default {
       interval: 120, // 验证码有效时间倒计时
     };
   },
-  computed: mapState('user', ['picCode']),
+  computed: mapState('user', ['picCode', 'anyringToken']),
+  watch: {
+    isShowModel(val) {
+      if (val === 1 && !this.anyringToken) {
+        this.visible = true;
+      } else {
+        this.visible = false;
+      }
+    },
+  },
   async created() {
     this.sendPicCode();
     await this.getUserSer();
@@ -242,13 +262,25 @@ export default {
         this.platform.companyName = this.userSer.companyName;
       }
     }
+    if (this.isShowModel === 1 && !this.anyringToken) {
+      this.visible = true;
+    } else {
+      this.visible = false;
+    }
   },
   methods: {
     ...mapActions('user', ['sendCode', 'sendPicCode']),
     ...mapActions('home', ['getUserSer']),
+    ...mapMutations('home', ['setPagePath']),
     // 显示表单输入框
     showModal() {
-      this.visible = true;
+      if (!this.anyringToken) {
+        this.setPagePath(this.$route.path);
+        this.$router.push('/login');
+        this.$message.error('请先登录');
+      } else {
+        this.visible = true;
+      }
     },
     // 取消显示
     handleCancel(e) {
@@ -395,6 +427,16 @@ export default {
         this.confirmLoading = false;
       }
     },
+    beforeUpload(file) {
+      return new Promise((resolve, reject) => {
+        const isLt5M = file.size / 1024 / 1024 < 5;
+        if (!isLt5M) {
+          this.$message.warning('上传附件大小不能超过5m！');
+          return reject(false);
+        }
+        return resolve(true);
+      });
+    },
     fileChange(info) {
       this.fileList = info.fileList;
     },

src/components/PlatformList/PlatformList.vue

@@ -192,6 +192,10 @@ export default {
             id: item.id,
             description: item.description,
             name: item.name,
+            direction: item.direction,
+            experiments: item.experiments,
+            projectKind: item.projectKind,
+            vertify: item.vertify,
           },
         });
       } else if (this.listState === 1) {

src/store/modules/home/mutations.js

@@ -287,6 +287,15 @@ const mutations = {
   setServiceArr(state, data) {
     state.serviceArr = data;
   },
+
+  /**
+   * 存储原表单界面
+   * @param {object} state
+   * @param {string} data
+   */
+  setPagePath(state, data) {
+    state.pagePath = data;
+  },
 };
 
 export default mutations;

src/store/modules/home/state.js

@@ -1,3 +1,10 @@
+/*
+ * @Author: wally
+ * @email: 18603454788@163.com
+ * @Date: 2021-01-13 17:21:29
+ * @LastEditors: wally
+ * @LastEditTime: 2021-01-25 15:57:08
+ */
 const state = {
   userSer: null, // 登录人信息
   policyId: 0,
@@ -56,6 +63,7 @@ const state = {
   },
   productId: 0, // 当前产品详情Id
   serviceArr: [], // 服务详情导航
+  pagePath: '', // 点击表单后跳转到登录界面，暂存原表单界面
 };
 
 export default state;

src/views/Community/Posting.vue

@@ -4,16 +4,8 @@
     <h2>标题：</h2>
     <a-input style="margin-bottom: 20px" v-model.trim="title" />
     <h2>封面图片</h2>
-    <a-upload
-      :action="action"
-      :default-file-list="fileList"
-      @change="fileChange"
-      list-type="picture"
-      name="files"
-    >
-      <a-button v-show="fileList.length === 0">
-        <a-icon type="upload" />点击上传
-      </a-button>
+    <a-upload :action="action" :default-file-list="fileList" @change="fileChange" list-type="picture" name="files">
+      <a-button v-show="fileList.length === 0"> <a-icon type="upload" />点击上传 </a-button>
     </a-upload>
     <h2 style="margin-top: 20px">内容：</h2>
     <div class="edit_container" style="height: auto; margin-bottom: 40px">
@@ -92,12 +84,13 @@ export default {
     },
     // 上传图片事件
     fileChange(info) {
-      this.fileList = info.fileList;
-      if (info.file.status === 'done') {
-        this.files = [];
-        this.files = info.fileList[0].response.data[0].id;
-        console.log(this.files);
-      }
+      console.log(info);
+      // this.fileList = info.fileList;
+      // if (info.file.status === 'done') {
+      //   this.files = [];
+      //   this.files = info.fileList[0].response.data[0].id;
+      //   console.log(this.files);
+      // }
     },
     // 发帖
     async subMit() {

src/views/IncubationPlatform/Children/Services.vue

@@ -79,7 +79,14 @@
           label="上传附件"
           v-show="typeData.type === 0"
         >
-          <a-upload :action="action" :default-file-list="fileList" @change="fileChange" list-type="picture" name="files">
+          <a-upload
+            :action="action"
+            :default-file-list="fileList"
+            :before-upload="beforeUpload"
+            @change="fileChange"
+            list-type="picture"
+            name="files"
+          >
             <a-button> <a-icon type="upload" />点击上传附件 </a-button>
           </a-upload>
         </a-form-item>
@@ -311,6 +318,16 @@ export default {
     changePicCode() {
       this.sendPicCode();
     },
+    beforeUpload(file) {
+      return new Promise((resolve, reject) => {
+        const isLt5M = file.size / 1024 / 1024 < 5;
+        if (!isLt5M) {
+          this.$message.warning('上传附件大小不能超过5m！');
+          return reject(false);
+        }
+        return resolve(true);
+      });
+    },
     fileChange(info) {
       this.fileList = info.fileList;
     },

src/views/IncubationPlatform/Children/place/EntitySpace.vue

@@ -104,7 +104,7 @@
         <div style="margin-left: 40px">入驻企业名录</div>
       </div>
       <div class="center-content">
-        <settled-enterprise :lists="lists" />
+        <settled-enterprise :lists="lists" :is-show-model="isShowModel" />
         <!-- <div :key="index" class="ent-box" v-for="(item, index) in lists">
           <p class="ent-index">{{ index + 1 }}</p>
           <span class="ent-name" style="margin-left: 50px">{{ item.company }}</span>
@@ -137,11 +137,23 @@ export default {
       ],
       list: [],
       pageSize: 18,
+      isShowModel: 0,
       current: 1,
       lists: [],
     };
   },
-
+  beforeRouteEnter(to, from, next) {
+    next(vm => {
+      //  这里的vm指的就是vue实例，可以用来当做this使用
+      // console.log(to);
+      // console.log(from);
+      if (from.fullPath === '/login') {
+        vm.isShowModel = 1;
+      } else {
+        vm.isShowModel = 0;
+      }
+    });
+  },
   created() {
     this.searchEnt();
   },

src/views/IncubationPlatform/Children/place/VirtualSpace.vue

@@ -42,7 +42,7 @@
         <div style="margin-left: 40px">入驻企业名录</div>
       </div>
       <div class="center-content">
-        <settled-enterprise :lists="lists" />
+        <settled-enterprise :lists="lists" :is-show-model="isShowModel" />
         <!-- <div :key="index" class="ent-box" v-for="(item, index) in lists">
           <p class="ent-index">{{ index + 1 }}</p>
           <span class="ent-name" style="margin-left: 50px">{{ item.company }}</span>
@@ -77,6 +77,7 @@ export default {
       pageSize: 18,
       current: 1,
       lists: [],
+      isShowModel: 0,
     };
   },
 

src/views/Industry/Children/Serve.vue

@@ -60,7 +60,14 @@
           label="上传附件"
           v-show="typeData.type === 0"
         >
-          <a-upload :action="action" :default-file-list="fileList" @change="fileChange" list-type="picture" name="files">
+          <a-upload
+            :action="action"
+            :default-file-list="fileList"
+            :before-upload="beforeUpload"
+            @change="fileChange"
+            list-type="picture"
+            name="files"
+          >
             <a-button> <a-icon type="upload" />点击上传附件 </a-button>
           </a-upload>
         </a-form-item>
@@ -272,6 +279,16 @@ export default {
     changePicCode() {
       this.sendPicCode();
     },
+    beforeUpload(file) {
+      return new Promise((resolve, reject) => {
+        const isLt5M = file.size / 1024 / 1024 < 5;
+        if (!isLt5M) {
+          this.$message.warning('上传附件大小不能超过5m！');
+          return reject(false);
+        }
+        return resolve(true);
+      });
+    },
     fileChange(info) {
       this.fileList = info.fileList;
     },

src/views/NewPlatform/Children/Service.vue

@@ -57,7 +57,14 @@
           <a-textarea placeholder="请输入需求描述..." style="height: 120px" v-model.trim="platform.describe" />
         </a-form-item>
         <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="上传附件">
-          <a-upload :action="action" :default-file-list="fileList" @change="fileChange" list-type="picture" name="files">
+          <a-upload
+            :action="action"
+            :default-file-list="fileList"
+            :before-upload="beforeUpload"
+            @change="fileChange"
+            list-type="picture"
+            name="files"
+          >
             <a-button> <a-icon type="upload" />点击上传附件 </a-button>
           </a-upload>
         </a-form-item>
@@ -268,6 +275,16 @@ export default {
     changePicCode() {
       this.sendPicCode();
     },
+    beforeUpload(file) {
+      return new Promise((resolve, reject) => {
+        const isLt5M = file.size / 1024 / 1024 < 5;
+        if (!isLt5M) {
+          this.$message.warning('上传附件大小不能超过5m！');
+          return reject(false);
+        }
+        return resolve(true);
+      });
+    },
     fileChange(info) {
       this.fileList = info.fileList;
     },

src/views/NewPlatform/Children/ShareChild/Institute.vue

@@ -4,10 +4,18 @@
     <div class="inner my-1">
       <bread-crumb :arr="arr" />
     </div>
-    <banner :show-page="showPage" />
+    <!-- <banner :show-page="showPage" /> -->
     <div class="inner ins-box">
-      <p class="font-bold-24 item-title">{{ shareName }}</p>
-      <div>{{ description }}</div>
+      <p class="font-bold-24 item-title" v-if="description">{{ shareName }}</p>
+      <div class="font-20" v-if="description">{{ description }}</div>
+      <p class="font-bold-24 item-title" v-if="direction">研究方向：</p>
+      <div class="font-20" v-if="direction" v-dompurify-html="direction"></div>
+      <p class="font-bold-24 item-title">科研能力：</p>
+      <div class="font-20">
+        <p>可做实验：{{ experiments }}</p>
+        <p>测试分析：{{ vertify }}</p>
+        <p>相关项目：{{ projectKind }}</p>
+      </div>
       <p class="font-bold-24 item-title" v-if="list[0]">设备列表</p>
       <div class="d-flex flex-wrap" v-if="list[0]">
         <div :class="(index + 1) % 4 === 0 ? 'margin-0' : ''" :key="index" class="item-box mb-8" v-for="(item, index) in list">
@@ -79,12 +87,12 @@
 <script>
 import { mapMutations, mapState } from 'vuex';
 import { selInstrumentByRes, teamSearch } from 'config/api';
-import Banner from 'components/Banner/Banner.vue';
+// import Banner from 'components/Banner/Banner.vue';
 import HNav from './../../components/HNav.vue';
 import BreadCrumb from 'components/BreadCrumb/BreadCrumb.vue';
 export default {
   name: 'Institute',
-  components: { Banner, HNav, BreadCrumb },
+  components: { HNav, BreadCrumb },
   data() {
     return {
       id: 0,
@@ -114,6 +122,10 @@ export default {
       list: [],
       description: '',
       shareName: '',
+      direction: '', // 研究方向
+      experiments: '', // 科研能力
+      projectKind: '', // 项目分类
+      vertify: '', // 校验
     };
   },
   computed: mapState('home', ['LabId']),
@@ -130,6 +142,18 @@ export default {
     if (this.$route.params.name) {
       this.shareName = this.$route.params.name;
     }
+    if (this.$route.params.direction) {
+      this.direction = this.$route.params.direction;
+    }
+    if (this.$route.params.experiments) {
+      this.experiments = this.$route.params.experiments;
+    }
+    if (this.$route.params.projectKind) {
+      this.projectKind = this.$route.params.projectKind;
+    }
+    if (this.$route.params.vertify) {
+      this.vertify = this.$route.params.vertify;
+    }
     this.getData();
     this.getTeam();
   },

src/views/NewPlatform/components/NewModel.vue

@@ -55,7 +55,14 @@
           </div>
         </a-form-item>
         <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="上传附件">
-          <a-upload :action="action" :default-file-list="fileList" @change="fileChange" list-type="picture" name="files">
+          <a-upload
+            :action="action"
+            :default-file-list="fileList"
+            :before-upload="beforeUpload"
+            @change="fileChange"
+            list-type="picture"
+            name="files"
+          >
             <a-button> <a-icon type="upload" />点击上传附件 </a-button>
           </a-upload>
         </a-form-item>
@@ -166,6 +173,16 @@ export default {
     changePhone(e) {
       this.platform.phone = e.target.value;
     },
+    beforeUpload(file) {
+      return new Promise((resolve, reject) => {
+        const isLt5M = file.size / 1024 / 1024 < 5;
+        if (!isLt5M) {
+          this.$message.warning('上传附件大小不能超过5m！');
+          return reject(false);
+        }
+        return resolve(true);
+      });
+    },
     fileChange(info) {
       this.fileList = info.fileList;
     },

src/views/User/Login.vue

@@ -148,7 +148,10 @@ export default {
     };
   },
 
-  computed: mapState('user', ['picCode']),
+  computed: {
+    ...mapState('user', ['picCode']),
+    ...mapState('home', ['pagePath']),
+  },
 
   created() {
     this.sendPicCode();
@@ -192,8 +195,13 @@ export default {
             const params = { data: { identifier, credential, source: 1 }, type, client: SIGN_IN_CLIENTS.h5 };
             await this.signIn(params);
             // 没有特殊情况就跳转到首页
+            console.log(this.pagePath);
             const { query } = this.$route;
-            this.$router.replace({ path: '/', query });
+            if (this.pagePath !== '') {
+              this.$router.push(this.pagePath);
+            } else {
+              this.$router.replace({ path: '/', query });
+            }
           } catch (error) {
             // console.log(`Login.vue methods handleSignIn: ${error}`);
           }