Merge branch 'dev' of maopiao/mp-ui-pc into test

src/views/business/exchange/index.vue

@@ -3,7 +3,7 @@
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
 
       <el-form-item label="兑换码名称">
-        <el-input v-model="queryParams.title" placeholder="最大值" @change="pageParams.pageNum = 1;handleQuery()" clearable @keyup.enter.native="pageParams.pageNum = 1;handleQuery()" />
+        <el-input v-model="queryParams.title" placeholder="请输入兑换码名称" @change="pageParams.pageNum = 1;handleQuery()" clearable @keyup.enter.native="pageParams.pageNum = 1;handleQuery()" />
       </el-form-item>
       <el-form-item label="创建日期">
         <el-date-picker v-model="addTimeArr" type="datetimerange" size="small" value-format="timestamp" range-separator="至" start-placeholder="时间选择" end-placeholder="时间选择" @change="addTime">
@@ -81,7 +81,7 @@
       <el-table-column label="状态" prop="status" align="center">
         <template slot-scope="{ row }">
           <el-tag type="warning" v-if="row.status && JSON.parse(row.status).value == 'waiting'">待生成</el-tag>
-          <el-tag type="success" v-if="row.status && JSON.parse(row.status).value == 'nonactivated'">未激活</el-tag>
+          <el-tag type="success" v-if="row.status && JSON.parse(row.status).value == 'noactive'">待激活</el-tag>
           <el-tag type="" v-if="row.status && JSON.parse(row.status).value == 'activated'">已生效</el-tag>
           <el-tag type="info" v-if="row.status && JSON.parse(row.status).value == 'invalid'">已失效</el-tag>
         </template>
@@ -90,7 +90,7 @@
         <template slot-scope="{ row }">
           <div>
             <el-button v-hasPermi="['business:exchange:detail']" type="text" @click="$router.push({ path: '/exchange/detailCode',query: {id: row.groupId} })">查看</el-button>
-            <el-button v-if="row.status && JSON.parse(row.status).value == 'nonactivated'" v-hasPermi="['business:exchange:edit']" type="text" @click="setStatus(row)">激活</el-button>
+            <el-button v-if="row.status && JSON.parse(row.status).value == 'noactive'" v-hasPermi="['business:exchange:edit']" type="text" @click="setStatus(row)">激活</el-button>
           </div>
         </template>
       </el-table-column>
@@ -209,7 +209,7 @@ export default {
     //激活兑换码
     setStatus(item) {
       this.$confirm(
-        `确认激活兑换码 “${item.groupId}” 吗？`,
+        `确认激活兑换码 “${item.title}” 吗？`,
         `激活兑换码`,
         {
           confirmButtonText: "确定",