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

# Conflicts:
#	package.json

.env.development

@@ -9,20 +9,21 @@ ICP_URL =https://beian.miit.gov.cn
 # 网站LOG
 VUE_APP_LOG_URL =@/assets/logo/logo.png
 # 存储桶配置
-OSS_ACCESS_KEY_ID = K2UTJGIN7UTZJR2XMXYG
+OBS_ACCESS_KEY_ID = K2UTJGIN7UTZJR2XMXYG
 # 存储桶配置
-OSS_SECRET_ACCESS_KEY = sbyeNJLbcYmH6copxeFP9pAoksM4NIT9Zw4x0SRX
+OBS_SECRET_ACCESS_KEY = sbyeNJLbcYmH6copxeFP9pAoksM4NIT9Zw4x0SRX
 # 存储桶配置
-OSS_SERVER = https://obs.cn-north-4.myhuaweicloud.com
+OBS_SERVER = https://obs.cn-north-4.myhuaweicloud.com
 # 存储桶配置
-OSS_BUCKET = hzyy-1323137866
+OBS_BUCKET = zkzh-hw079058881
 # 存储桶配置
-OSS_REGION = ap-chongqing
+COS_BUCKET = zkzh-1323137866
+# 存储桶配置
+COS_REGION = ap-chongqing
 # 线路一地址
-OSS_LINE_1 = https://hzyytcpv.ylrzcloud.com
+VIDEO_LINE_1 = https://zkzhtcpv.ylrzcloud.com
 # 线路二地址
-OSS_LINE_2 = https://hzyyobs.ylrztop.com
-
+VIDEO_LINE_2 = https://zkzhobs.ylrztop.com
 # 开发环境配置
 ENV = 'development'
 

.env.prod-zkzh

@@ -0,0 +1,31 @@
+#页面标题
+VUE_APP_TITLE =互联网医院管理系统
+# 公司名称
+COMPANY_NAME =陕西中康智慧药房有限公司
+# ICP备案号
+ICP_RECORD =蜀ICP备2023036719号
+# ICP网站访问地址
+ICP_URL =https://beian.miit.gov.cn
+# 网站LOG
+VUE_APP_LOG_URL =@/assets/logo/logo.png
+# 存储桶配置
+OBS_ACCESS_KEY_ID = K2UTJGIN7UTZJR2XMXYG
+# 存储桶配置
+OBS_SECRET_ACCESS_KEY = sbyeNJLbcYmH6copxeFP9pAoksM4NIT9Zw4x0SRX
+# 存储桶配置
+OBS_SERVER = https://obs.cn-north-4.myhuaweicloud.com
+# 存储桶配置
+OBS_BUCKET = zkzh-hw079058881
+# 存储桶配置
+COS_BUCKET = zkzh-1323137866
+# 存储桶配置
+COS_REGION = ap-chongqing
+# 线路一地址
+VIDEO_LINE_1 = https://zkzhtcpv.ylrzcloud.com
+# 线路二地址
+VIDEO_LINE_2 = https://zkzhobs.ylrztop.com
+# 生产环境配置
+ENV = 'production'
+
+#FS管理系统/生产环境
+VUE_APP_BASE_API = '/prod-api'

package.json

@@ -8,6 +8,8 @@
     "dev": "vue-cli-service serve",
     "build:prod": "vue-cli-service build",
     "build:stage": "vue-cli-service build --mode staging",
+    "build:prod-jz": "vue-cli-service build --mode prod-jz",
+    "build:prod-zkzh": "vue-cli-service build --mode prod-zkzh",
     "build:prod-fby": "vue-cli-service build --mode prod-fby",
     "preview": "node build/index.js --preview",
     "lint": "eslint --ext .js,.vue src",

src/components/VideoUpload/index.vue

@@ -285,9 +285,9 @@ export default {
         console.log("isPrivate=======>",this.isPrivate)
         let line_1='' ;
         if (this.isPrivate===0){
-          line_1 = `${process.env.OSS_LINE_1}${data.urlPath}`;
+          line_1 = `${process.env.VIDEO_LINE_1}${data.urlPath}`;
         }else {
-          line_1 = `${process.env.OSS_LINE_1}${data.urlPath}`;
+          line_1 = `${process.env.VIDEO_LINE_1}${data.urlPath}`;
         }
 
         let urlPathWithoutFirstSlash = data.urlPath.substring(1);
@@ -311,9 +311,9 @@ export default {
         console.log("华为OBS返回========>",data);
         let line_2='' ;
         if (this.isPrivate===0){
-          line_2 = `${process.env.OSS_LINE_2}/${data.urlPath}`;
+          line_2 = `${process.env.VIDEO_LINE_2}/${data.urlPath}`;
         }else {
-          line_2 = `${process.env.OSS_LINE_2}/${data.urlPath}`;
+          line_2 = `${process.env.VIDEO_LINE_2}/${data.urlPath}`;
         }
         // this.$emit("update:videoUrl", data);
         this.$emit("update:line_2", line_2);

src/utils/cos.js

@@ -3,8 +3,8 @@ import { Message } from 'element-ui';
 import { getTmpSecretKey } from '@/api/common';
 
 const config = {
-  Bucket: process.env.OSS_BUCKET,
-  Region: process.env.OSS_REGION,
+  Bucket: process.env.COS_BUCKET,
+  Region: process.env.COS_REGION,
 };
 
 // 上传到腾讯云cos

src/utils/obs.js

@@ -4,9 +4,9 @@ import ObsClient from "esdk-obs-browserjs/src/obs";
 export const uploadToOBS = async(file,progressCallback,type) =>  {
     try {
         const obsClient = new ObsClient({
-          access_key_id: process.env.OSS_ACCESS_KEY_ID,
-          secret_access_key: process.env.OSS_SECRET_ACCESS_KEY,
-          server: process.env.OSS_SERVER
+          access_key_id: process.env.OBS_ACCESS_KEY_ID,
+          secret_access_key: process.env.OBS_SECRET_ACCESS_KEY,
+          server: process.env.OBS_SERVER
         });
         let fileName = file.name || ""
         const upload_file_name = new Date().getTime() + '.' + fileName.split(".")[fileName.split(".").length - 1];
@@ -29,7 +29,7 @@ export const uploadToOBS = async(file,progressCallback,type) =>  {
         return new Promise((resolve, reject) => {
             //上传对象
             obsClient.putObject({
-                Bucket: 'fby-hw079058881',//桶名称
+                Bucket: process.env.OBS_BUCKET,//桶名称
                 Key: key,//文件名
                 Body: file,
                 ProgressCallback: callback,//进度回调

src/views/course/videoResource/index.vue

@@ -1029,7 +1029,7 @@ export default {
           onProgress(progressEvent);
         }, 1);
 
-        let line_1 = `${process.env.OSS_LINE_1}${data.urlPath}`;
+        let line_1 = `${process.env.VIDEO_LINE_1}${data.urlPath}`;
 
         form.fileKey = data.urlPath.substring(1);
         form.videoUrl = line_1;
@@ -1053,7 +1053,7 @@ export default {
           onProgress(progressEvent);
         }, 1);
 
-        form.line2 = `${process.env.OSS_LINE_2}/${data.urlPath}`;
+        form.line2 = `${process.env.VIDEO_LINE_1}/${data.urlPath}`;
         this.$message.success("线路二上传成功");
       } catch (error) {
         this.$message.error("线路二上传失败");

src/views/system/config/config.vue

@@ -415,7 +415,7 @@
              <el-button @click="addDisabledTime" style="margin-top: 10px">添加时间段</el-button>
            </el-form-item>
 
-           <el-form-item label="红包模式">
+           <el-form-item label="红包模式" v-if="form18.rewardType==1">
              <el-radio-group v-model="form18.redPacketMode">
                <el-radio label="1">总公司</el-radio>
                <el-radio label="2">分公司</el-radio>