2022-8-5 广告

src/views/business/component/addStore.vue

@@ -1,7 +1,7 @@
 <!--新增门店-->
 <template>
   <div>
-    <xy-dialog :is-show.sync="isShow" :title="type === 'add' ? '新增门店' : '编辑门店'" type="form" :form="form" :rules="rules" @submit="submit">
+    <xy-dialog ref="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">
@@ -248,16 +248,7 @@ export default {
           this.form.lng = res.longitude
         }
       }else{
-        this.form = {
+        this.$refs['dialog'].reset()
-          belongsMerchant:'',
-          name:'',
-          password:'',
-          contact:'',
-          contactNumber:'',
-          address:'',
-          lng:'',//经度
-          lat:'',//纬度
-        }
       }
     }
   },

src/views/login/index.vue

@@ -64,7 +64,7 @@
       return {
         loginForm: {
           username: 'admin',
-          password: 'Yunyubang2021@'
+          password: ''
         },
         loginRules: {
           username: [{

src/views/marketing/ad.vue

@@ -23,8 +23,10 @@
             </div>
 
             <div class="selects-item">
-              <div class="selects-item-label">有效时间：</div>
+              <div class="selects-item-label">是否在有效期：</div>
-              <DatePicker :value="select.effectiveDate" style="width: 200px;" transfer placeholder="选择有效时间" type="daterange" placement="bottom" @on-change="(e)=>select.effectiveDate = e"></DatePicker>
+              <Select v-model="select.isEffect" placeholder="是否有效" style="width: 100px;" clearable>
+                <Option v-for="item in [{value:0,label:'有效'},{value:1,label:'无效'},{value:'',label:'全部'}]" :value="item.value">{{ item.label }}</Option>
+              </Select>
             </div>
 
             <div class="selects-item">
@@ -80,7 +82,7 @@ export default {
         name:'',
         system:'',
         createDate:[],
-        effectiveDate:[]
+        isEffect:''
       },
 
       total:0,
@@ -109,7 +111,7 @@ export default {
         {
           label:'发布系统',
           width: 180,
-          prop:'origin_system'
+          prop:'origin_system_detail.value'
         },
         {
           label:'活动跳转',
@@ -124,9 +126,12 @@ export default {
           prop:'type',
           formatter:(cell,data,value)=>{
             switch (value){
-              case 1:
+              case 0:
                 return '首页轮播图'
                 break;
+              case 1:
+                return '商品轮播图'
+                break;
               default:
                 return '未知'
             }
@@ -152,15 +157,14 @@ export default {
           label:'有效期',
           width: 220,
           customFn:(row)=>{
-            return (<div>{parseTime(new Date(row.valid_time_begin),'{y}-{m}-{d}')} - {parseTime(new Date(row.valid_time_over),'{y}-{m}-{d}')}</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',
+          customFn:(row)=>{
-          formatter:(cell, data, value) => {
+            return (<div>{row.admin.name} / {parseTime(new Date(row.created_at),'{y}-{m}-{d}')}</div>)
-            return parseTime(new Date(value),'{y}-{m}-{d}') || ''
           }
         }
       ],
@@ -184,7 +188,8 @@ export default {
         page_size:this.select.pageSize,
         create_begin:this.select.createDate[0],
         create_over:this.select.createDate[1],
-        page:this.select.pageIndex
+        page:this.select.pageIndex,
+        valid_time:this.select.isEffect,
       })
       this.list = res.data
     },

src/views/marketing/components/addAd.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <xy-dialog :is-show.sync="isShow" type="form" :title="type === 'add' ? '新增广告' : '编辑广告'" :form="form" :rules="rules" @submit="submit">
+    <xy-dialog :is-show.sync="isShow" type="form" :title="type === 'add' ? '新增广告' : '编辑广告'" :form="form" :rules="rules" ref="dialog" @submit="submit">
       <template v-slot:name>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
@@ -133,7 +133,7 @@ export default {
       type:'add',
       isShow:false,
 
-      types:[{label:'首页轮播图',value:1}],
+      types:[{label:'首页轮播图',value:0},{label:'商品轮播图',value:1}],
       states:[
         {
           label:'禁用',
@@ -290,7 +290,7 @@ export default {
       this.form.name = res?.name
       this.form.state = res?.state
       this.form.system = res?.origin_system
-      this.form.to = Number(res?.action)
+      this.form.to = res?.action
       this.form.sort = res?.sort
       this.form.type = res?.type
       this.form.img = res?.pic
@@ -304,6 +304,8 @@ export default {
         if(this.type === 'editor'){
           this.getDetailAd()
         }
+      }else{
+        this.$refs['dialog'].reset()
       }
     }
   }

vue.config.js

@@ -46,7 +46,7 @@ module.exports = {
     //before: require('./mock/mock-server.js'),
     proxy: {
       [process.env.VUE_APP_BASE_API]: {
-        target: 'http://yunyubang.ali251.langye.net/',
+        target: 'https://yunyubang.ali251.langye.net/',
         changeOrigin: true, //配置跨域
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''