读取配置

package.json

@@ -5,9 +5,9 @@
   "author": "FS",
   "license": "MIT",
   "scripts": {
-    "dev": "vue-cli-service serve",
-    "build:prod": "vue-cli-service build",
-    "build:stage": "vue-cli-service build --mode staging",
+    "dev": "set NODE_OPTIONS=--openssl-legacy-provider&& vue-cli-service serve",
+    "build:prod": "set NODE_OPTIONS=--openssl-legacy-provider&& vue-cli-service build",
+    "build:stage": "set NODE_OPTIONS=--openssl-legacy-provider&& vue-cli-service build --mode staging",
     "preview": "node build/index.js --preview",
     "lint": "eslint --ext .js,.vue src",
     "test:unit": "jest --clearCache && vue-cli-service test:unit",
@@ -88,8 +88,6 @@
     "autoprefixer": "9.5.1",
     "babel-eslint": "10.1.0",
     "babel-jest": "23.6.0",
-    "stylus": "^0.54.7",
-    "stylus-loader": "^3.0.2",
     "babel-plugin-dynamic-import-node": "2.3.3",
     "chalk": "2.4.2",
     "chokidar": "2.1.5",
@@ -100,13 +98,15 @@
     "husky": "1.3.1",
     "lint-staged": "8.1.5",
     "mockjs": "1.0.1-beta3",
-    "node-sass": "4.14.1",
     "plop": "2.3.0",
     "runjs": "4.3.2",
+    "sass": "^1.32.13",
     "sass-loader": "8.0.2",
     "script-ext-html-webpack-plugin": "2.1.3",
     "script-loader": "0.7.2",
     "serve-static": "1.13.2",
+    "stylus": "^0.54.7",
+    "stylus-loader": "^3.0.2",
     "svg-sprite-loader": "4.1.3",
     "svgo": "1.2.0",
     "vue-template-compiler": "2.6.10"

src/api/live/liveRedConf.js

@@ -61,3 +61,12 @@ export function listLiveRedConfOn(query) {
     params: query
   })
 }
+
+// 查询红包领取记录
+export function listLiveRedClaimRecords(query) {
+  return request({
+    url: '/live/liveRedConf/claimRecords',
+    method: 'get',
+    params: query
+  })
+}

src/components/HeaderSearch/index.vue

@@ -167,7 +167,7 @@ export default {
     display: inline-block;
     vertical-align: middle;
 
-    /deep/ .el-input__inner {
+    ::v-deep  .el-input__inner {
       border-radius: 0;
       border: 0;
       padding-left: 0;

src/components/LemonUI/components/chatrecords/basic.vue

@@ -524,23 +524,23 @@
         padding: 0 8px;
     }
 
-    /deep/.el-dialog__headerbtn{
+    ::v-deep .el-dialog__headerbtn{
          top:10px;
     }
 
-    /deep/.el-form--inline .el-form-item{
+    ::v-deep .el-form--inline .el-form-item{
         display: flex;
     }
-    /deep/.el-form-item--medium .el-form-item__content{
+    ::v-deep .el-form-item--medium .el-form-item__content{
         flex: 1;
         margin-right: 20px;
     }
 
-    /deep/.el-dialog:not(.is-fullscreen) {
+    ::v-deep .el-dialog:not(.is-fullscreen) {
         margin-top: 0 !important;
     }
 
-    // /deep/.el-dialog__header{
+    // ::v-deep .el-dialog__header{
     //     padding-bottom: 0;
     // }
     

src/components/LemonUI/components/chatrecords/basic1.vue

@@ -537,19 +537,19 @@
         padding: 0 8px;
     }
 
-    /deep/.el-dialog__headerbtn{
+    ::v-deep .el-dialog__headerbtn{
          top:10px;
     }
 
-    /deep/.el-form--inline .el-form-item{
+    ::v-deep .el-form--inline .el-form-item{
         display: flex;
     }
-    /deep/.el-form-item--medium .el-form-item__content{
+    ::v-deep .el-form-item--medium .el-form-item__content{
         flex: 1;
         margin-right: 20px;
     }
 
-    // /deep/.el-dialog__header{
+    // ::v-deep .el-dialog__header{
     //     padding-bottom: 0;
     // }
     

src/components/LemonUI/components/chatrecords/segrecords.vue

@@ -410,23 +410,23 @@
         padding: 0 8px;
     }
 
-    /deep/.el-dialog__headerbtn{
+    ::v-deep .el-dialog__headerbtn{
          top:10px;
     }
 
-    /deep/.el-form--inline .el-form-item{
+    ::v-deep .el-form--inline .el-form-item{
         display: flex;
     }
-    /deep/.el-form-item--medium .el-form-item__content{
+    ::v-deep .el-form-item--medium .el-form-item__content{
         flex: 1;
         margin-right: 20px;
     }
 
-    /deep/.el-dialog:not(.is-fullscreen) {
+    ::v-deep .el-dialog:not(.is-fullscreen) {
         margin-top: 0 !important;
     }
 
-    // /deep/.el-dialog__header{
+    // ::v-deep .el-dialog__header{
     //     padding-bottom: 0;
     // }
     

src/layout/components/TagsView/ScrollPane.vue

@@ -82,7 +82,7 @@ export default {
   position: relative;
   overflow: hidden;
   width: 100%;
-  /deep/ {
+  ::v-deep  {
     .el-scrollbar__bar {
       bottom: 0px;
     }

src/views/company/companyRecharge/doRecharge.vue

@@ -156,7 +156,7 @@ export default {
   .radio-img{
     margin-right: 10px;
   }
-  /deep/.el-radio{
+  ::v-deep .el-radio{
     display: flex;
     align-items: center;
     .el-radio__label{

src/views/company/companyVoicePackageOrder/buy.vue

@@ -159,7 +159,7 @@ export default {
   .radio-img{
     margin-right: 10px;
   }
-  /deep/.el-radio{
+  ::v-deep .el-radio{
     display: flex;
     align-items: center;
     .el-radio__label{

src/views/live/liveConfig/liveRedConf.vue

@@ -150,6 +150,13 @@
             v-hasPermi="['live:liveRedConf:edit']"
           >结算</el-button>
 
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="handleClaimRecords(scope.row)"
+            v-hasPermi="['live:liveRedConf:list']"
+          >领取记录</el-button>
           <el-button
             :disabled="isViewOnly"
             size="mini"
@@ -170,6 +177,27 @@
       @pagination="getList"
     />
 
+    <el-dialog :title="claimDialog.title" :visible.sync="claimDialog.open" width="800px" append-to-body>
+      <el-table v-loading="claimDialog.loading" :data="claimDialog.list" border>
+        <el-table-column label="用户ID" align="center" prop="userId" width="100" />
+        <el-table-column label="昵称" align="center" prop="nickname" min-width="120" />
+        <el-table-column label="手机号" align="center" prop="phone" min-width="120" />
+        <el-table-column label="芳华币" align="center" prop="integral" width="100" />
+        <el-table-column label="领取时间" align="center" prop="createTime" width="170">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="claimDialog.total>0"
+        :total="claimDialog.total"
+        :page.sync="claimDialog.query.pageNum"
+        :limit.sync="claimDialog.query.pageSize"
+        @pagination="getClaimRecords"
+      />
+    </el-dialog>
+
     <!-- 添加或修改直播红包记录配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
@@ -203,7 +231,7 @@
 </template>
 
 <script>
-import { listLiveRedConf, getLiveRedConf, delLiveRedConf, addLiveRedConf, updateLiveRedConf, exportLiveRedConf } from "@/api/live/liveRedConf";
+import { listLiveRedConf, getLiveRedConf, delLiveRedConf, addLiveRedConf, updateLiveRedConf, exportLiveRedConf, listLiveRedClaimRecords } from "@/api/live/liveRedConf";
 
 export default {
   props:{
@@ -222,6 +250,18 @@ export default {
       canLiveId:false,
       //parentLiveId
       parentLiveId : null,
+      claimDialog: {
+        open: false,
+        title: "领取记录",
+        loading: false,
+        list: [],
+        total: 0,
+        query: {
+          pageNum: 1,
+          pageSize: 10,
+          redId: null
+        }
+      },
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -483,6 +523,24 @@ export default {
         }
       });
     },
+    /** 查看领取记录 */
+    handleClaimRecords(row) {
+      this.claimDialog.title = `领取记录（红包ID: ${row.redId}）`;
+      this.claimDialog.query.redId = row.redId;
+      this.claimDialog.query.pageNum = 1;
+      this.claimDialog.open = true;
+      this.getClaimRecords();
+    },
+    getClaimRecords() {
+      this.claimDialog.loading = true;
+      listLiveRedClaimRecords(this.claimDialog.query).then(response => {
+        this.claimDialog.list = response.rows || [];
+        this.claimDialog.total = response.total || 0;
+        this.claimDialog.loading = false;
+      }).catch(() => {
+        this.claimDialog.loading = false;
+      });
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       //如果状态不为0，则不能删除

src/views/qw/forbiddenMessage/index.vue

@@ -341,7 +341,7 @@ export default {
 
 
 <style lang="scss" scoped>
-    /deep/.el-dialog__headerbtn{
+    ::v-deep .el-dialog__headerbtn{
          top:10px;
     }
 </style>

src/views/qw/qwChat/chatmsg.vue

@@ -661,11 +661,11 @@ export default {
         padding: 0 8px;
     }
 
-    /deep/.el-dialog__headerbtn{
+    ::v-deep .el-dialog__headerbtn{
          top:10px;
     }
 
-    /deep/.el-dialog:not(.is-fullscreen) {
+    ::v-deep .el-dialog:not(.is-fullscreen) {
         margin-top: 0 !important;
     }
 
@@ -687,7 +687,7 @@ export default {
    }
 
 
-   /deep/.el-form-item{
+   ::v-deep .el-form-item{
         margin-bottom: 0;
         vertical-align: middle !important;
    }

src/views/qw/qwChat/qq.vue

@@ -868,11 +868,11 @@ export default {
         padding: 0 8px;
     }
 
-    /deep/.el-dialog__headerbtn{
+    ::v-deep .el-dialog__headerbtn{
          top:10px;
     }
 
-    /deep/.el-dialog:not(.is-fullscreen) {
+    ::v-deep .el-dialog:not(.is-fullscreen) {
         margin-top: 0 !important;
     }