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

.env.prod-cfryt

@@ -0,0 +1,25 @@
+# 页面标题
+VUE_APP_TITLE =赤峰润元堂SCRM销售端
+# 公司名称
+VUE_APP_COMPANY_NAME =云联融智互联网医院有限公司
+# ICP备案号
+VUE_APP_ICP_RECORD =渝ICP备2024031984号-1
+# ICP网站访问地址
+VUE_APP_ICP_URL =https://beian.miit.gov.cn
+# 网站LOG
+VUE_APP_LOG_URL =@/assets/logo/kyt.jpg
+
+# 生产环境配置
+ENV = 'production'
+
+# FS管理系统/开发环境
+VUE_APP_BASE_API = '/prod-api'
+
+#默认 1、会员 2、企微
+VUE_APP_COURSE_DEFAULT = 2
+
+#项目所属
+VUE_APP_PROJECT_FROM=kyt
+
+# 路由懒加载
+VUE_CLI_BABEL_TRANSPILE_MODULES = true

.env.prod-hsyy

@@ -0,0 +1,25 @@
+# 页面标题
+VUE_APP_TITLE =河山医院SCRM销售端
+# 公司名称
+VUE_APP_COMPANY_NAME =云联融智互联网医院有限公司
+# ICP备案号
+VUE_APP_ICP_RECORD =渝ICP备2024031984号-1
+# ICP网站访问地址
+VUE_APP_ICP_URL =https://beian.miit.gov.cn
+# 网站LOG
+VUE_APP_LOG_URL =@/assets/logo/kyt.jpg
+
+# 生产环境配置
+ENV = 'production'
+
+# FS管理系统/开发环境
+VUE_APP_BASE_API = '/prod-api'
+
+#默认 1、会员 2、企微
+VUE_APP_COURSE_DEFAULT = 2
+
+#项目所属
+VUE_APP_PROJECT_FROM=kyt
+
+# 路由懒加载
+VUE_CLI_BABEL_TRANSPILE_MODULES = true

package.json

@@ -8,6 +8,8 @@
     "dev": "vue-cli-service serve",
     "build:prod": "vue-cli-service build",
     "build:prod-ylrz": "vue-cli-service build --mode prod-ylrz",
+    "build:prod-cfryt": "vue-cli-service build --mode prod-cfryt",
+    "build:prod-hsyy": "vue-cli-service build --mode prod-hsyy",
     "build:stage": "vue-cli-service build --mode staging",
     "build:prod-jz": "vue-cli-service build --mode prod-jz",
     "build:prod-hzyy": "vue-cli-service build --mode prod-hzyy",

src/views/live/live/index.vue

@@ -110,9 +110,9 @@
       <el-checkbox :indeterminate="isIndeterminate" v-model="allChecked" @change="toggleSelectAll">
         {{ multipleSelection.length > 0 ? `已选 ${multipleSelection.length} 条` : '选中本页' }}
       </el-checkbox>
-      <el-button  plain size="mini" @click="handleShelf" v-hasPermi="['live:live:operation']">上架</el-button>
-      <el-button  plain size="mini" @click="handleUnshelf" v-hasPermi="['live:live:operation']">下架</el-button>
-      <el-button  plain size="mini" @click="handleDeleteSelected" v-hasPermi="['live:live:operation']">删除</el-button>
+<!--      <el-button  plain size="mini" @click="handleShelf" v-hasPermi="['live:live:operation']">上架</el-button>-->
+<!--      <el-button  plain size="mini" @click="handleUnshelf" v-hasPermi="['live:live:operation']">下架</el-button>-->
+<!--      <el-button  plain size="mini" @click="handleDeleteSelected" v-hasPermi="['live:live:operation']">删除</el-button>-->
 <!--      <el-dropdown>-->
 <!--        <el-button plain size="mini">-->
 <!--          更多操作<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>-->
@@ -174,14 +174,14 @@
       </el-table-column>
       <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            v-if="scope.row.companyName != '总台' || scope.row.status != 2"
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['live:live:edit', 'live:live:operation']"
-          >修改</el-button>
+<!--          <el-button-->
+<!--            v-if="scope.row.companyName != '总台' || scope.row.status != 2"-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-edit"-->
+<!--            @click="handleUpdate(scope.row)"-->
+<!--            v-hasPermi="['live:live:edit', 'live:live:operation']"-->
+<!--          >修改</el-button>-->
           <el-button
             v-if="scope.row.companyName == '总台'"
             size="mini"
@@ -191,13 +191,13 @@
             @click="handleView(scope.row)"
             v-hasPermi="['live:live:edit']"
           >查看</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-setting"
-            @click="handleConfig(scope.row)"
-            v-hasPermi="['live:config:list']"
-          >配置</el-button>
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-setting"-->
+<!--            @click="handleConfig(scope.row)"-->
+<!--            v-hasPermi="['live:config:list']"-->
+<!--          >配置</el-button>-->
           <el-button
             size="mini"
             type="text"
@@ -219,27 +219,27 @@
               </el-dropdown-item>
 
               <!-- 去直播按钮 -->
-              <el-dropdown-item
-                v-if="scope.row.status != 2"
-                @click.native="handleStart(scope.row)"
-                v-hasPermi="['live:live:operation']"
-              >
-                <i class="el-icon-monitor"></i> 去直播
-              </el-dropdown-item>
+<!--              <el-dropdown-item-->
+<!--                v-if="scope.row.status != 2"-->
+<!--                @click.native="handleStart(scope.row)"-->
+<!--                v-hasPermi="['live:live:operation']"-->
+<!--              >-->
+<!--                <i class="el-icon-monitor"></i> 去直播-->
+<!--              </el-dropdown-item>-->
 
               <!-- 进入直播间按钮 -->
-              <el-dropdown-item
-                v-if="scope.row.status == 2"
-                @click.native="handleEnded(scope.row)"
-                v-hasPermi="['live:live:operation']"
-              >
-                <i class="el-icon-service"></i> 结束
-              </el-dropdown-item>
-              <el-dropdown-item
-                @click.native="handleCopy(scope.row)"
-              >
-                <i class="el-icon-service"></i> 复制直播间
-              </el-dropdown-item>
+<!--              <el-dropdown-item-->
+<!--                v-if="scope.row.status == 2"-->
+<!--                @click.native="handleEnded(scope.row)"-->
+<!--                v-hasPermi="['live:live:operation']"-->
+<!--              >-->
+<!--                <i class="el-icon-service"></i> 结束-->
+<!--              </el-dropdown-item>-->
+<!--              <el-dropdown-item-->
+<!--                @click.native="handleCopy(scope.row)"-->
+<!--              >-->
+<!--                <i class="el-icon-service"></i> 复制直播间-->
+<!--              </el-dropdown-item>-->
               <el-dropdown-item
                 @click.native="handleLink(scope.row)"
               >

src/views/qw/user/index.vue

@@ -865,6 +865,10 @@ export default {
             this.$message.success('账号企业不一致请重新扫码登录');
             this.clearDl();
           }
+          if (res.msg == 23) {
+            this.$message.success('账号不匹配，请同步信息后重新扫码登录');
+            this.clearDl();
+          }
           if (res.msg == 104001) {
             this.$message.success('登录成功');
             this.clearDl()