Merge branch 'litemall-vue' of https://github.com/pkwenda/litemall into pkwenda-litemall-vue

litemall-vue/src/assets/scss/_mixin.scss

+@import "./mixin/one-border";
\ No newline at end of file

litemall-vue/src/assets/scss/_vant-theme.scss

+//loading
+.van-loading--gradient-circle, .van-loading--spinner{
+	margin: 0 auto;
+}
+//tabber
+div.van-tabbar-item--active {
+	color: $red;
+}
+
+.van-tabbar-item__icon .van-icon{
+	font-size: 18px;
+}
+
+//按钮组
+a.van-goods-action__mini-btn i {
+	font-size: 22px;
+}
+
+.van-goods-action .van-button--bottom-action {
+	font-size: $font-size-normal;
+}
+
+.van-button--bottom-action.van-button--primary {
+	background-color: $red;
+}
+
+.van-button--danger {
+	background-color: $red;
+}
+
+.van-address-edit__buttons .van-button--primary{
+	background-color: $red;
+	border-color: $red;
+}
+
+// 多选
+.van-checkbox__control:checked + i.van-icon-success {
+	background-color: $red;
+	border-color: $red;
+}
+
+//单选
+.van-radio i.van-icon-checked {
+	color: $red;
+}
+
+.payment .van-cell-group .van-radio__input{
+	position: absolute;
+	right: 10px;
+	top: 50%;
+	transform: translate3d(0, -50%, 0);
+}
+.van-radio .van-radio__input{
+	height: 16px;
+}
+.van-radio i.van-icon{
+	font-size: 16px;
+}
+span.van-radio__input, span.van-radio__label{
+	vertical-align: unset;
+	line-height: 16px;
+}
+.van-cell-group .van-radio__label{
+	margin-left: 0;
+}
+
+//弹窗
+.van-dialog__confirm,
+.van-dialog__confirm:active {
+	color: $red;
+}
+
+//商品卡片
+.van-card__footer {
+	width: 100%;
+	padding-left: 130px;
+	box-sizing: border-box;
+}
+
+div.van-card {
+	font-size: $font-size-normal;
+	background-color: #fff;
+}
+
+div.van-card__footer {
+	font-size: 12px;	
+	color: $font-color-gray;
+}
+
+//cell
+.van-cell__title{
+	vertical-align: middle;
+}
+
+//商品详情
+.item_detail .van-picker__cancel {
+	color: #000;
+}
+
+.item_detail .van-picker__confirm {
+	color: $red;
+}
+
+//购物车
+.tab-cart > .card-goods .van-checkbox {
+	padding-left: 10px;
+	box-sizing: border-box;
+}
+
+.tab-cart > .card-goods .van-card {
+	flex: 1;
+}
+.tab-cart .van-card:not(:first-child){
+	margin-top: 0;
+	padding-top: 10px;
+	padding-bottom: 10px;
+}
+
+//设置昵称
+.set_nickname .van-field__control{
+	text-align: right
+}
+
+//商品列表
+.item_list .van-tab--disabled{
+	color: #000;
+}

litemall-vue/src/assets/scss/_var.scss

+$red: #db3d3c;
+$gray-deep: #999;
+$gray: #bfbfbf;
+$gray-shallow: #e5e5e5;
+$gray-shallow-more: #f2f2f2;
+
+$icon-bg: #f9f3e8;
+
+//字体变量
+$font-color-gray: $gray-deep;
+$font-size-small: 12px;
+$font-size-normal: 14px;
+$font-size-big: 16px;
+
+$border-color: $gray-shallow;
+$bg-color: $gray-shallow-more;
\ No newline at end of file

litemall-vue/src/assets/scss/common.scss

+.red{
+	color: $red;
+}
+
+.text-desc{
+	font-size:$font-size-small;
+	color: $font-color-gray;
+}
+
+.float-r {
+	float: right;
+}
+
+.float-l {
+	float: left;
+}
+
+.clearfix {
+  &:before,
+  &:after {
+    content: " "; // 1
+    display: table; // 2
+  }
+  &:after {
+    clear: both;
+  }
+}
+
+.one_border {
+	@include one-border;
+}
+
+.one_border:last-child::after {
+	border-bottom-width: 0px;
+}
+
+.van-hairline--top-bottom::after {
+  border-width: 1px 0;
+  border-top-width: 0px;
+  border-right-width: 0px;
+  border-bottom-width: 0px;
+  border-left-width: 0px;
+}
+
+.text-center{
+	text-align: center;
+}
+
+.over-hide {
+  overflow: hidden !important;
+}
+
+.no-pad-bottom {
+  padding-bottom: 0 !important;
+}
+
+.height-fix42 {
+  padding-bottom: 42px;
+}
\ No newline at end of file

litemall-vue/src/assets/scss/global.scss

+@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;
+}
\ No newline at end of file

litemall-vue/src/assets/scss/iconfont/iconfont.css

+@font-face {
+	font-family: "iconfont";
+	src: url('./iconfont.ttf') format('truetype');
+}
+
+@font-face {
+	font-family: "vanIcon";
+	src: url(https://b.yzcdn.cn/zanui/icon/vant-icon-4c3245.ttf) format('truetype');
+}
+
+.van-icon {
+	position: relative;
+	font-family: "iconfont", "vanIcon" !important;
+	font-size: 14px;
+	font-style: normal;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+}
+
+i.van-icon-huida:before {
+	content: "\e678";
+}
+
+i.van-icon-wen:before {
+	content: "\e715";
+}
+
+i.van-icon-wuliu:before {
+	content: "\e640";
+}
+
+i.van-icon-hint:before {
+	content: "\e62a";
+}
+
+i.van-icon-add:before {
+	content: "\e64f";
+}
+
+i.van-icon-miaosha:before {
+	content: "\e68f";
+}
+
+i.van-icon-lock:before {
+	content: "\e60c";
+}
+
+i.van-icon-wode:before {
+	content: "\e604";
+}
+
+i.van-icon-checked:before {
+	content: "\e607";
+}
+
+i.van-icon-check:before {
+	content: "\e628";
+}
+
+i.van-icon-leimu:before {
+	content: "\e703";
+}
+
+i.van-icon-camera_full:before {
+	content: "\e618";
+}
+
+i.van-icon-cart-full:before {
+	content: "\e73c";
+}
+
+i.van-icon-cart:before {
+	content: "\e73d";
+}
+
+i.van-icon-miaosha-copy:before {
+	content: "\e601";
+}
+
+i.van-icon-id-card:before {
+	content: "\e61e";
+}
+
+i.van-icon-compass-full:before {
+	content: "\e7ac";
+}
+
+i.van-icon-fail:before {
+	content: "\e609";
+}
+
+i.van-icon-success:before {
+	content: "\e626";
+}
+
+i.van-icon-wangwang-full:before {
+	content: "\e605";
+}
+
+i.van-icon-daifahuo:before {
+	content: "\e642";
+}
+
+i.van-icon-arrowupcircle:before {
+	content: "\e6cf";
+}
+
+i.van-icon-class-full:before {
+	content: "\e7f8";
+}
+
+i.van-icon-fenxiang:before {
+	content: "\e610";
+}
+
+i.van-icon-gold-bean:before {
+	content: "\e629";
+}
+
+i.van-icon-coupon-due:before {
+	content: "\e6dd";
+}
+
+i.van-icon-coupon-used:before {
+	content: "\e6df";
+}
+
+i.van-icon-team:before {
+	content: "\e65d";
+}
+
+i.van-icon-dingwei:before {
+	content: "\e622";
+}
+
+i.van-icon-editor:before {
+	content: "\e685";
+}
+
+i.van-icon-coupon:before {
+	content: "\e60e";
+}
+
+i.van-icon-arrow-down:before {
+	content: "\e61b";
+}
+
+i.van-icon-clear:before {
+	content: "\e61f";
+}
+
+i.van-icon-laba:before {
+	content: "\e73b";
+}
+
+i.van-icon-kefu:before {
+	content: "\e616";
+}
+
+i.van-icon-tubiao215:before {
+	content: "\e619";
+}
+
+i.van-icon-jijiangkaishi:before {
+	content: "\e681";
+}
+
+i.van-icon-arrow:before {
+	content: "\e66e";
+}
+
+i.van-icon-mobile:before {
+	content: "\e72c";
+}
+
+i.van-icon-username:before {
+	content: "\e84d";
+}
+
+i.van-icon-icon104:before {
+	content: "\e665";
+}
+
+i.van-icon-list:before {
+	content: "\e68e";
+}
+
+i.van-icon-set:before {
+	content: "\e690";
+}
+
+i.van-icon-good:before {
+	content: "\e699";
+}
+
+i.van-icon-search:before {
+	content: "\e6a4";
+}
+
+i.van-icon-compass:before {
+	content: "\e6a6";
+}
+
+i.van-icon-success-radius:before {
+	content: "\e6b4";
+}
+
+i.van-icon-browse:before {
+	content: "\e6c0";
+}
+
+i.van-icon-phone:before {
+	content: "\e6c2";
+}
+
+i.van-icon-naozhong:before {
+	content: "\e661";
+}
+
+i.van-icon-shiliangzhinengduixiang42:before {
+	content: "\e675";
+}
+
+i.van-icon-dengdai:before {
+	content: "\e60b";
+}
+
+i.van-icon-cancel:before {
+	content: "\e61c";
+}
+
+i.van-icon-shouhouguanli:before {
+	content: "\e608";
+}
+
+i.van-icon-invitation:before {
+	content: "\e932";
+}
+
+i.van-icon-arrow-left:before {
+	content: "\e625";
+}
+
+i.van-icon-clear-full:before {
+	content: "\e658";
+}
+
+i.van-icon-wode1:before {
+	content: "\e602";
+}
+
+i.van-icon-baoguo-shixin:before {
+	content: "\e8fb";
+}
+
+i.van-icon-lajitong:before {
+	content: "\e62f";
+}
+
+i.van-icon-daifukuan:before {
+	content: "\e60a";
+}
+
+i.van-icon-eye-close:before {
+	content: "\e60d";
+}
+
+i.van-icon-eye-open:before {
+	content: "\e623";
+}
+
+i.van-icon-baoguo-kongxin:before {
+	content: "\e61a";
+}
+
+i.van-icon-dingwei1:before {
+	content: "\e7db";
+}
+
+i.van-icon-n4:before {
+	content: "\e79a";
+}
+
+i.van-icon-jiaoyiwancheng:before {
+	content: "\e686";
+}
+
+i.van-icon-jiaoyiguanbi:before {
+	content: "\e687";
+}
+
+i.van-icon-qianshoutixing:before {
+	content: "\e679";
+}
+
+i.van-icon-chulizhong:before {
+	content: "\e68b";
+}
+
+i.van-icon-tuandui1:before {
+	content: "\e63d";
+}
+
+i.van-icon-icon:before {
+	content: "\e603";
+}
+
+i.van-icon-wangwang:before {
+	content: "\e933";
+}
+
+i.van-icon-shoucang:before {
+	content: "\e620";
+}
+
+i.van-icon-shoucang-full:before {
+	content: "\e61d";
+}