Ver Fonte

auto commit

gcz há 4 anos atrás
pai
commit
a656cf01ab

+ 8 - 8
src/router/index.js

@@ -316,7 +316,13 @@ export const asyncRouterMap = [
         component: () => import('@/views/sms/advertise/update'),
         meta: {title: '编辑广告'},
         hidden:true
-      }
+      },
+      {
+        path: 'rollbuy',
+        name: 'rollbuy',
+        component: () => import('@/views/ums/rollbuy/index'),
+        meta: {title: '购买滚动', icon: 'ums-admin'}
+      },
     ]
   },
   {
@@ -377,13 +383,7 @@ export const asyncRouterMap = [
         name: 'subject',
         component: () => import('@/views/ums/subject/index'),
         meta: {title: '专题管理', icon: 'ums-admin'}
-      },
-      {
-        path: 'rollbuy',
-        name: 'rollbuy',
-        component: () => import('@/views/ums/rollbuy/index'),
-        meta: {title: '购买滚动', icon: 'ums-admin'}
-      },
+      },      
       {
         path: 'resource',
         name: 'resource',

+ 1 - 1
src/views/pms/product/components/ProductInfoDetail.vue

@@ -125,7 +125,7 @@
       <el-form-item label="排序">
         <el-input type="number" v-model="value.sort"></el-input>
       </el-form-item>
-      <el-form-item label="商品图:" prop="selectProductPics">
+      <el-form-item label="商品图:" prop="selectProductPics">
         <multi-upload v-model="selectProductPics"></multi-upload>
       </el-form-item>
       <el-form-item style="text-align: center">

+ 53 - 5
src/views/sms/advertise/components/HomeAdvertiseDetail.vue

@@ -18,7 +18,7 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="开始时间:" prop="startTime">
+      <!-- <el-form-item label="开始时间:" prop="startTime">
         <el-date-picker
           type="datetime"
           placeholder="选择日期"
@@ -29,6 +29,22 @@
           type="datetime"
           placeholder="选择日期"
           v-model="homeAdvertise.endTime"></el-date-picker>
+      </el-form-item> -->
+      <el-form-item label="时间:" prop="startTime">
+            <el-date-picker
+              v-model="rangeTime"
+              type="datetimerange"
+              :picker-options="pickerOptions"
+              @change="timeChange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :default-time="['00:00:00', '23:59:59']"
+              align="right">
+            </el-date-picker>
+          </el-form-item>
+      <el-form-item label="弹窗时长:" prop="jumpTime" v-if="homeAdvertise.type=='0'">
+        <el-input v-model="homeAdvertise.jumpTime" class="input-width"></el-input>
       </el-form-item>
       <el-form-item label="上线/下线:">
         <el-radio-group v-model="homeAdvertise.status">
@@ -44,6 +60,7 @@
       </el-form-item>
       <el-form-item label="广告链接:" prop="url">
         <el-input v-model="homeAdvertise.url" class="input-width"></el-input>
+        <div style="color:#666;font-size: 12px;">例:http://wxh5.gzqlyx.com/#/pages/product/product?id=776</div>
       </el-form-item>
       <el-form-item label="广告备注:">
         <el-input
@@ -64,9 +81,10 @@
 <script>
   import SingleUpload from '@/components/Upload/singleUpload'
   import {createHomeAdvertise, getHomeAdvertise, updateHomeAdvertise} from '@/api/homeAdvertise'
+  // import {formatDate} from '@/utils/date';
   const defaultTypeOptions = [
     {
-      label: 'PC首页轮播',
+      label: '推广弹窗',
       value: 0
     },
     {
@@ -83,7 +101,10 @@
     status: 0,
     url: null,
     note: null,
-    sort: 0
+    sort: 0,
+    conType:0,//0:url跳转,1:商品跳转2:供应商跳转3:生产地跳转	
+    isJump:0,//1:是弹窗
+    jumpTime:5,//弹窗时间
   };
   export default {
     name: 'HomeAdvertiseDetail',
@@ -96,7 +117,11 @@
     },
     data() {
       return {
-        homeAdvertise: null,
+        rangeTime:'',//时间区间
+        pickerOptions: {
+          
+        },
+        homeAdvertise: new Object(),
         rules: {
           name: [
             {required: true, message: '请输入广告名称', trigger: 'blur'},
@@ -111,6 +136,9 @@
           endTime: [
             {required: true, message: '请选择到期时间', trigger: 'blur'}
           ],
+          jumpTime: [
+            {required: true, message: '请输入广告时长', trigger: 'blur'}
+          ],
           pic: [
             {required: true, message: '请选择广告图片', trigger: 'blur'}
           ]
@@ -122,6 +150,7 @@
       if (this.isEdit) {
         getHomeAdvertise(this.$route.query.id).then(response => {
           this.homeAdvertise = response.data;
+          this.rangeTime=[response.data.startTime,response.data.endTime]
         });
       }else{
         this.homeAdvertise = Object.assign({},defaultHomeAdvertise);
@@ -178,7 +207,26 @@
       resetForm(formName) {
         this.$refs[formName].resetFields();
         this.homeAdvertise = Object.assign({},defaultHomeAdvertise);
-      }
+      },
+      timeChange(rangeTime){
+        let startDate = new Date(rangeTime[0]);
+        let endDate = new Date(rangeTime[1]);
+        // this.homeAdvertise.startTime =  formatDate(startDate, 'yyyy-MM-dd hh:mm:ss');
+        // this.homeAdvertise.endTime =  formatDate(endDate, 'yyyy-MM-dd hh:mm:ss');
+        this.homeAdvertise.startTime  = startDate;
+        this.homeAdvertise.endTime = endDate;
+        console.log(' this.homeAdvertise.startTime', this.homeAdvertise.startTime);
+      },
+      //广告类型改变
+      // typechange(e){
+      //   // console.log('广告类型改变',e);        
+      //   if(e == '0'){
+      //     this.homeAdvertise.isJump = 1
+      //   }else if(e == '1'){
+      //     this.homeAdvertise.isJump = 0
+      //   }
+      // }
+
     }
   }
 </script>

+ 2 - 2
src/views/sms/advertise/index.vue

@@ -68,7 +68,7 @@
         <el-table-column label="广告图片" width="120" align="center">
           <template slot-scope="scope"><img style="height: 80px" :src="scope.row.pic"></template>
         </el-table-column>
-        <el-table-column label="时间" width="220" align="center">
+        <el-table-column label="时间" width="230" align="center">
           <template slot-scope="scope">
             <p>开始时间:{{scope.row.startTime | formatTime}}</p>
             <p>到期时间:{{scope.row.endTime | formatTime}}</p>
@@ -189,7 +189,7 @@
         if(type===1){
           return 'APP首页轮播';
         }else{
-          return 'PC首页轮播';
+          return '推广弹窗';
         }
       },
       formatTime(time){

src/views/ums/rollbuy/index.vue → src/views/sms/rollbuy/index.vue