Merge branch 'xqc_3445' into debug

pages-video/comment/list.vue

@@ -21,7 +21,7 @@
                     <view class="row">评论时间：{{item.CreateTime | formatTime}}</view>
                 </view>
                 <view class="action-bot flex">
-                    <text class="red-color" @click="delHandle(item,index)">删除</text>
+                    <text class="red-color" v-if="showDelBtn" @click="delHandle(item,index)">删除</text>
                 </view>
             </view>
         </view>
@@ -32,6 +32,12 @@
 <script>
 import {apiCommentList,apiDelComment} from '@/api/question/index'
 export default {
+    computed: {
+      showDelBtn(){
+          const userInfo = this.$store.state.userInfo;
+          return ['ficc_admin','admin'].includes(userInfo.RoleTypeCode)
+      }  
+    },
     data() {
         return {
             id:0,

pages/workbench/index.vue

@@ -138,14 +138,15 @@
 				this.my_tabs=this.my_tabs.filter(_ => _.label !== '出差管理')
 			}
 			//不是销售不显示销售员日历
-			const showArr = ['ficc_seller', 'rai_seller', 'ficc_group', 'rai_group','seller',]
-			if(!showArr.includes(userInfo.RoleTypeCode)){
+			//admin和沛总单独开
+			const showArr = ['ficc_seller','ficc_group','seller','admin']
+			if(!showArr.includes(userInfo.RoleTypeCode)&&userInfo.AdminId!==66){
 				this.my_tabs = this.my_tabs.map(item=>{
 					item.child=item.child.filter(_=>_.label!=='销售员日历')
 					return item
 				})
 			}
-         }
+		}
 		},
 	}
 </script>

utils/config.js

@@ -14,7 +14,7 @@ if(env.envVersion==='develop'){//开发
     baseUrl='https://xcxh5test.hzinsights.com/h5adminapi';
 		linkRoadshowUrl='https://xcxh5test.hzinsights.com/xcx_h5/ssbg';
 }else if(env.envVersion==='release'){//正式版
-    baseUrl='https://ficc.hzinsights.com/h5adminapi';
+    baseUrl='https://ssbg.hzinsights.com/h5adminapi';
 		linkRoadshowUrl='https://details.hzinsights.com/ssbg';
 }