Merge remote-tracking branch 'origin/master'

luobisheng

2022-11-28 fa5fd9d4f9c1ba33f26a343942a7941003cc601c

 src/views/operate/fivepack/threepack/components/content.vue

@@ -143,12 +143,12 @@
      <!-- 查看修改页面 -->
      <el-dialog
        :visible.sync="dialogScore"
        width="45%"
        width="60%"
        :destroy-on-close="true"
        title="查看积分"
        :before-close="handleClose"
        :before-close="handleCloseScoreView"
      >
        <scoreView :storeInfo="storeInfo" @closeDialog="closeDialog" />
        <scoreView v-if="dialogScore" :storeInfo="storeInfoScoreView" />
      </el-dialog>
      <!-- 分页 -->
      <div class="pagination">
@@ -200,6 +200,7 @@
      userInfo: null,
      dialogType: "",
      storeInfo: null,
      storeInfoScoreView: {},
    };
  },

@@ -227,8 +228,8 @@
      this.dialogType = type;
    },
    handleScoreView(row) {
      this.storeInfoScoreView = row;
      this.dialogScore = true;
      this.storeInfo = row;
    },

    handleDelete(id) {
@@ -239,15 +240,15 @@
        })
        .catch((err) => this.$message({ type: "error", message: err }));
    },

    handleCloseScoreView() {
      this.dialogScore = false;
    },
    handleClose() {
      this.dialogUpdate = false;
      this.dialogScore = false;
    },

    closeDialog() {
      this.dialogUpdate = false;
      this.dialogScore = false;
      this.search();
    },