合并代码

604bef98 · damodmg · f48cb82a · 604bef98 · 604bef98 · 604bef98
Commit 604bef98 authored Nov 14, 2018 by damodmg
8 changed files
--- a/dist/index.html
+++ b/dist/index.html
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/integral-mall/static/css/app.6caa95a4a966142c816ec420925bb1ea.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/integral-mall/static/js/manifest.003beacb9c9ae622c7f2.js></script><script type=text/javascript src=/integral-mall/static/js/vendor.7611b6f4ffb724a2700b.js></script><script type=text/javascript src=/integral-mall/static/js/app.9cad7656f251429e6425.js></script></body></html>
\ No newline at end of file
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/integral-mall/static/css/app.bdce448252ebc299b9adf868a076b6a0.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/integral-mall/static/js/manifest.003beacb9c9ae622c7f2.js></script><script type=text/javascript src=/integral-mall/static/js/vendor.dbbbfd2f879f6e7b00f5.js></script><script type=text/javascript src=/integral-mall/static/js/app.c0c7abbd1ba67e6847c7.js></script></body></html>
\ No newline at end of file
--- a/dist/static/css/app.6caa95a4a966142c816ec420925bb1ea.css
+++ b/dist/static/css/app.6caa95a4a966142c816ec420925bb1ea.css
--- a/dist/static/css/common.css
+++ b/dist/static/css/common.css
@@ -297,3 +297,12 @@ a:hover{
  color: #a3adb6;
  margin:14px 0;
 }
+/*去掉input数字框默认的上下三角*/
+input::-webkit-outer-spin-button,
+input::-webkit-inner-spin-button {
+  -webkit-appearance: none !important;
+  margin: 0; 
+}
+input[type="number"] {
+  -moz-appearance: textfield;
+}
--- a/dist/static/js/app.9cad7656f251429e6425.js
+++ b/dist/static/js/app.9cad7656f251429e6425.js
--- a/dist/static/js/app.c0c7abbd1ba67e6847c7.js
+++ b/dist/static/js/app.c0c7abbd1ba67e6847c7.js
--- a/dist/static/js/vendor.7611b6f4ffb724a2700b.js
+++ b/dist/static/js/vendor.7611b6f4ffb724a2700b.js
--- a/dist/static/js/vendor.dbbbfd2f879f6e7b00f5.js
+++ b/dist/static/js/vendor.dbbbfd2f879f6e7b00f5.js
--- a/src/views/mall/gift/info.vue
+++ b/src/views/mall/gift/info.vue
@@ -22,7 +22,6 @@
              @deleteImage="deleteImage">
          </vue-gic-upload-image>
        </div>
-          <!-- <dm-upload-avatar :model.sync="form.giftImg" label="上传图片" tips="规格750*750，大小≤1M"></dm-upload-avatar> -->
      </el-form-item>
      <el-form-item prop="proCategoryId" label="礼品分类">
        <el-select v-model="form.proCategoryId"  placeholder="请选择" class="w300">