Merge remote-tracking branch 'origin/developerB' into developerB

src/main/resources/static/js/shopping/confirm.js

@@ -151,7 +151,6 @@ var shoppingConfirm = new Vue({
                         })
                         _self.couponList[0].ischecked = true;
                         _self.payInfo.orderShouldPayFee = data.totalPrice - _self.couponAmount;
-                        console.log('111111111',_self.payInfo.orderShouldPayFee)
                     }
                     _self.totalDiscountAmount =  _self.reducedPrice + _self.couponAmount;
                     if(data.invoice){
@@ -525,7 +524,6 @@ var shoppingConfirm = new Vue({
                                 console.log('有勾选余额抵扣部分抵',_self.payInfo.orderShouldPayFee)
                             }
                         }else{
-                            console.log('订单总额2222222',total)
                             _self.payInfo.orderShouldPayFee = ((_self.totalPrice*100 + _self.payInfo.freight*100 - _self.freightBeansMoney*100)/100) - _self.couponAmount;
                             console.log('无余额抵扣',_self.payInfo.orderShouldPayFee)
                         }
@@ -533,9 +531,9 @@ var shoppingConfirm = new Vue({
                 }else if(_self.payInfo.freePostFlag == -1){// 到付
                     _self.hanldUserBeans = _self.freightBeansMoney*100;
                     if(_self.balance.flag) {// 勾选了余额抵扣
-                        if(_self.balance.userMoney>=total){ // 全部抵扣
+                        if(_self.balance.userMoney >= total){ // 全部抵扣
                             _self.payInfo.orderShouldPayFee = 0;
-                            _self.balance.deductMoney = _self.totalPrice;  // 抵扣使用金额 = 订单总金额
+                            _self.balance.deductMoney = _self.totalPrice - _self.couponAmount;  // 抵扣使用金额 = 订单总金额
                             _self.balance.surplusMoney = _self.repiceNumSub(_self.balance.userMoney,_self.balance.deductMoney);  // 抵扣后剩余余额 = 余额总额 - 抵扣使用金额
                             console.log('到付有勾选余额抵扣全抵',_self.payInfo.orderShouldPayFee)
                         }else{ // 部分抵扣

src/main/resources/templates/account/login.html

@@ -36,7 +36,7 @@
                     <a href="/forget.html">忘记密码？</a>
                 </div>
                 <div class="submit clear">
-                    <a v-if="isPC" class="btn" href="/register.html" rel="nofollow">免费注册</a>
+                    <a v-if="isPC" class="btn" href="/register.html" rel="nofollow" onclick="_czc.push(['_trackEvent','登录页面','注册','点击','','Um_Event_Regirster'])">免费注册</a>
                     <button class="btn" type="button" @click="loginSubmit()">登录</button>
                     <a v-if="!isPC" class="btn" href="/register.html" rel="nofollow">免费注册</a>
                     <a v-if="!isPC && isWeChat" class="weChat" @click="weChatLogin()" href="javascript:void(0);">