解决冲突

src/pages/exam/paperPublish.vue

@@ -133,7 +133,6 @@
     margin: 0 10px 10px 0;
     display: inline-block;
   }
-
 </style>
 <template>
   <div class="page-body" id="paper_Publish">
@@ -153,8 +152,8 @@
       <span class="papPub_Left f1">发放时间</span>
       <div class="f1">
         <div class="Sysuser_Date" style="width:308px;">
-          <q-field filled>
-             <template v-slot:control>
+          <q-field filled>
+             <template v-slot:control>
               <el-date-picker v-model="postMsg.ExamStartTime" value-format='yyyy-MM-dd HH:mm:ss'
                 :picker-options="picker" type="datetime" placeholder="开始时间" size="small"
                 clear-icon="iconfont icon-guanbi"></el-date-picker>
@@ -167,11 +166,11 @@
       <span class="papPub_Left f1">结束时间</span>
       <div class="f1">
         <div class="Sysuser_Date" style="width:308px;">
-          <q-field filled>
-             <template v-slot:control>
+          <q-field filled>
+             <template v-slot:control>
               <el-date-picker v-model="postMsg.ExamEndTime" value-format='yyyy-MM-dd HH:mm:ss' @change="getMinus()"
                 type="datetime" :picker-options="pickerEnd" placeholder="结束时间" size="small"
-                clear-icon="iconfont icon-guanbi"></el-date-picker>
+                clear-icon="iconfont icon-guanbi"></el-date-picker> 
             </template>
           </q-field>
         </div>
@@ -545,5 +544,4 @@
       }
     }
   }
-
 </script>
\ No newline at end of file

src/pages/sale/finishTask.vue

@@ -35,6 +35,8 @@
         </template>
         <template v-slot:body-cell-optioned="props">
           <q-td>
+            <q-btn v-if="props.row.ExchangeStatus==1" flat size="xs" icon="iconfont icon-view" style="font-weight:400" label="兑换"
+              @click="exchangeKudo(props.row)"  />
             <q-btn flat size="xs" icon="iconfont icon-view" style="font-weight:400" label="详情"
               @click="goToDetail(props.row)" />
           </q-td>
@@ -49,7 +51,8 @@
 </template>
 <script>
   import {
-    queryCustomerFinishtaskPage
+    queryCustomerFinishtaskPage,
+    saveExchangeKudo
   } from '../../api/sale/peemanagement';
 
   export default {
@@ -140,6 +143,32 @@
       this.getList()
     },
     methods: {
+      //兑换奖品
+      exchangeKudo(item) {
+        var postMsg = {
+          CustomerId: item.CustomerId,
+          ExchangeCode: item.ExchangeCode
+        };
+        saveExchangeKudo(postMsg).then(res => {
+          if (res.Code == 1) {
+            this.$q.notify({
+              icon: "iconfont icon-chenggong",
+              color: "accent",
+              timeout: 2000,
+              message: "兑换成功!",
+              position: "top",
+            });
+            this.getList();
+          } else {
+            this.$q.notify({
+              type: "negative",
+              message: "兑换失败!",
+              position: "top",
+              timeout: 2000,
+            });
+          }
+        })
+      },
       goToDetail(item) {
         this.OpenNewUrl('/sale/finishTaskDetails', {
           TaskId: item.TaskId,