直播间

1

src/views/groupChatManager/component/timingMsgList.vue

@@ -8,14 +8,18 @@
       @reset="onReSet"
     >
       <el-form-item>
-        <el-select
-          v-model.trim="searchForm.sendFlag"
-          placeholder="状态"
-        >
+        <el-select v-model.trim="searchForm.sendType" placeholder="消息类型" clearable>
+          <el-option label="即时发送" value="NOW"></el-option>
+          <el-option label="定时发送" value="TIMING"> </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-select v-model.trim="searchForm.sendFlag" placeholder="状态" clearable>
           <el-option label="已发送" :value="true"></el-option>
           <el-option label="未发送" :value="false"> </el-option>
         </el-select>
       </el-form-item>
+
       <el-form-item>
         <el-button native-type="submit" type="primary">搜索</el-button>
         <el-button native-type="reset" type="danger">重置</el-button>
@@ -27,15 +31,16 @@
         :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
         :data="tableList"
       >
-        <el-table-column
-          align="center"
-          prop="sendTime"
-          label="发送时间"
-        >
-        <template slot-scope="scope">
-              {{ scope.row.sendTime | dayjsFormat }}
+        <el-table-column align="center" prop="sendTime" label="消息类型">
+          <template slot-scope="scope">
+            {{ scope.row.sendType == "NOW" ? "即时发送" : "定时发送" }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" prop="sendTime" label="发送时间">
+          <template slot-scope="scope">
+            {{ scope.row.sendTime | dayjsFormat }}
             {{ scope.row.sendTime | dayjsFormatMinute }}
-        </template>
+          </template>
         </el-table-column>
         <el-table-column
           align="center"
@@ -69,13 +74,16 @@
               </auth>
               <auth
                 auths="imSendGroupMessage/update"
-                 v-if="!scope.row.sendFlag"
+                v-if="!scope.row.sendFlag"
               >
                 <el-button type="text" @click="resetGroup(scope.row)"
                   >修改</el-button
                 >
               </auth>
-              <auth auths="imSendGroupMessage/delete" v-if="!scope.row.sendFlag">
+              <auth
+                auths="imSendGroupMessage/delete"
+                v-if="!scope.row.sendFlag"
+              >
                 <el-button type="text" @click="deleteGroup(scope.row)"
                   >删除</el-button
                 >
@@ -92,8 +100,8 @@
         :page-sizes="rules.page_size"
         @pagination="getList"
       />
-      <lookGroup ref='lookGroup' />
-        <eidtPostMsg ref='eidtPostMsg' />
+      <lookGroup ref="lookGroup" />
+      <eidtPostMsg ref="eidtPostMsg" />
     </div>
   </div>
 </template>
@@ -103,15 +111,16 @@ import { getToken } from "@/utils/auth";
 import pagination from "@/components/Pagination/index";
 import load from "@/utils/loading";
 import { getTimes } from "@/utils";
-import { getGroupMessageList,deteleGroupMessage } from "../api";
-import lookGroup from '../model/lookGroup.vue'
-import eidtPostMsg from '../model/eidtPostMsg'
+import { getGroupMessageList, deteleGroupMessage } from "../api";
+import lookGroup from "../model/lookGroup.vue";
+import eidtPostMsg from "../model/eidtPostMsg";
 export default {
-  components: { pagination ,lookGroup,eidtPostMsg},
+  components: { pagination, lookGroup, eidtPostMsg },
   data() {
     return {
       searchForm: {
         sendFlag: null,
+        sendType: "",
       },
 
       tableList: [],
@@ -163,15 +172,16 @@ export default {
     },
     onReSet() {
       this.searchForm.sendFlag = null;
-      this.search()
+      this.searchForm.sendType = "";
+      this.search();
     },
     lookGroup(row) {
-      this.$refs.lookGroup.openDioag(row)
+      this.$refs.lookGroup.openDioag(row);
     },
     resetGroup(row) {
-       this.$refs.eidtPostMsg.openResetDioag(row)
+      this.$refs.eidtPostMsg.openResetDioag(row);
     },
-      deleteGroup(row) {
+    deleteGroup(row) {
       // deteleGroupMessage
       this.$confirm("确定删除?", "提示", {
         confirmButtonText: "确定",

src/views/liveClassManager/newLiveClass.vue

@@ -33,7 +33,7 @@
           </el-form-item>
           <el-form-item
             label="主讲人"
-             class="nomb"
+            class="nomb"
             prop="speakerId"
             :rules="[{ required: true, message: '请输入主讲人' }]"
           >
@@ -63,7 +63,7 @@
           </el-form-item>
           <el-form-item
             label="直播开始时间"
-             class="nomb"
+            class="nomb"
             prop="liveStartTime"
             :rules="[{ required: true, message: '请选择直播开始时间' }]"
           >
@@ -75,9 +75,8 @@
               placeholder="请选择直播开始时间"
             >
             </el-date-picker>
-             <p style="color:red;">主讲人可提前30分钟进入直播间准备直播</p>
+            <p style="color: red">主讲人可提前30分钟进入直播间准备直播</p>
           </el-form-item>
-
         </el-row>
         <el-row class="row">
           <el-form-item
@@ -206,7 +205,7 @@
             </el-radio-group>
           </el-form-item>
         </el-row>
-            <el-row class="row">
+        <el-row class="row">
           <el-form-item
             prop="roomConfig.whether_mic"
             label-width="120px"
@@ -220,6 +219,20 @@
             </el-radio-group>
           </el-form-item>
         </el-row>
+        <el-row class="row">
+          <el-form-item
+            prop="roomConfig.whether_view_shop_cart"
+            label-width="120px"
+            class="mline"
+            label="是否展示购物车"
+            :rules="[{ required: true, message: '是否展示购物车' }]"
+          >
+            <el-radio-group v-model="form.roomConfig.whether_view_shop_cart">
+              <el-radio :label="0">是</el-radio>
+              <el-radio :label="1">否</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-row>
       </el-form>
       <el-row class="row">
         <el-button type="primary" @click="preLook">预览</el-button>
@@ -255,7 +268,13 @@ export default {
         liveStartTime: "",
         liveRemark: "",
         preTemplate: null,
-        roomConfig: { whether_like: 0, whether_chat: 0, whether_video: 0, whether_mic:0},
+        roomConfig: {
+          whether_like: 0,
+          whether_chat: 0,
+          whether_video: 0,
+          whether_mic: 0,
+          whether_view_shop_cart: 0,
+        },
         checkList: [],
       },
       remoteLoading: false,
@@ -269,7 +288,6 @@ export default {
       // console.log()
       this.form = { ...this.$route.query };
       this.form.roomConfig = JSON.parse(this.$route.query.roomConfig);
-      console.log(this.form.roomConfig);
       this.remoteMethod(this.$route.query.speakerName);
       this.checkList.push(this.form.preTemplate * 1);
     }
@@ -396,7 +414,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .nomb {
-  margin-bottom: 0px!important;
+  margin-bottom: 0px !important;
 }
 /deep/.mline {
   .el-form-item__content {