Merge remote-tracking branch 'origin/master'

.env.prod-sft

@@ -30,6 +30,14 @@ VUE_APP_VIDEO_LINE_1 = https://cqsfttcpv.ylrzcloud.com
 # 线路二地址
 VUE_APP_VIDEO_LINE_2 = https://sftobs.ylrztop.com
 
+#火山云视频地址域名
+VUE_APP_VIDEO_URL = https://cqsftvolcengine.ylrztop.com
+#火山云视频点播空间名
+VUE_APP_HSY_SPACE = cqsft-2114522511
+
+#直播解码路径
+VUE_APP_LIVE_PATH = /live
+
 # 开发环境配置
 ENV = 'development'
 

src/views/company/companyRedPacketBalanceLogs/index.vue

@@ -1,15 +1,15 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="ID" prop="logsId">
-        <el-input
-          v-model="queryParams.logsId"
-          placeholder="请输入ID"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+<!--      <el-form-item label="ID" prop="logsId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.logsId"-->
+<!--          placeholder="请输入ID"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
       <el-form-item label="公司名" prop="companyId">
         <el-select filterable  style="width: 220px" v-model="queryParams.companyId" placeholder="请选择公司名" clearable size="small">
           <el-option
@@ -64,8 +64,8 @@
     </el-row>
 
     <el-table border v-loading="loading" :data="companyRedPacketBalanceLogsList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="ID" align="center" prop="logsId" />
+<!--      <el-table-column type="selection" width="55" align="center" />-->
+<!--      <el-table-column label="ID" align="center" prop="logsId" />-->
       <el-table-column label="企业" align="center" prop="companyName" />
       <el-table-column label="金额" align="center" prop="money" />
       <el-table-column label="余额" align="center" prop="balance" />
@@ -75,6 +75,12 @@
           <dict-tag :options="logsTypeOptions" :value="scope.row.logsType"/>
         </template>
       </el-table-column>
+      <!--  创建时间    -->
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
       <el-table-column v-if="false" label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button

src/views/course/statistics/index.vue

@@ -71,8 +71,8 @@
         </template>
       </el-table-column>
       <el-table-column label="公司名称" align="center" prop="companyName" />
-      <el-table-column label="会员数量" align="center" prop="userCount" />
-      <el-table-column label="会员黑名单数量" align="center" prop="userBlacklistCount" />
+      <el-table-column label="新增会员数量" align="center" prop="userCount" />
+      <el-table-column label="新增会员黑名单数量" align="center" prop="userBlacklistCount" />
       <el-table-column label="观看次数" align="center" prop="watchCount" />
       <el-table-column label="完播次数" align="center" prop="completeWatchCount" />
       <el-table-column label="完播率" align="center" prop="completeRate" />

src/views/course/userCourse/public.vue

@@ -632,7 +632,7 @@ export default {
 
     },
     talentMethod(query) {
-      if (query !== '') {
+      if (/^\d{11}$/.test(query)) {
         this.talentParam.phone = query;
         listBySearch(this.talentParam).then(response => {
           this.talentList = response.data;

src/views/course/userTalent/index.vue

@@ -423,7 +423,7 @@ export default {
       }
     },
     userMethod(query){
-      if (query !== '') {
+      if (/^\d{11}$/.test(query)) {
         this.userParam.phone = query;
         listBySearch(this.userParam).then(response => {
           this.userList = response.data;

src/views/course/userVideo/index.vue

@@ -665,7 +665,7 @@ export default {
       this.getList()
     },
     talentMethod(query){
-      if (query !== '') {
+      if (/^\d{11}$/.test(query)) {
         this.talentParam.phone = query;
         listBySearch(this.talentParam).then(response => {
           this.talentList = response.data;

src/views/course/videoResource/index.vue

@@ -560,7 +560,13 @@
         class="upload-dialog">
         <el-form :model="batchUploadForm" ref="batchUploadForm" label-width="80px">
           <el-form-item style="margin-top: 20px" label="分类" prop="typeId" :rules="[{ required: true, message: '请选择分类', trigger: 'blur' }]">
-            <el-select v-model="batchUploadForm.typeId" placeholder="请选择分类" style="width: 100%" @change="val => changeCateType(val, 3)">
+            <el-select
+              v-model="batchUploadForm.typeId"
+              placeholder="请选择分类"
+              style="width: 100%"
+              @change="val => changeCateType(val, 3)"
+              filterable
+            >
               <el-option
                 v-for="item in rootTypeList"
                 :key="item.dictValue"
@@ -571,7 +577,14 @@
           </el-form-item>
 
           <el-form-item label="子分类" prop="typeSubId" :rules="[{ required: true, message: '请选择子分类', trigger: 'blur' }]">
-            <el-select v-model="batchUploadForm.typeSubId" clearable placeholder="请选择子分类" style="width: 100%" @change="changeSubType">
+            <el-select
+              v-model="batchUploadForm.typeSubId"
+              clearable
+              placeholder="请选择子分类"
+              style="width: 100%"
+              @change="changeSubType"
+              filterable
+            >
               <el-option
                 v-for="item in subTypeList"
                 :key="item.dictValue"

src/views/his/merchantAppConfig/index.vue

@@ -229,8 +229,8 @@
         <div v-if="form.merchantType">
           <!-- 易宝支付配置 -->
           <div v-if="form.merchantType === 'yb'">
-            <el-form-item label="易宝商户号" prop="ybAccount">
-              <el-input v-model="ybConfig.ybAccount" placeholder="请输入易宝商户号"></el-input>
+            <el-form-item label="易宝商户号" prop="ybAccount" >
+              <el-input v-model="ybConfig.ybAccount" placeholder="请输入易宝商户号" :disabled="form.id !== null"></el-input>
             </el-form-item>
             <el-form-item label="易宝Key" prop="ybKey">
               <el-input v-model="ybConfig.ybKey" placeholder="请输入易宝Key"></el-input>
@@ -242,8 +242,8 @@
 
           <!-- 台州银行配置 -->
           <div v-else-if="form.merchantType === 'tz'">
-            <el-form-item label="台州商户号" prop="tzPlatMerCstNo">
-              <el-input v-model="tzConfig.tzPlatMerCstNo" placeholder="请输入台州商户号"></el-input>
+            <el-form-item label="台州商户号" prop="tzPlatMerCstNo" >
+              <el-input v-model="tzConfig.tzPlatMerCstNo" placeholder="请输入台州商户号" :disabled="form.id !== null"></el-input>
             </el-form-item>
             <el-form-item label="台州appSecret" prop="tzAppSecret">
               <el-input v-model="tzConfig.tzAppSecret" placeholder="请输入台州appSecret"></el-input>
@@ -269,9 +269,9 @@
           </div>
 
           <!-- 微信支付配置 -->
-            <div v-else-if="form.merchantType === 'wx'">
-            <el-form-item label="微信商户号" prop="wxMchId">
-              <el-input v-model="wxConfig.wxMchId" placeholder="请输入微信商户号"></el-input>
+          <div v-else-if="form.merchantType === 'wx'">
+            <el-form-item label="微信商户号" prop="wxMchId" >
+              <el-input v-model="wxConfig.wxMchId" placeholder="请输入微信商户号" :disabled="form.id !== null"></el-input>
             </el-form-item>
             <el-form-item label="微信Key" prop="wxMchKey">
               <el-input v-model="wxConfig.wxMchKey" placeholder="请输入微信Key"></el-input>
@@ -290,13 +290,14 @@
           <!-- 汇付支付配置 -->
           <div v-else-if="form.merchantType === 'hf'">
             <el-form-item label="汇付产品号" prop="hfProductId">
-              <el-input v-model="hfConfig.hfProductId" placeholder="汇付产品号"></el-input>
+              <el-input v-model="hfConfig.hfProductId" placeholder="汇付产品号" ></el-input>
             </el-form-item>
             <el-form-item label="系统号" prop="hfSysId">
               <el-input v-model="hfConfig.hfSysId" placeholder="系统号Key"></el-input>
             </el-form-item>
+            <!--  商户号不允许修改,退款的时候需要用历史的商户号查询并退款  -->
             <el-form-item label="商户号" prop="hfHuifuId">
-              <el-input v-model="hfConfig.huifuId" placeholder="商户号"></el-input>
+              <el-input v-model="hfConfig.huifuId" placeholder="商户号" :disabled="form.id !== null"></el-input>
             </el-form-item>
             <el-form-item label="商户私钥" prop="hfRsaPrivateKey">
               <el-input v-model="hfConfig.hfRsaPrivateKey" placeholder="商户私钥"></el-input>

src/views/hisStore/storeProduct/index.vue

@@ -38,7 +38,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="所属公司">
-        <el-select style="width: 240px" v-model="companyId" multiple placeholder="请选择企业" clearable size="small" >
+          <el-select style="width: 240px" v-model="companyId" multiple placeholder="请选择企业" clearable size="small" >
           <el-option
             v-for="item in companyOptions"
             :key="item.companyId"
@@ -1604,13 +1604,18 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.queryParams.companyIds = this.companyId +''
+      this.queryParams.pageNum = 1
+      if (this.companyId){
+        this.queryParams.companyIds = this.companyId +''
+      }
       this.getList();
     },
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.companyId = null;
+      this.queryParams.companyIds = null;
+      this.queryParams.storeIds = null;
       this.handleQuery();
     },
     // 多选框选中数据

src/views/live/liveCouponIssue/index.vue

@@ -197,6 +197,10 @@ export default {
     /** 查询优惠券领取列表 */
     getList() {
       this.loading = true;
+      if (this.dateRange!=null && this.dateRange.length>0){
+        this.dateRange[0]=this.dateRange[0]+" 00:00:00"
+        this.dateRange[1]=this.dateRange[1]+" 23:59:59"
+      }
       listStoreCouponIssue(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
         this.storeCouponIssueList = response.rows;
         this.total = response.total;
@@ -235,6 +239,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.dateRange = []; // 清空日期范围选择器的值
       this.handleQuery();
     },
     // 多选框选中数据

src/views/live/liveOrder/index.vue

@@ -599,8 +599,8 @@ export default {
       // 同时清空范围选择器的值
       this.orderTimeRange = [];
       // 清空时间范围参数
-      this.queryParams.orderStartTime = null;
-      this.queryParams.orderEndTime = null;
+      this.queryParams.createTimeStart = null;
+      this.queryParams.createTimeEnd = null;
       this.handleQuery();
     },
 

src/views/system/config/config.vue

@@ -2492,6 +2492,48 @@
           </div>
         </el-form>
       </el-tab-pane>
+
+      <!--   福袋配置    -->
+      <el-tab-pane label="福袋配置" name="luckyBag.config">
+        <!--   单个客服每周(7天)给同客户发送数量次数限制      -->
+        <el-form ref="form33" :model="form33" :rules="rules33" label-width="300px">
+          <el-form-item label="单个客服每周(7天)给同客户发送数量次数限制">
+            <el-tooltip class="item" effect="dark" placement="top-end">
+              <el-input-number
+                v-model="form33.weekLimit"
+                :min="0"
+                :step="1"
+                :precision="0"
+              ></el-input-number>
+            </el-tooltip>
+          </el-form-item>
+          <el-form-item label="福袋封面图标">
+            <ImageUpload v-model="form33.miniprogramPicUrl" :file-type='["png", "jpg", "jpeg"]' :limit="1" />
+          </el-form-item>
+        </el-form>
+
+        <div class="footer">
+          <el-button type="primary" @click="submitForm33">提  交</el-button>
+        </div>
+      </el-tab-pane>
+
+      <el-tab-pane label="IM配置" name="im.config">
+        <!--   小米     -->
+        <el-form ref="form34" :model="form34" :rules="rules34" label-width="300px">
+          <el-form-item label="离线推送 小米系统申请channel_id">
+            <el-input v-model="form34.xm_channel_id" style="width: 200px"></el-input>
+          </el-form-item>
+          <el-form-item label="离线推送 华为系统申请channel_id">
+            <el-input v-model="form34.hw_channel_id" style="width: 200px"></el-input>
+          </el-form-item>
+
+        </el-form>
+
+        <div class="footer">
+          <el-button type="primary" @click="submitForm34">提  交</el-button>
+        </div>
+      </el-tab-pane>
+
     </el-tabs>
 
 
@@ -2685,6 +2727,8 @@ export default {
       },
       form31:{},
       form32:{},
+      form33:{},
+      form34:{},
       storeProductScrmColumns:[],
       storeScrmColumns: [],
       photoArr: [],
@@ -2740,7 +2784,9 @@ export default {
       },
       rules21: {},
       rules25: {},
-      rules26: {}
+      rules26: {},
+      rules33: {},
+      rules34: {},
     }
   },
   created() {
@@ -3086,6 +3132,14 @@ export default {
           this.form30 = {...this.form30, ...JSON.parse(response.data.configValue)}
           }
         }
+
+        if(key=="luckyBag.config"){
+          console.log("----------"+response.data.configValue)
+          this.form33 =JSON.parse(response.data.configValue);
+        }
+        if(key=="im.config"){
+          this.form34 =JSON.parse(response.data.configValue);
+        }
         if(key == 'vc.config'){
            if(!!response.data){
           this.configId = response.data.configId
@@ -3394,6 +3448,22 @@ export default {
         }
       })
     },
+    submitForm33(){
+      var param={configId:this.configId,configValue:JSON.stringify(this.form33)}
+      updateConfigByKey(param).then(response => {
+        if (response.code === 200) {
+          this.msgSuccess("修改成功");
+        }
+      });
+    },
+    submitForm34(){
+      var param={configId:this.configId,configValue:JSON.stringify(this.form34)}
+      updateConfigByKey(param).then(response => {
+        if (response.code === 200) {
+          this.msgSuccess("修改成功");
+        }
+      });
+    },
     submitForm32(){
       const param = { configId: this.configId, configName : "直播源配置", configKey: this.configKey, configValue: JSON.stringify(this.form32) }
       console.log(param)