浏览代码

提交代码-6.4

zhuxinbo 5 年之前
父节点
当前提交
ad041e32df

+ 4 - 4
src/views/dashboard/Analysis.vue

@@ -5,7 +5,7 @@
 </style>
 <template>
   <div class="page-header-index-wide">
-    <!-- <div v-if="roleCode == 'operator' || roleCode == 'touTiaoOperationManager'">
+    <div v-if="roleCode == 'operator'">
       <a-row :gutter="24">
         <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
           <chart-card :loading="loading" title="总销售额" total="¥126,560">
@@ -147,9 +147,9 @@
           </a-card>
         </a-col>
       </a-row>
-    </div> -->
+    </div>
 
-    <newHome v-if="roleCode == 'operator' || roleCode == 'touTiaoOperationManager'" />
+    <newHome v-else-if=" roleCode == 'touTiaoOperationManager'" />
     <statistics v-else-if="roleCode == 'kuaishouOperationManager'" />
     <statistics v-else-if="roleCode == 'sale'||roleCode=='saleDirector'" />
 
@@ -229,7 +229,7 @@
         loginfo: {},
         visitFields: ['ip', 'visit'],
         visitInfo: [],
-        // indicator: < a - icon type = "loading"style = "font-size: 24px"spin / > ,
+        indicator: <a-icon type="loading" style="font-size: 24px" spin />,
         roleCode: localStorage.getItem('roleCode')
       }
     },

+ 1 - 1
src/views/modules/kuaishouapp/account/stepForm/Step3.vue

@@ -55,7 +55,7 @@
     color: rgb(255, 255, 255);
     line-height: 20px;
     text-align: center;
-    background: rgba(255, 0, 0, 0.5);
+    background: rgba(0, 0, 0, 0.5);
     border-radius: 2px;
   }
 

+ 11 - 3
src/views/modules/material/videoMaterial.vue

@@ -65,7 +65,7 @@ li.chouzhen.first:before{
     color: rgb(255, 255, 255);
     line-height: 20px;
     text-align: center;
-    background: rgba(255, 0, 0, 0.5);
+    background: rgba(0, 0, 0, 0.5);
     border-radius: 2px;
 }
 </style>
@@ -383,10 +383,18 @@ a {
                   @click.stop
                 >
                   <span
-                    style="color: #999; fontSize: 16px;padding-bottom:10px;display:block;width:100%;overflow: hidden;text-overflow: ellipsis;"
+                    style="color: #999; fontSize: 14px;padding-bottom:10px;display:inline-block;width:100%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"
+                    :title="items.projectName"
                   >
                     {{ items.projectName }}
                   </span>
+                  <span
+                    style="color: #999; fontSize: 14px;padding-bottom:10px;display:inline-block;width:100%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"
+                    :title="items.materialName"
+                  >
+                     {{items.materialName}}
+                  </span>
+                 
                   <a-icon
                     type="close-circle"
                     @click="deleteData(items.id)"
@@ -1195,7 +1203,7 @@ a {
           </a-form-item>
         </a-form>
     </a-modal>
-    <a-modal title="抽帧展示" v-model="chouzhen" width="60%">
+    <a-modal title="推荐封面" v-model="chouzhen" width="60%">
         <template slot="footer">
             <a-button key="back" @click="chouzhen=false">关闭</a-button>
         </template>

+ 1 - 1
vue.config.js

@@ -73,7 +73,7 @@ module.exports = {
         // target: 'http://192.168.2.115:8080', //请求本地 需要jeecg-boot后台项目  祚云
         // target: 'http://192.168.1.54:8080', //请求本地 需要jeecg-boot后台项目  孙震
         // target: 'http://192.168.1.165:8088', //请求本地 需要jeecg-boot后台项目  毕洁泉
-        target: 'http://192.168.1.251:80', //请求本地 需要jeecg-boot后台项目 
+        // target: 'http://192.168.1.251:80', //请求本地 需要jeecg-boot后台项目 
         ws: false,
         changeOrigin: true
       },