Merge branch 'master' of http://192.168.31.40:10101/r/Demay_New

src/pages/discount-coupon/getPay/index.vue

@@ -0,0 +1,12 @@
+<template>
+  领取消费
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style>
+</style>

src/pages/discount-coupon/issue/index.vue

@@ -0,0 +1,12 @@
+<template>
+  发布
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style>
+</style>

src/pages/discount-coupon/management/index.vue

@@ -0,0 +1,12 @@
+<template>
+  管理
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style>
+</style>

src/pages/storeManage/storeParameters/storeParameters.vue

@@ -2,12 +2,12 @@
 <template>
   <div class="parameters" style="margin-left: 20px">
     <div>
-      <!-- <div style="margin: 10px auto">
+      <div style="margin: 10px auto">
         <el-button type="primary" size="mini" v-if="headOffice!=1" @click="copy" v-role="4001003">同步总店参数</el-button>
         <el-button type="primary" size="mini" v-show="!editInput" @click="editInput = true,loading = false" v-role="4001003">修改</el-button>
         <el-button type="primary" size="mini" plain v-show="editInput" @click="getData( editInput = false,loading = false)" v-role="4001003">取消</el-button>
         <el-button type="success" size="mini" v-show="editInput" @click="editconfirm((loading = true))" :loading="loading" v-role="4001003">保存</el-button>
-      </div> -->
+      </div>
       <el-form :model="dataList" :inline="true" v-show="buttonShow" :style="{ color: !editInput ? '#bbb' : '' }">
         <el-row :gutter="10">
           <el-col class="div1" :xl="2">