Merge branch 'master' into 金牛明医

.env.prod-shdn

@@ -1,11 +1,11 @@
 # 页面标题
-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备2024031984号-1
+VUE_APP_ICP_RECORD =鲁ICP备2024100689号-2
 # ICP网站访问地址
 VUE_APP_ICP_URL =https://beian.miit.gov.cn
 # 网站LOG

.env.prod-ylrz

@@ -26,7 +26,14 @@ VUE_APP_COS_REGION = ap-chongqing
 # 线路一地址
 VUE_APP_VIDEO_LINE_1 = https://ylrztcpv.ylrzcloud.com
 # 线路二地址
-VUE_APP_VIDEO_LINE_2 = https://myhkkobs.ylrztop.com
+VUE_APP_VIDEO_LINE_2 = https://cdhytobs.ylrztop.com
+#火山云视频地址域名
+VUE_APP_VIDEO_URL = https://ylrzvolcengine.ylrztop.com
+#火山云视频点播空间名
+VUE_APP_HSY_SPACE = ylrz-2114522511
+
+#直播解码路径
+VUE_APP_LIVE_PATH = /live
 
 # 开发环境配置
 ENV = 'production'

Dockerfile

@@ -1,7 +1,5 @@
-
-
 #基于官方 NGINX 镜像部署（精简镜像）
-FROM nginx:alpine
+FROM swr.cn-east-2.myhuaweicloud.com/library/nginx:alpine
 
 # 复制本地打包好的 dist 目录到 NGINX 静态资源目录
 COPY ./dist /usr/share/nginx/html
@@ -13,4 +11,4 @@ COPY ./nginx.conf /etc/nginx/nginx.conf
 #EXPOSE 80
 
 # 启动 NGINX（前台运行，避免容器启动后退出）
-CMD ["nginx", "-g", "daemon off;"]
+CMD ["nginx", "-g", "daemon off;"]

src/views/components/course/userCourseCatalogDetails.vue

@@ -133,6 +133,44 @@
                       @change="handleVideoChange" @selectProjects="handleSelectProjects" ref="videoUpload"
                       append-to-body/>
 
+        <el-form-item label="关联疗法" >
+          <el-button size="small" type="primary" @click="choosePackage">选取疗法</el-button>
+          <el-table border width="100%" style="margin-top:5px;"  :data="packageList">
+            <el-table-column label="疗法名称" align="center" prop="packageName"/>
+            <el-table-column label="疗法图片" align="center" prop="imgUrl">
+              <template slot-scope="scope">
+                <img :src="scope.row.imgUrl" style="height: 80px;">
+              </template>
+            </el-table-column>
+            <el-table-column label="疗法别名" align="center" prop="secondName"/>
+            <el-table-column label="总金额" align="center" prop="totalPrice"/>
+            <!-- 根据课程类型控制是否显示弹出时间列：0是公域(显示)，1是私域(不显示) -->
+            <el-table-column label="弹出时间" align="center" width="250px" v-if="isPrivate == 0">
+              <template slot-scope="scope">
+                <div>
+                  <el-time-select
+                    v-model="scope.row.duration"
+                    size="mini"
+                    placeholder="选择时间"
+                    :picker-options="getPickerOptions()"
+                    @change="handleTimeChange(scope.$index, scope.row)"
+                  ></el-time-select>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" width="100px" fixed="right">
+              <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-delete"
+                  @click="handlePackageDelete(scope.row)"
+                >删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-form-item >
+
         <el-form-item label="课题选择" prop="questionBankId">
           <el-button size="small" type="primary" @click="chooseQuestionBank">选取课题</el-button>
           <el-table border width="100%" style="margin-top:5px;" :data="form.questionBankList">
@@ -631,6 +669,22 @@ export default {
           .padStart(2, "0")}`, // 动态结束时间
       };
     },
+
+    // 处理时间选择框值变化
+    handleTimeChange(index, row) {
+      // 确保 packageList 中的数据被正确更新
+      this.$set(this.packageList, index, row);
+      // 同步更新 form.packageJson 字段
+      this.$nextTick(() => {
+        // 确保每个疗法包都有 duration 字段
+        this.packageList.forEach(item => {
+          if (item.duration === undefined || item.duration === null) {
+            item.duration = ''; // 空值应初始化为空字符串而不是null，避免显示"null"
+          }
+        });
+        this.form.packageJson = JSON.stringify(this.packageList);
+      });
+    },
     handlePackageDelete(row) {
       this.packageList.splice(this.packageList.findIndex(item => item.packageId === row.packageId), 1)
     },

src/views/system/config/config.vue

@@ -1,6 +1,89 @@
 <template>
   <div class="app-container">
     <el-tabs v-model="activeName" @tab-click="handleClick">
+
+
+
+      <el-tab-pane label="个微配置" name="wx.config">
+        <el-form :model="form30" label-width="200px">
+          <el-form-item  label="新账号判断时间" prop="newAccountTime">
+            <el-input v-model="form30.newAccountTime" placeholder="请输入天" style="width: 150px">
+              <template slot="append">天</template>
+            </el-input>
+          </el-form-item>
+          <el-form-item  label="新账号每天添加数量" prop="newAccountAddNum">
+            <el-input v-model="form30.newAccountAddNum" placeholder="请输入个" style="width: 150px">
+              <template slot="append">个</template>
+            </el-input>
+          </el-form-item>
+          <el-form-item  label="普通账号每天添加数量" prop="accountAddNum">
+            <el-input v-model="form30.accountAddMin" placeholder="请输入个" style="width: 150px">
+              <template slot="append">个</template>
+            </el-input>
+            <span> 到 </span>
+            <el-input v-model="form30.accountAddMax" placeholder="请输入个" style="width: 150px">
+              <template slot="append">个</template>
+            </el-input>
+          </el-form-item>
+          <el-form-item  label="文字消息（条/分）" prop="accountAddNum">
+            <el-input v-model="form30.txtMsgMinNum" placeholder="请输入条" style="width: 150px">
+              <template slot="append">条</template>
+            </el-input>
+            <span> 到 </span>
+            <el-input v-model="form30.txtMsgMaxNum" placeholder="请输入条" style="width: 150px">
+              <template slot="append">条</template>
+            </el-input>
+          </el-form-item>
+          <el-form-item  label="图片消息（条/分）" prop="accountAddNum">
+            <el-input v-model="form30.imgMsgMinNum" placeholder="请输入条" style="width: 150px">
+              <template slot="append">条</template>
+            </el-input>
+            <span> 到 </span>
+            <el-input v-model="form30.imgMsgMaxNum" placeholder="请输入条" style="width: 150px">
+              <template slot="append">条</template>
+            </el-input>
+          </el-form-item>
+          <el-form-item  label="新号添加好友频率(条/分)" prop="accountAddNum">
+            <el-input v-model="form30.newAccountAddWxMin" placeholder="请输入分" style="width: 150px">
+              <template slot="append">分</template>
+            </el-input>
+            <span> 到 </span>
+            <el-input v-model="form30.newAccountAddWxMax" placeholder="请输入分" style="width: 150px">
+              <template slot="append">分</template>
+            </el-input>
+          </el-form-item>
+          <el-form-item  label="新号消息发送频率(条/秒)" prop="accountAddNum">
+            <el-input v-model="form30.newAccountSendMsgMin" placeholder="请输入秒" style="width: 150px">
+              <template slot="append">秒</template>
+            </el-input>
+            <span> 到 </span>
+            <el-input v-model="form30.newAccountSendMsgMax" placeholder="请输入秒" style="width: 150px">
+              <template slot="append">秒</template>
+            </el-input>
+          </el-form-item>
+          <el-form-item  label="添加好友频率(条/分)" prop="accountAddNum">
+            <el-input v-model="form30.accountAddWxMin" placeholder="请输入分" style="width: 150px">
+              <template slot="append">分</template>
+            </el-input>
+            <span> 到 </span>
+            <el-input v-model="form30.accountAddWxMax" placeholder="请输入分" style="width: 150px">
+              <template slot="append">分</template>
+            </el-input>
+          </el-form-item>
+          <el-form-item  label="消息发送频率(条/秒)" prop="accountAddNum">
+            <el-input v-model="form30.accountSendMsgMin" placeholder="请输入秒" style="width: 150px">
+              <template slot="append">秒</template>
+            </el-input>
+            <span> 到 </span>
+            <el-input v-model="form30.accountSendMsgMax" placeholder="请输入秒" style="width: 150px">
+              <template slot="append">秒</template>
+            </el-input>
+          </el-form-item>
+          <div class="footer">
+            <el-button type="primary" @click="submitForm30">提 交</el-button>
+          </div>
+        </el-form>
+      </el-tab-pane>
       <el-tab-pane label="OSS配置" name="sys.oss.cloudStorage">
         <el-form ref="form1" :model="form1" :rules="rules1" label-width="160px">
           <el-form-item label="类型" prop="type">
@@ -2547,6 +2630,7 @@ export default {
       },
       form27: {},
       form28: {},
+      form30: {},
       form29:{
         //是否开启拼手气红包
         enableRandomRedpacket:false,
@@ -2953,6 +3037,13 @@ export default {
           this.form29 = {...this.form29, ...JSON.parse(response.data.configValue)}
           }
         }
+        if (key == 'wx.config') {
+          if(!!response.data){
+          this.configId = response.data.configId
+          this.configKey = response.data.configKey
+          this.form30 = {...this.form30, ...JSON.parse(response.data.configValue)}
+          }
+        }
       })
     },
     /** 提交按钮 */
@@ -3229,6 +3320,14 @@ export default {
         }
       })
     },
+    submitForm30(){
+      const param = { configId: this.configId, configKey: this.configKey, configValue: JSON.stringify(this.form30) }
+      updateConfigByKey(param).then(response => {
+        if (response.code === 200) {
+          this.msgSuccess('修改成功')
+        }
+      })
+    },
     formatColumns(){
       console.log(this.form27.pass_columns)
 

vue.config.js

@@ -34,7 +34,7 @@ module.exports = {
     proxy: {
       // 为 watch 模块单独设置的代理
       '/watch-api': {
-        target: 'http://localhost:8114', // 另一个目标服务器
+        target: 'http://localhost:8004', // 另一个目标服务器
         changeOrigin: true,
         pathRewrite: {
           '^/watch-api': '' // 将 /watch-api 替换为空