Merge branch 'feature/福利中心-礼品管理' into dev

# Conflicts:
#	dist/index.html
#	dist/js/app.3e0abf53.js

src/views/gift-manage/real-gift-detail.vue

@@ -107,7 +107,7 @@
                         <dm-input-amount v-model.trim="handleData.giftSkuCostPrice" width="140" style="margin-left:-2px;" controls-position="right" precision="2" :min="0" :max="999999.99"></dm-input-amount>
                       </div>
                       <div class="popver-button" style="margin-top:18px;text-align:right">
-                        <el-button type="dafault" size="small" @click="$refs.popover3.showPopper = false">取消</el-button>
+                        <el-button type="dafault" class="cancel-style" size="small" @click="$refs.popover3.showPopper = false">取消</el-button>
                         <el-button type="primary" size="small" class="ml10 ml10" @click="handleCostPrice">确认</el-button>
                       </div>
                       <el-tooltip slot="reference" popper-class="batch-style" visible-arrow placement="top" content="批量编辑">
@@ -129,7 +129,7 @@
                         <dm-input-number v-model.trim="handleData.stock" width="140" style="margin-left:-2px;" controls-position="right" precision="0" :min="0" :max="999999"></dm-input-number>
                       </div>
                       <div class="popver-button" style="margin-top:18px;text-align:right">
-                        <el-button type="dafault" size="small" @click="$refs.popover2.showPopper = false">取消</el-button>
+                        <el-button type="dafault" class="cancel-style" size="small" @click="$refs.popover2.showPopper = false">取消</el-button>
                         <el-button type="primary" size="small" class="ml10 ml10" @click="handleStock">确认</el-button>
                       </div>
                       <el-tooltip slot="reference" popper-class="batch-style" visible-arrow placement="top" content="批量编辑">
@@ -146,10 +146,10 @@
                     <span>sku编码</span>
                     <el-popover placement="top" trigger="click" ref="popover1">
                       <div>
-                        <el-input class="hidden-limit" v-model.trim="handleData.giftSkuCode" width="140" @blur="handleValiedSkuCode(handleData.giftSkuCode, '', 1)" style="margin-left:-2px;"></el-input>
+                        <el-input class="hidden-limit" placeholder="请输入" v-model.trim="handleData.giftSkuCode" width="140" @blur="handleValiedSkuCode(handleData.giftSkuCode, '', 1)" style="margin-left:-2px;"></el-input>
                       </div>
                       <div class="popver-button" style="margin-top:18px;text-align:right">
-                        <el-button type="dafault" size="small" @click="$refs.popover1.showPopper = false">取消</el-button>
+                        <el-button type="dafault" class="cancel-style" size="small" @click="$refs.popover1.showPopper = false">取消</el-button>
                         <el-button type="primary" size="small" class="ml10 ml10" @click="handleSkuCode">确认</el-button>
                       </div>
                       <el-tooltip slot="reference" popper-class="batch-style" visible-arrow placement="top" content="批量编辑">
@@ -166,10 +166,10 @@
                     <span>礼品条形码</span>
                     <el-popover placement="top" trigger="click" ref="popover">
                       <div>
-                        <el-input class="hidden-limit" v-model.trim="handleData.skuBarCode" width="140" @blur="handleValiedskuBarCode(handleData.skuBarCode, '', 1)" style="margin-left:-2px;"></el-input>
+                        <el-input class="hidden-limit" placeholder="请输入" v-model.trim="handleData.skuBarCode" width="140" @blur="handleValiedskuBarCode(handleData.skuBarCode, '', 1)" style="margin-left:-2px;"></el-input>
                       </div>
                       <div class="popver-button" style="margin-top:18px;text-align:right">
-                        <el-button type="dafault" size="small" @click="$refs.popover.showPopper = false">取消</el-button>
+                        <el-button type="dafault" class="cancel-style" size="small" @click="$refs.popover.showPopper = false">取消</el-button>
                         <el-button type="primary" size="small" class="ml10 ml10" @click="handleBarCode">确认</el-button>
                       </div>
                       <el-tooltip slot="reference" popper-class="batch-style" visible-arrow placement="top" content="批量编辑">
@@ -1816,4 +1816,16 @@ export default {
   border-radius: 4px;
   padding: 5px !important;
 }
+.popver-button .el-button{
+  min-width: auto !important;
+  vertical-align: top;
+  line-height: 22px;
+  padding: 0 5px;
+  font-size: 12px;
+}
+.popver-button .el-button.cancel-style:focus, .el-button.cancel-style:hover {
+  color: #2f54eb !important;
+  border-color: #2f54eb !important;
+  background-color: #fff !important;
+}
 </style>