lhl 2 years ago
parent
commit
41ec97f34c
93 changed files with 663 additions and 4 deletions
  1. 2 2
      pages/order/order.vue
  2. 5 1
      pages/user/hxjl.vue
  3. BIN
      unpackage/dist/build/h5/h5.rar
  4. 5 1
      unpackage/dist/build/h5/index.html
  5. 558 0
      unpackage/dist/build/h5/static/css/cmy.css
  6. 55 0
      unpackage/dist/build/h5/static/css/flex.css
  7. 38 0
      unpackage/dist/build/h5/static/css/padding.css
  8. 0 0
      unpackage/dist/build/h5/static/js/chunk-vendors.a9cbb497.js
  9. 0 0
      unpackage/dist/build/h5/static/js/index.c8011a5e.js
  10. 0 0
      unpackage/dist/build/h5/static/js/pages-cart-cart.506ef193.js
  11. 0 0
      unpackage/dist/build/h5/static/js/pages-category-business.6ccc0b79.js
  12. 0 0
      unpackage/dist/build/h5/static/js/pages-category-business~pages-shop-shopList~pages-user-award~pages-user-cash.7c0b1679.js
  13. 0 0
      unpackage/dist/build/h5/static/js/pages-category-business~pages-shop-shopList~pages-user-award~pages-user-cash.ce869e1a.js
  14. 0 0
      unpackage/dist/build/h5/static/js/pages-category-category.e84f51cf.js
  15. 0 0
      unpackage/dist/build/h5/static/js/pages-index-index.eefbe7df.js
  16. 0 0
      unpackage/dist/build/h5/static/js/pages-index-sign.26ed7491.js
  17. 0 0
      unpackage/dist/build/h5/static/js/pages-index-vipShop.22ec0bea.js
  18. 0 0
      unpackage/dist/build/h5/static/js/pages-index-vipShop.371ba68e.js
  19. 0 0
      unpackage/dist/build/h5/static/js/pages-index-vipShop~pages-user-award~pages-user-cash.27054ff1.js
  20. 0 0
      unpackage/dist/build/h5/static/js/pages-index-vipShop~pages-user-award~pages-user-cash.d2f81d89.js
  21. 0 0
      unpackage/dist/build/h5/static/js/pages-money-account.a8bab240.js
  22. 0 0
      unpackage/dist/build/h5/static/js/pages-money-pay.4241089e.js
  23. 0 0
      unpackage/dist/build/h5/static/js/pages-money-paySuccess.5e2ed839.js
  24. 0 0
      unpackage/dist/build/h5/static/js/pages-money-recharge.e36f8acd.js
  25. 0 0
      unpackage/dist/build/h5/static/js/pages-money-success.9db3aa85.js
  26. 0 0
      unpackage/dist/build/h5/static/js/pages-money-wallet.92f5275b.js
  27. 0 0
      unpackage/dist/build/h5/static/js/pages-money-wallet~pages-order-order~pages-user-coupon~pages-user-favorites~pages-user-hxjl~pages-us~59136ad4.cf75c60c.js
  28. 0 0
      unpackage/dist/build/h5/static/js/pages-money-withdmoenys.0ffaebcf.js
  29. 0 0
      unpackage/dist/build/h5/static/js/pages-money-withdrawal.6a87009c.js
  30. 0 0
      unpackage/dist/build/h5/static/js/pages-money-withdrawal~pages-order-evaluate~pages-order-expressInfo~pages-product-groupBooking-produ~a6f98c47.b569478f.js
  31. 0 0
      unpackage/dist/build/h5/static/js/pages-order-createOrder.d5ebd1a7.js
  32. 0 0
      unpackage/dist/build/h5/static/js/pages-order-evaluate.0f6b89ab.js
  33. 0 0
      unpackage/dist/build/h5/static/js/pages-order-evaluate.714496b5.js
  34. 0 0
      unpackage/dist/build/h5/static/js/pages-order-expressInfo.7ee4de18.js
  35. 0 0
      unpackage/dist/build/h5/static/js/pages-order-expressInfo.c3bcfe0c.js
  36. 0 0
      unpackage/dist/build/h5/static/js/pages-order-order.aae33983.js
  37. 0 0
      unpackage/dist/build/h5/static/js/pages-order-order.f76fea14.js
  38. 0 0
      unpackage/dist/build/h5/static/js/pages-order-orderDetail.a718da13.js
  39. 0 0
      unpackage/dist/build/h5/static/js/pages-order-orderDetail.babb73f1.js
  40. 0 0
      unpackage/dist/build/h5/static/js/pages-order-orderRefund.8de1c986.js
  41. 0 0
      unpackage/dist/build/h5/static/js/pages-order-orderRefund.b6085858.js
  42. 0 0
      unpackage/dist/build/h5/static/js/pages-product-classify.f6e8d444.js
  43. 0 0
      unpackage/dist/build/h5/static/js/pages-product-groupBooking-detail.9d1aa41b.js
  44. 0 0
      unpackage/dist/build/h5/static/js/pages-product-groupBooking-index.56b12a3e.js
  45. 0 0
      unpackage/dist/build/h5/static/js/pages-product-groupBooking-inviteImg.7357da72.js
  46. 0 0
      unpackage/dist/build/h5/static/js/pages-product-groupBooking-productCollage.ac450027.js
  47. 0 0
      unpackage/dist/build/h5/static/js/pages-product-groupBooking-productCollage~pages-set-addressManage~pages-shop-giftDetail~pages-shop-s~e5e16630.cc98267b.js
  48. 0 0
      unpackage/dist/build/h5/static/js/pages-product-groupBooking-productGroup.1029dd05.js
  49. 0 0
      unpackage/dist/build/h5/static/js/pages-product-groupBooking-productGroup.a8a22876.js
  50. 0 0
      unpackage/dist/build/h5/static/js/pages-product-groupBooking-productGroup~pages-product-miaosha~pages-product-product.7f630e3d.js
  51. 0 0
      unpackage/dist/build/h5/static/js/pages-product-list.30300c73.js
  52. 0 0
      unpackage/dist/build/h5/static/js/pages-product-miaosha.bc5b5ec6.js
  53. 0 0
      unpackage/dist/build/h5/static/js/pages-product-miaosha~pages-product-product.93f2bef3.js
  54. 0 0
      unpackage/dist/build/h5/static/js/pages-product-product.cc336b3d.js
  55. 0 0
      unpackage/dist/build/h5/static/js/pages-product-reply.ad40c0b5.js
  56. 0 0
      unpackage/dist/build/h5/static/js/pages-product-search.ed837779.js
  57. 0 0
      unpackage/dist/build/h5/static/js/pages-product-seckill.eaa6c0c7.js
  58. 0 0
      unpackage/dist/build/h5/static/js/pages-public-forget.0121c511.js
  59. 0 0
      unpackage/dist/build/h5/static/js/pages-public-login.5c585ff6.js
  60. 0 0
      unpackage/dist/build/h5/static/js/pages-public-register.e7775d69.js
  61. 0 0
      unpackage/dist/build/h5/static/js/pages-public-wxLogin.b629e6ad.js
  62. 0 0
      unpackage/dist/build/h5/static/js/pages-redirect-redirect.8b3367bc.js
  63. 0 0
      unpackage/dist/build/h5/static/js/pages-set-address.fae958aa.js
  64. 0 0
      unpackage/dist/build/h5/static/js/pages-set-addressManage.6452456e.js
  65. 0 0
      unpackage/dist/build/h5/static/js/pages-set-addressManage~pages-set-set~pages-set-userinfo~pages-user-user.70b26800.js
  66. 0 0
      unpackage/dist/build/h5/static/js/pages-set-password.35f5a7d6.js
  67. 0 0
      unpackage/dist/build/h5/static/js/pages-set-phone.8f5650ec.js
  68. 0 0
      unpackage/dist/build/h5/static/js/pages-set-set.8affdddb.js
  69. 0 0
      unpackage/dist/build/h5/static/js/pages-set-user.e97c064f.js
  70. 0 0
      unpackage/dist/build/h5/static/js/pages-set-userinfo.0d81cf09.js
  71. 0 0
      unpackage/dist/build/h5/static/js/pages-shop-djqQm.260c8714.js
  72. 0 0
      unpackage/dist/build/h5/static/js/pages-shop-giftDetail.ae6a7240.js
  73. 0 0
      unpackage/dist/build/h5/static/js/pages-shop-joinshop.09955205.js
  74. 0 0
      unpackage/dist/build/h5/static/js/pages-shop-shopDetail.3ad234e0.js
  75. 0 0
      unpackage/dist/build/h5/static/js/pages-shop-shopList.2e74dc21.js
  76. 0 0
      unpackage/dist/build/h5/static/js/pages-shop-yhqDetail.0602bc72.js
  77. 0 0
      unpackage/dist/build/h5/static/js/pages-shoping-list.87a5105d.js
  78. 0 0
      unpackage/dist/build/h5/static/js/pages-user-award.1fef75cf.js
  79. 0 0
      unpackage/dist/build/h5/static/js/pages-user-award.901d42ee.js
  80. 0 0
      unpackage/dist/build/h5/static/js/pages-user-cash.b20aa34f.js
  81. 0 0
      unpackage/dist/build/h5/static/js/pages-user-cash.d0747f61.js
  82. 0 0
      unpackage/dist/build/h5/static/js/pages-user-coupon.1a9e954e.js
  83. 0 0
      unpackage/dist/build/h5/static/js/pages-user-coupon.d014d820.js
  84. 0 0
      unpackage/dist/build/h5/static/js/pages-user-favorites.d4072ad9.js
  85. 0 0
      unpackage/dist/build/h5/static/js/pages-user-hxjl.a21cc9a5.js
  86. 0 0
      unpackage/dist/build/h5/static/js/pages-user-jiedian.bbedb952.js
  87. 0 0
      unpackage/dist/build/h5/static/js/pages-user-jiedianDetails.c5960a3f.js
  88. 0 0
      unpackage/dist/build/h5/static/js/pages-user-notice.9e319b71.js
  89. 0 0
      unpackage/dist/build/h5/static/js/pages-user-scoreAccumulate.8df0a8bd.js
  90. 0 0
      unpackage/dist/build/h5/static/js/pages-user-shareQrCode.2bd876e8.js
  91. 0 0
      unpackage/dist/build/h5/static/js/pages-user-team.ee6a694b.js
  92. 0 0
      unpackage/dist/build/h5/static/js/pages-user-user.4de76f5b.js
  93. 0 0
      unpackage/dist/build/h5/static/js/pages-user-withdrawal.523a46bd.js

+ 2 - 2
pages/order/order.vue

@@ -14,7 +14,7 @@
 					<view @click="goToOrderDetail(item)" v-for="(item, index) in tabItem.orderList" :key="index" class="order-item">
 						<view class="i-top b-b">
 							<text class="time">{{ item._add_time }}</text>
-							<text class="state" :style="{ color: item.stateTipColor }">{{ item._status._title }}</text>
+							<text class="state" :style="{ color: item.stateTipColor }">{{ item.stateTip }}</text>
 							<text v-if="item.status === 4" class="del-btn iconfont icondelete" @click="deleteOrder(index)"></text>
 						</view>
 
@@ -371,7 +371,7 @@ export default {
 					stateTip = '待发货';
 					break;
 				case 2:
-					stateTip = '待收货';
+					stateTip = '待使用';
 					break;
 				case 3:
 					stateTip = '待使用';

+ 5 - 1
pages/user/hxjl.vue

@@ -39,6 +39,10 @@ export default {
 		};
 	},
 	onShow() {
+		this.loadingType = 'more';
+		this.list = [];
+		this.page = 1;
+		this.limit = 10;
 		this.getList();
 	},
 	onReachBottom() {
@@ -61,7 +65,7 @@ export default {
 					obj.page++;
 					obj.loadingType = 'more';
 				} else {
-					obj.loadingType = 'nomore';
+					obj.loadingType = 'noMore';
 				}
 			});
 		}

BIN
unpackage/dist/build/h5/h5.rar


+ 5 - 1
unpackage/dist/build/h5/index.html

@@ -1,2 +1,6 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>想亮商城</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.58012eb0.js></script><script src=/index/static/js/index.e15c5dd5.js></script></body></html>
+<<<<<<< HEAD
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.58012eb0.js></script><script src=/index/static/js/index.e15c5dd5.js></script></body></html>
+=======
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.a9cbb497.js></script><script src=/index/static/js/index.c8011a5e.js></script></body></html>
+>>>>>>> 11810c650fcbb786f7c6eb685212a6cf2f3e6856

+ 558 - 0
unpackage/dist/build/h5/static/css/cmy.css

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 /*初始化类*/
 @font-face {
 	font-family: 'iconfont';
@@ -553,4 +554,561 @@
 
 .position-relative {
 	position: relative;
+=======
+/*初始化类*/
+@font-face {
+	font-family: 'iconfont';
+	/* project id 1482221 */
+	src: url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.eot');
+	src: url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.eot?#iefix') format('embedded-opentype'),
+		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.woff2') format('woff2'),
+		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.woff') format('woff'),
+		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.ttf') format('truetype'),
+		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.svg#iconfont') format('svg');
+}
+
+.acea-row {
+	display: -webkit-box;
+	display: -moz-box;
+	display: -webkit-flex;
+	display: -ms-flexbox;
+	display: flex;
+	-webkit-box-lines: multiple;
+	-moz-box-lines: multiple;
+	-o-box-lines: multiple;
+	-webkit-flex-wrap: wrap;
+	-ms-flex-wrap: wrap;
+	flex-wrap: wrap
+}
+
+.acea-row.row-middle {
+	-webkit-box-align: center;
+	-moz-box-align: center;
+	-o-box-align: center;
+	-ms-flex-align: center;
+	-webkit-align-items: center;
+	align-items: center
+}
+
+.bg-color-red {
+	background-color: #e93323 !important;
+}
+
+.acea-row.row-right {
+	-webkit-box-pack: end;
+	-moz-box-pack: end;
+	-o-box-pack: end;
+	-ms-flex-pack: end;
+	-webkit-justify-content: flex-end;
+	justify-content: flex-end
+}
+
+.acea-row.row-between-wrapper {
+	-webkit-box-align: center;
+	-moz-box-align: center;
+	-o-box-align: center;
+	-ms-flex-align: center;
+	-webkit-align-items: center;
+	align-items: center;
+	-webkit-box-pack: justify;
+	-moz-box-pack: justify;
+	-o-box-pack: justify;
+	-ms-flex-pack: justify;
+	-webkit-justify-content: space-between;
+	justify-content: space-between
+}
+
+.acea-row.row-column-around {
+	-webkit-flex-direction: column;
+	-ms-flex-direction: column;
+	flex-direction: column;
+	justify-content: space-around;
+	-webkit-justify-content: space-around
+}
+
+.acea-row.row-center-wrapper {
+	-webkit-box-align: center;
+	-moz-box-align: center;
+	-o-box-align: center;
+	-ms-flex-align: center;
+	-webkit-align-items: center;
+	align-items: center;
+	-webkit-box-pack: center;
+	-moz-box-pack: center;
+	-o-box-pack: center;
+	-ms-flex-pack: center;
+	-webkit-justify-content: center;
+	justify-content: center
+}
+
+.iconfont {
+	font-family: "iconfont" !important;
+	font-size: 34rpx;
+	font-style: normal;
+	-webkit-font-smoothing: antialiased;
+	-webkit-text-stroke-width: 0rpx;
+	-moz-osx-font-smoothing: grayscale;
+}
+
+.iconedit:before {
+	content: "\e649";
+}
+
+.iconfavorfill:before {
+	content: "\e64b";
+}
+
+.iconfavor:before {
+	content: "\e64c";
+}
+
+.iconlocation:before {
+	content: "\e651";
+}
+
+.iconroundcheckfill:before {
+	content: "\e656";
+}
+
+.iconroundcheck:before {
+	content: "\e657";
+}
+
+.iconunfold:before {
+	content: "\e661";
+}
+
+.iconlikefill:before {
+	content: "\e668";
+}
+
+.iconlike:before {
+	content: "\e669";
+}
+
+.iconshop:before {
+	content: "\e676";
+}
+
+.iconcart:before {
+	content: "\e6af";
+}
+
+.icondelete:before {
+	content: "\e6b4";
+}
+
+.iconhome:before {
+	content: "\e6b8";
+}
+
+.iconcartfill:before {
+	content: "\e6b9";
+}
+
+.iconhomefill:before {
+	content: "\e6bb";
+}
+
+.iconlock:before {
+	content: "\e6c0";
+}
+
+.iconfriendadd:before {
+	content: "\e6ca";
+}
+
+.iconfold:before {
+	content: "\e6de";
+}
+
+.iconapps:before {
+	content: "\e729";
+}
+
+.iconadd:before {
+	content: "\e767";
+}
+
+.iconaddred:before {
+	content: "\e767";
+	color: #F35B64;
+}
+
+.iconmove:before {
+	content: "\e768";
+}
+
+.icontriangledownfill:before {
+	content: "\e79b";
+}
+
+.icontriangleupfill:before {
+	content: "\e79c";
+}
+
+.iconshaixuan:before {
+	content: "\e74a";
+}
+
+.iconyanzhengma:before {
+	content: "\e684";
+}
+
+.iconjifen:before {
+	content: "\e60f";
+}
+
+.iconwuliuxinxi:before {
+	content: "\e62b";
+}
+
+.iconmessage:before {
+	content: "\e78a";
+}
+
+.iconsetting:before {
+	content: "\e78e";
+}
+
+.iconaddition:before {
+	content: "\e6e0";
+}
+
+.iconclose:before {
+	content: "\e6e9";
+}
+
+.iconenter:after {
+	content: "\e6f8";
+}
+
+.iconprompt:before {
+	content: "\e71b";
+}
+
+.iconreturn:before {
+	content: "\e720";
+}
+
+.iconsearch:before {
+	content: "\e741";
+}
+
+.iconpengyouquan:before {
+	content: "\e62c";
+}
+
+.iconweixin:before {
+	content: "\e60e";
+}
+
+.iconzhifubao:before {
+	content: "\e673";
+}
+
+.iconyue:before {
+	content: "\e618";
+}
+
+.iconweixin1:before {
+	content: "\e622";
+}
+
+.iconlock1:before {
+	content: "\e64d";
+}
+
+.iconuser:before {
+	content: "\e64e";
+}
+
+.iconchenggongtixianshouyi:before {
+	content: "\e64f";
+}
+
+.iconviptuiguangdingdan:before {
+	content: "\e650";
+}
+
+.icondaifukuan:before {
+	content: "\e652";
+}
+
+.icondaijiesuanshouyi:before {
+	content: "\e653";
+}
+
+.icondaidakuanshouyi:before {
+	content: "\e654";
+}
+
+.icondaifahuo:before {
+	content: "\e655";
+}
+
+.icondaishouhuoshouyi:before {
+	content: "\e658";
+}
+
+.icondaishouhuo:before {
+	content: "\e659";
+}
+
+.iconwuxiaoshouyi:before {
+	content: "\e65a";
+}
+
+.icontixianmingxi:before {
+	content: "\e65b";
+}
+
+.iconshouyi:before {
+	content: "\e65c";
+}
+
+.iconkouchutixianshouxufei:before {
+	content: "\e65d";
+}
+
+.iconyishenqingshouyi:before {
+	content: "\e65e";
+}
+
+.icontuihuanhuo:before {
+	content: "\e65f";
+}
+
+
+/*水平线*/
+.hr {
+	width: 100%;
+	position: relative;
+	border-bottom: 1px solid #dddddd;
+	/* height: 0.5rpx; */
+}
+
+/* 一行显示 */
+.clamp {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	display: block;
+}
+
+/* 二行显示 */
+.clamp2 {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	display: -webkit-box;
+	-webkit-line-clamp: 2;
+	-webkit-box-orient: vertical;
+}
+
+/* 二行显示 */
+.ellipsis {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	display: -webkit-box;
+	-webkit-box-orient: vertical;
+	-webkit-line-clamp: 2;
+}
+
+.common-hover {
+	background: #f5f5f5;
+}
+
+/* 角标 */
+.corner {
+	background-color: #e51c23;
+	position: absolute;
+	right: -18rpx;
+	top: -18rpx;
+	color: #FFFFFF;
+	text-align: center;
+	border-radius: 999px;
+	font-size: 24rpx !important;
+	min-width: 35rpx;
+	min-height: 35rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	line-height: 1;
+}
+
+.flex_item {
+	display: flex;
+	align-items: center;
+	/* justify-content: space-between; */
+}
+
+/* 左右顶格加上下居中 */
+.flex-between-center {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+}
+
+/* flex布局-整体居中 */
+.flex-center {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.flex-start {
+	display: flex;
+	align-items: center;
+	justify-content: flex-start;
+}
+
+/*文字对齐*/
+.text-left {
+	text-align: left !important;
+}
+
+.text-center {
+	text-align: center !important;
+}
+
+.text-justify {
+	text-align: justify !important;
+}
+
+.text-right {
+	text-align: right !important;
+}
+
+.text-default {
+	color: #212121 !important;
+}
+
+.text-white {
+	color: #ffffff !important;
+}
+
+.text-primary {
+	color: #00bcd4 !important;
+}
+
+.text-success {
+	color: #009688 !important;
+}
+
+.text-info {
+	color: #03a9f4 !important;
+}
+
+.text-warning {
+	color: #ffc107 !important;
+}
+
+.text-danger {
+	color: #e51c23 !important;
+}
+
+.text-pink {
+	color: #e91e63 !important;
+}
+
+.text-purple {
+	color: #673ab7 !important;
+}
+
+.text-indigo {
+	color: #3f51b5 !important;
+}
+
+.text-gray {
+	color: #999999 !important;
+}
+
+.bg-default {
+	background-color: #f5f5f5 !important;
+}
+
+.bg-primary {
+	background-color: #00bcd4 !important;
+}
+
+.bg-success {
+	background-color: #009688 !important;
+}
+
+.bg-info {
+	background-color: #03a9f4 !important;
+}
+
+.bg-warning {
+	background-color: #FFB238 !important;
+}
+
+.bg-danger {
+	background-color: #DC4D46 !important;
+}
+
+.bg-pink {
+	background-color: #e91e63 !important;
+}
+
+.bg-purple {
+	background-color: #673ab7 !important;
+}
+
+.bg-indigo {
+	background-color: #3f51b5 !important;
+}
+
+.bg-white {
+	background-color: white !important;
+}
+
+.bg-gray {
+	background-color: #e3e3e3 !important;
+}
+
+/* 边框 */
+.border-radius-15 {
+	border-radius: 15rpx;
+}
+
+.border-radius-10 {
+	border-radius: 10rpx;
+}
+
+.border-radius-all {
+	border-radius: 1000rpx;
+}
+
+/* 底部边线 */
+.borde-b {
+	border-bottom: 1px solid #dddddd;
+}
+
+/* 弹性盒子 */
+.flex {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+
+.items-left {
+	justify-content: flex-start;
+}
+
+.items-right {
+	justify-content: flex-end;
+}
+
+.flex-shrink-false {
+	flex-shrink: 0;
+}
+
+.flex-grow-true {
+	flex-grow: 1;
+}
+
+.position-relative {
+	position: relative;
+>>>>>>> 11810c650fcbb786f7c6eb685212a6cf2f3e6856
 }

+ 55 - 0
unpackage/dist/build/h5/static/css/flex.css

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 /* flex 布局 */
 .f-d-c {
 	flex-direction: column;
@@ -50,4 +51,58 @@
 
 .p-a {
 	position: absolute;
+=======
+/* flex 布局 */
+.f-d-c {
+	flex-direction: column;
+}
+
+.f-j-c {
+	justify-content: center;
+}
+
+.f-j-s {
+	justify-content: flex-start;
+}
+
+.f-j-e {
+	justify-content: flex-end;
+}
+
+.f-j-sa {
+	justify-content: space-around;
+}
+
+.f-j-sb {
+	justify-content: space-between;
+}
+
+.f-ai-c {
+	align-items: center;
+}
+
+.f-ai-s {
+	align-items: flex-start;
+}
+
+.f-ai-e {
+	align-items: flex-end;
+}
+
+.fg1 {
+	flex-grow: 1;
+}
+
+.fs0 {
+	flex-shrink: 0;
+}
+
+/* 相对定位&绝对定位 */
+.p-r {
+	position: relative;
+}
+
+.p-a {
+	position: absolute;
+>>>>>>> 11810c650fcbb786f7c6eb685212a6cf2f3e6856
 }

+ 38 - 0
unpackage/dist/build/h5/static/css/padding.css

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 /* padding */
 .pl10 {
 	padding-left: 10rpx;
@@ -33,4 +34,41 @@
 
 .pr20 {
 	padding-right: 20rpx;
+=======
+/* padding */
+.pl10 {
+	padding-left: 10rpx;
+}
+
+.pt10 {
+	padding-top: 10rpx;
+}
+
+.pt15 {
+	padding-top: 15rpx;
+}
+
+.pl15 {
+	padding-left: 15rpx;
+}
+
+.pt20 {
+	padding-top: 20rpx;
+}
+
+.pl20 {
+	padding-left: 20rpx;
+}
+
+.pr10 {
+	padding-right: 10rpx;
+}
+
+.pr15 {
+	padding-right: 15rpx;
+}
+
+.pr20 {
+	padding-right: 20rpx;
+>>>>>>> 11810c650fcbb786f7c6eb685212a6cf2f3e6856
 }

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/chunk-vendors.a9cbb497.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/index.c8011a5e.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-cart-cart.506ef193.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-category-business.6ccc0b79.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-category-business~pages-shop-shopList~pages-user-award~pages-user-cash.7c0b1679.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-category-business~pages-shop-shopList~pages-user-award~pages-user-cash.ce869e1a.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-category-category.e84f51cf.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-index-index.eefbe7df.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-index-sign.26ed7491.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-index-vipShop.22ec0bea.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-index-vipShop.371ba68e.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-index-vipShop~pages-user-award~pages-user-cash.27054ff1.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-index-vipShop~pages-user-award~pages-user-cash.d2f81d89.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-money-account.a8bab240.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-money-pay.4241089e.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-money-paySuccess.5e2ed839.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-money-recharge.e36f8acd.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-money-success.9db3aa85.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-money-wallet.92f5275b.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-money-wallet~pages-order-order~pages-user-coupon~pages-user-favorites~pages-user-hxjl~pages-us~59136ad4.cf75c60c.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-money-withdmoenys.0ffaebcf.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-money-withdrawal.6a87009c.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-money-withdrawal~pages-order-evaluate~pages-order-expressInfo~pages-product-groupBooking-produ~a6f98c47.b569478f.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-order-createOrder.d5ebd1a7.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-order-evaluate.0f6b89ab.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-order-evaluate.714496b5.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-order-expressInfo.7ee4de18.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-order-expressInfo.c3bcfe0c.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-order-order.aae33983.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-order-order.f76fea14.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-order-orderDetail.a718da13.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-order-orderDetail.babb73f1.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-order-orderRefund.8de1c986.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-order-orderRefund.b6085858.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-product-classify.f6e8d444.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-product-groupBooking-detail.9d1aa41b.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-product-groupBooking-index.56b12a3e.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-product-groupBooking-inviteImg.7357da72.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-product-groupBooking-productCollage.ac450027.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-product-groupBooking-productCollage~pages-set-addressManage~pages-shop-giftDetail~pages-shop-s~e5e16630.cc98267b.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-product-groupBooking-productGroup.1029dd05.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-product-groupBooking-productGroup.a8a22876.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-product-groupBooking-productGroup~pages-product-miaosha~pages-product-product.7f630e3d.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-product-list.30300c73.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-product-miaosha.bc5b5ec6.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-product-miaosha~pages-product-product.93f2bef3.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-product-product.cc336b3d.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-product-reply.ad40c0b5.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-product-search.ed837779.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-product-seckill.eaa6c0c7.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-public-forget.0121c511.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-public-login.5c585ff6.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-public-register.e7775d69.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-public-wxLogin.b629e6ad.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-redirect-redirect.8b3367bc.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-set-address.fae958aa.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-set-addressManage.6452456e.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-set-addressManage~pages-set-set~pages-set-userinfo~pages-user-user.70b26800.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-set-password.35f5a7d6.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-set-phone.8f5650ec.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-set-set.8affdddb.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-set-user.e97c064f.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-set-userinfo.0d81cf09.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-shop-djqQm.260c8714.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-shop-giftDetail.ae6a7240.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-shop-joinshop.09955205.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-shop-shopDetail.3ad234e0.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-shop-shopList.2e74dc21.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-shop-yhqDetail.0602bc72.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-shoping-list.87a5105d.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-award.1fef75cf.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-award.901d42ee.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-cash.b20aa34f.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-cash.d0747f61.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-coupon.1a9e954e.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-coupon.d014d820.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-favorites.d4072ad9.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-hxjl.a21cc9a5.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-jiedian.bbedb952.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-jiedianDetails.c5960a3f.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-notice.9e319b71.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-scoreAccumulate.8df0a8bd.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-shareQrCode.2bd876e8.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-team.ee6a694b.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-user.4de76f5b.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-withdrawal.523a46bd.js


Some files were not shown because too many files changed in this diff