Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/apps/AppMeetingNotice/belongToMe.vue
#	src/apps/AppMeetingNotice/detail.vue

src/apps/AppAskForm/AppForm.vue

@@ -50,6 +50,8 @@ export default {
         }).then(res => {
           if (res?.code == 0) {
             this.access = true
+          } else {
+            this.err = "无法获取表单"
           }
         }).catch(err => {
           this.err = err

src/apps/AppInterview/interviewDetail.vue

@@ -6,10 +6,10 @@
           <u-input v-model="form.title" placeholder="请输入，最多30字" maxlength="30"/>
         </u-form-item>
         <u-form-item label="调查走访内容" prop="content">
-          <ai-textarea v-model="form.content" placeholder="请输入，最多500字" :maxlength="500"/>
+          <AiTextarea v-model="form.content" placeholder="请输入，最多500字" :maxlength="500"/>
         </u-form-item>
         <u-form-item label="图片（最多9张）">
-          <ai-uploader multiple :limit="9" :def.sync="form.fileList" action="/admin/file/add2"/>
+          <AiUploader multiple :limit="9" :def.sync="form.fileList" action="/admin/file/add2"/>
         </u-form-item>
       </u-form>
       <div bottom>
@@ -24,7 +24,7 @@
       <div class="contentPane">
         <div v-html="form.content"/>
         <div flex class="wrap">
-          <ai-image v-for="(op,i) in form.fileList" :src="op.accessUrl" preview :key="i"/>
+          <AiImage v-for="(op,i) in form.fileList" :src="op.accessUrl" preview :key="i"/>
         </div>
       </div>
     </template>
@@ -33,14 +33,9 @@
 </template>
 
 <script>
-import AiUploader from "../../components/AiUploader";
-import AiImage from "../../components/AiImage";
-import AiTextarea from "../../components/AiTextarea";
-import AiBack from "../../components/AiBack";
 
 export default {
   name: 'interviewDetail',
-  components: {AiBack, AiTextarea, AiImage, AiUploader},
   inject: {root: {}},
   computed: {
     isEdit() {

src/apps/AppNotification/AppNotification.vue

@@ -68,17 +68,13 @@
 </template>
 
 <script>
-import AiAdd from "../../components/AiAdd";
-import AiEmpty from "../../components/AiEmpty";
-import AiTopFixed from "../../components/AiTopFixed";
 import {add, detail, read} from "./components";
-import AiOpenData from "../../components/AiOpenData";
 import {mapActions} from "vuex";
 
 export default {
   name: "AppNotification",
   appName: "通知公告",
-  components: {AiOpenData,AiAdd, AiEmpty, AiTopFixed, add, detail, read},
+  components: {add, detail, read},
   data() {
     return {
       index: 0,

src/apps/AppNotification/components/add.vue

@@ -12,7 +12,8 @@
       </div>
 
       <div class="card">
-        <AiUploader :multiple="true" type="image" :limit="9" placeholder="上传图片" @list="fileList" :def="form.files" action="/admin/file/add2"></AiUploader>
+        <AiUploader :multiple="true" type="image" :limit="9" placeholder="上传图片" @list="fileList" :def="form.files"
+                    action="/admin/file/add2"></AiUploader>
       </div>
 
       <div class="card item-wrap">
@@ -66,13 +67,10 @@
 </template>
 
 <script>
-  import AiBack from "../../../components/AiBack";
-  import AiUploader from "../../../components/AiUploader";
 import {mapActions} from "vuex";
 
 export default {
   name: "add",
-    components: {AiBack,AiUploader},
   props: {
     params: Object
   },
@@ -104,7 +102,7 @@
   },
   watch: {
     params: {
-        handler:function (v) {
+      handler: function () {
         if (this.params?.id) {
           this.form.id = this.params?.id;
           this.flag = this.params?.flag;
@@ -132,7 +130,7 @@
       })
     },
     confirm(e) {
-        if(e.timestamp< (Date.now()/1000)|0){
+      if (e.timestamp < (Date.now() / 1000) || 0) {
         return this.$u.toast("发送时间不能小于当前时间");
       }
       this.form.releaseTime = `${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}:${e.second}`;
@@ -306,6 +304,7 @@
           bottom: 0;
         }
       }
+
       .active {
         background-color: #E7F1FE;
         color: #1174FE;

src/apps/AppNotification/components/detail.vue

@@ -60,14 +60,10 @@
 </template>
 
 <script>
-  import AiBack from "../../../components/AiBack";
 import {mapActions} from "vuex";
-  import AiEmpty from "../../../components/AiEmpty";
-  import AiOpenData from "../../../components/AiOpenData";
 
 export default {
   name: "detail",
-    components:{AiOpenData,AiBack,AiEmpty},
   props: {
     params: Object
   },

src/apps/AppNotification/components/read.vue

@@ -14,13 +14,10 @@
 </template>
 
 <script>
-  import AiBack from "../../../components/AiBack";
-  import AiTopFixed from "../../../components/AiTopFixed";
-  import AiOpenData from "../../../components/AiOpenData";
 import {mapActions} from "vuex";
+
 export default {
   name: "read",
-    components: {AiBack, AiTopFixed, AiOpenData},
   props: {
     params: [String, Number]
   },