end

src/views/merchant/list/handle/merEditForm.vue

@@ -93,6 +93,19 @@
               </el-form-item>
             </el-col>
           </el-row>
+		  <el-col :span="12">
+		      <el-form-item label="发放现金券：" prop="is_cash">
+		        <el-switch
+		          v-model="merData.is_cash"
+		          :active-value="1"
+		          :inactive-value="0"
+		          :width="50"
+		          active-text="是"
+		          inactive-text="否"
+		        />
+		      </el-form-item>
+		    </el-col>
+		  </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="排序：" prop="sort">

src/views/merchant/list/index.vue

@@ -140,6 +140,12 @@
             
           </template>
         </el-table-column>
+		<el-table-column prop="margin" label="现金券功能" min-width="150">
+		  <template slot-scope="scope">
+		    <span>{{scope.row.is_cash == 1 ? '开启' : '---'}}</span>
+		    
+		  </template>
+		</el-table-column>
         <el-table-column prop="sort" label="排序" min-width="100" />
         <el-table-column prop="mark" label="备注" min-width="200" />