From 98f36794d4bc96e5341366d3a1ba9ed4de169a29 Mon Sep 17 00:00:00 2001
From: "271556543@qq.com" <271556543@qq.com>
Date: Fri, 5 Aug 2022 13:30:53 +0800
Subject: [PATCH] =?UTF-8?q?2022-8-5=20=E9=97=A8=E5=BA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ad/index.js                       |   8 ++
 src/api/shop/index.js                     |  43 +++++++++
 src/views/business/component/addStore.vue | 105 +++++++++++++++++++---
 src/views/business/storeManage.vue        |  78 ++++++++++++----
 src/views/marketing/ad.vue                |  60 ++++++++++---
 src/views/marketing/components/addAd.vue  |  63 ++++++++-----
 6 files changed, 294 insertions(+), 63 deletions(-)
 create mode 100644 src/api/shop/index.js

diff --git a/src/api/ad/index.js b/src/api/ad/index.js
index 190b23e..2b62eb4 100644
--- a/src/api/ad/index.js
+++ b/src/api/ad/index.js
@@ -31,3 +31,11 @@ export function update(data){
     data
   })
 }
+
+export function destroy(params){
+  return request({
+    method:'get',
+    url:'/api/admin/advertisement/destroy',
+    params
+  })
+}
diff --git a/src/api/shop/index.js b/src/api/shop/index.js
new file mode 100644
index 0000000..8ced51a
--- /dev/null
+++ b/src/api/shop/index.js
@@ -0,0 +1,43 @@
+//门店管理
+
+import request from '@/utils/request'
+
+export function index(params){
+  return request({
+    method:'get',
+    url:'/api/admin/shop/index',
+    params
+  })
+}
+
+export function store(data){
+  return request({
+    method:'post',
+    url:'/api/admin/shop/store',
+    data
+  })
+}
+
+export function show(params){
+  return request({
+    method:'get',
+    url:'/api/admin/shop/show',
+    params
+  })
+}
+
+export function save(data){
+  return request({
+    method:'post',
+    url:'/api/admin/shop/save',
+    data
+  })
+}
+
+export function destroy(params){
+  return request({
+    method:'get',
+    url:'/api/admin/shop/destroy',
+    params
+  })
+}
diff --git a/src/views/business/component/addStore.vue b/src/views/business/component/addStore.vue
index 90d6b6f..d3837c2 100644
--- a/src/views/business/component/addStore.vue
+++ b/src/views/business/component/addStore.vue
@@ -1,14 +1,16 @@
 <!--新增门店-->
 <template>
   <div>
-    <xy-dialog :is-show.sync="isShow" title="新增门店" type="form" :form="form" :rules="rules">
+    <xy-dialog :is-show.sync="isShow" :title="type === 'add' ? '新增门店' : '编辑门店'" type="form" :form="form" :rules="rules" @submit="submit">
       <template v-slot:belongsMerchant>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
             <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>所属商家：
           </div>
           <div class="xy-table-item-content">
-            <el-select clearable placeholder="请选择所属商家" v-model="form.belongsMerchant" style="width: 300px;"/>
+            <el-select clearable placeholder="请选择所属商家" v-model="form.belongsMerchant" style="width: 300px;">
+              <el-option v-for="item in merchants" :key="item.value" :value="item.value" :label="item.label"></el-option>
+            </el-select>
           </div>
         </div>
       </template>
@@ -28,7 +30,7 @@
             <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>密码：
           </div>
           <div class="xy-table-item-content">
-            <el-input clearable placeholder="请填写密码" v-model="form.password" style="width: 300px;"/>
+            <el-input v-model="showPassword" show-password type="password" clearable placeholder="请填写密码"  style="width: 300px;" @input="e => form.password = e"/>
           </div>
         </div>
       </template>
@@ -99,11 +101,27 @@
 </template>
 
 <script>
+import {show,save,store} from '@/api/shop'
+import { Message } from 'element-ui'
 export default {
   data() {
     return {
-      isShow:false,
+      merchants:[
+        {
+          value:1,
+          label:'测试商户1'
+        },
+        {
+          value:2,
+          label:'测试商户2'
+        },
+      ],
+      //测试
 
+      type:'add',
+      id:null,
+      isShow:false,
+      showPassword:'',//展示的密码
       form:{
         belongsMerchant:'',
         name:'',
@@ -161,21 +179,86 @@ export default {
     }
   },
   methods: {
-    //地图点击
-    mapClick(r,p){
-      this.$nextTick(()=>{
-        this.form.lat = p
-        this.form.lng = r
-      })
+    submit(){
+      if(this.type === 'add'){
+        store({
+          merchant_id:this.form.belongsMerchant,
+          name:this.form.name,
+          password:this.form.password,
+          address:this.form.address,
+          contact:this.form.contact,
+          phone:this.form.contactNumber,
+          longitude:this.form.lng,
+          latitude:this.form.lat,
+          state:1
+        }).then(res => {
+          Message({
+            type:'success',
+            message:'添加成功'
+          })
+          this.isShow = false
+          this.showPassword = ''
+          this.$emit('refresh')
+        })
+        return
+      }
+      if(this.type === 'editor'){
+        save({
+          id:this.id,
+          merchant_id:this.form.belongsMerchant,
+          name:this.form.name,
+          password:this.form.password,
+          address:this.form.address,
+          contact:this.form.contact,
+          phone:this.form.contactNumber,
+          longitude:this.form.lng,
+          latitude:this.form.lat,
+          state:1
+        }).then(res => {
+          Message({
+            type:'success',
+            message:'编辑门店成功'
+          })
+          this.isShow = false
+          this.showPassword = ''
+          this.$emit('refresh')
+        })
+        return
+      }
     }
   },
   watch:{
     map(newVal){
-      console.log(newVal)
       if(!newVal) return
       this.form.lat = newVal[1]
       this.form.lng = newVal[0]
       this.form.address = newVal[2]
+    },
+    async isShow(newVal){
+      if(newVal){
+        if(this.type === 'editor'){
+          const res = await show({id:this.id})
+          this.form.address = res.address
+          this.form.contact = res.contact
+          this.form.name = res.name
+          this.form.password = res.password
+          this.form.contactNumber = res.phone
+          this.form.belongsMerchant = res.merchant_id
+          this.form.lat = res.latitude
+          this.form.lng = res.longitude
+        }
+      }else{
+        this.form = {
+          belongsMerchant:'',
+          name:'',
+          password:'',
+          contact:'',
+          contactNumber:'',
+          address:'',
+          lng:'',//经度
+          lat:'',//纬度
+        }
+      }
     }
   },
   mounted() {
diff --git a/src/views/business/storeManage.vue b/src/views/business/storeManage.vue
index 986c2b4..cc6c178 100644
--- a/src/views/business/storeManage.vue
+++ b/src/views/business/storeManage.vue
@@ -5,69 +5,82 @@
         <div slot="content"></div>
         <slot>
           <div>
-            <Input style="width: 200px; margin-right: 10px" placeholder="关键字搜索" />
-            <Button type="primary">查询</Button>
-            <Button type="primary" style="margin-left: 10px" @click="$refs['addStore'].isShow = true">新增门店</Button>
+            <Input style="width: 200px; margin-right: 10px" v-model="select.keywords" placeholder="关键字搜索" />
+            <Button type="primary" @click="getStores">查询</Button>
+            <Button type="primary" style="margin-left: 10px" @click="$refs['addStore'].isShow = true,$refs['addStore'].type = 'add'">新增门店</Button>
           </div>
         </slot>
       </lx-header>
     </div>
 
-    <xy-table :list="list" :table-item="tableItem"></xy-table>
+    <xy-table :list="list" :table-item="tableItem" @delete="deleteStore" @editor="editorStore"></xy-table>
 
     <div style="display: flex;justify-content: flex-end;">
-      <Page :total="5" show-elevator />
+      <Page :total="total" show-elevator @on-change="pageChange"/>
     </div>
 
 <!--    新增门店-->
-    <add-store ref="addStore"></add-store>
+    <add-store ref="addStore" @refresh="getStores"></add-store>
   </div>
 </template>
 
 <script>
+import {index,destroy} from '@/api/shop'
+
 import addStore from '@/views/business/component/addStore'
+import { Message } from 'element-ui'
 export default {
   components:{
     addStore
   },
   data() {
     return {
-      list:JSON.parse('{"total":39,"rows":[{"id":1,"merchant_id":1,"name":"\u6717\u4e1a\u7f51\u7edc","address":"\u7af9\u56ed\u8def209\u53f7","contact":"\u5b8b\u536b\u5b97","phone":"18962113007","state":"active","created_at":"2021-07-25T01:23:41.000000Z","updated_at":"2021-07-25T01:23:41.000000Z","deleted_at":null,"is_default":1,"merchant":{"id":1,"username":"\u6717\u4e1a\u7f51\u7edc","name":"\u82cf\u5dde\u6717\u4e1a\u7f51\u7edc\u79d1\u6280\u6709\u9650\u516c\u53f8","logo_id":null,"address":"\u82cf\u5dde\u7af9\u56ed\u8def209\u53f7","slogan":null,"site_id":null,"boss":"\u738b\u6e05\u840d","boss_phone":"13306201077","contact":"\u5b8b\u536b\u5b97","phone":"18962113007","certificate_id":null,"state":"active","created_at":"2021-07-25T01:23:41.000000Z","updated_at":"2022-01-09T07:40:07.000000Z","deleted_at":null,"business_number":"91320506690278148Y","balance":"0.00","lng":null,"lat":null}},{"id":2,"merchant_id":2,"name":"\u5143\u548c\u521d\u5fc3","address":"\u65e0","contact":"\u5b8b\u536b\u5b97","phone":"18962113007","state":"active","created_at":"2021-08-30T03:03:59.000000Z","updated_at":"2021-08-30T03:03:59.000000Z","deleted_at":null,"is_default":1,"merchant":{"id":2,"username":"\u5143\u548c\u521d\u5fc3","name":"KINGBABY\uff08\u5143\u548c\u521d\u5fc3\uff09","logo_id":null,"address":"\u76f8\u57ce\u533a\u7e41\u82b1\u4e2d\u5fc3\u5546\u573a\u8d1f\u4e00\u5c42KINGBABY","slogan":null,"site_id":null,"boss":"\u65e0","boss_phone":"\u65e0","contact":"YOYO","phone":"13913175422","certificate_id":null,"state":"active","created_at":"2021-08-30T03:03:59.000000Z","updated_at":"2022-06-17T09:32:22.000000Z","deleted_at":null,"business_number":"\u65e0","balance":"3376.20","lng":null,"lat":null}},{"id":3,"merchant_id":3,"name":"\u5e78\u5b55\u7eaa","address":"\u65e0","contact":"\u5b8b\u536b\u5b97","phone":"18962113007","state":"active","created_at":"2021-08-30T03:05:32.000000Z","updated_at":"2021-08-30T03:05:32.000000Z","deleted_at":null,"is_default":1,"merchant":{"id":3,"username":"\u5e78\u5b55\u7eaa","name":"\u5e78\u5b55\u7eaa","logo_id":null,"address":"\u59d1\u82cf\u533a\\/\u65b0\u533a\\/\u56ed\u533a","slogan":null,"site_id":null,"boss":"\u65e0","boss_phone":"\u65e0","contact":"\u5ba2\u670d","phone":"18616951428","certificate_id":null,"state":"active","created_at":"2021-08-30T03:05:31.000000Z","updated_at":"2022-07-10T07:34:24.000000Z","deleted_at":null,"business_number":"\u65e0","balance":"-1500.00","lng":"120.620095","lat":"31.300602"}},{"id":4,"merchant_id":4,"name":"\u4f0a\u7d22","address":"\u65e0","contact":"\u5b8b\u536b\u5b97","phone":"18962113007","state":"active","created_at":"2021-08-30T03:06:17.000000Z","updated_at":"2021-08-30T03:06:17.000000Z","deleted_at":null,"is_default":1,"merchant":{"id":4,"username":"\u4f0a\u7d22","name":"\u82cf\u5dde\u5e02\u4f0a\u7d22\u6587\u5316\u4f20\u64ad\u6709\u9650\u516c\u53f8","logo_id":null,"address":"\u65b0\u533a\\/\u56ed\u533a\\/\u65b0\u751f\u513f\u4e0a\u95e8","slogan":null,"site_id":null,"boss":"\u6881\u542f\u6d77","boss_phone":"13913567424","contact":"\u5b59\u840d","phone":"19962192327","certificate_id":null,"state":"active","created_at":"2021-08-30T03:06:17.000000Z","updated_at":"2022-07-10T08:52:40.000000Z","deleted_at":null,"business_number":"91320508094081197J","balance":"2070.00","lng":"120.61648","lat":"31.31036"}},{"id":5,"merchant_id":5,"name":"\u661f\u53d4\u53d4","address":"\u65e0","contact":"\u5b8b\u536b\u5b97","phone":"18962113007","state":"active","created_at":"2021-08-30T03:07:28.000000Z","updated_at":"2021-08-30T03:07:28.000000Z","deleted_at":null,"is_default":1,"merchant":{"id":5,"username":"\u661f\u53d4\u53d4","name":"\u661f\u53d4\u53d4","logo_id":null,"address":"\u82cf\u5dde\u4e1c\u5434\u5317\u8def288\u53f7","slogan":null,"site_id":null,"boss":"\u66f9\u5f90\u6d2a","boss_phone":"\u65e0","contact":"\u66fc\u66fc","phone":"18930820580","certificate_id":null,"state":"active","created_at":"2021-08-30T03:07:28.000000Z","updated_at":"2022-07-02T06:02:50.000000Z","deleted_at":null,"business_number":"\u65e0","balance":"1300.00","lng":"120.62723","lat":"31.27856"}},{"id":6,"merchant_id":6,"name":"\u963f\u6ce2\u7f57","address":"\u65e0","contact":"\u5b8b\u536b\u5b97","phone":"18962113007","state":"active","created_at":"2021-08-30T03:08:19.000000Z","updated_at":"2021-08-30T03:08:19.000000Z","deleted_at":null,"is_default":1,"merchant":{"id":6,"username":"\u963f\u6ce2\u7f57","name":"\u963f\u6ce2\u7f57","logo_id":null,"address":"\u82cf\u5dde\u5e02\u517b\u80b2\u5df7415\u53f7\u521b\u5143\u5a5a\u5e86\u56ed9\u53f7\u697c1\u5c42,\u5b55\u5987\u7167\u65b0\u533a\u7eff\u5b9d\uff0c\u56ed\u533a\u6c38\u65fa\\/\u5b9d\u5b9d\u7167\u65b0\u533a\u7eff\u5b9d\uff0c\u65b0\u533a\u6c38\u65fa\uff0c\u56ed\u533a\u666f\u57ce\u5e97","slogan":null,"site_id":null,"boss":"\u65e0","boss_phone":"\u65e0","contact":"\u963f\u626c","phone":"15062300561","certificate_id":null,"state":"active","created_at":"2021-08-30T03:08:18.000000Z","updated_at":"2022-07-02T11:37:04.000000Z","deleted_at":null,"business_number":"\u65e0","balance":"2680.00","lng":"120.57186","lat":"31.29579"}},{"id":7,"merchant_id":7,"name":"\u82b3\u59ae\u8c46\u4e01","address":"\u65e0","contact":"\u5b8b\u536b\u5b97","phone":"18962113007","state":"active","created_at":"2021-08-30T03:09:32.000000Z","updated_at":"2021-08-30T03:09:32.000000Z","deleted_at":null,"is_default":1,"merchant":{"id":7,"username":"\u82b3\u59ae\u8c46\u4e01","name":"\u82b3\u59ae\u8c46\u4e01\uff08\u7f8e\u8587\u513f\uff09","logo_id":null,"address":"\u4e0a\u95e8\u62cd\u6444","slogan":null,"site_id":null,"boss":"\u65e0","boss_phone":"\u65e0","contact":"\u6797\u6797","phone":"15724862376","certificate_id":null,"state":"active","created_at":"2021-08-30T03:09:32.000000Z","updated_at":"2022-07-08T09:13:42.000000Z","deleted_at":null,"business_number":"92320594MA25AF430U","balance":"3550.00","lng":"120.6698","lat":"31.26647"}},{"id":8,"merchant_id":8,"name":"\u559c\u4e4b\u5bb6","address":"\u65e0","contact":"\u5b8b\u536b\u5b97","phone":"18962113007","state":"active","created_at":"2021-08-30T03:11:16.000000Z","updated_at":"2021-08-30T03:11:16.000000Z","deleted_at":null,"is_default":1,"merchant":{"id":8,"username":"\u559c\u4e4b\u5bb6","name":"\u559c\u4e4b\u5bb6","logo_id":null,"address":"\u65e0","slogan":null,"site_id":null,"boss":"\u65e0","boss_phone":"\u65e0","contact":"\u5b8b\u536b\u5b97","phone":"18962113007","certificate_id":null,"state":"active","created_at":"2021-08-30T03:11:16.000000Z","updated_at":"2021-08-30T03:11:16.000000Z","deleted_at":null,"business_number":"\u65e0","balance":"0.00","lng":null,"lat":null}},{"id":9,"merchant_id":9,"name":"\u7231\u7684\u679c\u5b9e","address":"\u65e0","contact":"\u5b8b\u536b\u5b97","phone":"18962113007","state":"active","created_at":"2021-08-30T03:12:11.000000Z","updated_at":"2021-08-30T03:12:11.000000Z","deleted_at":null,"is_default":1,"merchant":{"id":9,"username":"\u7231\u7684\u679c\u5b9e","name":"\u7231\u7684\u679c\u5b9e","logo_id":null,"address":"\u65e0","slogan":null,"site_id":null,"boss":"\u65e0","boss_phone":"\u65e0","contact":"\u5b8b\u536b\u5b97","phone":"18962113007","certificate_id":null,"state":"active","created_at":"2021-08-30T03:12:11.000000Z","updated_at":"2021-08-30T03:12:11.000000Z","deleted_at":null,"business_number":"\u65e0","balance":"0.00","lng":null,"lat":null}},{"id":10,"merchant_id":10,"name":"\u597d\u5b55\u5988\u5988","address":"\u65e0","contact":"\u5b8b\u536b\u5b97","phone":"18962113007","state":"active","created_at":"2021-08-30T03:12:49.000000Z","updated_at":"2021-08-30T03:12:49.000000Z","deleted_at":null,"is_default":1,"merchant":{"id":10,"username":"\u597d\u5b55\u5988\u5988","name":"\u597d\u5b55\u5988\u5988","logo_id":null,"address":"\u65e0","slogan":null,"site_id":null,"boss":"\u65e0","boss_phone":"\u65e0","contact":"\u5b8b\u536b\u5b97","phone":"18962113007","certificate_id":null,"state":"active","created_at":"2021-08-30T03:12:48.000000Z","updated_at":"2021-08-30T03:12:48.000000Z","deleted_at":null,"business_number":"\u65e0","balance":"0.00","lng":null,"lat":null}}]}').rows,
+      select:{
+        pageIndex:1,
+        pageSize:10,
+        keywords:''
+      },
+
+      total:0,
+      list:[],
       tableItem:[
         {
           prop:'name',
           label:'名称/用户名',
-          width:120
+          align:'left',
+          width:140
         },
         {
           prop:'merchant.name',
           label:'所属商户',
-          width:200
+          width:220
         },
         {
           prop:'address',
           label:'地址',
-          width: 190
+          width: 300,
+          align:'left'
         },
         {
           prop:'contact',
           label:'联系人',
-          width: 100
+          width: 120
         },
         {
           prop:'phone',
           label:'联系电话',
-          width: 140
+          width: 160
         },
         {
           prop:'state',
-          label:'状态'
+          label:'状态',
+          width: 120
         },
         {
           label:'是否为主营门店',
           prop:'is_default',
-          width: 145,
-          formatter:(row, column, cellValue, index)=>{
+          width: 150,
+          formatter:(row, column, cellValue)=>{
             if(cellValue){
               return '是'
             }else{
@@ -79,11 +92,40 @@ export default {
     }
   },
   methods: {
-    test(){
-      console.log(this.form)
+    async getStores(){
+      const res = await index({
+        page_size:this.select.pageSize,
+        page:this.select.pageIndex
+      })
+      this.list = res.data
+      this.total = res.total
+    },
+
+    pageChange(e){
+      this.select.pageIndex = e
+      this.getStores()
+    },
+
+    deleteStore(row){
+      destroy({
+        id:row.id
+      }).then(res => {
+        Message({
+          type:'success',
+          message:'删除成功'
+        })
+        this.getStores()
+      })
+    },
+    editorStore(row){
+      this.$refs['addStore'].type = 'editor'
+      this.$refs['addStore'].id = row.id
+      this.$refs['addStore'].isShow = true
     }
+  },
+  mounted() {
+    this.getStores()
   }
-
 }
 </script>
 
diff --git a/src/views/marketing/ad.vue b/src/views/marketing/ad.vue
index 8bceb0f..81f54f1 100644
--- a/src/views/marketing/ad.vue
+++ b/src/views/marketing/ad.vue
@@ -12,8 +12,8 @@
 
             <div class="selects-item">
               <div class="selects-item-label">发布系统：</div>
-              <Select placeholder="选择发布系统" style="width: 150px;" clearable>
-                <Option></Option>
+              <Select v-model="select.system" placeholder="选择发布系统" style="width: 150px;" clearable>
+                <Option v-for="item in systems" :key="item.value" :value="item.value">{{ item.label }}</Option>
               </Select>
             </div>
 
@@ -46,29 +46,34 @@
     <xy-table
       :list="list"
       :table-item="table"
-      @editor="editorShow">
+      @editor="editorShow"
+      @delete="deleteAd">
 
     </xy-table>
 
     <div style="display: flex;justify-content: flex-end;">
-      <Page :total="total" show-elevator />
+      <Page :total="total" show-elevator @on-change="pageChange"/>
     </div>
 
     <!--    新增-->
-    <add-ad ref="addAd" @refresh="getAds"></add-ad>
+    <add-ad ref="addAd" :systems="systems" @refresh="getAds"></add-ad>
   </div>
 </template>
 
 <script>
-import {index} from "@/api/ad"
+import {index,destroy} from "@/api/ad"
+import {getparameter} from '@/api/system/dictionary'
+import {parseTime} from '@/utils'
 
 import addAd from './components/addAd'
+import { Message } from 'element-ui'
 export default {
   components:{
     addAd
   },
   data() {
     return {
+      systems:[],
       select:{
         pageSize:10,
         pageIndex:1,
@@ -79,7 +84,7 @@ export default {
       },
 
       total:0,
-      list:[{}],
+      list:[],
       table:[
         {
           label:'图片',
@@ -147,21 +152,40 @@ export default {
           label:'有效期',
           width: 220,
           customFn:(row)=>{
-            return (<div>{row.valid_time_begin} - {row.valid_time_over}</div>)
+            return (<div>{parseTime(new Date(row.valid_time_begin),'{y}-{m}-{d}')} - {parseTime(new Date(row.valid_time_over),'{y}-{m}-{d}')}</div>)
           }
         },
         {
           label:'创建人/创建时间',
           width: 220,
-          prop:'created_at'
+          prop:'created_at',
+          formatter:(cell, data, value) => {
+            return parseTime(new Date(value),'{y}-{m}-{d}') || ''
+          }
         }
       ],
     }
   },
   methods: {
+    //获取类型
+    async getSystem(){
+      let res = await getparameter({number:'system'})
+      this.systems = res.detail.map(item => {
+        return {
+          label:item.value,
+          value:item.id
+        }
+      })
+    },
     async getAds(){
-      console.log(this.select)
-      const res = await index()
+      const res = await index({
+        name:this.select.name,
+        origin_system:this.select.system,
+        page_size:this.select.pageSize,
+        create_begin:this.select.createDate[0],
+        create_over:this.select.createDate[1],
+        page:this.select.pageIndex
+      })
       this.list = res.data
     },
 
@@ -175,14 +199,28 @@ export default {
         effectiveDate:[]
       }
     },
+    pageChange(e){
+      this.select.pageIndex = e
+      this.getAds()
+    },
 
     editorShow(row){
       this.$refs['addAd'].type = 'editor'
       this.$refs['addAd'].id = row.id
       this.$refs['addAd'].isShow = true
+    },
+    deleteAd(row){
+      destroy({id:row.id}).then(res => {
+        Message({
+          type:'success',
+          message:'删除成功'
+        })
+        this.getAds()
+      })
     }
   },
   mounted() {
+    this.getSystem()
     this.getAds()
   }
 
diff --git a/src/views/marketing/components/addAd.vue b/src/views/marketing/components/addAd.vue
index c4a75e1..f375058 100644
--- a/src/views/marketing/components/addAd.vue
+++ b/src/views/marketing/components/addAd.vue
@@ -41,9 +41,7 @@
             <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>跳转方向：
           </div>
           <div class="xy-table-item-content">
-            <el-select clearable placeholder="请选择跳转方向" v-model="form.to" style="width: 300px;">
-              <el-option v-for="item in toUrls" :key="item.value" :value="item.value" :label="item.label"></el-option>
-            </el-select>
+            <el-input clearable placeholder="请填写跳转方向" v-model="form.to" style="width: 300px;"/>
           </div>
         </div>
       </template>
@@ -94,17 +92,24 @@
             <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>图片：
           </div>
           <div class="xy-table-item-content">
-            <img v-if="form.img" :src="form.img" class="avatar">
+            <div v-if="form.img" style="position: relative;">
+              <img :src="form.img" class="avatar">
+              <Button shape="circle" icon="md-close" type="error" size="small" class="img__delete" @click="form.img = ''"></Button>
+            </div>
             <el-upload
               v-else
+              accept="picture"
+              :limit="1"
               class="avatar-uploader"
               list-type="picture-card"
               action="/api/admin/upload-file"
-              :show-file-list="false"
+              :show-file-list="true"
               :on-error="uploadFail"
-              :on-success="uploadSuccess">
+              :on-success="uploadSuccess"
+              :before-upload="uploadBefore">
               <i  class="el-icon-plus avatar-uploader-icon"></i>
             </el-upload>
+            <div style="font-size: 10px;">建议尺寸： 800*450像素</div>
           </div>
         </div>
       </template>
@@ -117,13 +122,17 @@ import {store,show,update} from '@/api/ad'
 import {getparameter} from '@/api/system/dictionary'
 import { Message } from 'element-ui'
 export default {
+  props:{
+    systems:{
+      type:Array
+    }
+  },
   data() {
     return {
       id:'',
       type:'add',
       isShow:false,
-      systems:[],
-      toUrls:[],
+
       types:[{label:'首页轮播图',value:1}],
       states:[
         {
@@ -157,7 +166,7 @@ export default {
           {required:true,message:"请选择发布系统"}
         ],
         to:[
-          {required:true,message:"请选择跳转方向"}
+          {required:true,message:"请填写跳转方向"}
         ],
         state:[
           {required:true,message:"请选择状态"}
@@ -175,16 +184,7 @@ export default {
     }
   },
   methods: {
-    //获取类型
-    async getSystem(){
-      let res = await getparameter({number:'system'})
-      this.systems = res.detail.map(item => {
-        return {
-          label:item.value,
-          value:item.id
-        }
-      })
-    },
+
     async getToUrl(){
       let res = await getparameter({number:'toUrl'})
       this.toUrls = res.detail.map(item => {
@@ -203,6 +203,17 @@ export default {
       console.log(response)
       this.form.img = response.url
     },
+    uploadBefore(file){
+      console.log(file)
+      if((file.size/1000) > 2024){
+        Message({
+          type:'warning',
+          message:'上传图片大小超过2M！'
+        })
+        return false
+      }
+    },
+
     submit(){
       console.log(this.form)
 
@@ -289,8 +300,6 @@ export default {
   watch:{
     isShow(val){
       if(val){
-        this.getSystem()
-        this.getToUrl()
 
         if(this.type === 'editor'){
           this.getDetailAd()
@@ -302,8 +311,16 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.img__delete{
+
+
+  position: absolute;
+  top: 3px;
+  right: 15px;
+}
 </style>
-<style>
+
+<style lang="scss">
 .avatar-uploader .el-upload {
   border: 1px dashed #d9d9d9;
   border-radius: 6px;
@@ -324,7 +341,7 @@ export default {
 }
 .avatar {
   width: 120px;
-  height: 120px;
   display: block;
+  border-radius: 6px;
 }
 </style>