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

.env.development

@@ -1,3 +1,28 @@
+# 页面标题
+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
+# 存储桶配置
+OSS_ACCESS_KEY_ID = K2UTJGIN7UTZJR2XMXYG
+# 存储桶配置
+OSS_SECRET_ACCESS_KEY = sbyeNJLbcYmH6copxeFP9pAoksM4NIT9Zw4x0SRX
+# 存储桶配置
+OSS_SERVER = https://obs.cn-north-4.myhuaweicloud.com
+# 存储桶配置
+OSS_BUCKET = hzyy-1323137866
+# 存储桶配置
+OSS_REGION = ap-chongqing
+# 线路一地址
+OSS_LINE_1 = https://hzyytcpv.ylrzcloud.com
+# 线路二地址
+OSS_LINE_2 = https://hzyyobs.ylrztop.com
+
 # 开发环境配置
 ENV = 'development'
 

package.json

@@ -8,6 +8,7 @@
     "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",
     "preview": "node build/index.js --preview",
     "lint": "eslint --ext .js,.vue src",
     "test:unit": "jest --clearCache && vue-cli-service test:unit",

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 = `https://tcpv.ylrzcloud.com${data.urlPath}`;
+          line_1 = `${process.env.OSS_LINE_1}${data.urlPath}`;
         }else {
-          line_1 = `https://fbytcpv.ylrzcloud.com${data.urlPath}`;
+          line_1 = `${process.env.OSS_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 = `https://obs.ylrztop.com/${data.urlPath}`;
+          line_2 = `${process.env.OSS_LINE_2}/${data.urlPath}`;
         }else {
-          line_2 = `https://fbyobs.ylrztop.com/${data.urlPath}`;
+          line_2 = `${process.env.OSS_LINE_2}/${data.urlPath}`;
         }
         // this.$emit("update:videoUrl", data);
         this.$emit("update:line_2", line_2);

src/layout/components/Navbar.vue

@@ -10,7 +10,7 @@
     <div class="right-menu">
       <template v-if="device!=='mobile'">
         <!-- <search id="header-search" class="right-menu-item" />
-        
+
         -->
         <screenfull id="screenfull" class="right-menu-item hover-effect" />
 
@@ -22,7 +22,7 @@
 
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
         <div class="avatar-wrapper">
-          <img :src="avatar" class="user-avatar">
+          <img :src="logImg" class="user-avatar">
           <i class="el-icon-caret-bottom" />
         </div>
         <el-dropdown-menu slot="dropdown">
@@ -50,7 +50,7 @@ import Screenfull from '@/components/Screenfull'
 import SizeSelect from '@/components/SizeSelect'
 import Search from '@/components/HeaderSearch'
 
- 
+
 export default {
   components: {
     Breadcrumb,
@@ -85,14 +85,14 @@ export default {
   },
   data() {
     return {
-       
+
     }
   },
   created() {
-    
+
   },
   methods: {
-    
+
     toggleSideBar() {
       this.$store.dispatch('app/toggleSideBar')
     },
@@ -151,7 +151,7 @@ export default {
     }
 
     .right-menu-item {
-    
+
       position: relative;
       display: inline-block;
       padding: 0 8px;
@@ -169,7 +169,7 @@ export default {
           top:0px;
 
         }
-      
+
       &.hover-effect {
         cursor: pointer;
         transition: background .3s;
@@ -207,4 +207,4 @@ export default {
 }
 
 </style>
- 
+

src/layout/components/Sidebar/Logo.vue

@@ -2,11 +2,11 @@
   <div class="sidebar-logo-container" :class="{'collapse':collapse}">
     <transition name="sidebarLogoFade">
       <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
-        <img v-if="logo" :src="logo" class="sidebar-logo">
+        <img v-if="logImg" :src="logImg" class="sidebar-logo">
         <h1 v-else class="sidebar-title">{{ title }} </h1>
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
-        <!-- <img v-if="logo" :src="logo" class="sidebar-logo"> -->
+        <!-- <img v-if="logImg" :src="logImg" class="sidebar-logo"> -->
         <h1 class="sidebar-title">{{ title }} </h1>
       </router-link>
     </transition>
@@ -14,8 +14,6 @@
 </template>
 
 <script>
-import logoImg from '@/assets/logo/crm.png'
-import { getToken } from "@/utils/auth";
 export default {
   name: 'SidebarLogo',
   props: {
@@ -26,8 +24,7 @@ export default {
   },
   data() {
     return {
-      title: '云联大健康私域平台',
-      logo: logoImg
+      title: process.env.VUE_APP_TITLE,
     }
   }
 }

src/main.js

@@ -52,6 +52,8 @@ Vue.prototype.qwIm = qwIm
 
 
 
+// 全局配置
+Vue.prototype.logImg = require(process.env.VUE_APP_LOG_URL)
 // 全局方法挂载
 Vue.prototype.getDicts = getDicts
 Vue.prototype.getConfigKey = getConfigKey

src/utils/cos.js

@@ -3,8 +3,8 @@ import { Message } from 'element-ui';
 import { getTmpSecretKey } from '@/api/common';
 
 const config = {
-    Bucket: 'fby-1323137866',
-    Region: 'ap-chongqing',
+  Bucket: process.env.OSS_BUCKET,
+  Region: process.env.OSS_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: 'K2UTJGIN7UTZJR2XMXYG',
-            secret_access_key: 'sbyeNJLbcYmH6copxeFP9pAoksM4NIT9Zw4x0SRX',
-            server: 'https://obs.cn-north-4.myhuaweicloud.com'
+          access_key_id: process.env.OSS_ACCESS_KEY_ID,
+          secret_access_key: process.env.OSS_SECRET_ACCESS_KEY,
+          server: process.env.OSS_SERVER
         });
         let fileName = file.name || ""
         const upload_file_name = new Date().getTime() + '.' + fileName.split(".")[fileName.split(".").length - 1];

src/views/course/userCoursePeriod/index.vue

@@ -224,8 +224,8 @@
     </el-container>
 
     <!-- 添加或修改会员营期对话框-->
-    <el-drawer :title="title" :visible.sync="open" width="700px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-drawer :title="title" :visible.sync="open" size="700px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="营期名称" prop="periodName">
           <el-input v-model="form.periodName" placeholder="请输入营期名称" />
         </el-form-item>
@@ -257,6 +257,9 @@
             <el-radio :label="2" >单课程</el-radio>
           </el-radio-group>
         </el-form-item>
+        <el-form-item label="销售可查看天数" prop="periodType">
+          <el-input-number :min="0" v-model="form.maxViewNum" style="width: 200px" />
+        </el-form-item>
         <el-form-item label="开营日期" prop="periodStartingTime">
           <el-date-picker
             :disabled = "isDisabledDateRange"
@@ -924,6 +927,7 @@ export default {
         dateRange: [],
         date: null,
         days: [],
+        maxViewNum: 0,
         periodEndTime: null,
         timeRange: [], // 看课时间范围
         viewStartTime: null, // 看课开始时间

src/views/course/videoResource/index.vue

@@ -1029,7 +1029,7 @@ export default {
           onProgress(progressEvent);
         }, 1);
 
-        let line_1 = `https://fbytcpv.ylrzcloud.com${data.urlPath}`;
+        let line_1 = `${process.env.OSS_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 = `https://fbyobs.ylrztop.com/${data.urlPath}`;
+        form.line2 = `${process.env.OSS_LINE_2}/${data.urlPath}`;
         this.$message.success("线路二上传成功");
       } catch (error) {
         this.$message.error("线路二上传失败");

src/views/login.vue

@@ -5,7 +5,7 @@
         <img src="../assets/image/login_left.png" alt="">
       </div>
       <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-        <h3 class="title">云联大健康私域平台</h3>
+        <h3 class="title">{{vueAppTitle}}</h3>
         <el-form-item prop="username">
           <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">
             <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
@@ -53,8 +53,8 @@
     </div>
     <!--  底部  -->
     <div class="el-login-footer">
-      <span>版权信息  </span>
-      <a href="https://beian.miit.gov.cn" target="_bank">备</a>
+      <span>{{companyName}}</span>
+      <a :href="icpUrl" target="_bank">{{icpRecord}}</a>
     </div>
   </div>
 </template>
@@ -69,6 +69,10 @@ export default {
   data() {
     return {
       codeUrl: "",
+      vueAppTitle: process.env.VUE_APP_TITLE,
+      companyName: process.env.COMPANY_NAME,
+      icpRecord: process.env.ICP_RECORD,
+      icpUrl: process.env.ICP_URL,
       cookiePassword: "",
       loginForm: {
         username: "",

src/views/system/user/profile/index.vue

@@ -7,9 +7,9 @@
             <span>个人信息</span>
           </div>
           <div>
-            <div class="text-center">
-              <userAvatar :user="user" />
-            </div>
+<!--            <div class="text-center">-->
+<!--              <userAvatar :user="user" />-->
+<!--            </div>-->
             <ul class="list-group list-group-striped">
               <li class="list-group-item">
                 <svg-icon icon-class="user" />用户名称