Merge remote-tracking branch 'origin/master'

.env.prod-myhk

@@ -0,0 +1,19 @@
+# 页面标题
+VUE_APP_TITLE =木易华康SCRM销售端
+# 公司名称
+VUE_APP_COMPANY_NAME =福州市木易华康医药有限公司
+# ICP备案号
+VUE_APP_ICP_RECORD =闽ICP备2020016609号-3
+# ICP网站访问地址
+VUE_APP_ICP_URL =https://beian.miit.gov.cn
+# 网站LOG
+VUE_APP_LOG_URL =@/assets/logo/myhk.png
+
+# 开发环境配置
+ENV = 'development'
+
+# FS管理系统/开发环境
+VUE_APP_BASE_API = '/prod-api'
+
+# 路由懒加载
+VUE_CLI_BABEL_TRANSPILE_MODULES = true

src/views/course/userCourse/index.vue

@@ -36,10 +36,10 @@
       </el-form-item>
     </el-form>
 
-    <el-tabs type="card" v-model="queryParams.isShow" @tab-click="handleClick">
-      <el-tab-pane label="已上架" name="1"></el-tab-pane>
-      <el-tab-pane label="待上架" name="0"></el-tab-pane>
-    </el-tabs>
+<!--    <el-tabs type="card" v-model="queryParams.isShow" @tab-click="handleClick">-->
+<!--      <el-tab-pane label="已上架" name="1"></el-tab-pane>-->
+<!--      <el-tab-pane label="待上架" name="0"></el-tab-pane>-->
+<!--    </el-tabs>-->
     <el-table height="600" border v-loading="loading" :data="userCourseList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="课程ID" align="center" prop="courseId" />

src/views/index.vue

@@ -41,7 +41,7 @@
               企微数量
             </div>
             <div class="card-value highlight">
-              <count-to :start-val="0" :end-val="memberCount" :duration="3600" class="card-panel-num" /></div>
+              <count-to :start-val="0" :end-val="qwMemberNum" :duration="3600" class="card-panel-num" /></div>
             <div class="card-badge">
             </div>
           </div>

src/views/qw/sop/sop.vue

@@ -203,8 +203,10 @@
 
       <el-table-column label="新客户自动创建sop" align="center" prop="isAutoSop" width="140">
         <template slot-scope="scope">
+          <span v-if="scope.row.filterMode == 2"
+                style="margin-left: 10px;color: #ff4949">群聊无法设置</span>
           <el-switch
-            v-if="(scope.row.sendType==2 || scope.row.sendType==4) && scope.row.filterMode == 1"
+            v-if="(scope.row.sendType===2 || scope.row.sendType===4 || scope.row.sendType===5) && scope.row.filterMode == 1"
             v-model="scope.row.isAutoSop"
             active-color="#13ce66"
             inactive-color="#ff4949"