Procházet zdrojové kódy

fix(design):修改公共样式

王忠青 před 1 rokem
rodič
revize
df2bd5de13

+ 0 - 6
src/App.vue

@@ -22,12 +22,6 @@
 
 <style lang="scss">
   @import 'uview-ui/index.scss';
-  @import url('design/background.css');
-  @import url('design/flex.css');
-  @import url('design/margin.css');
-  @import url('design/padding.css');
-  @import url('design/shadow.css');
-  @import url('design/text.css');
   @import url('design/common.css');
 
   page {

+ 0 - 0
src/api/client/system.js → src/api/system.js


+ 0 - 0
src/api/client/user.js → src/api/user.js


+ 0 - 209
src/design/background.css

@@ -1,209 +0,0 @@
-.chelvc-red {
-  background-color: #e54d42;
-  color: #ffffff;
-}
-
-.chelvc-orange {
-  background-color: #f37b1d;
-  color: #ffffff;
-}
-
-.chelvc-yellow {
-  background-color: #fbbd08;
-  color: #333333;
-}
-
-.chelvc-olive {
-  background-color: #8dc63f;
-  color: #ffffff;
-}
-
-.chelvc-green {
-  background-color: #39b54a;
-  color: #ffffff;
-}
-
-.chelvc-cyan {
-  background-color: #1cbbb4;
-  color: #ffffff;
-}
-
-.chelvc-blue {
-  background-color: #0081ff;
-  color: #ffffff;
-}
-
-.chelvc-purple {
-  background-color: #6739b6;
-  color: #ffffff;
-}
-
-.chelvc-mauve {
-  background-color: #9c26b0;
-  color: #ffffff;
-}
-
-.chelvc-pink {
-  background-color: #e03997;
-  color: #ffffff;
-}
-
-.chelvc-brown {
-  background-color: #a5673f;
-  color: #ffffff;
-}
-
-.chelvc-grey {
-  background-color: #8799a3;
-  color: #ffffff;
-}
-
-.chelvc-gray {
-  background-color: #f0f0f0;
-  color: #333333;
-}
-
-.chelvc-black {
-  background-color: #333333;
-  color: #ffffff;
-}
-
-.chelvc-white {
-  background-color: #ffffff;
-  color: #666666;
-}
-
-.chelvc-shadeTop {
-  background-image: linear-gradient(rgba(0, 0, 0, 1), rgba(0, 0, 0, 0.01));
-  color: #ffffff;
-}
-
-.chelvc-shadeBottom {
-  background-image: linear-gradient(rgba(0, 0, 0, 0.01), rgba(0, 0, 0, 1));
-  color: #ffffff;
-}
-
-.chelvc-red.light {
-  color: #e54d42;
-  background-color: #fadbd9;
-}
-
-.chelvc-orange.light {
-  color: #f37b1d;
-  background-color: #fde6d2;
-}
-
-.chelvc-yellow.light {
-  color: #fbbd08;
-  background-color: #fef2ced2;
-}
-
-.chelvc-olive.light {
-  color: #8dc63f;
-  background-color: #e8f4d9;
-}
-
-.chelvc-green.light {
-  color: #39b54a;
-  background-color: #d7f0dbff;
-}
-
-.chelvc-cyan.light {
-  color: #1cbbb4;
-  background-color: #d2f1f0;
-}
-
-.chelvc-blue.light {
-  color: #0081ff;
-  background-color: #cce6ff;
-}
-
-.chelvc-purple.light {
-  color: #6739b6;
-  background-color: #e1d7f0;
-}
-
-.chelvc-mauve.light {
-  color: #9c26b0;
-  background-color: #ebd4ef;
-}
-
-.chelvc-pink.light {
-  color: #e03997;
-  background-color: #f9d7ea;
-}
-
-.chelvc-brown.light {
-  color: #a5673f;
-  background-color: #ede1d9;
-}
-
-.chelvc-grey.light {
-  color: #8799a3;
-  background-color: #e7ebed;
-}
-
-.chelvc-gradual-red {
-  background-image: linear-gradient(45deg, #f43f3b, #ec008c);
-  color: #ffffff;
-}
-
-.chelvc-gradual-orange {
-  background-image: linear-gradient(45deg, #ff9700, #ed1c24);
-  color: #ffffff;
-}
-
-.chelvc-gradual-green {
-  background-image: linear-gradient(45deg, #39b54a, #8dc63f);
-  color: #ffffff;
-}
-
-.chelvc-gradual-purple {
-  background-image: linear-gradient(45deg, #9000ff, #5e00ff);
-  color: #ffffff;
-}
-
-.chelvc-gradual-pink {
-  background-image: linear-gradient(45deg, #ec008c, #6739b6);
-  color: #ffffff;
-}
-
-.chelvc-gradual-blue {
-  background-image: linear-gradient(45deg, #0081ff, #1cbbb4);
-  color: #ffffff;
-}
-
-.chelvc-1a1a1a {
-  background-color: #1a1a1a;
-  color: #ffffff;
-}
-
-.chelvc-gdBlue {
-  background-color: #2695fe;
-  color: #ffffff;
-}
-
-.chelvc-img {
-  background-size: cover;
-  background-position: center;
-  background-repeat: no-repeat;
-}
-
-.chelvc-mask {
-  background-color: #333333;
-  position: relative;
-}
-
-.chelvc-mask::after {
-  content: '';
-  border-radius: inherit;
-  width: 100%;
-  height: 100%;
-  display: block;
-  background-color: rgba(0, 0, 0, 0.4);
-  position: absolute;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  top: 0;
-}

+ 618 - 1
src/design/common.css

@@ -1,4 +1,621 @@
-/* 省略号*/
+/* ==================
+     flex弹性布局
+ ==================== */
+
+.chelvc-flex {
+  display: flex;
+}
+
+.chelvc-flex-item {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.chelvc-basis-xs {
+  flex-basis: 20%;
+}
+
+.chelvc-basis-sm {
+  flex-basis: 40%;
+}
+
+.chelvc-basis-df {
+  flex-basis: 50%;
+}
+
+.chelvc-basis-lg {
+  flex-basis: 60%;
+}
+
+.chelvc-basis-xl {
+  flex-basis: 80%;
+}
+
+.chelvc-flex-sub {
+  flex: 1;
+}
+
+.chelvc-flex-twice {
+  flex: 2;
+}
+
+.chelvc-flex-treble {
+  flex: 3;
+}
+
+.chelvc-flex-direction {
+  flex-direction: column;
+}
+
+.chelvc-flex-wrap {
+  flex-wrap: wrap;
+}
+
+.chelvc-align-start {
+  align-items: flex-start;
+}
+
+.chelvc-align-end {
+  align-items: flex-end;
+}
+
+.chelvc-chelvc-align-center {
+  align-items: center;
+}
+
+.chelvc-align-stretch {
+  align-items: stretch;
+}
+
+.chelvc-self-start {
+  align-self: flex-start;
+}
+
+.chelvc-self-center {
+  align-self: flex-center;
+}
+
+.chelvc-self-end {
+  align-self: flex-end;
+}
+
+.chelvc-self-stretch {
+  align-self: stretch;
+}
+
+.chelvc-align-stretch {
+  align-items: stretch;
+}
+
+.chelvc-justify-start {
+  justify-content: flex-start;
+}
+
+.chelvc-justify-end {
+  justify-content: flex-end;
+}
+
+.chelvc-justify-center {
+  justify-content: center;
+}
+
+.chelvc-justify-between {
+  justify-content: space-between;
+}
+
+.chelvc-justify-around {
+  justify-content: space-around;
+}
+
+/* ==================
+     外边距
+ ==================== */
+
+ .margin-0 {
+  margin: 0;
+}
+
+.margin-xs {
+  margin: 10upx;
+}
+
+.margin-sm {
+  margin: 20upx;
+}
+
+.margin {
+  margin: 30upx;
+}
+
+.margin-lg {
+  margin: 40upx;
+}
+
+.margin-xl {
+  margin: 50upx;
+}
+
+.margin-top-xs {
+  margin-top: 10upx;
+}
+
+.margin-top-sm {
+  margin-top: 20upx;
+}
+
+.margin-top {
+  margin-top: 30upx;
+}
+
+.margin-top-lg {
+  margin-top: 40upx;
+}
+
+.margin-top-xl {
+  margin-top: 50upx;
+}
+
+.margin-right-xs {
+  margin-right: 10upx;
+}
+
+.margin-right-sm {
+  margin-right: 20upx;
+}
+
+.margin-right {
+  margin-right: 30upx;
+}
+
+.margin-right-lg {
+  margin-right: 40upx;
+}
+
+.margin-right-xl {
+  margin-right: 50upx;
+}
+
+.margin-bottom-xs {
+  margin-bottom: 10upx;
+}
+
+.margin-bottom-sm {
+  margin-bottom: 20upx;
+}
+
+.margin-bottom {
+  margin-bottom: 30upx;
+}
+
+.margin-bottom-lg {
+  margin-bottom: 40upx;
+}
+
+.margin-bottom-xl {
+  margin-bottom: 50upx;
+}
+
+.margin-bottom-xxl {
+  margin-bottom: 140upx;
+}
+
+.margin-left-xs {
+  margin-left: 10upx;
+}
+
+.margin-left-sm {
+  margin-left: 20upx;
+}
+
+.margin-left {
+  margin-left: 30upx;
+}
+
+.margin-left-lg {
+  margin-left: 40upx;
+}
+
+.margin-left-xl {
+  margin-left: 50upx;
+}
+
+.margin-lr-xs {
+  margin-left: 10upx;
+  margin-right: 10upx;
+}
+
+.margin-lr-sm {
+  margin-left: 20upx;
+  margin-right: 20upx;
+}
+
+.margin-lr {
+  margin-left: 30upx;
+  margin-right: 30upx;
+}
+
+.margin-lr-lg {
+  margin-left: 40upx;
+  margin-right: 40upx;
+}
+
+.margin-lr-xl {
+  margin-left: 50upx;
+  margin-right: 50upx;
+}
+
+.margin-tb-xs {
+  margin-top: 10upx;
+  margin-bottom: 10upx;
+}
+
+.margin-tb-sm {
+  margin-top: 20upx;
+  margin-bottom: 20upx;
+}
+
+.margin-tb {
+  margin-top: 30upx;
+  margin-bottom: 30upx;
+}
+
+.margin-tb-lg {
+  margin-top: 40upx;
+  margin-bottom: 40upx;
+}
+
+.margin-tb-xl {
+  margin-top: 50upx;
+  margin-bottom: 50upx;
+}
+
+/* ==================
+     内边距
+ ==================== */
+
+ .padding-0 {
+  padding: 0;
+}
+
+.padding-xs {
+  padding: 10upx;
+}
+
+.padding-sm {
+  padding: 20upx;
+}
+
+.padding {
+  padding: 30upx;
+}
+
+.padding-lg {
+  padding: 40upx;
+}
+
+.padding-xl {
+  padding: 50upx;
+}
+
+.padding-top-xs {
+  padding-top: 10upx;
+}
+
+.padding-top-sm {
+  padding-top: 20upx;
+}
+
+.padding-top {
+  padding-top: 30upx;
+}
+
+.padding-top-lg {
+  padding-top: 40upx;
+}
+
+.padding-top-xl {
+  padding-top: 50upx;
+}
+
+.padding-right-xs {
+  padding-right: 10upx;
+}
+
+.padding-right-sm {
+  padding-right: 20upx;
+}
+
+.padding-right {
+  padding-right: 30upx;
+}
+
+.padding-right-lg {
+  padding-right: 40upx;
+}
+
+.padding-right-xl {
+  padding-right: 50upx;
+}
+
+.padding-bottom-xs {
+  padding-bottom: 10upx;
+}
+
+.padding-bottom-sm {
+  padding-bottom: 20upx;
+}
+
+.padding-bottom {
+  padding-bottom: 30upx;
+}
+
+.padding-bottom-lg {
+  padding-bottom: 40upx;
+}
+
+.padding-bottom-xl {
+  padding-bottom: 50upx;
+}
+
+.padding-left-xs {
+  padding-left: 10upx;
+}
+
+.padding-left-sm {
+  padding-left: 20upx;
+}
+
+.padding-left {
+  padding-left: 30upx;
+}
+
+.padding-left-lg {
+  padding-left: 40upx;
+}
+
+.padding-left-xl {
+  padding-left: 50upx;
+}
+
+.padding-left-xxl {
+  padding-left: 80upx;
+}
+
+.padding-lr-xs {
+  padding-left: 10upx;
+  padding-right: 10upx;
+}
+
+.padding-lr-sm {
+  padding-left: 20upx;
+  padding-right: 20upx;
+}
+
+.padding-lr {
+  padding-left: 30upx;
+  padding-right: 30upx;
+}
+
+.padding-lr-lg {
+  padding-left: 40upx;
+  padding-right: 40upx;
+}
+
+.padding-lr-xl {
+  padding-left: 50upx;
+  padding-right: 50upx;
+}
+
+.padding-tb-xs {
+  padding-top: 10upx;
+  padding-bottom: 10upx;
+}
+
+.padding-tb-sm {
+  padding-top: 20upx;
+  padding-bottom: 20upx;
+}
+
+.padding-tb {
+  padding-top: 30upx;
+  padding-bottom: 30upx;
+}
+
+.padding-tb-lg {
+  padding-top: 40upx;
+  padding-bottom: 40upx;
+}
+
+.padding-tb-xl {
+  padding-top: 50upx;
+  padding-bottom: 50upx;
+}
+
+
+/* ==================
+     文字
+ ==================== */
+
+ .text-xs {
+  font-size: 20upx;
+}
+
+.text-22 {
+  font-size: 22rpx;
+}
+
+.text-sm {
+  font-size: 24upx;
+}
+
+.text-df {
+  font-size: 28upx;
+}
+
+.text-lg {
+  font-size: 32upx;
+}
+
+.text-xl {
+  font-size: 36upx;
+}
+
+.text-xxl {
+  font-size: 44upx;
+}
+
+.text-xxxl {
+  font-size: 52upx;
+}
+
+.text-sl {
+  font-size: 80upx;
+}
+
+.text-xsl {
+  font-size: 120upx;
+}
+
+.text-Abc {
+  text-transform: Capitalize;
+}
+
+.text-ABC {
+  text-transform: Uppercase;
+}
+
+.text-abc {
+  text-transform: Lowercase;
+}
+
+.text-price::before {
+  content: '¥';
+  font-size: 80%;
+  margin-right: 4upx;
+}
+
+.text-cut {
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+}
+
+.text-bold {
+  font-weight: bold;
+}
+
+.text-center {
+  text-align: center;
+}
+
+.text-content {
+  line-height: 1.6;
+}
+
+.text-left {
+  text-align: left;
+}
+
+.text-right {
+  text-align: right;
+}
+
+.text-red,
+.line-red,
+.lines-red {
+  color: #e54d42;
+}
+
+.text-orange,
+.line-orange,
+.lines-orange {
+  color: #f37b1d;
+}
+
+.text-yellow,
+.line-yellow,
+.lines-yellow {
+  color: #fbbd08;
+}
+
+.text-olive,
+.line-olive,
+.lines-olive {
+  color: #8dc63f;
+}
+
+.text-green,
+.line-green,
+.lines-green {
+  color: #39b54a;
+}
+
+.text-cyan,
+.line-cyan,
+.lines-cyan {
+  color: #1cbbb4;
+}
+
+.text-blue,
+.line-blue,
+.lines-blue {
+  color: #0081ff;
+}
+
+.text-purple,
+.line-purple,
+.lines-purple {
+  color: #6739b6;
+}
+
+.text-mauve,
+.line-mauve,
+.lines-mauve {
+  color: #9c26b0;
+}
+
+.text-pink,
+.line-pink,
+.lines-pink {
+  color: #e03997;
+}
+
+.text-brown,
+.line-brown,
+.lines-brown {
+  color: #a5673f;
+}
+
+.text-grey,
+.line-grey,
+.lines-grey {
+  color: #8799a3;
+}
+
+.text-gray,
+.line-gray,
+.lines-gray {
+  color: #aaaaaa;
+}
+
+.text-black,
+.line-black,
+.lines-black {
+  color: #333333;
+}
+
+.text-white,
+.line-white,
+.lines-white {
+  color: #ffffff;
+}
+
+/* ==================
+     公共
+ ==================== */
+
+ /* 省略号*/
 .apostrophe {
   display: -webkit-box;
   overflow: hidden;

+ 0 - 109
src/design/flex.css

@@ -1,109 +0,0 @@
-/* ==================
-     flex弹性布局
- ==================== */
-
-.chelvc-flex {
-  display: flex;
-}
-
-.chelvc-flex-item {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-
-.chelvc-basis-xs {
-  flex-basis: 20%;
-}
-
-.chelvc-basis-sm {
-  flex-basis: 40%;
-}
-
-.chelvc-basis-df {
-  flex-basis: 50%;
-}
-
-.chelvc-basis-lg {
-  flex-basis: 60%;
-}
-
-.chelvc-basis-xl {
-  flex-basis: 80%;
-}
-
-.chelvc-flex-sub {
-  flex: 1;
-}
-
-.chelvc-flex-twice {
-  flex: 2;
-}
-
-.chelvc-flex-treble {
-  flex: 3;
-}
-
-.chelvc-flex-direction {
-  flex-direction: column;
-}
-
-.chelvc-flex-wrap {
-  flex-wrap: wrap;
-}
-
-.chelvc-align-start {
-  align-items: flex-start;
-}
-
-.chelvc-align-end {
-  align-items: flex-end;
-}
-
-.chelvc-chelvc-align-center {
-  align-items: center;
-}
-
-.chelvc-align-stretch {
-  align-items: stretch;
-}
-
-.chelvc-self-start {
-  align-self: flex-start;
-}
-
-.chelvc-self-center {
-  align-self: flex-center;
-}
-
-.chelvc-self-end {
-  align-self: flex-end;
-}
-
-.chelvc-self-stretch {
-  align-self: stretch;
-}
-
-.chelvc-align-stretch {
-  align-items: stretch;
-}
-
-.chelvc-justify-start {
-  justify-content: flex-start;
-}
-
-.chelvc-justify-end {
-  justify-content: flex-end;
-}
-
-.chelvc-justify-center {
-  justify-content: center;
-}
-
-.chelvc-justify-between {
-  justify-content: space-between;
-}
-
-.chelvc-justify-around {
-  justify-content: space-around;
-}

+ 0 - 0
src/design/index.scss


+ 0 - 157
src/design/margin.css

@@ -1,157 +0,0 @@
-.margin-0 {
-  margin: 0;
-}
-
-.margin-xs {
-  margin: 10upx;
-}
-
-.margin-sm {
-  margin: 20upx;
-}
-
-.margin {
-  margin: 30upx;
-}
-
-.margin-lg {
-  margin: 40upx;
-}
-
-.margin-xl {
-  margin: 50upx;
-}
-
-.margin-top-xs {
-  margin-top: 10upx;
-}
-
-.margin-top-sm {
-  margin-top: 20upx;
-}
-
-.margin-top {
-  margin-top: 30upx;
-}
-
-.margin-top-lg {
-  margin-top: 40upx;
-}
-
-.margin-top-xl {
-  margin-top: 50upx;
-}
-
-.margin-right-xs {
-  margin-right: 10upx;
-}
-
-.margin-right-sm {
-  margin-right: 20upx;
-}
-
-.margin-right {
-  margin-right: 30upx;
-}
-
-.margin-right-lg {
-  margin-right: 40upx;
-}
-
-.margin-right-xl {
-  margin-right: 50upx;
-}
-
-.margin-bottom-xs {
-  margin-bottom: 10upx;
-}
-
-.margin-bottom-sm {
-  margin-bottom: 20upx;
-}
-
-.margin-bottom {
-  margin-bottom: 30upx;
-}
-
-.margin-bottom-lg {
-  margin-bottom: 40upx;
-}
-
-.margin-bottom-xl {
-  margin-bottom: 50upx;
-}
-
-.margin-bottom-xxl {
-  margin-bottom: 140upx;
-}
-
-.margin-left-xs {
-  margin-left: 10upx;
-}
-
-.margin-left-sm {
-  margin-left: 20upx;
-}
-
-.margin-left {
-  margin-left: 30upx;
-}
-
-.margin-left-lg {
-  margin-left: 40upx;
-}
-
-.margin-left-xl {
-  margin-left: 50upx;
-}
-
-.margin-lr-xs {
-  margin-left: 10upx;
-  margin-right: 10upx;
-}
-
-.margin-lr-sm {
-  margin-left: 20upx;
-  margin-right: 20upx;
-}
-
-.margin-lr {
-  margin-left: 30upx;
-  margin-right: 30upx;
-}
-
-.margin-lr-lg {
-  margin-left: 40upx;
-  margin-right: 40upx;
-}
-
-.margin-lr-xl {
-  margin-left: 50upx;
-  margin-right: 50upx;
-}
-
-.margin-tb-xs {
-  margin-top: 10upx;
-  margin-bottom: 10upx;
-}
-
-.margin-tb-sm {
-  margin-top: 20upx;
-  margin-bottom: 20upx;
-}
-
-.margin-tb {
-  margin-top: 30upx;
-  margin-bottom: 30upx;
-}
-
-.margin-tb-lg {
-  margin-top: 40upx;
-  margin-bottom: 40upx;
-}
-
-.margin-tb-xl {
-  margin-top: 50upx;
-  margin-bottom: 50upx;
-}

+ 0 - 157
src/design/padding.css

@@ -1,157 +0,0 @@
-.padding-0 {
-  padding: 0;
-}
-
-.padding-xs {
-  padding: 10upx;
-}
-
-.padding-sm {
-  padding: 20upx;
-}
-
-.padding {
-  padding: 30upx;
-}
-
-.padding-lg {
-  padding: 40upx;
-}
-
-.padding-xl {
-  padding: 50upx;
-}
-
-.padding-top-xs {
-  padding-top: 10upx;
-}
-
-.padding-top-sm {
-  padding-top: 20upx;
-}
-
-.padding-top {
-  padding-top: 30upx;
-}
-
-.padding-top-lg {
-  padding-top: 40upx;
-}
-
-.padding-top-xl {
-  padding-top: 50upx;
-}
-
-.padding-right-xs {
-  padding-right: 10upx;
-}
-
-.padding-right-sm {
-  padding-right: 20upx;
-}
-
-.padding-right {
-  padding-right: 30upx;
-}
-
-.padding-right-lg {
-  padding-right: 40upx;
-}
-
-.padding-right-xl {
-  padding-right: 50upx;
-}
-
-.padding-bottom-xs {
-  padding-bottom: 10upx;
-}
-
-.padding-bottom-sm {
-  padding-bottom: 20upx;
-}
-
-.padding-bottom {
-  padding-bottom: 30upx;
-}
-
-.padding-bottom-lg {
-  padding-bottom: 40upx;
-}
-
-.padding-bottom-xl {
-  padding-bottom: 50upx;
-}
-
-.padding-left-xs {
-  padding-left: 10upx;
-}
-
-.padding-left-sm {
-  padding-left: 20upx;
-}
-
-.padding-left {
-  padding-left: 30upx;
-}
-
-.padding-left-lg {
-  padding-left: 40upx;
-}
-
-.padding-left-xl {
-  padding-left: 50upx;
-}
-
-.padding-left-xxl {
-  padding-left: 80upx;
-}
-
-.padding-lr-xs {
-  padding-left: 10upx;
-  padding-right: 10upx;
-}
-
-.padding-lr-sm {
-  padding-left: 20upx;
-  padding-right: 20upx;
-}
-
-.padding-lr {
-  padding-left: 30upx;
-  padding-right: 30upx;
-}
-
-.padding-lr-lg {
-  padding-left: 40upx;
-  padding-right: 40upx;
-}
-
-.padding-lr-xl {
-  padding-left: 50upx;
-  padding-right: 50upx;
-}
-
-.padding-tb-xs {
-  padding-top: 10upx;
-  padding-bottom: 10upx;
-}
-
-.padding-tb-sm {
-  padding-top: 20upx;
-  padding-bottom: 20upx;
-}
-
-.padding-tb {
-  padding-top: 30upx;
-  padding-bottom: 30upx;
-}
-
-.padding-tb-lg {
-  padding-top: 40upx;
-  padding-bottom: 40upx;
-}
-
-.padding-tb-xl {
-  padding-top: 50upx;
-  padding-bottom: 50upx;
-}

+ 0 - 115
src/design/shadow.css

@@ -1,115 +0,0 @@
-.shadow[class*='-red'] {
-  box-shadow: 6upx 6upx 8upx rgba(204, 69, 59, 0.2);
-}
-
-.shadow[class*='-orange'] {
-  box-shadow: 6upx 6upx 8upx rgba(217, 109, 26, 0.2);
-}
-
-.shadow[class*='-yellow'] {
-  box-shadow: 6upx 6upx 8upx rgba(224, 170, 7, 0.2);
-}
-
-.shadow[class*='-olive'] {
-  box-shadow: 6upx 6upx 8upx rgba(124, 173, 55, 0.2);
-}
-
-.shadow[class*='-green'] {
-  box-shadow: 6upx 6upx 8upx rgba(48, 156, 63, 0.2);
-}
-
-.shadow[class*='-cyan'] {
-  box-shadow: 6upx 6upx 8upx rgba(28, 187, 180, 0.2);
-}
-
-.shadow[class*='-blue'] {
-  box-shadow: 6upx 6upx 8upx rgba(0, 102, 204, 0.2);
-}
-
-.shadow[class*='-purple'] {
-  box-shadow: 6upx 6upx 8upx rgba(88, 48, 156, 0.2);
-}
-
-.shadow[class*='-mauve'] {
-  box-shadow: 6upx 6upx 8upx rgba(133, 33, 150, 0.2);
-}
-
-.shadow[class*='-pink'] {
-  box-shadow: 6upx 6upx 8upx rgba(199, 50, 134, 0.2);
-}
-
-.shadow[class*='-brown'] {
-  box-shadow: 6upx 6upx 8upx rgba(140, 88, 53, 0.2);
-}
-
-.shadow[class*='-grey'] {
-  box-shadow: 6upx 6upx 8upx rgba(114, 130, 138, 0.2);
-}
-
-.shadow[class*='-gray'] {
-  box-shadow: 6upx 6upx 8upx rgba(114, 130, 138, 0.2);
-}
-
-.shadow[class*='-black'] {
-  box-shadow: 6upx 6upx 8upx rgba(26, 26, 26, 0.2);
-}
-
-.shadow[class*='-white'] {
-  box-shadow: 6upx 6upx 8upx rgba(26, 26, 26, 0.2);
-}
-
-.text-shadow[class*='-red'] {
-  text-shadow: 6upx 6upx 8upx rgba(204, 69, 59, 0.2);
-}
-
-.text-shadow[class*='-orange'] {
-  text-shadow: 6upx 6upx 8upx rgba(217, 109, 26, 0.2);
-}
-
-.text-shadow[class*='-yellow'] {
-  text-shadow: 6upx 6upx 8upx rgba(224, 170, 7, 0.2);
-}
-
-.text-shadow[class*='-olive'] {
-  text-shadow: 6upx 6upx 8upx rgba(124, 173, 55, 0.2);
-}
-
-.text-shadow[class*='-green'] {
-  text-shadow: 6upx 6upx 8upx rgba(48, 156, 63, 0.2);
-}
-
-.text-shadow[class*='-cyan'] {
-  text-shadow: 6upx 6upx 8upx rgba(28, 187, 180, 0.2);
-}
-
-.text-shadow[class*='-blue'] {
-  text-shadow: 6upx 6upx 8upx rgba(0, 102, 204, 0.2);
-}
-
-.text-shadow[class*='-purple'] {
-  text-shadow: 6upx 6upx 8upx rgba(88, 48, 156, 0.2);
-}
-
-.text-shadow[class*='-mauve'] {
-  text-shadow: 6upx 6upx 8upx rgba(133, 33, 150, 0.2);
-}
-
-.text-shadow[class*='-pink'] {
-  text-shadow: 6upx 6upx 8upx rgba(199, 50, 134, 0.2);
-}
-
-.text-shadow[class*='-brown'] {
-  text-shadow: 6upx 6upx 8upx rgba(140, 88, 53, 0.2);
-}
-
-.text-shadow[class*='-grey'] {
-  text-shadow: 6upx 6upx 8upx rgba(114, 130, 138, 0.2);
-}
-
-.text-shadow[class*='-gray'] {
-  text-shadow: 6upx 6upx 8upx rgba(114, 130, 138, 0.2);
-}
-
-.text-shadow[class*='-black'] {
-  text-shadow: 6upx 6upx 8upx rgba(26, 26, 26, 0.2);
-}

+ 0 - 177
src/design/text.css

@@ -1,177 +0,0 @@
-/* ==================
-          文本
- ==================== */
-
-.text-xs {
-  font-size: 20upx;
-}
-
-.text-22 {
-  font-size: 22rpx;
-}
-
-.text-sm {
-  font-size: 24upx;
-}
-
-.text-df {
-  font-size: 28upx;
-}
-
-.text-lg {
-  font-size: 32upx;
-}
-
-.text-xl {
-  font-size: 36upx;
-}
-
-.text-xxl {
-  font-size: 44upx;
-}
-
-.text-xxxl {
-  font-size: 52upx;
-}
-
-.text-sl {
-  font-size: 80upx;
-}
-
-.text-xsl {
-  font-size: 120upx;
-}
-
-.text-Abc {
-  text-transform: Capitalize;
-}
-
-.text-ABC {
-  text-transform: Uppercase;
-}
-
-.text-abc {
-  text-transform: Lowercase;
-}
-
-.text-price::before {
-  content: '¥';
-  font-size: 80%;
-  margin-right: 4upx;
-}
-
-.text-cut {
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  overflow: hidden;
-}
-
-.text-bold {
-  font-weight: bold;
-}
-
-.text-center {
-  text-align: center;
-}
-
-.text-content {
-  line-height: 1.6;
-}
-
-.text-left {
-  text-align: left;
-}
-
-.text-right {
-  text-align: right;
-}
-
-.text-red,
-.line-red,
-.lines-red {
-  color: #e54d42;
-}
-
-.text-orange,
-.line-orange,
-.lines-orange {
-  color: #f37b1d;
-}
-
-.text-yellow,
-.line-yellow,
-.lines-yellow {
-  color: #fbbd08;
-}
-
-.text-olive,
-.line-olive,
-.lines-olive {
-  color: #8dc63f;
-}
-
-.text-green,
-.line-green,
-.lines-green {
-  color: #39b54a;
-}
-
-.text-cyan,
-.line-cyan,
-.lines-cyan {
-  color: #1cbbb4;
-}
-
-.text-blue,
-.line-blue,
-.lines-blue {
-  color: #0081ff;
-}
-
-.text-purple,
-.line-purple,
-.lines-purple {
-  color: #6739b6;
-}
-
-.text-mauve,
-.line-mauve,
-.lines-mauve {
-  color: #9c26b0;
-}
-
-.text-pink,
-.line-pink,
-.lines-pink {
-  color: #e03997;
-}
-
-.text-brown,
-.line-brown,
-.lines-brown {
-  color: #a5673f;
-}
-
-.text-grey,
-.line-grey,
-.lines-grey {
-  color: #8799a3;
-}
-
-.text-gray,
-.line-gray,
-.lines-gray {
-  color: #aaaaaa;
-}
-
-.text-black,
-.line-black,
-.lines-black {
-  color: #333333;
-}
-
-.text-white,
-.line-white,
-.lines-white {
-  color: #ffffff;
-}

+ 3 - 3
src/pages/client/clientPackage/category.vue

@@ -33,9 +33,9 @@
 </template>
 
 <script>
-  import {
-    buildTree
-  } from '@/utils/tools.js';
+  // import {
+  //   buildTree
+  // } from '@/utils/tools.js';
   import {
     maintainCategories
   } from '@/api/client/business.js';

+ 2 - 2
src/pages/client/clientPackage/uptickOrder.vue

@@ -139,8 +139,8 @@
 
 <script>
   import { generateOrder ,getCartList , generateConfirmOrder} from "@/api/client/business.js"
-  import { maintainCouponPaging } from "@/api/client/mine.js"
-  import { changeTime } from "@/utils/tools.js"
+//   import { maintainCouponPaging } from "@/api/client/mine.js"
+  import { changeTime } from "@/utils/date"
 	export default {
 		data() {
 			return {

+ 1 - 1
src/pages/client/tabBar/community/index.vue

@@ -73,7 +73,7 @@
 
 <script>
   import { clientContentList, addEvaulateRecords } from '@/api/client/community.js';
-  import { intervalTime } from "@/utils/tools.js"
+  // import { intervalTime } from "@/utils/tools.js"
   import communityPop from "@/components/communityPop/index.vue"
   import empty from "@/components/empty/index.vue"
   export default {

+ 1 - 1
src/store/modules/user.js

@@ -2,7 +2,7 @@
  * 用户基本信息
  */
 import { setCache, getCache } from '@/utils/cache';
-import { getUserInfo } from '../../api/client/user';
+import { getUserInfo } from '@/api/user';
 
 export default {
   state: () => ({

+ 57 - 3
src/utils/date.js

@@ -1,11 +1,11 @@
 /**
- *@description  格式化时间戳
+ * @description  格式化时间戳
  * @param {String} format  YYYY-MM-DD hh:mm:ss
  * @param {String} daytime 时间戳,单位为毫秒
  * @returns 返回格式化后的时间字符串
  */
 
-function formatTime(daytime, format = 'YYYY-MM-DD hh:mm:ss') {
+ export function formatTime(daytime, format = 'YYYY-MM-DD hh:mm:ss') {
   const date = new Date(daytime);
   const year = date.getFullYear();
   const month = ('0' + (date.getMonth() + 1)).slice(-2);
@@ -25,4 +25,58 @@ function formatTime(daytime, format = 'YYYY-MM-DD hh:mm:ss') {
   return format.replace(/YYYY|MM|DD|hh|mm|ss/g, matched => map[matched]);
 }
 
-export { formatTime };
+
+
+/**
+ * 
+ * @param {*} endTime 
+ * @returns 
+ */
+
+export function intervalTime( endTime) {
+  // var timestamp=new Date().getTime(); //计算当前时间戳
+  var date1 = new Date().getTime() //计算当前时间戳 (毫秒级)
+
+  var date2 = endTime; //结束时间
+  // var date3 = date2.getTime() - date1.getTime(); //时间差的毫秒数
+  var date3 = (date1 - date2) * 1000; //时间差的毫秒数
+  //计算出相差天数
+  var days = Math.floor(date3 / (24 * 3600 * 1000));
+  if (days < 0) {
+    days = days * (-1)
+  }
+  //计算出小时数
+  var leave1 = date3 % (24 * 3600 * 1000); //计算天数后剩余的毫秒数
+  var hours = Math.floor(leave1 / (3600 * 1000));
+  //计算相差分钟数
+  var leave2 = leave1 % (3600 * 1000); //计算小时数后剩余的毫秒数
+  var minutes = Math.floor(leave2 / (60 * 1000));
+
+  //计算相差秒数
+  var leave3 = leave2 % (60 * 1000); //计算分钟数后剩余的毫秒数
+  var seconds = Math.round(leave3 / 1000);
+  console.log(days + "天 " + hours + "小时 ")
+  // return   days + "天 " + hours + "小时 " + minutes + " 分钟" + seconds + " 秒"
+  return days + "天 " + hours + "小时 "
+}
+
+
+/**
+ * 
+ * @param {*} e 
+ * @returns 
+ */
+
+export function changeTime(e){
+  let time = new Date(e)
+  let year = time.getFullYear()
+  let month = time.getMonth() + 1
+  let date = time.getDate()
+  if (month < 10) {
+    month = '0' + month
+  }
+  if (date < 10) {
+    date = '0' + date
+  }
+  return year + '-' + month + '-' + date
+}

+ 6 - 39
src/utils/tools.js

@@ -1,3 +1,9 @@
+/**
+ * @description  tree的处理
+ * @param {Array} data 
+ * @returns 
+ */
+
 export function buildTree(data) {
   const tree = {};
 
@@ -23,43 +29,4 @@ export function buildTree(data) {
   return Object.values(tree);
 }
 
-export function intervalTime( endTime) {
-  // var timestamp=new Date().getTime(); //计算当前时间戳
-  var date1 = new Date().getTime() //计算当前时间戳 (毫秒级)
-
-  var date2 = endTime; //结束时间
-  // var date3 = date2.getTime() - date1.getTime(); //时间差的毫秒数
-  var date3 = (date1 - date2) * 1000; //时间差的毫秒数
-  //计算出相差天数
-  var days = Math.floor(date3 / (24 * 3600 * 1000));
-  if (days < 0) {
-    days = days * (-1)
-  }
-  //计算出小时数
-  var leave1 = date3 % (24 * 3600 * 1000); //计算天数后剩余的毫秒数
-  var hours = Math.floor(leave1 / (3600 * 1000));
-  //计算相差分钟数
-  var leave2 = leave1 % (3600 * 1000); //计算小时数后剩余的毫秒数
-  var minutes = Math.floor(leave2 / (60 * 1000));
 
-  //计算相差秒数
-  var leave3 = leave2 % (60 * 1000); //计算分钟数后剩余的毫秒数
-  var seconds = Math.round(leave3 / 1000);
-  console.log(days + "天 " + hours + "小时 ")
-  // return   days + "天 " + hours + "小时 " + minutes + " 分钟" + seconds + " 秒"
-  return days + "天 " + hours + "小时 "
-}
-
-export function changeTime(e){
-  let time = new Date(e)
-  let year = time.getFullYear()
-  let month = time.getMonth() + 1
-  let date = time.getDate()
-  if (month < 10) {
-    month = '0' + month
-  }
-  if (date < 10) {
-    date = '0' + date
-  }
-  return year + '-' + month + '-' + date
-}