Merge branch 'dev' into 'test'

Dev

See merge request quanshu/mp-ui-pc!79

src/views/business/coupon/add.vue

@@ -53,7 +53,11 @@
           <el-form-item label="使用说明:" prop="description">
             <el-input type="textarea" rows="4" :readonly="readonly" v-model="addData.description" placeholder="请输入使用说明 对用户可见"/>
           </el-form-item>
-          <el-form-item v-if="addData.type === 2" label="使用范围:" prop="useArea">进票门店</el-form-item>
+          <el-form-item v-if="addData.type === 2" label="使用范围:" prop="useArea">
+            <el-radio-group v-model="addData.useArea" :disabled="readonly">
+              <el-radio :label="2">进票门店</el-radio>
+            </el-radio-group>
+          </el-form-item>
           <el-form-item v-else label="使用范围:" prop="useArea">
             <el-radio-group v-model="addData.useArea" :disabled="readonly">
               <el-radio :label="0">所有盲票</el-radio>
@@ -210,4 +214,4 @@ export default {
   font-size: 12px;
   color: #888;
 }
-</style>
+</style>

src/views/business/ticket/index.vue

@@ -74,7 +74,7 @@
           >添加盲票组</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <!--<el-col :span="1.5">
         <el-button
           type="info"
           plain
@@ -96,7 +96,7 @@
           v-hasPermi="['business:ticket:export']"
           >导出</el-button
         >
-      </el-col>
+      </el-col>-->
 
       <el-col :span="1.5">
         <el-button