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

src/views/business/exchange/index.vue

@@ -45,7 +45,7 @@
     </el-form>
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" icon="el-icon-plus" size="mini" @click="$router.push({ path: '/exchange/addCode' })" v-hasPermi="['business:exchange:add']">创建兑换码</el-button>
+        <el-button type="primary" icon="el-icon-plus" size="mini" @click="$router.push({ path: '/exchange/addCode' })" v-hasPermi="['business:cdKey:add']">创建兑换码</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -55,7 +55,7 @@
           size="mini"
           :loading="exportLoading"
           @click="handleExport"
-          v-hasPermi="['business:exchange:export']"
+          v-hasPermi="['business:cdKey:export']"
           >导出兑换码</el-button
         >
       </el-col>
@@ -89,8 +89,8 @@
       <el-table-column label="操作" align="center">
         <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 == 'noactive'" v-hasPermi="['business:exchange:edit']" type="text" @click="setStatus(row)">激活</el-button>
+            <el-button v-hasPermi="['business:cdKey:query']" 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 == 'noactive'" v-hasPermi="['business:cdKey:activate']" type="text" @click="setStatus(row)">激活</el-button>
           </div>
         </template>
       </el-table-column>

src/views/business/salesite/components/Create.vue

@@ -159,8 +159,8 @@
 
       </flexbox>
       <flexbox class="ygp-form-items" align="flex-start" justify="flex-start">
-         <el-form-item label="认证状态" prop="certifyStatus" style="width: 50%;">
-          <el-checkbox v-model="form.certifyStatus">已认证</el-checkbox>
+         <el-form-item label="信息状态" prop="certifyStatus" style="width: 50%;">
+          <el-checkbox v-model="form.certifyStatus">已补充</el-checkbox>
          </el-form-item>
       </flexbox>
     </el-form>

src/views/business/salesite/index.vue

@@ -139,7 +139,7 @@
           {{ parseTime(row.createdTime) }}
         </template>
       </el-table-column>
-      <el-table-column label="认证状态" prop="certifyStatus" >
+      <el-table-column label="信息状态" prop="certifyStatus" >
         <template slot-scope="{ row }">
              <span v-if="getValue(row.certifyStatus) == 'y'" style="color: blue;"> {{getDesc(row.certifyStatus)}}</span>
              <span v-if="getValue(row.certifyStatus) == 'n'" style="color: red;"> {{getDesc(row.certifyStatus)}}</span>