1

app/admin/controller/BestKnowledge.php

@@ -104,6 +104,7 @@ class BestKnowledge extends Controller
                 });
             })
             ->with(['user','classTo'])
+            ->whereIn('audit','1,3')
             ->where('type',2)
             ->where('is_del',1)
             ->order('id','desc')
@@ -160,7 +161,7 @@ class BestKnowledge extends Controller
                 });
             })
             ->with(['user','classTo'])
-            ->where('type',1)
+//            ->whereIn('type','1,2')
             ->where('is_del',1)
             ->order('id','desc')
             ->layTable();

app/admin/controller/ShopCoor.php

@@ -79,8 +79,8 @@ class ShopCoor extends Controller
                     'name'=>['require',],
                     'spec'=>['require',],
                     'number'=>['require','integer'],
-                    'standard'=>['require',],
-                    'price'=>['require','float'],
+                    'enclosure'=>['require',],
+//                    'price'=>['require','float'],
                 ]);
                 if(!$make){
                     $this->error('请填写正确的商品信息');
@@ -91,7 +91,7 @@ class ShopCoor extends Controller
             $data['admin_id']=AdminService::getUserId();
             $data['longitude']=$merchant['longitude']??null;
             $data['latitude']=$merchant['latitude']??null;
-            $data['amount']=min(array_column($item,'price'));
+//            $data['amount']=min(array_column($item,'price'));
             $data['type'] =1;
             $order= \app\data\model\ShopCoordination::create($data);
             $order->items()->saveAll($item);

app/admin/view/shop_coor/add.html

@@ -40,6 +40,7 @@
         <el-form-item label="商品信息：" prop="item" :rules="[{message:'此项必须',required:true},{type:'array',min:1,message:'需要商品信息'}]">
             <div><el-button @click="addItem">添加</el-button></div>
             <div v-for="(item,idx) in form.item" class="child-form">
+                <i class="el-icon-delete" @click="deleteItem(idx)"></i>
                 <el-form-item label="商品名称">
                     <el-input v-model="item.name"></el-input>
                 </el-form-item>
@@ -49,11 +50,19 @@
                 <el-form-item label="数量">
                     <el-input v-model="item.number"></el-input>
                 </el-form-item>
-                <el-form-item label="质量标准">
-                    <el-input v-model="item.standard"></el-input>
-                </el-form-item>
-                <el-form-item label="采购价">
-                    <el-input v-model="item.price"></el-input>
+<!--                <el-form-item label="质量标准">-->
+<!--                    <el-input v-model="item.standard"></el-input>-->
+<!--                </el-form-item>-->
+<!--                <el-form-item label="采购价">-->
+<!--                    <el-input v-model="item.price"></el-input>-->
+<!--                </el-form-item>-->
+                <el-form-item label="文件" prop="enclosure">
+                    <el-button @click="addFiles(null,item.enclosure)">增加</el-button>
+                    <div>
+                        <span v-for="(val,idx) in item.enclosure" :key="idx">
+                            <el-tag type="text" @close="item.enclosure.splice(idx,1)" closable>文件{{idx+1}}</el-tag>
+                        </span>
+                    </div>
                 </el-form-item>
             </div>
         </el-form-item>
@@ -61,10 +70,10 @@
         <el-form-item label="图片视频" prop="files">
             <el-button @click="addFile('image')">增加图片/视频</el-button>
             <div>
-                <div v-for="(item,idx) in form.images" :key="idx" style="display: inline-block;">
+                <div v-for="(item,idx) in form.file" :key="idx" style="display: inline-block;">
                     <el-image v-if="item.type==='image'" :src="item.src" class="video"></el-image>
                     <video controls v-else :src="item.src" class="video"></video>
-                    <a @click="form.images.splice(idx,1)">删除</a>
+                    <a @click="form.file.splice(idx,1)">删除</a>
                 </div>
             </div>
         </el-form-item>
@@ -96,7 +105,7 @@
                 standard_tech:null,
                 standard_check:null,
                 item:[],
-                images:[],
+                file:[],
             },
             saving:false,
         }),
@@ -106,10 +115,14 @@
                     name:null,
                     spec:null,
                     number:null,
-                    standard:null,
-                    price:null,
+                    // standard:null,
+                    // price:null,
+                    enclosure:[]
                 })
             },
+            deleteItem (key) {
+                this.form.item.splice(key, 1)
+            },
             addFile(){
                 $('#fileUpload').unbind('upload.done')
                 $('#fileUpload').on('upload.done',  (e,obj) => {
@@ -118,13 +131,24 @@
                         this.$message.error('请上传正确的格式')
                         return
                     }
-                    this.form.images.push({
+                    this.form.file.push({
                         type:type,
                         src:obj.data.url
                     })
                 });
                 $('#fileUpload').trigger('click')
             },
+            addFiles(ext,form){
+                $('#fileUpload').unbind('upload.done')
+                $('#fileUpload').on('upload.done',  (e,obj) => {
+                    if(ext && obj.file.type.indexOf(ext)===-1){
+                        this.$message.error('请上传正确的格式')
+                        return
+                    }
+                    form.push(obj.data.url)
+                });
+                $('#fileUpload').trigger('click')
+            },
             save(){
                 let _this=this,
                     form=this.form