From 93b364f04940276a8d4dc1d7e9c6d04c99d85fba Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 8 Feb 2023 13:56:58 +0800
Subject: [PATCH 1/3] bug

---
 .../components/Detail.vue                     | 51 ++++++++++++++++++-
 1 file changed, 50 insertions(+), 1 deletion(-)

diff --git a/project/activeAnalysis/app/AppMarketingActivity/components/Detail.vue b/project/activeAnalysis/app/AppMarketingActivity/components/Detail.vue
index fd43e438..44497674 100644
--- a/project/activeAnalysis/app/AppMarketingActivity/components/Detail.vue
+++ b/project/activeAnalysis/app/AppMarketingActivity/components/Detail.vue
@@ -97,6 +97,13 @@
               :current.sync="search.current"
               :size.sync="search.size"
               @getList="getList">
+              <el-table-column slot="options" width="110px" fixed="right" label="操作" align="center">
+                <template slot-scope="{ row }">
+                  <div class="table-options">
+                    <el-button type="text" @click="changePhone(row.id, row.phone)">更换手机号</el-button>
+                  </div>
+                </template>
+              </el-table-column>
             </ai-table>
           </template>
         </ai-card>
@@ -149,6 +156,17 @@
           </template>
         </ai-card>
       </div>
+      <ai-dialog
+        :visible.sync="isShowPhone"
+        width="790px"
+        @onConfirm="onConfirm"
+        title="更换手机号">
+        <el-form class="ai-form" :model="form" label-width="180px!important" ref="form">
+          <el-form-item prop="phone" style="width: 100%;" label="标题" :rules="[{required: true, message: '请输入手机号', trigger: 'change'}]">
+            <el-input size="small" placeholder="请输入手机号" v-model="form.phone"></el-input>
+          </el-form-item>
+        </el-form>
+      </ai-dialog>
     </template>
   </ai-detail>
 </template>
@@ -166,6 +184,10 @@
     data () {
       return {
         currIndex: 0,
+        form: {
+          phone: ''
+        },
+        id: '',
         tabList: ['基本信息', '报名记录', '抽奖记录'],
         colConfigs: [
           { prop: 'name',  label: '姓名', align: 'left', width: '200px' },
@@ -193,7 +215,8 @@
         prizes: [],
         tableData: [],
         total: 0,
-        info: {}
+        info: {},
+        isShowPhone: false
       }
     },
 
@@ -217,6 +240,32 @@
         })
       },
 
+      changePhone (id, phone) {
+        this.id = id
+        this.form.phone = phone
+
+        this.isShowPhone = true
+      },
+
+      onConfirm () {
+        this.$refs.form.validate((valid) => {
+          if (valid) {
+            this.instance.post(`/app/appmarketingactivityinfo/updateBindPhone`, null, {
+              params: {
+                ...this.form,
+                signupId: this.params.id || ''
+              }
+            }).then(res => {
+              if (res.code == 0) {
+                this.$message.success('更换成功')
+                this.isShowPhone = false
+                this.getList()
+              }
+            })
+          }
+        })
+      },
+
       getPrizeList() {
         this.instance.post(`/app/appmarketingactivityinfo/raffleList?activityId=${this.params.id}`, null, {
           params: {

From 12331f89704df24508726f2eed48a871f4ae4dce Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 8 Feb 2023 14:08:51 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B2=E9=9D=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppExaminationManage.vue                  |  70 +++++
 .../AppExaminationManage/components/Add.vue   | 280 ++++++++++++++++++
 .../components/Detail.vue                     |  92 ++++++
 .../AppExaminationManage/components/List.vue  | 148 +++++++++
 4 files changed, 590 insertions(+)
 create mode 100644 project/qujing/app/AppExaminationManage/AppExaminationManage.vue
 create mode 100644 project/qujing/app/AppExaminationManage/components/Add.vue
 create mode 100644 project/qujing/app/AppExaminationManage/components/Detail.vue
 create mode 100644 project/qujing/app/AppExaminationManage/components/List.vue

diff --git a/project/qujing/app/AppExaminationManage/AppExaminationManage.vue b/project/qujing/app/AppExaminationManage/AppExaminationManage.vue
new file mode 100644
index 00000000..062b3a20
--- /dev/null
+++ b/project/qujing/app/AppExaminationManage/AppExaminationManage.vue
@@ -0,0 +1,70 @@
+<template>
+  <div class="AppExaminationManage">
+    <keep-alive :include="['List']">
+      <component ref="component" :is="component" @change="onChange" :params="params" :instance="instance" :dict="dict"></component>
+    </keep-alive>
+  </div>
+</template>
+
+<script>
+  import Add from './components/Add'
+  import List from './components/List'
+  import Detail from './components/Detail'
+
+  export default {
+    name: 'AppExaminationManage',
+    label: '考试管理',
+
+    props: {
+      instance: Function,
+      dict: Object
+    },
+
+    data () {
+      return {
+        component: 'List',
+        params: {},
+        include: []
+      }
+    },
+
+    components: {
+      Add,
+      List,
+      Detail
+    },
+
+    methods: {
+      onChange (data) {
+        if (data.type === 'Add') {
+          this.component = 'Add'
+          this.params = data.params
+        }
+
+        if (data.type === 'Detail') {
+          this.component = 'Detail'
+          this.params = data.params
+        }
+
+        if (data.type === 'List') {
+          this.component = 'List'
+          this.params = data.params
+
+          this.$nextTick(() => {
+            if (data.isRefresh) {
+              this.$refs.component.getList()
+            }
+          })
+        }
+      }
+    }
+  }
+</script>
+
+<style lang="scss">
+  .AppExaminationManage {
+    height: 100%;
+    background: #F3F6F9;
+    overflow: auto;
+  }
+</style>
diff --git a/project/qujing/app/AppExaminationManage/components/Add.vue b/project/qujing/app/AppExaminationManage/components/Add.vue
new file mode 100644
index 00000000..e870c3b4
--- /dev/null
+++ b/project/qujing/app/AppExaminationManage/components/Add.vue
@@ -0,0 +1,280 @@
+<template>
+  <ai-detail class="content-add" v-loading="isLoading">
+    <template slot="title">
+      <ai-title :title="params.id ? '编辑' + '考试' : '添加' + '考试'" isShowBack isShowBottomBorder @onBackClick="cancel(false)"></ai-title>
+    </template>
+    <template slot="content">
+      <ai-card title="基本信息">
+        <template #content>
+          <el-form class="ai-form" :model="form" label-width="120px" ref="form">
+            <el-form-item label="标题" style="width: 100%;" prop="title" :rules="[{required: true, message: '请输入标题', trigger: 'blur'}]">
+              <el-input size="small" v-model="form.title" clearable placeholder="请输入..." :maxlength="50" :show-word-limit="true"></el-input>
+            </el-form-item>
+            <el-form-item prop="showIndex" label="排序" :rules="[{required: true, message: '请选择文章类型', trigger: 'change'}]">
+              <el-input-number size="small" v-model="form.showIndex" :min="0"></el-input-number>
+            </el-form-item>
+            <el-form-item v-if="form.contentType === '0'" label="正文" prop="content" style="width: 100%;" :rules="[{required: true, message: '请输入内容', trigger: 'change'}]">
+              <ai-editor v-model="form.content" :instance="instance"/>
+            </el-form-item>
+            <el-form-item v-if="form.contentType === '0' && !isHideCoverimg" label="封面图片" prop="files" style="width: 100%;">
+              <ai-uploader
+                :instance="instance"
+                v-model="form.files"
+                key="file"
+                :limit="9">
+                <template slot="tips">
+                  <p>最多上传9张图片,单个文件最大10MB，支持jpg、jpeg、png格式</p>
+                </template>
+              </ai-uploader>
+            </el-form-item>
+            <el-form-item v-if="form.contentType === '1'" label="视频" prop="files" style="width: 100%;" :rules="[{required: true, message: '请上传视频', trigger: 'change'}]">
+              <el-upload :show-file-list="false" ref="upload1" action :http-request="submitUpload" :accept="accept" :limit="1">
+                <div class="video" v-if="!form.files.length">
+                  <div class="icon">
+                    <ai-icon type="svg" icon="iconVideo"/>
+                    <span>上传视频</span>
+                  </div>
+                  <span class="tips">支持mp4格式，单个文件最大100MB</span>
+                </div>
+              </el-upload>
+              <video class="video-com" style="width:100%; height:100%; object-fit: fill;" muted
+                    :src="form.files[0].url" controls="controls" v-if="form.files.length"></video>
+              <el-upload :show-file-list="false" ref="upload2" action :http-request="submitUpload" :accept="accept"
+                        :limit="1" v-if="form.files.length">
+                <el-button style="margin-top: 10px;">重新选择</el-button>
+              </el-upload>
+            </el-form-item>
+            <el-form-item label="视频封面" prop="pictureUrl" style="width: 100%;" v-if="form.contentType === '1'" :rules="[{required: true, message: '请上传视频封面', trigger: 'change'}]">
+              <ai-uploader
+                :instance="instance"
+                isShowTip
+                v-model="form.pictureUrl"
+                :limit="1"
+                :cropOps="cropOps"
+                is-crop>
+                <template slot="tips">
+                  <p>最多上传1张图片,单个文件最大10MB，支持jpg、jpeg、png格式</p>
+                  <p>图片比例：1.6：1</p>
+                </template>
+              </ai-uploader>
+            </el-form-item>
+          </el-form>
+        </template>
+      </ai-card>
+    </template>
+    <template #footer>
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" :loading="isLoading" @click="confirm">提交</el-button>
+    </template>
+  </ai-detail>
+</template>
+
+<script>
+  import mp4box from 'mp4box'
+  import { mapState } from 'vuex'
+  export default {
+    name: 'Add',
+
+    props: {
+      instance: Function,
+      dict: Object,
+      params: Object,
+      areaId: String
+    },
+    data () {
+      return {
+        info: {},
+        accept: '.mp4',
+        form: {
+          title: '',
+          content: '',
+          showIndex: '',
+          files: [],
+          pictureUrl: [],
+          contentType: '0',
+          thumbUrl: []
+        },
+        isLoading: false,
+        cropOps: {
+          width: "336px",
+          height: "210px"
+        },
+        id: '',
+        contentTypeList: [
+          {
+            name: '图文',
+            value: '0'
+          },
+          {
+            name: '视频',
+            value: '1'
+          }
+        ],
+        isHideCoverimg: false,
+        cateList: [],
+        needExamine: '0'
+      }
+    },
+
+    computed: {
+      ...mapState(['user'])
+    },
+
+    created () {
+      if (this.params && this.params.id) {
+        this.id = this.params.id
+        this.getInfo(this.params.id)
+      }
+    },
+
+    methods: {
+      getInfo (id) {
+        this.instance.post(`/app/appcontentinfo/queryDetailById?id=${id}`).then(res => {
+          if (res.code === 0) {
+            this.form = res.data
+            this.form.pictureUrl = res.data.pictureUrl ? [{
+              url: res.data.pictureUrl
+            }] : []
+          }
+        })
+      },
+
+      onChange () {
+        this.form.files = []
+      },
+
+      submitUpload(file) {
+        this.$refs['upload1']?.clearFiles();
+        this.$refs['upload2']?.clearFiles();
+        this.$refs['ruleForm']?.clearValidate('videoFile');
+        const fileType = file.file.name.split(".")[1];
+        const size = file.file.size / 1024 / 1024 > 100;
+        let mp4boxfile = mp4box.createFile();
+        const reader = new FileReader();
+        reader.readAsArrayBuffer(file.file);
+        reader.onload = (e) => {
+          const arrayBuffer = e.target.result;
+          arrayBuffer.fileStart = 0;
+          mp4boxfile.appendBuffer(arrayBuffer);
+        };
+        mp4boxfile.onReady = (info) => {
+          let codec = info.mime.match(/codecs="(\S*),/)[1]
+          if (codec.indexOf('avc') === -1) {
+            return this.$message.error("视频编码格式不支持")
+          }
+
+          if (size) {
+            return this.$message.error("视频大小不能超过100M");
+          }
+
+          if (fileType && this.accept.indexOf(fileType.toLocaleLowerCase()) > -1) {
+            let formData = new FormData()
+            formData.append('file', file.file);
+            this.isLoading = true
+            this.instance.post(`/admin/file/add-unlimited`, formData).then(res => {
+              if (res && res.data) {
+                let videoList = res.data[0].split(";");
+
+                this.form.files = [{
+                  id: videoList[1],
+                  url: videoList[0]
+                }]
+              }
+
+              this.isLoading = false
+            }).catch(() => {
+              this.isLoading = false
+            })
+          } else {
+            return this.$message.error("视频格式错误")
+          }
+        }
+      },
+
+      confirm () {
+        this.$refs.form.validate((valid) => {
+          if (valid) {
+            this.isLoading = true
+            this.instance.post(`/app/appcontentinfo/addOrUpdate`, {
+              ...this.form,
+              pictureUrl: this.form.pictureUrl.length ? this.form.pictureUrl[0].url : ''
+            }).then(res => {
+              if (res.code == 0) {
+                if (this.needExamine === '1') {
+                  this.$message.success('提交成功，等待管理员审核')
+                } else {
+                  this.$message.success('提交成功')
+                }
+                setTimeout(() => {
+                  this.cancel(true)
+                }, 600)
+              } else {
+                this.isLoading = false
+              }
+            }).catch(() => {
+              this.isLoading = false
+            })
+          }
+        })
+      },
+
+      cancel (isRefresh) {
+        this.$emit('change', {
+          type: 'List',
+          isRefresh: !!isRefresh
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+  .content-add {
+    .video {
+      width: 640px;
+      height: 360px;
+      border-radius: 4px;
+      border: 1px dashed #D0D4DC;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+
+      .icon {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+
+        span:nth-child(2) {
+          display: inline-block;
+          font-size: 16px;
+          color: #333333;
+          line-height: 30px;
+        }
+
+        .iconfont {
+          display: inline-block;
+          font-size: 40px;
+          color: #2266FF;
+        }
+      }
+
+      .tips {
+        display: inline-block;
+        font-size: 12px;
+        color: #999999;
+        line-height: 26px;
+      }
+    }
+
+    .video-com {
+      width: 640px;
+      height: 360px;
+      background: rgba(0, 0, 0, 0.5);
+      border-radius: 2px;
+      border: 1px solid #D0D4DC;
+      margin-top: -40px;
+    }
+  }
+</style>
diff --git a/project/qujing/app/AppExaminationManage/components/Detail.vue b/project/qujing/app/AppExaminationManage/components/Detail.vue
new file mode 100644
index 00000000..b3c1bb5d
--- /dev/null
+++ b/project/qujing/app/AppExaminationManage/components/Detail.vue
@@ -0,0 +1,92 @@
+<template>
+  <ai-detail>
+    <template slot="title">
+      <ai-title title="课程详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
+      </ai-title>
+    </template>
+    <template slot="content">
+      <ai-card title="基本信息">
+        <template #content>
+          <ai-wrapper
+            label-width="120px">
+            <ai-info-item label="标题" isLine :value="info.title"></ai-info-item>
+            <ai-info-item label="发布地区" isLine :value="info.areaName"></ai-info-item>
+            <ai-info-item label="文章类型" isLine :value="info.contentType === '0' ? '图文' : '视频'"></ai-info-item>
+            <ai-info-item label="正文" v-if="info.contentType === '0'" isLine>
+              <AiArticle :value="info.content"></AiArticle>
+            </ai-info-item>
+            <ai-info-item v-if="info.contentType === '0'" isLine label="封面图片">
+              <ai-uploader
+                :instance="instance"
+                disabled
+                v-model="info.files"
+                :limit="9">
+              </ai-uploader>
+            </ai-info-item>
+            <ai-info-item v-if="info.contentType === '1'" isLine label="封面图片">
+              <video style="width:100%; height:100%; object-fit: fill;" :src="info.files[0].url" controls></video>
+            </ai-info-item>
+            <ai-info-item v-if="info.contentType === '1'" isLine label="视频封面">
+              <ai-uploader
+                :instance="instance"
+                disabled
+                v-model="info.pictureUrl"
+                :limit="1">
+              </ai-uploader>
+            </ai-info-item>
+          </ai-wrapper>
+        </template>
+      </ai-card>
+    </template>
+  </ai-detail>
+</template>
+
+<script>
+  export default {
+    name: 'Detail',
+
+    props: {
+      instance: Function,
+      dict: Object,
+      params: Object,
+      moduleId: String
+    },
+
+    data () {
+      return {
+        info: {},
+        id: ''
+      }
+    },
+
+    created () {
+      if (this.params && this.params.id) {
+        this.id = this.params.id
+        this.getInfo(this.params.id)
+      }
+    },
+
+    methods: {
+      getInfo (id) {
+        this.instance.post(`/app/appcontentinfo/queryDetailById?id=${id}`).then(res => {
+          if (res.code === 0) {
+            this.info = res.data
+            this.info.pictureUrl = res.data.pictureUrl ? [{
+              url: res.data.pictureUrl
+            }] : []
+          }
+        })
+      },
+
+      cancel (isRefresh) {
+        this.$emit('change', {
+          type: 'List',
+          isRefresh: !!isRefresh
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+</style>
diff --git a/project/qujing/app/AppExaminationManage/components/List.vue b/project/qujing/app/AppExaminationManage/components/List.vue
new file mode 100644
index 00000000..877e06bb
--- /dev/null
+++ b/project/qujing/app/AppExaminationManage/components/List.vue
@@ -0,0 +1,148 @@
+<template>
+  <ai-list class="notice">
+    <template slot="title">
+      <ai-title title="考试管理" isShowBottomBorder></ai-title>
+    </template>
+    <template slot="content">
+      <ai-search-bar class="search-bar">
+        <template #left>
+          <ai-select
+            v-model="search.status"
+            clearable
+            placeholder="请选择课程状态"
+            :selectList="statusList"
+            @change="search.current = 1, getList()">
+          </ai-select>
+          <el-button size="small" type="primary" icon="iconfont iconAdd" @click="toAdd('')">添加</el-button>
+        </template>
+        <template #right>
+          <el-input
+            v-model="search.title"
+            class="search-input"
+            size="small"
+            v-throttle="() => {search.current = 1, getList()}"
+            placeholder="请输入标题"
+            clearable
+            @clear="search.current = 1, getList()"
+            suffix-icon="iconfont iconSearch">
+          </el-input>
+        </template>
+      </ai-search-bar>
+      <ai-table
+        :tableData="tableData"
+        :col-configs="colConfigs"
+        :total="total"
+        style="margin-top: 6px;"
+        :current.sync="search.current"
+        :size.sync="search.size"
+        @getList="getList">
+        <el-table-column slot="options" width="120px" fixed="right" label="操作" align="center">
+          <template slot-scope="{ row }">
+            <div class="table-options">
+              <el-button type="text" @click="toAdd(row.id)">编辑</el-button>
+              <el-button type="text" @click="toDetail(row.id)">详情</el-button>
+              <el-button type="text" @click="remove(row.id)">删除</el-button>
+            </div>
+          </template>
+        </el-table-column>
+      </ai-table>
+    </template>
+  </ai-list>
+</template>
+
+<script>
+  export default {
+    name: 'List',
+
+    props: {
+      instance: Function,
+      dict: Object
+    },
+
+    data () {
+      return {
+        search: {
+          current: 1,
+          size: 10,
+          title: '',
+          status: ''
+        },
+        total: 10,
+        colConfigs: [
+          { prop: 'title',  label: '考试名称', align: 'left' },
+          { prop: 'createUserName',  label: '试题总数', align: 'center' },
+          { prop: 'beginTime',  label: '通过分数', align: 'center' },
+          { prop: 'endTime', label: '状态', align: 'center' },
+          { prop: 'createTime', label: '考试人数', align: 'center' },
+          { prop: 'createTime', label: '通过人数', align: 'center' }
+        ],
+        tableData: [],
+        statusList: [
+          {
+            dictValue: '0',
+            dictName: '未开始'
+          },
+          {
+            dictValue: '1',
+            dictName: '进行中'
+          },
+          {
+            dictValue: '2',
+            dictName: '已结束'
+          }
+        ]
+      }
+    },
+
+    created() {
+      this.getList()
+    },
+
+    methods: {
+      getList() {
+        this.instance.post(`/app/appmarketingactivityinfo/list`, null, {
+          params: {
+            ...this.search
+          }
+        }).then(res => {
+          if (res.code == 0) {
+            this.tableData = res.data.records
+            this.total = res.data.total
+          }
+        })
+      },
+
+      remove (id) {
+        this.$confirm('确定删除该活动？').then(() => {
+          this.instance.post(`/app/appmarketingactivityinfo/delete?id=${id}`).then(res => {
+            if (res.code == 0) {
+              this.$message.success('删除成功！')
+              this.getList()
+            }
+          })
+        })
+      },
+
+      toDetail (id) {
+        this.$emit('change', {
+          type: 'Detail',
+          params: {
+            id: id || ''
+          }
+        })
+      },
+
+      toAdd(id) {
+        this.$emit('change', {
+          type: 'Add',
+          params: {
+            id: id || ''
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+</style>

From 081effb3b37ba5d55623c4b4a9443992eb2b3f40 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 8 Feb 2023 14:13:58 +0800
Subject: [PATCH 3/3] bug

---
 .../app/AppMarketingActivity/components/Detail.vue              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/activeAnalysis/app/AppMarketingActivity/components/Detail.vue b/project/activeAnalysis/app/AppMarketingActivity/components/Detail.vue
index 44497674..3e2b2102 100644
--- a/project/activeAnalysis/app/AppMarketingActivity/components/Detail.vue
+++ b/project/activeAnalysis/app/AppMarketingActivity/components/Detail.vue
@@ -253,7 +253,7 @@
             this.instance.post(`/app/appmarketingactivityinfo/updateBindPhone`, null, {
               params: {
                 ...this.form,
-                signupId: this.params.id || ''
+                signupId: this.id
               }
             }).then(res => {
               if (res.code == 0) {