t

src/api/index.js

@@ -3,10 +3,12 @@ import house from './house'
 import user from './user'
 import shop from './shop'
 import cust from './cust'
+import other from './other'
 export default {
   base,
   house,
   user,
   shop,
   cust,
+  other,
 }

src/api/other.js

@@ -4,239 +4,26 @@
 import { getRequest, getRequestNoSort } from '@/utils/request'
 
 export default {
-  admadvertslist: params => { // 广告 - 列表
-    return getRequest('/adm/adverts/list', params)
+  admlotteryprizeuserlist: params => { // 中奖用户列表
+    return getRequest('/adm/lottery/prize/user/list', params)
   },
-  admadvertsedit: params => { // 广告 - 编辑
-    return getRequestNoSort('/adm/adverts/edit', params, 'loading')
+  admlotterycharlist: params => { // 抽卡概率列表
+    return getRequest('/adm/lottery/char/list', params)
   },
-  admadvertsadd: params => { // 广告 - 添加
-    return getRequestNoSort('/adm/adverts/add', params, 'loading')
+  admlotterycharsave: params => { // 抽卡概率设置
+    return getRequest('/adm/lottery/char/save', params)
   },
-  admadvertsdel: params => { // 广告 - 删除
-    return getRequestNoSort('/adm/adverts/del', params, 'loading')
+  admlotteryprizelist: params => { // 大奖概率列表
+    return getRequest('/adm/lottery/prize/list', params)
   },
-  admadvertsdetail: params => { // 广告 - 详情
-    return getRequestNoSort('/adm/adverts/detail', params, 'loading')
+  admlotteryprizeadd: params => { // 添加大奖配置
+    return getRequest('/adm/lottery/prize/add', params)
   },
-  admqalist: params => { // qa - 列表
-    return getRequest('/adm/qa/list', params)
+  admlotteryprizesave: params => { // 大奖概率设置
+    return getRequest('/adm/lottery/prize/save', params)
   },
-  admqaedit: params => { // qa - 编辑
-    return getRequestNoSort('/adm/qa/edit', params, 'loading')
-  },
-  admqaadd: params => { // qa - 添加
-    return getRequestNoSort('/adm/qa/add', params, 'loading')
-  },
-  admqadel: params => { // qa - 删除
-    return getRequestNoSort('/adm/qa/del', params, 'loading')
-  },
-  admqadetail: params => { // qa - 详情
-    return getRequestNoSort('/adm/qa/detail', params, 'loading')
-  },
-  admhouseinspectlist: params => { // 验房报名 列表
-    return getRequest('/adm/house/inspect/list', params)
-  },
-  planlist: params => { // 获客意向收集
-    return getRequest('/adm/plan/list', params)
-  },
-  plandel: params => { // 获客意向收集 删除
-    return getRequest('/adm/plan/del', params)
-  },
-  planexport: params => { // 获客意向收集 导出
-    return getRequestNoSort('/adm/plan/export', params, 'loading')
-  },
-  admactivityruleedit: params => { // 团购助力活动规则 编辑
-    return getRequestNoSort('/adm/activity/rule/edit', params, 'loading')
-  },
-  admactivityruleadd: params => { // 团购助力活动规则 添加
-    return getRequestNoSort('/adm/activity/rule/add', params, 'loading')
-  },
-  admactivityruledel: params => { // 团购助力活动规则 删除
-    return getRequestNoSort('/adm/activity/rule/del', params, 'loading')
-  },
-  admactivityruledetail: params => { // 团购助力活动规则 详情
-    return getRequestNoSort('/adm/activity/rule/detail', params, 'loading')
-  },
-  admactivitybuyinglaunchlist: params => { // 助力活动- 列表
-    return getRequest('/adm/activity/buying/launch/list', params)
-  },
-  admactivitybuyinglaunchedit: params => { // 助力活动 - 标记已助力
-    return getRequestNoSort('/adm/activity/buying/launch/edit', params, 'loading')
-  },
-  admactivitybuyingjoinlist: params => { // 助力活动- 列表参与列表
-    return getRequest('/adm/activity/buying/join/list', params)
-  },
-  admindexrankclick: params => { //  楼盘 - 点击排行
-    return getRequest('/adm/index/rank/click', params)
-  },
-  admindexranksearch: params => { // 楼盘 - 搜索排行
-    return getRequest('/adm/index/rank/search', params)
-  },
-  admindexrankgzh: params => { // 楼盘 - 公众号 排行
-    return getRequest('/adm/index/rank/gzh', params)
-  },
-  admindexrankweek: params => { // 楼盘 - 一周 排行
-    return getRequest('/adm/index/rank/week', params)
-  },
-  admindexrankmonth: params => { // 楼盘 - 一月 排行
-    return getRequest('/adm/index/rank/month', params)
-  },
-  admindexrankyesterday: params => { // 楼盘 - 昨天 排行
-    return getRequest('/adm/index/rank/yesterday', params)
-  },
-  admindexranktoday: params => { // 楼盘 - 今天 排行
-    return getRequest('/adm/index/rank/today', params)
-  },
-  admindexrank: params => { // 楼盘 - 所有 排行
-    return getRequest('/adm/index/rank', params)
-  },
-  admareainfolist: params => { // 区域管理 - 列表
-    return getRequest('/adm/area/info/list', params)
-  },
-  admareainfoedit: params => { // 区域管理 - 编辑
-    return getRequestNoSort('/adm/area/info/edit', params, 'loading')
-  },
-  admareainfoadd: params => { // 区域管理 - 添加
-    return getRequestNoSort('/adm/area/info/add', params, 'loading')
-  },
-  admareainfodel: params => { // 区域管理 - 删除
-    return getRequestNoSort('/adm/area/info/del', params, 'loading')
-  },
-  admareainfodetail: params => { // 区域管理 - 详情
-    return getRequestNoSort('/adm/area/info/detail', params, 'loading')
-  },
-  admchannelslist: params => { // 短视频管理 - 列表
-    return getRequest('/adm/channels/list', params)
-  },
-  admchannelsedit: params => { // 短视频管理 - 编辑
-    return getRequestNoSort('/adm/channels/edit', params, 'loading')
-  },
-  admchannelsadd: params => { // 短视频管理 - 添加
-    return getRequestNoSort('/adm/channels/add', params, 'loading')
-  },
-  admchannelsdel: params => { // 短视频管理 - 删除
-    return getRequestNoSort('/adm/channels/del', params, 'loading')
-  },
-  admchannelsdetail: params => { // 短视频管理 - 详情
-    return getRequestNoSort('/adm/channels/detail', params, 'loading')
-  },
-  admthemelist: params => { // 小程序主题 - 列表
-    return getRequest('/adm/theme/list', params)
-  },
-  admthemeedit: params => { // 小程序主题 - 编辑
-    return getRequestNoSort('/adm/theme/edit', params, 'loading')
-  },
-  admthemeadd: params => { // 小程序主题 - 添加
-    return getRequestNoSort('/adm/theme/add', params, 'loading')
-  },
-  admthemedel: params => { // 小程序主题 - 删除
-    return getRequestNoSort('/adm/theme/del', params, 'loading')
-  },
-  admthemedetail: params => { // 小程序主题 - 详情
-    return getRequestNoSort('/adm/theme/detail', params, 'loading')
-  },
-  admthemedatalist: params => { // 小程序主题 - 主题数据 - 列表
-    return getRequest('/adm/theme/data/list', params)
-  },
-  admthemedataedit: params => { // 小程序主题 - 主题数据 - 编辑
-    return getRequestNoSort('/adm/theme/data/edit', params, 'loading')
-  },
-  admthemedataadd: params => { // 小程序主题 - 主题数据 - 添加
-    return getRequestNoSort('/adm/theme/data/add', params, 'loading')
-  },
-  admthemedatadel: params => { // 小程序主题 - 主题数据 - 删除
-    return getRequestNoSort('/adm/theme/data/del', params, 'loading')
-  },
-  admthemedatadetail: params => { // 小程序主题 - 主题数据 - 详情
-    return getRequestNoSort('/adm/theme/data/detail', params, 'loading')
-  },
-  admthemetemplate: params => { // 小程序主题 - 主题数据 - 一键创建
-    return getRequestNoSort('/adm/theme/template', params, 'loading')
-  },
-  admthemecopy: params => { // 小程序主题 - 主题数据 - 复制
-    return getRequestNoSort('/adm/theme/copy', params, 'loading')
-  },
-  admnewslist: params => { // 今日简报 - 列表
-    return getRequestNoSort('/adm/news/list', params)
-  },
-  admnewschange: params => { // 今日简报 - 修改
-    return getRequestNoSort('/adm/news/change', params, 'loading')
-  },
-  admnewscollect: params => { // 今日简报 - 新闻采集
-    return getRequestNoSort('/adm/news/collect', params, 'loading')
-  },
-  admmapcoordindetail: params => { // 地图 测试 详情
-    return getRequestNoSort('/adm/map/coordin/detail', params)
-  },
-  admmapcoordinlist: params => { // 地图 测试 列表
-    return getRequestNoSort('/adm/map/coordin/list', params)
-  },
-  admmapcoordinadd: params => { // 地图 测试 添加
-    return getRequestNoSort('/adm/map/coordin/add', params)
-  },
-  admmapcoordinedit: params => { // 地图 测试 编辑
-    return getRequestNoSort('/adm/map/coordin/edit', params)
-  },
-  admmapcoordindel: params => { // 地图 测试 删除
-    return getRequestNoSort('/adm/map/coordin/del', params)
-  },
-  admmapcoordinall: params => { // 地图 测试 楼盘学校经纬度信息
-    return getRequestNoSort('/adm/map/coordin/all', params)
-  },
-  admmapcoordincount: params => { // 地图 测试 统计
-    return getRequestNoSort('/adm/map/coordin/count', params)
-  },
-  admmetroinfolist: params => { // 地铁管理 - 列表
-    return getRequest('/adm/metro/info/list', params)
-  },
-  admmetroinfoedit: params => { // 地铁管理 - 编辑
-    return getRequestNoSort('/adm/metro/info/edit', params, 'loading')
-  },
-  admmetroinfoadd: params => { // 地铁管理 - 添加
-    return getRequestNoSort('/adm/metro/info/add', params, 'loading')
-  },
-  admmetroinfodel: params => { // 地铁管理 - 删除
-    return getRequestNoSort('/adm/metro/info/del', params, 'loading')
-  },
-  admmetroinfodetail: params => { // 地铁管理 - 详情
-    return getRequestNoSort('/adm/metro/info/detail', params, 'loading')
-  },
-  admbankratelist: params => { // 银行利率管理 - 列表
-    return getRequest('/adm/bank/rate/list', params)
-  },
-  admbankrateedit: params => { // 银行利率管理 - 编辑
-    return getRequestNoSort('/adm/bank/rate/edit', params, 'loading')
-  },
-  admbankrateadd: params => { // 银行利率管理 - 添加
-    return getRequestNoSort('/adm/bank/rate/add', params, 'loading')
-  },
-  admbankratedel: params => { // 银行利率管理 - 删除
-    return getRequestNoSort('/adm/bank/rate/del', params, 'loading')
-  },
-  admbrandlist: params => { // 广告- 品牌 - 列表
-    return getRequest('/adm/brand/list', params)
-  },
-  admbrandedit: params => { // 广告- 品牌 - 编辑
-    return getRequestNoSort('/adm/brand/edit', params, 'loading')
-  },
-  admbrandadd: params => { // 广告- 品牌 - 添加
-    return getRequestNoSort('/adm/brand/add', params, 'loading')
-  },
-  admbranddel: params => { // 广告- 品牌 - 删除
-    return getRequestNoSort('/adm/brand/del', params, 'loading')
-  },
-  admbranddatalist: params => { // 广告- 品牌 楼盘数据 - 列表
-    return getRequest('/adm/brand/data/list', params)
-  },
-  admbranddataedit: params => { // 广告- 品牌 楼盘数据 - 编辑
-    return getRequestNoSort('/adm/brand/data/edit', params, 'loading')
-  },
-  admbranddataadd: params => { // 广告- 品牌 楼盘数据 - 添加
-    return getRequestNoSort('/adm/brand/data/add', params, 'loading')
-  },
-  admbranddatadel: params => { // 广告- 品牌 楼盘数据 - 删除
-    return getRequestNoSort('/adm/brand/data/del', params, 'loading')
+  admlotteryuserlist: params => { // 参与用户列表
+    return getRequest('/adm/lottery/user/list', params)
   },
 }
 

src/views/jiangtou/charlist.vue

@@ -0,0 +1,93 @@
+<template>
+  <div class="app-container">
+    <!-- <search-form
+      :list-loading="listLoading"
+      @change="searchHandle"
+    /> -->
+    <table-list
+      :list-loading="listLoading"
+      :data="tableData2"
+      :columns="listConfig"
+      :current-page="currentPage"
+      :page-size="pageSize"
+      :total-records="totalRecords"
+      @currentChange="pageHandle"
+      @sizeChange="sizeChange"
+    />
+    <popup-edit
+      :isShow="isDtlShow"
+      :curObj="curObj"
+      @close="closePopup"
+    />
+  </div>
+</template>
+<script>
+import { arrToObj } from '@/utils'
+import SearchForm from './components/searchForm/Charlist'
+import PopupEdit from './components/popup/Charlist'
+import baseTable from '_m/baseTable.js'
+export default {
+  name: 'Index',
+  components: {
+    SearchForm,
+    PopupEdit,
+  },
+  provide() {
+    return {
+      parentData: this
+    }
+  },
+  mixins: [baseTable],
+  data() {
+    return {
+      apiStr: 'other.admlotterycharlist',
+      searchForm: null,
+      isDtlShow: false,
+      // noCreated: true,
+      curObj: {},
+    }
+  },
+  computed: {
+    tableData2() {
+      const arr = [...this.tableData]
+      arr.map(item => {
+        if (item.total === 0 && item.name !== '春') {
+          item.total = '999'
+        }
+      })
+      return arr
+    }
+  },
+  created() {},
+  mounted() {
+    this.listConfig = {
+      rows: [
+        { label: '字', prop: 'name' },
+        { label: '概率', prop: 'v' },
+        { label: '剩余数量', prop: 'total' },
+        { label: '操作', width: 80, type: 'handle2', operations:
+          [
+            { label: '设置', func: this.openPopup, btnType: 'primary' },
+          ]
+        }
+      ]
+    }
+  },
+  methods: {
+    openPopup(row) {
+      if (row && row.id) {
+        this.curObj = row
+      } else {
+        this.curObj = {}
+      }
+      this.isDtlShow = true
+    },
+    closePopup(obj) {
+      this.isDtlShow = false
+      if (obj) {
+        this.fetchData()
+      }
+    }
+  }
+}
+</script>

src/views/jiangtou/components/popup/Charlist.vue

@@ -0,0 +1,92 @@
+<template>
+  <div>
+    <el-dialog
+      v-loading="loading"
+      :show-close="false"
+      :close-on-click-modal="false"
+      :visible.sync="isShow"
+      :title="curObj.id ? '编辑概率' : '新增概率'"
+      :fullscreen="false"
+      width="400px"
+      custom-class="xl-dialog"
+      center
+    >
+      <base-form ref="ruleForm" :data="formData" :is-inline="false" label-width="90px">
+        <div slot="footer" style="padding-top: 20px;">
+          <el-button class="xl-form-btn t2" @click="close">关 闭</el-button>
+          <el-button class="xl-form-btn t1" @click="close('confirm')">确定</el-button>
+        </div>
+      </base-form>
+    </el-dialog>
+  </div>
+</template>
+<script>
+export default {
+  components: { },
+  mixins,
+  props: {
+    isShow: Boolean,
+    curObj: Object
+  },
+  inject: ['parentData'],
+  data() {
+    return {
+      formData: [],
+      loading: true,
+      cObj: {},
+      curEstateList: [],
+    }
+  },
+  watch: {
+    isShow: function(val) {
+      if (val) {
+        this.getDef()
+      }
+    },
+  },
+  methods: {
+    getDef() {
+      let params = {...this.curObj}
+      this.formData = [
+        { label: '概率', key: 'v', rules: 1 },
+        { label: '剩余数量', key: 'total', rules: 1 },
+      ]
+      this.setDefaultValue(params)
+    },
+    close(str) {
+      if (str === 'confirm') {
+        this.$refs['ruleForm'].$refs['baseForm'].validate((valid) => {
+          if (valid) {
+            const oldform = this.$refs.ruleForm.baseForm
+            const newForm = { ...oldform }
+            if (this.curObj.id) {
+              newForm.id = this.curObj.id
+            }
+            let apiStr = 'admlotterycharsave'
+            if (newForm.id) apiStr = 'admlotterycharsave'
+            this.$api.other[apiStr](newForm).then(data => {
+              this.$msgs(newForm.id ? '编辑成功' : '新增成功')
+              this.$emit('close', newForm)
+            })
+          }
+        })
+      } else {
+        this.$emit('close')
+        this.setDefaultValue()
+      }
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+@import '../../../../styles/libEdit.scss';
+.lib-edit {
+  padding-top: 0;
+  ::v-deep .el-form-item {
+    margin-bottom: 10px;
+  }
+  ::v-deep .el-date-editor.el-input {
+    width: 100%;
+  }
+}
+</style>

src/views/jiangtou/components/popup/Prizelist.vue

@@ -0,0 +1,92 @@
+<template>
+  <div>
+    <el-dialog
+      v-loading="loading"
+      :show-close="false"
+      :close-on-click-modal="false"
+      :visible.sync="isShow"
+      :title="curObj.id ? '编辑概率' : '新增概率'"
+      :fullscreen="false"
+      width="400px"
+      custom-class="xl-dialog"
+      center
+    >
+      <base-form ref="ruleForm" :data="formData" :is-inline="false" label-width="90px">
+        <div slot="footer" style="padding-top: 20px;">
+          <el-button class="xl-form-btn t2" @click="close">关 闭</el-button>
+          <el-button class="xl-form-btn t1" @click="close('confirm')">确定</el-button>
+        </div>
+      </base-form>
+    </el-dialog>
+  </div>
+</template>
+<script>
+export default {
+  components: { },
+  mixins,
+  props: {
+    isShow: Boolean,
+    curObj: Object
+  },
+  inject: ['parentData'],
+  data() {
+    return {
+      formData: [],
+      loading: true,
+      cObj: {},
+      curEstateList: [],
+    }
+  },
+  watch: {
+    isShow: function(val) {
+      if (val) {
+        this.getDef()
+      }
+    },
+  },
+  methods: {
+    getDef() {
+      let params = {...this.curObj}
+      this.formData = [
+        { label: '概率', key: 'v', rules: 1 },
+        { label: '剩余数量', key: 'total', rules: 1 },
+      ]
+      this.setDefaultValue(params)
+    },
+    close(str) {
+      if (str === 'confirm') {
+        this.$refs['ruleForm'].$refs['baseForm'].validate((valid) => {
+          if (valid) {
+            const oldform = this.$refs.ruleForm.baseForm
+            const newForm = { ...oldform }
+            if (this.curObj.id) {
+              newForm.id = this.curObj.id
+            }
+            let apiStr = 'admlotteryprizesave'
+            if (newForm.id) apiStr = 'admlotteryprizesave'
+            this.$api.other[apiStr](newForm).then(data => {
+              this.$msgs(newForm.id ? '编辑成功' : '新增成功')
+              this.$emit('close', newForm)
+            })
+          }
+        })
+      } else {
+        this.$emit('close')
+        this.setDefaultValue()
+      }
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+@import '../../../../styles/libEdit.scss';
+.lib-edit {
+  padding-top: 0;
+  ::v-deep .el-form-item {
+    margin-bottom: 10px;
+  }
+  ::v-deep .el-date-editor.el-input {
+    width: 100%;
+  }
+}
+</style>

src/views/room/components/searchForm/ClickRecord.vue → src/views/jiangtou/components/searchForm/Charlist.vue

@@ -28,24 +28,14 @@ export default {
     getDef (str) {
       let params = { ...this.$refs.ruleForm.baseForm }
       this.searchData = [
-        { label: '咨询客户', key: 'nickname' },
-        { label: '置业经理', key: 'sale_id', type: 'selectRemote',
-          remoteParams: { skey: 'sale_name', api: `user.admsaleuserlist`, opKey: 'sale_name', opVal: 'id' }
-        },
-        { label: '点击类型', key: 'click_type', type: 'select', options: this.$dictData.contact_click_type},
-        // { label: '目标类型', key: 'target_type', type: 'select', options: this.$dictData.contact_target_type},
-        { label: '点击时间', label2: '开始时间', label3: '结束时间', key: 'startEndTime', type: 'datePicker', rules: 1},
+        { label: 'id', key: 'id' },
+        { label: '已中奖', key: 'is_lottery', type: 'select', options: this.$dictData.sys_yesno},
       ]
       this.setDefaultValue(params, 'searchData')
     },
     searchHandle() {
       const oldform = this.$refs.ruleForm.baseForm
       const newForm = { ...oldform }
-      if (newForm.startEndTime) {
-        newForm.start_at = newForm.startEndTime[0]
-        newForm.end_at = newForm.startEndTime[1]
-      }
-      delete newForm.startEndTime
       this.$emit('change', newForm)
     }
   }

src/views/jiangtou/components/searchForm/Prizelist.vue

@@ -0,0 +1,43 @@
+<template>
+  <base-form slot="content" ref="ruleForm" :data="searchData">
+    <div slot="footer">
+      <el-button :loading="listLoading" icon="el-icon-search" class="xl-form-btn bgc1" @click="searchHandle">查询</el-button>
+      <!-- <el-button :loading="listLoading" icon="el-icon-document" class="xl-form-btn bgc2" @click="toExportExcel">导出{{ this.$route.meta.title }}信息</el-button> -->
+    </div>
+  </base-form>
+</template>
+<script>
+export default {
+  props: {
+    listLoading: Boolean
+  },
+  inject: ['parentData'],
+  mixins,
+  data() {
+    return {
+      searchData: []
+    }
+  },
+  mounted () {
+    this.getDef()
+  },
+  methods: {
+    subwayLineChange (val) {
+      this.getDef('change')
+    },
+    getDef (str) {
+      let params = { ...this.$refs.ruleForm.baseForm }
+      this.searchData = [
+        { label: 'id', key: 'id' },
+        { label: '已中奖', key: 'is_lottery', type: 'select', options: this.$dictData.sys_yesno},
+      ]
+      this.setDefaultValue(params, 'searchData')
+    },
+    searchHandle() {
+      const oldform = this.$refs.ruleForm.baseForm
+      const newForm = { ...oldform }
+      this.$emit('change', newForm)
+    }
+  }
+}
+</script>

src/views/jiangtou/components/searchForm/Prizeulist.vue

@@ -0,0 +1,42 @@
+<template>
+  <base-form slot="content" ref="ruleForm" :data="searchData">
+    <div slot="footer">
+      <el-button :loading="listLoading" icon="el-icon-search" class="xl-form-btn bgc1" @click="searchHandle">查询</el-button>
+      <!-- <el-button :loading="listLoading" icon="el-icon-document" class="xl-form-btn bgc2" @click="toExportExcel">导出{{ this.$route.meta.title }}信息</el-button> -->
+    </div>
+  </base-form>
+</template>
+<script>
+export default {
+  props: {
+    listLoading: Boolean
+  },
+  inject: ['parentData'],
+  mixins,
+  data() {
+    return {
+      searchData: []
+    }
+  },
+  mounted () {
+    this.getDef()
+  },
+  methods: {
+    subwayLineChange (val) {
+      this.getDef('change')
+    },
+    getDef (str) {
+      let params = { ...this.$refs.ruleForm.baseForm }
+      this.searchData = [
+        { label: '用户id', key: 'user_id' },
+      ]
+      this.setDefaultValue(params, 'searchData')
+    },
+    searchHandle() {
+      const oldform = this.$refs.ruleForm.baseForm
+      const newForm = { ...oldform }
+      this.$emit('change', newForm)
+    }
+  }
+}
+</script>

src/views/jiangtou/components/searchForm/Userlist.vue

@@ -0,0 +1,43 @@
+<template>
+  <base-form slot="content" ref="ruleForm" :data="searchData">
+    <div slot="footer">
+      <el-button :loading="listLoading" icon="el-icon-search" class="xl-form-btn bgc1" @click="searchHandle">查询</el-button>
+      <!-- <el-button :loading="listLoading" icon="el-icon-document" class="xl-form-btn bgc2" @click="toExportExcel">导出{{ this.$route.meta.title }}信息</el-button> -->
+    </div>
+  </base-form>
+</template>
+<script>
+export default {
+  props: {
+    listLoading: Boolean
+  },
+  inject: ['parentData'],
+  mixins,
+  data() {
+    return {
+      searchData: []
+    }
+  },
+  mounted () {
+    this.getDef()
+  },
+  methods: {
+    subwayLineChange (val) {
+      this.getDef('change')
+    },
+    getDef (str) {
+      let params = { ...this.$refs.ruleForm.baseForm }
+      this.searchData = [
+        { label: 'id', key: 'id' },
+        { label: '已中奖', key: 'is_lottery', type: 'select', options: this.$dictData.sys_yesno},
+      ]
+      this.setDefaultValue(params, 'searchData')
+    },
+    searchHandle() {
+      const oldform = this.$refs.ruleForm.baseForm
+      const newForm = { ...oldform }
+      this.$emit('change', newForm)
+    }
+  }
+}
+</script>

src/views/jiangtou/prizelist.vue

@@ -0,0 +1,94 @@
+<template>
+  <div class="app-container">
+    <!-- <search-form
+      :list-loading="listLoading"
+      @change="searchHandle"
+    /> -->
+    <table-list
+      :list-loading="listLoading"
+      :data="tableData2"
+      :columns="listConfig"
+      :current-page="currentPage"
+      :page-size="pageSize"
+      :total-records="totalRecords"
+      @currentChange="pageHandle"
+      @sizeChange="sizeChange"
+      :isAdd="true"
+      @add="openPopup"
+      :operationsDefaultLength="5"
+    />
+    <popup-edit
+      :isShow="isDtlShow"
+      :curObj="curObj"
+      @close="closePopup"
+    />
+  </div>
+</template>
+<script>
+import { arrToObj } from '@/utils'
+import SearchForm from './components/searchForm/Prizelist'
+import PopupEdit from './components/popup/Prizelist'
+import baseTable from '_m/baseTable.js'
+export default {
+  name: 'Index',
+  components: {
+    SearchForm,
+    PopupEdit,
+  },
+  provide() {
+    return {
+      parentData: this
+    }
+  },
+  mixins: [baseTable],
+  data() {
+    return {
+      apiStr: 'other.admlotteryprizelist',
+      searchForm: null,
+      isDtlShow: false,
+      // noCreated: true,
+      curObj: {},
+    }
+  },
+  computed: {
+    tableData2() {
+      const arr = [...this.tableData]
+      arr.map(item => {
+        item.pri_image = this.IMadd(item.pri_image)
+      })
+      return arr
+    }
+  },
+  created() {},
+  mounted() {
+    this.listConfig = {
+      rows: [
+        { label: '字', prop: 'name' },
+        { label: '概率', prop: 'v' },
+        { label: '剩余数量', prop: 'total' },
+        { label: '操作', width: 80, type: 'handle2', operations:
+          [
+            { label: '设置', func: this.openPopup, btnType: 'primary' },
+          ]
+        }
+      ]
+    }
+  },
+  methods: {
+    openPopup(row) {
+      if (row && row.id) {
+        this.curObj = row
+      } else {
+        this.curObj = {}
+      }
+      this.isDtlShow = true
+    },
+    closePopup(obj) {
+      this.isDtlShow = false
+      if (obj) {
+        this.fetchData()
+      }
+    }
+  }
+}
+</script>

src/views/jiangtou/prizeulist.vue

@@ -0,0 +1,64 @@
+<template>
+  <div class="app-container">
+    <search-form
+      :list-loading="listLoading"
+      @change="searchHandle"
+    />
+    <table-list
+      :list-loading="listLoading"
+      :data="tableData2"
+      :columns="listConfig"
+      :current-page="currentPage"
+      :page-size="pageSize"
+      :total-records="totalRecords"
+      @currentChange="pageHandle"
+      @sizeChange="sizeChange"
+    />
+  </div>
+</template>
+<script>
+import { arrToObj } from '@/utils'
+import SearchForm from './components/searchForm/Prizeulist'
+import baseTable from '_m/baseTable.js'
+export default {
+  name: 'Index',
+  components: {
+    SearchForm,
+  },
+  provide() {
+    return {
+      parentData: this
+    }
+  },
+  mixins: [baseTable],
+  data() {
+    return {
+      apiStr: 'other.admlotteryprizeuserlist',
+      searchForm: null,
+      isDtlShow: false,
+      // noCreated: true,
+      curObj: {},
+    }
+  },
+  computed: {
+    tableData2() {
+      const arr = [...this.tableData]
+      arr.map(item => {})
+      return arr
+    }
+  },
+  created() {},
+  mounted() {
+    this.listConfig = {
+      rows: [
+        { label: '用户id', prop: 'user_id' },
+        { label: 'openid', prop: 'openid' },
+        { label: '奖品', prop: 'prize' },
+        { label: '创建时间', prop: 'create_at' },
+      ]
+    }
+  },
+  methods: {
+  }
+}
+</script>

src/views/room/clickRecord.vue → src/views/jiangtou/userlist.vue

@@ -13,9 +13,6 @@
       :total-records="totalRecords"
       @currentChange="pageHandle"
       @sizeChange="sizeChange"
-      :isAdd="true"
-      @add="openPopup"
-      :operationsDefaultLength="5"
     />
     <popup-edit
       :isShow="isDtlShow"
@@ -26,11 +23,11 @@
 </template>
 <script>
 import { arrToObj } from '@/utils'
-import SearchForm from './components/searchForm/ClickRecord'
+import SearchForm from './components/searchForm/Userlist'
 import PopupEdit from './components/popup/IndexEdit'
 import baseTable from '_m/baseTable.js'
 export default {
-  name: 'index',
+  name: 'Index',
   components: {
     SearchForm,
     PopupEdit,
@@ -43,7 +40,7 @@ export default {
   mixins: [baseTable],
   data() {
     return {
-      apiStr: 'house.admcontactclicklist',
+      apiStr: 'other.admlotteryuserlist',
       searchForm: null,
       isDtlShow: false,
       // noCreated: true,
@@ -61,19 +58,26 @@ export default {
   mounted() {
     this.listConfig = {
       rows: [
-        { label: '咨询客户', prop: 'nickname' },
-        { label: '客户头像', prop: 'avatar', type: 'img' },
-        { label: '点击类型', prop: 'click_type', type: 'flag', flags: arrToObj(this.$dictData.contact_click_type) },
-        { label: '目标类型', prop: 'target_type', type: 'flag', flags: arrToObj(this.$dictData.contact_target_type) },
-        { label: '联系ID', prop: 'target_id', },
-        { label: '置业经理', prop: 'sale_name' },
-        { label: '置业经理头像', prop: 'sale_avatar', type: 'img' },
+        { label: '用户ID', prop: 'id' },
+        { label: 'openid', prop: 'openid' },
+        { label: '可抽卡数', prop: 'lucky1_num' },
+        { label: '集满套数', prop: 'lucky2_num' },
+        { label: '已中奖', prop: 'is_lottery', type: 'tag', tags: arrToObj(this.$dictData.sys_yesno) },
+        { label: '江', prop: 'jiang' },
+        { label: '投', prop: 'tou' },
+        { label: '青', prop: 'qing' },
+        { label: '云', prop: 'yun' },
+        { label: '春', prop: 'chun' },
+        { label: '天', prop: 'tian' },
+
         { label: '创建时间', prop: 'create_at' },
-        { label: '操作', width: 120, type: 'handle2', operations:
-          [
-            { label: '查看咨询房源', func: this.openPopup, btnType: 'primary' },
-          ]
-        }
+        // { label: '操作', width: 200, type: 'handle2', operations:
+        //   [
+        //     { label: '保存排序', func: this.saveHandle, btnType: 'success' },
+        //     { label: '编辑', func: this.openPopup, btnType: 'primary' },
+        //     { label: '删除', func: this.delHandle, btnType: 'danger' },
+        //   ]
+        // }
       ]
     }
   },
@@ -99,8 +103,10 @@ export default {
       }, null, true)
     },
     openPopup(row) {
-      this.curObj = {
-        id: row.target_id
+      if (row && row.id) {
+        this.curObj = row
+      } else {
+        this.curObj = {}
       }
       this.isDtlShow = true
     },

src/views/room/index.vue

@@ -1,128 +0,0 @@
-<template>
-  <div class="app-container">
-    <search-form
-      :list-loading="listLoading"
-      @change="searchHandle"
-    />
-    <table-list
-      :list-loading="listLoading"
-      :data="tableData2"
-      :columns="listConfig"
-      :current-page="currentPage"
-      :page-size="pageSize"
-      :total-records="totalRecords"
-      @currentChange="pageHandle"
-      @sizeChange="sizeChange"
-      :isAdd="true"
-      @add="openPopup"
-      :operationsDefaultLength="5"
-    />
-    <popup-edit
-      :isShow="isDtlShow"
-      :curObj="curObj"
-      @close="closePopup"
-    />
-  </div>
-</template>
-<script>
-import { arrToObj } from '@/utils'
-import SearchForm from './components/searchForm/Index'
-import PopupEdit from './components/popup/IndexEdit'
-import baseTable from '_m/baseTable.js'
-export default {
-  name: 'Index',
-  components: {
-    SearchForm,
-    PopupEdit,
-  },
-  provide() {
-    return {
-      parentData: this
-    }
-  },
-  mixins: [baseTable],
-  data() {
-    return {
-      apiStr: 'house.admoldhouselist',
-      searchForm: null,
-      isDtlShow: false,
-      // noCreated: true,
-      curObj: {},
-    }
-  },
-  computed: {
-    tableData2() {
-      const arr = [...this.tableData]
-      arr.map(item => {
-        item.pri_image = this.IMadd(item.pri_image)
-      })
-      return arr
-    }
-  },
-  created() {},
-  mounted() {
-    this.listConfig = {
-      rows: [
-        { label: '排序', prop: 'sort', type: 'input', width: 80},
-        { label: '楼盘', prop: 'estate_name' },
-        { label: '浏览数', prop: 'view_count' },
-        { label: '置业经理', prop: 'sale_name' },
-        { label: '标题', prop: 'title' },
-        { label: '主图', prop: 'pri_image', type: 'img' },
-        { label: '详细地址', prop: 'detail_address', fullShow: true, minWidth: 100 },
-        { label: '总价', prop: 'price' },
-        { label: '面积㎡', prop: 'area' },
-        { label: '房源类型', prop: 'house_type', width: 100, fullShow: true, type: 'flag', flags: arrToObj(this.$dictData.house_type) },
-        { label: '所属区域', prop: 'area_type', type: 'flag', flags: arrToObj(this.$dictData.area_type) },
-        { label: '更新人', prop: 'update_by' },
-        { label: '更新时间', prop: 'update_at' },
-        { label: '创建人', prop: 'create_by' },
-        { label: '创建时间', prop: 'create_at' },
-        { label: '操作', width: 200, type: 'handle2', operations:
-          [
-            { label: '保存排序', func: this.saveHandle, btnType: 'success' },
-            { label: '编辑', func: this.openPopup, btnType: 'primary' },
-            { label: '删除', func: this.delHandle, btnType: 'danger' },
-          ]
-        }
-      ]
-    }
-  },
-  methods: {
-    saveHandle (row) {
-      this.$api.house.admoldhousesortedit({
-        id: row.id,
-        sort: row.sort,
-      }).then(data => {
-        this.$msgs(`已保存！`)
-        this.fetchData()
-      })
-    },
-    delHandle(row) {
-      this.$msg(`您确定要删除该楼盘吗？`, 'confirm', () => {
-        this.$api.house.admoldhousedel({
-          id: row.id,
-          status: 2
-        }).then(data => {
-          this.$msgs(`已删除！`)
-          this.fetchData()
-        })
-      }, null, true)
-    },
-    openPopup(row) {
-      if (row && row.id) {
-        this.curObj = row
-      } else {
-        this.curObj = {}
-      }
-      this.isDtlShow = true
-    },
-    closePopup(obj) {
-      this.isDtlShow = false
-      if (obj) {
-        this.fetchData()
-      }
-    }
-  }
-}
-</script>