Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_his_scrm_companyUI

.env.prod-ylrz

@@ -23,3 +23,7 @@ VUE_APP_PROJECT_FROM=ylrz
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
 # 直播webSocket地址
 VUE_APP_LIVE_WS_URL = wss://websocket.scrm.ylrzcloud.com/ws
+
+#默认 1、会员 2、企微
+VUE_APP_COURSE_DEFAULT = 1
+

Dockerfile

@@ -1,7 +1,7 @@
 
 
 #基于官方 NGINX 镜像部署（精简镜像）
-FROM nginx:alpine
+FROM swr.cn-east-2.myhuaweicloud.com/library/nginx:alpine
 
 # 复制本地打包好的 dist 目录到 NGINX 静态资源目录
 COPY ./dist /usr/share/nginx/html
@@ -13,4 +13,4 @@ COPY ./nginx.conf /etc/nginx/nginx.conf
 #EXPOSE 80
 
 # 启动 NGINX（前台运行，避免容器启动后退出）
-CMD ["nginx", "-g", "daemon off;"]
+CMD ["nginx", "-g", "daemon off;"]

src/views/adv/promotionAccount/index.vue

@@ -217,7 +217,7 @@
                 clearable
               />
             </el-form-item>
-            <el-form-item v-if="form.advertiserId !== 10002" label="应用授权链接" prop="authUrl" class="slide-fade">
+            <el-form-item v-if="form.advertiserId !== 10002 && form.advertiserId !== 10004" label="应用授权链接" prop="authUrl" class="slide-fade">
               <el-input 
                 v-model="form.authUrl" 
                 placeholder="请输入应用授权链接"

src/views/company/companyConfig/index.vue

@@ -184,7 +184,7 @@
         </el-tab-pane>
         <el-tab-pane label="配置销售会员审核" name="companyUserConfig">
           <el-form ref="companyUserConfig" label-width="140px">
-            <el-form-item label="会员是否默认黑名单">
+            <el-form-item label="会员是否小黑屋"><!--会员是否默认黑名单-->
               <el-row>
                 <el-switch v-model="userIsDefaultBlack"></el-switch>
               </el-row>

src/views/live/live/index.vue

@@ -151,6 +151,7 @@
           <el-tag v-else>总台</el-tag>
         </template>
       </el-table-column>
+
       <el-table-column label="直播类型" align="center" prop="liveType">
         <template slot-scope="scope">
           <el-tag type="danger" v-if="scope.row.liveType == 1">直播</el-tag>

src/views/qw/externalContact/index.vue

@@ -454,6 +454,7 @@
         </template>
       </el-table-column>
       <el-table-column label="企业id" align="center" prop="corpId" />
+      <el-table-column label="广告业务ID" align="center" prop="traceId" />
       <el-table-column label="重粉看课历史" width="100px" align="center" fixed="right">
         <template slot-scope="scope">
           <div v-if="scope.row.fsUserId">

src/views/qw/user/index.vue

@@ -275,6 +275,7 @@
           </el-button>
 <!--          <el-button
             v-if="scope.row.loginCodeUrl==null && scope.row.appKey !=null"
+            v-show="false"
             size="mini"
             type="text"
             icon="el-icon-sunny"