Merge branch 'feature/bugfix61' into 'release/6.1'

icon-change



See merge request !929

@@ -7,8 +7,7 @@
                 <i> ￥</i><span>{{remainAmount}}</span>
             </div>
             <div class="logo pull-right">
-                <i class="iconfont">&#xe60e;</i>
-                <i class="iconfont">&#xe60d;</i>
+                <i class="iconfont">&#xe734;</i>
             </div>
         </div>
         <div class="card-body clearfix">

@@ -354,6 +354,9 @@ t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q-
     <glyph glyph-name="sx" unicode="&#59187;" d="M810.72128 293.49888a40.89856 40.89856 0 0 1-55.27552-17.28512 237.42464 237.42464 0 0 0-81.08032-89.04704 237.6704 237.6704 0 0 0-239.06304-11.07968 235.7248 235.7248 0 0 0-116.36736 139.34592 235.58144 235.58144 0 0 0 16.24064 180.81792 235.6224 235.6224 0 0 0 139.34592 116.34688 235.4176 235.4176 0 0 0 180.81792-16.26112l1.04448-0.59392-0.94208-0.16384a40.98048 40.98048 0 0 1 13.47584-80.81408l99.75808 16.65024a40.96 40.96 0 0 1 33.66912 47.14496l-16.62976 99.75808a40.96 40.96 0 0 1-80.81408-13.47584l0.49152-2.90816c-4.01408 2.33472-7.92576 4.8128-12.06272 6.98368a316.94848 316.94848 0 0 1-243.24096 21.87264 316.86656 316.86656 0 0 1-187.45344-156.54912C181.02272 378.368 241.43872 185.1392 397.312 103.5264a318.42304 318.42304 0 0 1 147.92704-36.31104c60.60032 0 121.05728 17.16224 173.62944 51.15904a319.13984 319.13984 0 0 1 109.1584 119.84896 40.96 40.96 0 0 1-17.3056 55.27552z"  horiz-adv-x="1024" />
 
     
+    <glyph glyph-name="yohobuy_h" unicode="&#59188;" d="M2346.09492279 495.18680825c0-19.49837299-15.30849372-34.96514213-34.74689851-34.96514085-19.44528656 0-34.95776844 15.46676914-34.95776846 34.96514085 0 19.48755842 15.51248189 34.73903291 35.16962223 34.73903419 19.22655102 0 34.53504475-15.25147449 34.53504474-34.73903419z m-61.01425549 0c0-15.46676914 11.38306273-27.76114411 26.47921075-27.76114411 14.68079801-0.20841289 25.84758352 12.29437626 25.84758351 27.54535882 0 15.46382018-11.16727615 27.95874371-26.27522257 27.95874371-14.66850895 0.00049191-26.05157168-12.49443161-26.05157169-27.74295842z m20.89336096-18.01195826h-7.86511745v34.74640659c3.10062887 0.42026538 7.44239374 1.05484286 13.02431202 1.05484286 6.41753497 0 9.30680069-1.05484286 11.5909824-2.75261815 2.06839642-1.47854912 3.51696274-4.02029863 3.51696274-7.41240964 0-4.23166049-3.09325518-6.99214297-7.03736506-8.26670391v-0.42370756c3.31641417-1.05484286 4.96552777-3.81188575 6.00119981-8.47462488 1.03616397-5.29043487 1.85703457-7.19662434 2.48817116-8.47118531h-8.28194193c-1.02485876 1.27456096-1.65697792 4.23215111-2.68134605 8.47118531-0.63211915 3.60789628-2.69265125 5.29830048-7.04522939 5.29829918h-3.71062825v-13.76948449z m0.20890352 19.48706779h3.72095091c4.33734142 0 7.85037136 1.48592282 7.85037134 5.08595478 0 3.17337675-2.268945 5.30223199-7.23791363 5.30223199-2.06446361 0-3.51696274-0.21185378-4.33340862-0.42763908v-9.96054769zM2116.38985893 176.43599859999995l122.81448213-57.53858204 24.70967013 52.74165235-119.43465888 55.95533456c-6.32463373-15.89833972-17.82320681-35.95362697-28.08949338-51.15840487zM1994.98756919 411.11101367v-56.95512589h58.23951756V464.10728358c17.59365799 19.63747759 25.64654302 33.19019423 26.28554394 34.28435998l-50.21366637 29.50561728c-0.25314307-0.42419818-26.26686634-43.08192687-91.45822142-85.82026775l31.93185385-48.706117a471.00307653 471.00307653 0 0 1 25.21497244 17.74013758zM2241.93975608 217.35908483000003V346.55374414000005h-257.53748135v-129.19465931h58.23951756v70.95514304h141.05844623v-70.95514304zM2139.20562863 280.85512166h-58.24000819v-28.08162777c0-44.7315311-75.90641534-66.54849463-123.68057353-75.84644715l31.55238585-52.7686875c73.45265171 17.37148285 150.36819717 53.49469045 150.36819587 128.61513465v28.08162777zM2056.03524965 451.63792071l13.3433199-56.69166145a980.83380905 980.83380905 0 0 1 36.03817067 9.21291689c5.5332553-13.7267207 13.92972631-24.87777629 25.2572456-33.25704291 15.97944385-11.81758226 34.44656823-15.40188559 50.98587397-15.40188559 16.46213574 0.00196641 31.0067768 3.55726819 39.24005703 6.07788049 23.99005702 7.34261072 43.64228071 21.55398844 56.73540778 33.17298982l-28.80517366 53.29217677c-6.43375553-7.30132142-24.70819566-24.57253063-44.97533408-30.77575349-16.29992751-4.98568113-31.42605962-4.80528593-38.54502074 0.46057212-1.36402131 1.0086382-2.47637404 2.37315015-3.48550417 3.86792112 59.35137837 20.44655107 95.3497355 39.78222521 102.17426423 43.5724818l-34.68791416 47.51806744c-11.39780882-5.85767175-36.68208695-18.03063715-73.54358655-31.42556898V517.2800158800001h-58.23951758v-54.81938758c-13.06019402-3.72586627-26.84491522-7.37603569-41.49228824-10.82270759zM1914.59782605 412.27596218V470.51547844h-148.40793873a429.69609756 429.69609756 0 0 1 8.37926663 35.66706021l-57.21908226 10.88316642c-3.00281227-15.78921921-7.03785699-31.33512478-12.02746963-46.55022663h-84.74822048v-58.23951626h60.08967036c-21.91625332-41.72134643-51.55999265-79.43615777-87.53475553-110.66314459l38.17980689-43.98439222c12.77755877 11.09157932 24.80945185 22.93865505 36.15712321 35.36722054v-165.73420076h58.24000948v70.34858325h110.97183112v-10.21270823h-52.7667211l20.50946823-58.24000819h35.24974249c30.46510057 0 55.24702794 24.78438442 55.24702664 55.24702666V392.94225447h-158.81873717a440.61563921 440.61563921 0 0 1 9.09740653 19.33370771h169.40157332z m-188.89257263-156.42641752v10.30069412h110.97182985v-10.30069412h-110.97182985z m110.97182985 68.54119422h-110.97182985v10.31199803h110.97182985v-10.31199803zM302.74972899 463.01115142H229.06998551L166.54080697 370.93555822999997 127.30664913 463.01115142H53.07343228l69.99172565-164.25024436-0.07913772-0.60754234-12.80508454-101.22362654h64.71357854l12.39563245 96.06590773zM339.02433155 397.46588899c-55.01796974 0-105.62142806-46.21499687-112.80232247-103.01872779-3.55677627-28.13127331 3.95688957-54.36864748 21.15731601-73.88324104 16.23995932-18.42485124 39.35507676-28.57169205 65.08370776-28.57169205 55.01796974 0 105.62093615 46.21450496 112.80232247 103.01823588 3.55579371 28.13127331-3.95738149 54.36864748-21.15731731 73.88324103-16.23995932 18.42485124-39.35507676 28.57218397-65.08370646 28.57218397z m25.30639791-103.01872779c-2.9000803-22.91260246-22.45694571-41.55274836-43.59214453-41.55274837-9.71527024 0-18.53888841 3.93772003-24.84336876 11.0876465-7.03785699 7.98013716-10.22401343 19.2899601-8.7375987 31.02840466 2.9000803 22.91260246 22.45645507 41.55274836 43.59165263 41.55274836 9.72018559 0 18.54134544-3.93722812 24.83943724-11.08715588 7.03736507-7.97767884 10.22352149-19.28750177 8.74202212-31.02889527zM736.87459474 397.46588899c-55.01403824 0-105.61700334-46.21499687-112.80133991-103.01872779-3.55677627-28.12881628 3.95885597-54.36864748 21.16075819-73.88520744 16.24045124-18.42485124 39.35556868-28.56923502 65.08419968-28.56923502 55.01403824 0 105.61700334 46.21450496 112.80183052 103.01823717 3.55628563 28.12930691-3.95934789 54.36864748-21.16174072 73.88569805-16.23995932 18.42386868-39.35507676 28.56923502-65.08370776 28.56923503z m25.305906-103.01872779c-2.9000803-22.91260246-22.45645507-41.55274836-43.59214325-41.55274837-9.71527024 0-18.53888841 3.93772003-24.84287683 11.08518948-7.03589058 7.9825942-10.22008062 19.29438352-8.73366717 31.03086168 2.9000803 22.91260246 22.45645507 41.55274836 43.59214453 41.55274836 9.71527024 0 18.53888841-3.93722812 24.84287683-11.08715588 7.03589058-7.98013716 10.22008062-19.28946817 8.73366589-31.02889527zM602.41899275 371.45462276c-11.74385184 13.32759125-28.6552545 20.66676109-47.62178197 20.6667611-13.7247543 0-27.62449652-3.95099165-40.19118538-11.42238433l-3.97261821-2.36037176 10.71260194 84.67252365h-64.70915381l-33.65666557-266.08141324h64.70964704l15.16103158 119.8460774c1.68892842 13.34872718 13.92825184 24.2092832 27.28287692 24.20928318 6.56253878 0 12.43544726-2.56337607 16.53783258-7.21382746 4.14220013-4.69911309 5.96089436-10.93527029 5.1223287-17.55925174l-15.08631729-119.28228138h64.70964574l15.66780835 123.86047681c2.42820298 19.18624558-2.77965329 37.18149134-14.66605062 50.66440777zM1274.31261936 388.8860738l-15.16053965-119.84607737c-1.68892842-13.34872718-13.92825184-24.2092832-27.28386078-24.2092832-6.56204686 0-12.43495534 2.56091904-16.53684872 7.21186235-4.14220013 4.70157141-5.96089436 10.94018565-5.1223287 17.56170749l15.08582535 119.28228267h-64.71357855l-15.6633849-123.85801979c-2.4286949-19.19116094 2.77965329-37.18591477 14.66605192-50.66932312 11.74335993-13.32709934 28.65722091-20.66430276 47.62129005-20.66430407 13.72278789 0 27.62007309 3.95049972 40.18725256 11.42189371l3.9726195 2.36086239-1.33649554-10.54744605h64.71357982l24.27957275 191.95633693h-64.70915511zM859.61878604 463.01115142l-22.69829166-179.44912435h64.71357854l22.69878357 179.44912435zM867.49619122 267.22769201999995c-20.64021789 0-39.55611597-16.79687356-42.16471414-37.4439732-1.25784847-9.93547897 1.43086998-19.24375545 7.57068505-26.20837262 6.06657529-6.88154668 14.81056381-10.67082202 24.62315874-10.67082202 20.64021789 0 39.55562533 16.79687356 42.16471545 37.44348128 1.25735655 9.93597088-1.42890358 19.24375545-7.56626164 26.20640622-6.06903361 6.88351308-14.8159711 10.67328034-24.62758346 10.67328034zM1132.80687261 271.67612036c3.53465778 27.9282677-8.72236067 53.2120552-31.98690667 65.98174967l-3.56070907 1.95485118 3.54301402 1.98876677c21.46600384 12.05843629 36.03030635 33.08107243 38.95889627 56.23354637 2.13180549 16.84111182-2.2350281 32.79941974-12.29191792 44.93896144-9.87207119 11.91736528-24.30169252 19.03239358-40.63406115 20.03169298l-2.40559258 0.14549574 0.00933881 0.05947498h-130.44021872l-33.65568172-266.07944683 131.66021877 0.17203895c40.22706738 1.76216821 75.73929175 34.5173497 80.80361996 74.57286875z m-65.31276463 9.1603224c-1.9174934-15.19003182-15.84574522-27.54781714-31.04904995-27.54781584h-44.25867123l7.02900883 55.58864623h44.42186202c7.32393183-0.20939545 13.80929931-3.20680043 18.2926271-8.44070928 4.51871918-5.2781471 6.49421435-12.23883149 5.56422323-19.60012111z m13.4504753 102.67907462c-1.76855806-13.98723618-14.59527045-25.36538354-28.5913548-25.36538224h-46.90610037l6.48733259 51.29406988h46.3378822c6.87073341 0 13.01890473-2.68183668 17.30856572-7.54856528 4.33537501-4.92128951 6.24205513-11.4499114 5.36367466-18.38012236zM1350.42843016 109.80541729000004c36.28148303 0 71.85760838 22.80200618 88.52668125 56.73983123l109.84276592 222.34082528h-64.66098406L1431.07475725 281.47888457l-25.89182177 107.40718923h-65.0507747l47.22756788-195.90486893-2.93350527-5.94123292c-4.80430338-9.78113635-15.07943553-16.35399649-25.56789723-16.35399778-2.86714724 0-5.63893622 0.49055622-8.23967007 1.45741319l-12.20589844 4.52953246-27.68839752-57.57298959 11.81315882-4.3840367c8.78871872-3.2589043 18.17121754-4.91047493 27.89091121-4.91047624z"  horiz-adv-x="2415" />
+
+    
 
 
   </font>

 import $ from 'yoho-jquery';
 import Page from 'yoho-page';
+import tip from 'plugin/tip';
 
 class SelectGiftCard extends Page {
     constructor(order) {
@@ -45,6 +46,11 @@ class SelectGiftCard extends Page {
     useGiftCard() {
         let selectedGiftCards = [];
 
+        if (!this.selector.useGiftCardBtn.hasClass('active')) {
+            tip.show('请选择礼品卡');
+            return;
+        }
+
         this.selector.giftcard.each((index, elem) => {
             let theElem = $(elem);
 

@@ -11,6 +11,7 @@ $fontColor: #444;
 $fontGrayLight: #e0e0e0;
 $border-radius: 25px;
 $card-info-line-height: 44px;
+$card-title-height: 88px;
 
 .select-giftcard-page {
     @extend padding-30;
@@ -42,13 +43,17 @@ $card-info-line-height: 44px;
         margin-bottom: 30px;
 
         > .card-title {
-            height: 88px;
-            line-height: 88px;
+            height: $card-title-height;
+            line-height: $card-title-height;
             background-color: $title-bg-color;
             color: $title-font-color;
             border-top-left-radius: $border-radius;
             border-top-right-radius: $border-radius;
 
+            .balance {
+                height: $card-title-height;
+            }
+
             .balance > label {
                 margin-left: 30px;
                 font-size: 24px;
@@ -60,10 +65,11 @@ $card-info-line-height: 44px;
             }
 
             .logo {
-                margin-right: 30px;
+                height: $card-title-height;
+                margin-right: 27px;
 
                 .iconfont {
-                    font-size: 36px;
+                    font-size: 80px;
                 }
             }
         }