Merge remote-tracking branch 'origin/master'

.env.prod-zlwh

@@ -0,0 +1,26 @@
+# 页面标题
+VUE_APP_TITLE =SCRM销售端
+# 公司名称
+VUE_APP_COMPANY_NAME =泽林文化
+# ICP备案号
+VUE_APP_ICP_RECORD =京ICP备2024100370号-1
+# ICP网站访问地址
+VUE_APP_ICP_URL =https://beian.miit.gov.cn
+# 网站LOG
+VUE_APP_LOG_URL =@/assets/logo/zlwh.png
+
+# 生产环境配置
+ENV = 'production'
+
+# FS管理系统/开发环境
+VUE_APP_BASE_API = '/prod-api'
+
+
+#默认 1、会员 2、企微
+VUE_APP_COURSE_DEFAULT = 1
+
+#项目所属
+VUE_APP_PROJECT_FROM=bjczwh
+
+# 路由懒加载
+VUE_CLI_BABEL_TRANSPILE_MODULES = true

package.json

@@ -57,6 +57,7 @@
     "build:prod-gzzdy": "vue-cli-service build --mode prod-gzzdy",
     "build:prod-shdn": "vue-cli-service build --mode prod-shdn",
     "build:prod-xcsw": "vue-cli-service build --mode prod-xcsw",
+    "build:prod-zlwh": "vue-cli-service build --mode prod-zlwh",
     "preview": "node build/index.js --preview",
     "lint": "eslint --ext .js,.vue src",
     "test:unit": "jest --clearCache && vue-cli-service test:unit",

src/views/qw/user/index.vue

@@ -359,7 +359,7 @@
             icon="el-icon-unlock"
             plain
             v-hasPermi="['qw:user:aiStatus']"
-            v-if="scope.row.aiStatus == 0 && projectFrom === 'sxjz'"
+            v-if="scope.row.aiStatus == 0 && (projectFrom === 'sxjz' || projectFrom === 'myhk')"
             @click="updateFastGptRoleStatus(scope.row)"
           >Ai客服下线</el-button>
           <el-button
@@ -368,7 +368,7 @@
             icon="el-icon-unlock"
             plain
             v-hasPermi="['qw:user:aiStatus']"
-            v-if="scope.row.aiStatus == 1 && projectFrom === 'sxjz'"
+            v-if="scope.row.aiStatus == 1 && (projectFrom === 'sxjz' || projectFrom === 'myhk')"
             @click="updateFastGptRoleStatus(scope.row)"
           >Ai客服上线</el-button>
         </template>

src/views/qw/user/myIndex.vue

@@ -345,7 +345,7 @@
             icon="el-icon-unlock"
             plain
             v-hasPermi="['qw:user:myAiStatus']"
-            v-if="scope.row.aiStatus == 0 && projectFrom === 'sxjz'"
+            v-if="scope.row.aiStatus == 0 && (projectFrom === 'sxjz' || projectFrom === 'myhk')"
             @click="updateFastGptRoleStatus(scope.row)"
           >Ai客服下线</el-button>
           <el-button
@@ -354,7 +354,7 @@
             icon="el-icon-unlock"
             plain
             v-hasPermi="['qw:user:myAiStatus']"
-            v-if="scope.row.aiStatus == 1 && projectFrom === 'sxjz'"
+            v-if="scope.row.aiStatus == 1 && (projectFrom === 'sxjz' || projectFrom === 'myhk')"
             @click="updateFastGptRoleStatus(scope.row)"
           >Ai客服上线</el-button>
         </template>