From 424496d4b8346e673c8b62743b6149384e46a14f Mon Sep 17 00:00:00 2001
From: Junling Bu <linlinjavaer@gmail.com>
Date: Sun, 12 May 2019 00:30:39 +0800
Subject: [PATCH] =?UTF-8?q?chore[litemall-vue]:=20=E5=88=A0=E9=99=A4spinne?=
 =?UTF-8?q?r?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 litemall-vue/src/assets/scss/global.scss      | 87 +++++++++----------
 litemall-vue/src/assets/scss/spinner.scss     | 53 -----------
 litemall-vue/src/components/spinner/index.js  |  3 -
 .../src/components/spinner/spinner.vue        | 11 ---
 litemall-vue/src/mixin/get-shop-info.js       | 23 -----
 5 files changed, 43 insertions(+), 134 deletions(-)
 delete mode 100644 litemall-vue/src/assets/scss/spinner.scss
 delete mode 100644 litemall-vue/src/components/spinner/index.js
 delete mode 100644 litemall-vue/src/components/spinner/spinner.vue
 delete mode 100644 litemall-vue/src/mixin/get-shop-info.js

diff --git a/litemall-vue/src/assets/scss/global.scss b/litemall-vue/src/assets/scss/global.scss
index a99052c2..74718cd7 100755
--- a/litemall-vue/src/assets/scss/global.scss
+++ b/litemall-vue/src/assets/scss/global.scss
@@ -1,45 +1,44 @@
-@import "./var";
-@import "mixin";
-
-@import "./common";
-@import "./vant-theme";
-@import "./spinner";
-
-* {
-	box-sizing: border-box;
-}
-
-a {
-	color: #000
-}
-
-input:-webkit-autofill {
-	-webkit-box-shadow: 0 0 0 1000px white inset;
-}
-
-html {
-	-webkit-overflow-scrolling: touch;
-}
-
-body {
-	overflow-x: hidden;
-	max-width: 700px;
-	margin: 0 auto;
-	font-size: 14px;
-}
-
-.view-router {
-	background-color: $bg-color;
-	height: 100vh;
-	overflow-y: auto;
-	padding-bottom: 50px;
-	box-sizing: border-box;
-}
-
-.full-page {
-	height: 100vh;
-}
-
-.scroll-wrap {
-	overflow-y: scroll;
+@import "./var";
+@import "mixin";
+
+@import "./common";
+@import "./vant-theme";
+
+* {
+	box-sizing: border-box;
+}
+
+a {
+	color: #000
+}
+
+input:-webkit-autofill {
+	-webkit-box-shadow: 0 0 0 1000px white inset;
+}
+
+html {
+	-webkit-overflow-scrolling: touch;
+}
+
+body {
+	overflow-x: hidden;
+	max-width: 700px;
+	margin: 0 auto;
+	font-size: 14px;
+}
+
+.view-router {
+	background-color: $bg-color;
+	height: 100vh;
+	overflow-y: auto;
+	padding-bottom: 50px;
+	box-sizing: border-box;
+}
+
+.full-page {
+	height: 100vh;
+}
+
+.scroll-wrap {
+	overflow-y: scroll;
 }
\ No newline at end of file
diff --git a/litemall-vue/src/assets/scss/spinner.scss b/litemall-vue/src/assets/scss/spinner.scss
deleted file mode 100644
index 47a08e50..00000000
--- a/litemall-vue/src/assets/scss/spinner.scss
+++ /dev/null
@@ -1,53 +0,0 @@
-@keyframes lds-ball {
-  0%, 100% {
-    animation-timing-function: cubic-bezier(0.45, 0, 0.9, 0.55);
-  }
-  0% {
-    -webkit-transform: translate(0, 0);
-    transform: translate(0, 0);
-  }
-  50% {
-    -webkit-transform: translate(0, 108px);
-    transform: translate(0, 108px);
-    animation-timing-function: cubic-bezier(0, 0.45, 0.55, 0.9);
-  }
-  100% {
-    -webkit-transform: translate(0, 0);
-    transform: translate(0, 0);
-  }
-}
-@-webkit-keyframes lds-ball {
-  0%, 100% {
-    animation-timing-function: cubic-bezier(0.45, 0, 0.9, 0.55);
-  }
-  0% {
-    -webkit-transform: translate(0, 0);
-    transform: translate(0, 0);
-  }
-  50% {
-    -webkit-transform: translate(0, 108px);
-    transform: translate(0, 108px);
-    animation-timing-function: cubic-bezier(0, 0.45, 0.55, 0.9);
-  }
-  100% {
-    -webkit-transform: translate(0, 0);
-    transform: translate(0, 0);
-  }
-}
-.lds-ball {
-  position: relative;
-}
-.lds-ball div {
-  width: 52px;
-  height: 52px;
-  border-radius: 50%;
-  background: #e15b64;
-  -webkit-animation: lds-ball 1s linear infinite;
-  animation: lds-ball 1s linear infinite;
-}
-.lds-ball {
-  position: fixed;
-  left: 50%;
-  top: 30%;
-  transform: translateX(-50%);
-}
\ No newline at end of file
diff --git a/litemall-vue/src/components/spinner/index.js b/litemall-vue/src/components/spinner/index.js
deleted file mode 100644
index 2b361bef..00000000
--- a/litemall-vue/src/components/spinner/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import spinner from './spinner';
-
-export default spinner;
diff --git a/litemall-vue/src/components/spinner/spinner.vue b/litemall-vue/src/components/spinner/spinner.vue
deleted file mode 100644
index 23271bbc..00000000
--- a/litemall-vue/src/components/spinner/spinner.vue
+++ /dev/null
@@ -1,11 +0,0 @@
-<template>
-<div>
-  <div class="lds-ball">
-    <div></div>
-  </div>
-</div>
-</template>
-
-<script>
-export default {};
-</script>
diff --git a/litemall-vue/src/mixin/get-shop-info.js b/litemall-vue/src/mixin/get-shop-info.js
deleted file mode 100644
index 1f0c74b7..00000000
--- a/litemall-vue/src/mixin/get-shop-info.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import { SHOPINFO } from '@/api/shop';
-
-export default {
-  methods: {
-    getShopInfo(...keys) {
-      return new Promise((resolve, reject) => {
-        const id = window.sessionStorage.getItem('id');
-        if (id === null) {
-          const shop_id = this.$util.getLocationParam('shop_id');
-          this.$reqGet(`${SHOPINFO}/${shop_id}`)
-            .then(res => {
-              const { data } = res.data;
-              this.$util.setSessionStorage(data);
-              resolve(data);
-            })
-            .catch(reject);
-        } else {
-          resolve(this.$util.getSessionStorage(...keys));
-        }
-      });
-    }
-  }
-};