测试门店组件

ca7cf93e · zhangmeng · c2327988 · ca7cf93e · ca7cf93e · c2327988
Commit ca7cf93e authored Nov 01, 2018 by zhangmeng
10 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.102f761e2a159950ae256038daa74d10.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.468b1a0927c2f59e9881.js></script><script type=text/javascript src=/integral-mall/static/js/app.1853cf779a6326ac584f.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.e283673409e035b2e21dbe4d915fc132.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.eed8e32e671448aae0c2.js></script><script type=text/javascript src=/integral-mall/static/js/app.7f84d32efa8cf00ba9f6.js></script></body></html>
\ No newline at end of file
--- a/dist/static/css/app.102f761e2a159950ae256038daa74d10.css
+++ b/dist/static/css/app.102f761e2a159950ae256038daa74d10.css
--- a/dist/static/js/app.1853cf779a6326ac584f.js
+++ b/dist/static/js/app.1853cf779a6326ac584f.js
--- a/dist/static/js/app.7f84d32efa8cf00ba9f6.js
+++ b/dist/static/js/app.7f84d32efa8cf00ba9f6.js
--- a/dist/static/js/vendor.468b1a0927c2f59e9881.js
+++ b/dist/static/js/vendor.468b1a0927c2f59e9881.js
--- a/dist/static/js/vendor.eed8e32e671448aae0c2.js
+++ b/dist/static/js/vendor.eed8e32e671448aae0c2.js
--- a/package-lock.json
+++ b/package-lock.json
@@ -94,6 +94,33 @@
        }
      }
    },
+    "@gic-test/vue-gic-store-new": {
+      "version": "file:@gic-test/vue-gic-store-new",
+      "integrity": "sha1-4rmjwqfMc0d8bsFQ3VT4BFKxdCU=",
+      "requires": {
+        "axios": "0.18.0",
+        "qs": "6.5.2",
+        "vue": "2.5.17"
+      },
+      "dependencies": {
+        "axios": {
+          "version": "0.18.0",
+          "bundled": true,
+          "requires": {
+            "follow-redirects": "1.5.8",
+            "is-buffer": "1.1.6"
+          }
+        },
+        "qs": {
+          "version": "6.5.2",
+          "bundled": true
+        },
+        "vue": {
+          "version": "2.5.17",
+          "bundled": true
+        }
+      }
+    },
    "@gic-test/vue-gic-upload-image": {
      "version": "1.0.35",
      "resolved": "http://www.gicdev.com:7001/@gic-test/vue-gic-upload-image/download/@gic-test/vue-gic-upload-image-1.0.35.tgz",

--- a/package.json
+++ b/package.json
@@ -15,6 +15,7 @@
    "@gic-test/vue-gic-header": "^1.3.31",
    "@gic-test/vue-gic-img-preview": "^1.0.13",
    "@gic-test/vue-gic-store-linkage": "^1.0.7",
+    "@gic-test/vue-gic-store-new": "^1.0.5",
    "@gic-test/vue-gic-upload-image": "^1.0.35",
    "@riophae/vue-treeselect": "^0.0.36",
    "axios": "^0.18.0",
@@ -24,6 +25,7 @@
    "vue": "^2.5.2",
    "vue-axios": "^2.1.1",
    "vue-router": "^3.0.1",
+    "vuedraggable": "^2.16.0",
    "vuex": "^3.0.1"
  },
  "devDependencies": {

--- a/src/main.js
+++ b/src/main.js
@@ -10,6 +10,10 @@ import vueGicImgPreview from '@gic-test/vue-gic-img-preview'
 import vueGicStoreLinkage from '@gic-test/vue-gic-store-linkage/src/lib'
 import vueGicAsideMenu from '@/components/aside-menu'
 import vueGicUploadImage from '@gic-test/vue-gic-upload-image/src/lib'
+
+import vueGicStoreNew from '@gic-test/vue-gic-store-new'
+Vue.use(vueGicStoreNew)
+
 import packele from 'packele'
 Vue.config.productionTip = false
 Vue.use(packele)

--- a/src/views/mall/coupon/list.vue
+++ b/src/views/mall/coupon/list.vue
 <template>
 <section class="dm-wrap">
+  <vue-gic-store-new :uuid.sync="uuid"></vue-gic-store-new>
    <div class="pb22 clearfix">
        <el-button class="fr" type="primary"  @click="$router.push('/coupon/info')">新增优惠券</el-button>
    </div>
@@ -68,6 +69,7 @@ export default {
    },
    data () {
      return {
+        uuid:'',
        defaultAvatar:require('../../../assets/img/head_default.png'),
        daijinAvatar:require('../../../assets/img/credit_daijin_icon.png'),
        zhekouAvatar:require('../../../assets/img/credit_zhekou_icon.png'),