Parcourir la source

Merge remote-tracking branch 'origin/master'

yjwang il y a 1 jour
Parent
commit
efd192f9bf

+ 9 - 9
.env.development

@@ -1,15 +1,15 @@
 # 页面标题
-VUE_APP_TITLE =木易华康互联网医院管理系统
+VUE_APP_TITLE =小访客管理系统
 # 首页菜单标题
-VUE_APP_TITLE_INDEX =木易华康互联网医院
+VUE_APP_TITLE_INDEX =小访客
 # 公司名称
-VUE_APP_COMPANY_NAME =福州市木易华康医药有限公司
+VUE_APP_COMPANY_NAME =西安小访客网络科技有限公司
 # ICP备案号
-VUE_APP_ICP_RECORD =闽ICP备2020016609号-3
+VUE_APP_ICP_RECORD =陕ICP备2025066365号-3
 # ICP网站访问地址
 VUE_APP_ICP_URL =https://beian.miit.gov.cn
 # 网站LOG
-VUE_APP_LOG_URL =@/assets/logo/myhk.png
+VUE_APP_LOG_URL =@/assets/logo/xfk.png
 # 存储桶配置
 VUE_APP_OBS_ACCESS_KEY_ID = K2UTJGIN7UTZJR2XMXYG
 # 存储桶配置
@@ -17,15 +17,15 @@ VUE_APP_OBS_SECRET_ACCESS_KEY = sbyeNJLbcYmH6copxeFP9pAoksM4NIT9Zw4x0SRX
 # 存储桶配置
 VUE_APP_OBS_SERVER = https://obs.cn-north-4.myhuaweicloud.com
 # 存储桶配置
-VUE_APP_OBS_BUCKET = myhk-hw079058881
+VUE_APP_OBS_BUCKET = xfk-hw079058881
 # 存储桶配置
-VUE_APP_COS_BUCKET = myhk-1323137866
+VUE_APP_COS_BUCKET = xfk-1323137866
 # 存储桶配置
 VUE_APP_COS_REGION = ap-chongqing
 # 线路一地址
-VUE_APP_VIDEO_LINE_1 = https://myhktcpv.ylrzcloud.com
+VUE_APP_VIDEO_LINE_1 = https://xfktcpv.ylrzcloud.com
 # 线路二地址
-VUE_APP_VIDEO_LINE_2 = https://myhkobs.ylrztop.com
+VUE_APP_VIDEO_LINE_2 = https://xfkobs.ylrztop.com
 
 # 开发环境配置
 ENV = 'production'

+ 37 - 0
.env.prod-xfk

@@ -0,0 +1,37 @@
+# 页面标题
+VUE_APP_TITLE =小访客管理系统
+# 首页菜单标题
+VUE_APP_TITLE_INDEX =小访客
+# 公司名称
+VUE_APP_COMPANY_NAME =西安小访客网络科技有限公司
+# ICP备案号
+VUE_APP_ICP_RECORD =陕ICP备2025066365号-3
+# ICP网站访问地址
+VUE_APP_ICP_URL =https://beian.miit.gov.cn
+# 网站LOG
+VUE_APP_LOG_URL =@/assets/logo/xfk.png
+# 存储桶配置
+VUE_APP_OBS_ACCESS_KEY_ID = K2UTJGIN7UTZJR2XMXYG
+# 存储桶配置
+VUE_APP_OBS_SECRET_ACCESS_KEY = sbyeNJLbcYmH6copxeFP9pAoksM4NIT9Zw4x0SRX
+# 存储桶配置
+VUE_APP_OBS_SERVER = https://obs.cn-north-4.myhuaweicloud.com
+# 存储桶配置
+VUE_APP_OBS_BUCKET = xfk-hw079058881
+# 存储桶配置
+VUE_APP_COS_BUCKET = xfk-1323137866
+# 存储桶配置
+VUE_APP_COS_REGION = ap-chongqing
+# 线路一地址
+VUE_APP_VIDEO_LINE_1 = https://xfktcpv.ylrzcloud.com
+# 线路二地址
+VUE_APP_VIDEO_LINE_2 = https://xfkobs.ylrztop.com
+
+# 开发环境配置
+ENV = 'development'
+
+# FS管理系统/开发环境
+VUE_APP_BASE_API = '/prod-api'
+
+# 路由懒加载
+VUE_CLI_BABEL_TRANSPILE_MODULES = true

+ 1 - 1
.env.prod-zsjk

@@ -9,7 +9,7 @@ VUE_APP_ICP_RECORD =京ICP备2024062307号
 # ICP网站访问地址
 VUE_APP_ICP_URL =https://beian.miit.gov.cn
 # 网站LOG
-VUE_APP_LOG_URL =@/assets/logo/zsjk.jpg
+VUE_APP_LOG_URL =@/assets/logo/zsjk.png
 # 存储桶配置
 VUE_APP_OBS_ACCESS_KEY_ID = K2UTJGIN7UTZJR2XMXYG
 # 存储桶配置

+ 1 - 0
package.json

@@ -13,6 +13,7 @@
     "build:prod-hcl": "vue-cli-service build --mode prod-hcl",
     "build:prod-myhk": "vue-cli-service build --mode prod-myhk",
     "build:prod-sxjz": "vue-cli-service build --mode prod-sxjz",
+    "build:prod-xfk": "vue-cli-service build --mode prod-xfk",
     "build:prod-jnmy": "vue-cli-service build --mode prod-jnmy",
     "build:prod-hdt": "vue-cli-service build --mode prod-hdt",
     "build:prod-yzt": "vue-cli-service build --mode prod-yzt",

BIN
src/assets/logo/xfk.png


+ 22 - 15
src/views/his/company/index.vue

@@ -256,7 +256,7 @@
               />
             </el-select>
         </el-form-item>
-        <el-form-item label="开始时间" prop="startTime">
+        <!-- <el-form-item label="开始时间" prop="startTime">
           <el-date-picker clearable size="small"
             v-model="form.startTime"
             type="date"
@@ -271,7 +271,7 @@
             value-format="yyyy-MM-dd"
             placeholder="选择到期时间">
           </el-date-picker>
-        </el-form-item>
+        </el-form-item> -->
 <!--      <el-form-item label="主机重启时间" prop="restartTime" >-->
 <!--        <el-time-select style="width: 150px;" placeholder="主机重启时间(不填默认1点10分)" v-model="form.restartTime" :picker-options="{-->
 <!--                              start: '00:00',-->
@@ -457,12 +457,12 @@ export default {
        status: [
          { required: true, message: "状态不能为空", trigger: "blur" }
        ],
-       startTime: [
-         { required: true, message: "开始时间不能为空", trigger: "blur" }
-       ],
-       limitTime: [
-         { required: true, message: "到期时间不能为空", trigger: "blur" }
-       ],
+      //  startTime: [
+      //    { required: true, message: "开始时间不能为空", trigger: "blur" }
+      //  ],
+      //  limitTime: [
+      //    { required: true, message: "到期时间不能为空", trigger: "blur" }
+      //  ],
         userName: [
          { required: true, message: "管理员账号不能为空", trigger: "blur" }
        ],
@@ -610,6 +610,7 @@ export default {
         isDel: null,
         courseMaAppId: null,
         courseMiniAppId: null,
+        packageCateIds:'',
       };
       this.resetForm("form");
     },
@@ -652,7 +653,8 @@ export default {
       this.reset();
       this.getAppList()
       this.open = true;
-	  this.doctorIds=[]
+	    this.doctorIds=[];
+
       this.title = "添加公司";
     },
     /** 修改按钮操作 */
@@ -674,9 +676,9 @@ export default {
         if(this.form.followDoctorIds!=null){
            this.form.followDoctorIds= JSON.parse(this.form.followDoctorIds)
         }
-        // if(this.form.packageCateIds!=null){
-        //    this.form.packageCateIds= JSON.parse(this.form.packageCateIds)
-        // }
+        if(this.form.packageCateIds!=null){
+           this.form.packageCateIds= JSON.parse(this.form.packageCateIds)
+        }
         if(this.form.companyType!=null){
           this.form.companyType = String(this.form.companyType)
         }
@@ -709,15 +711,20 @@ export default {
           if(this.form.followDoctorIds!=null){
              this.form.followDoctorIds= JSON.stringify(this.form.followDoctorIds)
           }
-          // if(this.form.packageCateIds!=null){
-          //    this.form.packageCateIds= JSON.stringify(this.form.packageCateIds)
-          // }
+          if(this.form.packageCateIds!=null){
+             this.form.packageCateIds= JSON.stringify(this.form.packageCateIds)
+          }else {
+            this.form.packageCateIds='';
+          }
           if(this.doctorIds!=null){
             this.form.doctorIds= (this.doctorIds).toString()
+          }else {
+            this.form.doctorIds=null
           }
           if(this.doctorIds!=null){
             this.form.doctorIds= (this.doctorIds).toString()
           }
+          console.log("传参------》",this.form)
           if (this.form.companyId != null) {
             updateCompany(this.form).then(response => {
               this.msgSuccess("修改成功");

+ 1 - 1
src/views/his/vessel/index.vue

@@ -212,7 +212,7 @@
           <el-input-number v-model="form.sort"  :min="0" label="请输入排序"></el-input-number>
         </el-form-item>
 
-       <el-form-item label="描述">
+       <el-form-item label="描述" prop="descs">
          <Editor ref="myeditor"   @on-text-change="updateText"/>
        </el-form-item>
         <el-form-item label="状态">

+ 12 - 5
src/views/system/config/config.vue

@@ -1007,6 +1007,13 @@
              </el-radio-group>
            </el-form-item>
 
+           <el-form-item label="默认客服二维码图片" prop="companyUserQRCode">
+             <ImageUpload v-model="form18.companyUserQRCode" type="image" :num="10" :width="150" :height="150" :limit="1"/>
+           </el-form-item>
+           <el-form-item label="课程LOGO" prop="courseLogo">
+             <image-upload v-model="form18.courseLogo" :limit="1" />
+           </el-form-item>
+
            <el-form-item label="开启评论/弹幕" prop="openCommentStatus">
              <el-radio-group v-model="form18.openCommentStatus">
                <el-radio :label="1" >开启评论</el-radio>
@@ -1027,7 +1034,7 @@
            </div>
          </el-form>
        </el-tab-pane>
-       <el-tab-pane label="点播小程序配置" name="courseMa.config">
+       <el-tab-pane label="点播播放源配置" name="courseMa.config">
          <el-button type="primary" @click="addCourseMaConfig" style="margin-bottom: 10px">添加配置</el-button>
          <el-table  height="660" border v-loading="courseMaConfigLoading" :data="courseMaConfigList">
            <el-table-column label="名称" align="center" prop="name">
@@ -1041,8 +1048,8 @@
                  v-model="scope.row.type"
                   placeholder="请选择类型"
                  :disabled="!scope.row.editing">
-                 <el-option label="小程序" value="1"></el-option>
-                 <el-option label="公众号" value="2"></el-option>
+                 <el-option label="公众号" value="1"></el-option>
+                 <el-option label="小程序" value="2"></el-option>
                </el-select>
              </template>
            </el-table-column>
@@ -1127,10 +1134,10 @@
            <el-form-item   label="apiV3密钥" prop="apiV3Key">
              <el-input   v-model="form19.apiV3Key"  label="请输入apiV3Key"></el-input>
            </el-form-item>
-           <el-form-item   label="公钥ID" prop="publicKeyId">
+           <el-form-item   label="公钥ID" prop="publicKeyId" v-if="form19.isNew==1">
              <el-input   v-model="form19.publicKeyId"  label="请输入公钥ID"></el-input>
            </el-form-item>
-           <el-form-item   label="公钥证书" prop="publicKeyPath">
+           <el-form-item   label="公钥证书" prop="publicKeyPath" v-if="form19.isNew==1">
              <el-input   v-model="form19.publicKeyPath"  label="请输入publicKeyPath"></el-input>
            </el-form-item>
            <el-form-item   label="key路径" prop="privateKeyPath">