285

project/fengdu/app/AppIntegratingAudit/components/Detail.vue

@@ -36,7 +36,7 @@
             <ai-info-item label="事件附件" isLine>
               <div class="files">
                 <div class="file-item" v-for="(item, index) in info.files" :key="index">
-                  <img :src="item.url" v-viewer="{movable: true}" v-if="item.postfix !== '.mp4'">
+                  <img :src="item.url" v-viewer="{movable: true}" v-if="['.mp4', '.mov'].includes(item.postfix) !== '.mp4'">
                   <video controls v-else :src="item.url"></video>
                 </div>
               </div>

project/fengdu/app/AppIntegratingSupermarket/components/AddStore.vue

@@ -305,7 +305,9 @@
 
       onConfirm () {
         this.isShow = false
-        this.form.goodsList = this.chooseList.map(v => {
+        let list = this.chooseList.filter(v => {
+          return this.form.goodsList.map(e => e.goodsId).indexOf(v.id) === -1
+        }).map(v => {
           return {
             goods: {
               ...v
@@ -317,6 +319,11 @@
             status: v.status
           }
         })
+
+        this.form.goodsList = [
+          ...this.form.goodsList ,
+          ...list
+        ]
       },
 
       getInfo (id) {