From 4146097331b277f67ef35713a5715fa71b75559f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BF=97=E5=BC=BA?= <357099073@qq.com>
Date: Wed, 6 Aug 2025 17:32:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0vue2=E7=9A=84sass=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                       |  4 +-
 .../balance_transfer/balance_transfer.vue     |  4 +-
 .../pages/bargain_process/bargain_process.vue | 20 ++++-----
 .../pages/forget_pay_pwd/forget_pay_pwd.vue   |  2 +-
 .../goods_combination/goods_combination.vue   |  4 +-
 bundle/pages/invite_fans/invite_fans.vue      |  4 +-
 bundle/pages/luckly_wheel/luckly_wheel.vue    |  2 +-
 .../pages/message_center/message_center.vue   |  2 +-
 bundle/pages/notice/notice.vue                |  2 +-
 bundle/pages/recharge_code/recharge_code.vue  |  2 +-
 bundle/pages/sign_detail/sign_detail.vue      |  2 +-
 .../pages/transfer_record/transfer_record.vue |  2 +-
 bundle/pages/user_bill/user_bill.vue          |  4 +-
 bundle/pages/user_fans/user_fans.vue          |  6 +--
 bundle/pages/user_payment/user_payment.vue    |  4 +-
 bundle/pages/user_profile/user_profile.vue    | 10 ++---
 bundle/pages/user_set/user_set.vue            | 10 ++---
 bundle/pages/user_sign/user_sign.vue          | 10 ++---
 bundle/pages/user_spread/user_spread.vue      | 10 ++---
 .../user_spread_month_bill_detail.vue         |  6 +--
 bundle/pages/user_withdraw/user_withdraw.vue  |  4 +-
 .../user_withdraw_code/user_withdraw_code.vue |  2 +-
 .../widthdraw_result/widthdraw_result.vue     |  2 +-
 components/active-area/active-area.vue        |  2 +-
 .../after-sales-list/after-sales-list.vue     |  2 +-
 components/bargain-list/bargain-list.vue      |  4 +-
 components/cate-four/cate-four.vue            |  2 +-
 components/cate-list/cate-list.vue            |  4 +-
 components/cate-three/cate-three.vue          |  2 +-
 components/comment-list/comment-list.vue      |  4 +-
 components/download-nav/download-nav.vue      |  2 +-
 components/group-list/group-list.vue          |  2 +-
 components/home-coupon/home-coupon.vue        |  2 +-
 .../components/l-painter/painter.js           |  2 +-
 components/lyg-popup/lyg-popup.vue            | 10 ++---
 components/order-list/order-list.vue          |  4 +-
 components/privacy-popup/privacy-popup.vue    |  2 +-
 components/share-popup/share-popup.vue        |  2 +-
 components/spec-popup/spec-popup.vue          |  8 ++--
 components/swipers/swipers.vue                |  2 +-
 pages/address_edit/address_edit.vue           |  2 +-
 pages/all_comments/all_comments.vue           |  2 +-
 pages/forget_pwd/forget_pwd.vue               |  2 +-
 pages/goods_details/goods_details.vue         | 10 ++---
 pages/index/index.vue                         |  8 ++--
 pages/login/login.vue                         |  8 ++--
 pages/order_details/order_details.vue         |  6 +--
 pages/pay_result/pay_result.vue               |  2 +-
 pages/payment/payment.vue                     | 10 ++---
 pages/register/register.vue                   |  8 ++--
 pages/shop_cart/shop_cart.vue                 |  6 +--
 pages/sort/sort.vue                           |  2 +-
 pages/user/user.vue                           |  8 ++--
 pages/user_address/user_address.vue           |  2 +-
 pages/user_collection/user_collection.vue     |  4 +-
 styles/base.scss                              | 44 +++++++++----------
 uni.scss                                      | 20 ++++-----
 57 files changed, 159 insertions(+), 159 deletions(-)

diff --git a/App.vue b/App.vue
index 371cc19..3b277f6 100644
--- a/App.vue
+++ b/App.vue
@@ -15,7 +15,7 @@ export default {
     });
     // 获取配置
     this.getConfigFun();
-
+	//获取用户
     this.getUser();
     // 获取分享
     this.getShareInfo();
@@ -27,7 +27,7 @@ export default {
     this.bindCode(options);
   },
   onHide: function () {
-    console.log("App Hide");
+    // console.log("App Hide");
   },
   methods: {
     ...mapMutations(["SETCONFIG"]),
diff --git a/bundle/pages/balance_transfer/balance_transfer.vue b/bundle/pages/balance_transfer/balance_transfer.vue
index 4b657da..2c30c51 100644
--- a/bundle/pages/balance_transfer/balance_transfer.vue
+++ b/bundle/pages/balance_transfer/balance_transfer.vue
@@ -189,7 +189,7 @@ export default {
         padding: 30rpx 45rpx;
 
         .input {
-            border-bottom: $-solid-border;
+            border-bottom: $solid-border;
             margin-top: 30rpx;
 
             input {
@@ -215,7 +215,7 @@ export default {
             padding: 26rpx 0;
 
             &:not(:last-of-type) {
-                border-bottom: $-solid-border;
+                border-bottom: $solid-border;
             }
         }
     }
diff --git a/bundle/pages/bargain_process/bargain_process.vue b/bundle/pages/bargain_process/bargain_process.vue
index d61a2b2..c821590 100644
--- a/bundle/pages/bargain_process/bargain_process.vue
+++ b/bundle/pages/bargain_process/bargain_process.vue
@@ -535,7 +535,7 @@
             .bargain-panel {
                 margin-top: 30rpx;
                 padding: 24rpx 24rpx 20rpx;
-                background-color: $-color-white;
+                background-color: $color-white;
                 box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.06);
                 border-radius: 20rpx;
                 .bargain-panel-header {
@@ -558,7 +558,7 @@
                     }
                 }
                 .invite-btn1 {
-                    background-color: $-color-primary;
+                    background-color: $color-primary;
                     height: 84rpx;
                     margin-top: 36rpx;
                     box-shadow: 0px 3px 10px rgba(235, 36, 51, 0.5);
@@ -580,7 +580,7 @@
                     .invite-friend-btn {
                         width: 316rpx;
                         height: 84rpx;
-                        background-color: $-color-primary;
+                        background-color: $color-primary;
                     }
                 }
                 .bargain-code-content {
@@ -603,13 +603,13 @@
                 .btn-container {
                     margin-top: 40rpx;
                     .help-knife-btn {
-                        background-color: $-color-primary;
+                        background-color: $color-primary;
                         height: 84rpx;
                         box-shadow: 0px 3px 10px rgba(235, 36, 51, 0.5);
                     }
                     .knife-btn {
                         height: 84rpx;
-                        background-color: $-color-white;
+                        background-color: $color-white;
                         border: 1px solid #BBBBBB;
                         margin-top: 30rpx;
                     }
@@ -617,7 +617,7 @@
                 .code-content {
                     margin-top: 30rpx;
                     padding: 27rpx 24rpx;
-                    background-color: $-color-white;                       
+                    background-color: $color-white;                       
                     .user-item {
                         padding: 15rpx 0;
                         margin-top: 10rpx;
@@ -633,13 +633,13 @@
                 }
                 .choose-content {
                     padding: 30rpx 20rpx;
-                    background-color: $-color-white;
+                    background-color: $color-white;
                     border-radius: 10px;
                 }
             }
             .lunch-btn {
                 height: 84rpx;
-                background-color: $-color-primary;
+                background-color: $color-primary;
                 box-shadow: 0px 3px 10px rgba(235, 36, 51, 0.5);
             }
         }
@@ -663,7 +663,7 @@
                 .spec-active-item {
                     padding: 8rpx 28rpx;
                     color: white;
-                    background-color: $-color-primary;
+                    background-color: $color-primary;
                 }
             }
             .pickup-number {
@@ -711,7 +711,7 @@
         }
         .share-pop-container {
             height: 500rpx;
-            background-color: $-color-white;
+            background-color: $color-white;
         }
     }
 </style>
\ No newline at end of file
diff --git a/bundle/pages/forget_pay_pwd/forget_pay_pwd.vue b/bundle/pages/forget_pay_pwd/forget_pay_pwd.vue
index 36c7f6f..76e7e13 100644
--- a/bundle/pages/forget_pay_pwd/forget_pay_pwd.vue
+++ b/bundle/pages/forget_pay_pwd/forget_pay_pwd.vue
@@ -172,7 +172,7 @@ export default {
                 width: 176rpx;
                 height: 58rpx;
                 flex: none;
-                border: 1px solid $-color-primary;
+                border: 1px solid $color-primary;
             }
         }
 
diff --git a/bundle/pages/goods_combination/goods_combination.vue b/bundle/pages/goods_combination/goods_combination.vue
index 9cd26ec..ce3d630 100644
--- a/bundle/pages/goods_combination/goods_combination.vue
+++ b/bundle/pages/goods_combination/goods_combination.vue
@@ -120,7 +120,7 @@
 </script>
 <style lang="scss">
 	.goods-combination {
-		background-color: $-color-primary;
+		background-color: $color-primary;
 		min-height: 100vh;
 
 		.header .img {
@@ -147,7 +147,7 @@
 						flex: 1;
 						width: 475rpx;
 						.group {
-							border: 1px solid $-color-primary;
+							border: 1px solid $color-primary;
 							border-radius: 4rpx;
 							.group-img {
 								padding: 2rpx 6rpx;
diff --git a/bundle/pages/invite_fans/invite_fans.vue b/bundle/pages/invite_fans/invite_fans.vue
index ef911af..d8bcdeb 100644
--- a/bundle/pages/invite_fans/invite_fans.vue
+++ b/bundle/pages/invite_fans/invite_fans.vue
@@ -142,12 +142,12 @@
 		}
 
 		.copy-btn {
-			color: $-color-primary;
+			color: $color-primary;
 		}
 
 		.save-btn {
 			color: #fff;
-			background-color: $-color-primary;
+			background-color: $color-primary;
 		}
 	}
 </style>
diff --git a/bundle/pages/luckly_wheel/luckly_wheel.vue b/bundle/pages/luckly_wheel/luckly_wheel.vue
index faeb7b3..b5758c0 100644
--- a/bundle/pages/luckly_wheel/luckly_wheel.vue
+++ b/bundle/pages/luckly_wheel/luckly_wheel.vue
@@ -152,7 +152,7 @@
 	/* pages/luckly_wheel/luckly_wheel.wxss */
 
 	.luckly-wheel-container {
-		background-color: $-color-primary;
+		background-color: $color-primary;
 		padding-bottom: 20rpx;
 
 		.header {
diff --git a/bundle/pages/message_center/message_center.vue b/bundle/pages/message_center/message_center.vue
index 615c116..b7b586c 100644
--- a/bundle/pages/message_center/message_center.vue
+++ b/bundle/pages/message_center/message_center.vue
@@ -70,7 +70,7 @@ export default {
   .message-item {
     padding: 32rpx 0;
     &:not(:last-of-type) {
-        border-bottom: $-solid-border;
+        border-bottom: $solid-border;
     }
     .item-info {
       font-size: 32rpx;
diff --git a/bundle/pages/notice/notice.vue b/bundle/pages/notice/notice.vue
index f6808b3..ccb228e 100644
--- a/bundle/pages/notice/notice.vue
+++ b/bundle/pages/notice/notice.vue
@@ -130,7 +130,7 @@ export default {
     border-radius: 10rpx;
     .item-header {
       padding: 19rpx 0;
-      border-bottom: $-solid-border;
+      border-bottom: $solid-border;
       .header-title {
         font-weight: bold;
       }
diff --git a/bundle/pages/recharge_code/recharge_code.vue b/bundle/pages/recharge_code/recharge_code.vue
index b11c157..5452184 100644
--- a/bundle/pages/recharge_code/recharge_code.vue
+++ b/bundle/pages/recharge_code/recharge_code.vue
@@ -73,7 +73,7 @@
 				padding: 20rpx 30rpx;
 
 				&:not(:last-of-type) {
-					border-bottom: $-solid-border;
+					border-bottom: $solid-border;
 				}
 			}
 		}
diff --git a/bundle/pages/sign_detail/sign_detail.vue b/bundle/pages/sign_detail/sign_detail.vue
index 39ee733..bb1cacb 100644
--- a/bundle/pages/sign_detail/sign_detail.vue
+++ b/bundle/pages/sign_detail/sign_detail.vue
@@ -103,7 +103,7 @@ export default {
 .sign-detail-container .sign-item {
   padding: 18rpx 30rpx;
   background-color: #fff;
-  border-bottom: $-solid-border;
+  border-bottom: $solid-border;
 }
 
 .sign-type {
diff --git a/bundle/pages/transfer_record/transfer_record.vue b/bundle/pages/transfer_record/transfer_record.vue
index 8b43241..8625d80 100644
--- a/bundle/pages/transfer_record/transfer_record.vue
+++ b/bundle/pages/transfer_record/transfer_record.vue
@@ -152,7 +152,7 @@
 		.list {
 			.item {
 				padding: 20rpx 30rpx;
-				border-bottom: $-solid-border;
+				border-bottom: $solid-border;
 				align-items: flex-start;
 				.avatar {
 					width: 68rpx;
diff --git a/bundle/pages/user_bill/user_bill.vue b/bundle/pages/user_bill/user_bill.vue
index 34ebd50..28e1d1a 100644
--- a/bundle/pages/user_bill/user_bill.vue
+++ b/bundle/pages/user_bill/user_bill.vue
@@ -165,9 +165,9 @@ export default {
             .bill-list {
                 .bill-item {
                     padding: 20rpx 30rpx;
-                    border-bottom: $-solid-border;
+                    border-bottom: $solid-border;
                     .income {
-                        color: $-color-primary;
+                        color: $color-primary;
                     }
                 }
             }
diff --git a/bundle/pages/user_fans/user_fans.vue b/bundle/pages/user_fans/user_fans.vue
index 9c260eb..0ff4061 100644
--- a/bundle/pages/user_fans/user_fans.vue
+++ b/bundle/pages/user_fans/user_fans.vue
@@ -259,7 +259,7 @@ export default {
             }
             .item-active {
                 color: white;
-                background-color: $-color-primary;
+                background-color: $color-primary;
                 border-radius: 100rpx;
                 height: 100%;
             }
@@ -272,7 +272,7 @@ export default {
                 line-height: 40rpx;
                 height: 100%;
                 .item-active {
-                    color: $-color-primary;
+                    color: $color-primary;
                 }
             }
         }
@@ -304,7 +304,7 @@ export default {
                 text-align: right;
             }
             &:not(:nth-last-of-type(3)) {
-                border-bottom: $-solid-border;
+                border-bottom: $solid-border;
             }
         }
     }
diff --git a/bundle/pages/user_payment/user_payment.vue b/bundle/pages/user_payment/user_payment.vue
index 8c6b4cf..1224d2f 100644
--- a/bundle/pages/user_payment/user_payment.vue
+++ b/bundle/pages/user_payment/user_payment.vue
@@ -248,7 +248,7 @@
 					margin-left: 30rpx;
 				}
 
-				border-bottom: $-solid-border;
+				border-bottom: $solid-border;
 			}
 
 			.tip {
@@ -279,7 +279,7 @@
 					height: 150rpx;
 					border-radius: 10rpx;
 					margin-bottom: 16rpx;
-					border: 1px solid $-color-primary;
+					border: 1px solid $color-primary;
 
 					&:not(:nth-of-type(3n)) {
 						margin-right: 24rpx;
diff --git a/bundle/pages/user_profile/user_profile.vue b/bundle/pages/user_profile/user_profile.vue
index 4a98eff..98fce09 100644
--- a/bundle/pages/user_profile/user_profile.vue
+++ b/bundle/pages/user_profile/user_profile.vue
@@ -629,8 +629,8 @@ export default {
 
             .bd-btn {
                 padding: 8rpx 24rpx;
-                border: 1px solid $-color-primary;
-                color: $-color-primary;
+                border: 1px solid $color-primary;
+                color: $color-primary;
             }
         }
 
@@ -666,7 +666,7 @@ export default {
         padding-bottom: 30rpx;
         width: 580rpx;
         border-radius: 30rpx;
-        background-color: $-color-white;
+        background-color: $color-white;
 
         .title {
             padding: 26rpx 0rpx;
@@ -678,10 +678,10 @@ export default {
             border-bottom: 1rpx solid #e5e5e5;
 
             .send-code-btn {
-                border: 1px solid $-color-primary;
+                border: 1px solid $color-primary;
                 width: 184rpx;
                 height: 62rpx;
-                color: $-color-primary;
+                color: $color-primary;
             }
         }
 
diff --git a/bundle/pages/user_set/user_set.vue b/bundle/pages/user_set/user_set.vue
index 8233c19..d882533 100644
--- a/bundle/pages/user_set/user_set.vue
+++ b/bundle/pages/user_set/user_set.vue
@@ -548,8 +548,8 @@ export default {
 
             .bd-btn {
                 padding: 8rpx 24rpx;
-                border: 1px solid $-color-primary;
-                color: $-color-primary;
+                border: 1px solid $color-primary;
+                color: $color-primary;
             }
         }
 
@@ -585,7 +585,7 @@ export default {
         padding-bottom: 30rpx;
         width: 580rpx;
         border-radius: 30rpx;
-        background-color: $-color-white;
+        background-color: $color-white;
 
         .title {
             padding: 26rpx 0rpx;
@@ -597,10 +597,10 @@ export default {
             border-bottom: 1rpx solid #e5e5e5;
 
             .send-code-btn {
-                border: 1px solid $-color-primary;
+                border: 1px solid $color-primary;
                 width: 184rpx;
                 height: 62rpx;
-                color: $-color-primary;
+                color: $color-primary;
             }
         }
 
diff --git a/bundle/pages/user_sign/user_sign.vue b/bundle/pages/user_sign/user_sign.vue
index 5dd1569..1508d66 100644
--- a/bundle/pages/user_sign/user_sign.vue
+++ b/bundle/pages/user_sign/user_sign.vue
@@ -216,7 +216,7 @@ export default {
 .user-sgin .main .contain .title .line {
     width: 8rpx;
     height: 34rpx;
-    background-color: $-color-primary;
+    background-color: $color-primary;
 }
 
 .user-sgin .main .day-list {
@@ -275,7 +275,7 @@ export default {
     background: linear-gradient(270deg, rgba(249, 95, 47, 1) 0%, rgba(252, 67, 54, 1) 55%, rgba(255, 44, 60, 1) 100%);
 }
 .user-sgin .main .contain .task {
-    border-top: $-solid-border;
+    border-top: $solid-border;
 }
 .user-sgin .main .contain .task .item {
     padding: 23rpx 30rpx;
@@ -290,10 +290,10 @@ export default {
 }
 .user-sgin .main .contain .task .item .btn {
     width: 154rpx;
-    border: 1px solid $-color-primary;
+    border: 1px solid $color-primary;
 }
 .user-sgin .main .contain .task .item .con .num {
-    color: $-color-primary;
+    color: $color-primary;
 }
 
 .score-detail-entry {
@@ -326,7 +326,7 @@ export default {
     font-weight: bold;
     padding-top: 90rpx;
     padding-bottom: 150rpx;
-    color: $-color-primary;
+    color: $color-primary;
 }
 
 .desc {
diff --git a/bundle/pages/user_spread/user_spread.vue b/bundle/pages/user_spread/user_spread.vue
index f522c28..815096e 100644
--- a/bundle/pages/user_spread/user_spread.vue
+++ b/bundle/pages/user_spread/user_spread.vue
@@ -567,7 +567,7 @@ export default {
                 .usual-tools-header {
                     height: 100rpx;
                     line-height: 44rpx;
-                    border-bottom: $-solid-border;
+                    border-bottom: $solid-border;
                 }
                 .usual-content {
                     padding: 40rpx 0;
@@ -610,7 +610,7 @@ export default {
                     margin-top: 60rpx;
                     .form-item {
                         padding: 24rpx 0 24rpx 30rpx;
-                        border: $-solid-border;
+                        border: $solid-border;
                         margin: 0 34rpx 30rpx;
                         .label {
                             width: 150rpx;
@@ -647,7 +647,7 @@ export default {
                     padding: 60rpx 0 22rpx;
                     /* margin: 0 8px; */
                     width: 100%;
-                    border-bottom: $-solid-border;
+                    border-bottom: $solid-border;
                     .apply-result-img {
                         width: 100rpx;
                         height: 100rpx;
@@ -707,7 +707,7 @@ van-field textarea {
 }
 
 .main .user-result-box .user-result-content  .apply-fail-reason {
-    color: $-color-primary;
+    color: $color-primary;
     line-height: 36rpx;
     margin-top: 10rpx;
 }
@@ -719,7 +719,7 @@ van-field textarea {
     padding-bottom: 30rpx;
     width: 580rpx;
     border-radius: 6rpx;
-    background-color: $-color-white;
+    background-color: $color-white;
 }
 
 .inviteformContain .title { 
diff --git a/bundle/pages/user_spread_month_bill_detail/user_spread_month_bill_detail.vue b/bundle/pages/user_spread_month_bill_detail/user_spread_month_bill_detail.vue
index fcb27c7..2005659 100644
--- a/bundle/pages/user_spread_month_bill_detail/user_spread_month_bill_detail.vue
+++ b/bundle/pages/user_spread_month_bill_detail/user_spread_month_bill_detail.vue
@@ -202,7 +202,7 @@ export default {
 <style lang="scss">
 .user-spread-month-bill .header {
   height: 240rpx;
-  background-color: $-color-primary;
+  background-color: $color-primary;
   padding-top: 60rpx;
 }
 
@@ -226,7 +226,7 @@ export default {
 
 .user-spread-month-bill .content .order-container .order-item .order-header {
   padding: 20rpx 30rpx;
-  border-bottom: $-solid-border;
+  border-bottom: $solid-border;
 }
 
 .user-spread-month-bill .content .order-container .order-item .order-header .guide-shop-btn {
@@ -238,7 +238,7 @@ export default {
 
 .user-spread-month-bill .content .order-container .order-item .order-content {
   padding: 20rpx 30rpx 20rpx 20rpx;
-  border-bottom: $-solid-border;
+  border-bottom: $solid-border;
 }
 
 .user-spread-month-bill .content .order-container .order-item .order-content .order-goods-img {
diff --git a/bundle/pages/user_withdraw/user_withdraw.vue b/bundle/pages/user_withdraw/user_withdraw.vue
index 926038b..5951fd9 100644
--- a/bundle/pages/user_withdraw/user_withdraw.vue
+++ b/bundle/pages/user_withdraw/user_withdraw.vue
@@ -382,7 +382,7 @@
 				border-radius: 20rpx;
 
 				.input {
-					border-bottom: $-solid-border;
+					border-bottom: $solid-border;
 
 					input {
 						width: 100%;
@@ -410,7 +410,7 @@
 
 				.input-item {
 					padding: 28rpx 0 30rpx;
-					border-bottom: $-solid-border;
+					border-bottom: $solid-border;
 				}
 
 				.input-label {
diff --git a/bundle/pages/user_withdraw_code/user_withdraw_code.vue b/bundle/pages/user_withdraw_code/user_withdraw_code.vue
index 5847f88..4f8305e 100644
--- a/bundle/pages/user_withdraw_code/user_withdraw_code.vue
+++ b/bundle/pages/user_withdraw_code/user_withdraw_code.vue
@@ -105,7 +105,7 @@ export default {
               color: #666666;
             }
             .error-status {
-              color: $-color-primary;
+              color: $color-primary;
             }
             &:not(:last-of-type) {
               border-bottom: var(--border);
diff --git a/bundle/pages/widthdraw_result/widthdraw_result.vue b/bundle/pages/widthdraw_result/widthdraw_result.vue
index de03785..c35c284 100644
--- a/bundle/pages/widthdraw_result/widthdraw_result.vue
+++ b/bundle/pages/widthdraw_result/widthdraw_result.vue
@@ -170,7 +170,7 @@
 				.go-back-btn {
 					width: 650rpx;
 					height: 84rpx;
-					border: solid 1rpx $-color-primary;
+					border: solid 1rpx $color-primary;
 					box-sizing: border-box;
 				}
 			}
diff --git a/components/active-area/active-area.vue b/components/active-area/active-area.vue
index 981faf8..38f12dd 100644
--- a/components/active-area/active-area.vue
+++ b/components/active-area/active-area.vue
@@ -93,7 +93,7 @@
 		border-radius: 10rpx;
 		padding-bottom: 20rpx;
 		&.seckill {
-			background-color: $-color-white;
+			background-color: $color-white;
 			background-image: url(../../static/images/home_seckill_bg.png);
 		}
 
diff --git a/components/after-sales-list/after-sales-list.vue b/components/after-sales-list/after-sales-list.vue
index eda348d..2998957 100644
--- a/components/after-sales-list/after-sales-list.vue
+++ b/components/after-sales-list/after-sales-list.vue
@@ -396,7 +396,7 @@ export default {
       .btn {
         padding: 9rpx 34rpx;
         font-family: PingFang SC;
-        border: 1px solid $-color-primary;
+        border: 1px solid $color-primary;
       }
 
       .grey-btn {
diff --git a/components/bargain-list/bargain-list.vue b/components/bargain-list/bargain-list.vue
index 108e706..c17290c 100644
--- a/components/bargain-list/bargain-list.vue
+++ b/components/bargain-list/bargain-list.vue
@@ -105,7 +105,7 @@
 <style lang="scss">
     .bargain-list-container {
         .bargain-list {
-            background-color: $-color-white;
+            background-color: $color-white;
             .header {
                 height: 80rpx;
                 padding: 20rpx 20rpx;
@@ -126,7 +126,7 @@
                     // 继续砍价 按钮
                     height: 62rpx;
                     padding: 0 44rpx;
-                    background-color: $-color-primary;
+                    background-color: $color-primary;
                 }
                 .purchase-btn {
                     // 直接购买
diff --git a/components/cate-four/cate-four.vue b/components/cate-four/cate-four.vue
index 49c0db4..a387f3b 100644
--- a/components/cate-four/cate-four.vue
+++ b/components/cate-four/cate-four.vue
@@ -242,7 +242,7 @@
 				padding: 26rpx 10rpx;
 
 				&.active {
-					color: $-color-primary;
+					color: $color-primary;
 					font-size: 26rpx;
 					font-weight: bold;
 				}
diff --git a/components/cate-list/cate-list.vue b/components/cate-list/cate-list.vue
index 4a40d17..6ed8fc8 100644
--- a/components/cate-list/cate-list.vue
+++ b/components/cate-list/cate-list.vue
@@ -255,7 +255,7 @@
 					border: 1px solid transparent;
 					border-radius: 50%;
 					&.active {
-						border-color: $-color-primary;
+						border-color: $color-primary;
 					}
 				}
 				.name {
@@ -279,7 +279,7 @@
 
 					&.active {
 						width: 20rpx;
-						background-color: $-color-primary;
+						background-color: $color-primary;
 					}
 				}
 
diff --git a/components/cate-three/cate-three.vue b/components/cate-three/cate-three.vue
index 3b82a6e..a0528f9 100644
--- a/components/cate-three/cate-three.vue
+++ b/components/cate-three/cate-three.vue
@@ -101,7 +101,7 @@
 				padding: 26rpx 10rpx;
 
 				&.active {
-					color: $-color-primary;
+					color: $color-primary;
 					font-size: 26rpx;
 					font-weight: bold;
 				}
diff --git a/components/comment-list/comment-list.vue b/components/comment-list/comment-list.vue
index 55864fe..6532058 100644
--- a/components/comment-list/comment-list.vue
+++ b/components/comment-list/comment-list.vue
@@ -176,7 +176,7 @@ export default {
         }
         .btn {
             padding: 6rpx 34rpx;
-            border: 1px solid $-color-primary;
+            border: 1px solid $color-primary;
         }
     }
 }
@@ -194,7 +194,7 @@ export default {
         .btn {
             width: 178rpx;
             height: 52rpx;
-            border: 1px solid $-color-primary;
+            border: 1px solid $color-primary;
         }
     }
 }
diff --git a/components/download-nav/download-nav.vue b/components/download-nav/download-nav.vue
index f68c0a9..88a4e3f 100644
--- a/components/download-nav/download-nav.vue
+++ b/components/download-nav/download-nav.vue
@@ -58,7 +58,7 @@
         z-index: 871;
         top: 0;
         .primary-btn {
-            background-color: $-color-primary;
+            background-color: $color-primary;
             height: 54rpx;
             width: 154rpx;
             margin-right: 30rpx;
diff --git a/components/group-list/group-list.vue b/components/group-list/group-list.vue
index 747a0cf..c5b6402 100644
--- a/components/group-list/group-list.vue
+++ b/components/group-list/group-list.vue
@@ -159,7 +159,7 @@
 			}
 			.group-footer {
 				height: 100rpx;
-				border-top: $-solid-border;
+				border-top: $solid-border;
 				padding: 0 24rpx;
 				.btn {
 					width: 244rpx;
diff --git a/components/home-coupon/home-coupon.vue b/components/home-coupon/home-coupon.vue
index 484bdfd..1b500ec 100644
--- a/components/home-coupon/home-coupon.vue
+++ b/components/home-coupon/home-coupon.vue
@@ -167,7 +167,7 @@
 
 					.coupon-right {
 						background-color: #E5E5E5;
-						color: $-color-muted;
+						color: $color-muted;
 					}
 				}
 
diff --git a/components/lime-painter/components/l-painter/painter.js b/components/lime-painter/components/l-painter/painter.js
index fdf69cd..2b51419 100644
--- a/components/lime-painter/components/l-painter/painter.js
+++ b/components/lime-painter/components/l-painter/painter.js
@@ -12,4 +12,4 @@
     LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
     OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
     PERFORMANCE OF THIS SOFTWARE.
-    ***************************************************************************** */var e,i=function(){return(i=Object.assign||function(t){for(var e,i=1,o=arguments.length;i<o;i++)for(var r in e=arguments[i])Object.prototype.hasOwnProperty.call(e,r)&&(t[r]=e[r]);return t}).apply(this,arguments)};function o(t,e,i,o){return new(i||(i=Promise))((function(r,n){function s(t){try{h(o.next(t))}catch(t){n(t)}}function a(t){try{h(o.throw(t))}catch(t){n(t)}}function h(t){var e;t.done?r(t.value):(e=t.value,e instanceof i?e:new i((function(t){t(e)}))).then(s,a)}h((o=o.apply(t,e||[])).next())}))}function r(t,e){var i,o,r,n,s={label:0,sent:function(){if(1&r[0])throw r[1];return r[1]},trys:[],ops:[]};return n={next:a(0),throw:a(1),return:a(2)},"function"==typeof Symbol&&(n[Symbol.iterator]=function(){return this}),n;function a(n){return function(a){return function(n){if(i)throw new TypeError("Generator is already executing.");for(;s;)try{if(i=1,o&&(r=2&n[0]?o.return:n[0]?o.throw||((r=o.return)&&r.call(o),0):o.next)&&!(r=r.call(o,n[1])).done)return r;switch(o=0,r&&(n=[2&n[0],r.value]),n[0]){case 0:case 1:r=n;break;case 4:return s.label++,{value:n[1],done:!1};case 5:s.label++,o=n[1],n=[0];continue;case 7:n=s.ops.pop(),s.trys.pop();continue;default:if(!(r=s.trys,(r=r.length>0&&r[r.length-1])||6!==n[0]&&2!==n[0])){s=0;continue}if(3===n[0]&&(!r||n[1]>r[0]&&n[1]<r[3])){s.label=n[1];break}if(6===n[0]&&s.label<r[1]){s.label=r[1],r=n;break}if(r&&s.label<r[2]){s.label=r[2],s.ops.push(n);break}r[2]&&s.ops.pop(),s.trys.pop();continue}n=e.call(t,s)}catch(t){n=[6,t],o=0}finally{i=r=0}if(5&n[0])throw n[1];return{value:n[0]?n[1]:void 0,done:!0}}([n,a])}}}var n={upx2px:function(t){return window.innerWidth/750*t},getSystemInfoSync:function(){return{screenWidth:window.innerWidth}},getImageInfo:function(t){var e=t.src,i=t.success,o=t.fail,r=new Image;r.onload=function(){i({width:this.naturalWidth,height:this.naturalHeight,path:this.src,src:e})},r.onerror=o,r.src=e}},s="object"==typeof swan?"mp-baidu":"object"==typeof tt?"mp-toutao":"object"==typeof plus?"plus":"object"==typeof window?"undefined"==typeof uni||"undefined"!=typeof uni&&!(null===uni||void 0===uni?void 0:uni.addInterceptor)?"web":"h5":"mp-weixin",a="mp-weixin"==s?wx:"mp-toutao"==s?tt:"undefined"!=typeof uni?uni.upx2px?uni:Object.assign(uni,n):"undefined"!=typeof window?n:uni;if(!a.upx2px){var h=(null!==(e=a.getSystemInfoSync().screenWidth)&&void 0!==e?e:375)/750;a.upx2px=function(t){return h*t}}function d(t){return/^-?\d+(\.\d+)?$/.test(t)}function l(t,e,i){if("number"==typeof t)return t;if(d(t))return 1*t;if("string"==typeof t){var o=/^-?([0-9]+)?([.]{1}[0-9]+){0,1}(em|rpx|px|%)$/g.exec(t);if(!t||!o)return 0;var r=o[3];t=parseFloat(t);var n=0;return"rpx"===r?n=a.upx2px(t):"px"===r?n=1*t:"%"===r&&e?n=t*l(e)/100:"em"===r&&e&&(n=t*l(e||14)),i?1*n.toFixed(2):Math.round(n)}return 0}function c(t){var e=this;return new Promise((function(i,n){return o(e,void 0,void 0,(function(){var e,o;return r(this,(function(r){switch(r.label){case 0:if(e=t,"plus"!=s&&!/^mp/.test(s)||!/data:image\/(\w+);base64,(.*)/.test(t))return[3,4];r.label=1;case 1:return r.trys.push([1,3,,4]),[4,(h=t,new Promise((function(t,e){var i=/data:image\/(\w+);base64,(.*)/.exec(h)||[],o=i[1];if(i[2],/^mp/.test(s)){var r=a.getFileSystemManager();o||(console.error("ERROR_BASE64SRC_PARSE"),e(new Error("ERROR_BASE64SRC_PARSE")));var n=(new Date).getTime(),d=a.env.USER_DATA_PATH+"/"+n+"."+o;r.writeFile({filePath:d,data:h.replace(/^data:\S+\/\S+;base64,/,""),encoding:"base64",success:function(){t(d)},fail:function(t){console.error("获取base64图片失败",JSON.stringify(t)),e(t)}})}else if("plus"!=s)e(new Error("not support"));else{var l=h.split(",")[0].match(/data\:\S+\/(\S+);/);l?l=l[1]:e(new Error("base64 error"));var c=Date.now()+"."+l,u="_doc",f="uniapp_temp",g="_doc/uniapp_temp/"+c;if(!function(t,e){for(var i=t.split("."),o=e.split("."),r=!1,n=0;n<o.length;n++){var s=i[n]-o[n];if(0!==s){r=s>0;break}}return r}("Android"===plus.os.name?"1.9.9.80627":"1.9.9.80472",plus.runtime.innerVersion))return void plus.io.resolveLocalFileSystemURL(u,(function(i){i.getDirectory(f,{create:!0,exclusive:!1},(function(i){i.getFile(c,{create:!0,exclusive:!1},(function(i){i.createWriter((function(i){var o;i.onwrite=function(){t(g)},i.onerror=e,i.seek(0),i.writeAsBinary((o=h.split(","))[o.length-1])}),e)}),e)}),e)}),e);var v=new plus.nativeObj.Bitmap(c);v.loadBase64Data(h,(function(){v.save(g,{},(function(){v.clear(),t(g)}),(function(t){v.clear(),e(t)}))}),(function(t){v.clear(),e(t)}))}})))];case 2:return e=r.sent(),[3,4];case 3:return o=r.sent(),console.log(o),[3,4];case 4:return a.getImageInfo({src:e,success:function(t){return i(t)},fail:function(t){return n(t)}}),[2]}var h}))}))}))}var u=function(t){return!(!t||!t.startsWith("linear")&&!t.startsWith("radial"))},f=function(t,e,i,o,r,n){t.startsWith("linear")?function(t,e,i,o,r,n){for(var s=function(t,e,i,o,r){void 0===o&&(o=0);void 0===r&&(r=0);var n=t.match(/([-]?\d{1,3})deg/),s=n&&n[1]?parseFloat(n[1]):0;s>=360&&(s-=360);s<0&&(s+=360);if(0===(s=Math.round(s)))return{x0:Math.round(e/2)+o,y0:i+r,x1:Math.round(e/2)+o,y1:r};if(180===s)return{x0:Math.round(e/2)+o,y0:r,x1:Math.round(e/2)+o,y1:i+r};if(90===s)return{x0:o,y0:Math.round(i/2)+r,x1:e+o,y1:Math.round(i/2)+r};if(270===s)return{x0:e+o,y0:Math.round(i/2)+r,x1:o,y1:Math.round(i/2)+r};var a=Math.round(180*Math.asin(e/Math.sqrt(Math.pow(e,2)+Math.pow(i,2)))/Math.PI);if(s===a)return{x0:o,y0:i+r,x1:e+o,y1:r};if(s===180-a)return{x0:o,y0:r,x1:e+o,y1:i+r};if(s===180+a)return{x0:e+o,y0:r,x1:o,y1:i+r};if(s===360-a)return{x0:e+o,y0:i+r,x1:o,y1:r};var h=0,d=0,l=0,c=0;if(s<a||s>180-a&&s<180||s>180&&s<180+a||s>360-a){var u=s*Math.PI/180,f=s<a||s>360-a?i/2:-i/2,g=Math.tan(u)*f,v=s<a||s>180-a&&s<180?e/2-g:-e/2-g;h=-(l=g+(p=Math.pow(Math.sin(u),2)*v)),d=-(c=f+p/Math.tan(u))}if(s>a&&s<90||s>90&&s<90+a||s>180+a&&s<270||s>270&&s<360-a){var p;u=(90-s)*Math.PI/180,g=s>a&&s<90||s>90&&s<90+a?e/2:-e/2,f=Math.tan(u)*g,v=s>a&&s<90||s>270&&s<360-a?i/2-f:-i/2-f;h=-(l=g+(p=Math.pow(Math.sin(u),2)*v)/Math.tan(u)),d=-(c=f+p)}return h=Math.round(h+e/2)+o,d=Math.round(i/2-d)+r,l=Math.round(l+e/2)+o,c=Math.round(i/2-c)+r,{x0:h,y0:d,x1:l,y1:c}}(r,t,e,i,o),a=s.x0,h=s.y0,d=s.x1,l=s.y1,c=n.createLinearGradient(a,h,d,l),u=r.match(/linear-gradient\((.+)\)/)[1],f=g(u.substring(u.indexOf(",")+1)),v=0;v<f.colors.length;v++)c.addColorStop(f.percents[v],f.colors[v]);n.setFillStyle(c)}(e,i,o,r,t,n):t.startsWith("radial")&&function(t,e,i,o,r,n){for(var s=g(r.match(/radial-gradient\((.+)\)/)[1]),a=Math.round(t/2)+i,h=Math.round(e/2)+o,d=n.createRadialGradient(a,h,0,a,h,Math.max(t,e)/2),l=0;l<s.colors.length;l++)d.addColorStop(s.percents[l],s.colors[l]);n.setFillStyle(d)}(e,i,o,r,t,n)};function g(t){for(var e=[],i=[],o=0,r=t.substring(0,t.length-1).split("%,");o<r.length;o++){var n=r[o];e.push(n.substring(0,n.lastIndexOf(" ")).trim()),i.push(n.substring(n.lastIndexOf(" "),n.length)/100)}return{colors:e,percents:i}}function v(t,e,i){return e in t?Object.defineProperty(t,e,{value:i,enumerable:!0,configurable:!0,writable:!0}):t[e]=i,t}function p(){return(p=Object.assign||function(t){for(var e=1;e<arguments.length;e++){var i=arguments[e];for(var o in i)Object.prototype.hasOwnProperty.call(i,o)&&(t[o]=i[o])}return t}).apply(this,arguments)}var b=0,m={left:null,top:null,width:null,height:null},w=function(){function t(t,e,i,o){var r=this;v(this,"id",b++),v(this,"style",{left:null,top:null,width:null,height:null}),v(this,"computedStyle",{}),v(this,"children",{}),v(this,"layoutBox",p({},m)),v(this,"contentSize",p({},m,{maxLineHeight:0})),v(this,"clientSize",p({},m)),v(this,"borderSize",p({},m)),v(this,"offsetSize",p({},m)),this.ctx=o,this.root=i,e&&(this.parent=e),this.name=t.name||t.type,this.attributes=this.getAttributes(t);var n=this.getComputedStyle(t,null==e?void 0:e.computedStyle);this.isAbsolute="absolute"==n.position,this.isFixed="fixed"==n.position,Object.keys(n).forEach((function(t){Object.defineProperty(r.style,t,{configurable:!0,enumerable:!0,get:function(){return n[t]},set:function(e){n[t]=e}})}));var s={contentSize:p({},this.contentSize),clientSize:p({},this.clientSize),borderSize:p({},this.borderSize),offsetSize:p({},this.offsetSize)};Object.keys(s).forEach((function(t){Object.keys(r[t]).forEach((function(e){Object.defineProperty(r[t],e,{configurable:!0,enumerable:!0,get:function(){return s[t][e]},set:function(i){s[t][e]=i}})}))})),this.computedStyle=this.style}var e=t.prototype;return e.add=function(t){t.parent=this,this.children[t.id]=t},e.remove=function(t){var e=this;t?this.children[t.id]&&(t.remove(),delete this.children[t.id]):Object.keys(this.children).forEach((function(t){e.children[t].remove(),delete e.children[t]}))},e.getChildren=function(){var t=this;return Object.keys(this.children).map((function(e){return t.children[e]}))},e.getComputedStyle=function(t,e){var i=["color","fontSize","lineHeight","verticalAlign","fontWeight","textAlign"],o=t.css,r=void 0===o?{}:o,n=t.type,s=void 0===n?"view":n,a={};if(e)for(var h=0;h<i.length;h++){var c=i[h];(r[c]||e[c])&&(r[c]=r[c]||e[c])}for(var u=function(){var t=g[f],e=r[t];if(/^(box)?shadow$/i.test(t)){var i=e.split(" ").map((function(t){return/^\d/.test(t)?l(t):t}));return a.boxShadow=i,"continue"}if(/^border/i.test(t)&&!/radius$/i.test(t)){var o,n=t.match(/^border([BTRLa-z]+)?/)[0],h=t.match(/[W|S|C][a-z]+/),c=e.replace(/([\(,])\s+|\s+([\),])/g,"$1$2").split(" ").map((function(t){return/^\d/.test(t)?l(t,"",!0):t}));return a[n]=((o={})[n+"Width"]=(d(c[0])?c[0]:0)||1,o[n+"Style"]=c[1]||"solid",o[n+"Color"]=c[2]||"black",o),1==c.length&&h&&(a[n][n+h[0]]=c[0]),"continue"}if(/^background(color)?$/i.test(t))return a.backgroundColor=e,"continue";if(/^objectPosition$/i.test(t))return a[t]=e.split(" "),"continue";if(/padding|margin|radius/i.test(t)){var u=/radius$/i.test(t),v=u?"borderRadius":t.match(/[a-z]+/)[0],p=[0,0,0,0].map((function(t,e){return u?["borderTopLeftRadius","borderTopRightRadius","borderBottomRightRadius","borderBottomLeftRadius"][e]:[v+"Top",v+"Right",v+"Bottom",v+"Left"][e]}));if("padding"===t||"margin"===t||/^(border)?radius$/i.test(t)){var b,m=(null==e?void 0:e.split(" ").map((function(e){return/^\d+(rpx|px)?$/.test(e)?l(e):"margin"!=t&&/auto/.test(e)?0:e}),[]))||[0],w=u?"borderRadius":t,x=m[0],y=m[1],S=m[2],z=m[3];a[w]=((b={})[p[0]]="auto"==x?0:x,b[p[1]]=d(y)?y:x,b[p[2]]="auto"==(d(S)?S:x)?0:d(S)?S:x,b[p[3]]=d(z)?z:y||x,b)}else{var B;if("object"==typeof a[v])a[v][t]="margin"==v&&"auto"==e||/%$/.test(e)?e:l(e);else a[v]=((B={})[p[0]]=a[v]||0,B[p[1]]=a[v]||0,B[p[2]]=a[v]||0,B[p[3]]=a[v]||0,B),a[v][t]="margin"==v&&"auto"==e||/%$/.test(e)?e:l(e)}return"continue"}if(/^transform$/i.test(t))return a[t]={},e.replace(/([a-zA-Z]+)\(([0-9,-\.%rpxdeg\s]+)\)/g,(function(e,i,o){var n=o.split(",").map((function(t){return t.replace(/(^\s*)|(\s*$)/g,"")})),s=function(t,e){return t.includes("deg")?1*t:e&&!/%$/.test(e)?l(t,e):t};i.includes("matrix")?a[t][i]=n.map((function(t){return 1*t})):i.includes("rotate")?a[t][i]=1*o.match(/^-?\d+(\.\d+)?/)[0]:/[X, Y]/.test(i)?a[t][i]=/[X]/.test(i)?s(n[0],r.width):s(n[0],r.height):(a[t][i+"X"]=s(n[0],r.width),a[t][i+"Y"]=s(n[1]||n[0],r.height))})),"continue";/^left|top$/i.test(t)&&!["absolute","fixed"].includes(r.position)?a[t]=0:a[t]=/^[\d\.]+(px|rpx)?$/.test(e)?l(e):/em$/.test(e)&&"text"==s?l(e,r.fontSize):e},f=0,g=Object.keys(r);f<g.length;f++)u();return a},e.setPosition=function(t,e){var i={left:"width",top:"height",right:"width",bottom:"height"};Object.keys(i).forEach((function(o){["right","bottom"].includes(o)&&void 0!==t.style[o]?t.style["right"==o?"left":"top"]=e[i[o]]-t.offsetSize[i[o]]-l(t.style[o],e[i[o]]):t.style[o]=l(t.style[o],e[i[o]])}))},e.getAttributes=function(t){var e=t.attributes||{};return(null!=t&&t.url||null!=t&&t.src)&&(e.src=e.src||t.url||(null==t?void 0:t.src)),t.replace&&(e.replace=t.replace),null!=t&&t.text&&(e.text=t.text),e},e.getOffsetSize=function(t,e,i){void 0===i&&(i="offsetSize");var o=e||{},r=o.margin,n=(r=void 0===r?{}:r).marginLeft,s=void 0===n?0:n,a=r.marginTop,h=void 0===a?0:a,d=r.marginRight,l=void 0===d?0:d,c=r.marginBottom,u=void 0===c?0:c,f=o.padding,g=(f=void 0===f?{}:f).paddingLeft,v=void 0===g?0:g,p=f.paddingTop,b=void 0===p?0:p,m=f.paddingRight,w=void 0===m?0:m,x=f.paddingBottom,y=void 0===x?0:x,S=o.border,z=(S=void 0===S?{}:S).borderWidth,B=void 0===z?0:z,R=o.borderTop,M=(R=void 0===R?{}:R).borderTopWidth,k=void 0===M?B:M,P=o.borderBottom,O=(P=void 0===P?{}:P).borderBottomWidth,T=void 0===O?B:O,L=o.borderRight,W=(L=void 0===L?{}:L).borderRightWidth,I=void 0===W?B:W,j=o.borderLeft,C=(j=void 0===j?{}:j).borderLeftWidth,F=void 0===C?B:C;return"contentSize"==i&&(this[i].left=t.left+s+v+F,this[i].top=t.top+h+b+k,this[i].width=t.width,this[i].height=t.height),"clientSize"==i&&(this[i].left=t.left+s+F,this[i].top=t.top+h+k,this[i].width=t.width+v+w,this[i].height=t.height+b+y),"borderSize"==i&&(this[i].left=t.left+s+F/2,this[i].top=t.top+h+k/2,this[i].width=t.width+v+w+F/2+I/2,this[i].height=t.height+b+y+T/2+k/2),"offsetSize"==i&&(this[i].left=t.left,this[i].top=t.top,this[i].width=t.width+v+w+F+I+s+l,this[i].height=t.height+b+y+T+k+u+h),this[i]},e.layoutBoxUpdate=function(t,e,i,o){if(void 0===i&&(i=""),"border-box"==(null==e?void 0:e.boxSizing)){var r=e||{},n=r.border,s=(n=void 0===n?{}:n).borderWidth,a=void 0===s?0:s,h=r.borderTop,d=(h=void 0===h?{}:h).borderTopWidth,l=void 0===d?a:d,c=r.borderBottom,u=(c=void 0===c?{}:c).borderBottomWidth,f=void 0===u?a:u,g=r.borderRight,v=(g=void 0===g?{}:g).borderRightWidth,p=void 0===v?a:v,b=r.borderLeft,m=(b=void 0===b?{}:b).borderLeftWidth,w=void 0===m?a:m,x=r.padding,y=(x=void 0===x?{}:x).paddingTop,S=void 0===y?0:y,z=x.paddingRight,B=void 0===z?0:z,R=x.paddingBottom,M=void 0===R?0:R,k=x.paddingLeft,P=void 0===k?0:k;"width"==i&&(t.width-=P+B+p+w),"height"!=i||o||(t.height-=S+M+l+f)}this.layoutBox.contentSize=this.getOffsetSize(t,e,"contentSize"),this.layoutBox.clientSize=this.getOffsetSize(t,e,"clientSize"),this.layoutBox.borderSize=this.getOffsetSize(t,e,"borderSize"),this.layoutBox.offsetSize=this.getOffsetSize(t,e,"offsetSize"),this.layoutBox=Object.assign({},this.layoutBox,this.layoutBox.borderSize)},e.getBoxPosition=function(t){var e=this.computedStyle,i=this.getChildren(),o=e.verticalAlign,r=e.left,n=void 0===r?0:r,s=e.top,a=void 0===s?0:s,h=p({},this.contentSize,{left:n,top:a}),d=this.contentSize.top-this.offsetSize.top,l=this.contentSize.left-this.offsetSize.left,c=0;if("bottom"==o&&this.contentSize.maxLineHeight?c=this.contentSize.maxLineHeight-this.contentSize.height:"middle"==o&&this.contentSize.maxLineHeight&&(c=(this.contentSize.maxLineHeight-this.contentSize.height)/2),h.top+=c,i.length){n+=l,a+=d;for(var u=null,f=null,g=!1,v=0;v<i.length;v++){var b=i[v];if(b.isAbsolute||b.isFixed)b.isAbsolute?(b.setPosition(b,h),b.style.left+=n,b.style.top+=a,b.getBoxPosition()):(b.setPosition(b,this.root),b.getBoxPosition());else if(0==v)b.style.left+=n,b.style.top+=a,b.getBoxPosition(),u=b,f=b;else{var m,w,x,y;(null==(m=f)?void 0:m.offsetSize.height)<(null==(w=u)?void 0:w.offsetSize.height)&&(f=u);var S=(null==(x=u)?void 0:x.offsetSize.left)+(null==(y=u)?void 0:y.offsetSize.width)+b.offsetSize.width>h.left+h.width+l;if(this.getBoxState(u,b)||S){var z,B,R,M;if(b.style.left+=n,(null==(z=u)?void 0:z.offsetSize.height)>=(null==(B=f)?void 0:B.offsetSize.height))b.style.top+=u.offsetSize.top+u.offsetSize.height||0;else b.style.top+=(null==(R=f)?void 0:R.offsetSize.top)+(null==(M=f)?void 0:M.offsetSize.height)||0;b.getBoxPosition(),u=b,f=b,g=!0}else b.style.left+=u.offsetSize.left+u.offsetSize.width,b.style.top+=g?u.offsetSize.top:a,b.getBoxPosition(),u=b}}this.layoutBoxUpdate(h,e)}else this.layoutBoxUpdate(h,e);return this.layoutBox},e.setMaxLineHeight=function(t,e,i){for(var o=t;o>=0&&!e[o].contentSize.maxLineHeight;)e[o].contentSize.maxLineHeight=i,o--},e.getBoxState=function(t,e){return"view"==e.name&&"inline-block"!==e.style.display||"view"==(null==t?void 0:t.name)&&"inline-block"!==(null==t?void 0:t.style.display)||"block"==e.style.display||"block"==(null==t?void 0:t.style.display)},e.getBoxHieght=function(){var t,e=this,i=this.name,o=this.computedStyle,r=this.attributes,n=this.parent,s=this.getChildren(),a=o.top,h=o.bottom,d=o.height,c=void 0===d?0:d,u=o.fontSize,f=void 0===u?14:u,g=o.position,v=o.lineHeight,b=void 0===v?"1.4em":v;o.lineClamp;var m=p({},this.contentSize);if("image"==i&&null==c){var w=r.width,x=r.height;r.mode,m.height=Math.round(m.width*x/w)||0,this.layoutBoxUpdate(m,o,"height")}else if(c)if(s.length){var y=null,S=0;s.forEach((function(t,i){var o,r,n=i==s.length-1;t.getBoxHieght();var a=(null==(o=y)?void 0:o.offsetSize.left)+(null==(r=y)?void 0:r.offsetSize.width)+t.offsetSize.width>m.left+m.width,h=e.getBoxState(y,t);if(a||h){if(a){for(var d=i-1;d>=0&&!s[d].contentSize.maxLineHeight;)S<s[d].contentSize.height&&(S=s[d].contentSize.height),d--;e.setMaxLineHeight(i-1,s,S),S=0}}else if(n){for(var l=i;l>=0&&!s[l].contentSize.maxLineHeight;)S<s[l].contentSize.height&&(S=s[l].contentSize.height),l--;e.setMaxLineHeight(i,s,S),S=0}y=t}))}else this.layoutBoxUpdate(m,o,"height");else{var z=0;if(null!==a&&(this.isAbsolute||this.isFixed&&n.contentSize.height)){var B="absolute"==g?n.contentSize.height:this.root.height;z=B-(/%$/.test(a)?l(a,B):a)-(/%$/.test(h)?l(h,B):h)}if("text"==i)b=l(b,f),m.height=z||this.attributes.lines*b,this.layoutBoxUpdate(m,o,"height",!0);else if(s.length){var R=0,M=null,k=0;m.height=s.reduce((function(t,i,o){var r=o==s.length-1;if(i.isAbsolute||i.isFixed)return r?t+R:t;i.getBoxHieght();var n=e.getBoxState(M,i),a=k+i.offsetSize.width>m.width;if(a||n){var h,d,l=0;return a||M&&("view"!==(null==(h=M)?void 0:h.name)||"inline-block"==(null==(d=M)?void 0:d.style.display))?(r&&(e.setMaxLineHeight(o-1,s,R),R+=i.offsetSize.height),l=t+R,R=i.offsetSize.height,k=i.offsetSize.width,M=i,l):(k=0,R=0,t+i.offsetSize.height)}return k+=i.offsetSize.width,R=Math.max(R,i.offsetSize.height)||0,r?(e.setMaxLineHeight(o,s,R),t+R):(M=i,t)}),0),z&&(m.height=z),this.layoutBoxUpdate(m,o)}else z&&(m.height=z),this.layoutBoxUpdate(m,o,"height")}if(o.borderRadius&&null!=(t=this.borderSize)&&t.width)for(var P in o.borderRadius)Object.hasOwnProperty.call(o.borderRadius,P)&&(o.borderRadius[P]=l(o.borderRadius[P],this.borderSize.width));return this.layoutBox},e.contrastSize=function(t,e,i){var o=t;return i&&(o=Math.min(o,i)),e&&(o=Math.max(o,e)),o},e.measureText=function(t,e){var i=this.ctx.measureText(t);return{width:i.width,fontHeight:(i.actualBoundingBoxAscent||.7*e)+1}},e.getBoxWidth=function(){var t,e=this,i=this.name,o=this.computedStyle,r=this.attributes,n=this.parent,s=void 0===n?{}:n,a=this.ctx,h=this.getChildren(),d=o.left,c=void 0===d?0:d;o.top;var u=o.right,f=o.width,g=void 0===f?0:f,v=o.minWidth,p=o.maxWidth,b=o.height,m=void 0===b?0:b,w=o.fontSize,x=void 0===w?14:w,y=o.fontWeight,S=o.fontFamily,z=o.textStyle,B=o.position,R=o.display,M=o.lineClamp,k=o.padding,P=void 0===k?{}:k,O=o.margin,T=void 0===O?{}:O,L=o.border,W=(L=void 0===L?{}:L).borderWidth,I=void 0===W?0:W,j=o.borderRight,C=(j=void 0===j?{}:j).borderRightWidth,F=void 0===C?I:C,A=o.borderLeft,H=(A=void 0===A?{}:A).borderLeftWidth,$=void 0===H?I:H;if(/%$/.test(g)&&s.contentSize.width&&(g=l(g,s.contentSize.width,!0)),/%$/.test(m)&&s.contentSize.height&&(m=l(m,s.contentSize.height)),/%$/.test(v)&&s.contentSize.width&&(v=l(v,s.contentSize.width,!0)),/%$/.test(p)&&s.contentSize.width&&(p=l(p,s.contentSize.width,!0)),o.padding&&null!=(t=s.contentSize)&&t.width)for(var E in o.padding)Object.hasOwnProperty.call(o.padding,E)&&(o.padding[E]=l(o.padding[E],s.contentSize.width));var U=P.paddingRight,_=void 0===U?0:U,D=P.paddingLeft,N=void 0===D?0:D;if(o.margin&&[o.margin.marginLeft,o.margin.marginRight].includes("auto"))if(g){var V=s.contentSize.width-g-_-N-$-F||0;o.margin.marginLeft==o.margin.marginRight?o.margin.marginLeft=o.margin.marginRight=V/2:"auto"==o.margin.marginLeft?o.margin.marginLeft=V:o.margin.marginRight=V}else o.margin.marginLeft=o.margin.marginRight=0;var X=T.marginRight,q=void 0===X?0:X,G=T.marginLeft,J={width:g,height:m,left:0,top:0},Y=N+_+$+F+(void 0===G?0:G)+q;if("text"==i&&!this.attributes.widths){var Q=r.text||"";a.save(),a.setFonts({fontFamily:S,fontSize:x,fontWeight:y,textStyle:z}),Q.split("\n").map((function(t){var i=t.split("").map((function(t){return e.measureText(t,x).width}));e.attributes.fontHeight=e.measureText(t,x).fontHeight,e.attributes.widths||(e.attributes.widths=[]),e.attributes.widths.push({widths:i,total:i.reduce((function(t,e){return t+e}),0)})})),a.restore()}if("image"==i&&null==g){var Z=r.width,K=r.height;J.width=this.contrastSize(Math.round(Z*m/K)||0,v,p),this.layoutBoxUpdate(J,o,"width")}else if(g)h.length?(this.layoutBoxUpdate(J,o,"width"),h.forEach((function(t){t.getBoxWidth()}))):this.layoutBoxUpdate(J,o,"width");else{var tt=0;if((this.isAbsolute||this.isFixed)&&s.contentSize.width){var et="absolute"==B?s.contentSize.width:this.root.width;tt=et-(/%$/.test(c)?l(c,et):c)-(/%$/.test(u)?l(u,et):u)}if("text"==i){var it=this.attributes.widths,ot=Math.max.apply(Math,it.map((function(t){return t.total})));if(s&&s.contentSize.width>0&&(ot>s.contentSize.width||"block"==R)&&!this.isAbsolute&&!this.isFixed)ot=s.contentSize.width-Y;J.width=tt||this.contrastSize(ot,v,p),this.layoutBoxUpdate(J,o,"width")}else if("view"!=i||!s||"inline-block"===R||this.isAbsolute||this.isFixed)if(h.length){for(var rt=0,nt=null,st=0;h.length>st;){var at=h[st],ht=st==h.length-1,dt=this.getBoxState(nt,at);if(!at.isFixed&&!at.isAbsolute)if(!nt||dt){var lt=at.getBoxWidth();rt=Math.max(rt,lt.width)||0,nt=at}else if(nt.offsetSize.left+nt.offsetSize.width+at.offsetSize.width<s.contentSize.width&&st!==h.length-1){rt+=at.getBoxWidth().width,nt=at}else{var ct=at.getBoxWidth();ht?rt+=ct.width:rt=s.contentSize.width,nt=null}st++}J.width=tt||this.contrastSize(Math.ceil(rt),v,p),h.forEach((function(t){"block"!=t.style.display||"text"!=t.name||t.isFixed||t.isAbsolute||t.style.width||(t.style.width=J.width,t.getBoxWidth())})),this.layoutBoxUpdate(J,o,"width")}else J.width=tt,this.layoutBoxUpdate(J,o,"width");else J.width=this.contrastSize(s.contentSize.width-Y,v,p),this.layoutBoxUpdate(J,o),h.length&&h.forEach((function(t){t.getBoxWidth()}))}if("text"==i&&!this.attributes.lines){var ut=this.attributes.widths.length;this.attributes.widths.forEach((function(t){return t.widths.reduce((function(t,e,i){return t+e>J.width?(ut++,e):t+e}),0)})),ut=M&&ut>M?M:ut,this.attributes.lines=ut}return this.layoutBox},e.layout=function(){return this.getBoxWidth(),this.getBoxHieght(),this.getBoxPosition(),this.offsetSize},t}(),x=function(){var t,e,i,o,r,n,s=[0,11,15,19,23,27,31,16,18,20,22,24,26,28,20,22,24,24,26,28,28,22,24,24,26,26,28,28,24,24,26,26,26,28,28,24,26,26,26,28,28],a=[3220,1468,2713,1235,3062,1890,2119,1549,2344,2936,1117,2583,1330,2470,1667,2249,2028,3780,481,4011,142,3098,831,3445,592,2517,1776,2234,1951,2827,1070,2660,1345,3177],h=[30660,29427,32170,30877,26159,25368,27713,26998,21522,20773,24188,23371,17913,16590,20375,19104,13663,12392,16177,14854,9396,8579,11994,11245,5769,5054,7399,6608,1890,597,3340,2107],d=[1,0,19,7,1,0,16,10,1,0,13,13,1,0,9,17,1,0,34,10,1,0,28,16,1,0,22,22,1,0,16,28,1,0,55,15,1,0,44,26,2,0,17,18,2,0,13,22,1,0,80,20,2,0,32,18,2,0,24,26,4,0,9,16,1,0,108,26,2,0,43,24,2,2,15,18,2,2,11,22,2,0,68,18,4,0,27,16,4,0,19,24,4,0,15,28,2,0,78,20,4,0,31,18,2,4,14,18,4,1,13,26,2,0,97,24,2,2,38,22,4,2,18,22,4,2,14,26,2,0,116,30,3,2,36,22,4,4,16,20,4,4,12,24,2,2,68,18,4,1,43,26,6,2,19,24,6,2,15,28,4,0,81,20,1,4,50,30,4,4,22,28,3,8,12,24,2,2,92,24,6,2,36,22,4,6,20,26,7,4,14,28,4,0,107,26,8,1,37,22,8,4,20,24,12,4,11,22,3,1,115,30,4,5,40,24,11,5,16,20,11,5,12,24,5,1,87,22,5,5,41,24,5,7,24,30,11,7,12,24,5,1,98,24,7,3,45,28,15,2,19,24,3,13,15,30,1,5,107,28,10,1,46,28,1,15,22,28,2,17,14,28,5,1,120,30,9,4,43,26,17,1,22,28,2,19,14,28,3,4,113,28,3,11,44,26,17,4,21,26,9,16,13,26,3,5,107,28,3,13,41,26,15,5,24,30,15,10,15,28,4,4,116,28,17,0,42,26,17,6,22,28,19,6,16,30,2,7,111,28,17,0,46,28,7,16,24,30,34,0,13,24,4,5,121,30,4,14,47,28,11,14,24,30,16,14,15,30,6,4,117,30,6,14,45,28,11,16,24,30,30,2,16,30,8,4,106,26,8,13,47,28,7,22,24,30,22,13,15,30,10,2,114,28,19,4,46,28,28,6,22,28,33,4,16,30,8,4,122,30,22,3,45,28,8,26,23,30,12,28,15,30,3,10,117,30,3,23,45,28,4,31,24,30,11,31,15,30,7,7,116,30,21,7,45,28,1,37,23,30,19,26,15,30,5,10,115,30,19,10,47,28,15,25,24,30,23,25,15,30,13,3,115,30,2,29,46,28,42,1,24,30,23,28,15,30,17,0,115,30,10,23,46,28,10,35,24,30,19,35,15,30,17,1,115,30,14,21,46,28,29,19,24,30,11,46,15,30,13,6,115,30,14,23,46,28,44,7,24,30,59,1,16,30,12,7,121,30,12,26,47,28,39,14,24,30,22,41,15,30,6,14,121,30,6,34,47,28,46,10,24,30,2,64,15,30,17,4,122,30,29,14,46,28,49,10,24,30,24,46,15,30,4,18,122,30,13,32,46,28,48,14,24,30,42,32,15,30,20,4,117,30,40,7,47,28,43,22,24,30,10,67,15,30,19,6,118,30,18,31,47,28,34,34,24,30,20,61,15,30],l=[255,0,1,25,2,50,26,198,3,223,51,238,27,104,199,75,4,100,224,14,52,141,239,129,28,193,105,248,200,8,76,113,5,138,101,47,225,36,15,33,53,147,142,218,240,18,130,69,29,181,194,125,106,39,249,185,201,154,9,120,77,228,114,166,6,191,139,98,102,221,48,253,226,152,37,179,16,145,34,136,54,208,148,206,143,150,219,189,241,210,19,92,131,56,70,64,30,66,182,163,195,72,126,110,107,58,40,84,250,133,186,61,202,94,155,159,10,21,121,43,78,212,229,172,115,243,167,87,7,112,192,247,140,128,99,13,103,74,222,237,49,197,254,24,227,165,153,119,38,184,180,124,17,68,146,217,35,32,137,46,55,63,209,91,149,188,207,205,144,135,151,178,220,252,190,97,242,86,211,171,20,42,93,158,132,60,57,83,71,109,65,162,31,45,67,216,183,123,164,118,196,23,73,236,127,12,111,246,108,161,59,82,41,157,85,170,251,96,134,177,187,204,62,90,203,89,95,176,156,169,160,81,11,245,22,235,122,117,44,215,79,174,213,233,230,231,173,232,116,214,244,234,168,80,88,175],c=[1,2,4,8,16,32,64,128,29,58,116,232,205,135,19,38,76,152,45,90,180,117,234,201,143,3,6,12,24,48,96,192,157,39,78,156,37,74,148,53,106,212,181,119,238,193,159,35,70,140,5,10,20,40,80,160,93,186,105,210,185,111,222,161,95,190,97,194,153,47,94,188,101,202,137,15,30,60,120,240,253,231,211,187,107,214,177,127,254,225,223,163,91,182,113,226,217,175,67,134,17,34,68,136,13,26,52,104,208,189,103,206,129,31,62,124,248,237,199,147,59,118,236,197,151,51,102,204,133,23,46,92,184,109,218,169,79,158,33,66,132,21,42,84,168,77,154,41,82,164,85,170,73,146,57,114,228,213,183,115,230,209,191,99,198,145,63,126,252,229,215,179,123,246,241,255,227,219,171,75,150,49,98,196,149,55,110,220,165,87,174,65,130,25,50,100,200,141,7,14,28,56,112,224,221,167,83,166,81,162,89,178,121,242,249,239,195,155,43,86,172,69,138,9,18,36,72,144,61,122,244,245,247,243,251,235,203,139,11,22,44,88,176,125,250,233,207,131,27,54,108,216,173,71,142,0],u=[],f=[],g=[],v=[],p=[],b=2;function m(t,e){var i;t>e&&(i=t,t=e,e=i),i=e,i*=e,i+=e,i>>=1,v[i+=t]=1}function w(t,i){var o;for(g[t+e*i]=1,o=-2;o<2;o++)g[t+o+e*(i-2)]=1,g[t-2+e*(i+o+1)]=1,g[t+2+e*(i+o)]=1,g[t+o+1+e*(i+2)]=1;for(o=0;o<2;o++)m(t-1,i+o),m(t+1,i-o),m(t-o,i-1),m(t+o,i+1)}function x(t){for(;t>=255;)t=((t-=255)>>8)+(255&t);return t}var y=[];function S(t,e,i,o){var r,n,s;for(r=0;r<o;r++)u[i+r]=0;for(r=0;r<e;r++){if(255!=(s=l[u[t+r]^u[i]]))for(n=1;n<o;n++)u[i+n-1]=u[i+n]^c[x(s+y[o-n])];else for(n=i;n<i+o;n++)u[n]=u[n+1];u[i+o-1]=255==s?0:c[x(s+y[0])]}}function z(t,e){var i;return t>e&&(i=t,t=e,e=i),i=e,i+=e*e,i>>=1,v[i+=t]}function B(t){var i,o,r,n;switch(t){case 0:for(o=0;o<e;o++)for(i=0;i<e;i++)i+o&1||z(i,o)||(g[i+o*e]^=1);break;case 1:for(o=0;o<e;o++)for(i=0;i<e;i++)1&o||z(i,o)||(g[i+o*e]^=1);break;case 2:for(o=0;o<e;o++)for(r=0,i=0;i<e;i++,r++)3==r&&(r=0),r||z(i,o)||(g[i+o*e]^=1);break;case 3:for(n=0,o=0;o<e;o++,n++)for(3==n&&(n=0),r=n,i=0;i<e;i++,r++)3==r&&(r=0),r||z(i,o)||(g[i+o*e]^=1);break;case 4:for(o=0;o<e;o++)for(r=0,n=o>>1&1,i=0;i<e;i++,r++)3==r&&(r=0,n=!n),n||z(i,o)||(g[i+o*e]^=1);break;case 5:for(n=0,o=0;o<e;o++,n++)for(3==n&&(n=0),r=0,i=0;i<e;i++,r++)3==r&&(r=0),(i&o&1)+!(!r|!n)||z(i,o)||(g[i+o*e]^=1);break;case 6:for(n=0,o=0;o<e;o++,n++)for(3==n&&(n=0),r=0,i=0;i<e;i++,r++)3==r&&(r=0),(i&o&1)+(r&&r==n)&1||z(i,o)||(g[i+o*e]^=1);break;case 7:for(n=0,o=0;o<e;o++,n++)for(3==n&&(n=0),r=0,i=0;i<e;i++,r++)3==r&&(r=0),(r&&r==n)+(i+o&1)&1||z(i,o)||(g[i+o*e]^=1)}}function R(t){var e,i=0;for(e=0;e<=t;e++)p[e]>=5&&(i+=3+p[e]-5);for(e=3;e<t-1;e+=2)p[e-2]==p[e+2]&&p[e+2]==p[e-1]&&p[e-1]==p[e+1]&&3*p[e-1]==p[e]&&(0==p[e-3]||e+3>t||3*p[e-3]>=4*p[e]||3*p[e+3]>=4*p[e])&&(i+=40);return i}function M(){var t,i,o,r,n,s=0,a=0;for(i=0;i<e-1;i++)for(t=0;t<e-1;t++)(g[t+e*i]&&g[t+1+e*i]&&g[t+e*(i+1)]&&g[t+1+e*(i+1)]||!(g[t+e*i]||g[t+1+e*i]||g[t+e*(i+1)]||g[t+1+e*(i+1)]))&&(s+=3);for(i=0;i<e;i++){for(p[0]=0,o=r=t=0;t<e;t++)(n=g[t+e*i])==r?p[o]++:p[++o]=1,a+=(r=n)?1:-1;s+=R(o)}a<0&&(a=-a);var h=a,d=0;for(h+=h<<2,h<<=1;h>e*e;)h-=e*e,d++;for(s+=10*d,t=0;t<e;t++){for(p[0]=0,o=r=i=0;i<e;i++)(n=g[t+e*i])==r?p[o]++:p[++o]=1,r=n;s+=R(o)}return s}var k=null;return{api:{get ecclevel(){return b},set ecclevel(t){b=t},get size(){return _size},set size(t){_size=t},get canvas(){return k},set canvas(t){k=t},getFrame:function(p){return function(p){var R,k,P,O,T,L,W,I;O=p.length,t=0;do{if(t++,P=4*(b-1)+16*(t-1),i=d[P++],o=d[P++],r=d[P++],n=d[P],O<=(P=r*(i+o)+o-3+(t<=9)))break}while(t<40);for(e=17+4*t,T=r+(r+n)*(i+o)+o,O=0;O<T;O++)f[O]=0;for(u=p.slice(0),O=0;O<e*e;O++)g[O]=0;for(O=0;O<(e*(e+1)+1)/2;O++)v[O]=0;for(O=0;O<3;O++){for(P=0,k=0,1==O&&(P=e-7),2==O&&(k=e-7),g[k+3+e*(P+3)]=1,R=0;R<6;R++)g[k+R+e*P]=1,g[k+e*(P+R+1)]=1,g[k+6+e*(P+R)]=1,g[k+R+1+e*(P+6)]=1;for(R=1;R<5;R++)m(k+R,P+1),m(k+1,P+R+1),m(k+5,P+R),m(k+R+1,P+5);for(R=2;R<4;R++)g[k+R+e*(P+2)]=1,g[k+2+e*(P+R+1)]=1,g[k+4+e*(P+R)]=1,g[k+R+1+e*(P+4)]=1}if(t>1)for(O=s[t],k=e-7;;){for(R=e-7;R>O-3&&(w(R,k),!(R<O));)R-=O;if(k<=O+9)break;w(6,k-=O),w(k,6)}for(g[8+e*(e-8)]=1,k=0;k<7;k++)m(7,k),m(e-8,k),m(7,k+e-7);for(R=0;R<8;R++)m(R,7),m(R+e-8,7),m(R,e-8);for(R=0;R<9;R++)m(R,8);for(R=0;R<8;R++)m(R+e-8,8),m(8,R);for(k=0;k<7;k++)m(8,k+e-7);for(R=0;R<e-14;R++)1&R?(m(8+R,6),m(6,8+R)):(g[8+R+6*e]=1,g[6+e*(8+R)]=1);if(t>6)for(O=a[t-7],P=17,R=0;R<6;R++)for(k=0;k<3;k++,P--)1&(P>11?t>>P-12:O>>P)?(g[5-R+e*(2-k+e-11)]=1,g[2-k+e-11+e*(5-R)]=1):(m(5-R,2-k+e-11),m(2-k+e-11,5-R));for(k=0;k<e;k++)for(R=0;R<=k;R++)g[R+e*k]&&m(R,k);for(T=u.length,L=0;L<T;L++)f[L]=u.charCodeAt(L);if(u=f.slice(0),T>=(R=r*(i+o)+o)-2&&(T=R-2,t>9&&T--),L=T,t>9){for(u[L+2]=0,u[L+3]=0;L--;)O=u[L],u[L+3]|=255&O<<4,u[L+2]=O>>4;u[2]|=255&T<<4,u[1]=T>>4,u[0]=64|T>>12}else{for(u[L+1]=0,u[L+2]=0;L--;)O=u[L],u[L+2]|=255&O<<4,u[L+1]=O>>4;u[1]|=255&T<<4,u[0]=64|T>>4}for(L=T+3-(t<10);L<R;)u[L++]=236,u[L++]=17;for(y[0]=1,L=0;L<n;L++){for(y[L+1]=1,W=L;W>0;W--)y[W]=y[W]?y[W-1]^c[x(l[y[W]]+L)]:y[W-1];y[0]=c[x(l[y[0]]+L)]}for(L=0;L<=n;L++)y[L]=l[y[L]];for(P=R,k=0,L=0;L<i;L++)S(k,r,P,n),k+=r,P+=n;for(L=0;L<o;L++)S(k,r+1,P,n),k+=r+1,P+=n;for(k=0,L=0;L<r;L++){for(W=0;W<i;W++)f[k++]=u[L+W*r];for(W=0;W<o;W++)f[k++]=u[i*r+L+W*(r+1)]}for(W=0;W<o;W++)f[k++]=u[i*r+L+W*(r+1)];for(L=0;L<n;L++)for(W=0;W<i+o;W++)f[k++]=u[R+L+W*n];for(u=f,R=k=e-1,P=T=1,I=(r+n)*(i+o)+o,L=0;L<I;L++)for(O=u[L],W=0;W<8;W++,O<<=1){128&O&&(g[R+e*k]=1);do{T?R--:(R++,P?0!=k?k--:(P=!P,6==(R-=2)&&(R--,k=9)):k!=e-1?k++:(P=!P,6==(R-=2)&&(R--,k-=8))),T=!T}while(z(R,k))}for(u=g.slice(0),O=0,k=3e4,P=0;P<8&&(B(P),(R=M())<k&&(k=R,O=P),7!=O);P++)g=u.slice(0);for(O!=P&&B(O),k=h[O+(b-1<<3)],P=0;P<8;P++,k>>=1)1&k&&(g[e-1-P+8*e]=1,P<6?g[8+e*P]=1:g[8+e*(P+1)]=1);for(P=0;P<7;P++,k>>=1)1&k&&(g[8+e*(e-7+P)]=1,P?g[6-P+8*e]=1:g[7+8*e]=1);return g}(p)},utf16to8:function(t){var e,i,o,r;for(e="",o=t.length,i=0;i<o;i++)(r=t.charCodeAt(i))>=1&&r<=127?e+=t.charAt(i):r>2047?(e+=String.fromCharCode(224|r>>12&15),e+=String.fromCharCode(128|r>>6&63),e+=String.fromCharCode(128|r>>0&63)):(e+=String.fromCharCode(192|r>>6&31),e+=String.fromCharCode(128|r>>0&63));return e},draw:function(t,i,o,r,n){i.drawView(o,r);var s=i.ctx,a=o.contentSize,h=a.width,d=a.height;r.borderRadius,r.backgroundColor;var l=r.color,c=void 0===l?"#000000":l;r.border;var u=o.contentSize.left-o.borderSize.left,f=o.contentSize.top-o.borderSize.top;if(b=n||b,s){s.save(),i.setOpacity(r);var g=i.setTransform(o,r),v=g.x,p=g.y;v+=u,p+=f;var m=Math.min(h,d);t=this.utf16to8(t);var w=this.getFrame(t),x=m/e;s.setFillStyle(c);for(var y=0;y<e;y++)for(var S=0;S<e;S++)w[S*e+y]&&s.fillRect(v+x*y,p+x*S,x,x);s.restore(),i.setBorder(o,r)}else console.warn("No canvas provided to draw QR code in!")}}}}(),y=function(){function t(t,e){var o,r,n=this,a=t.id,h=t.context,d=t.canvas,l=t.pixelRatio,c=t.width,u=t.height;this.count=0,this.isDraw=!0,this.id=a,this.canvas=d,this.pixelRatio=1*l.toFixed(2),this.width=c,this.height=u,this.platform=s,this.isRate=!1,this.component=e,this.ctx=(r=this,(o=h).setFonts=function(t){var e=t.fontFamily,i=void 0===e?"sans-serif":e,n=t.fontSize,s=void 0===n?14:n,a=t.fontWeight,h=void 0===a?"normal":a,d=t.textStyle,l=void 0===d?"normal":d;"mp-toutao"==r.platform&&(h="bold"==h?"bold":"",l="italic"==l?"italic":""),o.font=l+" "+h+" "+s+"px "+i},o.draw?o:Object.assign(o,{setStrokeStyle:function(t){o.strokeStyle=t},setLineWidth:function(t){o.lineWidth=t},setLineCap:function(t){o.lineCap=t},setFillStyle:function(t){o.fillStyle=t},setFontSize:function(t){o.font=String(t)+"px sans-serif"},setGlobalAlpha:function(t){o.globalAlpha=t},setLineJoin:function(t){o.lineJoin=t},setTextAlign:function(t){o.textAlign=t},setMiterLimit:function(t){o.miterLimit=t},setShadow:function(t,e,i,r){o.shadowOffsetX=t,o.shadowOffsetY=e,o.shadowBlur=i,o.shadowColor=r},setTextBaseline:function(t){o.textBaseline=t},createCircularGradient:function(){},draw:function(){}})),this.sleep=1e3/30,this.progress=0,this.root={width:c,height:u,fontSizeRate:1};var f=i({},this.size);Object.defineProperty(this,"size",{configurable:!0,set:function(t){Object.keys(t).forEach((function(e){f[e]=t[e],n.root[e]=t[e]}))},get:function(){return f}}),this.init()}return t.prototype.init=function(){this.canvas.height&&(this.canvas.height=this.root.height*this.pixelRatio,this.canvas.width=this.root.width*this.pixelRatio,this.ctx.scale(this.pixelRatio,this.pixelRatio))},t.prototype.clear=function(){this.ctx.clearRect(0,0,this.root.width,this.root.height)},t.prototype.roundRect=function(t,e,i,o,r,n,s){if(void 0===n&&(n=!1),void 0===s&&(s=!1),!(r<0)){var a=this.ctx;if(a.beginPath(),r){var h=r||{},d=h.borderTopLeftRadius,l=void 0===d?r||0:d,c=h.borderTopRightRadius,u=void 0===c?r||0:c,f=h.borderBottomRightRadius,g=void 0===f?r||0:f,v=h.borderBottomLeftRadius,p=void 0===v?r||0:v;a.arc(t+i-g,e+o-g,g,0,.5*Math.PI),a.lineTo(t+p,e+o),a.arc(t+p,e+o-p,p,.5*Math.PI,Math.PI),a.lineTo(t,e+l),a.arc(t+l,e+l,l,Math.PI,1.5*Math.PI),a.lineTo(t+i-u,e),a.arc(t+i-u,e+u,u,1.5*Math.PI,2*Math.PI),a.lineTo(t+i,e+o-g)}else a.rect(t,e,i,o);a.closePath(),s&&a.stroke(),n&&a.fill()}},t.prototype.setTransform=function(t,e){var i=e.transform,o=e.transformOrigin,r=void 0===o?"center center":o,n=e.position,s=this.ctx,a=i||{},h=a.scaleX,c=void 0===h?1:h,u=a.scaleY,f=void 0===u?1:u,g=a.translateX,v=void 0===g?0:g,p=a.translateY,b=void 0===p?0:p,m=a.rotate,w=void 0===m?0:m,x=a.skewX,y=void 0===x?0:x,S=a.skewY,z=void 0===S?0:S,B=t.left,R=t.top,M=t.width,k=t.height;if(!["absolute","fixed"].includes(n))return{x:B,y:R,w:M,h:k};v=l(v,M)||0,b=l(b,k)||0;var P={top:l("0%",1),center:l("50%",1,!0),bottom:l("100%",1)},O={left:l("0%",1),center:l("50%",1,!0),right:l("100%",1)};r=r.split(" ").filter((function(t,e){return e<2})).reduce((function(t,e){if(/\d+/.test(e)){var i=l(e,1,!0)/(/px|rpx$/.test(e)?d(t.x)?k:M:1);return d(t.x)?Object.assign(t,{y:i}):Object.assign(t,{x:i})}return d(O[e])&&!d(t.x)?Object.assign(t,{x:O[e]}):Object.assign(t,{y:P[e]||.5})}),{}),s.scale(c,f);var T={x:M*(c>0?1:-1)*r.x+(B+v)/c,y:k*(f>0?1:-1)*r.y+(R+b)/f};return s.translate(T.x,T.y),w&&s.rotate(w*Math.PI/180),(y||z)&&s.transform(1,Math.tan(z*Math.PI/180),Math.tan(y*Math.PI/180),1,0,0),{x:-M*r.x,y:-k*r.y,w:M,h:k}},t.prototype.setBackground=function(t,e,i,o,r){var n=this.ctx;t&&"transparent"!=t?u(t)?f(t,e,i,o,r,n):n.setFillStyle(t):["mp-toutiao","mp-baidu"].includes(this.platform)?n.setFillStyle("transparent"):n.setFillStyle("rgba(0,0,0,0)")},t.prototype.setShadow=function(t){var e=t.boxShadow,i=void 0===e?[]:e,o=this.ctx;if(i.length){var r=i[0],n=i[1],s=i[2],a=i[3];o.setShadow(r,n,s,a)}},t.prototype.setBorder=function(t,e){var i=this,o=this.ctx,r=t.width,n=t.height,s=e.border,a=e.borderBottom,h=e.borderTop,d=e.borderRight,l=e.borderLeft,c=e.borderRadius,u=s||{},f=u.borderWidth,g=void 0===f?0:f,v=u.borderStyle,p=u.borderColor,b=a||{},m=b.borderBottomWidth,w=void 0===m?g:m,x=b.borderBottomStyle,y=void 0===x?v:x,S=b.borderBottomColor,z=void 0===S?p:S,B=h||{},R=B.borderTopWidth,M=void 0===R?g:R,k=B.borderTopStyle,P=void 0===k?v:k,O=B.borderTopColor,T=void 0===O?p:O,L=d||{},W=L.borderRightWidth,I=void 0===W?g:W,j=L.borderRightStyle,C=void 0===j?v:j,F=L.borderRightColor,A=void 0===F?p:F,H=l||{},$=H.borderLeftWidth,E=void 0===$?g:$,U=H.borderLeftStyle,_=void 0===U?v:U,D=H.borderLeftColor,N=void 0===D?p:D,V=c||{},X=V.borderTopLeftRadius,q=void 0===X?c||0:X,G=V.borderTopRightRadius,J=void 0===G?c||0:G,Y=V.borderBottomRightRadius,Q=void 0===Y?c||0:Y,Z=V.borderBottomLeftRadius,K=void 0===Z?c||0:Z;if(a||l||h||d||s){var tt=function(t,e,r){"dashed"==e?/mp/.test(i.platform)?o.setLineDash([Math.ceil(4*t/3),Math.ceil(4*t/3)]):o.setLineDash([Math.ceil(6*t),Math.ceil(6*t)]):"dotted"==e&&o.setLineDash([t,t]),o.setStrokeStyle(r)},et=function(t,e,i,r,n,s,a,h,d,l,c,u,f,g){o.save(),o.setLineWidth(u),tt(u,f,g),o.beginPath(),o.arc(t,e,a,Math.PI*d,Math.PI*l),o.lineTo(i,r),o.arc(n,s,h,Math.PI*l,Math.PI*c),o.stroke(),o.restore()};o.save(),this.setOpacity(e);var it=this.setTransform(t,e),ot=it.x,rt=it.y;s&&(o.setLineWidth(g),tt(g,v,p),this.roundRect(ot,rt,r,n,c,!1,!!p),o.restore()),a&&et(ot+r-Q,rt+n-Q,ot+K,rt+n,ot+K,rt+n-K,Q,K,.25,.5,.75,w,y,z),l&&et(ot+K,rt+n-K,ot,rt+q,ot+q,rt+q,K,q,.75,1,1.25,E,_,N),h&&et(ot+q,rt+q,ot+r-J,rt,ot+r-J,rt+J,q,J,1.25,1.5,1.75,M,P,T),d&&et(ot+r-J,rt+J,ot+r,rt+n-Q,ot+r-Q,rt+n-Q,J,Q,1.75,2,.25,I,C,A)}},t.prototype.setOpacity=function(t){var e=t.opacity,i=void 0===e?1:e;this.ctx.setGlobalAlpha(i)},t.prototype.drawPattern=function(t,e,i){return o(this,void 0,void 0,(function(){var n=this;return r(this,(function(s){return[2,new Promise((function(s,a){var h=n,d=h.ctx,l=h.canvas,c=e.width,u=e.height,f=i||{},g=f.borderRadius,v=void 0===g?0:g,p=f.backgroundColor,b=void 0===p?"transparent":p,m=f.backgroundImage,w=f.backgroundRepeat,x=void 0===w?"repeat":w;d.save(),n.setOpacity(i);var y=n.setTransform(e,i),S=y.x,z=y.y;n.setShadow(i),n.setBackground(b,c,u,S,z),n.roundRect(S,z,c,u,v,!0,!1);var B=function(t){var o=d.createPattern(t.src,x);d.setFillStyle(o),n.roundRect(S,z,c,u,v,!0,!1),n.setBorder(e,i),d.restore(),s()};if(m)if(l.createImage||"web"==n.platform){var R=null;(R=l.createImage?l.createImage():new Image).onload=function(){t.src=R,B(t)},R.onerror=function(){return o(n,void 0,void 0,(function(){return r(this,(function(e){return console.log("createImage fail: "+JSON.stringify(t)),s(),[2]}))}))},R.src=t.path}else B(t)}))]}))}))},t.prototype.drawView=function(t,e,i,o,r){void 0===i&&(i=!0),void 0===o&&(o=!0),void 0===r&&(r=!0);var n=this.ctx,s=t.width,a=t.height,h=e||{},d=h.borderRadius,l=void 0===d?0:d,c=h.backgroundColor,u=void 0===c?"transparent":c;n.save(),this.setOpacity(e);var f=this.setTransform(t,e),g=f.x,v=f.y;r&&this.setShadow(e),i&&this.setBackground(u,s,a,g,v),this.roundRect(g,v,s,a,l,i,!1),n.restore(),o&&this.setBorder(t,e)},t.prototype.drawImage=function(t,e,i,n){return void 0===e&&(e={}),void 0===i&&(i={}),void 0===n&&(n=!0),o(this,void 0,void 0,(function(){var s=this;return r(this,(function(a){switch(a.label){case 0:return[4,new Promise((function(a,h){return o(s,void 0,void 0,(function(){var s,h,d,u,f,g,v,p,b,m,w,x,y,S,z,B,R,M,k,P,O,T,L,W,I,j,C,F=this;return r(this,(function(A){switch(A.label){case 0:return i.boxShadow&&this.drawView(e,Object.assign(i,{backgroundColor:i.backgroundColor||i.boxShadow&&(i.backgroundColor||"#ffffff")}),!0,!1,!0),h=(s=this).ctx,d=s.sleep,u=s.canvas,f=i.borderRadius,g=void 0===f?0:f,v=i.backgroundColor,p=void 0===v?"transparent":v,b=i.objectFit,m=void 0===b?"fill":b,w=i.objectPosition,x=e.width,y=e.height,S=e.left,z=e.top,h.save(),B=e.contentSize.left-e.borderSize.left,R=e.contentSize.top-e.borderSize.top,n||(this.setOpacity(i),M=this.setTransform(e,i),k=M.x,P=M.y,this.setBackground(p,x,y,S,z),S=k,z=P,this.roundRect(S,z,x,y,g,!!g,!1)),S+=B,z+=R,h.clip(),O=function(t){if("fill"!==m){var i=function(t,e,i){var o=t.objectFit,r=t.objectPosition,n=e.width/e.height,s=i.width/i.height,a=1;"contain"==o&&n>=s||"cover"==o&&n<s?a=e.height/i.height:("contain"==o&&n<s||"cover"==o&&n>=s)&&(a=e.width/i.width);var h=i.width*a,d=i.height*a,c=/^\d+px|rpx$/.test(null==r?void 0:r[0])?l(null==r?void 0:r[0],e.width):(e.width-h)*(/%$/.test(null==r?void 0:r[0])?l(null==r?void 0:r[0],1,!0):{left:0,center:.5,right:1}[(null==r?void 0:r[0])||"center"]),u=/^\d+px|rpx$/.test(null==r?void 0:r[1])?l(null==r?void 0:r[1],e.height):(e.height-d)*(/%$/.test(null==r?void 0:r[1])?l(null==r?void 0:r[1],1,!0):{top:0,center:.5,bottom:1}[(null==r?void 0:r[1])||"center"]),f=function(t,e){return[(t-c)/a,(e-u)/a]},g=f(0,0),v=g[0],p=g[1],b=f(e.width,e.height),m=b[0],w=b[1];return{sx:Math.max(v,0),sy:Math.max(p,0),sw:Math.min(m-v,i.width),sh:Math.min(w-p,i.height),dx:Math.max(c,0),dy:Math.max(u,0),dw:Math.min(h,e.width),dh:Math.min(d,e.height)}}({objectFit:m,objectPosition:w},e.contentSize,t),o=i.sx,r=i.sy,n=i.sh,s=i.sw,a=i.dx,d=i.dy,c=i.dh,u=i.dw;"mp-baidu"==F.platform?h.drawImage(t.src,a+S,d+z,u,c,o,r,s,n):h.drawImage(t.src,o,r,s,n,a+S,d+z,u,c)}else h.drawImage(t.src,S,z,x,y)},T=function(){h.restore(),F.drawView(e,i,!1,!0,!1),setTimeout(a,d)},L=function(t){if(u.createImage||"web"==F.platform){var e=null;(e=u.createImage?u.createImage():new Image).onload=function(){t.src=e,O(t),T()},e.onerror=function(){return o(F,void 0,void 0,(function(){return r(this,(function(e){return console.log("createImage fail: "+JSON.stringify(t)),a(!0),[2]}))}))},e.src=t.path}else O(t),T()},"string"!=typeof t?[3,2]:[4,c(t)];case 1:return W=A.sent(),I=W.path,j=W.width,C=W.height,L({path:I,src:I,width:j,height:C}),[3,3];case 2:L(t),A.label=3;case 3:return[2]}}))}))}))];case 1:return a.sent(),[2]}}))}))},t.prototype.drawText=function(t,e,i,o){this.drawView(e,i);var r=this.ctx,n=e.borderSize,s=e.contentSize,a=s.width,h=s.height,d=s.left-n.left,c=s.top-n.top,u=i.color,f=void 0===u?"#000000":u,g=i.lineHeight,v=void 0===g?"1.4em":g,p=i.fontSize,b=void 0===p?14:p,m=i.fontWeight,w=i.fontFamily,x=i.textStyle,y=i.textAlign,S=void 0===y?"left":y,z=i.verticalAlign,B=void 0===z?"middle":z;i.backgroundColor;var R=i.lineClamp,M=i.textDecoration;if(v=l(v,b),t){r.save(),this.setOpacity(i);var k=this.setTransform(e,i),P=k.x,O=k.y;switch(P+=d,O+=c,r.setFonts({fontFamily:w,fontSize:b,fontWeight:m,textStyle:x}),r.setTextBaseline("middle"),r.setTextAlign(S),r.setFillStyle(f),O+=b/2,S){case"left":break;case"center":P+=.5*a;break;case"right":P+=a}var T=o.lines*v,L=Math.ceil((h-T)/2);switch(L<0&&(L=0),B){case"top":break;case"middle":O+=L;break;case"bottom":O+=2*L}var W=(v-o.fontHeight)/2,I=function(t,e,i){var n=t;switch(S){case"left":t=t,n+=i;break;case"center":n=(t-=i/2)+i;break;case"right":n=t,t-=i}M&&(r.setLineWidth(b/13),r.beginPath(),e-=W,/\bunderline\b/.test(M)&&(r.moveTo(t,e-.5*o.fontHeight),r.lineTo(n,e-.5*o.fontHeight)),/\boverline\b/.test(M)&&(r.moveTo(t,e-1.5*o.fontHeight),r.lineTo(n,e-1.5*o.fontHeight)),/\bline-through\b/.test(M)&&(r.moveTo(t,e-o.fontHeight),r.lineTo(n,e-o.fontHeight)),r.closePath(),r.setStrokeStyle(f),r.stroke())};if(1==o.widths.lenght&&o.widths[0].total<=s.width)return r.fillText(t,P,O+W),I(P,O+=v,o.widths[0].total),r.restore(),void this.setBorder(e,i);for(var j=t.split(""),C=O,F=P,A="",H=0,$=0;$<=j.length;$++){var E=j[$]||"",U="\n"===E,_=""==E,D=A+(E=U?"":E),N=r.measureText(D).width;if(H>=R)break;if(F=P,(N=N)>s.width||U||_){if(H++,A=_&&N<=s.width?D:A,H===R&&N>a){for(;r.measureText(A+"...").width>s.width&&!(A.length<=1);)A=A.substring(0,A.length-1);A+="..."}if(r.fillText(A,F,O+W),I(F,O+=v,N),A=E,O+v>C+h)break}else A=D}r.restore()}},t.prototype.source=function(t){var e;return o(this,void 0,void 0,(function(){var i,o;return r(this,(function(r){switch(r.label){case 0:if("{}"==JSON.stringify(t))return[2];if(!t.type)for(i in t.type="view",t.css=t.css||{},t)["views","children","type","css"].includes(i)||(t.css[i]=t[i],delete t[i]);return(null===(e=null==t?void 0:t.css)||void 0===e?void 0:e.width)||(t.css?t.css.width=this.root.width:t.css={width:this.root.width}),[4,this.create(t)];case 1:return o=r.sent(),this.size=o.layout(),this.node=o,[2,this.size]}}))}))},t.prototype.create=function(t,e){var i,n,s,a;return o(this,void 0,void 0,(function(){var o,h,d,l,u,f,g,v,p,b,m,x;return r(this,(function(r){switch(r.label){case 0:if("image"==t.type&&!t.src&&!t.url||"qrcode"==t.type&&!t.text)return[2];if("none"==(null===(i=null==t?void 0:t.css)||void 0===i?void 0:i.display))return console.error("element display none"),[2];r.label=1;case 1:return r.trys.push([1,4,,5]),"image"==t.type||"view"==t.type&&(null===(n=t.css)||void 0===n?void 0:n.backgroundImage)?(o=null,h=/url\((.+)\)/,t.css.backgroundImage&&(null===(s=h.exec(t.css.backgroundImage))||void 0===s?void 0:s[1])&&(o=null===(a=h.exec(t.css.backgroundImage))||void 0===a?void 0:a[1]),[4,c(t.src||o)]):[3,3];case 2:d=r.sent(),l=d.width,u=d.height,f=d.path,["mp-weixin","mp-baidu","mp-qq","mp-toutiao"].includes(this.platform)&&(f=/^\.|^\/(?=[^\/])/.test(t.src||o)?"/"+f:f),t.attributes=Object.assign(t.attributes||{},{width:l,height:u,path:f,src:f,naturalSrc:t.src||o}),r.label=3;case 3:return[3,5];case 4:return g=r.sent(),console.log(g),[2];case 5:if(this.count+=1,v=new w(t,e,this.root,this.ctx),!(p=t.views||t.children))return[3,9];b=0,r.label=6;case 6:return b<p.length?(m=p[b],[4,this.create(m,v)]):[3,9];case 7:(x=r.sent())&&v.add(x),r.label=8;case 8:return b++,[3,6];case 9:return[2,v]}}))}))},t.prototype.drawNode=function(t){return o(this,void 0,void 0,(function(){var e,i,o,n,s,a,h,d,l,c,u,f;return r(this,(function(r){switch(r.label){case 0:return e=t.layoutBox,i=t.computedStyle,o=t.attributes,n=t.name,s=t.children,a=t.attributes,h=a.src,d=a.text,"view"!==n?[3,4]:h?[4,this.drawPattern(o,e,i)]:[3,2];case 1:return r.sent(),[3,3];case 2:this.drawView(e,i),r.label=3;case 3:return[3,7];case 4:return"image"===n&&h?[4,this.drawImage(o,e,i,!1)]:[3,6];case 5:return r.sent(),[3,7];case 6:"text"===n?this.drawText(d,e,i,o):"qrcode"===n&&(null==x?void 0:x.api)&&x.api.draw(d,this,e,i),r.label=7;case 7:if(this.progress+=1,!s)return[2];l=Object.values?Object.values(s):Object.keys(s).map((function(t){return s[t]})),c=0,u=l,r.label=8;case 8:return c<u.length?(f=u[c],[4,this.drawNode(f)]):[3,11];case 9:r.sent(),r.label=10;case 10:return c++,[3,8];case 11:return[2]}}))}))},t.prototype.render=function(){return o(this,void 0,void 0,(function(){return r(this,(function(t){switch(t.label){case 0:return this.init(),[4,(e=30,void 0===e&&(e=0),new Promise((function(t){return setTimeout(t,e)})))];case 1:return t.sent(),[4,this.drawNode(this.node)];case 2:return t.sent(),[2]}var e}))}))},t.prototype.listen=function(t,e){var i=this;if("progressChange"==t){var o=0;Object.defineProperty(this,"progress",{configurable:!0,set:function(t){o=t,e(t/i.count)},get:function(){return o||0}})}},t.prototype.save=function(t){try{var e=t||{},i=e.fileType,o=void 0===i?"png":i,r=e.quality,n=void 0===r?1:r;return this.canvas.toDataURL("image/"+o,n)}catch(t){return console.log("image cross domain"),t}},t}();"web"==s&&(window.Painter=y),t.Painter=y,Object.defineProperty(t,"__esModule",{value:!0})}));
+    ***************************************************************************** */var e,i=function(){return(i=Object.assign||function(t){for(var e,i=1,o=arguments.length;i<o;i++)for(var r in e=arguments[i])Object.prototype.hasOwnProperty.call(e,r)&&(t[r]=e[r]);return t}).apply(this,arguments)};function o(t,e,i,o){return new(i||(i=Promise))((function(r,n){function s(t){try{h(o.next(t))}catch(t){n(t)}}function a(t){try{h(o.throw(t))}catch(t){n(t)}}function h(t){var e;t.done?r(t.value):(e=t.value,e instanceof i?e:new i((function(t){t(e)}))).then(s,a)}h((o=o.apply(t,e||[])).next())}))}function r(t,e){var i,o,r,n,s={label:0,sent:function(){if(1&r[0])throw r[1];return r[1]},trys:[],ops:[]};return n={next:a(0),throw:a(1),return:a(2)},"function"==typeof Symbol&&(n[Symbol.iterator]=function(){return this}),n;function a(n){return function(a){return function(n){if(i)throw new TypeError("Generator is already executing.");for(;s;)try{if(i=1,o&&(r=2&n[0]?o.return:n[0]?o.throw||((r=o.return)&&r.call(o),0):o.next)&&!(r=r.call(o,n[1])).done)return r;switch(o=0,r&&(n=[2&n[0],r.value]),n[0]){case 0:case 1:r=n;break;case 4:return s.label++,{value:n[1],done:!1};case 5:s.label++,o=n[1],n=[0];continue;case 7:n=s.ops.pop(),s.trys.pop();continue;default:if(!(r=s.trys,(r=r.length>0&&r[r.length-1])||6!==n[0]&&2!==n[0])){s=0;continue}if(3===n[0]&&(!r||n[1]>r[0]&&n[1]<r[3])){s.label=n[1];break}if(6===n[0]&&s.label<r[1]){s.label=r[1],r=n;break}if(r&&s.label<r[2]){s.label=r[2],s.ops.push(n);break}r[2]&&s.ops.pop(),s.trys.pop();continue}n=e.call(t,s)}catch(t){n=[6,t],o=0}finally{i=r=0}if(5&n[0])throw n[1];return{value:n[0]?n[1]:void 0,done:!0}}([n,a])}}}var n={upx2px:function(t){return window.innerWidth/750*t},getSystemInfoSync:function(){return{screenWidth:window.innerWidth}},getImageInfo:function(t){var e=t.src,i=t.success,o=t.fail,r=new Image;r.onload=function(){i({width:this.naturalWidth,height:this.naturalHeight,path:this.src,src:e})},r.onerror=o,r.src=e}},s="object"==typeof swan?"mp-baidu":"object"==typeof tt?"mp-toutao":"object"==typeof plus?"plus":"object"==typeof window?"undefined"==typeof uni||"undefined"!=typeof uni&&!(null===uni||void 0===uni?void 0:uni.addInterceptor)?"web":"h5":"mp-weixin",a="mp-weixin"==s?wx:"mp-toutao"==s?tt:"undefined"!=typeof uni?uni.upx2px?uni:Object.assign(uni,n):"undefined"!=typeof window?n:uni;if(!a.upx2px){var h=(null!==(e=a.getSystemInfoSync().screenWidth)&&void 0!==e?e:375)/750;a.upx2px=function(t){return h*t}}function d(t){return/^-?\d+(\.\d+)?$/.test(t)}function l(t,e,i){if("number"==typeof t)return t;if(d(t))return 1*t;if("string"==typeof t){var o=/^-?([0-9]+)?([.]{1}[0-9]+){0,1}(em|rpx|px|%)$/g.exec(t);if(!t||!o)return 0;var r=o[3];t=parseFloat(t);var n=0;return"rpx"===r?n=a.upx2px(t):"px"===r?n=1*t:"%"===r&&e?n=t*l(e)/100:"em"===r&&e&&(n=t*l(e||14)),i?1*n.toFixed(2):Math.round(n)}return 0}function c(t){var e=this;return new Promise((function(i,n){return o(e,void 0,void 0,(function(){var e,o;return r(this,(function(r){switch(r.label){case 0:if(e=t,"plus"!=s&&!/^mp/.test(s)||!/data:image\/(\w+);base64,(.*)/.test(t))return[3,4];r.label=1;case 1:return r.trys.push([1,3,,4]),[4,(h=t,new Promise((function(t,e){var i=/data:image\/(\w+);base64,(.*)/.exec(h)||[],o=i[1];if(i[2],/^mp/.test(s)){var r=a.getFileSystemManager();o||(console.error("ERROR_BASE64SRC_PARSE"),e(new Error("ERROR_BASE64SRC_PARSE")));var n=(new Date).getTime(),d=a.env.USER_DATA_PATH+"/"+n+"."+o;r.writeFile({filePath:d,data:h.replace(/^data:\S+\/\S+;base64,/,""),encoding:"base64",success:function(){t(d)},fail:function(t){console.error("获取base64图片失败",JSON.stringify(t)),e(t)}})}else if("plus"!=s)e(new Error("not support"));else{var l=h.split(",")[0].match(/data\:\S+\/(\S+);/);l?l=l[1]:e(new Error("base64 error"));var c=Date.now()+"."+l,u="_doc",f="uniapp_temp",g="_doc/uniapp_temp/"+c;if(!function(t,e){for(var i=t.split("."),o=e.split("."),r=!1,n=0;n<o.length;n++){var s=i[n]-o[n];if(0!==s){r=s>0;break}}return r}("Android"===plus.os.name?"1.9.9.80627":"1.9.9.80472",plus.runtime.innerVersion))return void plus.io.resolveLocalFileSystemURL(u,(function(i){i.getDirectory(f,{create:!0,exclusive:!1},(function(i){i.getFile(c,{create:!0,exclusive:!1},(function(i){i.createWriter((function(i){var o;i.onwrite=function(){t(g)},i.onerror=e,i.seek(0),i.writeAsBinary((o=h.split(","))[o.length-1])}),e)}),e)}),e)}),e);var v=new plus.nativeObj.Bitmap(c);v.loadBase64Data(h,(function(){v.save(g,{},(function(){v.clear(),t(g)}),(function(t){v.clear(),e(t)}))}),(function(t){v.clear(),e(t)}))}})))];case 2:return e=r.sent(),[3,4];case 3:return o=r.sent(),console.log(o),[3,4];case 4:return a.getImageInfo({src:e,success:function(t){return i(t)},fail:function(t){return n(t)}}),[2]}var h}))}))}))}var u=function(t){return!(!t||!t.startsWith("linear")&&!t.startsWith("radial"))},f=function(t,e,i,o,r,n){t.startsWith("linear")?function(t,e,i,o,r,n){for(var s=function(t,e,i,o,r){void 0===o&&(o=0);void 0===r&&(r=0);var n=t.match(/([-]?\d{1,3})deg/),s=n&&n[1]?parseFloat(n[1]):0;s>=360&&(s-=360);s<0&&(s+=360);if(0===(s=Math.round(s)))return{x0:Math.round(e/2)+o,y0:i+r,x1:Math.round(e/2)+o,y1:r};if(180===s)return{x0:Math.round(e/2)+o,y0:r,x1:Math.round(e/2)+o,y1:i+r};if(90===s)return{x0:o,y0:Math.round(i/2)+r,x1:e+o,y1:Math.round(i/2)+r};if(270===s)return{x0:e+o,y0:Math.round(i/2)+r,x1:o,y1:Math.round(i/2)+r};var a=Math.round(180*Math.asin(e/Math.sqrt(Math.pow(e,2)+Math.pow(i,2)))/Math.PI);if(s===a)return{x0:o,y0:i+r,x1:e+o,y1:r};if(s===180-a)return{x0:o,y0:r,x1:e+o,y1:i+r};if(s===180+a)return{x0:e+o,y0:r,x1:o,y1:i+r};if(s===360-a)return{x0:e+o,y0:i+r,x1:o,y1:r};var h=0,d=0,l=0,c=0;if(s<a||s>180-a&&s<180||s>180&&s<180+a||s>360-a){var u=s*Math.PI/180,f=s<a||s>360-a?i/2:-i/2,g=Math.tan(u)*f,v=s<a||s>180-a&&s<180?e/2-g:-e/2-g;h=-(l=g+(p=Math.pow(Math.sin(u),2)*v)),d=-(c=f+p/Math.tan(u))}if(s>a&&s<90||s>90&&s<90+a||s>180+a&&s<270||s>270&&s<360-a){var p;u=(90-s)*Math.PI/180,g=s>a&&s<90||s>90&&s<90+a?e/2:-e/2,f=Math.tan(u)*g,v=s>a&&s<90||s>270&&s<360-a?i/2-f:-i/2-f;h=-(l=g+(p=Math.pow(Math.sin(u),2)*v)/Math.tan(u)),d=-(c=f+p)}return h=Math.round(h+e/2)+o,d=Math.round(i/2-d)+r,l=Math.round(l+e/2)+o,c=Math.round(i/2-c)+r,{x0:h,y0:d,x1:l,y1:c}}(r,t,e,i,o),a=s.x0,h=s.y0,d=s.x1,l=s.y1,c=n.createLinearGradient(a,h,d,l),u=r.match(/linear-gradient\((.+)\)/)[1],f=g(u.substring(u.indexOf(",")+1)),v=0;v<f.colors.length;v++)c.addColorStop(f.percents[v],f.colors[v]);n.setFillStyle(c)}(e,i,o,r,t,n):t.startsWith("radial")&&function(t,e,i,o,r,n){for(var s=g(r.match(/radial-gradient\((.+)\)/)[1]),a=Math.round(t/2)+i,h=Math.round(e/2)+o,d=n.createRadialGradient(a,h,0,a,h,Math.max(t,e)/2),l=0;l<s.colors.length;l++)d.addColorStop(s.percents[l],s.colors[l]);n.setFillStyle(d)}(e,i,o,r,t,n)};function g(t){for(var e=[],i=[],o=0,r=t.substring(0,t.length-1).split("%,");o<r.length;o++){var n=r[o];e.push(n.substring(0,n.lastIndexOf(" ")).trim()),i.push(n.substring(n.lastIndexOf(" "),n.length)/100)}return{colors:e,percents:i}}function v(t,e,i){return e in t?Object.defineProperty(t,e,{value:i,enumerable:!0,configurable:!0,writable:!0}):t[e]=i,t}function p(){return(p=Object.assign||function(t){for(var e=1;e<arguments.length;e++){var i=arguments[e];for(var o in i)Object.prototype.hasOwnProperty.call(i,o)&&(t[o]=i[o])}return t}).apply(this,arguments)}var b=0,m={left:null,top:null,width:null,height:null},w=function(){function t(t,e,i,o){var r=this;v(this,"id",b++),v(this,"style",{left:null,top:null,width:null,height:null}),v(this,"computedStyle",{}),v(this,"children",{}),v(this,"layoutBox",p({},m)),v(this,"contentSize",p({},m,{maxLineHeight:0})),v(this,"clientSize",p({},m)),v(this,"borderSize",p({},m)),v(this,"offsetSize",p({},m)),this.ctx=o,this.root=i,e&&(this.parent=e),this.name=t.name||t.type,this.attributes=this.getAttributes(t);var n=this.getComputedStyle(t,null==e?void 0:e.computedStyle);this.isAbsolute="absolute"==n.position,this.isFixed="fixed"==n.position,Object.keys(n).forEach((function(t){Object.defineProperty(r.style,t,{configurable:!0,enumerable:!0,get:function(){return n[t]},set:function(e){n[t]=e}})}));var s={contentSize:p({},this.contentSize),clientSize:p({},this.clientSize),borderSize:p({},this.borderSize),offsetSize:p({},this.offsetSize)};Object.keys(s).forEach((function(t){Object.keys(r[t]).forEach((function(e){Object.defineProperty(r[t],e,{configurable:!0,enumerable:!0,get:function(){return s[t][e]},set:function(i){s[t][e]=i}})}))})),this.computedStyle=this.style}var e=t.prototype;return e.add=function(t){t.parent=this,this.children[t.id]=t},e.remove=function(t){var e=this;t?this.children[t.id]&&(t.remove(),delete this.children[t.id]):Object.keys(this.children).forEach((function(t){e.children[t].remove(),delete e.children[t]}))},e.getChildren=function(){var t=this;return Object.keys(this.children).map((function(e){return t.children[e]}))},e.getComputedStyle=function(t,e){var i=["color","fontSize","lineHeight","verticalAlign","fontWeight","textAlign"],o=t.css,r=void 0===o?{}:o,n=t.type,s=void 0===n?"view":n,a={};if(e)for(var h=0;h<i.length;h++){var c=i[h];(r[c]||e[c])&&(r[c]=r[c]||e[c])}for(var u=function(){var t=g[f],e=r[t];if(/^(box)?shadow$/i.test(t)){var i=e.split(" ").map((function(t){return/^\d/.test(t)?l(t):t}));return a.boxShadow=i,"continue"}if(/^border/i.test(t)&&!/radius$/i.test(t)){var o,n=t.match(/^border([BTRLa-z]+)?/)[0],h=t.match(/[W|S|C][a-z]+/),c=e.replace(/([\(,])\s+|\s+([\),])/g,"$1$2").split(" ").map((function(t){return/^\d/.test(t)?l(t,"",!0):t}));return a[n]=((o={})[n+"Width"]=(d(c[0])?c[0]:0)||1,o[n+"Style"]=c[1]||"solid",o[n+"Color"]=c[2]||"black",o),1==c.length&&h&&(a[n][n+h[0]]=c[0]),"continue"}if(/^background(color)?$/i.test(t))return a.backgroundColor=e,"continue";if(/^objectPosition$/i.test(t))return a[t]=e.split(" "),"continue";if(/padding|margin|radius/i.test(t)){var u=/radius$/i.test(t),v=u?"borderRadius":t.match(/[a-z]+/)[0],p=[0,0,0,0].map((function(t,e){return u?["borderTopLeftRadius","borderTopRightRadius","borderBottomRightRadius","borderBottomLeftRadius"][e]:[v+"Top",v+"Right",v+"Bottom",v+"Left"][e]}));if("padding"===t||"margin"===t||/^(border)?radius$/i.test(t)){var b,m=(null==e?void 0:e.split(" ").map((function(e){return/^\d+(rpx|px)?$/.test(e)?l(e):"margin"!=t&&/auto/.test(e)?0:e}),[]))||[0],w=u?"borderRadius":t,x=m[0],y=m[1],S=m[2],z=m[3];a[w]=((b={})[p[0]]="auto"==x?0:x,b[p[1]]=d(y)?y:x,b[p[2]]="auto"==(d(S)?S:x)?0:d(S)?S:x,b[p[3]]=d(z)?z:y||x,b)}else{var B;if("object"==typeof a[v])a[v][t]="margin"==v&&"auto"==e||/%$/.test(e)?e:l(e);else a[v]=((B={})[p[0]]=a[v]||0,B[p[1]]=a[v]||0,B[p[2]]=a[v]||0,B[p[3]]=a[v]||0,B),a[v][t]="margin"==v&&"auto"==e||/%$/.test(e)?e:l(e)}return"continue"}if(/^transform$/i.test(t))return a[t]={},e.replace(/([a-zA-Z]+)\(([0-9,-\.%rpxdeg\s]+)\)/g,(function(e,i,o){var n=o.split(",").map((function(t){return t.replace(/(^\s*)|(\s*$)/g,"")})),s=function(t,e){return t.includes("deg")?1*t:e&&!/%$/.test(e)?l(t,e):t};i.includes("matrix")?a[t][i]=n.map((function(t){return 1*t})):i.includes("rotate")?a[t][i]=1*o.match(/^-?\d+(\.\d+)?/)[0]:/[X, Y]/.test(i)?a[t][i]=/[X]/.test(i)?s(n[0],r.width):s(n[0],r.height):(a[t][i+"X"]=s(n[0],r.width),a[t][i+"Y"]=s(n[1]||n[0],r.height))})),"continue";/^left|top$/i.test(t)&&!["absolute","fixed"].includes(r.position)?a[t]=0:a[t]=/^[\d\.]+(px|rpx)?$/.test(e)?l(e):/em$/.test(e)&&"text"==s?l(e,r.fontSize):e},f=0,g=Object.keys(r);f<g.length;f++)u();return a},e.setPosition=function(t,e){var i={left:"width",top:"height",right:"width",bottom:"height"};Object.keys(i).forEach((function(o){["right","bottom"].includes(o)&&void 0!==t.style[o]?t.style["right"==o?"left":"top"]=e[i[o]]-t.offsetSize[i[o]]-l(t.style[o],e[i[o]]):t.style[o]=l(t.style[o],e[i[o]])}))},e.getAttributes=function(t){var e=t.attributes||{};return(null!=t&&t.url||null!=t&&t.src)&&(e.src=e.src||t.url||(null==t?void 0:t.src)),t.replace&&(e.replace=t.replace),null!=t&&t.text&&(e.text=t.text),e},e.getOffsetSize=function(t,e,i){void 0===i&&(i="offsetSize");var o=e||{},r=o.margin,n=(r=void 0===r?{}:r).marginLeft,s=void 0===n?0:n,a=r.marginTop,h=void 0===a?0:a,d=r.marginRight,l=void 0===d?0:d,c=r.marginBottom,u=void 0===c?0:c,f=o.padding,g=(f=void 0===f?{}:f).paddingLeft,v=void 0===g?0:g,p=f.paddingTop,b=void 0===p?0:p,m=f.paddingRight,w=void 0===m?0:m,x=f.paddingBottom,y=void 0===x?0:x,S=o.border,z=(S=void 0===S?{}:S).borderWidth,B=void 0===z?0:z,R=o.borderTop,M=(R=void 0===R?{}:R).borderTopWidth,k=void 0===M?B:M,P=o.borderBottom,O=(P=void 0===P?{}:P).borderBottomWidth,T=void 0===O?B:O,L=o.borderRight,W=(L=void 0===L?{}:L).borderRightWidth,I=void 0===W?B:W,j=o.borderLeft,C=(j=void 0===j?{}:j).borderLeftWidth,F=void 0===C?B:C;return"contentSize"==i&&(this[i].left=t.left+s+v+F,this[i].top=t.top+h+b+k,this[i].width=t.width,this[i].height=t.height),"clientSize"==i&&(this[i].left=t.left+s+F,this[i].top=t.top+h+k,this[i].width=t.width+v+w,this[i].height=t.height+b+y),"borderSize"==i&&(this[i].left=t.left+s+F/2,this[i].top=t.top+h+k/2,this[i].width=t.width+v+w+F/2+I/2,this[i].height=t.height+b+y+T/2+k/2),"offsetSize"==i&&(this[i].left=t.left,this[i].top=t.top,this[i].width=t.width+v+w+F+I+s+l,this[i].height=t.height+b+y+T+k+u+h),this[i]},e.layoutBoxUpdate=function(t,e,i,o){if(void 0===i&&(i=""),"border-box"==(null==e?void 0:e.boxSizing)){var r=e||{},n=r.border,s=(n=void 0===n?{}:n).borderWidth,a=void 0===s?0:s,h=r.borderTop,d=(h=void 0===h?{}:h).borderTopWidth,l=void 0===d?a:d,c=r.borderBottom,u=(c=void 0===c?{}:c).borderBottomWidth,f=void 0===u?a:u,g=r.borderRight,v=(g=void 0===g?{}:g).borderRightWidth,p=void 0===v?a:v,b=r.borderLeft,m=(b=void 0===b?{}:b).borderLeftWidth,w=void 0===m?a:m,x=r.padding,y=(x=void 0===x?{}:x).paddingTop,S=void 0===y?0:y,z=x.paddingRight,B=void 0===z?0:z,R=x.paddingBottom,M=void 0===R?0:R,k=x.paddingLeft,P=void 0===k?0:k;"width"==i&&(t.width-=P+B+p+w),"height"!=i||o||(t.height-=S+M+l+f)}this.layoutBox.contentSize=this.getOffsetSize(t,e,"contentSize"),this.layoutBox.clientSize=this.getOffsetSize(t,e,"clientSize"),this.layoutBox.borderSize=this.getOffsetSize(t,e,"borderSize"),this.layoutBox.offsetSize=this.getOffsetSize(t,e,"offsetSize"),this.layoutBox=Object.assign({},this.layoutBox,this.layoutBox.borderSize)},e.getBoxPosition=function(t){var e=this.computedStyle,i=this.getChildren(),o=e.verticalAlign,r=e.left,n=void 0===r?0:r,s=e.top,a=void 0===s?0:s,h=p({},this.contentSize,{left:n,top:a}),d=this.contentSize.top-this.offsetSize.top,l=this.contentSize.left-this.offsetSize.left,c=0;if("bottom"==o&&this.contentSize.maxLineHeight?c=this.contentSize.maxLineHeight-this.contentSize.height:"middle"==o&&this.contentSize.maxLineHeight&&(c=(this.contentSize.maxLineHeight-this.contentSize.height)/2),h.top+=c,i.length){n+=l,a+=d;for(var u=null,f=null,g=!1,v=0;v<i.length;v++){var b=i[v];if(b.isAbsolute||b.isFixed)b.isAbsolute?(b.setPosition(b,h),b.style.left+=n,b.style.top+=a,b.getBoxPosition()):(b.setPosition(b,this.root),b.getBoxPosition());else if(0==v)b.style.left+=n,b.style.top+=a,b.getBoxPosition(),u=b,f=b;else{var m,w,x,y;(null==(m=f)?void 0:m.offsetSize.height)<(null==(w=u)?void 0:w.offsetSize.height)&&(f=u);var S=(null==(x=u)?void 0:x.offsetSize.left)+(null==(y=u)?void 0:y.offsetSize.width)+b.offsetSize.width>h.left+h.width+l;if(this.getBoxState(u,b)||S){var z,B,R,M;if(b.style.left+=n,(null==(z=u)?void 0:z.offsetSize.height)>=(null==(B=f)?void 0:B.offsetSize.height))b.style.top+=u.offsetSize.top+u.offsetSize.height||0;else b.style.top+=(null==(R=f)?void 0:R.offsetSize.top)+(null==(M=f)?void 0:M.offsetSize.height)||0;b.getBoxPosition(),u=b,f=b,g=!0}else b.style.left+=u.offsetSize.left+u.offsetSize.width,b.style.top+=g?u.offsetSize.top:a,b.getBoxPosition(),u=b}}this.layoutBoxUpdate(h,e)}else this.layoutBoxUpdate(h,e);return this.layoutBox},e.setMaxLineHeight=function(t,e,i){for(var o=t;o>=0&&!e[o].contentSize.maxLineHeight;)e[o].contentSize.maxLineHeight=i,o--},e.getBoxState=function(t,e){return"view"==e.name&&"inline-block"!==e.style.display||"view"==(null==t?void 0:t.name)&&"inline-block"!==(null==t?void 0:t.style.display)||"block"==e.style.display||"block"==(null==t?void 0:t.style.display)},e.getBoxHieght=function(){var t,e=this,i=this.name,o=this.computedStyle,r=this.attributes,n=this.parent,s=this.getChildren(),a=o.top,h=o.bottom,d=o.height,c=void 0===d?0:d,u=o.fontSize,f=void 0===u?14:u,g=o.position,v=o.lineHeight,b=void 0===v?"1.4em":v;o.lineClamp;var m=p({},this.contentSize);if("image"==i&&null==c){var w=r.width,x=r.height;r.mode,m.height=Math.round(m.width*x/w)||0,this.layoutBoxUpdate(m,o,"height")}else if(c)if(s.length){var y=null,S=0;s.forEach((function(t,i){var o,r,n=i==s.length-1;t.getBoxHieght();var a=(null==(o=y)?void 0:o.offsetSize.left)+(null==(r=y)?void 0:r.offsetSize.width)+t.offsetSize.width>m.left+m.width,h=e.getBoxState(y,t);if(a||h){if(a){for(var d=i-1;d>=0&&!s[d].contentSize.maxLineHeight;)S<s[d].contentSize.height&&(S=s[d].contentSize.height),d--;e.setMaxLineHeight(i-1,s,S),S=0}}else if(n){for(var l=i;l>=0&&!s[l].contentSize.maxLineHeight;)S<s[l].contentSize.height&&(S=s[l].contentSize.height),l--;e.setMaxLineHeight(i,s,S),S=0}y=t}))}else this.layoutBoxUpdate(m,o,"height");else{var z=0;if(null!==a&&(this.isAbsolute||this.isFixed&&n.contentSize.height)){var B="absolute"==g?n.contentSize.height:this.root.height;z=B-(/%$/.test(a)?l(a,B):a)-(/%$/.test(h)?l(h,B):h)}if("text"==i)b=l(b,f),m.height=z||this.attributes.lines*b,this.layoutBoxUpdate(m,o,"height",!0);else if(s.length){var R=0,M=null,k=0;m.height=s.reduce((function(t,i,o){var r=o==s.length-1;if(i.isAbsolute||i.isFixed)return r?t+R:t;i.getBoxHieght();var n=e.getBoxState(M,i),a=k+i.offsetSize.width>m.width;if(a||n){var h,d,l=0;return a||M&&("view"!==(null==(h=M)?void 0:h.name)||"inline-block"==(null==(d=M)?void 0:d.style.display))?(r&&(e.setMaxLineHeight(o-1,s,R),R+=i.offsetSize.height),l=t+R,R=i.offsetSize.height,k=i.offsetSize.width,M=i,l):(k=0,R=0,t+i.offsetSize.height)}return k+=i.offsetSize.width,R=Math.max(R,i.offsetSize.height)||0,r?(e.setMaxLineHeight(o,s,R),t+R):(M=i,t)}),0),z&&(m.height=z),this.layoutBoxUpdate(m,o)}else z&&(m.height=z),this.layoutBoxUpdate(m,o,"height")}if(o.borderRadius&&null!=(t=this.borderSize)&&t.width)for(var P in o.borderRadius)Object.hasOwnProperty.call(o.borderRadius,P)&&(o.borderRadius[P]=l(o.borderRadius[P],this.borderSize.width));return this.layoutBox},e.contrastSize=function(t,e,i){var o=t;return i&&(o=Math.min(o,i)),e&&(o=Math.max(o,e)),o},e.measureText=function(t,e){var i=this.ctx.measureText(t);return{width:i.width,fontHeight:(i.actualBoundingBoxAscent||.7*e)+1}},e.getBoxWidth=function(){var t,e=this,i=this.name,o=this.computedStyle,r=this.attributes,n=this.parent,s=void 0===n?{}:n,a=this.ctx,h=this.getChildren(),d=o.left,c=void 0===d?0:d;o.top;var u=o.right,f=o.width,g=void 0===f?0:f,v=o.minWidth,p=o.maxWidth,b=o.height,m=void 0===b?0:b,w=o.fontSize,x=void 0===w?14:w,y=o.fontWeight,S=o.fontFamily,z=o.textStyle,B=o.position,R=o.display,M=o.lineClamp,k=o.padding,P=void 0===k?{}:k,O=o.margin,T=void 0===O?{}:O,L=o.border,W=(L=void 0===L?{}:L).borderWidth,I=void 0===W?0:W,j=o.borderRight,C=(j=void 0===j?{}:j).borderRightWidth,F=void 0===C?I:C,A=o.borderLeft,H=(A=void 0===A?{}:A).borderLeftWidth,$=void 0===H?I:H;if(/%$/.test(g)&&s.contentSize.width&&(g=l(g,s.contentSize.width,!0)),/%$/.test(m)&&s.contentSize.height&&(m=l(m,s.contentSize.height)),/%$/.test(v)&&s.contentSize.width&&(v=l(v,s.contentSize.width,!0)),/%$/.test(p)&&s.contentSize.width&&(p=l(p,s.contentSize.width,!0)),o.padding&&null!=(t=s.contentSize)&&t.width)for(var E in o.padding)Object.hasOwnProperty.call(o.padding,E)&&(o.padding[E]=l(o.padding[E],s.contentSize.width));var U=P.paddingRight,_=void 0===U?0:U,D=P.paddingLeft,N=void 0===D?0:D;if(o.margin&&[o.margin.marginLeft,o.margin.marginRight].includes("auto"))if(g){var V=s.contentSize.width-g-_-N-$F||0;o.margin.marginLeft==o.margin.marginRight?o.margin.marginLeft=o.margin.marginRight=V/2:"auto"==o.margin.marginLeft?o.margin.marginLeft=V:o.margin.marginRight=V}else o.margin.marginLeft=o.margin.marginRight=0;var X=T.marginRight,q=void 0===X?0:X,G=T.marginLeft,J={width:g,height:m,left:0,top:0},Y=N+_+$+F+(void 0===G?0:G)+q;if("text"==i&&!this.attributes.widths){var Q=r.text||"";a.save(),a.setFonts({fontFamily:S,fontSize:x,fontWeight:y,textStyle:z}),Q.split("\n").map((function(t){var i=t.split("").map((function(t){return e.measureText(t,x).width}));e.attributes.fontHeight=e.measureText(t,x).fontHeight,e.attributes.widths||(e.attributes.widths=[]),e.attributes.widths.push({widths:i,total:i.reduce((function(t,e){return t+e}),0)})})),a.restore()}if("image"==i&&null==g){var Z=r.width,K=r.height;J.width=this.contrastSize(Math.round(Z*m/K)||0,v,p),this.layoutBoxUpdate(J,o,"width")}else if(g)h.length?(this.layoutBoxUpdate(J,o,"width"),h.forEach((function(t){t.getBoxWidth()}))):this.layoutBoxUpdate(J,o,"width");else{var tt=0;if((this.isAbsolute||this.isFixed)&&s.contentSize.width){var et="absolute"==B?s.contentSize.width:this.root.width;tt=et-(/%$/.test(c)?l(c,et):c)-(/%$/.test(u)?l(u,et):u)}if("text"==i){var it=this.attributes.widths,ot=Math.max.apply(Math,it.map((function(t){return t.total})));if(s&&s.contentSize.width>0&&(ot>s.contentSize.width||"block"==R)&&!this.isAbsolute&&!this.isFixed)ot=s.contentSize.width-Y;J.width=tt||this.contrastSize(ot,v,p),this.layoutBoxUpdate(J,o,"width")}else if("view"!=i||!s||"inline-block"===R||this.isAbsolute||this.isFixed)if(h.length){for(var rt=0,nt=null,st=0;h.length>st;){var at=h[st],ht=st==h.length-1,dt=this.getBoxState(nt,at);if(!at.isFixed&&!at.isAbsolute)if(!nt||dt){var lt=at.getBoxWidth();rt=Math.max(rt,lt.width)||0,nt=at}else if(nt.offsetSize.left+nt.offsetSize.width+at.offsetSize.width<s.contentSize.width&&st!==h.length-1){rt+=at.getBoxWidth().width,nt=at}else{var ct=at.getBoxWidth();ht?rt+=ct.width:rt=s.contentSize.width,nt=null}st++}J.width=tt||this.contrastSize(Math.ceil(rt),v,p),h.forEach((function(t){"block"!=t.style.display||"text"!=t.name||t.isFixed||t.isAbsolute||t.style.width||(t.style.width=J.width,t.getBoxWidth())})),this.layoutBoxUpdate(J,o,"width")}else J.width=tt,this.layoutBoxUpdate(J,o,"width");else J.width=this.contrastSize(s.contentSize.width-Y,v,p),this.layoutBoxUpdate(J,o),h.length&&h.forEach((function(t){t.getBoxWidth()}))}if("text"==i&&!this.attributes.lines){var ut=this.attributes.widths.length;this.attributes.widths.forEach((function(t){return t.widths.reduce((function(t,e,i){return t+e>J.width?(ut++,e):t+e}),0)})),ut=M&&ut>M?M:ut,this.attributes.lines=ut}return this.layoutBox},e.layout=function(){return this.getBoxWidth(),this.getBoxHieght(),this.getBoxPosition(),this.offsetSize},t}(),x=function(){var t,e,i,o,r,n,s=[0,11,15,19,23,27,31,16,18,20,22,24,26,28,20,22,24,24,26,28,28,22,24,24,26,26,28,28,24,24,26,26,26,28,28,24,26,26,26,28,28],a=[3220,1468,2713,1235,3062,1890,2119,1549,2344,2936,1117,2583,1330,2470,1667,2249,2028,3780,481,4011,142,3098,831,3445,592,2517,1776,2234,1951,2827,1070,2660,1345,3177],h=[30660,29427,32170,30877,26159,25368,27713,26998,21522,20773,24188,23371,17913,16590,20375,19104,13663,12392,16177,14854,9396,8579,11994,11245,5769,5054,7399,6608,1890,597,3340,2107],d=[1,0,19,7,1,0,16,10,1,0,13,13,1,0,9,17,1,0,34,10,1,0,28,16,1,0,22,22,1,0,16,28,1,0,55,15,1,0,44,26,2,0,17,18,2,0,13,22,1,0,80,20,2,0,32,18,2,0,24,26,4,0,9,16,1,0,108,26,2,0,43,24,2,2,15,18,2,2,11,22,2,0,68,18,4,0,27,16,4,0,19,24,4,0,15,28,2,0,78,20,4,0,31,18,2,4,14,18,4,1,13,26,2,0,97,24,2,2,38,22,4,2,18,22,4,2,14,26,2,0,116,30,3,2,36,22,4,4,16,20,4,4,12,24,2,2,68,18,4,1,43,26,6,2,19,24,6,2,15,28,4,0,81,20,1,4,50,30,4,4,22,28,3,8,12,24,2,2,92,24,6,2,36,22,4,6,20,26,7,4,14,28,4,0,107,26,8,1,37,22,8,4,20,24,12,4,11,22,3,1,115,30,4,5,40,24,11,5,16,20,11,5,12,24,5,1,87,22,5,5,41,24,5,7,24,30,11,7,12,24,5,1,98,24,7,3,45,28,15,2,19,24,3,13,15,30,1,5,107,28,10,1,46,28,1,15,22,28,2,17,14,28,5,1,120,30,9,4,43,26,17,1,22,28,2,19,14,28,3,4,113,28,3,11,44,26,17,4,21,26,9,16,13,26,3,5,107,28,3,13,41,26,15,5,24,30,15,10,15,28,4,4,116,28,17,0,42,26,17,6,22,28,19,6,16,30,2,7,111,28,17,0,46,28,7,16,24,30,34,0,13,24,4,5,121,30,4,14,47,28,11,14,24,30,16,14,15,30,6,4,117,30,6,14,45,28,11,16,24,30,30,2,16,30,8,4,106,26,8,13,47,28,7,22,24,30,22,13,15,30,10,2,114,28,19,4,46,28,28,6,22,28,33,4,16,30,8,4,122,30,22,3,45,28,8,26,23,30,12,28,15,30,3,10,117,30,3,23,45,28,4,31,24,30,11,31,15,30,7,7,116,30,21,7,45,28,1,37,23,30,19,26,15,30,5,10,115,30,19,10,47,28,15,25,24,30,23,25,15,30,13,3,115,30,2,29,46,28,42,1,24,30,23,28,15,30,17,0,115,30,10,23,46,28,10,35,24,30,19,35,15,30,17,1,115,30,14,21,46,28,29,19,24,30,11,46,15,30,13,6,115,30,14,23,46,28,44,7,24,30,59,1,16,30,12,7,121,30,12,26,47,28,39,14,24,30,22,41,15,30,6,14,121,30,6,34,47,28,46,10,24,30,2,64,15,30,17,4,122,30,29,14,46,28,49,10,24,30,24,46,15,30,4,18,122,30,13,32,46,28,48,14,24,30,42,32,15,30,20,4,117,30,40,7,47,28,43,22,24,30,10,67,15,30,19,6,118,30,18,31,47,28,34,34,24,30,20,61,15,30],l=[255,0,1,25,2,50,26,198,3,223,51,238,27,104,199,75,4,100,224,14,52,141,239,129,28,193,105,248,200,8,76,113,5,138,101,47,225,36,15,33,53,147,142,218,240,18,130,69,29,181,194,125,106,39,249,185,201,154,9,120,77,228,114,166,6,191,139,98,102,221,48,253,226,152,37,179,16,145,34,136,54,208,148,206,143,150,219,189,241,210,19,92,131,56,70,64,30,66,182,163,195,72,126,110,107,58,40,84,250,133,186,61,202,94,155,159,10,21,121,43,78,212,229,172,115,243,167,87,7,112,192,247,140,128,99,13,103,74,222,237,49,197,254,24,227,165,153,119,38,184,180,124,17,68,146,217,35,32,137,46,55,63,209,91,149,188,207,205,144,135,151,178,220,252,190,97,242,86,211,171,20,42,93,158,132,60,57,83,71,109,65,162,31,45,67,216,183,123,164,118,196,23,73,236,127,12,111,246,108,161,59,82,41,157,85,170,251,96,134,177,187,204,62,90,203,89,95,176,156,169,160,81,11,245,22,235,122,117,44,215,79,174,213,233,230,231,173,232,116,214,244,234,168,80,88,175],c=[1,2,4,8,16,32,64,128,29,58,116,232,205,135,19,38,76,152,45,90,180,117,234,201,143,3,6,12,24,48,96,192,157,39,78,156,37,74,148,53,106,212,181,119,238,193,159,35,70,140,5,10,20,40,80,160,93,186,105,210,185,111,222,161,95,190,97,194,153,47,94,188,101,202,137,15,30,60,120,240,253,231,211,187,107,214,177,127,254,225,223,163,91,182,113,226,217,175,67,134,17,34,68,136,13,26,52,104,208,189,103,206,129,31,62,124,248,237,199,147,59,118,236,197,151,51,102,204,133,23,46,92,184,109,218,169,79,158,33,66,132,21,42,84,168,77,154,41,82,164,85,170,73,146,57,114,228,213,183,115,230,209,191,99,198,145,63,126,252,229,215,179,123,246,241,255,227,219,171,75,150,49,98,196,149,55,110,220,165,87,174,65,130,25,50,100,200,141,7,14,28,56,112,224,221,167,83,166,81,162,89,178,121,242,249,239,195,155,43,86,172,69,138,9,18,36,72,144,61,122,244,245,247,243,251,235,203,139,11,22,44,88,176,125,250,233,207,131,27,54,108,216,173,71,142,0],u=[],f=[],g=[],v=[],p=[],b=2;function m(t,e){var i;t>e&&(i=t,t=e,e=i),i=e,i*=e,i+=e,i>>=1,v[i+=t]=1}function w(t,i){var o;for(g[t+e*i]=1,o=-2;o<2;o++)g[t+o+e*(i-2)]=1,g[t-2+e*(i+o+1)]=1,g[t+2+e*(i+o)]=1,g[t+o+1+e*(i+2)]=1;for(o=0;o<2;o++)m(t-1,i+o),m(t+1,i-o),m(t-o,i-1),m(t+o,i+1)}function x(t){for(;t>=255;)t=((t-=255)>>8)+(255&t);return t}var y=[];function S(t,e,i,o){var r,n,s;for(r=0;r<o;r++)u[i+r]=0;for(r=0;r<e;r++){if(255!=(s=l[u[t+r]^u[i]]))for(n=1;n<o;n++)u[i+n-1]=u[i+n]^c[x(s+y[o-n])];else for(n=i;n<i+o;n++)u[n]=u[n+1];u[i+o-1]=255==s?0:c[x(s+y[0])]}}function z(t,e){var i;return t>e&&(i=t,t=e,e=i),i=e,i+=e*e,i>>=1,v[i+=t]}function B(t){var i,o,r,n;switch(t){case 0:for(o=0;o<e;o++)for(i=0;i<e;i++)i+o&1||z(i,o)||(g[i+o*e]^=1);break;case 1:for(o=0;o<e;o++)for(i=0;i<e;i++)1&o||z(i,o)||(g[i+o*e]^=1);break;case 2:for(o=0;o<e;o++)for(r=0,i=0;i<e;i++,r++)3==r&&(r=0),r||z(i,o)||(g[i+o*e]^=1);break;case 3:for(n=0,o=0;o<e;o++,n++)for(3==n&&(n=0),r=n,i=0;i<e;i++,r++)3==r&&(r=0),r||z(i,o)||(g[i+o*e]^=1);break;case 4:for(o=0;o<e;o++)for(r=0,n=o>>1&1,i=0;i<e;i++,r++)3==r&&(r=0,n=!n),n||z(i,o)||(g[i+o*e]^=1);break;case 5:for(n=0,o=0;o<e;o++,n++)for(3==n&&(n=0),r=0,i=0;i<e;i++,r++)3==r&&(r=0),(i&o&1)+!(!r|!n)||z(i,o)||(g[i+o*e]^=1);break;case 6:for(n=0,o=0;o<e;o++,n++)for(3==n&&(n=0),r=0,i=0;i<e;i++,r++)3==r&&(r=0),(i&o&1)+(r&&r==n)&1||z(i,o)||(g[i+o*e]^=1);break;case 7:for(n=0,o=0;o<e;o++,n++)for(3==n&&(n=0),r=0,i=0;i<e;i++,r++)3==r&&(r=0),(r&&r==n)+(i+o&1)&1||z(i,o)||(g[i+o*e]^=1)}}function R(t){var e,i=0;for(e=0;e<=t;e++)p[e]>=5&&(i+=3+p[e]-5);for(e=3;e<t-1;e+=2)p[e-2]==p[e+2]&&p[e+2]==p[e-1]&&p[e-1]==p[e+1]&&3*p[e-1]==p[e]&&(0==p[e-3]||e+3>t||3*p[e-3]>=4*p[e]||3*p[e+3]>=4*p[e])&&(i+=40);return i}function M(){var t,i,o,r,n,s=0,a=0;for(i=0;i<e-1;i++)for(t=0;t<e-1;t++)(g[t+e*i]&&g[t+1+e*i]&&g[t+e*(i+1)]&&g[t+1+e*(i+1)]||!(g[t+e*i]||g[t+1+e*i]||g[t+e*(i+1)]||g[t+1+e*(i+1)]))&&(s+=3);for(i=0;i<e;i++){for(p[0]=0,o=r=t=0;t<e;t++)(n=g[t+e*i])==r?p[o]++:p[++o]=1,a+=(r=n)?1:-1;s+=R(o)}a<0&&(a=-a);var h=a,d=0;for(h+=h<<2,h<<=1;h>e*e;)h-=e*e,d++;for(s+=10*d,t=0;t<e;t++){for(p[0]=0,o=r=i=0;i<e;i++)(n=g[t+e*i])==r?p[o]++:p[++o]=1,r=n;s+=R(o)}return s}var k=null;return{api:{get ecclevel(){return b},set ecclevel(t){b=t},get size(){return _size},set size(t){_size=t},get canvas(){return k},set canvas(t){k=t},getFrame:function(p){return function(p){var R,k,P,O,T,L,W,I;O=p.length,t=0;do{if(t++,P=4*(b-1)+16*(t-1),i=d[P++],o=d[P++],r=d[P++],n=d[P],O<=(P=r*(i+o)+o-3+(t<=9)))break}while(t<40);for(e=17+4*t,T=r+(r+n)*(i+o)+o,O=0;O<T;O++)f[O]=0;for(u=p.slice(0),O=0;O<e*e;O++)g[O]=0;for(O=0;O<(e*(e+1)+1)/2;O++)v[O]=0;for(O=0;O<3;O++){for(P=0,k=0,1==O&&(P=e-7),2==O&&(k=e-7),g[k+3+e*(P+3)]=1,R=0;R<6;R++)g[k+R+e*P]=1,g[k+e*(P+R+1)]=1,g[k+6+e*(P+R)]=1,g[k+R+1+e*(P+6)]=1;for(R=1;R<5;R++)m(k+R,P+1),m(k+1,P+R+1),m(k+5,P+R),m(k+R+1,P+5);for(R=2;R<4;R++)g[k+R+e*(P+2)]=1,g[k+2+e*(P+R+1)]=1,g[k+4+e*(P+R)]=1,g[k+R+1+e*(P+4)]=1}if(t>1)for(O=s[t],k=e-7;;){for(R=e-7;R>O-3&&(w(R,k),!(R<O));)R-=O;if(k<=O+9)break;w(6,k-=O),w(k,6)}for(g[8+e*(e-8)]=1,k=0;k<7;k++)m(7,k),m(e-8,k),m(7,k+e-7);for(R=0;R<8;R++)m(R,7),m(R+e-8,7),m(R,e-8);for(R=0;R<9;R++)m(R,8);for(R=0;R<8;R++)m(R+e-8,8),m(8,R);for(k=0;k<7;k++)m(8,k+e-7);for(R=0;R<e-14;R++)1&R?(m(8+R,6),m(6,8+R)):(g[8+R+6*e]=1,g[6+e*(8+R)]=1);if(t>6)for(O=a[t-7],P=17,R=0;R<6;R++)for(k=0;k<3;k++,P--)1&(P>11?t>>P-12:O>>P)?(g[5-R+e*(2-k+e-11)]=1,g[2-k+e-11+e*(5-R)]=1):(m(5-R,2-k+e-11),m(2-k+e-11,5-R));for(k=0;k<e;k++)for(R=0;R<=k;R++)g[R+e*k]&&m(R,k);for(T=u.length,L=0;L<T;L++)f[L]=u.charCodeAt(L);if(u=f.slice(0),T>=(R=r*(i+o)+o)-2&&(T=R-2,t>9&&T--),L=T,t>9){for(u[L+2]=0,u[L+3]=0;L--;)O=u[L],u[L+3]|=255&O<<4,u[L+2]=O>>4;u[2]|=255&T<<4,u[1]=T>>4,u[0]=64|T>>12}else{for(u[L+1]=0,u[L+2]=0;L--;)O=u[L],u[L+2]|=255&O<<4,u[L+1]=O>>4;u[1]|=255&T<<4,u[0]=64|T>>4}for(L=T+3-(t<10);L<R;)u[L++]=236,u[L++]=17;for(y[0]=1,L=0;L<n;L++){for(y[L+1]=1,W=L;W>0;W--)y[W]=y[W]?y[W-1]^c[x(l[y[W]]+L)]:y[W-1];y[0]=c[x(l[y[0]]+L)]}for(L=0;L<=n;L++)y[L]=l[y[L]];for(P=R,k=0,L=0;L<i;L++)S(k,r,P,n),k+=r,P+=n;for(L=0;L<o;L++)S(k,r+1,P,n),k+=r+1,P+=n;for(k=0,L=0;L<r;L++){for(W=0;W<i;W++)f[k++]=u[L+W*r];for(W=0;W<o;W++)f[k++]=u[i*r+L+W*(r+1)]}for(W=0;W<o;W++)f[k++]=u[i*r+L+W*(r+1)];for(L=0;L<n;L++)for(W=0;W<i+o;W++)f[k++]=u[R+L+W*n];for(u=f,R=k=e-1,P=T=1,I=(r+n)*(i+o)+o,L=0;L<I;L++)for(O=u[L],W=0;W<8;W++,O<<=1){128&O&&(g[R+e*k]=1);do{T?R--:(R++,P?0!=k?k--:(P=!P,6==(R-=2)&&(R--,k=9)):k!=e-1?k++:(P=!P,6==(R-=2)&&(R--,k-=8))),T=!T}while(z(R,k))}for(u=g.slice(0),O=0,k=3e4,P=0;P<8&&(B(P),(R=M())<k&&(k=R,O=P),7!=O);P++)g=u.slice(0);for(O!=P&&B(O),k=h[O+(b-1<<3)],P=0;P<8;P++,k>>=1)1&k&&(g[e-1-P+8*e]=1,P<6?g[8+e*P]=1:g[8+e*(P+1)]=1);for(P=0;P<7;P++,k>>=1)1&k&&(g[8+e*(e-7+P)]=1,P?g[6-P+8*e]=1:g[7+8*e]=1);return g}(p)},utf16to8:function(t){var e,i,o,r;for(e="",o=t.length,i=0;i<o;i++)(r=t.charCodeAt(i))>=1&&r<=127?e+=t.charAt(i):r>2047?(e+=String.fromCharCode(224|r>>12&15),e+=String.fromCharCode(128|r>>6&63),e+=String.fromCharCode(128|r>>0&63)):(e+=String.fromCharCode(192|r>>6&31),e+=String.fromCharCode(128|r>>0&63));return e},draw:function(t,i,o,r,n){i.drawView(o,r);var s=i.ctx,a=o.contentSize,h=a.width,d=a.height;r.borderRadius,r.backgroundColor;var l=r.color,c=void 0===l?"#000000":l;r.border;var u=o.contentSize.left-o.borderSize.left,f=o.contentSize.top-o.borderSize.top;if(b=n||b,s){s.save(),i.setOpacity(r);var g=i.setTransform(o,r),v=g.x,p=g.y;v+=u,p+=f;var m=Math.min(h,d);t=this.utf16to8(t);var w=this.getFrame(t),x=m/e;s.setFillStyle(c);for(var y=0;y<e;y++)for(var S=0;S<e;S++)w[S*e+y]&&s.fillRect(v+x*y,p+x*S,x,x);s.restore(),i.setBorder(o,r)}else console.warn("No canvas provided to draw QR code in!")}}}}(),y=function(){function t(t,e){var o,r,n=this,a=t.id,h=t.context,d=t.canvas,l=t.pixelRatio,c=t.width,u=t.height;this.count=0,this.isDraw=!0,this.id=a,this.canvas=d,this.pixelRatio=1*l.toFixed(2),this.width=c,this.height=u,this.platform=s,this.isRate=!1,this.component=e,this.ctx=(r=this,(o=h).setFonts=function(t){var e=t.fontFamily,i=void 0===e?"sans-serif":e,n=t.fontSize,s=void 0===n?14:n,a=t.fontWeight,h=void 0===a?"normal":a,d=t.textStyle,l=void 0===d?"normal":d;"mp-toutao"==r.platform&&(h="bold"==h?"bold":"",l="italic"==l?"italic":""),o.font=l+" "+h+" "+s+"px "+i},o.draw?o:Object.assign(o,{setStrokeStyle:function(t){o.strokeStyle=t},setLineWidth:function(t){o.lineWidth=t},setLineCap:function(t){o.lineCap=t},setFillStyle:function(t){o.fillStyle=t},setFontSize:function(t){o.font=String(t)+"px sans-serif"},setGlobalAlpha:function(t){o.globalAlpha=t},setLineJoin:function(t){o.lineJoin=t},setTextAlign:function(t){o.textAlign=t},setMiterLimit:function(t){o.miterLimit=t},setShadow:function(t,e,i,r){o.shadowOffsetX=t,o.shadowOffsetY=e,o.shadowBlur=i,o.shadowColor=r},setTextBaseline:function(t){o.textBaseline=t},createCircularGradient:function(){},draw:function(){}})),this.sleep=1e3/30,this.progress=0,this.root={width:c,height:u,fontSizeRate:1};var f=i({},this.size);Object.defineProperty(this,"size",{configurable:!0,set:function(t){Object.keys(t).forEach((function(e){f[e]=t[e],n.root[e]=t[e]}))},get:function(){return f}}),this.init()}return t.prototype.init=function(){this.canvas.height&&(this.canvas.height=this.root.height*this.pixelRatio,this.canvas.width=this.root.width*this.pixelRatio,this.ctx.scale(this.pixelRatio,this.pixelRatio))},t.prototype.clear=function(){this.ctx.clearRect(0,0,this.root.width,this.root.height)},t.prototype.roundRect=function(t,e,i,o,r,n,s){if(void 0===n&&(n=!1),void 0===s&&(s=!1),!(r<0)){var a=this.ctx;if(a.beginPath(),r){var h=r||{},d=h.borderTopLeftRadius,l=void 0===d?r||0:d,c=h.borderTopRightRadius,u=void 0===c?r||0:c,f=h.borderBottomRightRadius,g=void 0===f?r||0:f,v=h.borderBottomLeftRadius,p=void 0===v?r||0:v;a.arc(t+i-g,e+o-g,g,0,.5*Math.PI),a.lineTo(t+p,e+o),a.arc(t+p,e+o-p,p,.5*Math.PI,Math.PI),a.lineTo(t,e+l),a.arc(t+l,e+l,l,Math.PI,1.5*Math.PI),a.lineTo(t+i-u,e),a.arc(t+i-u,e+u,u,1.5*Math.PI,2*Math.PI),a.lineTo(t+i,e+o-g)}else a.rect(t,e,i,o);a.closePath(),s&&a.stroke(),n&&a.fill()}},t.prototype.setTransform=function(t,e){var i=e.transform,o=e.transformOrigin,r=void 0===o?"center center":o,n=e.position,s=this.ctx,a=i||{},h=a.scaleX,c=void 0===h?1:h,u=a.scaleY,f=void 0===u?1:u,g=a.translateX,v=void 0===g?0:g,p=a.translateY,b=void 0===p?0:p,m=a.rotate,w=void 0===m?0:m,x=a.skewX,y=void 0===x?0:x,S=a.skewY,z=void 0===S?0:S,B=t.left,R=t.top,M=t.width,k=t.height;if(!["absolute","fixed"].includes(n))return{x:B,y:R,w:M,h:k};v=l(v,M)||0,b=l(b,k)||0;var P={top:l("0%",1),center:l("50%",1,!0),bottom:l("100%",1)},O={left:l("0%",1),center:l("50%",1,!0),right:l("100%",1)};r=r.split(" ").filter((function(t,e){return e<2})).reduce((function(t,e){if(/\d+/.test(e)){var i=l(e,1,!0)/(/px|rpx$/.test(e)?d(t.x)?k:M:1);return d(t.x)?Object.assign(t,{y:i}):Object.assign(t,{x:i})}return d(O[e])&&!d(t.x)?Object.assign(t,{x:O[e]}):Object.assign(t,{y:P[e]||.5})}),{}),s.scale(c,f);var T={x:M*(c>0?1:-1)*r.x+(B+v)/c,y:k*(f>0?1:-1)*r.y+(R+b)/f};return s.translate(T.x,T.y),w&&s.rotate(w*Math.PI/180),(y||z)&&s.transform(1,Math.tan(z*Math.PI/180),Math.tan(y*Math.PI/180),1,0,0),{x:-M*r.x,y:-k*r.y,w:M,h:k}},t.prototype.setBackground=function(t,e,i,o,r){var n=this.ctx;t&&"transparent"!=t?u(t)?f(t,e,i,o,r,n):n.setFillStyle(t):["mp-toutiao","mp-baidu"].includes(this.platform)?n.setFillStyle("transparent"):n.setFillStyle("rgba(0,0,0,0)")},t.prototype.setShadow=function(t){var e=t.boxShadow,i=void 0===e?[]:e,o=this.ctx;if(i.length){var r=i[0],n=i[1],s=i[2],a=i[3];o.setShadow(r,n,s,a)}},t.prototype.setBorder=function(t,e){var i=this,o=this.ctx,r=t.width,n=t.height,s=e.border,a=e.borderBottom,h=e.borderTop,d=e.borderRight,l=e.borderLeft,c=e.borderRadius,u=s||{},f=u.borderWidth,g=void 0===f?0:f,v=u.borderStyle,p=u.borderColor,b=a||{},m=b.borderBottomWidth,w=void 0===m?g:m,x=b.borderBottomStyle,y=void 0===x?v:x,S=b.borderBottomColor,z=void 0===S?p:S,B=h||{},R=B.borderTopWidth,M=void 0===R?g:R,k=B.borderTopStyle,P=void 0===k?v:k,O=B.borderTopColor,T=void 0===O?p:O,L=d||{},W=L.borderRightWidth,I=void 0===W?g:W,j=L.borderRightStyle,C=void 0===j?v:j,F=L.borderRightColor,A=void 0===F?p:F,H=l||{},$=H.borderLeftWidth,E=void 0===$?g:$,U=H.borderLeftStyle,_=void 0===U?v:U,D=H.borderLeftColor,N=void 0===D?p:D,V=c||{},X=V.borderTopLeftRadius,q=void 0===X?c||0:X,G=V.borderTopRightRadius,J=void 0===G?c||0:G,Y=V.borderBottomRightRadius,Q=void 0===Y?c||0:Y,Z=V.borderBottomLeftRadius,K=void 0===Z?c||0:Z;if(a||l||h||d||s){var tt=function(t,e,r){"dashed"==e?/mp/.test(i.platform)?o.setLineDash([Math.ceil(4*t/3),Math.ceil(4*t/3)]):o.setLineDash([Math.ceil(6*t),Math.ceil(6*t)]):"dotted"==e&&o.setLineDash([t,t]),o.setStrokeStyle(r)},et=function(t,e,i,r,n,s,a,h,d,l,c,u,f,g){o.save(),o.setLineWidth(u),tt(u,f,g),o.beginPath(),o.arc(t,e,a,Math.PI*d,Math.PI*l),o.lineTo(i,r),o.arc(n,s,h,Math.PI*l,Math.PI*c),o.stroke(),o.restore()};o.save(),this.setOpacity(e);var it=this.setTransform(t,e),ot=it.x,rt=it.y;s&&(o.setLineWidth(g),tt(g,v,p),this.roundRect(ot,rt,r,n,c,!1,!!p),o.restore()),a&&et(ot+r-Q,rt+n-Q,ot+K,rt+n,ot+K,rt+n-K,Q,K,.25,.5,.75,w,y,z),l&&et(ot+K,rt+n-K,ot,rt+q,ot+q,rt+q,K,q,.75,1,1.25,E,_,N),h&&et(ot+q,rt+q,ot+r-J,rt,ot+r-J,rt+J,q,J,1.25,1.5,1.75,M,P,T),d&&et(ot+r-J,rt+J,ot+r,rt+n-Q,ot+r-Q,rt+n-Q,J,Q,1.75,2,.25,I,C,A)}},t.prototype.setOpacity=function(t){var e=t.opacity,i=void 0===e?1:e;this.ctx.setGlobalAlpha(i)},t.prototype.drawPattern=function(t,e,i){return o(this,void 0,void 0,(function(){var n=this;return r(this,(function(s){return[2,new Promise((function(s,a){var h=n,d=h.ctx,l=h.canvas,c=e.width,u=e.height,f=i||{},g=f.borderRadius,v=void 0===g?0:g,p=f.backgroundColor,b=void 0===p?"transparent":p,m=f.backgroundImage,w=f.backgroundRepeat,x=void 0===w?"repeat":w;d.save(),n.setOpacity(i);var y=n.setTransform(e,i),S=y.x,z=y.y;n.setShadow(i),n.setBackground(b,c,u,S,z),n.roundRect(S,z,c,u,v,!0,!1);var B=function(t){var o=d.createPattern(t.src,x);d.setFillStyle(o),n.roundRect(S,z,c,u,v,!0,!1),n.setBorder(e,i),d.restore(),s()};if(m)if(l.createImage||"web"==n.platform){var R=null;(R=l.createImage?l.createImage():new Image).onload=function(){t.src=R,B(t)},R.onerror=function(){return o(n,void 0,void 0,(function(){return r(this,(function(e){return console.log("createImage fail: "+JSON.stringify(t)),s(),[2]}))}))},R.src=t.path}else B(t)}))]}))}))},t.prototype.drawView=function(t,e,i,o,r){void 0===i&&(i=!0),void 0===o&&(o=!0),void 0===r&&(r=!0);var n=this.ctx,s=t.width,a=t.height,h=e||{},d=h.borderRadius,l=void 0===d?0:d,c=h.backgroundColor,u=void 0===c?"transparent":c;n.save(),this.setOpacity(e);var f=this.setTransform(t,e),g=f.x,v=f.y;r&&this.setShadow(e),i&&this.setBackground(u,s,a,g,v),this.roundRect(g,v,s,a,l,i,!1),n.restore(),o&&this.setBorder(t,e)},t.prototype.drawImage=function(t,e,i,n){return void 0===e&&(e={}),void 0===i&&(i={}),void 0===n&&(n=!0),o(this,void 0,void 0,(function(){var s=this;return r(this,(function(a){switch(a.label){case 0:return[4,new Promise((function(a,h){return o(s,void 0,void 0,(function(){var s,h,d,u,f,g,v,p,b,m,w,x,y,S,z,B,R,M,k,P,O,T,L,W,I,j,C,F=this;return r(this,(function(A){switch(A.label){case 0:return i.boxShadow&&this.drawView(e,Object.assign(i,{backgroundColor:i.backgroundColor||i.boxShadow&&(i.backgroundColor||"#ffffff")}),!0,!1,!0),h=(s=this).ctx,d=s.sleep,u=s.canvas,f=i.borderRadius,g=void 0===f?0:f,v=i.backgroundColor,p=void 0===v?"transparent":v,b=i.objectFit,m=void 0===b?"fill":b,w=i.objectPosition,x=e.width,y=e.height,S=e.left,z=e.top,h.save(),B=e.contentSize.left-e.borderSize.left,R=e.contentSize.top-e.borderSize.top,n||(this.setOpacity(i),M=this.setTransform(e,i),k=M.x,P=M.y,this.setBackground(p,x,y,S,z),S=k,z=P,this.roundRect(S,z,x,y,g,!!g,!1)),S+=B,z+=R,h.clip(),O=function(t){if("fill"!==m){var i=function(t,e,i){var o=t.objectFit,r=t.objectPosition,n=e.width/e.height,s=i.width/i.height,a=1;"contain"==o&&n>=s||"cover"==o&&n<s?a=e.height/i.height:("contain"==o&&n<s||"cover"==o&&n>=s)&&(a=e.width/i.width);var h=i.width*a,d=i.height*a,c=/^\d+px|rpx$/.test(null==r?void 0:r[0])?l(null==r?void 0:r[0],e.width):(e.width-h)*(/%$/.test(null==r?void 0:r[0])?l(null==r?void 0:r[0],1,!0):{left:0,center:.5,right:1}[(null==r?void 0:r[0])||"center"]),u=/^\d+px|rpx$/.test(null==r?void 0:r[1])?l(null==r?void 0:r[1],e.height):(e.height-d)*(/%$/.test(null==r?void 0:r[1])?l(null==r?void 0:r[1],1,!0):{top:0,center:.5,bottom:1}[(null==r?void 0:r[1])||"center"]),f=function(t,e){return[(t-c)/a,(e-u)/a]},g=f(0,0),v=g[0],p=g[1],b=f(e.width,e.height),m=b[0],w=b[1];return{sx:Math.max(v,0),sy:Math.max(p,0),sw:Math.min(m-v,i.width),sh:Math.min(w-p,i.height),dx:Math.max(c,0),dy:Math.max(u,0),dw:Math.min(h,e.width),dh:Math.min(d,e.height)}}({objectFit:m,objectPosition:w},e.contentSize,t),o=i.sx,r=i.sy,n=i.sh,s=i.sw,a=i.dx,d=i.dy,c=i.dh,u=i.dw;"mp-baidu"==F.platform?h.drawImage(t.src,a+S,d+z,u,c,o,r,s,n):h.drawImage(t.src,o,r,s,n,a+S,d+z,u,c)}else h.drawImage(t.src,S,z,x,y)},T=function(){h.restore(),F.drawView(e,i,!1,!0,!1),setTimeout(a,d)},L=function(t){if(u.createImage||"web"==F.platform){var e=null;(e=u.createImage?u.createImage():new Image).onload=function(){t.src=e,O(t),T()},e.onerror=function(){return o(F,void 0,void 0,(function(){return r(this,(function(e){return console.log("createImage fail: "+JSON.stringify(t)),a(!0),[2]}))}))},e.src=t.path}else O(t),T()},"string"!=typeof t?[3,2]:[4,c(t)];case 1:return W=A.sent(),I=W.path,j=W.width,C=W.height,L({path:I,src:I,width:j,height:C}),[3,3];case 2:L(t),A.label=3;case 3:return[2]}}))}))}))];case 1:return a.sent(),[2]}}))}))},t.prototype.drawText=function(t,e,i,o){this.drawView(e,i);var r=this.ctx,n=e.borderSize,s=e.contentSize,a=s.width,h=s.height,d=s.left-n.left,c=s.top-n.top,u=i.color,f=void 0===u?"#000000":u,g=i.lineHeight,v=void 0===g?"1.4em":g,p=i.fontSize,b=void 0===p?14:p,m=i.fontWeight,w=i.fontFamily,x=i.textStyle,y=i.textAlign,S=void 0===y?"left":y,z=i.verticalAlign,B=void 0===z?"middle":z;i.backgroundColor;var R=i.lineClamp,M=i.textDecoration;if(v=l(v,b),t){r.save(),this.setOpacity(i);var k=this.setTransform(e,i),P=k.x,O=k.y;switch(P+=d,O+=c,r.setFonts({fontFamily:w,fontSize:b,fontWeight:m,textStyle:x}),r.setTextBaseline("middle"),r.setTextAlign(S),r.setFillStyle(f),O+=b/2,S){case"left":break;case"center":P+=.5*a;break;case"right":P+=a}var T=o.lines*v,L=Math.ceil((h-T)/2);switch(L<0&&(L=0),B){case"top":break;case"middle":O+=L;break;case"bottom":O+=2*L}var W=(v-o.fontHeight)/2,I=function(t,e,i){var n=t;switch(S){case"left":t=t,n+=i;break;case"center":n=(t-=i/2)+i;break;case"right":n=t,t-=i}M&&(r.setLineWidth(b/13),r.beginPath(),e-=W,/\bunderline\b/.test(M)&&(r.moveTo(t,e-.5*o.fontHeight),r.lineTo(n,e-.5*o.fontHeight)),/\boverline\b/.test(M)&&(r.moveTo(t,e-1.5*o.fontHeight),r.lineTo(n,e-1.5*o.fontHeight)),/\bline-through\b/.test(M)&&(r.moveTo(t,e-o.fontHeight),r.lineTo(n,e-o.fontHeight)),r.closePath(),r.setStrokeStyle(f),r.stroke())};if(1==o.widths.lenght&&o.widths[0].total<=s.width)return r.fillText(t,P,O+W),I(P,O+=v,o.widths[0].total),r.restore(),void this.setBorder(e,i);for(var j=t.split(""),C=O,F=P,A="",H=0,$=0;$<=j.length;$++){var E=j[$]||"",U="\n"===E,_=""==E,D=A+(E=U?"":E),N=r.measureText(D).width;if(H>=R)break;if(F=P,(N=N)>s.width||U||_){if(H++,A=_&&N<=s.width?D:A,H===R&&N>a){for(;r.measureText(A+"...").width>s.width&&!(A.length<=1);)A=A.substring(0,A.length-1);A+="..."}if(r.fillText(A,F,O+W),I(F,O+=v,N),A=E,O+v>C+h)break}else A=D}r.restore()}},t.prototype.source=function(t){var e;return o(this,void 0,void 0,(function(){var i,o;return r(this,(function(r){switch(r.label){case 0:if("{}"==JSON.stringify(t))return[2];if(!t.type)for(i in t.type="view",t.css=t.css||{},t)["views","children","type","css"].includes(i)||(t.css[i]=t[i],delete t[i]);return(null===(e=null==t?void 0:t.css)||void 0===e?void 0:e.width)||(t.css?t.css.width=this.root.width:t.css={width:this.root.width}),[4,this.create(t)];case 1:return o=r.sent(),this.size=o.layout(),this.node=o,[2,this.size]}}))}))},t.prototype.create=function(t,e){var i,n,s,a;return o(this,void 0,void 0,(function(){var o,h,d,l,u,f,g,v,p,b,m,x;return r(this,(function(r){switch(r.label){case 0:if("image"==t.type&&!t.src&&!t.url||"qrcode"==t.type&&!t.text)return[2];if("none"==(null===(i=null==t?void 0:t.css)||void 0===i?void 0:i.display))return console.error("element display none"),[2];r.label=1;case 1:return r.trys.push([1,4,,5]),"image"==t.type||"view"==t.type&&(null===(n=t.css)||void 0===n?void 0:n.backgroundImage)?(o=null,h=/url\((.+)\)/,t.css.backgroundImage&&(null===(s=h.exec(t.css.backgroundImage))||void 0===s?void 0:s[1])&&(o=null===(a=h.exec(t.css.backgroundImage))||void 0===a?void 0:a[1]),[4,c(t.src||o)]):[3,3];case 2:d=r.sent(),l=d.width,u=d.height,f=d.path,["mp-weixin","mp-baidu","mp-qq","mp-toutiao"].includes(this.platform)&&(f=/^\.|^\/(?=[^\/])/.test(t.src||o)?"/"+f:f),t.attributes=Object.assign(t.attributes||{},{width:l,height:u,path:f,src:f,naturalSrc:t.src||o}),r.label=3;case 3:return[3,5];case 4:return g=r.sent(),console.log(g),[2];case 5:if(this.count+=1,v=new w(t,e,this.root,this.ctx),!(p=t.views||t.children))return[3,9];b=0,r.label=6;case 6:return b<p.length?(m=p[b],[4,this.create(m,v)]):[3,9];case 7:(x=r.sent())&&v.add(x),r.label=8;case 8:return b++,[3,6];case 9:return[2,v]}}))}))},t.prototype.drawNode=function(t){return o(this,void 0,void 0,(function(){var e,i,o,n,s,a,h,d,l,c,u,f;return r(this,(function(r){switch(r.label){case 0:return e=t.layoutBox,i=t.computedStyle,o=t.attributes,n=t.name,s=t.children,a=t.attributes,h=a.src,d=a.text,"view"!==n?[3,4]:h?[4,this.drawPattern(o,e,i)]:[3,2];case 1:return r.sent(),[3,3];case 2:this.drawView(e,i),r.label=3;case 3:return[3,7];case 4:return"image"===n&&h?[4,this.drawImage(o,e,i,!1)]:[3,6];case 5:return r.sent(),[3,7];case 6:"text"===n?this.drawText(d,e,i,o):"qrcode"===n&&(null==x?void 0:x.api)&&x.api.draw(d,this,e,i),r.label=7;case 7:if(this.progress+=1,!s)return[2];l=Object.values?Object.values(s):Object.keys(s).map((function(t){return s[t]})),c=0,u=l,r.label=8;case 8:return c<u.length?(f=u[c],[4,this.drawNode(f)]):[3,11];case 9:r.sent(),r.label=10;case 10:return c++,[3,8];case 11:return[2]}}))}))},t.prototype.render=function(){return o(this,void 0,void 0,(function(){return r(this,(function(t){switch(t.label){case 0:return this.init(),[4,(e=30,void 0===e&&(e=0),new Promise((function(t){return setTimeout(t,e)})))];case 1:return t.sent(),[4,this.drawNode(this.node)];case 2:return t.sent(),[2]}var e}))}))},t.prototype.listen=function(t,e){var i=this;if("progressChange"==t){var o=0;Object.defineProperty(this,"progress",{configurable:!0,set:function(t){o=t,e(t/i.count)},get:function(){return o||0}})}},t.prototype.save=function(t){try{var e=t||{},i=e.fileType,o=void 0===i?"png":i,r=e.quality,n=void 0===r?1:r;return this.canvas.toDataURL("image/"+o,n)}catch(t){return console.log("image cross domain"),t}},t}();"web"==s&&(window.Painter=y),t.Painter=y,Object.defineProperty(t,"__esModule",{value:!0})}));
diff --git a/components/lyg-popup/lyg-popup.vue b/components/lyg-popup/lyg-popup.vue
index 5fc6e4b..f356377 100644
--- a/components/lyg-popup/lyg-popup.vue
+++ b/components/lyg-popup/lyg-popup.vue
@@ -175,13 +175,13 @@
 				flex: 1;
 			}
 			button {
-				color: $-color-white;
-				background-color: $-color-primary;
+				color: $color-white;
+				background-color: $color-primary;
 			}
 			.plain {
-				color: $-color-primary;
-				background-color: $-color-white;
-				border: 1px solid $-color-primary;
+				color: $color-primary;
+				background-color: $color-white;
+				border: 1px solid $color-primary;
 			}
 		}
 	}
diff --git a/components/order-list/order-list.vue b/components/order-list/order-list.vue
index 54753fa..7f12f8f 100644
--- a/components/order-list/order-list.vue
+++ b/components/order-list/order-list.vue
@@ -463,14 +463,14 @@ export default {
 
     .order-footer {
       height: 100rpx;
-      border-top: $-solid-border;
+      border-top: $solid-border;
       padding: 0 24rpx;
 
       .plain {
         border: 1px solid #bbbbbb;
 
         &.red {
-          border-color: $-color-primary;
+          border-color: $color-primary;
         }
       }
     }
diff --git a/components/privacy-popup/privacy-popup.vue b/components/privacy-popup/privacy-popup.vue
index eefeda7..6496b7b 100644
--- a/components/privacy-popup/privacy-popup.vue
+++ b/components/privacy-popup/privacy-popup.vue
@@ -101,7 +101,7 @@ export default {
     margin-top: 15rpx;
   }
   .btn-comfirm {
-    background-color: $-color-primary;
+    background-color: $color-primary;
     color: white;
     height: 80rpx;
     line-height: 80rpx;
diff --git a/components/share-popup/share-popup.vue b/components/share-popup/share-popup.vue
index 11a3bd3..133097c 100644
--- a/components/share-popup/share-popup.vue
+++ b/components/share-popup/share-popup.vue
@@ -264,7 +264,7 @@
 
 		.save-btn {
 			// @include background_color();
-			background-color: $-color-primary;
+			background-color: $color-primary;
 			color: #fff;
 			margin-top: 20rpx;
 		}
diff --git a/components/spec-popup/spec-popup.vue b/components/spec-popup/spec-popup.vue
index 25e22e0..282cf7b 100644
--- a/components/spec-popup/spec-popup.vue
+++ b/components/spec-popup/spec-popup.vue
@@ -405,7 +405,7 @@ export default {
     padding: 30rpx 20rpx;
     padding-right: 70rpx;
     align-items: flex-start;
-    border: $-solid-border;
+    border: $solid-border;
     .vip-price {
       margin: 0 24rpx;
       background-color: #ffe9ba;
@@ -453,14 +453,14 @@ export default {
         border: 1px solid #f4f4f4;
 
         // &.checked {
-        // 	background-color: $-color-primary;
+        // 	background-color: $color-primary;
         // 	color: #fff;
         // }
 
         &.checked {
           background-color: #ffe9eb;
-          color: $-color-primary;
-          border-color: $-color-primary;
+          color: $color-primary;
+          border-color: $color-primary;
         }
 
         &.disabled {
diff --git a/components/swipers/swipers.vue b/components/swipers/swipers.vue
index b0c6f33..0af91f0 100644
--- a/components/swipers/swipers.vue
+++ b/components/swipers/swipers.vue
@@ -170,7 +170,7 @@
 				&.active {
 					width: 16rpx;
 					border-radius: 8rpx;
-					background-color: $-color-primary;
+					background-color: $color-primary;
 				}
 			}
 		}
diff --git a/pages/address_edit/address_edit.vue b/pages/address_edit/address_edit.vue
index 1bacb94..fd70c99 100644
--- a/pages/address_edit/address_edit.vue
+++ b/pages/address_edit/address_edit.vue
@@ -295,7 +295,7 @@ export default {
             padding: 0 24rpx;
             height: 80rpx;
             &:not(:nth-of-type(3)) {
-                border-bottom: $-solid-border;
+                border-bottom: $solid-border;
             }
             .label {
                 width: 150rpx;
diff --git a/pages/all_comments/all_comments.vue b/pages/all_comments/all_comments.vue
index 1afaf2f..e2b3343 100644
--- a/pages/all_comments/all_comments.vue
+++ b/pages/all_comments/all_comments.vue
@@ -257,7 +257,7 @@ export default {
             .evaluation-item {
                 padding: 20rpx;
                 &:not(:last-of-type) {
-                    border-bottom: $-solid-border;
+                    border-bottom: $solid-border;
                 }
                 .avatar {
                     width: 60rpx;
diff --git a/pages/forget_pwd/forget_pwd.vue b/pages/forget_pwd/forget_pwd.vue
index 337cee6..1b2160b 100644
--- a/pages/forget_pwd/forget_pwd.vue
+++ b/pages/forget_pwd/forget_pwd.vue
@@ -211,7 +211,7 @@ page {
       height: 100rpx;
       border-radius: 10rpx;
       width: 670rpx;
-      border: $-solid-border;
+      border: $solid-border;
       margin-top: 30rpx;
     }
   }
diff --git a/pages/goods_details/goods_details.vue b/pages/goods_details/goods_details.vue
index 22e2ea0..fc98380 100644
--- a/pages/goods_details/goods_details.vue
+++ b/pages/goods_details/goods_details.vue
@@ -774,7 +774,7 @@
 					padding: 0 18rpx;
 					border-radius: 6rpx;
 					box-sizing: border-box;
-					background-color: $-color-primary;
+					background-color: $color-primary;
 					color: #fff;
 					white-space: nowrap;
 					overflow: hidden;
@@ -817,7 +817,7 @@
 		.evaluation {
 			.title {
 				height: 100rpx;
-				border-bottom: $-solid-border;
+				border-bottom: $solid-border;
 				padding: 0 24rpx;
 			}
 
@@ -895,14 +895,14 @@
 			}
 
 			.right-buy {
-				background-color: $-color-primary;
+				background-color: $color-primary;
 			}
 		}
 
 		.group-play {
 			.title {
 				padding: 20rpx 28rpx;
-				border-bottom: $-solid-border;
+				border-bottom: $solid-border;
 			}
 
 			.steps {
@@ -935,7 +935,7 @@
 				padding: 20rpx 24rpx;
 
 				&:not(:last-of-type) {
-					border-bottom: $-solid-border;
+					border-bottom: $solid-border;
 				}
 
 				.group-btn {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 3b3267f..e085b2b 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -585,7 +585,7 @@ export default {
         justify-content: center;
         width: 80rpx;
         height: 80rpx;
-        border: $-solid-border;
+        border: $solid-border;
         border-radius: 50%;
         font-size: 32rpx;
         background-color: #ffffff;
@@ -660,7 +660,7 @@ export default {
 
                         &.active {
                             width: 20rpx;
-                            background-color: $-color-primary;
+                            background-color: $color-primary;
                         }
                     }
                 }
@@ -780,7 +780,7 @@ export default {
 
                 .coupon-right {
                     padding-left: 30rpx;
-                    border-left: 1rpx dashed $-color-primary;
+                    border-left: 1rpx dashed $color-primary;
                 }
             }
         }
@@ -823,7 +823,7 @@ export default {
 
                 .price {
                     width: 160rpx;
-                    border-right: 1px dashed $-color-primary;
+                    border-right: 1px dashed $color-primary;
                     height: 100%;
                 }
             }
diff --git a/pages/login/login.vue b/pages/login/login.vue
index e0da3a9..5a3a611 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -568,7 +568,7 @@ page {
                 height: 100rpx;
             }
             .phonebtn {
-                border: $-solid-border;
+                border: $solid-border;
                 margin-top: 50rpx;
                 width: 100%;
                 height: 100rpx;
@@ -577,12 +577,12 @@ page {
                 height: 100rpx;
                 border-radius: 10rpx;
                 width: 670rpx;
-                border: $-solid-border;
+                border: $solid-border;
                 margin-top: 30rpx;
             }
 
             .sms-btn {
-                border: 1px solid $-color-primary;
+                border: 1px solid $color-primary;
                 width: 176rpx;
                 height: 60rpx;
                 box-sizing: border-box;
@@ -605,7 +605,7 @@ page {
     padding: 60rpx 0 70rpx 0;
 }
 .agreement {
-    color: $-color-primary;
+    color: $color-primary;
 }
 .inactive {
     opacity: 0.5;
diff --git a/pages/order_details/order_details.vue b/pages/order_details/order_details.vue
index 205e922..db1bb36 100644
--- a/pages/order_details/order_details.vue
+++ b/pages/order_details/order_details.vue
@@ -621,7 +621,7 @@ export default {
   top: 0;
   width: 100%;
   height: 200rpx;
-  background-color: $-color-primary;
+  background-color: $color-primary;
   z-index: 0;
 }
 
@@ -691,7 +691,7 @@ export default {
 }
 
 .footer .plain.red {
-  border: 1px solid $-color-primary;
+  border: 1px solid $color-primary;
 }
 
 .tips-dialog {
@@ -783,6 +783,6 @@ export default {
 }
 
 .receive-info-item:nth-child(n + 2) {
-  border-top: $-dashed-border;
+  border-top: $dashed-border;
 }
 </style>
diff --git a/pages/pay_result/pay_result.vue b/pages/pay_result/pay_result.vue
index f88de58..d75ac00 100644
--- a/pages/pay_result/pay_result.vue
+++ b/pages/pay_result/pay_result.vue
@@ -146,7 +146,7 @@
 				.go-back-btn {
 					width: 650rpx;
 					height: 84rpx;
-					border:1px solid  $-color-primary;
+					border:1px solid  $color-primary;
 					box-sizing: border-box;
 				}
 			}
diff --git a/pages/payment/payment.vue b/pages/payment/payment.vue
index 11527db..b49a46a 100644
--- a/pages/payment/payment.vue
+++ b/pages/payment/payment.vue
@@ -262,7 +262,7 @@
 					justify-content: center;
 					padding: 20rpx 0;
 					font-size: 26rpx;
-					color: $-color-muted;
+					color: $color-muted;
 				}
 			}
 
@@ -276,7 +276,7 @@
 					height: 120rpx;
 
 					&:nth-child(n+2) {
-						border-top: $-dashed-border;
+						border-top: $dashed-border;
 					}
 
 					&-content {
@@ -287,12 +287,12 @@
 
 						&-name {
 							font-size: 28rpx;
-							color: $-color-black;
+							color: $color-black;
 						}
 
 						&-tips {
 							font-size: 22rpx;
-							color: $-color-muted;
+							color: $color-muted;
 						}
 					}
 				}
@@ -307,7 +307,7 @@
 				margin-top: 10rpx;
 				font-size: 22rpx;
 				background-color: #FFFFFF;
-				color: $-color-normal;
+				color: $color-normal;
 			}
 
 			&-submit {
diff --git a/pages/register/register.vue b/pages/register/register.vue
index 413a6af..957259d 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -291,7 +291,7 @@ page {
       height: 100rpx;
       border-radius: 10rpx;
       width: 670rpx;
-      border: $-solid-border;
+      border: $solid-border;
       margin-top: 30rpx;
     }
     .input-item {
@@ -312,10 +312,10 @@ page {
         height: 29px;
         width: 88px;
         flex: none;
-        border: 1px solid $-color-primary;
+        border: 1px solid $color-primary;
         cursor: pointer;
         .seconds {
-          color: $-color-primary;
+          color: $color-primary;
         }
       }
     }
@@ -332,7 +332,7 @@ page {
   padding: 60rpx 0 70rpx 0;
 }
 .agreement {
-  color: $-color-primary;
+  color: $color-primary;
 }
 .inactive {
   opacity: 0.5;
diff --git a/pages/shop_cart/shop_cart.vue b/pages/shop_cart/shop_cart.vue
index fc5d51d..dd1aaf9 100644
--- a/pages/shop_cart/shop_cart.vue
+++ b/pages/shop_cart/shop_cart.vue
@@ -335,20 +335,20 @@ export default {
       margin: 20rpx 20rpx 0;
       border-radius: 10rpx;
       // &.invalid {
-      // 	background-color: $-color-body;
+      // 	background-color: $color-body;
       // }
     }
 
     .select {
       height: 80rpx;
       padding: 0 20rpx;
-      border-bottom: $-solid-border;
+      border-bottom: $solid-border;
     }
   }
 
   .cart-null {
     .btn {
-      border: 1px solid $-color-primary;
+      border: 1px solid $color-primary;
       width: 184rpx;
       margin-left: auto;
       margin-right: auto;
diff --git a/pages/sort/sort.vue b/pages/sort/sort.vue
index 7b95fc6..7ee7f59 100644
--- a/pages/sort/sort.vue
+++ b/pages/sort/sort.vue
@@ -74,7 +74,7 @@
 			.header {
 				box-sizing: border-box;
 				height: $header-height;
-				border-bottom: $-solid-border;
+				border-bottom: $solid-border;
 
 				.search {
 					flex: 1;
diff --git a/pages/user/user.vue b/pages/user/user.vue
index 49f25e7..01a599f 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -348,7 +348,7 @@ export default {
                     position: absolute;
                     background-color: #ee0a24;
                     border: 2rpx solid #ffffff;
-                    color: $-color-primary;
+                    color: $color-primary;
                     border-radius: 100%;
                     top: 6rpx;
                     right: 0rpx;
@@ -398,7 +398,7 @@ export default {
     .title {
         height: 88rpx;
         padding: 0 30rpx;
-        border-bottom: $-dashed-border;
+        border-bottom: $dashed-border;
     }
 
     .nav {
@@ -418,8 +418,8 @@ export default {
             height: 28rpx;
             border-radius: 28rpx;
             box-sizing: border-box;
-            border: 1rpx solid $-color-primary;
-            color: $-color-primary;
+            border: 1rpx solid $color-primary;
+            color: $color-primary;
             position: absolute;
             left: 33rpx;
             top: -10rpx;
diff --git a/pages/user_address/user_address.vue b/pages/user_address/user_address.vue
index bda88ac..333b463 100644
--- a/pages/user_address/user_address.vue
+++ b/pages/user_address/user_address.vue
@@ -276,7 +276,7 @@ export default {
             padding: 0 30rpx;
             .address {
                 padding: 20rpx 0;
-                border-bottom: $-solid-border;
+                border-bottom: $solid-border;
             }
             .operation {
                 height: 80rpx;
diff --git a/pages/user_collection/user_collection.vue b/pages/user_collection/user_collection.vue
index a336967..43e595f 100644
--- a/pages/user_collection/user_collection.vue
+++ b/pages/user_collection/user_collection.vue
@@ -154,7 +154,7 @@ export default {
         .collection-item {
             padding: 20rpx;
             &:not(:last-of-type) {
-                border-bottom: $-solid-border;
+                border-bottom: $solid-border;
             }
             .info {
                 flex: 1;
@@ -168,7 +168,7 @@ export default {
                 width: 148rpx;
                 height: 52rpx;
                 right: 20rpx;
-                border: 1px solid $-color-primary;
+                border: 1px solid $color-primary;
                 display: flex;
                 justify-content: center;
                 align-items: center;
diff --git a/styles/base.scss b/styles/base.scss
index 3b25b93..4bcc8cc 100644
--- a/styles/base.scss
+++ b/styles/base.scss
@@ -4,9 +4,9 @@ page {
     /* 定义一些主题色及基础样式 */
     font-family: PingFang SC, Arial, Hiragino Sans GB, Microsoft YaHei, sans-serif;
     font-size: 28rpx;
-    color: $-color-normal;
+    color: $color-normal;
 	padding-bottom: env(safe-area-inset-bottom);
-    background-color: $-color-body;
+    background-color: $color-body;
 }
 
 .flex1{
@@ -25,41 +25,41 @@ page {
 }
 /* 定义字体颜色 */
 .primary {
-    color: $-color-primary;
+    color: $color-primary;
 }
 
 .bg-primary {
-    background-color: $-color-primary;
+    background-color: $color-primary;
 }
 .bg-white {
-    background-color: $-color-white;
+    background-color: $color-white;
 }
 .bg-body {
-    background-color: $-color-body;
+    background-color: $color-body;
 }
 .bg-gray {
-    background-color: $-color-border;
+    background-color: $color-border;
 }
 
 
 .black {
-    color: $-color-black;
+    color: $color-black;
 }
 
 .white {
-    color: $-color-white;
+    color: $color-white;
 }
 
 .normal {
-    color: $-color-normal;
+    color: $color-normal;
 }
 
 .lighter {
-    color: $-color-lighter;
+    color: $color-lighter;
 }
 
 .muted {
-    color: $-color-muted;
+    color: $color-muted;
 }
 
 /* 定义字体大小 */
@@ -278,10 +278,10 @@ page input {
 	font-size: 28rpx;
 }
 button[type=primary] {
-	background-color: $-color-primary;
+	background-color: $color-primary;
 }
 .button-hover[type=primary] {
-	background-color: $-color-primary;
+	background-color: $color-primary;
 }
 /* 按钮大小 */
 button[size="xs"]{
@@ -366,8 +366,8 @@ radio {
 	    width: 34rpx;
 	    height: 34rpx;
 		&.uni-radio-input-checked {
-			border: 1px solid $-color-primary !important;
-			background-color: $-color-primary !important;
+			border: 1px solid $color-primary !important;
+			background-color: $color-primary !important;
 		}
 	}
 } 
@@ -380,8 +380,8 @@ checkbox {
 	    width: 34rpx;
 	    height: 34rpx;
 		&.uni-checkbox-input-checked {
-		    border: 1px solid $-color-primary !important;
-		    background-color: $-color-primary !important;
+		    border: 1px solid $color-primary !important;
+		    background-color: $color-primary !important;
 		    color: #fff !important;
 			&::before {
 				font-size: 35rpx;
@@ -404,8 +404,8 @@ radio {
 	    width: 34rpx;
 	    height: 34rpx;
 		&.wx-radio-input-checked {
-			border: 1px solid $-color-primary !important;
-			background-color: $-color-primary !important;
+			border: 1px solid $color-primary !important;
+			background-color: $color-primary !important;
 		}
 	}
 } 
@@ -418,8 +418,8 @@ checkbox {
 	    width: 34rpx;
 	    height: 34rpx;
 		&.wx-checkbox-input-checked {
-		    border: 1px solid $-color-primary !important;
-		    background-color: $-color-primary !important;
+		    border: 1px solid $color-primary !important;
+		    background-color: $color-primary !important;
 		    color: #fff !important;
 			&::before {
 				font-size: 35rpx;
diff --git a/uni.scss b/uni.scss
index b899019..b8b2f0a 100644
--- a/uni.scss
+++ b/uni.scss
@@ -17,26 +17,26 @@
 
 /* 行为相关颜色 */
 //主题色
-$-color-primary: #FF2C3C;
+$color-primary: #FF2C3C;
 //主要边框颜色
-$-color-border: #E5E5E5;
+$color-border: #E5E5E5;
 //黑色
-$-color-black:#101010;
+$color-black:#101010;
 //白色
-$-color-white: #ffffff;
+$color-white: #ffffff;
 //字体主色
-$-color-normal: #333333;
+$color-normal: #333333;
 //字体浅色
-$-color-lighter: #666666;
+$color-lighter: #666666;
 //字体更浅色
-$-color-muted: #999999;
+$color-muted: #999999;
 
 //背景色
-$-color-body: #F6F6F6;
+$color-body: #F6F6F6;
 
 //边框
-$-solid-border: 1px solid $-color-border;
-$-dashed-border: 1px dashed $-color-border;
+$solid-border: 1px solid $color-border;
+$dashed-border: 1px dashed $color-border;