Merge branch 'beta/wap' into develop/wap

@@ -13,6 +13,11 @@ use Plugin\Images;
 
 
 class CouponFloorProcess
 class CouponFloorProcess
 {
 {
+    // 兼容驼峰规则命名的 template_name,此处是以 templateName 命名的数据
+    private static $TEMPLATE_LIST = array(
+        'single_image',
+        'focus'
+    );
 
 
     /**
     /**
      * 获取楼层数据
      * 获取楼层数据
@@ -38,7 +43,7 @@ class CouponFloorProcess
                     continue;
                     continue;
                 }
                 }
             }
             }
-            if ($fun !== 'single_image') {
+            if (!in_array($fun, self::$TEMPLATE_LIST)) {
                 $fun = $v['template_name'];
                 $fun = $v['template_name'];
             }
             }
             if (empty($v['data']) || !is_callable("self::$fun")) {
             if (empty($v['data']) || !is_callable("self::$fun")) {
@@ -152,4 +157,22 @@ class CouponFloorProcess
         $data[0]['isSingleImage'] = true;
         $data[0]['isSingleImage'] = true;
         return $data[0];
         return $data[0];
     }
     }
+
+    /**
+     *
+     * 辅助方法 Debug 数据输出
+     *
+     * @param $data
+     * @param bool $is_exit 输出后是否中断执行
+     */
+    public static function debugOut($data, $is_exit = true)
+    {
+        header("Content-type:text/html;charset=utf-8");
+        echo '<pre>';
+        print_r($data);
+        echo '</pre>';
+        if ($is_exit) {
+            exit;
+        }
+    }
 }
 }

@@ -343,4 +343,7 @@ function phoneHidden(phone) {
 
 
 $('.info-phone').html(phoneHidden($('.info-phone').html()));
 $('.info-phone').html(phoneHidden($('.info-phone').html()));
 
 
-
+if (orderInfo('address').is_support === 'N') {
+    orderInfo('deliveryId', $('.delivery-id .icon-cb-radio').data('id'));
+    orderCompute();
+}

@@ -108,7 +108,6 @@ $(document).on('touchstart', '.collection', function() {
                     $icon.addClass('collected');
                     $icon.addClass('collected');
                 }
                 }
 
 
-                $that.find('.collected-num').html(data.num);
             }
             }
 
 
             if (code === 201) {
             if (code === 201) {

@@ -54,6 +54,29 @@ module.exports = function(useInRegister, useForBind, useForRelate) {
         });
         });
     }
     }
 
 
+    function startReg() {
+        $.ajax({
+            type: 'POST',
+            url: '/passport/' + urlMid + '/verifycode',
+            data: {
+                phoneNum: phoneNum,
+                areaCode: areaCode,
+                code: trim($captcha.val()),
+                token: $('#token').val()
+            },
+            success: function(data) {
+                if (data.code === 200) {
+                    location.href = data.data;
+                } else {
+
+                    //验证码不正确，显示提示
+                    showErrTip(data.message);
+                }
+
+            }
+        });
+    }
+
     function countDown() {
     function countDown() {
         var count = 59,
         var count = 59,
             itime;
             itime;
@@ -109,38 +132,11 @@ module.exports = function(useInRegister, useForBind, useForRelate) {
             return;
             return;
         }
         }
 
 
-        startBind();
-
-        // $.ajax({
-        //     type: 'POST',
-        //     url: useForBind ? '/passport/bind/checkBindMsg' : '/passport/' + urlMid + '/verifycode',
-        //     data: {
-        //         phoneNum: phoneNum,
-        //         areaCode: areaCode,
-        //         code: trim($captcha.val()),
-        //         token: $('#token').val()
-        //     },
-        //     success: function(data) {
-        //         if (data.code === 200) {
-        //             if (useForBind) {
-        //                 if (isReg) {
-        //                     startBind();
-        //                 } else {
-        //                     location.href = '/passport/bind/password?phoneNum=' +
-        //                     phoneNum + '&areaCode=' + areaCode + '&openId=' +
-        //                     openId + '&sourceType=' + sourceType + '&nickname=' + nickname;
-        //                 }
-        //             } else {
-        //                 location.href = data.data;
-        //             }
-        //         } else {
-        //
-        //             //验证码不正确，显示提示
-        //             showErrTip(data.message);
-        //         }
-        //
-        //     }
-        // });
+        if (useForBind || useForRelate) {
+            startBind();
+        } else {
+            startReg();
+        }
     });
     });
 
 
     countDown();
     countDown();

@@ -731,7 +731,7 @@
             }
             }
 
 
             .cont-txt {
             .cont-txt {
-                font-size: 30px;
+                font-size: 28px;
                 line-height: 46px;
                 line-height: 46px;
                 color: #b0b0b0;
                 color: #b0b0b0;
                 margin-top: 10px;
                 margin-top: 10px;
@@ -747,11 +747,17 @@
             }
             }
 
 
             .title {
             .title {
-                font-size: 42px;
+                font-size: 40px;
                 line-height: 48px;
                 line-height: 48px;
 
 
                 a {
                 a {
                     color: #fff;
                     color: #fff;
+                    width: 100%;
+                    overflow: hidden;
+                    text-overflow: ellipsis;
+                    display: -webkit-box;
+                    -webkit-line-clamp: 2;
+                    -webkit-box-orient: vertical;
                 }
                 }
             }
             }
 
 

@@ -5,7 +5,7 @@
         width: 74PX;
         width: 74PX;
         height: 74PX;
         height: 74PX;
         margin: 60PX auto 30PX;
         margin: 60PX auto 30PX;
-        background: image-url("passport/success.png");
+        background: resolve("passport/success.png");
         background-size: 100%;
         background-size: 100%;
     }
     }
 
 

@@ -51,7 +51,7 @@
                 {{#each dispatchMode}}
                 {{#each dispatchMode}}
                 <li {{#if isSelected}}class="chosed"{{/if}} data-id="{{id}}">
                 <li {{#if isSelected}}class="chosed"{{/if}} data-id="{{id}}">
                     <span>{{name}}：运费¥{{cost}}</span>
                     <span>{{name}}：运费¥{{cost}}</span>
-                    <i class="right iconfont {{#if isSelected}}icon-cb-radio{{else}}icon-radio{{/if}}"></i>
+                    <i class="right iconfont {{#if isSelected}}icon-cb-radio{{else}}icon-radio{{/if}}"  data-id="{{id}}"></i>
                 </li>
                 </li>
                 {{/each}}
                 {{/each}}
             </ul>
             </ul>

@@ -9,7 +9,7 @@
             <div class="count-area">
             <div class="count-area">
                 <span class="time"><i class="iconfont time-ico">&#xe603;</i>{{time}}</span>
                 <span class="time"><i class="iconfont time-ico">&#xe603;</i>{{time}}</span>
                 <span class="see"><i class="iconfont see-ico">&#xe602;</i>{{seeNum}}</span>
                 <span class="see"><i class="iconfont see-ico">&#xe602;</i>{{seeNum}}</span>
-                <span class="collection"><i class="iconfont collected-ico {{#isCollected}} collected {{/isCollected}}">&#xe605;</i><i class="collected-num">{{zanNum}}</i></span>
+                <span class="collection"><i class="iconfont collected-ico {{#isCollected}} collected {{/isCollected}}">&#xe605;</i></span>
                 {{# share}}
                 {{# share}}
                     <a href="{{this}}" class="iconfont forward">&#xe600;</a>
                     <a href="{{this}}" class="iconfont forward">&#xe600;</a>
                 {{/share}}
                 {{/share}}