From e79d98d623d73d2e56b96e858c5068e8e2989ab7 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 2 Nov 2022 16:11:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/activitiesAdd.vue              | 17 +++++----
 .../components/activitiesList.vue             | 36 ++++++++++++++++++-
 2 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/project/tianfuxing/AppActivitiesManagement/components/activitiesAdd.vue b/project/tianfuxing/AppActivitiesManagement/components/activitiesAdd.vue
index a7f7649f..9b01aa53 100644
--- a/project/tianfuxing/AppActivitiesManagement/components/activitiesAdd.vue
+++ b/project/tianfuxing/AppActivitiesManagement/components/activitiesAdd.vue
@@ -54,29 +54,29 @@
                   <el-input v-model="form.address" disabled ></el-input>
                 </el-form-item>
 
-                <el-form-item label="打卡范围" prop="clockRange">
-                  <el-input v-model="form.clockRange" placeholder="请输入" >
+                <el-form-item label="打卡范围" prop="clockRange" style="width: 550px">
+                  <el-input type="number" v-model="form.clockRange" placeholder="请输入" >
                     <template slot="append">米</template>
                   </el-input>
                 </el-form-item>
 
                 <el-form-item label="进场打卡时间" prop="intoTime">
-                  <el-date-picker v-model="form.intoTime" type="datetimerange" start-placeholder="开始日期" 
+                  <el-date-picker v-model="form.intoTime" type="datetimerange" start-placeholder="开始日期" :picker-options="timeOption"
                   end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss" :default-time="['00:00:00']"></el-date-picker>
                 </el-form-item>
 
-                <el-form-item label="进场得积分" prop="intoIntegral">
+                <el-form-item label="进场得积分" prop="intoIntegral" style="width: 550px">
                   <el-input v-model="form.intoIntegral" type="number" placeholder="请输入" >
                     <template slot="append">积分</template>
                   </el-input>
                 </el-form-item>
 
                 <el-form-item label="离场打卡时间" prop="exitTime">
-                  <el-date-picker v-model="form.exitTime" type="datetimerange" start-placeholder="开始日期" 
+                  <el-date-picker v-model="form.exitTime" type="datetimerange" start-placeholder="开始日期" :picker-options="timeOption"
                   end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss" :default-time="['00:00:00']"></el-date-picker>
                 </el-form-item>
 
-                <el-form-item label="离场得积分" prop="exitIntegral">
+                <el-form-item label="离场得积分" prop="exitIntegral" style="width: 550px">
                   <el-input v-model="form.exitIntegral" type="number" placeholder="请输入" >
                     <template slot="append">积分</template>
                   </el-input>
@@ -169,6 +169,11 @@ export default {
       },
       showMap: false,
       searchPlace: '',
+      timeOption: {
+        disabledDate(date) {
+          return date.getTime() < Date.now() - 24 * 60 * 60 * 1000
+        }
+      },
     }
   },
   created() {
diff --git a/project/tianfuxing/AppActivitiesManagement/components/activitiesList.vue b/project/tianfuxing/AppActivitiesManagement/components/activitiesList.vue
index b96863f7..23ae674b 100644
--- a/project/tianfuxing/AppActivitiesManagement/components/activitiesList.vue
+++ b/project/tianfuxing/AppActivitiesManagement/components/activitiesList.vue
@@ -8,7 +8,15 @@
             <el-button size="small" type="primary" icon="iconfont iconAdd" @click="toAdd('')" >创建活动</el-button>
           </template>
         </ai-search-bar>
-        <ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size" @getList="getList" :col-configs="colConfigs" :dict="dict">
+        <ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" 
+        :size.sync="page.size" @getList="getList" :col-configs="colConfigs" :dict="dict">
+          <el-table-column slot="qrcode" width="200px" label="二维码" align="center">
+            <template slot-scope="{ row }">
+              <div class="qrcode">
+                <el-button type="text" @click="qrcode(row.qrCode, row.id)">{{ row.qrCode ? '预览' : '生成' }}</el-button>
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column slot="options" label="操作" fixed="right" align="center">
             <template slot-scope="{ row }">
               <el-button type="text" @click.native="toAdd(row.id)">详情</el-button>
@@ -17,6 +25,9 @@
             </template>
           </el-table-column>
         </ai-table>
+        <div class="qrCode" v-viewer="{movable: true}" v-show="false">
+          <img :src="img">
+        </div>
       </template>
     </ai-list>
   </section>
@@ -37,6 +48,8 @@ export default {
         total: 0,
       },
       tableData: [],
+      img: '',
+      isLoading: false,
     }
   },
   created () {
@@ -52,6 +65,7 @@ export default {
         {prop: "intoBegintime", label: "开始结束时间", align: "center", render: (h, {row}) => h('p',{textAlign:'center'},
          `${row.intoBegintime}至${row.exitEndtime}`)},
         {prop: "status", label: "活动状态", align: "center",dict:"activityStatus"},
+        { slot: "qrcode"},
         { slot: "options", },
       ]
     }
@@ -77,6 +91,26 @@ export default {
         }
       })
     },
+    qrcode (qrcode, id) {
+      if (!qrcode) {
+        this.isLoading = true
+        this.instance.post(`/appactivityinfo/generateQrCode?id=${id}&width=400&height=400`).then(res => {
+          if (res.code == 0) {
+            this.$message.success('二维码生成成功！')
+            this.getList()
+          }
+          this.isLoading = false
+        })
+      } else {
+        this.img = qrcode
+        this.$nextTick(() => {
+          setTimeout(() => {
+            const viewer = this.$el.querySelector('.qrCode').$viewer
+            viewer.view()
+          }, 600)
+        })
+      }
+    },
     handleDelete(id) {
       this.$confirm('确定删除该活动？').then(() => {
         this.instance.post(`/appactivityinfo/delete?ids=${id}`).then(res=>{