Merge remote-tracking branch 'origin/master'

.env.prod-bnkc

@@ -0,0 +1,37 @@
+# 页面标题
+VUE_APP_TITLE =百年康成互联网医院管理系统
+# 首页菜单标题
+VUE_APP_TITLE_INDEX =百年康成互联网医院
+# 公司名称
+VUE_APP_COMPANY_NAME =北京百年康成信息科技有限公司
+# ICP备案号
+VUE_APP_ICP_RECORD =闽ICP备2020016609号-3
+# ICP网站访问地址
+VUE_APP_ICP_URL =https://beian.miit.gov.cn
+# 网站LOG
+VUE_APP_LOG_URL =@/assets/logo/bnkc.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 = bnkc-hw079058881
+# 存储桶配置
+VUE_APP_COS_BUCKET = bnkc-1323137866
+# 存储桶配置
+VUE_APP_COS_REGION = ap-chongqing
+# 线路一地址
+VUE_APP_VIDEO_LINE_1 = https://bnkctcpv.ylrzcloud.com
+# 线路二地址
+VUE_APP_VIDEO_LINE_2 = https://bnkcobs.ylrztop.com
+
+# 开发环境配置
+ENV = 'production'
+
+# FS管理系统/开发环境
+VUE_APP_BASE_API = '/prod-api'
+
+# 路由懒加载
+VUE_CLI_BABEL_TRANSPILE_MODULES = true

package.json

@@ -21,6 +21,8 @@
     "build:prod-sft": "vue-cli-service build --mode prod-sft",
     "build:prod-zsjk": "vue-cli-service build --mode prod-zsjk",
     "build:prod-lmjy": "vue-cli-service build --mode prod-lmjy",
+    "build:prod-bnkc": "vue-cli-service build --mode prod-bnkc",
+    "build:prod-whhm": "vue-cli-service build --mode prod-whhm",
     "build:stage": "vue-cli-service build --mode staging",
     "preview": "node build/index.js --preview",
     "lint": "eslint --ext .js,.vue src"

src/views/course/userCoursePeriod/redPacket.vue

@@ -27,11 +27,11 @@
         <el-table-column label="课程" prop="courseName" align="center" />
         <el-table-column label="小节" prop="videoName" align="center" />
         <el-table-column label="营期日期" prop="dayDate" align="center"/>
-        <el-table-column label="红包金额(0.1-0.3元)" width="200px" align="center">
+        <el-table-column label="红包金额(0.0-0.3元)" width="200px" align="center">
           <template slot-scope="scope">
             <el-input-number
               v-model="scope.row.amount"
-              :min="0.1"
+              :min="0.0"
               :max="0.3"
               :precision="2"
               :step="0.01"
@@ -129,25 +129,27 @@ export default {
         periodId: this.periodId,
         companyId: this.currentCompany.companyId
       }).then(response => {
+        console.log("-----------",JSON.stringify(response.data))  
         this.redPacketList = (response.data || []).map(item => ({
           ...item,
-          amount: item.amount || 0.1
+          // amount: item.amount || 0.1
+          amount:item.amount ?? 0.1
         }));
       });
     },
     // 保存红包金额
     handleSave() {
       // 筛选出有金额的项目
-      const validAmountItems = this.redPacketList.filter(item => item.amount > 0);
+      const validAmountItems = this.redPacketList.filter(item => item.amount >= 0);
       if (validAmountItems.length === 0) {
         this.$message.warning('请至少设置一个红包金额');
         return;
       }
 
       // 验证金额范围
-      const invalidItems = validAmountItems.filter(item => item.amount < 0.1 || item.amount > 0.3);
+      const invalidItems = validAmountItems.filter(item => item.amount < 0.0 || item.amount > 0.3);
       if (invalidItems.length > 0) {
-        this.$message.error('红包金额需要在0.1元至0.3元之间');
+        this.$message.error('红包金额需要在0.0元至0.3元之间');
         return;
       }
 

src/views/his/doctor/type2.vue

@@ -546,13 +546,14 @@ export default {
       depList:[],
       userName: {name:"1"},
       userList:[],
-      auditTypeOptions:[{
-          dictValue: '1',
-          dictLabel: '西药'
-        }, {
-          dictValue: '2',
-          dictLabel: '中药'
-        }],
+      // auditTypeOptions:[{
+      //     dictValue: '1',
+      //     dictLabel: '西药'
+      //   }, {
+      //     dictValue: '2',
+      //     dictLabel: '中药'
+      //   }],
+      auditTypeOptions:[],
       //医院列表
       hospitalList:[],
       // 遮罩层
@@ -710,6 +711,9 @@ export default {
     this.getDicts("sys_store_order_type").then(response => {
       this.StoreOrderType = response.data;
     });
+    this.getDicts("sys_product_type").then(response => {
+      this.auditTypeOptions = response.data;
+    });
 
 
     this.getdeplist();

src/views/his/package/index.vue

@@ -147,16 +147,16 @@
 
     <el-table height="600" v-loading="loading" border :data="packageList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="ID" align="center" prop="packageId" />
+      <el-table-column label="ID" align="center" prop="packageId" width="100px"/>
       <el-table-column label="套餐包名称" align="center" prop="packageName" />
       <el-table-column label="别名" align="center" prop="secondName" />
-      <el-table-column label="排序号" align="center" prop="sort" />
-      <el-table-column label="状态" align="center" prop="status">
+      <el-table-column label="排序" align="center" prop="sort" width="50px"/>
+      <el-table-column label="状态" align="center" prop="status" width="65px">
         <template slot-scope="scope">
           <dict-tag :options="statusOptions" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column label="类型" align="center" prop="packageType">
+      <el-table-column label="类型" align="center" prop="packageType" width="70px">
         <template slot-scope="scope">
           <dict-tag :options="packageTypeOptions" :value="scope.row.packageType"/>
         </template>
@@ -166,14 +166,14 @@
           <dict-tag :options="packageSubTypeOptions" :value="scope.row.packageSubType"/>
         </template>
       </el-table-column>
-      <el-table-column label="是否展示" align="center" prop="isShow">
+      <el-table-column label="是否展示" align="center" prop="isShow" width="75px">
         <template slot-scope="scope">
           <dict-tag :options="orOptions" :value="scope.row.isShow"/>
         </template>
       </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime"/>
-      <el-table-column label="更改时间" align="center" prop="updateTime"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="150px">
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180px"/>
+      <el-table-column label="更改时间" align="center" prop="updateTime" width="180px"/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="180px">
         <template slot-scope="scope">
           <el-button
             size="mini"