bug fixes

src/modules/activity/components/FormType.vue

@@ -139,8 +139,7 @@ export default {
         ],
         jump_url: { required: true, message: '请填写跳转链接', trigger: 'blur' },
         shop_id: { required: true, message: '请选择支付平台', trigger: 'change' },
-        skip_pay_title: { required: true, message: '请填写跳过支付文案', trigger: 'blur' },
-        offline_info: { required: true, message: '请填写线下支付联系方式', trigger: 'blur' }
+        skip_pay_title: { required: true, message: '请填写跳过支付文案', trigger: 'blur' }
       },
       options: [],
       checkList: [],

src/modules/activity/views/Create.vue

@@ -127,7 +127,8 @@ export default {
         params.details.map(item => {
           if (parseInt(item.type) === 2) {
             item.user_fields = JSON.stringify(item.user_fields)
-            item.pay_type = item.pay_type.split(',')
+            // item.pay_type = item.pay_type.split(',')
+            item.pay_type = item.pay_type.split(',').toString()
           }
           return item
         })

src/modules/audit/components/payVoucher.vue

-<template>
-  <el-dialog v-bind="$attrs" v-on="$listeners" center width="40%">
-    <img :src="row" alt="" class="voucher_img" />
-    <!-- <div class="voucher_img" v-html="row"></div> -->
-  </el-dialog>
-</template>
-
-<script>
-export default {
-  props: {
-    row: {
-      type: String,
-      default: ''
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-::v-deep {
-  .el-dialog__body {
-    width: 80% !important;
-    .voucher_img {
-      width: 100%;
-      margin-left: 50px;
-    }
-  }
-}
-</style>

src/modules/audit/views/List.vue

@@ -3,14 +3,21 @@
     <app-list v-bind="tableOptions" ref="list">
       <el-divider></el-divider>
       <template v-slot:voucher="{ row }">
-        <el-button type="text" @click="handleLook(row)">点击查看</el-button>
+        <div v-if="row.voucher.length > 0">
+          <el-image
+            style="width: 100px; height: 100px; padding-top: 10px"
+            :src="row.voucher.indexOf('[') === -1 ? [row.voucher][0] : JSON.parse(row.voucher)[0]"
+            :preview-src-list="row.voucher.indexOf('[') === -1 ? [row.voucher] : JSON.parse(row.voucher)"
+          >
+          </el-image>
+        </div>
+        <div v-else>-</div>
       </template>
       <template v-slot:table-x="{ row }">
         <el-button type="text" @click="handleAudltDialog(row)">审核</el-button>
       </template>
     </app-list>
-    <!-- 点击查看凭证 -->
-    <pay-voucher :visible.sync="centerDialogVisible" :row="voucher" />
+
     <!-- 审核弹框 -->
     <audlt-dialog
       :visible.sync="dialogVisible"
@@ -25,7 +32,6 @@
 <script>
 import { getAuditList, auditResult } from '../api'
 import audltDialog from '../components/audltDialog.vue'
-import PayVoucher from '../components/payVoucher.vue'
 const statusMap = [
   { value: '待审核', id: '0' },
   { value: '审核通过', id: '1' },
@@ -33,11 +39,10 @@ const statusMap = [
 ]
 
 export default {
-  components: { audltDialog, PayVoucher },
+  components: { audltDialog },
   data() {
     return {
       isDisabled: '',
-      voucher: '',
       auditInfo: {
         cause: '',
         status: '',
@@ -101,20 +106,22 @@ export default {
           { label: '姓名', prop: 'user_name', align: 'center' },
           { label: '手机号', prop: 'user_mobile', align: 'center' },
           { label: '支付金额', prop: 'amount', align: 'center' },
-          { label: '凭证', align: 'center', slots: 'voucher', prop: 'voucher' },
+          {
+            label: '凭证',
+            align: 'center',
+            slots: 'voucher',
+            prop: 'voucher'
+          },
           { label: '备注', align: 'center', prop: 'comment' },
           { label: '操作', slots: 'table-x', align: 'center' }
         ]
       }
     }
   },
+
   methods: {
-    handleLook(row) {
-      this.voucher = row.voucher
-      this.centerDialogVisible = true
-    },
     handleAudltDialog(row) {
-      console.log(row.status, row.cause, row.id, '123')
+      console.log(row.status, row.cause, row.id, '123', row.voucher)
       this.auditInfo.status = row.status
       this.auditInfo.cause = row.cause
       this.auditInfo.id = row.id

src/modules/register/components/Pay.vue

 <template>
-  <div class="pay-list">
-    <div class="item" v-for="(item, index) in checkList" :key="index">
+  <div>
+    <div style="display: flex; justify-content: center">
       <el-radio-group v-model="pay_type">
         <el-radio :label="1">微信扫码支付</el-radio>
         <el-radio :label="11">支付宝扫码支付</el-radio>
       </el-radio-group>
+    </div>
+    <div class="pay-list">
+      <div class="item" v-for="(item, index) in checkList" :key="index">
         <div class="title">{{ item.title }}</div>
         <div class="checkbox">
           <el-checkbox-group v-model="item.form">
             <el-checkbox
-            :disabled="item.isDisabled"
+              :disabled="opt.isDisabled"
               v-for="opt in item.option"
               :key="opt.id"
               style="margin-bottom: 15px"
@@ -21,6 +24,7 @@
         </div>
       </div>
     </div>
+  </div>
 </template>
 
 <script>
@@ -29,7 +33,7 @@ export default {
   data() {
     return {
       checkList: [],
-      pay_type: ''
+      pay_type: 1
     }
   },
   mounted() {
@@ -43,7 +47,8 @@ export default {
           datas.option = []
           datas.form = []
           b.forEach(item => {
-            const params = { user_name: item.user_name, id: item.id, isDisabled: !!parseInt(item.pay_status) }
+            console.log(['1', '2'].includes(item.pay_status), '123')
+            const params = { user_name: item.user_name, id: item.id, isDisabled: ['1', '2'].includes(item.pay_status) }
             !parseInt(item.pay_status) && datas.form.push(item.id)
             datas.option.push(params)
           })
@@ -51,6 +56,9 @@ export default {
           return a
         }, [])
         console.log(this.checkList, 'list')
+
+        this.checkList.forEach(item => {})
+        console.log(this.checkList, 'list111')
       })
     },
     recordsQr(index) {

src/modules/register/views/Detail.vue

@@ -66,7 +66,7 @@
         </el-table>
       </div>
     </div>
-    <el-dialog title="提示" :visible.sync="dialogVisible" width="30%">
+    <el-dialog :visible.sync="dialogVisible" width="30%">
       <pay></pay>
     </el-dialog>
     <set-tabel-heade