通知改成可发给个人

src/layout/apply/form-1.vue

@@ -82,7 +82,7 @@
         </van-col>
       </van-col>
     </van-row>
-    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button ancelButtonText="返回">
+    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button cancel-button-text="返回">
       <van-col span="24" class="one" v-if="dialog.type == '1'">
         <van-col span="24" class="one_1">
           <van-search v-model="searchName" show-action placeholder="请输入联系电话" @search="searchUser">

src/layout/apply/form-2.vue

@@ -68,7 +68,7 @@
         </van-col>
       </van-col>
     </van-row>
-    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button ancelButtonText="返回">
+    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button cancel-button-text="返回">
       <van-col span="24" class="one" v-if="dialog.type == '1'">
         <van-col span="24" class="one_1">
           <van-search v-model="searchName" show-action placeholder="请输入联系电话" @search="searchUser">

src/layout/apply/list-gzj.vue

@@ -23,7 +23,7 @@
         </van-col>
       </van-col>
     </van-row>
-    <van-dialog class="dialog" v-model="show" title="文件下载" :show-confirm-button="false" :show-cancel-button="true" ancelButtonText="返回">
+    <van-dialog class="dialog" v-model="show" title="文件下载" :show-confirm-button="false" :show-cancel-button="true" cancel-button-text="返回">
       <van-col span="24" class="list" v-for="(item, index) in fileList" :key="index">
         <van-col span="24" class="name"
           >文件路径：<span>{{ item }}</span></van-col

src/layout/assessment/form-1.vue

@@ -60,7 +60,7 @@
         </van-col>
       </van-col>
     </van-row>
-    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button ancelButtonText="返回">
+    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button cancel-button-text="返回">
       <search-1 v-if="dialog.type == '1'" @conPatent="conPatent"></search-1>
     </van-dialog>
   </div>

src/layout/chatCommon/chat.vue

@@ -42,7 +42,7 @@
       :showConfirmButton="false"
       :showCancelButton="false"
       :closeOnClickOverlay="false"
-      ancelButtonText="返回"
+      cancel-button-text="返回"
     >
       <van-form>
         <van-field name="file" label="文件">

src/layout/notice/list-1.vue

@@ -0,0 +1,108 @@
+<template>
+  <div id="list-2">
+    <van-col span="24" class="main">
+      <van-col span="24" class="list" v-for="(item, index) in list" :key="index">
+        <van-col span="24" class="other">
+          <van-col span="24" class="otherInfo">
+            发送人：<span>{{ item.send_name || '暂无' }}</span>
+          </van-col>
+          <van-col span="24" class="otherInfo">
+            发送时间：<span>{{ getDate(item.meta) }}</span>
+          </van-col>
+          <van-col span="24" class="otherInfo" v-if="item.to_type == '4'">
+            是否阅读：<span>{{ item.is_read == true ? '已读' : '未读' }}</span>
+          </van-col>
+          <van-col span="24" class="otherInfo">
+            <span>{{ item.content || '暂无' }}</span>
+          </van-col>
+        </van-col>
+        <van-col span="24" class="btn">
+          <van-button type="info" size="small" @click="download(item.notice_file)">文件下载</van-button>
+          <van-button type="info" size="small" @click="toEdit(item)" v-if="item.to_type == '4' && item.is_read == false">消息已读</van-button>
+        </van-col>
+      </van-col>
+    </van-col>
+  </div>
+</template>
+
+<script>
+import { mapState, createNamespacedHelpers } from 'vuex';
+var moment = require('moment');
+export default {
+  name: 'list-2',
+  props: {
+    list: { type: Array },
+  },
+  components: {},
+  data: function () {
+    return {};
+  },
+  created() {},
+  methods: {
+    toEdit(data) {
+      this.$emit('toEdit', data);
+    },
+    getDate(val) {
+      let newDate = moment(val.createdAt).format('YYYY-MM-DD HH:mm:ss');
+      if (newDate) return newDate;
+    },
+    // 文件下载
+    download(data) {
+      if (data.length > 0) {
+        let url = data.map((i) => i.url);
+        window.location.href = `${process.env.VUE_APP_HOST}${url[0]}`;
+      } else {
+        this.$toast({ type: `fail`, message: `非正常文件，无法下载` });
+      }
+    },
+  },
+  computed: {
+    ...mapState(['user']),
+  },
+  metaInfo() {
+    return { title: this.$route.meta.title };
+  },
+  watch: {
+    test: {
+      deep: true,
+      immediate: true,
+      handler(val) {},
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.main {
+  padding: 8px 0 0 0;
+  .list {
+    background-color: #fff;
+    margin: 0 0 8px 0;
+    padding: 8px;
+    border-radius: 5px;
+    .title {
+      font-size: 16px;
+      font-weight: bold;
+      margin: 0 0 5px 0;
+    }
+    .other {
+      margin: 0 0 5px 0;
+      .otherInfo {
+        font-size: 14px;
+        color: #666;
+        margin: 0 0 5px 0;
+        span {
+          color: #000;
+          line-height: 20px;
+        }
+      }
+    }
+    .btn {
+      text-align: center;
+      .van-button {
+        margin: 0 5px;
+      }
+    }
+  }
+}
+</style>

src/layout/patentInfo/form-1.vue

@@ -323,7 +323,7 @@
         </van-col>
       </van-col>
     </van-row>
-    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button ancelButtonText="返回">
+    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button cancel-button-text="返回">
       <van-col span="24" class="one" v-if="dialog.type == '1'">
         <van-col span="24" class="one_1">
           <van-search v-model="searchName" show-action placeholder="请输入联系电话" @search="searchUser">

src/router/index.js

@@ -129,12 +129,12 @@ const account = [
   },
   {
     path: '/account/answertea/index',
-    meta: { title: '答题师' },
+    meta: { title: '咨询师' },
     component: () => import('../views/account/answertea/index.vue'),
   },
   {
     path: '/account/answertea/detail',
-    meta: { title: '答题师-信息管理' },
+    meta: { title: '咨询师-信息管理' },
     component: () => import('../views/account/answertea/detail.vue'),
   },
   {
@@ -303,12 +303,12 @@ const patent = [
   },
   {
     path: '/patent/mech/patent/navigation',
-    meta: { title: '查新检索' },
+    meta: { title: '专利检索' },
     component: () => import('../views/patent/mech/patent/navigation/index.vue'),
   },
   {
     path: '/patent/mech/patent/navigation/info',
-    meta: { title: '查新检索-详细信息' },
+    meta: { title: '专利检索-详细信息' },
     component: () => import('../views/patent/mech/patent/navigation/info.vue'),
   },
   {
@@ -421,7 +421,7 @@ const patent = [
     meta: { title: '专利需求' },
     component: () => import('../views/patent/admin/techol/index.vue'),
   },
-  // 答题师
+  // 咨询师
   {
     path: '/patent/answertea/message/question',
     meta: { title: '问题管理' },

src/store/index.js

@@ -67,7 +67,7 @@ import patenttrans from '@common/src/store/patent/patenttrans';
 // 代理机构
 import agent_mech from '@common/src/store/patent/agent_mech';
 
-// 答题师
+// 咨询师
 import answer_tea from '@common/src/store/patent/answer_tea';
 // 问题咨询
 import problem_service from '@common/src/store/patent/problem_service';

src/views/account/index.vue

@@ -16,7 +16,7 @@
           <van-cell title="机构用户" @click="to('mechanism')" is-link v-if="userInfo.role == '1'" />
           <van-cell title="平台用户" @click="to('users')" is-link v-if="userInfo.role == '1' || userInfo.role == '2'" />
           <van-cell title="代理机构" @click="to('agentmech')" is-link v-if="userInfo.role == '1'" />
-          <van-cell title="答题师" @click="to('answertea')" is-link v-if="userInfo.role == '1'" />
+          <van-cell title="咨询师" @click="to('answertea')" is-link v-if="userInfo.role == '1'" />
           <van-cell title="专利运营" @click="toPatent('patent')" is-link />
           <van-cell title="修改密码" @click="to('password')" is-link v-if="userInfo.role == '3'" />
           <van-cell title="退出登录" @click="logout" is-link />

src/views/account/patent/index.vue

@@ -5,7 +5,7 @@
         <list-1 :list="list" @detail="detail"></list-1>
       </template>
     </admin-frame>
-    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button ancelButtonText="返回">
+    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button cancel-button-text="返回">
       <info-1 :info="info" v-if="dialog.type == '1'"></info-1>
     </van-dialog>
   </div>

src/views/login.vue

@@ -11,7 +11,7 @@
             <van-tab title="代理机构">
               <login-3></login-3>
             </van-tab>
-            <van-tab title="答题师">
+            <van-tab title="咨询师">
               <login-4></login-4>
             </van-tab>
             <van-tab title="管理用户">

src/views/market/patentInfo/index.vue

@@ -11,7 +11,7 @@
         </van-col>
       </template>
     </admin-frame>
-    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button ancelButtonText="返回">
+    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button cancel-button-text="返回">
       <search-1 v-if="dialog.type == '1'" :searchForm="searchForm" @reseat="reseat" @onSubmit="onSubmit"></search-1>
       <info-1 v-else-if="dialog.type == '2'" :info="info"></info-1>
     </van-dialog>

src/views/market/transfer/index.vue

@@ -4,15 +4,17 @@
       <template v-slot:info>
         <van-tabs v-model="active" @change="changeActive">
           <van-tab title="成交专利">
+            <template #title>成交专利({{ total1 }})</template>
             <list-1 :list="list"></list-1>
           </van-tab>
           <van-tab title="转让信息">
+            <template #title>转让信息({{ total2 }})</template>
             <list-2 :list="list" @toView="toView"></list-2>
           </van-tab>
         </van-tabs>
       </template>
     </admin-frame>
-    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button cancelButtonText="返回">
+    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button cancel-button-text="返回">
       <info-1 :info="info" v-if="dialog.type == '1'"></info-1>
     </van-dialog>
   </div>
@@ -45,10 +47,14 @@ export default {
       dialog: { show: false, title: '详细信息', type: '1' },
       // 详细信息
       info: {},
+      // 显示总数
+      total1: 0,
+      total2: 0,
     };
   },
   async created() {
     await this.search();
+    await this.searchOther();
   },
   methods: {
     ...patenttrans(['query']),
@@ -79,6 +85,13 @@ export default {
       this.$set(this, `active`, Number(value));
       this.search();
     },
+    // 查询其他信息
+    async searchOther() {
+      let res = await this.query({ status: '5' });
+      if (this.$checkRes(res)) this.$set(this, `total1`, res.total);
+      res = await this.query({ status: '1' });
+      if (this.$checkRes(res)) this.$set(this, `total2`, res.total);
+    },
   },
   computed: {
     ...mapState(['user']),

src/views/patent/admin/examine/analysis.vue

@@ -5,7 +5,7 @@
         <list-1 :list="list" @toView="toView" @toCheck="toCheck" @toFile="toFile"></list-1>
       </template>
     </admin-frame>
-    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button ancelButtonText="返回">
+    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button cancel-button-text="返回">
       <info-1 :info="info" v-if="dialog.type == '1'"></info-1>
       <check-1 :form="info" v-else-if="dialog.type == '2'" @onSubmit="oneSubmit"></check-1>
       <file-1 :form="info" v-else-if="dialog.type == '3'" @onSubmit="twoSubmit"></file-1>

src/views/patent/admin/examine/hairmess/list-1.vue

@@ -20,7 +20,7 @@
         </van-col>
       </van-col>
     </van-row>
-    <van-dialog class="dialog" v-model="show" title="文件下载" :show-confirm-button="false" :show-cancel-button="true" ancelButtonText="返回">
+    <van-dialog class="dialog" v-model="show" title="文件下载" :show-confirm-button="false" :show-cancel-button="true" cancel-button-text="返回">
       <van-col span="24" class="list" v-for="(item, index) in fileList" :key="index">
         <van-col span="24" class="name"
           >文件路径：<span>{{ item }}</span></van-col

src/views/patent/admin/examine/patent copy.vue

@@ -5,7 +5,7 @@
         <list-3 :list="list" @toView="toView" @toCheck="toCheck" @formCheck="formCheck" @gzjSubmit="gzjSubmit"></list-3>
       </template>
     </admin-frame>
-    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button ancelButtonText="返回">
+    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button cancel-button-text="返回">
       <info-1 :info="info" v-if="dialog.type == '1'"></info-1>
       <check-2 :form="form" v-if="dialog.type == '2'" @onSubmit="checkSubmit"></check-2>
       <check-3 :form="form" v-if="dialog.type == '3'" @onSubmit="formSubmit"></check-3>

src/views/patent/admin/examine/patent.vue

@@ -5,7 +5,7 @@
         <list-1 :list="list" @toView="toView" @toAccept="toAccept" @gzjSubmit="gzjSubmit"></list-1>
       </template>
     </admin-frame>
-    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button ancelButtonText="返回">
+    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button cancel-button-text="返回">
       <info-1 :info="info" v-if="dialog.type == '1'"></info-1>
       <accept-1 :form="info" v-else-if="dialog.type == '2'" @onSubmit="oneSubmit"></accept-1>
     </van-dialog>

src/views/patent/admin/message/parts/form-1.vue

@@ -11,21 +11,68 @@
                 <van-radio name="0">所有用户</van-radio>
                 <van-radio name="1">机构用户</van-radio>
                 <van-radio name="2">平台用户</van-radio>
+                <van-radio name="4">个人用户</van-radio>
               </van-radio-group>
             </template>
           </van-field>
+          <van-field v-model="form.to_name" name="to_name" center clearable label="用戶姓名" readonly v-if="form.to_type == '4'">
+            <template #button>
+              <van-button size="small" type="primary" @click="toSelect">选择用户</van-button>
+            </template>
+          </van-field>
+          <van-field v-model="form.to_id" name="to_id" style="display: none" v-if="form.to_type == '4'" />
           <van-field v-model="form.content" name="content" rows="2" autosize label="发送内容" type="textarea" placeholder="发送内容" />
+          <van-field name="notice_file" label="通知文件" :rules="[{ required: true, message: '通知文件' }]">
+            <template #input>
+              <van-uploader
+                :fileList="form.notice_file"
+                :max-count="1"
+                :after-read="(file) => toUpload(file, 'notice_file')"
+                @delete="(file) => toDelete(file, 'notice_file')"
+                accept="file"
+              />
+            </template>
+          </van-field>
           <div style="margin: 16px">
             <van-button round block type="info" native-type="submit">提交</van-button>
           </div>
         </van-form>
       </van-col>
     </van-row>
+    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button cancel-button-text="返回">
+      <van-col span="24" class="one" v-if="dialog.type == '1'">
+        <van-col span="24" class="one_1">
+          <van-search v-model="searchName" show-action placeholder="请输入联系电话" @search="searchUser">
+            <template #action>
+              <div @click="searchUser">搜索</div>
+            </template>
+          </van-search>
+        </van-col>
+        <van-col span="24" class="one_2">
+          <van-col span="24" class="list" v-for="(item, index) in list" :key="index">
+            <van-col span="24" class="name"> {{ item.name }} </van-col>
+            <van-col span="24" class="other">
+              <van-col span="24" class="otherInfo">
+                联系电话:<span>{{ item.phone }}</span>
+              </van-col>
+            </van-col>
+            <van-col span="24" class="btn">
+              <van-button type="info" size="mini" @click.prevent="conFirm(item)">确认选择</van-button>
+            </van-col>
+          </van-col>
+          <van-col span="24" class="page">
+            <page @search="searchUser" :limit="limit" :total="total"></page>
+          </van-col>
+        </van-col>
+      </van-col>
+    </van-dialog>
   </div>
 </template>
 
 <script>
 import { mapState, createNamespacedHelpers } from 'vuex';
+const { mapActions: upload } = createNamespacedHelpers('upload');
+const { mapActions: personal } = createNamespacedHelpers('personal');
 export default {
   name: 'form-1',
   props: {
@@ -33,13 +80,52 @@ export default {
   },
   components: {},
   data: function () {
-    return {};
+    return {
+      dialog: { show: false, titla: '查询用户', type: '1' },
+      // 查询
+      searchName: '',
+      list: [],
+      limit: 3,
+      total: 0,
+    };
   },
   created() {},
   methods: {
+    ...upload(['upload']),
+    ...personal({ personalQuery: 'query' }),
     onSubmit(values) {
       this.$emit('onSubmit', values);
     },
+    async toUpload({ file }, model) {
+      // 上传,赋值
+      const res = await this.upload({ file, dir: 'analysis' });
+      if (this.$checkRes(res)) {
+        this.$set(this.form, model, [{ name: res.name, url: res.uri }]);
+      }
+    },
+    toDelete(file, model) {
+      const index = this.form[model].findIndex((f) => _.isEqual(f, file));
+      this.form[model].splice(index, 1);
+    },
+    // 选择用户
+    toSelect() {
+      this.dialog = { show: true, title: '查询用户', type: '1' };
+    },
+    // 查询用户
+    async searchUser({ skip = 0, limit = this.limit, ...info } = {}) {
+      if (this.searchName) info.phone = this.searchName;
+      let res = await this.personalQuery({ skip, limit, ...info });
+      if (this.$checkRes(res)) {
+        this.$set(this, `list`, res.data);
+        this.$set(this, `total`, res.total);
+      }
+    },
+    // 确认选择
+    conFirm(value) {
+      this.$set(this.form, `to_id`, value.id);
+      this.$set(this.form, `to_name`, value.name);
+      this.dialog = { show: false, title: '查询用户', type: '1' };
+    },
   },
   computed: {
     ...mapState(['user']),
@@ -57,4 +143,43 @@ export default {
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.dialog {
+  /deep/.van-dialog__content {
+    max-height: 350px;
+    overflow-y: auto;
+  }
+  .one {
+    .one_2 {
+      .list {
+        border-bottom: 1px dashed #ccc;
+        margin: 0 0 8px 0;
+        padding: 0 8px 5px 8px;
+        .name {
+          font-size: 16px;
+          margin: 0 0 5px 0;
+        }
+        .other {
+          margin: 0 0 5px 0;
+          .otherInfo {
+            font-size: 14px;
+            color: #666;
+            span {
+              color: #000;
+            }
+          }
+        }
+        .btn {
+          text-align: center;
+        }
+      }
+    }
+  }
+  .two {
+    .btn {
+      margin: 8px 0;
+      text-align: center;
+    }
+  }
+}
+</style>

src/views/patent/admin/message/question.vue

@@ -5,7 +5,7 @@
         <list-2 :list="list" @toView="toView" @toAssign="toAssign" @toIssue="toIssue"></list-2>
       </template>
     </admin-frame>
-    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button ancelButtonText="返回">
+    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button cancel-button-text="返回">
       <info-1 :info="info" v-if="dialog.type == '1'"></info-1>
       <assign-1 :form="info" v-else-if="dialog.type == '2'" @onSubmit="onSubmit"></assign-1>
     </van-dialog>

src/views/patent/admin/message/service.vue

@@ -10,7 +10,7 @@
         </van-col>
       </template>
     </admin-frame>
-    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button ancelButtonText="返回">
+    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button cancel-button-text="返回">
       <search-user v-if="dialog.type == '1'" @conFirm="toConUser"></search-user>
     </van-dialog>
   </div>

src/views/patent/admin/message/service_detail.vue

@@ -42,7 +42,7 @@
       :showConfirmButton="false"
       :showCancelButton="false"
       :closeOnClickOverlay="false"
-      ancelButtonText="返回"
+      cancel-button-text="返回"
     >
       <van-form>
         <van-field name="file" label="文件">

src/views/patent/admin/patent/assessment.vue

@@ -5,7 +5,7 @@
         <list-1 :list="list" @toView="toView" @toCheck="toCheck" @toFile="toFile"></list-1>
       </template>
     </admin-frame>
-    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button ancelButtonText="返回">
+    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button cancel-button-text="返回">
       <info-1 :info="info" v-if="dialog.type == '1'"></info-1>
       <check-1 :form="info" v-else-if="dialog.type == '2'" @onSubmit="oneSubmit"></check-1>
       <file-1 :form="info" v-else-if="dialog.type == '3'" @onSubmit="twoSubmit"></file-1>

src/views/patent/admin/patent/index.vue

@@ -10,7 +10,7 @@
         </van-col>
       </template>
     </admin-frame>
-    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button ancelButtonText="返回">
+    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button cancel-button-text="返回">
       <info-1 :info="info" v-if="dialog.type == '1'"></info-1>
     </van-dialog>
   </div>

src/views/patent/admin/patent/trans.vue

@@ -5,7 +5,7 @@
         <list-2 :list="list" @toView="toView"></list-2>
       </template>
     </admin-frame>
-    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button ancelButtonText="返回">
+    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button cancel-button-text="返回">
       <info-1 v-if="dialog.type == '1'" :info="info"></info-1>
     </van-dialog>
   </div>

src/views/patent/admin/safeg/index.vue

@@ -5,7 +5,7 @@
         <list-2 :list="list" @toView="toView" @toCheck="toCheck" @toFile="toFile"></list-2>
       </template>
     </admin-frame>
-    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button ancelButtonText="返回">
+    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button cancel-button-text="返回">
       <info-1 v-if="dialog.type == '1'" :info="info"></info-1>
       <check-1 v-else-if="dialog.type == '2'" :form="form" @onSubmit="checkSubmit"></check-1>
       <file-1 v-else-if="dialog.type == '3'" :form="form" @onSubmit="onSubmitfile"></file-1>

src/views/patent/admin/techol/index.vue

@@ -5,7 +5,7 @@
         <list-1 :list="list" @toView="toView"></list-1>
       </template>
     </admin-frame>
-    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button ancelButtonText="返回">
+    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button cancel-button-text="返回">
       <info-1 v-if="dialog.type == '1'" :info="info"></info-1>
     </van-dialog>
   </div>

src/views/patent/agentmech/apply/apply/index.vue

@@ -21,7 +21,7 @@
         </van-tabs>
       </template>
     </admin-frame>
-    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button ancelButtonText="返回">
+    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button cancel-button-text="返回">
       <info-1 :info="info" v-if="dialog.type == '1'"></info-1>
       <result-1 :info="info" v-else-if="dialog.type == '2'"></result-1>
     </van-dialog>

src/views/patent/agentmech/examine/patent.vue

@@ -5,7 +5,7 @@
         <list-1 :list="list" @toView="toView" @toAccept="toAccept" @toOneself="toOneself" @toGzj="toGzj"></list-1>
       </template>
     </admin-frame>
-    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button ancelButtonText="返回">
+    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button cancel-button-text="返回">
       <info-1 :info="info" v-if="dialog.type == '1'"></info-1>
       <accept-2 :form="info" v-else-if="dialog.type == '2'" @onSubmit="oneSubmit"></accept-2>
     </van-dialog>

src/views/patent/answertea/message/question.vue

@@ -5,7 +5,7 @@
         <list-2 :list="list" @toView="toView" @toUpload="toUpload"></list-2>
       </template>
     </admin-frame>
-    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button ancelButtonText="返回">
+    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button cancel-button-text="返回">
       <info-1 :info="info" v-if="dialog.type == '1'"></info-1>
       <upload-1 :form="info" v-if="dialog.type == '2'" @onSubmit="onSubmit"></upload-1>
     </van-dialog>

src/views/patent/market/index.vue

@@ -15,7 +15,7 @@
         </van-tabs>
       </template>
     </admin-frame>
-    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button ancelButtonText="返回">
+    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button cancel-button-text="返回">
       <info-3 :info="info" v-if="dialog.type == '1'"></info-3>
     </van-dialog>
   </div>

src/views/patent/mech/examine/contract.vue

@@ -5,7 +5,7 @@
         <list-1 :list="list" @toView="toView" @toContact="toContact"></list-1>
       </template>
     </admin-frame>
-    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button ancelButtonText="返回">
+    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button cancel-button-text="返回">
       <info-1 :info="info" v-if="dialog.type == '1'"></info-1>
       <contract-1 :form="info" v-if="dialog.type == '2'" @onSubmit="oneSubmit"></contract-1>
     </van-dialog>

src/views/patent/mech/examine/patent.vue

@@ -5,7 +5,7 @@
         <list-1 :list="list" @toView="toView" @fileCheck="fileCheck" @toGzj="toGzj"></list-1>
       </template>
     </admin-frame>
-    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button ancelButtonText="返回">
+    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button cancel-button-text="返回">
       <info-1 :info="info" v-if="dialog.type == '1'"></info-1>
       <check-1 :form="info" v-else-if="dialog.type == '2'" @onSubmit="oneSubmit"></check-1>
     </van-dialog>

src/views/patent/mech/examine/trans.vue

@@ -5,7 +5,7 @@
         <list-1 :list="list" @toView="toView" @toCheck="toCheck"></list-1>
       </template>
     </admin-frame>
-    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button ancelButtonText="返回">
+    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button cancel-button-text="返回">
       <info-1 :info="info" v-if="dialog.type == '1'"></info-1>
     </van-dialog>
   </div>

src/views/patent/mech/examine/trans_examine.vue

@@ -5,7 +5,7 @@
         <list-1 :list="list" @toView="toView" @toExamine="toExamine"></list-1>
       </template>
     </admin-frame>
-    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button ancelButtonText="返回">
+    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button cancel-button-text="返回">
       <info-1 :info="info" v-if="dialog.type == '1'"></info-1>
       <examine-1 :form="info" v-if="dialog.type == '2'" @onSubmit="oneSubmit"></examine-1>
     </van-dialog>

src/views/patent/mech/mechBtn.vue

@@ -22,7 +22,7 @@
           <van-divider content-position="left" :style="{ color: '#1989fa', borderColor: '#1989fa' }">我的专利</van-divider>
           <van-col span="24" class="one_1">
             <van-cell title="专利信息" @click="pathBtn('mech/patent', 'information')" is-link />
-            <van-cell title="查新检索" @click="pathBtn('mech/patent', 'navigation')" is-link />
+            <van-cell title="专利检索" @click="pathBtn('mech/patent', 'navigation')" is-link />
             <van-cell title="专利预警" @click="pathBtn('mech/patent', 'early')" is-link />
           </van-col>
         </van-col>

src/views/patent/mech/patent/information/index.vue

@@ -18,7 +18,7 @@
         </van-tabs>
       </template>
     </admin-frame>
-    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button ancelButtonText="返回">
+    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button cancel-button-text="返回">
       <info-1 v-if="dialog.type == '1'" :info="info"></info-1>
     </van-dialog>
   </div>

src/views/patent/mech/patent/navigation/index.vue

@@ -10,7 +10,7 @@
         </van-col>
       </template>
     </admin-frame>
-    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button ancelButtonText="返回">
+    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button cancel-button-text="返回">
       <search-1 v-if="dialog.type == '1'" :searchForm="searchForm" @reseat="reseat" @onSubmit="onSubmit"></search-1>
       <info-1 v-else-if="dialog.type == '2'" :info="info"></info-1>
     </van-dialog>

src/views/patent/mech/transaction/index.vue

@@ -5,7 +5,7 @@
         <list-2 :list="list" @toView="toView"></list-2>
       </template>
     </admin-frame>
-    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button ancelButtonText="返回">
+    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button cancel-button-text="返回">
       <info-1 v-if="dialog.type == '1'" :info="info"></info-1>
     </van-dialog>
   </div>

src/views/patent/parts/transfer-1.vue

@@ -5,7 +5,7 @@
         <list-2 :list="list" @toView="toView"></list-2>
       </van-col>
     </van-row>
-    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button ancelButtonText="返回">
+    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button cancel-button-text="返回">
       <info-1 :info="info" v-if="dialog.type == '1'"></info-1>
     </van-dialog>
   </div>

src/views/patent/user/apply/analysis/index.vue

@@ -21,7 +21,7 @@
         </van-tabs>
       </template>
     </admin-frame>
-    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button ancelButtonText="返回">
+    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button cancel-button-text="返回">
       <info-1 :info="info" v-if="dialog.type == '1'"></info-1>
       <result-1 :info="info" v-else-if="dialog.type == '2'"></result-1>
     </van-dialog>

src/views/patent/user/apply/apply/index.vue

@@ -21,7 +21,7 @@
         </van-tabs>
       </template>
     </admin-frame>
-    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button ancelButtonText="返回">
+    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button cancel-button-text="返回">
       <info-1 :info="info" v-if="dialog.type == '1'"></info-1>
       <result-1 :info="info" v-else-if="dialog.type == '2'"></result-1>
       <mech-1 :form="info" v-else-if="dialog.type == '3'" @onSubmit="oneSubmit"></mech-1>

src/views/patent/user/apply/assessment/index.vue

@@ -19,7 +19,7 @@
         </van-tabs>
       </template>
     </admin-frame>
-    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button ancelButtonText="返回">
+    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button cancel-button-text="返回">
       <info-1 v-if="dialog.type == '1'" :info="info"></info-1>
       <result-1 v-else-if="dialog.type == '2'" :info="info"></result-1>
     </van-dialog>

src/views/patent/user/chat/index.vue

@@ -5,7 +5,7 @@
         <list-1 :list="list" @toView="toView"></list-1>
       </template>
     </admin-frame>
-    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button ancelButtonText="返回">
+    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button cancel-button-text="返回">
       <info-1 :info="info" v-if="dialog.type == '1'" @onSubmit="onSubmit"></info-1>
     </van-dialog>
   </div>

src/views/patent/user/message/notice.vue

@@ -2,14 +2,14 @@
   <div id="read">
     <admin-frame @search="search" :limit="limit" :total="total" topType="2" @back="back" :rightArrow="false" :useNav="false">
       <template v-slot:info>
-        <list-2 :list="list"></list-2>
+        <list-1 :list="list" @toEdit="toEdit"></list-1>
       </template>
     </admin-frame>
   </div>
 </template>
 
 <script>
-import list2 from './parts/list-2.vue';
+import list1 from '@/layout/notice/list-1.vue';
 import adminFrame from '@frame/src/components/mobile-frame/mobile-main.vue';
 import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions: patentnotice } = createNamespacedHelpers('patentnotice');
@@ -18,7 +18,7 @@ export default {
   props: {},
   components: {
     adminFrame,
-    list2,
+    list1,
   },
   data: function () {
     return {
@@ -31,7 +31,7 @@ export default {
     this.search();
   },
   methods: {
-    ...patentnotice(['query']),
+    ...patentnotice(['query', 'update']),
     async search({ skip = 0, limit = this.limit, ...info } = {}) {
       info.to_id = this.user._id;
       let res = await this.query({ skip, limit, ...info });
@@ -40,6 +40,15 @@ export default {
         this.$set(this, `total`, res.total);
       }
     },
+    // 消息已读
+    async toEdit(data) {
+      data.is_read = true;
+      let res = await this.update(data);
+      if (this.$checkRes(res)) {
+        this.$toast({ type: `success`, message: `操作完成` });
+        this.search();
+      }
+    },
     // 返回
     back() {
       this.$router.push({ path: '/patent/index' });

src/views/patent/user/patent/information/index.vue

@@ -18,7 +18,7 @@
         </van-tabs>
       </template>
     </admin-frame>
-    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button ancelButtonText="返回">
+    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button cancel-button-text="返回">
       <info-1 :info="info" v-if="dialog.type == '1'"></info-1>
     </van-dialog>
   </div>

src/views/patent/user/patent/safe/index.vue

@@ -26,7 +26,7 @@
         </van-tabs>
       </template>
     </admin-frame>
-    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button ancelButtonText="返回">
+    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button cancel-button-text="返回">
       <search-1 v-if="dialog.type == '1'" @conPatent="conPatent"></search-1>
       <info-1 v-else-if="dialog.type == '2'" :info="info"></info-1>
       <result-1 v-else-if="dialog.type == '3'" :info="info"></result-1>

src/views/patent/user/transaction/index.vue

@@ -14,7 +14,7 @@
         ></list-1>
       </template>
     </admin-frame>
-    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button ancelButtonText="返回">
+    <van-dialog class="dialog" v-model="dialog.show" :title="dialog.title" :show-confirm-button="false" show-cancel-button cancel-button-text="返回">
       <info-1 :info="info" v-if="dialog.type == '1'"></info-1>
       <result-1 :info="info" v-if="dialog.type == '2'"></result-1>
       <endtrans-1 :form="info" v-if="dialog.type == '3'" @onSubmit="oneSubmit"></endtrans-1>

src/views/patent/user/userBtn.vue

@@ -126,7 +126,7 @@
       :showConfirmButton="false"
       :showCancelButton="false"
       :closeOnClickOverlay="true"
-      ancelButtonText="返回"
+      cancel-button-text="返回"
     >
       <frame-chat></frame-chat>
     </van-dialog>