Merge branch 'iteration_0802' into test

src/views/contentManager/contentOperation.vue

@@ -76,7 +76,8 @@
           <el-input v-model.trim="form.linkUrl"></el-input>
         </el-form-item>
 
-        <el-form-item label="上架时间" v-if="type == 5" prop="actionTime" :rules="[{required: true, message: '请选择上架时间范围', trigger: 'change'}]">
+        <!-- 闪页， BANNER， 广告页 -->
+        <el-form-item label="上架时间" v-if="type == 5 || type == 8 || type == 3" prop="actionTime" :rules="[{required: true, message: '请选择上架时间范围', trigger: 'change'}]">
           <el-date-picker style="width:400px;"
                         v-model="form.actionTime"
                         :clearable="false"