From 0e99a95913a618248391d0594a87f1ca37b7f106 Mon Sep 17 00:00:00 2001
From: zx <604444282@qq.com>
Date: Mon, 30 May 2022 15:48:20 +0800
Subject: [PATCH 1/4] zx

---
 src/views/BasicSetting/_rewardRule/config.js  |  3 +-
 src/views/BasicSetting/_rewardRule/index.vue  |  1 +
 src/views/MatManage/_matList/index.vue        |  5 ++-
 src/views/QuestManage/_questList/config.js    |  6 ++--
 src/views/QuestManage/_questList/index.vue    | 16 +++++++---
 src/views/QuestManage/_questRelease/config.js |  3 ++
 src/views/QuestManage/_questRelease/index.vue | 31 ++++++++++++-------
 src/views/StarwayInfo/_actRelease/index.vue   | 16 ++++++----
 8 files changed, 52 insertions(+), 29 deletions(-)
 create mode 100644 src/views/QuestManage/_questRelease/config.js

diff --git a/src/views/BasicSetting/_rewardRule/config.js b/src/views/BasicSetting/_rewardRule/config.js
index a649ccb..2fe9cf7 100644
--- a/src/views/BasicSetting/_rewardRule/config.js
+++ b/src/views/BasicSetting/_rewardRule/config.js
@@ -1,7 +1,6 @@
 export function statusFormatter(row) {
     switch(row.isDefault) {
         case true: return '是';
-        case false: return '否';
-        default: return '';
+        default: return '否';
     }
 };
\ No newline at end of file
diff --git a/src/views/BasicSetting/_rewardRule/index.vue b/src/views/BasicSetting/_rewardRule/index.vue
index 1330d69..d07f0e9 100644
--- a/src/views/BasicSetting/_rewardRule/index.vue
+++ b/src/views/BasicSetting/_rewardRule/index.vue
@@ -91,6 +91,7 @@ export default defineComponent({
             let obj = Object.assign({pageNum: this.pagination.current,pageSize: this.pagination.pageSize})
             this.proxy.$post("/rewardRuleTemplate/list", obj).then(res => {
                 const data = res.data;
+                console.log(data)
                 this.tableData.data = data;
             }).catch(() => {});
         },
diff --git a/src/views/MatManage/_matList/index.vue b/src/views/MatManage/_matList/index.vue
index a92e9b2..0d2bde5 100644
--- a/src/views/MatManage/_matList/index.vue
+++ b/src/views/MatManage/_matList/index.vue
@@ -134,7 +134,10 @@ export default defineComponent({
                 '删除', //标题
                 {type: 'warning'}
             ).then(() => {
-                this.$message.success('删除成功')
+                this.proxy.$post("/reference/del", {id: id}).then(res => {
+                    this.getData();
+                    this.$message.success(res.data);
+                }).catch(() => {});
             }).catch(() => {})
         }
     }
diff --git a/src/views/QuestManage/_questList/config.js b/src/views/QuestManage/_questList/config.js
index 81250f3..5c7dc4a 100644
--- a/src/views/QuestManage/_questList/config.js
+++ b/src/views/QuestManage/_questList/config.js
@@ -1,8 +1,8 @@
 export function statusFormatter(row) {
     switch(row.status) {
-        case 1: return '未开始';
-        case 2: return '进行中';
-        case 3: return '已终止';
+        case 0: return '未上线';
+        case 1: return '已上线';
+        case 2: return '已结束';
         default: return '';
     }
 };
\ No newline at end of file
diff --git a/src/views/QuestManage/_questList/index.vue b/src/views/QuestManage/_questList/index.vue
index 56db7f3..c66a5ee 100644
--- a/src/views/QuestManage/_questList/index.vue
+++ b/src/views/QuestManage/_questList/index.vue
@@ -38,24 +38,31 @@
        </div>
        <div class="area-table">
            <el-table :data="tableData.data" size="default" border :header-cell-style="{background: '#EEE'}">
-               <el-table-column prop="title" label="任务标题" width="360"></el-table-column>
+               <el-table-column prop="title" label="任务标题" width="240"></el-table-column>
+               <el-table-column prop="brandList" label="车型" width="240">
+                   <template #default="scope">
+                       <el-tag style="margin-right: 8px" v-for="(item,index) in scope.row.brandList" :key="index">
+                           {{item.name}}
+                        </el-tag>
+                   </template>
+               </el-table-column>
                <el-table-column prop="tagList" label="标签" width="240">
                    <template #default="scope">
                        <el-tag style="margin-right: 8px" v-for="(item,index) in scope.row.tagList" :key="index">
-                           {{item == 1?'媒体评测':item == 2?'产品宣传':'其他'}}
+                           {{item.title}}
                         </el-tag>
                    </template>
                </el-table-column>
                <el-table-column prop="status" label="状态" :formatter="statusFormatter"></el-table-column>
                <el-table-column prop="action" label="操作" fixed="right" width="240">
                    <template #default="scope">
-                       <div v-if="scope.row.status == 1">
+                       <div v-if="scope.row.status == 0">
                            <el-link type="primary" @click="goEdit(scope.row.id)">编辑</el-link>
                        </div>
                        <div v-else>
                            <el-link type="primary" style="margin-right: 8px">查看</el-link>
                            <el-link type="primary" style="margin-right: 8px">传播效果</el-link>
-                           <el-link v-if="scope.row.status == 2" type="danger" style="margin-right: 8px">终止</el-link>
+                           <el-link v-if="scope.row.status == 1" type="danger" style="margin-right: 8px">终止</el-link>
                        </div>
                    </template>
                </el-table-column>
@@ -112,7 +119,6 @@ export default defineComponent({
             let obj = Object.assign({pageNum: this.pagination.current,pageSize: this.pagination.pageSize})
             this.proxy.$post("/task/list", obj).then(res => {
                 const data = res.data
-                console.log(data.records)
                 this.tableData.data = data.records;
                 this.pagination.total = data.total
             }).catch(() => {});
diff --git a/src/views/QuestManage/_questRelease/config.js b/src/views/QuestManage/_questRelease/config.js
new file mode 100644
index 0000000..6836920
--- /dev/null
+++ b/src/views/QuestManage/_questRelease/config.js
@@ -0,0 +1,3 @@
+export function valueFormatter(row) {
+    return row.min +' 至 '+ row.max
+};
\ No newline at end of file
diff --git a/src/views/QuestManage/_questRelease/index.vue b/src/views/QuestManage/_questRelease/index.vue
index 643b46f..7a56556 100644
--- a/src/views/QuestManage/_questRelease/index.vue
+++ b/src/views/QuestManage/_questRelease/index.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="main-content">
         <div class="form-area">
-            <el-form size="default" :model="form" label-width="120px">
+            <el-form size="default" :model="form" label-width="90px">
                 <el-form-item label="任务标题" style="width: 80%">
                     <el-input placeholder="请输入" v-model="form.title" />
                 </el-form-item>
@@ -16,7 +16,7 @@
                     <el-input placeholder="请输入" type="textarea" v-model="form.subtitle" />
                 </el-form-item>
                 <el-form-item label="时间" style="width: 80%">
-                    <el-date-picker format="YYYY-MM-DD HH:MM:SS" @change="timeChange" v-model="selTime" type="daterange"></el-date-picker>
+                    <el-date-picker value-format="YYYY-MM-DD HH:mm:ss" @change="timeChange" v-model="selTime" type="daterange"></el-date-picker>
                 </el-form-item>
                 <el-form-item label="标签类别">
                     <el-checkbox-group v-model="form.tagList">
@@ -40,9 +40,11 @@
                         <el-icon class="img-upload"><Plus /></el-icon>
                     </uploadFile>
                 </el-form-item>
-                <el-form-item label="素材">
-                    
-                </el-form-item>
+                <el-form-item label="素材"></el-form-item>
+                <el-transfer style="padding:0px 0px 16px 30px;text-align: left; display: inline-block"
+                        v-model="form.referenceList" :titles="['素材列表','已选素材']"
+                        :data="refData" :props="{key: 'id',label: 'title'}">
+                </el-transfer>
                 <el-form-item label="教程">
                     
                 </el-form-item>
@@ -52,8 +54,8 @@
                        </el-option>
                     </el-select>
                     <el-table :data="ruleTable.data" border style="margin-top: 16px">
-                        <el-table-column prop="teleport" label="传播值"></el-table-column>
-                        <el-table-column prop="point" label="奖励积分"></el-table-column>
+                        <el-table-column prop="id" label="传播值" :formatter="valueFormatter"></el-table-column>
+                        <el-table-column prop="reward" label="奖励积分"></el-table-column>
                     </el-table>
                 </el-form-item>
                 <el-form-item>
@@ -66,6 +68,7 @@
 
 <script>
 import {defineComponent, reactive, ref, getCurrentInstance} from 'vue'
+import {valueFormatter} from './config.js'
 export default defineComponent({
     name: 'v-questRelease',
     setup() {
@@ -87,13 +90,14 @@ export default defineComponent({
         const tagData = ref([]);
         const brandData = ref([]);
         const ruleData = ref([]);
+        const refData = ref([]);
         const { proxy } = getCurrentInstance();
         const ruleTable = reactive({
             data: []
         });
         return {
-            form,proxy,selTime,
-            tagData,brandData,ruleData,
+            form,proxy,selTime,valueFormatter,
+            tagData,brandData,ruleData,refData,
             ruleTable,
             activeId
         }
@@ -113,6 +117,9 @@ export default defineComponent({
             this.proxy.$post("/rewardRuleTemplate/list", {}).then(res => {
                 this.ruleData = res.data;
             }).catch(() => {});
+            this.proxy.$post("/reference/list", {}).then(res => {
+                this.refData = res.data.records;
+            }).catch(() => {});
         },
         selectAll(value) {
             if(value == true) {
@@ -122,8 +129,8 @@ export default defineComponent({
             }
         },
         ruleChange(value) {
-            this.proxy.$post("/rewardRuleTemplate/list", {id: value}).then(res => {
-                // console.log(res.data)
+            this.proxy.$post("/rewardRuleTemplate/detail", {id: value}).then(res => {
+                this.ruleTable.data = res.data.ruleList
             }).catch(() => {});
         },
         confirm() {
@@ -138,7 +145,7 @@ export default defineComponent({
         },
         handlerUpload() {
 
-        }
+        },
     }
 })
 </script>
diff --git a/src/views/StarwayInfo/_actRelease/index.vue b/src/views/StarwayInfo/_actRelease/index.vue
index 1480351..d18e9a5 100644
--- a/src/views/StarwayInfo/_actRelease/index.vue
+++ b/src/views/StarwayInfo/_actRelease/index.vue
@@ -56,7 +56,7 @@
 import '@wangeditor/editor/dist/css/style.css'
 import { onBeforeUnmount, shallowRef, onMounted } from 'vue'
 import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
-import {defineComponent, reactive} from 'vue'
+import {defineComponent, reactive, getCurrentInstance} from 'vue'
 export default defineComponent({
     name: 'v-questRelease',
     components: { Editor, Toolbar },
@@ -67,9 +67,10 @@ export default defineComponent({
         const form = reactive({
             title: '',
             type: 1,
-            content: '',
+            content: '<p>请在此输入内容</p>',
             cover:''
         });
+        const { proxy } = getCurrentInstance();
         /////////////
         const editorRef = shallowRef()
         // onMounted(() => { // 模拟 ajax 异步获取内容
@@ -79,7 +80,7 @@ export default defineComponent({
         // }) 
         //配置项
         const toolbarConfig = {}
-        const editorConfig = { placeholder: '请输入内容...' }
+        const editorConfig = {}
         // 组件销毁时，也及时销毁编辑器
         onBeforeUnmount(() => {
             const editor = editorRef.value
@@ -91,7 +92,7 @@ export default defineComponent({
         }
         /////////////
         return {
-            form,
+            form,proxy,
             activeId,
             editorRef, mode: 'simple', toolbarConfig, editorConfig, handleCreated
         }
@@ -101,10 +102,13 @@ export default defineComponent({
     },
     methods: {
         confirm() {
-            this.$router.go(-1);
+            this.proxy.$post("/topicActivity/add", this.form).then(res => {
+                this.$message.success(res.data);
+                this.$router.go(-1);
+            }).catch(() => {});
         },
         handlerUpload() {
-
+            
         }
     }
 })

From 0e438931e7f7f2746f9c80ee288aa27643c95e24 Mon Sep 17 00:00:00 2001
From: zx <604444282@qq.com>
Date: Mon, 30 May 2022 16:05:32 +0800
Subject: [PATCH 2/4] zx

---
 src/views/StarwayInfo/_actRelease/index.vue | 2 +-
 src/views/StarwayInfo/config.js             | 2 +-
 src/views/StarwayInfo/index.vue             | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/views/StarwayInfo/_actRelease/index.vue b/src/views/StarwayInfo/_actRelease/index.vue
index d18e9a5..d38b656 100644
--- a/src/views/StarwayInfo/_actRelease/index.vue
+++ b/src/views/StarwayInfo/_actRelease/index.vue
@@ -9,7 +9,7 @@
                     <el-radio-group v-model="form.type">
                         <el-radio :label="1">视频</el-radio>
                         <el-radio :label="2">图片</el-radio>
-                        <el-radio :label="3">文章</el-radio>
+                        <el-radio :label="3">文字</el-radio>
                     </el-radio-group>
                 </el-form-item>
                 <el-form-item label="上传封面">
diff --git a/src/views/StarwayInfo/config.js b/src/views/StarwayInfo/config.js
index 67aa638..98a9b1f 100644
--- a/src/views/StarwayInfo/config.js
+++ b/src/views/StarwayInfo/config.js
@@ -2,7 +2,7 @@ export function statusFormatter(row) {
     switch(row.type) {
         case 1: return '视频';
         case 2: return '图片';
-        case 3: return '图文';
+        case 3: return '文字';
         default: return '';
     }
 };
\ No newline at end of file
diff --git a/src/views/StarwayInfo/index.vue b/src/views/StarwayInfo/index.vue
index d3246a4..b474190 100644
--- a/src/views/StarwayInfo/index.vue
+++ b/src/views/StarwayInfo/index.vue
@@ -97,7 +97,10 @@ export default defineComponent({
                 '删除', //标题
                 {type: 'warning'}
             ).then(() => {
-                this.$message.success('删除成功')
+                this.proxy.$post("/topicActivity/del", {id: id}).then(res => {
+                    this.getData()
+                    this.$message.success(res.data)
+                }).catch(() => {});
             }).catch(() => {})
         }
     }

From 9e16a7be4f43a17b4cb5d277b6f3880ab83c2d5e Mon Sep 17 00:00:00 2001
From: zx <604444282@qq.com>
Date: Mon, 30 May 2022 17:55:02 +0800
Subject: [PATCH 3/4] zx

---
 src/components/UploadFile/index.vue      |  3 ++-
 src/views/MatManage/_matList/config.js   |  8 +++++++-
 src/views/MatManage/_matList/index.vue   | 24 +++++++++++++++---------
 src/views/MatManage/_matUpload/index.vue | 19 +++++++++++++++----
 src/views/MatManage/_setManage/index.vue | 24 +++++++++++++++++++++---
 5 files changed, 60 insertions(+), 18 deletions(-)

diff --git a/src/components/UploadFile/index.vue b/src/components/UploadFile/index.vue
index 642b26e..1ea1934 100644
--- a/src/components/UploadFile/index.vue
+++ b/src/components/UploadFile/index.vue
@@ -55,7 +55,8 @@ export default defineComponent({
         // 上传成功
         handlerSuccess(response, file, fileList) {
             this.fileList = fileList || [];
-            this.$emit("change", this.fileList)
+            const data = response.data;
+            this.$emit("change", data)
         },
         // 上传失败
         handlerError() {}, 
diff --git a/src/views/MatManage/_matList/config.js b/src/views/MatManage/_matList/config.js
index 81250f3..aa51d8b 100644
--- a/src/views/MatManage/_matList/config.js
+++ b/src/views/MatManage/_matList/config.js
@@ -5,4 +5,10 @@ export function statusFormatter(row) {
         case 3: return '已终止';
         default: return '';
     }
-};
\ No newline at end of file
+};
+export function groupFormatter(row) {
+    switch(row.groupId) {
+        case 0: return '未分组'
+        default: return row.groupId;
+    }
+}
\ No newline at end of file
diff --git a/src/views/MatManage/_matList/index.vue b/src/views/MatManage/_matList/index.vue
index 0d2bde5..d5aa202 100644
--- a/src/views/MatManage/_matList/index.vue
+++ b/src/views/MatManage/_matList/index.vue
@@ -35,18 +35,23 @@
                @selection-change="handleSelect"
                :header-cell-style="{background: '#EEE'}">
                <el-table-column type="selection" width="55" />
-               <el-table-column prop="title" label="素材" width="360"></el-table-column>
+               <el-table-column prop="title" label="素材" width="240"></el-table-column>
                <el-table-column prop="tag" label="标签" width="240">
                    <template #default="scope">
-                       <el-tag style="margin-right: 8px" v-for="(item,index) in scope.row.tag" :key="index">
-                           {{item == 1?'媒体评测':item == 2?'产品宣传':'其他'}}
+                       <el-tag style="margin-right: 8px" v-for="(item,index) in scope.row.tagList" :key="index">
+                           {{item.title}}
                         </el-tag>
                    </template>
                </el-table-column>
-               <el-table-column prop="set" label="分组" :formatter="statusFormatter"></el-table-column>
-               <el-table-column prop="series" label="车型" :formatter="statusFormatter"></el-table-column>
-               <el-table-column prop="info" label="描述"></el-table-column>
-               <el-table-column prop="time" label="上传时间"></el-table-column>
+               <el-table-column prop="groupId" label="分组" :formatter="groupFormatter"></el-table-column>
+               <el-table-column prop="brandList" label="车型">
+                   <template #default="scope">
+                       <el-tag style="margin-right: 8px" v-for="(item,index) in scope.row.brandList" :key="index">
+                           {{item.name}}
+                        </el-tag>
+                   </template>
+               </el-table-column>
+               <el-table-column prop="creatAt" label="上传时间"></el-table-column>
                <el-table-column prop="action" label="操作" fixed="right" width="240">
                    <template #default="scope">
                         <el-link type="primary" @click="goEdit(scope.row.id)">编辑</el-link>
@@ -68,7 +73,7 @@
 
 <script>
 import {defineComponent, reactive, watch, getCurrentInstance} from 'vue'
-import {statusFormatter} from './config.js'
+import {groupFormatter} from './config.js'
 export default defineComponent({
     name: 'v-questList',
     setup() {
@@ -90,7 +95,7 @@ export default defineComponent({
             form,proxy,
             tableData,
             pagination,
-            statusFormatter
+            groupFormatter
         }
     },
     mounted() {
@@ -107,6 +112,7 @@ export default defineComponent({
             let obj = Object.assign({pageNum: this.pagination.current,pageSize: this.pagination.pageSize})
             this.proxy.$post("/reference/list", obj).then(res => {
                 const data = res.data
+                console.log(data.records)
                 this.tableData.data = data.records;
                 this.pagination.total = data.total
             }).catch(() => {});
diff --git a/src/views/MatManage/_matUpload/index.vue b/src/views/MatManage/_matUpload/index.vue
index 53657d9..1a6cdea 100644
--- a/src/views/MatManage/_matUpload/index.vue
+++ b/src/views/MatManage/_matUpload/index.vue
@@ -5,6 +5,7 @@
                 <el-form-item label="分组" style="width: 80%">
                     <el-select v-model="form.groupId" placeholder="请选择">
                         <el-option :value="0" label="不分组"></el-option>
+                        <el-option v-for="(item) in groupData" :key="item.id" :value="item.id" :label="item.name"></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="车系" style="width: 80%">
@@ -31,7 +32,7 @@
                     </el-checkbox-group>
                 </el-form-item>
                 <el-form-item label="素材描述" style="width: 80%">
-                    <el-input type="textarea" v-model="form.description" />
+                    <el-input type="textarea" v-model="form.title" />
                 </el-form-item>
                 <el-form-item label="素材内容" style="width: 100%">
                     <uploadFile @change="handlerUpload" :config="{ limit: 1, accept: '.jpg, .jpeg, .png, .gif'}">
@@ -57,15 +58,19 @@ export default defineComponent({
         const form = reactive({
             groupId: 0,
             title: '',
+            type: undefined,
             tagList: [],
             brandList: [],
+            coverUrl: '',
+            fileUrl: '',
         });
         const tagData = ref([]);
         const brandData = ref([]);
+        const groupData = ref([]);
         const { proxy } = getCurrentInstance();
         return {
             form,proxy,
-            tagData,brandData,
+            tagData,brandData,groupData,
             activeId
         }
     },
@@ -80,13 +85,19 @@ export default defineComponent({
             this.proxy.$post("/brand/list", {}).then(res => {
                 this.brandData = res.data.records;
             }).catch(() => {});
+            this.proxy.$post("/referenceGroup/list", {}).then(res => {
+                this.groupData = res.data.records;
+            }).catch(() => {});
         },
         confirm() {
-            this.$router.go(-1);
+            this.proxy.$post("/reference/add", this.form).then(res => {
+                this.$message.success(res.data)
+                this.$router.go(-1);
+            }).catch(() => {});
         },
         //素材上传
         handlerUpload(data) {
-            console.log(data)
+            this.form.fileUrl = data.fileUrl
         }
     }
 })
diff --git a/src/views/MatManage/_setManage/index.vue b/src/views/MatManage/_setManage/index.vue
index 9814132..2ed1f5c 100644
--- a/src/views/MatManage/_setManage/index.vue
+++ b/src/views/MatManage/_setManage/index.vue
@@ -15,7 +15,7 @@
                    </el-form-item>
                </el-form>
                <template #reference>
-                   <el-button size="default" type="primary" @click="visible = true">添加分组</el-button>
+                   <el-button size="default" type="primary" @click="visible = true;setForm.name=''">添加分组</el-button>
                </template>
            </el-popover>
        </div>
@@ -46,6 +46,13 @@
                 :total="pagination.total"
             />
        </div>
+       <el-dialog v-model="editVisible" width="30%" title="重命名">
+           <el-input v-model="setForm.name" placeholder="请输入分组名"></el-input>
+           <template #footer>
+               <el-button @click="editVisible = false;setForm=''">取消</el-button>
+               <el-button @click="editConfirm" type="primary">确定</el-button>
+           </template>
+       </el-dialog>
     </div>
 </template>
 
@@ -73,12 +80,14 @@ export default defineComponent({
             name: ''
         })
         const visible = ref(false);
+        const editVisible = ref(false);
+        const activeId = ref(false);
         return {
             form,setForm,proxy,
             tableData,
             pagination,
             statusFormatter,
-            visible
+            visible,editVisible,activeId
         }
     },
     mounted() {
@@ -103,7 +112,16 @@ export default defineComponent({
 
         },
         handlerEdit(value) {
-
+            this.activeId = value
+            this.editVisible = true;
+        },
+        editConfirm() {
+            let obj = Object.assign(this.setForm, {id: this.activeId})
+            this.proxy.$post("/referencegroup/upd", obj).then(res => {
+                this.getData();
+                this.editVisible = false;
+                this.$message.success(res.data)
+            }).catch(() => {});
         },
         //添加确认
         addConfirm() {

From 309f16cc348133747e5a728a330af3a79d851c8c Mon Sep 17 00:00:00 2001
From: xiaowen <372193233@qq.com>
Date: Tue, 31 May 2022 09:52:56 +0800
Subject: [PATCH 4/4] cxw-010203

---
 .env.production | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env.production b/.env.production
index 4a45f13..c8b5b42 100644
--- a/.env.production
+++ b/.env.production
@@ -1,2 +1,2 @@
 NODE_ENV = "production"
-VUE_APP_URL="http://121.41.171.43:7340/"
\ No newline at end of file
+VUE_APP_URL="https://api.sws010.com"
\ No newline at end of file