From 8fd1bb3f82ac898292734d13b2b7fcecbaf94240 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=B5=E5=AE=AA=E7=91=9E?=
 <9198107+min-xianrui@user.noreply.gitee.com>
Date: Thu, 21 Nov 2024 18:05:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E8=8C=B6=E6=A0=AA=E6=B8=B8?=
 =?UTF-8?q?=E6=88=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                               |   2 +-
 public/favicon.ico                            | Bin 4286 -> 4286 bytes
 src/api/games.js                              |  28 ++
 src/router/index.js                           |   2 +-
 src/router/modules/marketing.js               |  27 +-
 src/views/content/video/index.vue             |  31 +-
 .../content/video/video-add-and-update.vue    | 136 ++++----
 src/views/login/index.vue                     |   4 +-
 .../marketing/activity/activityLog/index.vue  | 173 +++++++++++
 .../marketing/activity/lotteryLog/index.vue   | 218 +++++++++++++
 .../marketing/raffle/rafflelog/index.vue      | 292 ++++++++++++++++++
 11 files changed, 829 insertions(+), 84 deletions(-)
 create mode 100644 src/views/marketing/activity/activityLog/index.vue
 create mode 100644 src/views/marketing/activity/lotteryLog/index.vue
 create mode 100644 src/views/marketing/raffle/rafflelog/index.vue

diff --git a/.env.production b/.env.production
index 6abd122..3360d1f 100644
--- a/.env.production
+++ b/.env.production
@@ -2,5 +2,5 @@
 ENV = 'production'
 
 # base api
-VUE_APP_BASE_API = 'http://api.xxx'
+VUE_APP_BASE_API = 'http://121.37.139.13:8080'
 
diff --git a/public/favicon.ico b/public/favicon.ico
index 95a0ea113581e4943aeefe258dcd499be35e97b2..0952ca237aa428737c28a1dd2d0956e5e0a17c9e 100644
GIT binary patch
literal 4286
zcmeH|YfO`86vtl~aa-bySr)eJgCWa4_+cN-vSdyOS(YqI*yb|B%<hYmIUGbYr+|P2
zI&k2Hfe>I^hm>2vT5c6gDJWR3(h7)BK;%~1QVNu|ynWC9Por5<aRN>EsZaB7-}iY=
z&+j?sJm-BmZW})S{v7+}#Jf1okK?#K5T>|5h|PP4Hv`@b{C^oBB5rNX@d9)ZLRY#s
z;KOguI9oR|bx-qO(k;x@!S)ryqCwO*+R3L>MbiV_M6P>ujx(4IqHj|_q$7WRO5b1j
zhz_THOh+?5r!W6_pF)xXob#dS2b^o>6>~y!Z|%T$uuByGN}BOLt-Jg?+V0BWvwP{c
zydNl~DvDAi(Uc(*(dqod^fUHxUUG(hFF#4lX7GW!Tz0!+II19&!m|!h`(VqgAP7G0
z>;ZYb_&CmkqW7E}#$r02^A#OPc*l8tC^?9XW@8HWpiM46MV}?UOIO=Vhrr(wp63N0
zo_Fj(P5tjr4GpwvnvG9alW}x<cmTG$Z{EEzlGk_%wF#sfeRa3C0=L-&AH*%bJ=AJk
zwOYTn+XdgXH355BPmb5XeFJN-armuTZQ0j4%ITB%w`p)fE#532KK4)Rr}|e`Eu!rD
zR10EIVea)M%W@C%@9J-Cc2ue!>*<>}&C6yC)5{HAHH2S_QhnWSxAPyk+CS?aj6L%1
zs}{tcR;#MeNZN|E6LVuVnX+WU+FR`Ztfmf!;Nx&OIK`cYj_R8wmX?0`GWJTPid;h8
zB&gjk<m6enb=PMMQ`r^D0_*i2>1<tRl_|3}nJ-o3@bf0!LzWAx%^u9^ZC+UtDf$~#
ztlkNwCn&4-9K{wNqmDtPWL?J_oCITE`ZW=um#LwvnobuSAyyCE>!;=?^KACD{jKUI
zJ>wx((}n6dDpTfBx-^k;>QfoNa)YRK&A{JY+?;9otMMY`%hRZ;t;mGA9rq^h79qc8
zT<^rWJRVmPPF=(8bg3pD&xIH~AI^}d?4;ZAvrSdC6_1}SiJ+9qXx7I%FkfC=UW{aU
zMs0(@k6`@X5!LdEoNp)zJ<sgpuSB@TXR$*O(hjjMrZ~*$7qzE_B~t>Jp==K8a-4w<
z#$Q-kFl(ppvtFnAP6<7npCtXFUd7%+TN&`}FYlI8RADGZ7agT@6_JE~G}m`l>%k8T
zyBtD=O&P2vh&P-xW4$D87ZZBGDRzxHJ<k4?p1Y6YKc$@+(Ui61@t0*uEM5`%zktOb
zUHB97FErWgb`^^sYa!5^E_&iQvDsXJu^llF)ZDtl>K)Af&-lM&eL>~Qe8PLi89%r|
zoAtd>dz`lzC<zST$9z_Qi*;4Lvby4|zbE;w`(*J)A^$jILzB9R@z}qQvHW{1{wMf0
z+mEdODq0JiH8?McW&A)_J5Sw%wHu1WdDx5Jee4?A=_#JquQvmp$^hOEPaosH0i@vm
q6}u1M1B6!<vBL8T5}xCTwm~n(5xoTYawI?mGs=ZVApVhP{qYaZeDFyC

literal 4286
zcmcIoS#wlH6uuNz`QU?=4?bZPkN6K1P!=E5Dg}yCv@~H!hzSA05<)Twsf4WnDFsA8
zL6#D*B3lVYFoY!#EI<&D#3U$WCPOC6?EBoAyL_HAGZ&`kCS<Adq`v9y)8~9&chBv<
zJ&~j_^f!LI#Gg{#OOo`8BuNtp<dUWm*q=1&d-;VFQjVcN0Z4@B2one;gkK2{2{OSj
zuCtH(IEG_6XJ~;zA~-kAF^S6W2v&kZ7|J-tO5hyM9nm-_o^=`H2wxD~gwY!3G6!=d
zc?X$p(rv_0Ig#)?K_{3k9tFJJfc+lL^fu7b1_YgenlQ(vIGBq$2OWdaN98oaBZ6o;
z4aMCB{n}w@2MVEm`98D_Z$Vo>3EHOV(00s*_LBvAOCt~sh`Fg2b27JS42F+N9-~=1
z7KV29Fx0O;gtBHLl&aUMd;>}~)eUf){k2n|?kk4gK~vT=q7#g{P3u5D9@DD?UMInH
zzYA*JIwaP-jYQ>CDyKgiRnsVL3KAP;(3tD!iH!?<)L;$P%KXm9Qk$O>!SsL|$`7@O
zTi!vu@?FAv!-s|9t3QC+e2UgV6?mz^TCAD;E~uPL5TA1;fyBvOkjrO4u9zjFd?sS-
zubd6JdJbgEEW}n15LYo1a?K}D|GGx>g0U8BvObT4_o`s(ook3z<siEHV?@g{uzC(+
z8;g)Qa}a9Fb!d-Tp#E_I@k5&_K9}O>i1B3~LEcsd-AnsJG}dJ8*9e`NU3xTv*zS#p
zl;$8(Huou3<wD-K1zNY2c2(BaOvItwZbo!N2_h6H=H(#Ka57VZ>#WJz%Lu}`rnKBe
zxS|;0(gK86r4U+~kLb=#&^;~+AKa9Cw-BycO1TTcIgD`mBFIPf0`bfvJE_Uq_1SE(
z<8=rwFGg_Xk|zjNtc22fKReXiradR0I);#?6p`&)A)h`8wf%4C;gEUFQrZtQNpx98
z`0H;FShfOz6{RUqJ+k{-aNlrD^ZB6KY|x{0PCnaMTOieZegxNUg|EZ{|FX&?d`m5e
z{dVcuOrz@+w3$Nl`r)tH4)2m$cuUr%uyift=3Apv7-5#?3BXsq2cE^7;aRdJ1**%<
zcSguG>~LWXG;a{zHT&UOv<>d!?MZMw+VH>3pS8v3FB*q$^9eW$cfq-6PYP7`?>Y-T
zp$>ae!wh6?asSb|5;$}f{RQ8nzwkgB`{7)E81astp=mW8%4087cL=&-djDnTv$pB{
ziQVW#U(t`~D>#b2&(m0V1l}E&p#@^u96~$Z)(cm~&v02z!?*JaLiMeXTYI7TO?#2g
zJk~ayzgkd+d;JCU<Q+%v!V>~~dv8K@MFh=cgXS%_IpL}~pUmsYKThQ_aM@dQ3gL4d
z**V7fJK*~#eAx;|K|LIKzrc~72G{e>puf5ap@vSxA9#?k`XS$U!hf_Cy(JBBEI9Kt
zp7W^PUw#paBbcpkynpx|_$EPk|LQRXp56EGcwPg#7n~O{pM9iNcoB}pmuQ@g=;pYj
zKQoqm`HcuQc4cd`7Hb;se_jLA{UhNBqp#*q*mIlkc>WbL=8?}pR==J7<ntZ<m(Fd|
zzIk&0;7d??9DFA--M`{pG=_Dp=*qc)u3W<0VIb!^?0Gjy+X^je(iZMt8Tveq0q>uR
zI}Xo5JM2aGVf*whY@ZQwvcNv>Bfq1p4WY{}IxkH7?@?MKIp^dBF#VBU1NKiRaGYSe
zO3(K{5x5WbpnKIr*z!AIo!1U)ZaZxA+tF3@06jIG@YlPbI8Ap>=3-9fHfbB<F#4$E
zb>MZ<38K-IRIfr~i6L?~jPQ*RqAd}`?J~3ob()Pin9FqUHgq#fic5}<%5j9P1P@`f
z#<|SFT!YR#Q{Skk<N3GaWCC5DU?m9mG-?lI9AhPL4(Bq5K|A7-bJHArPV#T-vjqMw
zGrwf6vyb~YhGU1Ni`p^JC8<W0q$z$$dXZt1r01I?X>2Y1>wqDR(v18j;<6E^!OvQ(
H$=d$`Qta5C

diff --git a/src/api/games.js b/src/api/games.js
index fe8b415..1b87fe1 100644
--- a/src/api/games.js
+++ b/src/api/games.js
@@ -10,3 +10,31 @@ export function gamesUpdateApi(data) {
         data
     })
 }
+
+
+/**
+ * 抽奖记录
+ * @param data
+ * @returns {AxiosPromise}
+ */
+
+export function gamesListApi(params) {
+  return request({
+    url: 'admin/game/prize/records',
+    method: 'GET',
+    params
+  })
+}
+/**
+ * 茶树购买记录
+ * @param data
+ * @returns {AxiosPromise}
+ */
+
+export function gamesTreeListApi(params) {
+  return request({
+    url: 'admin/game/tree/order',
+    method: 'GET',
+    params
+  })
+}
diff --git a/src/router/index.js b/src/router/index.js
index 05b0dfa..9d98bb0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -146,7 +146,7 @@ export const asyncRoutes = [
 
 const createRouter = () => new Router({
   // mode: 'history', // require service support
-  mode: 'history',
+  mode: 'hash',
   scrollBehavior: () => ({ y: 0 }),
   routes: constantRoutes
 })
diff --git a/src/router/modules/marketing.js b/src/router/modules/marketing.js
index 51b409d..805a4ca 100644
--- a/src/router/modules/marketing.js
+++ b/src/router/modules/marketing.js
@@ -54,17 +54,18 @@ const marketingRouter = {
     },
     {
       path: 'lottery',
-      component: () => import('@/views/marketing/lottery/config/index'),
+      component: () => import('@/views/marketing/lottery/index'),
       name: 'lottery',
-      meta: { title: '游戏管理', icon: '' },
+      meta: { title: '茶株管理', icon: '' },
       children: [
         {
-          path: 'config',
+          path: 'lotteryConfig',
           component: () => import('@/views/marketing/lottery/config/index'),
-          name: 'config',
+          name: 'lotteryConfig',
           meta: { title: '茶株认领', icon: '' }
         },
 
+
       ]
     },
     {
@@ -79,6 +80,12 @@ const marketingRouter = {
           name: 'config',
           meta: { title: '抽奖配置', icon: '' }
         },
+        {
+          path: 'rafflelog',
+          component: () => import('@/views/marketing/raffle/rafflelog/index'),
+          name: 'rafflelog',
+          meta: { title: '抽奖记录', icon: '' }
+        },
       ]
     },
     {
@@ -198,12 +205,24 @@ const marketingRouter = {
           name: 'ActivityList',
           meta: { title: '活动管理', icon: '' }
         },
+        {
+          path: 'activityLog',
+          component: () => import('@/views/marketing/activity/activityLog/index'),
+          name: 'activityLog',
+          meta: { title: '预约记录', icon: '' }
+        },
         {
           path: 'venueReservation',
           component: () => import('@/views/marketing/activity/venueReservation/index'),
           name: 'VenueReservation',
           meta: { title: '场地预约', icon: '' }
         },
+        {
+          path: 'lotteryLog',
+          component: () => import('@/views/marketing/activity/lotteryLog/index'),
+          name: 'lotteryLog',
+          meta: { title: '认领记录', icon: '' }
+        },
       ]
     },
   ]
diff --git a/src/views/content/video/index.vue b/src/views/content/video/index.vue
index 2cd63ed..5aba7e8 100644
--- a/src/views/content/video/index.vue
+++ b/src/views/content/video/index.vue
@@ -7,8 +7,6 @@
       <el-form-item>
         <el-button @click="getDataList()">查询</el-button>
         <el-button v-hasPermi="['admin:video:save']" type="primary" @click="addOrUpdateHandle()">新增视频鉴赏</el-button>
-        <el-button v-hasPermi="['admin:video:delete']" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>
-
       </el-form-item>
     </el-form>
     <el-table
@@ -16,12 +14,6 @@
       v-loading="dataListLoading"
       @selection-change="selectionChangeHandle"
       style="width: 100%;">
-      <el-table-column
-        type="selection"
-        header-align="center"
-        align="center"
-        width="50">
-      </el-table-column>
       <el-table-column
         prop="id"
         header-align="center"
@@ -127,6 +119,20 @@
         align="center"
         label="排序">
       </el-table-column>
+
+      <el-table-column
+        prop="visit"
+        header-align="center"
+        align="center"
+        label="是否关联商品">
+        <template slot-scope="scope">
+          <router-link v-if="scope.row.productId" :to="{path: '/store/list/creatProduct/' + scope.row.productId + '/1'}">
+            <el-link type="primary" >是</el-link>
+          </router-link>
+          <span v-else>否</span>
+        </template>
+      </el-table-column>
+
       <el-table-column
         prop="createTime"
         header-align="center"
@@ -163,15 +169,13 @@
       :visible.sync="videoVisible"
       width="30%"
      >
-      <video width="500" height="300" :src="videoPath.imageInput"  autoplay="autoplay" type="video/mp4"></video>
-
+      <video width="500" height="300" :src="videoPath.imageInput"  autoplay="autoplay" type="video/mp4" controls></video>
       <span slot="footer" class="dialog-footer">
     <el-button type="primary" @click="videoVisible = false">确 定</el-button>
   </span>
     </el-dialog>
   </div>
 </template>
-
 <script>
 
 import AddOrUpdate from '@/views/content/video/video-add-and-update.vue'
@@ -179,10 +183,7 @@ import {videoDeleteApi, videoListApi, videoUpdateApi} from "@/api/video";
 import video from "@/views/content/video/index.vue";
 export default {
   computed: {
-    video() {
-      return video
-    }
-  },
+    video() {return video}},
   data () {
     return {
       videoVisible:false,
diff --git a/src/views/content/video/video-add-and-update.vue b/src/views/content/video/video-add-and-update.vue
index 960926d..568785a 100644
--- a/src/views/content/video/video-add-and-update.vue
+++ b/src/views/content/video/video-add-and-update.vue
@@ -3,6 +3,7 @@
   <el-dialog
     :title="!dataForm.id ? '添加' : '修改'"
     :close-on-click-modal="false"
+    :before-close="handleClose"
     :visible.sync="visible">
     <!-- 新增和创建表单表单 -->
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataSubmit()" label-width="100px">
@@ -16,43 +17,40 @@
       <!--      <el-input v-model="dataForm.authorType" placeholder="作者类型：1管理员，2游客"></el-input>-->
       <!--    </el-form-item>-->
       <el-form-item label="上传视频" prop="imageInput">
-        <div class="upLoadPicBox" @click="modalPicTap('1')" >
-          <div v-if="dataForm.imageInput" class="pictrue">
-            <video  style="width: 50px;height: 50px" :src="dataForm.imageInput"></video>
-          </div>
-          <div v-else class="upLoad">
-            <i class="el-icon-camera cameraIconfont"/>
-          </div>
-        </div>
+       <div style="width: 300px;height: 300px">
+         <div class="upLoadPicBox" @click="modalPicTap('1')" >
+           <div v-if="dataForm.imageInput" class="pictrue">
+             <video   width="300" height="300"  :src="dataForm.imageInput" type="video/mp4" autoplay="false" controls> </video>
+           </div>
+           <div v-else class="upLoad">
+             <i class="el-icon-camera cameraIconfont"/>
+           </div>
+         </div>
+       </div>
       </el-form-item>
       <el-form-item label="视频简介" prop="synopsis">
         <el-input v-model="dataForm.synopsis" placeholder="视频简介"></el-input>
       </el-form-item>
-      <!--    <el-form-item label="视频分享标题" prop="shareTitle">-->
-      <!--      <el-input v-model="dataForm.shareTitle" placeholder="视频分享标题"></el-input>-->
-      <!--    </el-form-item>-->
-      <!--    <el-form-item label="视频分享简介" prop="shareSynopsis">-->
-      <!--      <el-input v-model="dataForm.shareSynopsis" placeholder="视频分享简介"></el-input>-->
-      <!--    </el-form-item>-->
 
 
-      <!--    <el-form-item label="原文链接" prop="url">-->
-      <!--      <el-input v-model="dataForm.url" placeholder="原文链接"></el-input>-->
-      <!--    </el-form-item>-->
-<!--      <el-form-item label="是否隐藏" prop="hide">-->
-<!--        <el-select v-model="dataForm.hide" placeholder="是否隐藏">-->
-<!--          <el-option label="是" :value=1></el-option>-->
-<!--          <el-option label="否" :value=0></el-option>-->
-<!--        </el-select>-->
-<!--      </el-form-item>-->
-
       <el-form-item label="详细内容" prop="content">
         <Tinymce v-model="dataForm.content"></Tinymce>
       </el-form-item>
 
-      <el-form-item label="商品关联" prop="productId">
-        <el-button v-if="dataForm.productId === undefined  "  type="primary" round  size="small" @click="store()">点击关联商品</el-button>
-        <span v-else>商品编号：{{dataForm.productId}},商品名称：{{dataForm.storeName}}</span>
+      <el-form-item label="关联商品" prop="productId">
+        <el-button v-if="storeList.length == 0"  type="primary" round  size="small" @click="store()">点击关联商品</el-button>
+        <el-table
+          v-else
+          :data="storeList"
+          style="width: 100%">
+
+          <el-table-column prop="id" label="商品编号" width="80">
+          </el-table-column>
+          <el-table-column prop="storeName" label="商品名称"></el-table-column>
+          <el-table-column   width="80"  label="操作">
+            <el-button type="text" size="small" @click="del">移除</el-button>
+          </el-table-column>
+        </el-table>
       </el-form-item>
       <el-form-item label="是否热门" prop="isHot">
         <el-switch
@@ -161,11 +159,12 @@
 <script>
 import Tinymce from '@/components/Tinymce/index'
 import {videoCreateApi, videoDetailApi, videoUpdateApi} from "@/api/video";
-import {productLstApi} from "@/api/store";
+import {productDetailApi, productLstApi} from "@/api/store";
 export default {
   components: {Tinymce },
   data() {
     return {
+      storeList:[],
       tableData: {
         data: [],
         total: 0
@@ -179,43 +178,32 @@ export default {
       },
       storeVisible: false,
       visible: false,
-      dataForm: {},
+      dataForm: {
+        title:"",
+        imageInput:"",
+        synopsis:"",
+        content:"",
+        sort:1,
+        isHot:false,
+        isBanner:false,
+        hide:false,
+      },
       dataRule: {
         title: [
-          {required: true, message: '视频标题  为必填项', trigger: 'blur'}
-        ],
-        author: [
-          {required: true, message: '视频作者  为必填项', trigger: 'blur'}
-        ],
-        authorType: [
-          {required: true, message: '作者类型：1管理员，2游客  为必填项', trigger: 'blur'}
+          {required: true, message: '视频标题不能为空', trigger: 'blur'}
         ],
         imageInput: [
-          {required: true, message: '视频图片  为必填项', trigger: 'blur'}
+          {required: true, message: '视频封面图片不能为空', trigger: 'blur'}
         ],
         synopsis: [
-          {required: true, message: '视频简介  为必填项', trigger: 'blur'}
+          {required: true, message: '视频简介不能为空', trigger: 'blur'}
         ],
-        shareTitle: [
-          {required: true, message: '视频分享标题  为必填项', trigger: 'blur'}
-        ],
-        shareSynopsis: [
-          {required: true, message: '视频分享简介  为必填项', trigger: 'blur'}
-        ],
-
         sort: [
-          {required: true, message: '排序  为必填项', trigger: 'blur'}
-        ],
-        url: [
-          {required: true, message: '原文链接  为必填项', trigger: 'blur'}
-        ],
-        status: [
-          {required: true, message: '状态  为必填项', trigger: 'blur'}
+          {required: true, message: '排序  不能为空', trigger: 'blur'}
         ],
         hide: [
           {required: true, message: '是否隐藏为必填项', trigger: 'blur'}
         ],
-
         isHot: [
           {required: true, message: '是否热门为必填项', trigger: 'blur'}
         ],
@@ -225,20 +213,36 @@ export default {
         content: [
           {required: true, message: '视频详细内容  为必填项', trigger: 'blur'}
         ],
-
       }
     }
   },
   methods: {
-    delStore(){
-      this.dataForm.productId = undefined
-      this.$message.success("关联商品已经删除！");
-
+    del(){
+      this.storeList = []
+      this.dataForm.productId = ""
     },
+    handleClose(done) {
+      this.$confirm('确认关闭？')
+        .then(_ => {
+          done()
+          this.storeList = []
+          this.tableFrom = {
+            title:"",
+            imageInput:"",
+            synopsis:"",
+            content:"",
+            sort:1,
+            isHot:false,
+            isBanner:false,
+            hide:false,
+          }
+        })
+        .catch(_ => {
+        });
+    },
+    //选中
     handleSave(row){
-      this.dataForm.productId = row.id
-      this.dataForm.storeName = row.storeName
-      console.log(row)
+      this.storeList.push(row)
       this.storeVisible = false
     },
     store(){
@@ -264,6 +268,7 @@ export default {
     modalPicTap(tit, num, i, status) {
       const _this = this;
       this.$modalUpload(function (img) {
+
         if (tit === '1' && !num) {
           _this.dataForm.imageInput = img[0].sattDir
         }
@@ -276,6 +281,12 @@ export default {
         this.$refs['dataForm'].resetFields()
         if (this.dataForm.id) {
           videoDetailApi({id:id}).then(res => {
+            //查看详情
+            if (res.productId){
+              productDetailApi(res.productId).then(res =>{
+                this.storeList.push(res)
+              })
+            }
             this.dataForm = res;
           })
         }
@@ -285,6 +296,9 @@ export default {
     dataSubmit() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
+          if (this.storeList.length > 0){
+            this.dataForm.productId = this.storeList[0].id
+          }
           if (this.dataForm.id){
             videoUpdateApi(this.dataForm).then(res => {
               this.visible = false
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index e28e4e1..131b6f8 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -126,8 +126,8 @@ export default {
         }
       },
       loginForm: {
-        account: 'admin', // admin
-        pwd: '123456',
+        account: '',
+        pwd: '',
         key: '',
         code: '',
         wxCode: ''
diff --git a/src/views/marketing/activity/activityLog/index.vue b/src/views/marketing/activity/activityLog/index.vue
new file mode 100644
index 0000000..b0d3bb9
--- /dev/null
+++ b/src/views/marketing/activity/activityLog/index.vue
@@ -0,0 +1,173 @@
+<template>
+  <div class="divBox">
+    <el-card class="box-card">
+      <div  class="clearfix">
+        <div class="container">
+          <el-form size="small" label-width="100px" >
+            <el-form-item label="手机号：" class="width100">
+              <el-input v-model="tableFrom.account" placeholder="请输入订单号" class="selWidth" size="small" clearable>
+                <el-button slot="append" icon="el-icon-search" size="small" @click="seachList" />
+              </el-input>
+            </el-form-item>
+
+            <el-form-item label="奖品名：" class="width100">
+              <el-input v-model="tableFrom.productName" placeholder="请输入奖品名" class="selWidth" size="small" clearable>
+                <el-button slot="append" icon="el-icon-search" size="small" @click="seachList" />
+              </el-input>
+            </el-form-item>
+
+          </el-form>
+        </div>
+      </div>
+    </el-card>
+    <div class="mt20"></div>
+    <el-table
+      v-loading="dataListLoading"
+      :data="dataList"
+      style="width: 100%;">
+      <el-table-column
+        prop="account"
+        header-align="center"
+        align="center"
+        label="获奖人手机">
+      </el-table-column>
+      <el-table-column
+        width="150"
+        prop="avatar"
+        header-align="center"
+        align="center"
+        label="获奖人头像">
+        <template slot-scope="scope">
+          <div class="demo-image__preview">
+            <el-image
+              style="width: 36px; height: 36px"
+              :src="scope.row.avatar"
+              :preview-src-list="[scope.row.avatar]"
+            />
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="productImage"
+        header-align="center"
+        align="center"
+        label="奖品图">
+        <template slot-scope="scope">
+          <div class="demo-image__preview">
+            <el-image
+              style="width: 36px; height: 36px"
+              :src="scope.row.productImage"
+              :preview-src-list="[scope.row.productImage]"
+            />
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        width="180"
+        prop="productName"
+        header-align="center"
+        align="center"
+        label="奖品名">
+      </el-table-column>
+      <el-table-column
+        prop="productPrice"
+        header-align="center"
+        align="center"
+        label="奖品价值">
+      </el-table-column>
+      <el-table-column
+        width="180"
+        prop="productNum"
+        header-align="center"
+        align="center"
+        label="奖品份数">
+      </el-table-column>
+      <el-table-column
+        width="180"
+        prop="createTime"
+        header-align="center"
+        align="center"
+        label="抽奖时间">
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="tableFrom.page"
+      :page-sizes="[10, 20, 50, 100]"
+      :page-size="tableFrom.limit"
+      :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+
+  </div>
+</template>
+<script>
+import {
+  activityDeleteApi,
+  activityListApi,
+  activityLogListApi,
+  activityPlaceListApi, activityPlaceUpdateApi,
+  ebactivityUpdateApi
+} from "@/api/activity"
+import AddOrUpdate from "@/views/marketing/activity/activityList/activity-add-and-update.vue"
+import {gamesListApi, gamesUpdateApi} from "@/api/games";
+
+export default {
+  data() {
+    return {
+      dataList:[],
+
+      tableFrom:{
+        page: 1,
+        limit: 20,
+        keywords: '',
+      }
+    }
+  },
+  components: {
+  },
+  mounted() {
+    this.getDataList()
+  },
+
+  methods: {
+    seachList() {
+      this.tableFrom.page = 1
+      this.getDataList()
+
+    },
+
+    mobile(row){
+      this.mobileVisible = true
+      this.mobileFrom = row
+    },
+
+    getDataList(){
+      this.dataListLoading = true
+      gamesListApi(this.tableFrom).then(res =>{
+        console.log(res)
+        this.dataList = res.list
+        this.totalPage = res.total
+        this.tableFrom.limit = res.total
+        this.tableFrom.page = res.page
+        this.dataListLoading = false
+      })
+    },
+    sizeChangeHandle(val) {
+      this.tableFrom.limit = val
+      this.getDataList()
+    },
+    currentChangeHandle(page) {
+      this.tableFrom.page = page
+      this.getDataList()
+    },
+
+  }
+
+}
+</script>
+
+<style lang="sass" scoped>
+
+</style>
diff --git a/src/views/marketing/activity/lotteryLog/index.vue b/src/views/marketing/activity/lotteryLog/index.vue
new file mode 100644
index 0000000..d90c58f
--- /dev/null
+++ b/src/views/marketing/activity/lotteryLog/index.vue
@@ -0,0 +1,218 @@
+<!--茶株记录-->
+<template>
+  <div class="divBox">
+    <el-card class="box-card">
+      <div class="clearfix">
+        <div class="container">
+          <el-form size="small" label-width="100px">
+            <el-form-item label="手机号：" class="width100">
+              <el-input v-model="tableFrom.account" placeholder="请输入手机号" class="selWidth" size="small" clearable>
+                <el-button slot="append" icon="el-icon-search" size="small" @click="seachList"/>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="订单号：" class="width100">
+              <el-input v-model="tableFrom.orderNo" placeholder="请输入订单号" class="selWidth" size="small" clearable>
+                <el-button slot="append" icon="el-icon-search" size="small" @click="seachList"/>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="购买时间：" class="width100">
+              <el-date-picker v-model="timeVal" value-format="yyyy-MM-dd" format="yyyy-MM-dd" size="small"
+                              type="daterange" placement="bottom-end" placeholder="自定义时间" style="width: 220px;"
+                              @change="onchangeTime"/>
+            </el-form-item>
+
+            <el-form-item label="订单状态：" class="width100">
+              <el-radio-group v-model="tableFrom.payStatus" type="button" @change="seachList">
+                <el-radio-button label="">全部</el-radio-button>
+                <el-radio-button :label=0>未支付</el-radio-button>
+                <el-radio-button :label=1>已支付</el-radio-button>
+              </el-radio-group>
+            </el-form-item>
+          </el-form>
+        </div>
+      </div>
+    </el-card>
+    <div class="mt20"></div>
+    <el-table
+      v-loading="dataListLoading"
+      :data="dataList"
+      style="width: 100%;">
+      <el-table-column
+        width="260"
+        prop="orderId"
+        header-align="center"
+        align="center"
+        label="订单号">
+      </el-table-column>
+      <el-table-column
+        prop="account"
+        header-align="center"
+        align="center"
+        label="获奖人手机">
+      </el-table-column>
+      <el-table-column
+
+        prop="avatar"
+        header-align="center"
+        align="center"
+        label="获奖人头像">
+        <template slot-scope="scope">
+          <div class="demo-image__preview">
+            <el-image
+              style="width: 36px; height: 36px"
+              :src="scope.row.avatar"
+              :preview-src-list="[scope.row.avatar]"
+            />
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="productImage"
+        header-align="center"
+        align="center"
+        label="奖品图">
+        <template slot-scope="scope">
+          <div class="demo-image__preview">
+            <el-image
+              style="width: 36px; height: 36px"
+              :src="scope.row.productImage"
+              :preview-src-list="[scope.row.productImage]"
+            />
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="productName"
+        header-align="center"
+        align="center"
+        label="茶株名称">
+      </el-table-column>
+      <el-table-column
+
+        prop="buyNum"
+        header-align="center"
+        align="center"
+        label="购买件数">
+      </el-table-column>
+      <el-table-column
+        prop="payPrice"
+        header-align="center"
+        align="center"
+        label="支付金额">
+      </el-table-column>
+      <el-table-column
+        width="180"
+        prop="createTime"
+        header-align="center"
+        align="center"
+        label="购买时间">
+      </el-table-column>
+      <el-table-column
+
+        width="180"
+        prop="payStatus"
+        header-align="center"
+        align="center"
+        label="支付状态">
+        <template slot-scope="scope">
+          <span v-if="scope.row.payStatus ===0">待支付</span>
+          <span v-if="scope.row.payStatus ===1">已支付</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        width="180"
+        prop="payTime"
+        header-align="center"
+        align="center"
+        label="付款时间">
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="tableFrom.page"
+      :page-sizes="[10, 20, 50, 100]"
+      :page-size="tableFrom.limit"
+      :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+
+  </div>
+</template>
+<script>
+import {
+  activityDeleteApi,
+  activityListApi,
+  activityLogListApi,
+  activityPlaceListApi, activityPlaceUpdateApi,
+  ebactivityUpdateApi
+} from "@/api/activity"
+import AddOrUpdate from "@/views/marketing/activity/activityList/activity-add-and-update.vue"
+import {gamesListApi, gamesTreeListApi, gamesUpdateApi} from "@/api/games";
+
+export default {
+  data() {
+    return {
+      dataList: [],
+      tableFrom: {
+        page: 1,
+        limit: 20,
+        account: "",
+        orderNo: "",
+        payStatus: "",
+      },
+      timeVal: [],
+    }
+  },
+  components: {},
+  mounted() {
+    this.getDataList()
+  },
+
+  methods: {
+    onchangeTime (e) {
+      this.timeVal = e;
+      this.tableFrom.beginDate =  this.timeVal[0]
+      this.tableFrom.endDate =  this.timeVal[1]
+      this.tableFrom.page = 1
+      this.getDataList();
+    },
+    seachList() {
+      this.tableFrom.page = 1
+      this.getDataList()
+
+    },
+
+    mobile(row) {
+      this.mobileVisible = true
+      this.mobileFrom = row
+    },
+
+    getDataList() {
+      this.dataListLoading = true
+      gamesTreeListApi(this.tableFrom).then(res => {
+        console.log(res)
+        this.dataList = res.list
+        this.totalPage = res.total
+        this.tableFrom.limit = res.total
+        this.tableFrom.page = res.page
+        this.dataListLoading = false
+      })
+    },
+    sizeChangeHandle(val) {
+      this.tableFrom.limit = val
+      this.getDataList()
+    },
+    currentChangeHandle(page) {
+      this.tableFrom.page = page
+      this.getDataList()
+    },
+
+  }
+
+}
+</script>
+
+<style lang="sass" scoped>
+
+</style>
diff --git a/src/views/marketing/raffle/rafflelog/index.vue b/src/views/marketing/raffle/rafflelog/index.vue
new file mode 100644
index 0000000..417660c
--- /dev/null
+++ b/src/views/marketing/raffle/rafflelog/index.vue
@@ -0,0 +1,292 @@
+<template>
+  <div class="divBox">
+    <el-card class="box-card">
+      <div  class="clearfix">
+        <div class="container">
+          <el-form size="small" label-width="100px" >
+<!--            <el-form-item label="预约状态：">-->
+<!--              <el-radio-group v-model="tableFrom.status" type="button" @change="seachList">-->
+<!--                <el-radio-button label="all">全部</el-radio-button>-->
+<!--                <el-radio-button label="unPaid">待确认 </el-radio-button>-->
+<!--                <el-radio-button label="unPaid">预约成功 </el-radio-button>-->
+<!--                <el-radio-button label="unPaid">预约取消 </el-radio-button>-->
+<!--              </el-radio-group>-->
+<!--            </el-form-item>-->
+            <el-form-item label="预约人：" class="width100">
+              <el-input v-model="tableFrom.keywords" placeholder="请输入预约人" class="selWidth" size="small" clearable>
+                <el-button slot="append" icon="el-icon-search" size="small" @click="seachList" />
+              </el-input>
+            </el-form-item>
+
+            <el-form-item label="手机号：" class="width100">
+              <el-input v-model="tableFrom.keywords" placeholder="请输入订单号" class="selWidth" size="small" clearable>
+                <el-button slot="append" icon="el-icon-search" size="small" @click="seachList" />
+              </el-input>
+            </el-form-item>
+
+          </el-form>
+        </div>
+      </div>
+    </el-card>
+    <div class="mt20">
+      <!-- <cards-data :cardLists="cardLists" v-if="checkPermi(['admin:order:list:data'])"></cards-data> -->
+    </div>
+    <el-table
+      v-loading="dataListLoading"
+      :data="dataList"
+      style="width: 100%;">
+      <el-table-column
+        width="80"
+        prop="id"
+        header-align="center"
+        align="center"
+        label="预约编号111111">
+      </el-table-column>  <el-table-column
+        width="150"
+        prop="userName"
+        header-align="center"
+        align="center"
+        label="预约人">
+      </el-table-column>
+      <el-table-column
+        prop="cellPhone"
+        header-align="center"
+        align="center"
+        label="预约手机号">
+      </el-table-column>
+      <el-table-column
+        width="180"
+        prop="createDate"
+        header-align="center"
+        align="center"
+        label="报名时间">
+      </el-table-column>
+      <el-table-column
+        prop="attendNum"
+        header-align="center"
+        align="center"
+        label="参与人数">
+      </el-table-column>
+      <el-table-column
+        width="180"
+        prop="subscribeDate"
+        header-align="center"
+        align="center"
+        label="预约指定日期">
+      </el-table-column>
+
+      <el-table-column
+        prop="remark"
+        header-align="center"
+        align="center"
+        label="备注">
+      </el-table-column>
+      <el-table-column
+        prop="registerStatus"
+        header-align="center"
+        align="center"
+        label="预约状态">
+
+        <template slot-scope="scope">
+          <div class="demo-image__preview">
+            <el-tag v-if="scope.row.status == 0">待确认</el-tag>
+            <el-tag type="success"  v-else-if="scope.row.status ==1">预约成功</el-tag>
+            <el-tag type="danger" v-else-if="scope.row.status ==2">预约取消</el-tag>
+            <el-tag v-else>类型错误</el-tag>
+          </div>
+        </template>
+
+      </el-table-column>
+      <el-table-column
+        width="180"
+        prop="cancelData"
+        header-align="center"
+        align="center"
+        label="取消时间">
+
+        <template slot-scope="scope">
+          <div class="demo-image__preview">
+            <span v-if="scope.row.cancelData  === null"> - </span>
+            <span v-else>{{ scope.row.cancelData }}</span>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="cancelReason"
+        header-align="center"
+        align="center"
+        label="取消原因">
+        <template slot-scope="scope">
+          <div class="demo-image__preview">
+            <span v-if="scope.row.cancelReason === null"> - </span>
+            <span v-else>{{ scope.row.cancelReason }}</span>
+          </div>
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        fixed="right"
+        header-align="center"
+        align="center"
+        width="150"
+        label="操作">
+        <template slot-scope="scope">
+                      <el-button v-if="scope.row.status == 0" type="text" size="small" @click="mobile(scope.row)">电话联系</el-button>
+          <!--            <el-button v-hasPermi="['admin:activity:update']" type="text" size="small"-->
+          <!--                       @click="activityLog(scope.row.id)">预约记录-->
+          <!--            </el-button>-->
+          <!--            <el-button v-hasPermi="['admin:activity:delete']" type="text" size="small"-->
+          <!--                       @click="deleteHandle(scope.row.id)">删除-->
+          <!--            </el-button>-->
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="tableFrom.page"
+      :page-sizes="[10, 20, 50, 100]"
+      :page-size="tableFrom.limit"
+      :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+
+<!--    <el-dialog-->
+<!--      title="电话联系"-->
+<!--      :close-on-click-modal="false"-->
+<!--      :visible.sync="mobileVisible"-->
+<!--      width="30%"-->
+<!--      center-->
+<!--    >-->
+
+<!--     <div style="width: 100%">-->
+<!--       <div style="text-align: center;font-size: 26px;font-weight: 700">预约人：{{this.mobileFrom.userName}}</div>-->
+<!--       <div style="text-align: center;font-size: 26px;font-weight: 700">联系方式：{{this.mobileFrom.cellPhone}}</div>-->
+<!--     </div>-->
+<!--      <span slot="footer" class="dialog-footer">-->
+<!--    <el-button type="primary" @click="userok" >确认预约</el-button>-->
+<!--    <el-button type="primary"  @click="usererror">取消预约</el-button>-->
+<!--  </span>-->
+<!--    </el-dialog>-->
+
+    <el-dialog title="电话联系" :visible.sync="mobileVisible" center>
+      <div style="width: 100%">
+        <div style="text-align: center;font-size: 26px;font-weight: 700">预约人：{{this.mobileFrom.userName}}</div>
+        <div style="text-align: center;font-size: 26px;font-weight: 700">联系方式：{{this.mobileFrom.cellPhone}}</div>
+      </div>
+
+      <el-dialog
+        width="30%"
+        title="取消原因"
+        :visible.sync="innerVisible"
+        append-to-body>
+        <el-input
+          type="textarea"
+          placeholder="请输入内容"
+          v-model="mobileFrom.cancelReason"
+          maxlength="30"
+          show-word-limit
+        >
+        </el-input>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="usererror">确定取消</el-button>
+        </div>
+
+      </el-dialog>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="userok" >确认预约</el-button>
+        <el-button type="primary" @click="innerVisible = true">取消预约</el-button>
+      </div>
+    </el-dialog>
+
+
+  </div>
+</template>
+<script>
+import {
+  activityDeleteApi,
+  activityListApi,
+  activityLogListApi,
+  activityPlaceListApi, activityPlaceUpdateApi,
+  ebactivityUpdateApi
+} from "@/api/activity"
+import AddOrUpdate from "@/views/marketing/activity/activityList/activity-add-and-update.vue"
+
+export default {
+  data() {
+    return {
+      dataListLoading: false,
+      innerVisible: false,
+      mobileVisible: false,
+      dataList:[],
+      mobileFrom:{},
+      tableFrom:{
+        page: 1,
+        limit: 20,
+        keywords: '',
+      }
+    }
+  },
+  components: {
+
+  },
+  mounted() {
+    this.getDataList()
+  },
+
+  methods: {
+    seachList() {
+      this.tableFrom.page = 1
+      this.getDataList()
+
+    },
+    userok(){
+      this.mobileFrom.status = 1
+      activityPlaceUpdateApi(this.mobileFrom).then(res =>{
+        this.$message.success('预约成功！')
+        this.mobileVisible = false
+        this.getDataList()
+      })
+    },
+    usererror(){
+      this.mobileFrom.status = 2
+      activityPlaceUpdateApi(this.mobileFrom).then(res =>{
+        this.$message.success('取消成功！')
+        this.mobileVisible = false
+        this.innerVisible = false
+        this.getDataList()
+      })
+    },
+    mobile(row){
+      this.mobileVisible = true
+      this.mobileFrom = row
+    },
+
+    getDataList(){
+      this.dataListLoading = true
+      activityPlaceListApi(this.tableFrom).then(res =>{
+        console.log(res)
+        this.dataList = res.list
+        this.totalPage = res.total
+        this.tableFrom.limit = res.total
+        this.tableFrom.page = res.page
+        this.dataListLoading = false
+      })
+    },
+    sizeChangeHandle(val) {
+      this.tableFrom.limit = val
+      this.getDataList()
+    },
+    currentChangeHandle(page) {
+      this.tableFrom.page = page
+      this.getDataList()
+    },
+
+  }
+
+}
+</script>
+
+<style lang="sass" scoped>
+
+</style>