Merge branch 'sit' of daiyanrong/live-telecast-ui-pc into master

src/views/mobile/park/addEdit.vue

@@ -29,7 +29,7 @@
                 v-model="ruleForm.username"
                 placeholder="XXXXXX"
                 :disabled="isDetail !== '003'"
-                ><template slot="prepend">1745</template></el-input
+                ><template slot="prepend">CJ1745</template></el-input
               >
             </el-form-item>
             <el-form-item
@@ -111,7 +111,7 @@
                   :disable-transitions="true"
                   :closable="isDetail !== '007'"
                   @close="handleClose(tag)"
-                  :type="tag.status==='0'?'info':''"
+                  :type="tag.status === '0' ? 'info' : ''"
                 >
                   {{ tag.video_name }}
                 </el-tag>
@@ -472,18 +472,17 @@ export default {
         if (valid) {
           this.loading = true;
           let model = Object.assign({}, this.ruleForm);
-          model.username = "1745" + model.username;
+          model.username = "CJ1745" + model.username;
           let isok = true;
           this.tags.forEach((v1) => {
             if (v1.status === "0") {
               isok = false;
             }
-            
           });
           if (!isok) {
             this.$message.warning("不能绑定已禁用的视频！");
             this.loading = false;
-            return
+            return;
           }
 
           let res = {};

src/views/mobile/park/index.vue

@@ -101,10 +101,11 @@
                     刷新
                   </el-button>
                 </el-col>
+
                 <el-col
                   :span="3"
-                  v-if="powers.some((item) => item == '003')"
                   style="width: 60px; float: right"
+                  v-if="powers.some((item) => item == '003')"
                 >
                   <el-button
                     type="success"
@@ -122,7 +123,13 @@
         <template #status="{ scope }">
           <el-tag
             :size="tablebtnSize"
-            :type="scope.row.status == '0' ? 'warning' : scope.row.status == '1'?'success':''"
+            :type="
+              scope.row.status == '0'
+                ? 'warning'
+                : scope.row.status == '1'
+                ? 'success'
+                : ''
+            "
             v-text="
               (statusList.find((item) => item.id == scope.row.status) || {})
                 .label || '--'
@@ -210,7 +217,7 @@ export default {
   },
   data() {
     return {
-      showDetail:"",
+      showDetail: "",
       sitem: null,
       select: "1",
       input: "",
@@ -256,7 +263,7 @@ export default {
         {
           prop: "username",
           label: "账号",
-          width: "100px",
+          width: "120px",
           fixed: "left",
         },
         {
@@ -328,9 +335,7 @@ export default {
       this.searchList();
     },
     openModal(id, isDetail, sitem) {
-      console.log(id,"添加按钮");
-      console.log(isDetail,"展示详情");// 003  点击了添加按钮
-      this.showModel = true;//显示弹窗框
+      this.showModel = true; //显示弹窗框
       this.modelId = id;
       this.isDetail = isDetail;
       this.sitem = sitem;
@@ -352,7 +357,6 @@ export default {
       }
       this.loading = false;
     },
-
   },
 };
 </script>