diff --git a/src/api/activity/activityUser.js b/src/api/activity/activityUser.js
index 498795f..fbdb163 100644
--- a/src/api/activity/activityUser.js
+++ b/src/api/activity/activityUser.js
@@ -1,28 +1,34 @@
-import request from "@/utils/request";
-
-export function index(params){
-  return request({
-    method:'get',
-    url:'/api/admin/vr/index',
-    params
-  })
-}
-
-
-
-
-export function show(params){
-  return request({
-    method:'get',
-    url:'/api/admin/vr/show',
-    params
-  })
-}
-
-export function destroy(params){
-  return request({
-    method:'get',
-    url:'/api/admin/vr/destroy',
-    params
-  })
+import request from "@/utils/request";
+
+export function index(params) {
+  return request({
+    method: 'get',
+    url: '/api/admin/user/index',
+    params
+  })
+}
+
+
+export function save(data) {
+  return request({
+    url: '/api/admin/user/save',
+    method: 'post',
+    data
+  })
+}
+
+export function show(params) {
+  return request({
+    method: 'get',
+    url: '/api/admin/user/show',
+    params
+  })
+}
+
+export function destroy(params) {
+  return request({
+    method: 'get',
+    url: '/api/admin/user/destroy',
+    params
+  })
 }
diff --git a/src/api/activity/drawPrize.js b/src/api/activity/drawPrize.js
new file mode 100644
index 0000000..7c672dd
--- /dev/null
+++ b/src/api/activity/drawPrize.js
@@ -0,0 +1,45 @@
+import request from "@/utils/request";
+
+export function index(params) {
+  return request({
+    method: 'get',
+    url: '/api/admin/draw-prize/index',
+    params
+  })
+}
+
+
+export function drawLog(params) {
+  return request({
+    method: 'get',
+    url: '/api/admin/draw-prize/draw-log',
+    params
+  })
+}
+
+
+
+export function save(data) {
+  return request({
+    url: '/api/admin/draw-prize/save',
+    method: 'post',
+    data
+  })
+}
+
+
+export function show(params) {
+  return request({
+    method: 'get',
+    url: '/api/admin/draw-prize/show',
+    params
+  })
+}
+
+export function destroy(params) {
+  return request({
+    method: 'get',
+    url: '/api/admin/draw-prize/destroy',
+    params
+  })
+}
diff --git a/src/api/activity/index.js b/src/api/activity/index.js
index c18bd53..78594fe 100644
--- a/src/api/activity/index.js
+++ b/src/api/activity/index.js
@@ -3,7 +3,7 @@ import request from "@/utils/request";
 export function index(params){
   return request({
     method:'get',
-    url:'/api/admin/activity_list/index',
+    url:'/api/admin/activity-list/index',
     params
   })
 }
@@ -12,7 +12,7 @@ export function index(params){
 
 export function save(data) {
   return request({
-    url: '/api/admin/activity_list/save',
+    url: '/api/admin/activity-list/save',
     method: 'post',
     data
   })
@@ -22,7 +22,7 @@ export function save(data) {
 export function show(params){
   return request({
     method:'get',
-    url:'/api/admin/activity_list/show',
+    url:'/api/admin/activity-list/show',
     params
   })
 }
@@ -30,7 +30,7 @@ export function show(params){
 export function destroy(params){
   return request({
     method:'get',
-    url:'/api/admin/activity_list/destroy',
+    url:'/api/admin/activity-list/destroy',
     params
   })
 }
diff --git a/src/views/activity/activityOrder.vue b/src/views/activity/activityOrder.vue
new file mode 100644
index 0000000..02409e3
--- /dev/null
+++ b/src/views/activity/activityOrder.vue
@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src/views/activity/activityUser.vue b/src/views/activity/activityUser.vue
index 0902a1b..d2c44eb 100644
--- a/src/views/activity/activityUser.vue
+++ b/src/views/activity/activityUser.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <lx-header icon="md-apps" style="margin-bottom: 10px; border: 0px; margin-top: 15px" text="活动参与管理">
+    <lx-header icon="md-apps" style="margin-bottom: 10px; border: 0px; margin-top: 15px" text="活动用户管理">
       <div slot="content"></div>
       <slot>
         <div class="selects">
@@ -23,16 +23,19 @@
           <Button style="margin-left: 10px" type="primary" @click="select={page:1,keyword:''}">重置
           </Button>
           <Button style="margin-left: 10px" type="primary" @click="doSearch">查询</Button>
+          <Button style="margin-left: 10px" type="primary" @click="add">新增</Button>
         </div>
       </slot>
     </lx-header>
 
 
-    <xy-table :list="list" :table-item="table">
-      <template v-slot:btns>
+    <xy-table :list="list" :table-item="table" @delete="deleteitem"
+      @editor="(row)=>{$refs['addActivityUser'].id = row.id;$refs['addActivityUser'].isShow = true;$refs['addActivityUser'].type = 'editor'}">
+      <template v-slot:btns v-if="type==0 ">
 
       </template>
     </xy-table>
+    <addActivityUser ref="addActivityUser" :listActivity="listActivity" @refresh="load()"></addActivityUser>
   </div>
 </template>
 
@@ -45,7 +48,13 @@
   import {
     index as activityIndex
   } from "@/api/activity/index";
+
+
+  import addActivityUser from '@/views/activity/components/addActivityUser'
   export default {
+    components: {
+      addActivityUser
+    },
     data() {
       return {
         select: {
@@ -58,28 +67,31 @@
         total: 0,
         list: [],
         table: [{
-            prop: 'name',
+            prop: 'activity_list.name',
             label: '活动名称',
-            align: 'left',
             fixed: 'left',
+            align: 'left'
+          }, {
+            prop: 'name',
+            label: '用户名称',
+            align: 'left',
 
+
+          }, {
+            prop: 'username',
+            label: '登录账号',
+            align: 'center'
           }, {
-            prop: 'appid',
-            label: '公众号的APPID',
-            align: 'center',
-            fixed: 'left'
-          }, , {
-            prop: 'mch_id',
-            label: '微信商户的ID',
-            align: 'center',
-            fixed: 'left'
+            prop: 'mobile',
+            label: '手机号',
+            align: 'center'
           },
           {
             prop: 'created_at',
             label: '创建信息',
-            width: 160,
+            width: 190,
             formatter: (v1, v2, value) => {
-              return value;
+              return this.$moment(value).format("YYYY-MM-DD HH:mm:ss");
             }
           }
         ],
@@ -99,7 +111,7 @@
         this.load();
       },
       add() {
-        this.$refs['addActivity'].isShow = true
+        this.$refs['addActivityUser'].isShow = true
       },
       pageSizeChange(e) {
         this.select.page_size = e;
diff --git a/src/views/activity/components/addActivity.vue b/src/views/activity/components/addActivity.vue
index 73b8507..a05aa71 100644
--- a/src/views/activity/components/addActivity.vue
+++ b/src/views/activity/components/addActivity.vue
@@ -27,6 +27,22 @@
       </template>
 
 
+      <template v-slot:datetimerange>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>活动时间范围
+          </div>
+          <div class="xy-table-item-content">
+            <el-date-picker v-model="detail.datetimerange" type="datetimerange" :picker-options="pickerOptions"
+              range-separator="至" value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期"
+              align="right">
+            </el-date-picker>
+          </div>
+        </div>
+      </template>
+
+
+
       <template v-slot:appid>
         <div class="xy-table-item">
           <div class="xy-table-item-label">公众号的APPID
@@ -102,9 +118,39 @@
         isShow: false,
         id: "",
         type: "add",
+        pickerOptions: {
+          shortcuts: [{
+            text: '最近一周',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit('pick', [start, end]);
+            }
+          }, {
+            text: '最近一个月',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit('pick', [start, end]);
+            }
+          }, {
+            text: '最近三个月',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit('pick', [start, end]);
+            }
+          }]
+        },
         detail: {
           name: "",
           tag: "",
+          datetimerange: [],
+          start_time: "",
+          end_time: "",
           appid: "",
           appsecret: "",
           mch_id: "",
@@ -122,6 +168,11 @@
             required: true,
             message: "活动的标识必填"
           }],
+          datetimerange: [{
+            required: true,
+            message: "活动时间必须填写",
+            trigger: 'change'
+          }],
         }
 
       }
@@ -145,8 +196,12 @@
           id: this.id
         })
         Object.assign(this.detail, res);
+        this.detail.datetimerange.push(this.$moment(res.start_time).format("YYYY-MM-DD HH:mm:ss"));
+        this.detail.datetimerange.push(this.$moment(res.end_time).format("YYYY-MM-DD HH:mm:ss"));
       },
       editor() {
+        this.detail.start_time = this.detail.datetimerange[0];
+        this.detail.end_time = this.detail.datetimerange[1];
         save(this.detail).then(res => {
           this.isShow = false
           this.$Message.success("操作成功");
diff --git a/src/views/activity/components/addActivityConfig.vue b/src/views/activity/components/addActivityConfig.vue
new file mode 100644
index 0000000..cce96d1
--- /dev/null
+++ b/src/views/activity/components/addActivityConfig.vue
@@ -0,0 +1,16 @@
+<template>
+  <div>
+    <!--    编辑-->
+    <xy-dialog :is-show.sync="isShow" title="活动配置" ref="addActivityConfig">
+
+
+    </xy-dialog>
+
+  </div>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>
diff --git a/src/views/activity/components/addActivityUser.vue b/src/views/activity/components/addActivityUser.vue
new file mode 100644
index 0000000..2ca9521
--- /dev/null
+++ b/src/views/activity/components/addActivityUser.vue
@@ -0,0 +1,218 @@
+<template>
+  <div>
+    <!--    编辑-->
+    <xy-dialog :is-show.sync="isShow" title="活动用户编辑" type="form" :form="detail" :rules="rules" @submit="editor"
+      ref="addActivity">
+
+      <template v-slot:name>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>用户名称
+          </div>
+          <div class="xy-table-item-content">
+            <el-input clearable placeholder="请填写用户名称" v-model="detail.name" style="width: 300px;" />
+          </div>
+        </div>
+      </template>
+      <template v-slot:mobile>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>手机号
+          </div>
+          <div class="xy-table-item-content">
+            <el-input clearable placeholder="请填写手机号" v-model="detail.mobile" style="width: 300px;" />
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:username>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>登录账号
+          </div>
+          <div class="xy-table-item-content">
+            <el-input clearable placeholder="请填写登录账号" v-model="detail.username" style="width: 300px;" />
+          </div>
+        </div>
+      </template>
+
+
+      <template v-slot:password>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>用户密码
+          </div>
+          <div class="xy-table-item-content">
+            <el-input clearable placeholder="请填写用户密码" type="password" v-model="detail.password" style="width: 300px;" />
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:activity_list_id>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>相关活动
+          </div>
+          <div class="xy-table-item-content">
+            <el-select clearable v-model="detail.activity_list_id">
+              <el-option v-for="(item,index) of listActivity" :key="item.id" :value="item.id" :label="item.name">
+              </el-option>
+            </el-select>
+          </div>
+        </div>
+      </template>
+
+
+      <template v-slot:status>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">状态
+          </div>
+          <div class="xy-table-item-content">
+            <el-select clearable v-model="detail.status">
+              <el-option :value="1" label="启用"></el-option>
+              <el-option :value="0" label="禁用"></el-option>
+            </el-select>
+          </div>
+        </div>
+      </template>
+
+    </xy-dialog>
+
+  </div>
+</template>
+
+<script>
+  import {
+    save,
+    show
+  } from "@/api/activity/activityUser";
+
+  export default {
+    props: {
+      listActivity: Array
+    },
+    data() {
+
+      return {
+        isShow: false,
+        id: "",
+        type: "add",
+
+        detail: {
+          activity_list_id: "",
+          username: "",
+          password: "",
+          name: "",
+          mobile: "",
+          status: 1
+        },
+        rules: {
+          name: [{
+            required: true,
+            message: "用户名称必填写"
+          }],
+          tag: [{
+            required: true,
+            message: "登录账号必填"
+          }],
+        }
+
+      }
+    },
+    watch: {
+      isShow(newVal) {
+        if (newVal) {
+          if (this.type === 'editor') {
+            this.getDetail()
+          }
+        } else {
+          this.id = ''
+          this.type = ''
+          this.$refs['addActivity'].reset()
+        }
+      }
+    },
+    methods: {
+      async getDetail() {
+        let res = await show({
+          id: this.id
+        })
+        Object.assign(this.detail, res);
+        this.detail.activity_list_id = parseInt(res.activity_list_id)
+      },
+      editor() {
+        save(this.detail).then(res => {
+          this.isShow = false
+          this.$Message.success("操作成功");
+          this.$emit('refresh')
+        })
+      },
+
+    },
+    computed: {
+
+    },
+    mounted() {
+      let that = this;
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+  .contract-add-plan {
+    min-height: 30px;
+    border: 1px solid #dcdee2;
+    border-radius: 4px;
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    align-content: center;
+
+    padding: 0 8px;
+
+    &-no-plan {
+      height: 30px;
+      line-height: 30px;
+      color: #CDD0D5;
+    }
+  }
+
+  .xy-table-item-label {
+    width: 140px;
+  }
+
+  .xy-table-item-price {
+    position: relative;
+
+    &::after {
+      z-index: 1;
+      position: absolute;
+      right: 0;
+      top: 0;
+      content: '（元）'
+    }
+
+    ::v-deep .el-input__clear {
+      position: relative;
+      right: 30px;
+      z-index: 2;
+    }
+  }
+
+  .xy-table-item-price-wan {
+    position: relative;
+
+    &::after {
+      position: absolute;
+      right: 0;
+      top: 0;
+      content: '（万元）'
+    }
+
+    ::v-deep .el-input__clear {
+      position: relative;
+      right: 46px;
+      z-index: 2;
+    }
+  }
+</style>
diff --git a/src/views/activity/components/addDrawPrize.vue b/src/views/activity/components/addDrawPrize.vue
new file mode 100644
index 0000000..8fcac5d
--- /dev/null
+++ b/src/views/activity/components/addDrawPrize.vue
@@ -0,0 +1,262 @@
+<template>
+  <div>
+    <!--    编辑-->
+    <xy-dialog :is-show.sync="isShow" title="抽奖奖项编辑" type="form" :form="detail" :rules="rules" @submit="editor"
+      ref="addActivity">
+
+      <template v-slot:name>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>奖品名字
+          </div>
+          <div class="xy-table-item-content">
+            <el-input clearable placeholder="请填写奖品名字" v-model="detail.name" style="width: 300px;" />
+          </div>
+        </div>
+      </template>
+      <template v-slot:rate>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>概率
+          </div>
+          <div class="xy-table-item-content">
+            <el-input clearable placeholder="请填写概率" v-model="detail.rate" style="width: 100px;" />
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:total>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>总数
+          </div>
+          <div class="xy-table-item-content">
+            <el-input clearable placeholder="请填写总数" v-model="detail.total" style="width: 100px;" />
+          </div>
+        </div>
+
+      </template>
+
+      <template v-slot:has_total>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>剩余数量
+          </div>
+          <div class="xy-table-item-content">
+            <el-input clearable placeholder="请填写剩余数量" v-model="detail.has_total" style="width: 100px;" />
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:image_id>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            图像：
+          </div>
+          <div class="xy-table-item-content">
+            <div v-if="detail.image_id_url" style="position: relative;">
+              <img :src="detail.image_id_url" class="avatar">
+              <Button class="img__delete" icon="md-close" shape="circle" size="small" type="error"
+                @click="detail.image_id_url = '',detail.image_id = ''"></Button>
+            </div>
+            <el-upload v-else :action="action" :before-upload="uploadBefore" :limit="1" :on-error="uploadFail"
+              :on-success="uploadSuccess" :show-file-list="true" accept="picture" class="avatar-uploader"
+              list-type="picture-card">
+              <i class="el-icon-plus avatar-uploader-icon"></i>
+            </el-upload>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:activity_list_id>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>相关活动
+          </div>
+          <div class="xy-table-item-content">
+            <el-select clearable v-model="detail.activity_list_id">
+              <el-option v-for="(item,index) of listActivity" :key="item.id" :value="item.id" :label="item.name">
+              </el-option>
+            </el-select>
+          </div>
+        </div>
+      </template>
+
+
+      <template v-slot:status>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">状态
+          </div>
+          <div class="xy-table-item-content">
+            <el-select clearable v-model="detail.status">
+              <el-option :value="1" label="启用"></el-option>
+              <el-option :value="0" label="禁用"></el-option>
+            </el-select>
+          </div>
+        </div>
+      </template>
+
+    </xy-dialog>
+
+  </div>
+</template>
+
+<script>
+  import {
+    save,
+    show
+  } from "@/api/activity/drawPrize";
+
+  export default {
+    props: {
+      listActivity: Array
+    },
+    data() {
+
+      return {
+        isShow: false,
+        id: "",
+        type: "add",
+
+        detail: {
+          activity_list_id: "",
+          rate: 0,
+          name: "",
+          status: 1,
+          image_id: "",
+          total: 0,
+          has_total: 0,
+          image_id_url: ""
+        },
+        action: process.env.VUE_APP_UPLOAD_API,
+        rules: {
+          name: [{
+            required: true,
+            message: "奖品名字必填写"
+          }],
+          activity_list_id: [{
+            required: true,
+            message: "活动必须选择"
+          }],
+        }
+
+      }
+    },
+    watch: {
+      isShow(newVal) {
+        if (newVal) {
+          if (this.type === 'editor') {
+            this.getDetail()
+          }
+        } else {
+          this.id = ''
+          this.type = ''
+          this.$refs['addActivity'].reset()
+        }
+      }
+    },
+    methods: {
+      //上传
+      uploadFail(err) {
+        console.log(err)
+      },
+      uploadSuccess(response) {
+        console.log(response)
+        this.detail.image_id = response.id
+        this.detail.image_id_url = response.url
+
+      },
+      uploadBefore(file) {
+        console.log(file)
+        if ((file.size / 1000) > 2024) {
+          this.$message({
+            type: 'warning',
+            message: '上传图片大小超过2M！'
+          })
+          return false
+        }
+      },
+      async getDetail() {
+        let res = await show({
+          id: this.id
+        })
+        Object.assign(this.detail, res);
+        this.detail.activity_list_id = parseInt(res.activity_list_id)
+        this.detail.image_id = res.id
+      },
+      editor() {
+        save(this.detail).then(res => {
+          this.isShow = false
+          this.$Message.success("操作成功");
+          this.$emit('refresh')
+        })
+      },
+
+    },
+    computed: {
+
+    },
+    mounted() {
+      let that = this;
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+  .contract-add-plan {
+    min-height: 30px;
+    border: 1px solid #dcdee2;
+    border-radius: 4px;
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    align-content: center;
+
+    padding: 0 8px;
+
+    &-no-plan {
+      height: 30px;
+      line-height: 30px;
+      color: #CDD0D5;
+    }
+  }
+
+  .xy-table-item-label {
+    width: 140px;
+  }
+
+  .xy-table-item-price {
+    position: relative;
+
+    &::after {
+      z-index: 1;
+      position: absolute;
+      right: 0;
+      top: 0;
+      content: '（元）'
+    }
+
+    ::v-deep .el-input__clear {
+      position: relative;
+      right: 30px;
+      z-index: 2;
+    }
+  }
+
+  .xy-table-item-price-wan {
+    position: relative;
+
+    &::after {
+      position: absolute;
+      right: 0;
+      top: 0;
+      content: '（万元）'
+    }
+
+    ::v-deep .el-input__clear {
+      position: relative;
+      right: 46px;
+      z-index: 2;
+    }
+  }
+</style>
diff --git a/src/views/activity/drawPrize.vue b/src/views/activity/drawPrize.vue
new file mode 100644
index 0000000..74917b4
--- /dev/null
+++ b/src/views/activity/drawPrize.vue
@@ -0,0 +1,163 @@
+<template>
+  <div>
+    <lx-header icon="md-apps" style="margin-bottom: 10px; border: 0px; margin-top: 15px" text="活动奖品管理">
+      <div slot="content"></div>
+      <slot>
+        <div class="selects">
+          <div style="display: flex;align-items: center;">
+            <span style="padding: 0 6px;word-break: keep-all;">
+              活动
+            </span>
+            <Select v-model="select.activity_list_id" style="width: 180px;">
+              <Option v-for="(item,index) of listActivity" :key="item.id" :value="item.id" :label="item.name">
+              </Option>
+            </Select>
+          </div>
+          <div>
+            <span style="padding: 0 6px;word-break: keep-all;">
+              关键字
+            </span>
+            <Input v-model="select.keyword" placeholder="请输入关键字" style="width: 180px"></Input>
+          </div>
+
+          <Button style="margin-left: 10px" type="primary" @click="select={page:1,keyword:''}">重置
+          </Button>
+          <Button style="margin-left: 10px" type="primary" @click="doSearch">查询</Button>
+          <Button style="margin-left: 10px" type="primary" @click="add">新增</Button>
+        </div>
+      </slot>
+    </lx-header>
+
+
+    <xy-table :list="list" :table-item="table" @delete="deleteitem"
+      @editor="(row)=>{$refs['addDrawPrize'].id = row.id;$refs['addDrawPrize'].isShow = true;$refs['addDrawPrize'].type = 'editor'}">
+      <template v-slot:btns v-if="type==0 ">
+
+      </template>
+    </xy-table>
+    <addDrawPrize ref="addDrawPrize" :listActivity="listActivity" @refresh="load()"></addDrawPrize>
+  </div>
+</template>
+
+<script>
+  import {
+    index,
+    destroy,
+    show
+  } from "@/api/activity/drawPrize";
+  import {
+    index as activityIndex
+  } from "@/api/activity/index";
+
+
+  import addDrawPrize from '@/views/activity/components/addDrawPrize'
+  export default {
+    components: {
+      addDrawPrize
+    },
+    data() {
+      return {
+        select: {
+          page: 1,
+          page_size: 20,
+          keyword: '',
+          activity_list_id: ""
+        },
+        listActivity: [],
+        total: 0,
+        list: [],
+        table: [{
+            prop: 'activity_list.name',
+            label: '活动名称',
+            fixed: 'left',
+            align: 'left'
+          }, {
+            prop: 'name',
+            label: '奖品名称',
+            align: 'left',
+
+
+          }, {
+            prop: 'total',
+            label: '总数',
+            align: 'right'
+          }, {
+            prop: 'rate',
+            label: '概率',
+            align: 'right'
+          }, {
+            prop: 'has_total',
+            label: '剩余数量',
+            align: 'right'
+          },
+          {
+            prop: 'created_at',
+            label: '创建信息',
+            width: 190,
+            formatter: (v1, v2, value) => {
+              return this.$moment(value).format("YYYY-MM-DD HH:mm:ss");
+            }
+          }
+        ],
+      }
+    },
+    methods: {
+
+      async loadActivity() {
+        const res = await activityIndex({
+          page: 1,
+          page_size: 999
+        })
+        this.listActivity = res.data;
+      },
+      doSearch() {
+        this.select.page = 1;
+        this.load();
+      },
+      add() {
+        this.$refs['addDrawPrize'].isShow = true
+      },
+      pageSizeChange(e) {
+        this.select.page_size = e;
+        this.select.page = 1;
+        this.load();
+      },
+      async load() {
+        const res = await index(this.select)
+        this.total = res.total
+        this.list = res.data
+      },
+      deleteitem(row) {
+        destroy({
+          id: row.id
+        }).then(res => {
+          this.load();
+          this.$Message.success("操作成功");
+        })
+      },
+      pageChange(e) {
+        this.select.page = e
+        this.load()
+      },
+    },
+    mounted() {
+      this.load();
+      this.loadActivity()
+    },
+    created() {
+      let type = parseInt(this.$route.path.split("_")[1]);
+      this.type = this.select.is_auth = type;
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .selects {
+    display: flex;
+    flex-wrap: wrap;
+
+    &>div {
+      margin-bottom: 6px;
+    }
+  }
+</style>
diff --git a/src/views/activity/drawPrizeLog.vue b/src/views/activity/drawPrizeLog.vue
new file mode 100644
index 0000000..94910b3
--- /dev/null
+++ b/src/views/activity/drawPrizeLog.vue
@@ -0,0 +1,152 @@
+<template>
+  <div>
+    <lx-header icon="md-apps" style="margin-bottom: 10px; border: 0px; margin-top: 15px" text="活动抽奖日志">
+      <div slot="content"></div>
+      <slot>
+        <div class="selects">
+          <div style="display: flex;align-items: center;">
+            <span style="padding: 0 6px;word-break: keep-all;">
+              活动
+            </span>
+            <Select v-model="select.activity_list_id" style="width: 180px;">
+              <Option v-for="(item,index) of listActivity" :key="item.id" :value="item.id" :label="item.name">
+              </Option>
+            </Select>
+          </div>
+          <div>
+            <span style="padding: 0 6px;word-break: keep-all;">
+              关键字
+            </span>
+            <Input v-model="select.keyword" placeholder="请输入关键字" style="width: 180px"></Input>
+          </div>
+
+          <Button style="margin-left: 10px" type="primary" @click="select={page:1,keyword:''}">重置
+          </Button>
+          <Button style="margin-left: 10px" type="primary" @click="doSearch">查询</Button>
+        </div>
+      </slot>
+    </lx-header>
+
+
+    <xy-table :list="list" :table-item="table" >
+      <template v-slot:btns>
+
+      </template>
+    </xy-table>
+  </div>
+</template>
+
+<script>
+  import {
+    index,
+    destroy,
+    show,
+    drawLog
+  } from "@/api/activity/drawPrize";
+  import {
+    index as activityIndex
+  } from "@/api/activity/index";
+
+  export default {
+    data() {
+      return {
+        select: {
+          page: 1,
+          page_size: 20,
+          keyword: '',
+          activity_list_id: ""
+        },
+        listActivity: [],
+        total: 0,
+        list: [],
+        table: [{
+            prop: 'activity_list.name',
+            label: '活动名称',
+            fixed: 'left',
+            align: 'left'
+          }, {
+            prop: 'name',
+            label: '用户名称',
+            align: 'left',
+
+
+          }, {
+            prop: 'username',
+            label: '登录账号',
+            align: 'center'
+          }, {
+            prop: 'mobile',
+            label: '手机号',
+            align: 'center'
+          },
+          {
+            prop: 'created_at',
+            label: '创建信息',
+            width: 190,
+            formatter: (v1, v2, value) => {
+              return this.$moment(value).format("YYYY-MM-DD HH:mm:ss");
+            }
+          }
+        ],
+      }
+    },
+    methods: {
+
+      async loadActivity() {
+        const res = await activityIndex({
+          page: 1,
+          page_size: 999
+        })
+        this.listActivity = res.data;
+      },
+      doSearch() {
+        this.select.page = 1;
+        this.load();
+      },
+      add() {
+        this.$refs['addActivityUser'].isShow = true
+      },
+      pageSizeChange(e) {
+        this.select.page_size = e;
+        this.select.page = 1;
+        this.load();
+      },
+      async load() {
+        const res = await drawLog(this.select)
+        this.total = res.total
+        this.list = res.data
+      },
+      deleteitem(row) {
+        destroy({
+          id: row.id
+        }).then(res => {
+          this.load();
+          this.$Message.success("操作成功");
+        })
+      },
+      pageChange(e) {
+        this.select.page = e
+        this.load()
+      },
+    },
+    mounted() {
+      this.load();
+      this.loadActivity()
+    },
+    created() {
+      let type = parseInt(this.$route.path.split("_")[1]);
+      this.type = this.select.is_auth = type;
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .selects {
+    display: flex;
+    flex-wrap: wrap;
+
+    &>div {
+      margin-bottom: 6px;
+    }
+  }
+</style>
diff --git a/src/views/activity/index.vue b/src/views/activity/index.vue
index c767f9c..170c873 100644
--- a/src/views/activity/index.vue
+++ b/src/views/activity/index.vue
@@ -21,10 +21,16 @@
     </lx-header>
 
 
-    <xy-table :list="list" :table-item="table" @delete="deleteitem"
-      @editor="(row)=>{$refs['addActivity'].id = row.id;$refs['addActivity'].isShow = true;$refs['addActivity'].type = 'editor'}">
-      <template v-slot:btns >
-          <button >1212</button>
+    <xy-table :list="list" :table-item="table">
+      <template v-slot:btns>
+        <el-table-column fixed="right" header-align="center" label="操作" width="200">
+          <template slot-scope="scope">
+            <div class="slot-btns">
+              <Button type="primary" @click="edit(scope.row)">编辑</Button>
+              <Button type="error" @click="deleteitem(scope.row)" style="margin-left: 10px;">删除</Button>
+            </div>
+          </template>
+        </el-table-column>
       </template>
     </xy-table>
 
@@ -58,9 +64,25 @@
             prop: 'name',
             label: '活动名称',
             align: 'left',
-            fixed: 'left',
-            
+            fixed: 'left',
+
+          },{
+            prop: 'tag',
+            label: '活动标识',
+            align: 'left',
+            fixed: 'left',
+
+          },  {
+            prop: 'start_time',
+            label: '活动开始时间',
+            align: 'center'
+
           }, {
+            prop: 'end_time',
+            label: '活动结束时间',
+            align: 'center'
+          },
+          {
             prop: 'appid',
             label: '公众号的APPID',
             align: 'center',
@@ -108,6 +130,11 @@
           this.$Message.success("操作成功");
         })
       },
+      edit(row) {
+        this.$refs['addActivity'].id = row.id;
+        this.$refs['addActivity'].isShow = true;
+        this.$refs['addActivity'].type = 'editor'
+      },
       pageChange(e) {
         this.select.page = e
         this.load()
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index d9362e7..3aa8b7c 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -168,7 +168,7 @@
         caret-color: $cursor;
 
         &:-webkit-autofill {
-          box-shadow: 0 0 0px 1000px $bg inset !important;
+          //box-shadow: 0 0 0px 1000px $bg inset !important;
           //-webkit-text-fill-color: $cursor !important;
         }
       }