Merge remote-tracking branch 'origin/master'

src/views/course/userCoursePeriod/index.vue

@@ -524,6 +524,14 @@
               </template>
             </el-table-column>
           </el-table>
+            <pagination
+              v-show="course.total > 0"
+              :total="course.total"
+              :page.sync="course.queryParams.pageNum"
+              :limit.sync="course.queryParams.pageSize"
+              @pagination="getCourseList"
+              style="height: 40px"
+            />
         </el-tab-pane>
         <el-tab-pane label="公司列表" name="company">
           <red-packet
@@ -617,6 +625,7 @@ export default {
       },
       // 表单参数
       form: {},
+      // 课程相关数据
       course: {
         open: false,
         row:{},
@@ -1263,25 +1272,25 @@ export default {
       const [year, month, day] = dateStr.split('-').map(Number);
       return new Date(Date.UTC(year, month - 1, day)); // 月份从0开始
     },
-    handleCourse(row){
-      this.course = {
-        open: false,
-        row:{},
-        list:[],
-        queryParams: {
-          pageNum: 1,
-          pageSize: 9999,
-        },
-        loading: true,
-        total: 0,
-        addOpen: false,
-        form: {},
-      };
-      this.course.open = true;
-      this.course.row = row;
-      this.course.queryParams.periodId = row.periodId;
-      this.getCourseList();
-    },
+    // handleCourse(row){
+    //   this.course = {
+    //     open: false,
+    //     row:{},
+    //     list:[],
+    //     queryParams: {
+    //       pageNum: 1,
+    //       pageSize: 3,  // 修改为每页显示3条
+    //     },
+    //     loading: true,
+    //     total: 0,
+    //     addOpen: false,
+    //     form: {},
+    //   };
+    //   this.course.open = true;
+    //   this.course.row = row;
+    //   this.course.queryParams.periodId = row.periodId;
+    //   this.getCourseList();
+    // },
     getCourseList(){
       this.course.loading = true;
       getDays(this.course.queryParams).then(e => {
@@ -1427,27 +1436,27 @@ export default {
         }
       });
     },
-    updateDate(){
-      updateCourseDate(this.form).then(response => {
-          this.$message.success('修改成功');
-          this.updateDateOpen = false;
-          // 重新加载训练营列表
-          this.getCourseList();
-        });
-    },
-    saveCourseData(){
-      updateListCourseData(this.course.list).then(response => {
-        this.$message.success('保存成功');
-        this.getCourseList();
-      });
-    },
-    setRedPacket(row) {
-      this.currentRedPacketData = {
-        periodId: row.periodId
-        // videoId: row.videoId
-      };
-      this.redPacketVisible = true;
-    },
+    // updateDate(){
+    //   updateCourseDate(this.form).then(response => {
+    //       this.$message.success('修改成功');
+    //       this.updateDateOpen = false;
+    //       // 重新加载训练营列表
+    //       this.getCourseList();
+    //     });
+    // },
+    // saveCourseData(){
+    //   updateListCourseData(this.course.list).then(response => {
+    //     this.$message.success('保存成功');
+    //     this.getCourseList();
+    //   });
+    // },
+    // setRedPacket(row) {
+    //   this.currentRedPacketData = {
+    //     periodId: row.periodId
+    //     // videoId: row.videoId
+    //   };
+    //   this.redPacketVisible = true;
+    // },
     handleRedPacketSuccess() {
       this.getCourseList();
     },

src/views/course/userCoursePeriod/redPacket.vue

@@ -52,7 +52,7 @@
 </template>
 
 <script>
-import { getPeriodCompanyList, getDays, batchSaveRedPacket, getPeriodRedPacketList } from "@/api/course/userCoursePeriod";
+import { getPeriodCompanyList, batchSaveRedPacket, getPeriodRedPacketList } from "@/api/course/userCoursePeriod";
 import redPacket from "@/views/course/userCoursePeriod/redPacket.vue";
 
 export default {

src/views/store/user/index.vue

@@ -22,24 +22,24 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="推线时间" prop="registerDate">
+      <el-form-item label="注册时间" prop="createTime">
         <el-date-picker clearable size="small" style="width: 205.4px"
-          v-model="queryParams.registerDate"
+          v-model="queryParams.createTime"
           type="date"
           value-format="yyyy-MM-dd"
-          placeholder="选择推线时间">
+          placeholder="选择注册时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="推线编码" prop="registerCode">
-        <el-input
+<!--      <el-form-item label="推线编码" prop="registerCode">-->
+<!--        <el-input-->
 
-          v-model="queryParams.registerCode"
-          placeholder="请输入推线编码"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+<!--          v-model="queryParams.registerCode"-->
+<!--          placeholder="请输入推线编码"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
       <el-form-item label="状态" prop="status">
         <el-select  v-model="queryParams.status" placeholder="请选择状态" clearable size="small" >
          <el-option
@@ -50,26 +50,26 @@
               />
         </el-select>
       </el-form-item>
-      <el-form-item label="会员等级" prop="status">
-        <el-select   v-model="queryParams.level" placeholder="请选择会员等级" clearable size="small" >
-         <el-option
-                v-for="item in userLevelOptions"
-                :key="item.dictValue"
-                :label="item.dictLabel"
-                :value="item.dictValue"
-              />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="推广员" prop="isPromoter">
-        <el-select  v-model="queryParams.isPromoter" placeholder="请选择" clearable size="small" >
-         <el-option
-                v-for="item in userIsPromoterOptions"
-                :key="item.dictValue"
-                :label="item.dictLabel"
-                :value="item.dictValue"
-              />
-        </el-select>
-      </el-form-item>
+<!--      <el-form-item label="会员等级" prop="status">-->
+<!--        <el-select   v-model="queryParams.level" placeholder="请选择会员等级" clearable size="small" >-->
+<!--         <el-option-->
+<!--                v-for="item in userLevelOptions"-->
+<!--                :key="item.dictValue"-->
+<!--                :label="item.dictLabel"-->
+<!--                :value="item.dictValue"-->
+<!--              />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="推广员" prop="isPromoter">-->
+<!--        <el-select  v-model="queryParams.isPromoter" placeholder="请选择" clearable size="small" >-->
+<!--         <el-option-->
+<!--                v-for="item in userIsPromoterOptions"-->
+<!--                :key="item.dictValue"-->
+<!--                :label="item.dictLabel"-->
+<!--                :value="item.dictValue"-->
+<!--              />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
 
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -118,37 +118,37 @@
       </el-table-column>
       <el-table-column label="手机号码" align="center" prop="phone" />
       <el-table-column label="用户余额" align="center" prop="nowMoney" />
-      <el-table-column label="推广佣金" align="center" prop="brokeragePrice" />
+<!--      <el-table-column label="推广佣金" align="center" prop="brokeragePrice" />-->
       <el-table-column label="积分" align="center" prop="integral" />
       <el-table-column label="会员注册时间" align="center" prop="createTime" />
-      <el-table-column label="累计消费金额" align="center" prop="totalAmount" />
-      <el-table-column label="上次消费时间" align="center" prop="lastBuyTime" />
-      <el-table-column label="上次消费金额(元)" align="center" prop="number" />
-      <el-table-column label="会员等级" align="center" prop="level" >
-          <template slot-scope="scope">
-              <el-tag prop="status" v-for="(item, index) in userLevelOptions"    v-if="scope.row.level==item.dictValue">{{item.dictLabel}}</el-tag>
-          </template>
-      </el-table-column>
-      <el-table-column label="是否允许下单" align="center" prop="isShow" >
-        <template slot-scope="scope">
-          <el-tag prop="isShow" v-for="(item, index) in isShowOptions"    v-if="scope.row.isShow==item.dictValue">{{item.dictLabel}}</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="推广员" align="center" prop="isPromoter" >
-          <template slot-scope="scope">
-              <el-tag prop="status" v-for="(item, index) in userIsPromoterOptions"    v-if="scope.row.isPromoter==item.dictValue">{{item.dictLabel}}</el-tag>
-          </template>
-      </el-table-column>
+<!--      <el-table-column label="累计消费金额" align="center" prop="totalAmount" />-->
+<!--      <el-table-column label="上次消费时间" align="center" prop="lastBuyTime" />-->
+<!--      <el-table-column label="上次消费金额(元)" align="center" prop="number" />-->
+<!--      <el-table-column label="会员等级" align="center" prop="level" >-->
+<!--          <template slot-scope="scope">-->
+<!--              <el-tag prop="status" v-for="(item, index) in userLevelOptions"    v-if="scope.row.level==item.dictValue">{{item.dictLabel}}</el-tag>-->
+<!--          </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="是否允许下单" align="center" prop="isShow" >-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-tag prop="isShow" v-for="(item, index) in isShowOptions"    v-if="scope.row.isShow==item.dictValue">{{item.dictLabel}}</el-tag>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="推广员" align="center" prop="isPromoter" >-->
+<!--          <template slot-scope="scope">-->
+<!--              <el-tag prop="status" v-for="(item, index) in userIsPromoterOptions"    v-if="scope.row.isPromoter==item.dictValue">{{item.dictLabel}}</el-tag>-->
+<!--          </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="状态" align="center" prop="status" >
           <template slot-scope="scope">
               <el-tag prop="status" v-for="(item, index) in statusOptions"    v-if="scope.row.status==item.dictValue">{{item.dictLabel}}</el-tag>
           </template>
       </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" />
-      <el-table-column label="累计佣金" align="center" prop="registerDate" />
-      <el-table-column label="可提现佣金" align="center" prop="registerCode" />
-      <el-table-column label="冻结佣金" align="center" prop="source" />
-      <el-table-column label="已提现佣金" align="center" prop="remark" />
+<!--      <el-table-column label="累计佣金" align="center" prop="registerDate" />-->
+<!--      <el-table-column label="可提现佣金" align="center" prop="registerCode" />-->
+<!--      <el-table-column label="冻结佣金" align="center" prop="source" />-->
+<!--      <el-table-column label="已提现佣金" align="center" prop="remark" />-->
       <el-table-column label="看课数量" align="center" prop="watchCourseCount" />
       <el-table-column label="参与营期数" align="center" prop="partCourseCount" />
       <el-table-column label="所属销售" align="center" prop="companyUserNickName" />

src/views/user/darkRoom/index.vue

@@ -17,17 +17,17 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
-      <el-button
-        size="mini"
-        type="primary"
-        style="margin-left: 5px"
-        :disabled="ids.length === 0"
-        @click="handleUpdateBatch"
-        v-hasPermi="['store:user:enabledUsers']"
-      >批量启用</el-button>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+<!--    <el-row :gutter="10" class="mb8">-->
+<!--      <el-button-->
+<!--        size="mini"-->
+<!--        type="primary"-->
+<!--        style="margin-left: 5px"-->
+<!--        :disabled="ids.length === 0"-->
+<!--        @click="handleUpdateBatch"-->
+<!--        v-hasPermi="['store:user:enabledUsers']"-->
+<!--      >批量启用</el-button>-->
+<!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
+<!--    </el-row>-->
 
     <el-table  height="500" border v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
@@ -65,17 +65,24 @@
       <el-table-column label="完播时间" align="center" prop="completeWatchDate" width="160px"/>
       <el-table-column label="标签名称" align="center" prop="tag" />
       <el-table-column label="所属销售名称" align="center" prop="companyUserNickName" width="120px"/>
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="是否重粉" align="center" prop="isRepeatFans" width="120px">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['store:user:darkRoomList']"
-          >启用</el-button>
+          <el-tag effect="dark" type="success" v-if="scope.row.isRepeatFans === 0">否</el-tag>
+          <el-tag effect="dark" type="danger"    v-else-if="scope.row.isRepeatFans === 1">是</el-tag>
         </template>
       </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+<!--        <template slot-scope="scope">-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            @click="handleUpdate(scope.row)"-->
+<!--            v-hasPermi="['store:user:darkRoomList']"-->
+<!--            v-if="scope.row.isRepeatFans !== 1"-->
+<!--          >启用</el-button>-->
+<!--        </template>-->
+      </el-table-column>
     </el-table>
 
     <pagination