Merge remote-tracking branch 'origin/developer' into developerE

src/main/resources/static/css/base/base.h5.css

@@ -230,9 +230,13 @@
 }
 /*采美豆弹窗样式*/
 .cmbeans-alert-box{width: 100%;height: 100%;display: flex;align-items: center;justify-content: center;flex-direction: column;position: fixed;left: 0;top: 0;background: rgba(51,51,51,0.5);z-index: 99999;}
+.cmbeans-alert-image{width: 87.2vw;height: 68.6vw;position: absolute;top: 0;left: 0;bottom: 0;right: 0;margin: auto;box-sizing: border-box;}
+.cmbeans-alert-image img{width: 87.2vw;height: 68.6vw;display: block;}
+.cmbeans-alert-image .mIcon{width:8vw;height:8vw;display: block;position: absolute;top: 45px;right: -3px;cursor: pointer;}
+.cmbeans-alert-image .mIcon:before{width:8vw;height:8vw;background-position:-34.1vw -77.9vw;}
 .cmbeans-alert-content{width: 71vw;height: 92vw;position: absolute;top: 0;left: 0;bottom: 0;right: 0;margin: auto;box-sizing: border-box;padding-top: 54.6vw;background-size: cover;}
-.cmbeans-alert-content .icon{width:30px;height:30px;display: block;position: absolute;top: 45px;right: -35px;cursor: pointer;}
-.cmbeans-alert-content .icon:before{width:33px;height:33px;background-position:-34.1vw -77.6vw;}
+.cmbeans-alert-content .mIcon{width:8vw;height:8vw;display: block;position: absolute;top: 45px;right: -35px;cursor: pointer;}
+.cmbeans-alert-content .mIcon:before{width:8vw;height:8vw;background-position:-34.1vw -77.9vw;}
 .cmbeans-alert-content-text{height: 14vw;line-height: 14vw;text-align: center;width: 100%;font-size: 4vw;color: #333333;}
 .cmbeans-alert-content-bean{width: 100%;height: 7.6vw;line-height: 7.6vw;box-sizing: border-box;display: flex;flex-direction: column;align-items: center;}
 .cmbeans-alert-content-bean .cmbeans-alert-icon{width: 9.2vw;height: 7.6vw;display: block;float: left;}

src/main/resources/static/css/base/base.pc.css

@@ -353,7 +353,11 @@ iframe{width:320px !important;height: 280px !important}
 .empty a{color:#E15616;}
 
 /*采美豆弹窗样式*/
-.cmbeans-alert-box{width: 100%;height: 100%;display: flex;align-items: center;justify-content: center;flex-direction: column;position: fixed;left: 0;top: 0;background: rgba(51,51,51,0.5);z-index: 99999;}
+.cmbeans-alert-box{width: 100%;height: 100%;display: flex;align-items: center;justify-content: center;flex-direction: column;position: fixed;left: 0;top: 0;background: rgba(51,51,51,0.7);z-index: 99999;}
+.cmbeans-alert-image{width: 404px;height: 342px;position: absolute;top: 0;left: 0;bottom: 0;right: 0;margin: auto;box-sizing: border-box;}
+.cmbeans-alert-image img{width: 404px;height: 342px;display: block;}
+.cmbeans-alert-image .icon{width:30px;height:30px;display: block;position: absolute;top: 45px;right: -35px;cursor: pointer;}
+.cmbeans-alert-image .icon:before{width:33px;height:33px;background-position:-197px -550px}
 .cmbeans-alert-content{width: 310px;height: 399px;position: absolute;top: 0;left: 0;bottom: 0;right: 0;margin: auto;box-sizing: border-box;padding-top: 238px;background-size: cover;}
 .cmbeans-alert-content .icon{width:30px;height:30px;display: block;position: absolute;top: 45px;right: -35px;cursor: pointer;}
 .cmbeans-alert-content .icon:before{width:33px;height:33px;background-position:-197px -550px}

src/main/resources/static/css/base/floor.css

@@ -40,7 +40,7 @@
 .section_page .page_main_price .main_price_none.sec{margin-top:25px}
 .section_page .page_main_price .main_price_none .listTag{margin:0}
 /*===================此行代码为申请证书时使用,后续可删除======================*/
-.section_page .page_main_price .price_grade{display: none !important;}
+.section_page .page_main_price .price_grade.service_none{display: none !important;}
 /*===================此行代码为申请证书时使用,后续可删除======================*/
 .section_page .page_main_price .price_grade,.section_page .page_main_price .price_grade_shop,.section_page .page_main_price .price_grade_club{float:left;margin:0;height:22px;line-height:22px;color:#4A4F58;font-style:normal;font-size:14px}
 .section_page .page_main_price .price_grade span,.section_page .page_main_price .price_grade_shop span,.section_page .page_main_price .price_grade_club span{display:inline-block;float:left}
@@ -122,7 +122,7 @@
 .section_page .page_main_item.ad_01.bottom{margin:2.4vw auto;display:block}
 .section_page .page_main_price .icon:before{width:15.8vw;height:5vw}
 /*===================此行代码为申请证书时使用,后续可删除======================*/
-.section_page .page_main_price .price_grade{display: none !important;}
+.section_page .page_main_price .price_grade.service_none{display: none !important;}
 /*===================此行代码为申请证书时使用,后续可删除======================*/
 .section_page .page_main_price .price_grade_1:before{background-position:-84vw -69.5vw}
 .section_page .page_main_price .price_grade_2:before{background-position:-84vw -76.5vw}

src/main/resources/static/js/account/register-club.js

@@ -216,7 +216,7 @@ var registerPage = new Vue({
                 _self.loginLoading = true;
                 UserApi.ClubUpgrade(_self.clubUpgradeUser,function (response) {
                     if(response.code === 0){
-                        CAIMEI.Alert('升级信息提交成功，审核通过后您的身份即成为会员机构并且获得20采美豆的奖励','确定',true,function () {
+                        CAIMEI.Alert('升级信息提交成功，审核通过后您的身份即成为会员机构并且获得500采美豆的奖励','确定',true,function () {
                             _self.clubLoginIndex();
                             _self.loginLoading = false;
                         });

src/main/resources/static/js/base.js

@@ -228,6 +228,11 @@ $(function(){
             window.location.reload();
         }
     });
+    //暂定
+    if(GLOBAL_USER_ID == 0){
+        $('.footLink').hide();
+        $('.footContact-code').hide();
+    }
     // 导航分类
     if(isPC){
         jqClickShow(".baseHeadTop .cTab", ".baseHeadTop .cShow");

src/main/resources/static/js/pay/caimei-success.js

@@ -17,21 +17,7 @@ var payContainer = new Vue({
     },
     filters: {
         NumFormat:function(value) {
-            if(!value) return '0.00';
-            var intPart = Number(value) - Number(value)%1; //获取整数部分（这里是windy93的方法）
-            var intPartFormat = intPart.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,'); //将整数部分逢三一断
-            var floatPart = ".00"; //预定义小数部分
-            var value2Array = value.toString().split(".");
-            if(value2Array.length == 2) {  //=2表示数据有小数位
-                floatPart = value2Array[1].toString(); //拿到小数部分
-                if(floatPart.length == 1) { //补0,实际上用不着
-                    return intPartFormat + "." + floatPart + '0';
-                } else {
-                    return intPartFormat + "." + floatPart;
-                }
-            } else {
-                return intPartFormat + floatPart;
-            }
+            return Number(value).toFixed(2);
         }
     },
     methods: {

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

@@ -76,6 +76,7 @@ var shoppingConfirm = new Vue({
         userBeans:0,
         freightBeansMoney:0,
         freightMoney:0,
+        deductionBeans:0,
         hanldUserBeans:0,
         submitLoading: false,
     },
@@ -140,7 +141,7 @@ var shoppingConfirm = new Vue({
                     _self.payInfo.orderShouldPayFee = _self.totalPrice + _self.payInfo.freight;
                     switch (_self.payInfo.freePostFlag) {
                         case 1:
-                            if( _self.userBeans >= r.data.freight*100 ){
+                            if( _self.userBeans > 0 ){
                                 _self.freightBeansMoney = r.data.freight;
                                 _self.freightMoney = r.data.freight;
                                 _self.isBeansShow = true;
@@ -149,11 +150,16 @@ var shoppingConfirm = new Vue({
                                 _self.balance.isFreight = false;
                                 _self.isBeansShow = false;
                             }
+                            if(r.data.userBeans >= _self.freightBeansMoney*100){
+                                _self.deductionBeans = _self.freightBeansMoney*100
+                            }else{
+                                _self.deductionBeans = _self.userBeans
+                            }
                             _self.changeDeductibleFreight();
                             break;
                         case -1:
-                            if( _self.userBeans >= 3000 ){
-                                _self.freightMoney = 30;
+                            if( _self.userBeans > 0 ){
+                                _self.freightMoney = '到付';
                                 _self.freightBeansMoney = 30;
                                 _self.isBeansShow = true;
                             }else{
@@ -161,6 +167,11 @@ var shoppingConfirm = new Vue({
                                 _self.balance.isFreight = false;
                                 _self.isBeansShow = false;
                             }
+                            if(r.data.userBeans >= _self.freightBeansMoney*100){
+                                _self.deductionBeans = _self.freightBeansMoney*100
+                            }else{
+                                _self.deductionBeans = _self.userBeans
+                            }
                             _self.changeDeductibleFreight();
                             break;
                     }
@@ -393,7 +404,7 @@ var shoppingConfirm = new Vue({
             $(el).parents('.priceTag').find('.tag').removeClass("on").siblings('.mFixed').hide();
             if(!isPC){looseBody();}
         },
-        useUserMoney: function(){
+        useUserMoney: function(){//勾选余额抵扣
             var _self = this;
             if(this.balance.userMoney>0){
                 this.$nextTick(function() {
@@ -404,15 +415,25 @@ var shoppingConfirm = new Vue({
                             _self.payInfo.orderShouldPayFee = 0;
                             if(_self.balance.isFreight){// 勾选了采美豆丢运费
                                 _self.balance.deductMoney = _self.totalPrice; // 抵扣使用金额 = 订单总金额
-                                _self.balance.surplusMoney = (_self.balance.userMoney*10 - _self.totalPrice*10)/10; // 抵扣后剩余余额 = 余额总额 - (订单总金额+邮费金额)
+                                _self.balance.surplusMoney = _self.repiceNumSub(_self.balance.userMoney,_self.totalPrice); // 抵扣后剩余余额 = 余额总额 - (订单总金额+邮费金额)
+                                console.log('余额全部抵扣勾选了采美豆运费',_self.balance.surplusMoney)
                             }else{
                                 _self.balance.deductMoney = total; // 抵扣使用金额 = 订单总金额 + 邮费金额
-                                _self.balance.surplusMoney = (_self.balance.userMoney*10 - _self.balance.deductMoney*10)/10; // 抵扣后剩余余额 = 余额总额 - 抵扣使用金额
+                                _self.balance.surplusMoney = _self.repiceNumSub(_self.balance.userMoney,_self.balance.deductMoney); // 抵扣后剩余余额 = 余额总额 - 抵扣使用金额
+                                console.log('余额全部抵扣未勾选了采美豆运费',_self.balance.surplusMoney)
                             }
                         }else{ // 部分抵扣
-                            _self.payInfo.orderShouldPayFee = total - _self.balance.userMoney; // 最终订单总价 = 订单总金额 - 余额总额
-                            _self.balance.deductMoney = _self.balance.userMoney; // 抵扣使用金额 = 余额总额
-                            _self.balance.surplusMoney = 0; // 抵扣后剩余余额 = 0
+                            if(_self.balance.isFreight){// 勾选了采美豆丢运费
+                                _self.payInfo.orderShouldPayFee = _self.repiceNumSub(_self.totalPrice,_self.balance.userMoney); // 最终订单总价 = 订单总金额 - 余额总额
+                                _self.balance.deductMoney = _self.balance.userMoney; // 抵扣使用金额 = 余额总额
+                                _self.balance.surplusMoney = 0; // 抵扣后剩余余额 = 0
+                                console.log('部分抵扣勾选了采美豆运费',_self.payInfo.orderShouldPayFee)
+                            }else{
+                                _self.payInfo.orderShouldPayFee = _self.repiceNumSub(total,_self.balance.userMoney); // 最终订单总价 = 订单总金额 - 余额总额
+                                _self.balance.deductMoney = _self.balance.userMoney; // 抵扣使用金额 = 余额总额
+                                _self.balance.surplusMoney = 0; // 抵扣后剩余余额 = 0
+                                console.log('部分抵扣没有勾选了采美豆运费',_self.payInfo.orderShouldPayFee)
+                            }
                         }
                     }else{// 取消抵扣
                         _self.payInfo.balancePayFlag = 0;
@@ -424,6 +445,7 @@ var shoppingConfirm = new Vue({
                         }else{
                             _self.payInfo.orderShouldPayFee = total; // 最终订单总价 = 订单总金额 + 邮费金额
                         }
+                        console.log('取消余额抵扣',_self.payInfo.orderShouldPayFee)
                     }
                 });
             }
@@ -431,41 +453,92 @@ var shoppingConfirm = new Vue({
         changeDeductibleFreight: function(){//选择采美豆抵扣邮费
             var _self = this;
             var total = _self.totalPrice + _self.payInfo.freight;
-            if(_self.balance.isFreight){
-                _self.hanldUserBeans = _self.freightBeansMoney*100;
-                if(_self.payInfo.freePostFlag == 1){
-                    if( _self.userBeans >= _self.payInfo.freight*100 ){
+            if(_self.balance.isFreight){//判断是否勾选运费
+                if(_self.payInfo.freePostFlag == 1){//有邮费
+                    _self.hanldUserBeans = _self.freightBeansMoney*100;
+                    if( _self.userBeans > 0 ){// 判断采美豆大于0
                         if(_self.balance.flag) {// 勾选了余额抵扣
+                            console.log('订单总额11111',total)
                             if(_self.balance.userMoney>=total){ // 全部抵扣
                                 _self.payInfo.orderShouldPayFee = 0;
                                 _self.balance.deductMoney = _self.totalPrice;  // 抵扣使用金额 = 订单总金额
-                                _self.balance.surplusMoney = (_self.balance.userMoney*10 - _self.balance.deductMoney*10)/10;  // 抵扣后剩余余额 = 余额总额 - 抵扣使用金额
+                                _self.balance.surplusMoney = _self.repiceNumSub(_self.balance.userMoney,_self.balance.deductMoney);  // 抵扣后剩余余额 = 余额总额 - 抵扣使用金额
+                                console.log('有勾选余额抵扣全抵',_self.payInfo.orderShouldPayFee)
                             }else{ // 部分抵扣
-                                _self.payInfo.orderShouldPayFee = total - _self.balance.userMoney;
+                                _self.payInfo.orderShouldPayFee = _self.repiceNumSub(_self.totalPrice,_self.balance.userMoney);
                                 _self.balance.deductMoney = _self.balance.userMoney; // 抵扣使用金额 = 余额总额
-                                _self.balance.surplusMoney = (_self.balance.userMoney*10 - _self.balance.deductMoney*10)/10; // 抵扣后剩余余额 = 余额总额 - 抵扣使用金额
+                                _self.balance.surplusMoney = _self.repiceNumSub(_self.balance.userMoney,_self.balance.deductMoney); // 抵扣后剩余余额 = 余额总额 - 抵扣使用金额
+                                console.log('有勾选余额抵扣部分抵',_self.payInfo.orderShouldPayFee)
                             }
                         }else{
+                            console.log('订单总额2222222',total)
                             _self.payInfo.orderShouldPayFee = (_self.totalPrice*100 + _self.payInfo.freight*100 - _self.freightBeansMoney*100)/100;
+                            console.log('无余额抵扣',_self.payInfo.orderShouldPayFee)
                         }
                     }
+                }else if(_self.payInfo.freePostFlag == -1){// 到付
+                    _self.hanldUserBeans = _self.freightBeansMoney*100;
+                    if(_self.balance.flag) {// 勾选了余额抵扣
+                        if(_self.balance.userMoney>=total){ // 全部抵扣
+                            _self.payInfo.orderShouldPayFee = 0;
+                            _self.balance.deductMoney = _self.totalPrice;  // 抵扣使用金额 = 订单总金额
+                            _self.balance.surplusMoney = _self.repiceNumSub(_self.balance.userMoney,_self.balance.deductMoney);  // 抵扣后剩余余额 = 余额总额 - 抵扣使用金额
+                            console.log('到付有勾选余额抵扣全抵',_self.payInfo.orderShouldPayFee)
+                        }else{ // 部分抵扣
+                            _self.payInfo.orderShouldPayFee = _self.repiceNumSub(_self.totalPrice,_self.balance.userMoney);
+                            _self.balance.deductMoney = _self.balance.userMoney; // 抵扣使用金额 = 余额总额
+                            _self.balance.surplusMoney = _self.repiceNumSub(_self.balance.userMoney,_self.balance.deductMoney); // 抵扣后剩余余额 = 余额总额 - 抵扣使用金额
+                            console.log('到付有勾选余额抵扣部分抵',_self.payInfo.orderShouldPayFee)
+                        }
+                    }else{
+                        _self.payInfo.orderShouldPayFee = _self.totalPrice ;
+                        console.log('到付未勾选余额抵扣',_self.payInfo.orderShouldPayFee)
+                    }
                 }else{
                     _self.hanldUserBeans = 0;
                     _self.payInfo.orderShouldPayFee = _self.totalPrice ;
+                    console.log('其他',_self.payInfo.orderShouldPayFee)
                 }
             }else{
+                console.log('未勾选采美豆抵扣')
                 _self.hanldUserBeans = 0;
-                if(_self.balance.flag) {//
+                if(_self.balance.flag) {//如果勾选了余额抵扣
                     if(_self.balance.userMoney>=total) { // 全部抵扣
+                        console.log('勾选采美豆抵扣=========》',total)
                         _self.payInfo.orderShouldPayFee = 0 ;
                         _self.balance.deductMoney = total; // 抵扣使用金额 = (订单总金额+邮费金额)
-                        _self.balance.surplusMoney = (_self.balance.userMoney*10 - _self.balance.deductMoney*10)/10; // 抵扣后剩余余额 = 余额总额 - 抵扣使用金额
+                        _self.balance.surplusMoney = _self.repiceNumSub(_self.balance.userMoney,_self.balance.deductMoney); // 抵扣后剩余余额 = 余额总额 - 抵扣使用金额
+                        console.log('余额全抵抵未勾选采美豆抵扣',_self.payInfo.orderShouldPayFee)
+                    }else{
+                        console.log('未勾选采美豆抵扣=========》',total)
+                        _self.payInfo.orderShouldPayFee = _self.repiceNumSub(total,_self.balance.userMoney) ;
+                        _self.balance.deductMoney = _self.balance.userMoney; // 抵扣使用金额 = (订单总金额+邮费金额)
+                        _self.balance.surplusMoney = _self.repiceNumSub(_self.balance.userMoney,_self.balance.deductMoney); // 抵扣后剩余余额 = 余额总额 - 抵扣使用金额
+                        console.log('余额部分抵未勾选采美豆抵扣',_self.payInfo.orderShouldPayFee)
                     }
                 }else{
                     _self.payInfo.orderShouldPayFee = _self.totalPrice + _self.payInfo.freight;
                 }
             }
         },
+        repiceNumSub: function(arg1, arg2) {//减法精确，arg2:被减数，arg1:减数
+            var r1,r2,m,n;
+            try{
+                r1=arg1.toString().split(".")[1].length
+            }catch(e){
+                r1=0
+            }
+            try{
+                r2=arg2.toString().split(".")[1].length
+            }catch(e){
+                r2=0
+            }
+            m=Math.pow(10,Math.max(r1,r2));
+            // last modify by deeka
+            // 动态控制精度长度
+            n=(r1>=r2)?r1:r2;
+            return ((arg1*m-arg2*m)/m).toFixed(n);
+        },
         submitOrder: function(){
             var _self = this;
             if(this.submitLoading){return false;}
@@ -550,6 +623,7 @@ var shoppingConfirm = new Vue({
             OrderApi.ConfirmOrder({'params':JSON.stringify(params)},function (r) {
                 if(r.code === 0){
                     var _data = r.data;
+                    debugger
                     if(Number(_data.code) === 1){//余额抵扣全部订单金额
                         var data = { payableAmount: _self.deductMoney };
                         CAIMEI.Storage.removeItem('confirmOrderInfo');

src/main/resources/static/js/user-center/account/beans.js

@@ -68,7 +68,8 @@ var orderPage = new Vue({
                     8:'系统发放',
                     9:'抵用退回',
                     10:'抵用运费',
-                    11:'退款回收'
+                    11:'退款回收',
+                    12:'登录奖励'
                 };
             Object.keys(stateTextObject).forEach(function(key){
                 if(key == state){

src/main/resources/static/js/user-center/order/detail.js

@@ -153,7 +153,7 @@ var orderPage = new Vue({
                 OrderApi.GetAffirmOrder({orderID:_self.orderId},function(response){
                     if(response.code == 0){
                         _self.beansType = 7;
-                        _self.beanNumber = 10;
+                        _self.beanNumber = 100;
                         _self.isShowBeansAlet = true;
                         _self.handInitType(_self.beansType);
                         _self.GetQueryOrderDetailsInfo();

src/main/resources/static/js/user-center/order/list.js

@@ -221,7 +221,7 @@ var orderPage = new Vue({
                 OrderApi.GetAffirmOrder({orderID:orderId},function(response){
                     if(response.code == 0){
                         _self.beansType = 7;
-                        _self.beanNumber = 10;
+                        _self.beanNumber = 100;
                         _self.isShowBeansAlet = true;
                         _self.handInitType(_self.beansType);
                         _self.GetQueryOrderListData();

src/main/resources/static/js/user-center/setting/upgrade.js

@@ -202,7 +202,7 @@ var upgradePage = new Vue({
                 _self.loginLoading = true;
                 UserApi.ClubUpgrade(params,function (response) {
                     if(response.code === 0){
-                        CAIMEI.Alert('升级信息提交成功，审核通过后您的身份即成为会员机构并且获得20采美豆的奖励','知道了',true,function () {
+                        CAIMEI.Alert('升级信息提交成功，审核通过后您的身份即成为会员机构并且获得500采美豆的奖励','知道了',true,function () {
                             _self.clubLoginIndex();
                             _self.loginLoading = false;
                         });

src/main/resources/templates/components/header.html

@@ -4,7 +4,7 @@
         <div class="wrap clear">
             <div class="header_top_left">欢迎来到采美采购服务平台</div>
             <ul class="header_top_ul">
-                <li class="headCart">
+                <li class="headCart" v-if="GLOBAL_USER_ID>0">
                     <a href="javascript:void(0)" class="addBtn icon" @click="goCartsLinkFn">购物车<em v-text="'('+headCart.cartCount+')'"></em></a>
                     <div class="cartData">
                         <div v-if="headCart.cartCount>0">

src/main/resources/templates/index.html

@@ -39,7 +39,7 @@
     <!--首页楼层主体数据-->
     <div class="section_container">
         <div class="inner">
-            <div id="sidebar" class="section_right">
+            <div id="sidebar" class="section_right"  v-if="userId>0">
                 <div class="box swiper-wrapper" >
                     <div class="section_right_item" th:if="${sideJson.get('liveList')}!=null and ${sideJson.get('liveList').size}>0">
                         <div class="right_item_title">
@@ -156,7 +156,7 @@
                                                                 </p>
                                                             </div>
                                                             <div class="main_price_none">
-                                                                <em class="price_grade"><span class="bold">￥</span><i th:attr="class=*{'icon mIcon price_grade_'+priceGrade}"></i></em>
+                                                                <em class="price_grade service_none"><span class="bold">￥</span><i th:attr="class=*{'icon mIcon price_grade_'+priceGrade}"></i></em>
                                                             </div>
                                                             <div class="main_price_login" th:attr="data-id=*{priceFlag}">
                                                                 <!--0公开价格 1不公开价格 2仅对会员机构公开-->
@@ -175,7 +175,7 @@
                                                         <!-- 二手商品 -->
                                                         <th:block th:if="*{productCategory}!=1">
                                                             <div class="main_price_none sec">
-                                                                <em class="price_grade"><span>￥</span>登录可见</em>
+                                                                <em class="price_grade service_none"><span>￥</span>登录可见</em>
                                                             </div>
                                                             <div class="main_price_login" data-id="3" v-if="userId>0">
                                                                 <div class="price_text_tag"></div>

src/main/resources/templates/product/instrument.html

@@ -108,7 +108,7 @@
                                                             </p>
                                                         </div>
                                                         <div class="main_price_none">
-                                                            <em class="price_grade"><span class="bold">￥</span><i th:attr="class=*{'icon mIcon price_grade_'+priceGrade}"></i></em>
+                                                            <em class="price_grade service_none"><span class="bold">￥</span><i th:attr="class=*{'icon mIcon price_grade_'+priceGrade}"></i></em>
                                                         </div>
                                                         <div class="main_price_login" th:attr="data-id=*{priceFlag}">
                                                             <!--0公开价格 1不公开价格 2仅对会员机构公开-->
@@ -127,7 +127,7 @@
                                                     <!-- 二手商品 -->
                                                     <th:block th:if="*{productCategory}!=1">
                                                         <div class="main_price_none sec">
-                                                            <em class="price_grade"><span>￥</span>登录可见</em>
+                                                            <em class="price_grade service_none"><span>￥</span>登录可见</em>
                                                         </div>
                                                         <div class="main_price_login" data-id="3" v-if="userId>0">
                                                             <div class="price_text_tag"></div>

src/main/resources/templates/shopping/confirm.html

@@ -299,7 +299,8 @@
             <p v-if="balance.deductMoney>0">抵扣账户余额: <span><em>- ¥{{balance.deductMoney | NumFormat}}</em></span></p>
             <p>总价: <span><em>¥{{payInfo.orderShouldPayFee | NumFormat}}</em></span></p>
             <p class="pis" v-if="isBeansShow">
-                可用{{ freightMoney*100 }}采美豆抵用{{ freightMoney }}元运费
+                <span v-if="payInfo.freePostFlag == 1">可用{{ deductionBeans }}采美豆抵用{{ freightMoney }}元运费</span>
+                <span v-if="payInfo.freePostFlag == -1">可用{{ deductionBeans }}采美豆抵用{{ freightMoney }}运费</span>
                 <span>
                     <label class="check">
                         <input v-model="balance.isFreight" name="useBalance" type="checkbox" @change="changeDeductibleFreight()">

src/main/resources/templates/user-center/dashboard.html

@@ -163,23 +163,31 @@
         </div>
         <!-- 采美豆弹窗 -->
         <div class="cmbeans-alert-box" v-if="isShowBeansAlet">
-            <div class="cmbeans-alert-content" :style="{'background-image': 'url('+bgImagePath+')'}">
-                <div class="cmbeans-alert-content-text">恭喜您获得采美豆！</div>
-                <div class="cmbeans-alert-content-bean">
-                    <div class="cmbeans-alert-main">
-                        <img v-if="isPC" class="cmbeans-alert-icon" src="/img/account/bean-icon@3x.png" mode="">
-                        <img v-else class="cmbeans-alert-icon" src="/img/account/bean-icon-h5@3x.png" mode="">
-                        <div class="cmbeans-alert-text">
-                            <span class="icon-add">+</span>
-                            <span class="icon-text">{{ beanNumber }}</span>
+            <template v-if="beansType == 12">
+                <div class="cmbeans-alert-image">
+                    <img src="/img/account/icon-beans-12@2x.png" alt="">
+                    <i class="icon mIcon" @click.stop="handleClickCancel"></i>
+                </div>
+            </template>
+            <template v-else>
+                <div class="cmbeans-alert-content" :style="{'background-image': 'url('+bgImagePath+')'}">
+                    <div class="cmbeans-alert-content-text">恭喜您获得采美豆！</div>
+                    <div class="cmbeans-alert-content-bean">
+                        <div class="cmbeans-alert-main">
+                            <img v-if="isPC" class="cmbeans-alert-icon" src="/img/account/bean-icon@3x.png" mode="">
+                            <img v-else class="cmbeans-alert-icon" src="/img/account/bean-icon-h5@3x.png" mode="">
+                            <div class="cmbeans-alert-text">
+                                <span class="icon-add">+</span>
+                                <span class="icon-text">{{ beanNumber }}</span>
+                            </div>
                         </div>
                     </div>
+                    <div class="cmbeans-alert-content-tips">
+                        <div class="tips">采美豆可抵扣运费</div>
+                    </div>
+                    <i class="icon mIcon" @click.stop="handleClickCancel"></i>
                 </div>
-                <div class="cmbeans-alert-content-tips">
-                    <div class="tips">采美豆可抵扣运费</div>
-                </div>
-                <i class="icon mIcon" @click.stop="handleClickCancel"></i>
-            </div>
+            </template>
         </div>
     </div>
     <!--loading-->

src/main/resources/templates/user-center/operation/list.html

@@ -69,7 +69,7 @@
                                 </div>
                                 <div class="td td-4">{{item.effectiveDays > 0 ? item.effectiveDays+'天': '- -'}}</div>
                                 <div class="td td-5" :style="{color: statusColorFn(item.status)}">{{item.status | stateExp}}</div>
-                                <div class="td td-6">{{item.nickName}}</div>
+                                <div class="td td-6">{{item.nickName ? item.nickName : '- -'}}</div>
                                 <div class="td td-7">{{item.addTime}}</div>
                                 <div class="td td-8">{{item.bindTime}}</div>
                                 <div class="td td-9">