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

.env.prod-cfryt

@@ -19,13 +19,13 @@ VUE_APP_OBS_SERVER = https://obs.cn-north-4.myhuaweicloud.com
 # 存储桶配置
 VUE_APP_OBS_BUCKET = cfryt-hw079058881
 # 存储桶配置
-VUE_APP_COS_BUCKET = cfryt-1323137866
+VUE_APP_COS_BUCKET = ryt-1323137866
 # 存储桶配置
 VUE_APP_COS_REGION = ap-chongqing
 # 线路一地址
-VUE_APP_VIDEO_LINE_1 = https://cfrytcpv.ylrzcloud.com
+VUE_APP_VIDEO_LINE_1 = https://ryttcpv.ylrzcloud.com
 # 线路二地址
-VUE_APP_VIDEO_LINE_2 = https://cqtytobs.ylrztop.com
+VUE_APP_VIDEO_LINE_2 = https://cfrytobs.ylrztop.com
 
 # 开发环境配置
 ENV = 'production'

.env.prod-hsyy

@@ -0,0 +1,40 @@
+# 页面标题
+VUE_APP_TITLE =河山医院
+# 首页菜单标题
+VUE_APP_TITLE_INDEX =河山医院
+# 公司名称
+VUE_APP_COMPANY_NAME =哈尔滨市河山医院有限公司
+# ICP备案号
+VUE_APP_ICP_RECORD =蒙ICP备2024019526号-1
+# ICP网站访问地址
+VUE_APP_ICP_URL =https://beian.miit.gov.cn
+# 网站LOG
+VUE_APP_LOG_URL =@/assets/logo/hsyy.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 = hsyy-hw079058881
+# 存储桶配置
+VUE_APP_COS_BUCKET = heshanyy-1323137866
+# 存储桶配置
+VUE_APP_COS_REGION = ap-chongqing
+# 线路一地址
+VUE_APP_VIDEO_LINE_1 = https://heshanyytcpv.ylrzcloud.com
+# 线路二地址
+VUE_APP_VIDEO_LINE_2 = https://hsyyobs.ylrztop.com
+
+# 开发环境配置
+ENV = 'production'
+
+# FS管理系统/开发环境
+VUE_APP_BASE_API = '/prod-api'
+
+#默认 1、会员 2、企微
+VUE_APP_COURSE_DEFAULT = 1
+
+# 路由懒加载
+VUE_CLI_BABEL_TRANSPILE_MODULES = true

package.json

@@ -52,6 +52,7 @@
     "build:prod-bjzm": "vue-cli-service build --mode prod-bjzm",
     "build:prod-gzzdy": "vue-cli-service build --mode prod-gzzdy",
     "build:prod-cfryt": "vue-cli-service build --mode prod-cfryt",
+    "build:prod-hsyy": "vue-cli-service build --mode prod-hsyy",
     "preview": "node build/index.js --preview",
     "lint": "eslint --ext .js,.vue src"
   },

src/views/components/course/userCourseCatalogDetails.vue

@@ -239,7 +239,7 @@
               </div>
           </div>
         </template>
-           
+
         </el-form-item>
         <el-form-item label="是否关联商品">
           <el-radio v-model="form.isProduct" :label=0>否</el-radio>
@@ -251,6 +251,12 @@
             <el-radio :label="0">否</el-radio>
           </el-radio-group>
         </el-form-item>
+        <el-form-item label="是否启用倍速" prop="isSpeed">
+          <el-radio-group v-model="form.isSpeed">
+            <el-radio :label="1">是</el-radio>
+            <el-radio :label="0">否</el-radio>
+          </el-radio-group>
+        </el-form-item>
         <el-form-item label="商品选择" v-if="form.isProduct === 1">
           <el-button size="small" type="primary" @click="chooseCourseProduct">选取商品</el-button>
           <el-table border width="100%" style="margin-top:5px;" :data="form.courseProducts">
@@ -826,6 +832,7 @@ export default {
         transcodeFileKey: null,
         isProduct: 0,
         isFirst: 0,
+        isSpeed: 0,
         listingStartTime: null,
         listingEndTime: null,
         randomRedPacketRules:null,
@@ -1150,24 +1157,24 @@ export default {
     handleAmountInput(rule, field) {
       let value = rule[field];
       if (value === null || value === undefined) return;
-      
+
       // 转换为字符串处理
       let str = value.toString();
-      
+
       // 移除除数字和小数点外的所有字符
       str = str.replace(/[^0-9.]/g, '');
-      
+
       // 只保留一个小数点
       const dotIndex = str.indexOf('.');
       if (dotIndex !== -1) {
         str = str.substring(0, dotIndex + 1) + str.substring(dotIndex + 1).replace(/\./g, '');
       }
-      
+
       // 限制小数点后最多两位
       if (dotIndex !== -1 && str.length > dotIndex + 3) {
         str = str.substring(0, dotIndex + 3);
       }
-      
+
       // 转换回数字并更新
       rule[field] = parseFloat(str) || 0;
     },
@@ -1196,7 +1203,7 @@ export default {
     validateMinAmount(rule, value, callback) {
       // debugger;
       // const maxAmount = this.form29.rules[].maxAmount
-      
+
       const index = rule.index;
       const maxAmount = this.form.randomRedPacketRulesArr[index].maxAmount;
 
@@ -1206,7 +1213,7 @@ export default {
         callback();
       }
     },
-      validateRules() {        
+      validateRules() {
       this.form.randomRedPacketRulesArr.forEach((rule) => {
         if (rule.minAmount === undefined || rule.minAmount < 0.01) {
           rule.minAmount = 0.01;

src/views/course/courseTrafficLog/index.vue

@@ -52,7 +52,7 @@
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        <el-button type="warning" plain icon="el-icon-download" size="mini" :loading="exportLoading" @click="handleExport" >导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" :loading="exportLoading" @click="handleExport" v-hasPermi="['course:courseTrafficLog:export']" >导出</el-button>
       </el-form-item>
     </el-form>
 
@@ -195,6 +195,7 @@ export default {
       });
     },
     handleQuery() {
+      this.queryParams.tabType = this.activeTab
       this.queryParams.pageNum = 1;
       this.getList();
     },

src/views/hisStore/storeProductPackage/index.vue

@@ -132,6 +132,7 @@
       </el-table-column>
 
       <el-table-column label="限购次数" align="center" prop="limitCount" />
+      <el-table-column label="赠送积分" align="center" prop="integral" />
       <el-table-column label="排序" align="center" prop="sort" />
       <!-- <el-table-column label="所属部门" align="center" prop="deptName" /> -->
       <el-table-column label="状态" align="center" prop="status" >
@@ -308,6 +309,9 @@
          <el-form-item label="限购次数" prop="limitCount">
               <el-input-number v-model="form.limitCount" :min="0" :step="1" placeholder="请输入限购次数" />
         </el-form-item>
+        <el-form-item label="赠送积分" prop="integral">
+          <el-input-number v-model="form.integral" :min="0" :step="1" placeholder="不填默认0积分" width="100px"/>
+        </el-form-item>
         <el-form-item label="排序" prop="sort">
           <el-input-number v-model="form.sort"  :min="1"  />
         </el-form-item>
@@ -633,6 +637,9 @@ export default {
         var data={id:item.id,count:item.count}
         this.form.productList.push(data)
       })
+      if (this.form.integral==null || this.form.integral<0){
+        this.form.integral = 0;
+      }
       // console.log(this.form)
       // return;
       this.$refs["form"].validate(valid => {