Merge branch 'feature/expandNew' into 'release/5.9'

Feature/expand new



See merge request !706

@@ -7,7 +7,12 @@
         </p>
         </p>
         <p class="detail-item">
         <p class="detail-item">
             <span>奖励状态</span>
             <span>奖励状态</span>
-            <span>{{couponStatusDesc}}</span>
+            <span>
+                {{couponStatusDesc}}
+                {{#if paymentStatusDesc}}
+                <i class="status-reason iconfont" data-reason="{{paymentStatusDesc}}">&#xe699;</i>
+                {{/if}}
+            </span>
         </p>
         </p>
         <p class="detail-item">
         <p class="detail-item">
             <span>发放时间</span>
             <span>发放时间</span>
@@ -32,14 +37,6 @@
             <span>{{firstOrderTimeDis}}</span>
             <span>{{firstOrderTimeDis}}</span>
         </div>
         </div>
         <div class="releated-item">
         <div class="releated-item">
-            <span>订单类型</span>
-            <span>{{paymentTypeDis}}</span>
-        </div>
-        <div class="releated-item">
-            <span>订单状态</span>
-            <span>{{paymentStatusDesc}}</span>
-        </div>
-        <div class="releated-item">
             <span>确认收货时间</span>
             <span>确认收货时间</span>
             <span>{{confirmReceiptTimeDis}}</span>
             <span>{{confirmReceiptTimeDis}}</span>
         </div>
         </div>

@@ -2,7 +2,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
 <svg xmlns="http://www.w3.org/2000/svg">
 <svg xmlns="http://www.w3.org/2000/svg">
 <metadata>
 <metadata>
-Created by FontForge 20120731 at Mon Apr 17 18:36:51 2017
+Created by FontForge 20120731 at Tue Jul  4 10:11:46 2017
  By admin
  By admin
 </metadata>
 </metadata>
 <defs>
 <defs>
@@ -19,7 +19,7 @@ Created by FontForge 20120731 at Mon Apr 17 18:36:51 2017
     bbox="-0.75 -212 3943 896.75"
     bbox="-0.75 -212 3943 896.75"
     underline-thickness="0"
     underline-thickness="0"
     underline-position="0"
     underline-position="0"
-    unicode-range="U+0078-E705"
+    unicode-range="U+0078-E70D"
   />
   />
 <missing-glyph 
 <missing-glyph 
  />
  />
@@ -287,6 +287,10 @@ q3 -7 7.5 -12.5t8 -10t8.5 -10t7.5 -8t8 -7t7.5 -6.5t7.5 -6.5t6.5 -4.5q11 -9 16.5
 d="M911 725h-242v123q0 21 -13.5 34.5t-34.5 13.5h-246q-20 0 -33.5 -13.5t-13.5 -34.5v-123h-246q-21 0 -34.5 -13.5t-13.5 -34t13.5 -34t34.5 -13.5h293h243h293q21 0 34.5 13.5t13.5 34t-13.5 34t-34.5 13.5zM423 725v72h147v-72h-147zM765 579q-21 0 -34.5 -14
 d="M911 725h-242v123q0 21 -13.5 34.5t-34.5 13.5h-246q-20 0 -33.5 -13.5t-13.5 -34.5v-123h-246q-21 0 -34.5 -13.5t-13.5 -34t13.5 -34t34.5 -13.5h293h243h293q21 0 34.5 13.5t13.5 34t-13.5 34t-34.5 13.5zM423 725v72h147v-72h-147zM765 579q-21 0 -34.5 -14
 t-13.5 -34v-560h-441v560q0 20 -13.5 34t-34 14t-34 -14t-13.5 -34v-611q0 -21 13.5 -34.5t34.5 -13.5h536q20 0 33.5 13.5t13.5 34.5v611q3 20 -11.5 34t-35.5 14zM447 67v389q0 20 -13.5 33.5t-34 13.5t-34 -13.5t-13.5 -33.5v-389q0 -21 13.5 -34.5t34 -13.5t34 13.5
 t-13.5 -34v-560h-441v560q0 20 -13.5 34t-34 14t-34 -14t-13.5 -34v-611q0 -21 13.5 -34.5t34.5 -13.5h536q20 0 33.5 13.5t13.5 34.5v611q3 20 -11.5 34t-35.5 14zM447 67v389q0 20 -13.5 33.5t-34 13.5t-34 -13.5t-13.5 -33.5v-389q0 -21 13.5 -34.5t34 -13.5t34 13.5
 t13.5 34.5zM645 67v389q0 20 -13.5 33.5t-34.5 13.5q-20 0 -35.5 -13.5t-15.5 -33.5v-389q0 -21 13.5 -34.5t34.5 -13.5t36 13.5t15 34.5z" />
 t13.5 34.5zM645 67v389q0 20 -13.5 33.5t-34.5 13.5q-20 0 -35.5 -13.5t-15.5 -33.5v-389q0 -21 13.5 -34.5t34.5 -13.5t36 13.5t15 34.5z" />
+    <glyph glyph-name="wenhao" unicode="&#xe699;" 
+d="M512 886q-102 0 -195 -39.5t-160.5 -107t-107 -160.5t-39.5 -195t39.5 -195t107 -160.5t160.5 -107t195 -39.5t195 39.5t160.5 107t107 160.5t39.5 195t-39.5 195t-107 160.5t-160.5 107t-195 39.5zM521 -15q-34 0 -58.5 24t-24.5 58.5t24.5 58.5t58.5 24t58 -24t24 -58
+q1 -34 -23.5 -58.5t-58.5 -24.5zM738 477q-17 -34 -67 -83q-45 -43 -60 -61q-12 -16 -17 -35q-6 -22 -6 -61l1 -31h-142v30q0 56 9 90q11 38 30 64q17 23 62 71q43 44 52 60q8 13 8 44q0 28 -20 51q-20 21 -61 21q-29 0 -48.5 -9.5t-28.5 -27.5t-12.5 -36t-3.5 -43v-30h-142
+l1 31q2 72 18 111q16 40 52 73q34 31 78 46q41 14 88 14q96 0 160 -56v0q66 -59 66 -154q0 -43 -17 -79z" />
     <glyph glyph-name="2" unicode="&#xe64d;" 
     <glyph glyph-name="2" unicode="&#xe64d;" 
 d="M562 224h109v-111h-109v111zM889 224h109v-111h-109v111zM562 113h109v-110h-109v110zM438 458h-438v438h438v-438zM111 569h216v216h-216v-216zM1000 458h-438v438h438v-438zM673 569h216v216h-216v-216zM438 -106h-438v438h438v-438zM111 5h216v216h-216v-216zM561 335
 d="M562 224h109v-111h-109v111zM889 224h109v-111h-109v111zM562 113h109v-110h-109v110zM438 458h-438v438h438v-438zM111 569h216v216h-216v-216zM1000 458h-438v438h438v-438zM673 569h216v216h-216v-216zM438 -106h-438v438h438v-438zM111 5h216v216h-216v-216zM561 335
 h222v-111h-222v111zM889 334h109v-111h-109v111zM780 113h109v-111h-109v111zM562 2h218v-110h-218v110zM889 2h109v-110h-109v110z" />
 h222v-111h-222v111zM889 334h109v-111h-109v111zM780 113h109v-111h-109v111zM562 2h218v-110h-218v110zM889 2h109v-110h-109v110z" />
@@ -303,5 +307,12 @@ q-2 2 -6 2zM512 497q-9 0 -13 2q-15 5 -22.5 19.5t-1.5 30.5l107 321q5 15 19.5 22.5
     <glyph glyph-name="shop" unicode="&#xe705;" horiz-adv-x="1077" 
     <glyph glyph-name="shop" unicode="&#xe705;" horiz-adv-x="1077" 
 d="M1062 573l-97 251q-12 38 -31.5 55t-55.5 17h-689q-35 0 -51.5 -18t-27.5 -54l-100 -251q-10 -34 -10 -71q0 -61 30 -113.5t80 -81.5l3 -2q42 -23 97 -23q46 0 88 21t71 58q5 5 10 0q29 -37 71 -58t88 -21q91 0 158 79q5 5 11 0q29 -37 71 -58t90 -21q57 0 100 23
 d="M1062 573l-97 251q-12 38 -31.5 55t-55.5 17h-689q-35 0 -51.5 -18t-27.5 -54l-100 -251q-10 -34 -10 -71q0 -61 30 -113.5t80 -81.5l3 -2q42 -23 97 -23q46 0 88 21t71 58q5 5 10 0q29 -37 71 -58t88 -21q91 0 158 79q5 5 11 0q29 -37 71 -58t90 -21q57 0 100 23
 q50 29 80 81t30 113q-14 69 -16 74zM960 225q-47 -25 -97 -25q-92 0 -159 79q-5 5 -10 0q-60 -79 -156 -79q-46 0 -86.5 21t-70.5 58q-5 5 -10 0q-59 -79 -156 -79q-54 0 -95 25l-2 3q-8 8 -16 10v-264q0 -40 28 -71t65 -31h683q38 0 65 30t27 72v264q0 -8 -10 -13z" />
 q50 29 80 81t30 113q-14 69 -16 74zM960 225q-47 -25 -97 -25q-92 0 -159 79q-5 5 -10 0q-60 -79 -156 -79q-46 0 -86.5 21t-70.5 58q-5 5 -10 0q-59 -79 -156 -79q-54 0 -95 25l-2 3q-8 8 -16 10v-264q0 -40 28 -71t65 -31h683q38 0 65 30t27 72v264q0 -8 -10 -13z" />
+    <glyph glyph-name="phone1" unicode="&#xe70a;" horiz-adv-x="1026" 
+d="M1011 45l-65 -113q-14 -24 -38 -38.5t-41 -17.5l-17 -3q-144 -8 -297 53t-284 183q-148 144 -217.5 318t-45.5 332q32 43 59 60l49 26l10 6l54 32q36 20 75 9.5t59 -47.5l108 -193q17 -37 21.5 -64t-3 -44.5t-16.5 -28t-26 -24t-25 -22.5l-16 -5q-4 -30 5.5 -59t32.5 -48
+l91 -92q21 -20 50.5 -30.5t57.5 -6.5l10 16q3 2 13 14t17 19t23 16t32.5 11.5t42.5 -1.5t55 -16l188 -113q36 -16 47 -54.5t-9 -74.5z" />
+    <glyph glyph-name="point" unicode="&#xe70c;" 
+d="M896 508q0 105 -51 194.5t-139.5 141.5t-193.5 52t-193.5 -52t-139.5 -141.5t-51 -194.5q0 -127 73 -226l311 -410l311 414q73 92 73 222zM512 384q-48 0 -81.5 34.5t-33.5 84.5q0 49 33.5 84.5t81.5 35.5t81.5 -34.5t33.5 -85t-33.5 -85t-81.5 -34.5z" />
+    <glyph glyph-name="time" unicode="&#xe70d;" 
+d="M512 896q-138 0 -256 -69t-187 -187t-69 -256t69 -256t187 -187t256 -69t256 69t187 187t69 256t-69 256t-187 187t-256 69zM717 282h-307v460h102v-358h205v-102z" />
   </font>
   </font>
 </defs></svg>
 </defs></svg>

 'use strict';
 'use strict';
 require('activity/reward-detail.page.css');
 require('activity/reward-detail.page.css');
+
+let $ = require('yoho-jquery');
+let dialog = require('plugin/dialog');
+
+$('.status-reason').click(function() {
+    dialog.showDialog({
+        dialogText: $(this).data('reason'),
+        hasFooter: {
+            centerBtnText: '我知道了'
+        }
+    });
+});

@@ -18,6 +18,11 @@
         }
         }
     }
     }
 
 
+    .status-reason {
+        font-size: 26px;
+        margin-left: 5px;
+    }
+
     .reward-related {
     .reward-related {
         background-color: #f0f0f0;
         background-color: #f0f0f0;
         padding-top: 20px;
         padding-top: 20px;