采美豆

src/main/resources/config/dev/application-dev.yml

@@ -53,10 +53,10 @@ logging:
 # 服务域名
 caimei:
   siteEnv: 0 #网站环境，（2：正式环境，1：测试环境，0：开发环境）
-  spiServer: https://spi-b.caimei365.com
-#  spiServer: http://192.168.2.67:8008
-  coreServer: https://core-b.caimei365.com
-#  coreServer: http://192.168.2.67:18002
+#  spiServer: https://spi-b.caimei365.com
+  spiServer: http://192.168.2.67:8008
+#  coreServer: https://core-b.caimei365.com
+  coreServer: http://192.168.2.67:18002
   imageDomain: https://img-b.caimei365.com
   wwwDomain: http:localhost:8009
   destPath: D:/_PLAN_WORKSPACE/test/static

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

@@ -225,4 +225,18 @@
     width: 20.1vw;
     display: inline-block;
 }
+/*采美豆弹窗样式*/
+.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-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-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;}
+.cmbeans-alert-content-bean .cmbeans-alert-text{color: #E15616;line-height: 7.6vw;float: left;font-size: 5.4vw;}
+.cmbeans-alert-content-bean .icon-add{margin-left: 2.5vw;}
+.cmbeans-alert-content-bean .icon-text{font-weight: bold;}
+.cmbeans-alert-content-tips{width: 100%;height: 5.6vw;line-height: 5.6vw;margin-top: 4vw;box-sizing: border-box;display: flex;flex-direction: column;align-items: center;}
+.cmbeans-alert-content-tips .tips{width: 27.2vw;height: 5.6vw;background-color: rgba(226, 91, 28, 0.1);border-radius: 2.8vw;line-height: 5.6vw;font-size: 2.6vw;color: #E15616;text-align: center;padding: 0 1.2vw;}
+
 

src/main/resources/static/css/shopping/shopping.css

@@ -169,6 +169,7 @@ li{list-style:none}
     .balanceWrap .text .red{color:#FF2A2A}
     .totalPriceWrap{line-height:36px;text-align:right;padding:16px}
     .totalPriceWrap span{display:inline-block;width:200px}
+    .totalPriceWrap .pis{color: #E15616;}
     .totalPriceWrap span em{font-style:normal;color:#FF2A2A}
     /* 发票 */
     .invoiceWrap{padding:16px;text-align:left}

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

@@ -19,14 +19,14 @@ li{list-style:none}
     .beans-content-tabs{width: 100%;height: 96px;box-sizing: border-box;padding:0 24px;}
     .beans-content-tabs .tabs-main{width: 100%;height:100%;border-bottom: 1px solid #e2e7ef;box-sizing: border-box;padding:33px 0; position: relative;}
     .beans-content-tabs .time-template{width: 184px;height: 100%;margin: 0 auto;}
-    .beans-content-tabs .time-template .time-pre{width: 30px;height: 100%;float: left;display: block;}
+    .beans-content-tabs .time-template .time-pre{width: 30px;height: 100%;float: left;display: block;cursor: pointer;}
     .beans-content-tabs .time-template .time-pre .icon{width:30px;height:30px;display: block;}
     .beans-content-tabs .time-template .time-pre .icon:before{width:30px;height:30px;background-position:-269px -550px}
     .beans-content-tabs .time-template .time-text{width: 124px;height: 100%;float: left;line-height: 30px;text-align: center;font-size: 16px;color: #22272e;}
-    .beans-content-tabs .time-template .time-next{width: 30px;height: 100%;float: left;display: block;}
+    .beans-content-tabs .time-template .time-next{width: 30px;height: 100%;float: left;display: block;cursor: pointer;}
     .beans-content-tabs .time-template .time-next .icon{width:30px;height:30px;display: block;}
     .beans-content-tabs .time-template .time-next .icon:before{width:30px;height:30px;background-position:-311px -550px}
-    .beans-content-tabs .time-tabs{width: 216px;height:30px;position: absolute;right: 0;top: 33px;}
+    .beans-content-tabs .time-tabs{width: 216px;height:30px;position: absolute;right: 0;top: 33px;cursor: pointer;}
     .beans-content-tabs .time-tabs-cell{width: 72px;height: 100%;float: left;text-align: center;font-size: 14px;color: #22272e;line-height: 30px;display: block;}
     .beans-content-tabs .time-tabs-cell.active{color: #E15616;}
 
@@ -44,8 +44,36 @@ li{list-style:none}
 * 移动端
 */
 @media screen and (max-width:768px){
-    .beans-header{box-sizing:border-box;width:100%;padding:2.7vw;background:#fff;position:relative}
+    .beans-header{width:100%;height:28vw;box-sizing:border-box;padding:4vw 8vw;background:url("/img/account/icon-beans-bg.png")no-repeat;background-size: cover;}
+    .beans-header-l{float: left;line-height: 10vw;color: #FFFFFF;font-size:3.2vw;}
+    .beans-header-l span{display: inline-block;width: 100%;height: 10vw;float: left;}
+    .beans-header-l span.big{font-size: 7.2vw;font-weight: bold;}
+    .beans-header-r{float: right;line-height:20vw;}
+    .beans-header-r a{color: #FFFFFF;font-size: 3vw;}
+    .beans-header-r a .icon{width:4vw;height:4vw;display: block;float: right;margin-left: 1vw;}
+    .beans-header-r a .icon:before{width:4vw;height:4vw;background-position:-44.6vw -78.3vw;}
+    .beans-container{width: 100%;min-height: 50vw;background-color: #FFFFFF;margin-top:2vw;}
+    .beans-content-tabs{width: 100%;height: auto;box-sizing: border-box;padding:0 3.4vw;}
+    .beans-content-tabs .tabs-main{width: 100%;height:100%;border-bottom: 1px solid #e2e7ef;box-sizing: border-box;padding-top: 6.4vw;position: relative;float: left;}
+    .beans-content-tabs .time-template{width: 100%;height: 6.7vw;float: left;box-sizing: border-box;padding: 0 25vw;}
+    .beans-content-tabs .time-template .time-pre{width: 6.7vw;height: 6.7vw;float: left;display: block;}
+    .beans-content-tabs .time-template .time-pre .icon{width:6.7vw;height:6.7vw;display: block;}
+    .beans-content-tabs .time-template .time-pre .icon:before{width:6.7vw;height:6.7vw;background-position:-51.2vw -78.3vw}
+    .beans-content-tabs .time-template .time-text{width: 28.4vw;height: 6.7vw;float: left;line-height: 6.7vw;text-align: center;font-size: 3.4vw;color: #22272e;}
+    .beans-content-tabs .time-template .time-next{width: 6.7vw;height: 6.7vw;float: left;display: block;}
+    .beans-content-tabs .time-template .time-next .icon{width:6.7vw;height:6.7vw;display: block;}
+    .beans-content-tabs .time-template .time-next .icon:before{width:6.7vw;height:6.7vw;background-position:-60.4vw -78.3vw}
+    .beans-content-tabs .time-tabs{width:100%;height:9.6vw;float: left;margin-top: 3.6vw;}
+    .beans-content-tabs .time-tabs-cell{width: 33.3%;height: 100%;float: left;text-align: center;font-size: 4vw;color: #22272e;line-height: 9.6vw;display: block;}
+    .beans-content-tabs .time-tabs-cell.active{color: #E15616;font-weight: bold;}
 
+    .beans-content-list{width: 100%;height: auto;box-sizing: border-box;padding:3.4vw;float: left;}
+    .beans-content-list .beans-list-cell{width: 100%;height: 10.7vw;box-sizing: border-box;float: left;margin-bottom: 6.4vw;}
+    .beans-content-list .list-cell-left{width: 50%;height: 10.7vw;float: left;text-align: left;}
+    .beans-content-list p{width: 100%;height: 4.7vw;float: left;line-height:  4.7vw;font-size: 3.6vw;color: #22272e;margin-bottom: 2vw;}
+    .beans-content-list p.none{color: #627386;font-size: 3.2vw;line-height: 4.2vw;}
+    .beans-content-list p.blod{font-weight: bold;line-height: 4.2vw;}
+    .beans-content-list .list-cell-right{width: 50%;height:10.7vw;float: right;text-align: right;}
 
 
 }

src/main/resources/static/css/user-center/dashboard.css

@@ -103,18 +103,27 @@ li{list-style:none}
     .user-header .logo .file{position:absolute;top:5vw;left:9vw;width:9vw;height:9vw}
     .user-header .logo .file:before{width:9vw;height:9vw;background-position:-7.5vw -60.3vw}
     .user-header .logo img{max-width:100%;max-height:100%;display:block;margin:0 auto;}
-    .user-header .account{width:64vw;height:19.4vw;box-sizing:border-box;color:#9aa5b5;font-size:3.1vw;line-height:6.4vw;position:relative}
+    .user-header .account{width:64vw;height:quto;box-sizing:border-box;color:#9aa5b5;font-size:3.1vw;line-height:6.4vw;position:relative}
     .user-header .account .name{font-size:3.7vw;color:#22272e}
     .user-header .account em{font-style:normal;color:#e15616}
     .user-header .account .name a,.user-header .account .msg a{display:inline-block;height:5.4vw;line-height:5.4vw;padding:0 2vw;color:#FFF;border-radius:2px;margin-left:2vw}
-    .user-header .account .name a{background-color:#e15616}
+    .user-header .account .name a{background-color:#e15616;position: relative;}
+    .user-header .account .name a .name-tips{width: 11.6vw;height: 4.8vw;line-height: 4.8vw;text-align: center;border-radius: 2.4vw;background-color: #ffe6dc;font-size: 12px;color: #E15616;position: absolute;right: -20px;top: -25px;z-index: 99;}
+    .user-header .account .name a .name-tips:before{content: '';width: 6px;height: 6px;background-color: #ffe6dc;position: absolute;bottom: -3px;left: 12px;z-index: -1;transform:rotate(45deg);}
     .user-header .account .msg a{background-color:#313a43}
+    .user-header .account .upgrade{margin-top: 6.5vw;}
+    .user-header .account .upgrade a{position: relative;width: 32.6vw;height: 8.5vw;display: block; background-color:#ffe6dc;box-sizing: border-box;border: 1px solid #E15616;line-height: 8.5vw;text-align: center;color: #E15616;font-size: 3.4vw;border-radius: 4.25vw;}
+    .user-header .account .upgrade a .name-tips{width: 12.6vw;height: 4.8vw;line-height: 4.8vw;text-align: center;border-radius: 2.4vw;background-color: #ffe6dc;font-size: 2.8vw;color: #E15616;position: absolute;right: -2vw;top: -6.5vw;z-index: 99;}
+    .user-header .account .upgrade a .name-tips:before{content: '';width: 6px;height: 6px;background-color: #ffe6dc;position: absolute;bottom: -3px;left: 12px;z-index: -1;transform:rotate(45deg);}
     .user-header .message{position:absolute;right:0;top:5vw}
     .user-header .message .mIcon{position:absolute;right:0;top:0}
     .user-header .message .mIcon:before{width:8vw;height:8vw;background-position:-16.5vw -60.3vw}
     .user-header .message .ellipse,.user-header .message .circular{padding:.6vw;border-radius:3.1vw;font-size:3.1vw;background-color:#f55c5c;color:#FFF;font-style:normal;position:absolute;right:4vw;top:-1vw;transform:scale(.7)}
     .user-header .message .circular{padding:0 1vw;}
-    .user-content{width:100%;margin:0 auto 2.4vw auto;background:#FFF}
+    .user-content{width:100%;margin:0 auto 2.4vw auto;background:#FFF;padding-top: 2.4vw;margin-top: 2.4vw;}
+    .user-content .section .user-main.account{height: 14vw;box-sizing: border-box;padding: 0 3.2vw;}
+    .user-content .section .user-main.account .account-cell{line-height:14vw;font-size:3.4vw;color: #333333;float: left;margin-right: 10vw;display: block;}
+    .user-content .section .user-main.account .account-cell .red{font-size:4.2vw;color: #f94b4b;font-weight: bold;}
     .user-content .user-main .tabs-left{box-sizing:border-box;width:100vw;padding:.7vw 6vw 4vw 6vw}
     .user-content .user-main .tabs-left .item{width:20.8vw;height:8.4vw;line-height:8.4vw;text-align:center;border-radius:4.2vw;border:1px solid #b8bfca;font-size:3.3vw;color:#627386;margin:3.3vw 4vw 0 4vw;position:relative}
     .user-content .user-main .tabs-left .item .icon span{height:4.6vw;line-height:4.6vw;padding:0 .6vw;border-radius:2.1vw;font-size:3.1vw;background-color:#f55c5c;color:#FFF;font-style:normal;position:absolute;right:1vw;top:-2vw}

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

@@ -179,8 +179,11 @@ li{list-style:none}
     .section-botton{margin-top:1.5vw;padding: 2.7vw;background: #fff}
     .section-botton .inner{overflow: hidden}
     .section-botton .btn{display:inline-block;width:22.4vw;height:11.2vw;line-height:11.2vw;font-size:3.7vw;text-align:center;background-color:#ffe6dc;border-radius:2px;border:1px solid #e15616;margin:0 2.7vw 0 auto;color:#e15616;float: right;}
-    .section-botton .primary{color:#FFF;Background:#e15616}
+    .section-botton .primary{color:#FFF;Background:#e15616;position: relative;}
     .section-botton .btn.primary.confirm{line-height: 4.5vw;}
+    .section-botton .btn.primary .tips{width: 12.6vw;height: 4.8vw;line-height: 4.8vw;text-align: center;border-radius: 2.4vw;background-color: #ffe6dc;font-size: 2.8vw;color: #E15616;position: absolute;right: -2vw;top: -6.5vw;z-index: 99;}
+    .section-botton .btn.primary .tips:before{content: '';width: 6px;height: 6px;background-color: #ffe6dc;position: absolute;bottom: -3px;left: 12px;z-index: -1;transform:rotate(45deg);}
+
 
 
 

src/main/resources/static/css/user-center/order/orderlist.css

@@ -127,9 +127,12 @@ li{list-style:none}
 .user-main.order .order-item p{display:inline-block;width:49%}
 .user-main.order .order-botton{text-align:right;margin-top:2vw}
 .user-main.order .order-botton .btn{display:inline-block;width:19.5vw;height:9.5vw;line-height:9.5vw;text-align:center;background-color:#ffe6dc;border-radius:2px;border:solid 1px #e15616;color:#e15616;font-size:3.4vw;margin-left:2.6vw;vertical-align: text-top}
-.user-main.order .order-botton .primary{background:#e15616;color:#FFF;}
+.user-main.order .order-botton .primary{background:#e15616;color:#FFF;position: relative;}
 .order-container .section .user-main .order-content .order-botton .btn.primary.confirm{line-height: 4.5vw;}
 .order-container .section .user-main .order-content .order-botton .btn.primary.confirm p{line-height: 5vw;}
+.order-container .section .user-main .order-content .order-botton .btn.primary .tips{width: 12.6vw;height: 4.8vw;line-height: 4.8vw;text-align: center;border-radius: 2.4vw;background-color: #ffe6dc;font-size: 2.8vw;color: #E15616;position: absolute;right: -2vw;top: -6.5vw;z-index: 99;}
+.order-container .section .user-main .order-content .order-botton .btn.primary .tips:before{content: '';width: 6px;height: 6px;background-color: #ffe6dc;position: absolute;bottom: -3px;left: 12px;z-index: -1;transform:rotate(45deg);}
+
 input::placeholder{color: #9AA5B5}
 }
 

src/main/resources/static/js/common/serviceapi/user.service.js

@@ -271,5 +271,29 @@ var UserApi = {
                 callback(res)
             });
         },
+        GetUserObtainBeans : function(params,callback) {//获取采美豆状态
+            Http.AjaxService({
+                url:'/user/club/obtain/beans',
+                type:'get',
+                data:params,
+                json:false,
+                isHost:true
+            })
+            .then(function(res){
+                callback(res)
+            });
+        },
+        GetUserClubBeansList : function(params,callback) {//机构采美豆收支明细
+            Http.AjaxService({
+                url:'/user/club/beans/history',
+                type:'get',
+                data:params,
+                json:false,
+                isHost:true
+            })
+            .then(function(res){
+                callback(res)
+            });
+        },
 
 };

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

@@ -47,6 +47,7 @@ var shoppingConfirm = new Vue({
             mobile: '^\\d{6,12}$'
         },
         balance: {
+            isFreight:false,    //使用采美豆抵扣运费
             flag: false,        //使用余额抵扣
             originUserMoney: 0, //初始化后不能改变，用于还原余额抵扣
             userMoney: 0,	    //显示可使用余额
@@ -69,8 +70,13 @@ var shoppingConfirm = new Vue({
             registeredAddress: '',//单位地址
             registeredPhone:'',	 //注册电话
             openBank:'',		//开户银行
-            bankAccountNo: ''  //银行账号
+            bankAccountNo: '',  //银行账号
         },
+        isBeansShow:false,
+        userBeans:0,
+        freightBeansMoney:0,
+        freightMoney:0,
+        hanldUserBeans:0,
         submitLoading: false,
     },
     computed: {
@@ -129,8 +135,30 @@ var shoppingConfirm = new Vue({
             },function (r) {
                 if(r.code === 0 && r.data){
                     _self.payInfo.freePostFlag = r.data.freePostFlag;
+                    _self.userBeans = r.data.userBeans;
                     _self.payInfo.freight = (r.data.freePostFlag===1 ? r.data.freight : 0);
                     _self.payInfo.orderShouldPayFee = _self.totalPrice + _self.payInfo.freight;
+                    switch (_self.payInfo.freePostFlag) {
+                        case 1:
+                            if( _self.userBeans >= _self.freightMoney*100 ){
+                                _self.freightBeansMoney = r.data.freight;
+                                _self.freightMoney = r.data.freight;
+                                _self.isBeansShow = true;
+                            }else{
+                                _self.isBeansShow = false;
+                            }
+                            break;
+                        case -1:
+                            if( _self.userBeans >= 3000 ){
+                                _self.freightMoney = 30;
+                                _self.freightBeansMoney = 30;
+                                _self.isBeansShow = true;
+                            }else{
+                                _self.isBeansShow = false;
+                            }
+                            break;
+                    }
+
                 }else{
                     CAIMEI.Alert(r.msg, '确定', false);
                 }
@@ -388,6 +416,22 @@ var shoppingConfirm = new Vue({
                 });
             }
         },
+        changeDeductibleFreight: function(){//选择采美豆抵扣邮费
+            var _self = this;
+            if(_self.balance.isFreight){
+                _self.hanldUserBeans = _self.freightBeansMoney*100;
+                console.log('freightBeansMoney',_self.freightBeansMoney);
+                if(_self.payInfo.freePostFlag == 1){
+                    _self.payInfo.orderShouldPayFee = _self.totalPrice + _self.payInfo.freight - _self.freightBeansMoney;
+                    console.log('最终支付金额',_self.payInfo.orderShouldPayFee)
+                }else{
+                    _self.payInfo.orderShouldPayFee = _self.totalPrice ;
+                }
+            }else{
+                _self.payInfo.orderShouldPayFee = _self.totalPrice + _self.payInfo.freight;
+                _self.hanldUserBeans = 0
+            }
+        },
         submitOrder: function(){
             var _self = this;
             if(this.submitLoading){return false;}
@@ -456,7 +500,8 @@ var shoppingConfirm = new Vue({
                     orderShouldPayFee: toFloat(this.payInfo.orderShouldPayFee),
                     balancePayFlag: this.payInfo.balancePayFlag,
                     freight: toFloat(this.payInfo.freight),
-                    freePostFlag: this.payInfo.freePostFlag
+                    freePostFlag: this.payInfo.freePostFlag,
+                    userBeans:this.hanldUserBeans
                 };
             var params = {
                     cartType: this.type,

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

@@ -1,10 +1,9 @@
 ;
 var orderPage = new Vue({
-    el: "#orderPage",
+    el: "#beansPage",
     data: {
         isRequset:true,
         noMore: false,
-        userId: 0,
         tabsListIndex:0,
         tabsList: [
             {value: 0,text: '全部'},
@@ -12,35 +11,17 @@ var orderPage = new Vue({
             {value: 2,text: '消耗'}
         ],
         listQuery:{
+            userId: 0,
             year:'',
             month:'',
             type:0,
             pageNum:1,
             pageSize:10
         },
-        beansList:[
-            {
-                type:1,
-                state:1,
-                number:100,
-                time:'2021-05-12 11:53:26'
-            },
-            {
-                type:1,
-                state:2,
-                number:500,
-                time:'2021-05-12 11:53:26'
-            },
-            {
-                type:2,
-                state:3,
-                number:1000,
-                time:'2021-05-12 11:53:26'
-            }
-        ],
+        beansList:[],
         listRecord: 0,
         pageInput: '1',
-        orderList:[],
+        userBeans:0,
         confirmedCount:'',//待確認數量
         paymentCount:'',//待付款
         waitShipmentsCount:'',//待发货
@@ -122,12 +103,13 @@ var orderPage = new Vue({
             var  _self = this;
             _self.tabsListIndex = index;
             _self.listQuery.type = index;
+            _self.GetQueryBeansListData();
         },
         initDate:function(){//初始化获取当前年月
             var _self = this;
             var _Date = new Date();
             _self.listQuery.year = _Date.getFullYear();
-            _self.listQuery.month = _Date.getMonth();
+            _self.listQuery.month = _Date.getMonth()+1;
             console.log('当前年份==========>', _self.listQuery.year);
             console.log('当前月份==========>', _self.listQuery.month);
         },
@@ -138,6 +120,7 @@ var orderPage = new Vue({
                 _self.listQuery.year--;
                 _self.listQuery.month = 12;
             }
+            _self.GetQueryBeansListData();
             console.log('年==========>', _self.listQuery.year);
             console.log('月==========>', _self.listQuery.month);
         },
@@ -148,6 +131,7 @@ var orderPage = new Vue({
                 _self.listQuery.year++;
                 _self.listQuery.month = 1;
             }
+            _self.GetQueryBeansListData();
         },
         toPagination: function (pageNum) {//点击切换分页
             if (pageNum <= this.pageTotal) {
@@ -171,21 +155,23 @@ var orderPage = new Vue({
             _self.listQuery.endTime = '';
             _self.listQuery.pageNum = 1;
             _self.isRequset = true;
-            _self.GetQueryOrderListData()
+            _self.GetQueryBeansListData()
         },
-        GetQueryOrderListData:function(){//查询订单列表
+        GetQueryBeansListData:function(){//查询订单列表
             var _self = this;
-            OrderApi.GetQueryOrderListData(_self.listQuery,function (response) {
+            UserApi.GetUserClubBeansList(_self.listQuery,function (response) {
                 if(response.code == 0){
                     var data = response.data;
-                    if(data.results && data.results.length>0) {
-                        _self.orderList = [];
-                        _self.orderList = data.results;
-                        _self.listRecord = data.totalRecord;
+                    var pageInfo = data.pageInfo;
+                    _self.userBeans = data.userBeans;
+                    if( pageInfo.list && pageInfo.list.length>0) {
+                        _self.beansList = [];
+                        _self.beansList = pageInfo.list;
+                        _self.listRecord = pageInfo.total;
                     }else{
-                        _self.orderList = [];
-                        _self.orderList = data.results;
-                        _self.listRecord = data.totalRecord;
+                        _self.beansList = [];
+                        _self.beansList = pageInfo.list;
+                        _self.listRecord = pageInfo.total;
                     }
                     _self.isRequset = false;
                 }else{
@@ -195,15 +181,14 @@ var orderPage = new Vue({
         }
     },
     mounted: function () {
+        var _self = this;
         if(globalUserData){
-            this.userId = globalUserData.userId;
-            this.listQuery.orderState = CAIMEI.getUrlParam('state');
-            this.listQuery.userId = this.userId;
-            this.GetQueryOrderListData();
-            this.initDate();
+            _self.userId = globalUserData.userId;
+            _self.listQuery.userId = this.userId;
+            _self.initDate();
+            _self.GetQueryBeansListData();
         }
         $('.navLayout').find('.navList').removeClass("on").find('.con').hide().find('a').removeClass("on");
         $('.navLayout').find('.navList').eq(0).addClass("on").find('.con').show().find('a').eq(0).addClass("on");
-        var _self = this;
     }
 });

src/main/resources/static/js/user-center/dashboard.js

@@ -16,7 +16,7 @@ var helpSuggestion = new Vue({
         salesReturnCount:'',//退货款
         productList:[],//推荐商品
         newsList:[],//新闻动态
-        isShowBeansAlet:true,
+        isShowBeansAlet:false,
         bgImagePath:'',//根据类型显示图片标记
         beanNumber:100,
         beansType:1
@@ -70,9 +70,26 @@ var helpSuggestion = new Vue({
         toFixedFn:function(text){//处理小数点后两位数
             return Number(text).toFixed(2);
         },
-        handInitType:function(type){
+        GetInitBeansInfo:function(){//初始化采美豆信息
             var _self = this;
-            _self.bgImagePath ='/img/account/icon-beans-'+type+'@2x.png';
+            UserApi.GetUserObtainBeans({userId:_self.userId},function(response){
+                if(response.code==0){
+                    _self.beansType = response.data.beansType;
+                    _self.beanNumber = response.data.num;
+                    _self.isShowBeansAlet = true;
+                    _self.handInitType(_self.beansType);
+                }else{
+                    console.log('@=========>用户暂无采美豆推送~')
+                }
+            });
+        },
+        handInitType:function(type){//根据类型判断弹窗背景
+            var _self = this;
+            if(isPC){
+                _self.bgImagePath ='/img/account/icon-beans-'+type+'@2x.png';
+            }else {
+                _self.bgImagePath ='/img/account/icon-beans-h5-'+type+'@2x.png';
+            }
             console.log(this.bgImagePath)
         },
         handleClickCancel:function () {//关闭弹窗
@@ -85,7 +102,7 @@ var helpSuggestion = new Vue({
         if(globalUserData){
             _self.userId = globalUserData.userId;
             _self.GetMyPcCenterInfo();
-            _self.handInitType(_self.beansType)
+            _self.GetInitBeansInfo()
         }
     }
 });

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

@@ -150,9 +150,11 @@ var orderPage = new Vue({
             CAIMEI.Modal('是否确认收货？','取消','确定',function () {
                 OrderApi.GetAffirmOrder({orderID:_self.orderId},function(response){
                     if(response.code == 0){
-                        CAIMEI.dialog('操作成功',true,function () {
-                            _self.GetQueryOrderDetailsInfo();
-                        });
+                        _self.beansType = 7;
+                        _self.beanNumber = 10;
+                        _self.isShowBeansAlet = true;
+                        _self.handInitType(_self.beansType);
+                        _self.GetQueryOrderDetailsInfo();
                     }else{
                         CAIMEI.Alert(response.msg, '确定', false);
                     }
@@ -300,9 +302,13 @@ var orderPage = new Vue({
             $(el).parents('.priceTag').find('.tag').removeClass("on").siblings('.mFixed').hide();
             if(!isPC){looseBody();}
         },
-        handInitType:function(type){
+        handInitType:function(type){//根据类型判断弹窗背景
             var _self = this;
-            _self.bgImagePath ='/img/account/icon-beans-'+type+'@2x.png';
+            if(isPC){
+                _self.bgImagePath ='/img/account/icon-beans-'+type+'@2x.png';
+            }else {
+                _self.bgImagePath ='/img/account/icon-beans-h5-'+type+'@2x.png';
+            }
             console.log(this.bgImagePath)
         },
         handleClickCancel:function () {//关闭弹窗
@@ -316,7 +322,6 @@ var orderPage = new Vue({
             _self.userId = globalUserData.userId;
             _self.orderId = CAIMEI.getUrlParam('orderId');
             _self.GetQueryOrderDetailsInfo();
-            _self.handInitType(_self.beansType)
         }
         $(window).scroll(function (event) {
             var supportPageOffset = window.pageXOffset !== undefined; // 判断是否支持pageXOffset

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

@@ -36,7 +36,7 @@ var orderPage = new Vue({
         payModelData:{},
         hanldOrderData:{},//监听点击的单个订单项的按钮
         confrimsBtn:true,
-        isShowBeansAlet:true,
+        isShowBeansAlet:false,
         bgImagePath:'',//根据类型显示图片标记
         beanNumber:100,
         beansType:7
@@ -220,9 +220,11 @@ var orderPage = new Vue({
             CAIMEI.Modal('是否确认收货？','取消','确定',function () {
                 OrderApi.GetAffirmOrder({orderID:orderId},function(response){
                     if(response.code == 0){
-                        CAIMEI.dialog('操作成功',true,function () {
-                            _self.GetQueryOrderListData();
-                        });
+                        _self.beansType = 7;
+                        _self.beanNumber = 10;
+                        _self.isShowBeansAlet = true;
+                        _self.handInitType(_self.beansType);
+                        _self.GetQueryOrderListData();
                     }else{
                         CAIMEI.Alert(response.msg, '确定', false);
                     }
@@ -351,9 +353,13 @@ var orderPage = new Vue({
             document.body.removeChild(oInput);
             CAIMEI.dialog('复制成功');
         },
-        handInitType:function(type){
+        handInitType:function(type){//根据类型判断弹窗背景
             var _self = this;
-            _self.bgImagePath ='/img/account/icon-beans-'+type+'@2x.png';
+            if(isPC){
+                _self.bgImagePath ='/img/account/icon-beans-'+type+'@2x.png';
+            }else {
+                _self.bgImagePath ='/img/account/icon-beans-h5-'+type+'@2x.png';
+            }
             console.log(this.bgImagePath)
         },
         handleClickCancel:function () {//关闭弹窗
@@ -370,7 +376,6 @@ var orderPage = new Vue({
             _self.orderTabBarIndex = this.listQuery.orderState;
             _self.GetQueryOrderListData();
             _self.GetQueryOrderNumInfo();
-            _self.handInitType(_self.beansType)
         }
         $('.navLayout').find('.navList').removeClass("on").find('.con').hide().find('a').removeClass("on");
         $('.navLayout').find('.navList').eq(0).addClass("on").find('.con').show().find('a').eq(0).addClass("on");

src/main/resources/templates/account/register-club.html

@@ -61,7 +61,7 @@
                         <a href="/help/1013.html" target="_blank">《隐私权政策》</a>
                     </p>
                     <span class="errTips icon mIcon show" v-if="isShowAgree">请阅读并同意协议</span>
-                    <div class="btn" :class="loginLoading ? 'disabled':''"  @click="clubRegister()">注册</div>
+                    <div class="btn" :class="loginLoading ? 'disabled':''"  @click="clubRegister()" onclick="_czc.push(['_trackEvent','注册页面','点击','确认注册','','Um_Event_ConfirmRegister'])">注册</div>
                 </div>
             </form>
         </div>

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

@@ -48,7 +48,7 @@
                     </div>
                 </li>
                 <template v-else>
-                    <li><a href="/register.html" rel="nofollow">注册</a></li>
+                    <li><a href="/register.html" rel="nofollow" onclick="_czc.push(['_trackEvent','顶部导航','注册','点击','','Um_Event_Regirster'])">注册</a></li>
                     <li><a href="/login.html" rel="nofollow">登录</a></li>
                 </template>
             </ul>

src/main/resources/templates/pay/caimei-paycash.html

@@ -137,10 +137,10 @@
     <div class="pay-button-main" v-if="tabIndex == 0">
         <div class="inner">
             <div class="pay-button" v-if="mobileTabIndex === 2 || mobileTabIndex === 3">
-                <a v-show="isPC" href="javascript:void(0);" id="paySubmit" @click="PaySubmitFn" :class="isSubMitStatus ? 'disabled' : ''">立即支付</a>
+                <a v-show="isPC" href="javascript:void(0);" id="paySubmit" @click="PaySubmitFn" :class="isSubMitStatus ? 'disabled' : ''" onclick="_czc.push(['_trackEvent','线上支付','点击','网银支付','','Um_Event_CopyUnionPay'])">立即支付</a>
             </div>
             <div class="pay-button" v-else>
-                <a href="javascript:void(0);" id="payMobileSubmit" @click="PayMobileSubmitFn" :class="isSubMitStatus ? 'disabled' : ''">立即支付</a>
+                <a href="javascript:void(0);" id="payMobileSubmit" @click="PayMobileSubmitFn" :class="isSubMitStatus ? 'disabled' : ''" onclick="_czc.push(['_trackEvent','线上支付','点击','移动支付','','Um_Event_ConfirmMobilePay'])">立即支付</a>
             </div>
         </div>
     </div>

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

@@ -166,16 +166,16 @@
                 <div v-if="!isPC" class="wechatH5 btnBox"><img src="/img/base/wechat.h5.png" style="padding: 2.7vw 0"></div>
                 <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                     <div  class="btnBox" v-if="priceObj.priceFlag==2 && priceObj.userIdentity==4">
-                        <a class="upgrade" href="/user/setting/upgrade.html">升级会员查看价格</a>
+                        <a class="upgrade" href="/user/setting/upgrade.html" onclick="_czc.push(['_trackEvent','商品详情','点击','升级查看价格','','Um_Event_ProductUpgrade'])">升级会员查看价格</a>
                     </div>
                     <div class="btnBox" v-else-if="(priceObj.priceFlag==0 && priceObj.userIdentity!=3) || (priceObj.priceFlag==2 && priceObj.userIdentity==2)">
-                        <a href="javascript:void(0);" class="cart icon" @click='addShopCart()' v-if="!isNoneDisabled">加入购物车</a>
-                        <a href="javascript:void(0);" class="buy" @click="buyNowSubmit()" v-if="!isNoneDisabled">立即购买</a>
+                        <a href="javascript:void(0);" class="cart icon" @click='addShopCart()' v-if="!isNoneDisabled" onclick="_czc.push(['_trackEvent','商品详情','点击','加入购物车','','Um_Event_ProductAddCart'])">加入购物车</a>
+                        <a href="javascript:void(0);" class="buy" @click="buyNowSubmit()" v-if="!isNoneDisabled" onclick="_czc.push(['_trackEvent','商品详情','点击','立即购买','','Um_Event_ProductBuyConfirm'])">立即购买</a>
                     </div>
                 </template>
                 <template v-else>
                     <div  class="btnBox">
-                        <a href="javascript:void(0);" class="upgrade" @click="toLogin" v-if="!isNoneDisabled">登录查看价格</a>
+                        <a href="javascript:void(0);" class="upgrade" @click="toLogin" v-if="!isNoneDisabled" onclick="_czc.push(['_trackEvent','商品详情','点击','登录查看价格','','Um_Event_ProductLoginPrice'])">登录查看价格</a>
                     </div>
                 </template>
             </div>
@@ -273,7 +273,7 @@
                         <div class="con" th:text="${product.shopAddress}"></div>
                     </template>
                     <div class="tit">满意度：<i th:each="i:${#numbers.sequence(1,5)}" class="icon heart"></i></div>
-                    <a th:href="@{'/supplier-'+ ${product.shopId} +'.html'}" class="btn">查看主页</a>
+                    <a th:href="@{'/supplier-'+ ${product.shopId} +'.html'}" class="btn" onclick="_czc.push(['_trackEvent','商品详情','点击','查看主页','','Um_Event_ProductShopHome'])">查看主页</a>
                 </div>
             </div>
             <div class="contact">

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

@@ -298,6 +298,14 @@
             <p v-if="reducedPrice>0">促销满减: <span><em>- ¥{{reducedPrice | NumFormat}}</em></span></p>
             <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>
+                    <label class="check">
+                        <input v-model="balance.isFreight" name="useBalance" type="checkbox" @change="changeDeductibleFreight()">
+                    </label>
+                </span>
+            </p>
         </div>
     </div>
 
@@ -310,7 +318,7 @@
             </div>
             <div class="right mfbt">
                 <div class="item">总价：<em>¥{{payInfo.orderShouldPayFee | NumFormat}}</em></div>
-                <a :class="submitLoading?'submit dis':'submit'" href="javascript:void(0);" @click="submitOrder()">提交订单</a>
+                <a :class="submitLoading?'submit dis':'submit'" href="javascript:void(0);" @click="submitOrder()" onclick="_czc.push(['_trackEvent','确认订单','点击','用户提交订单','','Um_Event_ConfirmOrder'])">提交订单</a>
             </div>
         </div>
     </div>

src/main/resources/templates/supplier/list.html

@@ -55,7 +55,7 @@
                     </template>
                     <li v-else-if="isPC" v-for="i in 3"></li>
                 </ul>
-                <a v-if="isPC" :href="'/supplier-'+shop.shopId+'.html'" target="_blank" class="four">进入本店铺>>></a>
+                <a v-if="isPC" :href="'/supplier-'+shop.shopId+'.html'" target="_blank" class="four" onclick="_czc.push(['_trackEvent','搜索供应商','点击','查看主页','','Um_Event_SearchShopListHome'])">进入本店铺>>></a>
             </div>
         </li>
     </ul>

src/main/resources/templates/user-center/account/beans.html

@@ -11,8 +11,8 @@
 <body>
 <!-- 引用头部 -->
 <template th:replace="components/header"></template>
-<!-- 我的订单 -->
-<div id="orderPage" v-cloak>
+<!-- 采美豆明细 -->
+<div id="beansPage" v-cloak>
     <div class="navLayout" v-cloak>
         <div v-if="isPC" class="crumbs">
             <span>我的交易</span>
@@ -26,10 +26,10 @@
                 <div class="beans-header">
                     <div class="beans-header-l">
                         <span>可用数量：</span>
-                        <span class="big">2000</span>
+                        <span class="big">{{ userBeans }}</span>
                     </div>
                     <div class="beans-header-r">
-                        <a href="">查看采美豆说明<i class="icon mIcon"></i></a>
+                        <a href="/help/1031.html">查看采美豆说明<i class="icon mIcon"></i></a>
                     </div>
                 </div>
                 <!--loading-->
@@ -37,29 +37,28 @@
                     <img src="/img/base/loading.gif">
                 </div>
                 <div class="beans-container clear" v-else>
-                    <div class="beans-content-tabs">
+                    <div class="beans-content-tabs clearfix">
                         <div class="tabs-main">
                             <div class="time-template">
-                                <a href="javascript:void(0);" class="time-pre" @click="reduceMonth">
+                                <div class="time-pre" @click="reduceMonth">
                                     <i class="icon mIcon"></i>
-                                </a>
+                                </div>
                                 <div class="time-text">
                                     {{ ( listQuery.year ||'') +'年'+( listQuery.month ||'') +'月'}}
                                 </div>
-                                <a href="javascript:void(0);" class="time-next" @click="addMonth">
+                                <div class="time-next" @click="addMonth">
                                     <i class="icon mIcon"></i>
-                                </a>
+                                </div>
                             </div>
                             <div class="time-tabs">
-                                <a href="javascript:void(0);"
-                                   class="time-tabs-cell"
-                                   v-for="(tabs, index) in tabsList"
-                                   :key="index"
-                                   :class="tabsListIndex == index ? 'active' : ''"
-                                   @click="tabClick(index)"
+                                <div   class="time-tabs-cell"
+                                       v-for="(tabs, index) in tabsList"
+                                       :key="index"
+                                       :class="tabsListIndex == index ? 'active' : ''"
+                                       @click="tabClick(index)"
                                 >
                                     {{ tabs.text }}
-                                </a>
+                                </div>
                             </div>
                         </div>
                     </div>
@@ -67,12 +66,12 @@
                     <div class="beans-content-list" v-if="beansList.length > 0">
                         <div class="beans-list-cell" v-for="(beans, index) in beansList" :key="index">
                             <div class="list-cell-left">
-                                <p class="black">{{ beans.state | stateText }}</p>
-                                <p class="none">{{ beans.time }}</p>
+                                <p class="black">{{ beans.beansType | stateText }}</p>
+                                <p class="none">{{ beans.addTime }}</p>
                             </div>
                             <div class="list-cell-right">
                                 <p class="black">{{ beans.type | stateTypeText }}</p>
-                                <p class="blod" :style="{color:beans.type == 1 ? '#ff2a2a' : '#15C47A'}"><span>{{beans.type =='1'? '+' : '-'}}</span>{{ beans.number }}</p>
+                                <p class="blod" :style="{color:beans.type == 1 ? '#ff2a2a' : '#15C47A'}"><span>{{beans.type =='1'? '+' : '-'}}</span>{{ beans.num }}</p>
                             </div>
                         </div>
                     </div>
@@ -104,8 +103,7 @@
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/center.js(v=${version})}"></script>
-<script charset="utf-8" type="text/javascript" src="/lib/datapicker/moment.min.js"></script>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/order.service.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/user.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/user-center/account/beans.js(v=${version})}"></script>
 </body>
 </html>

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

@@ -36,12 +36,18 @@
                         <div class="account">
                             <div class="name">
                                 <span>{{userInfo.name}}</span>
-                                <a href="/user/setting/upgrade.html" v-if="userInfo.userIdentity === 4">
+                                <a href="/user/setting/upgrade.html" v-if="userInfo.userIdentity === 4 && isPC" onclick="_czc.push(['_trackEvent','个人中心','升级入口','点击','','Um_Event_ClubUpgrade'])">
                                     去升级会员机构
                                     <div class="name-tips">采美豆</div>
                                 </a>
                             </div>
                             <div class="msg"><span>资料完整度:<em class="red">{{degree}}</em></span><a href="/user/setting/information.html">立即完善</a></div>
+                            <div class="upgrade">
+                                <a href="/user/setting/upgrade.html" v-if="userInfo.userIdentity === 4 && !isPC" onclick="_czc.push(['_trackEvent','个人中心','升级入口','点击','','Um_Event_ClubUpgrade'])">
+                                    去升级会员机构
+                                    <div class="name-tips">采美豆</div>
+                                </a>
+                            </div>
                         </div>
                         <div class="message">
                             <a href="/user/message/list.html">
@@ -61,7 +67,7 @@
                                 </a>
                                 <a href="/user/beans.html" class="account-cell">
                                     <span>采美豆：</span>
-                                    <span class="red">30000</span>
+                                    <span class="red">{{ userInfo.userBeans }}</span>
                                 </a>
                             </div>
                         </div>
@@ -155,30 +161,31 @@
                 </template>
             </div>
         </div>
-    </div>
-    <!--loading-->
-    <div v-else class="loading">
-        <img src="/img/base/loading.gif">
-    </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 class="cmbeans-alert-icon" src="/img/account/bean-icon@3x.png" mode="">
-                    <div class="cmbeans-alert-text">
-                        <span class="icon-add">+</span>
-                        <span class="icon-text">{{ beanNumber }}</span>
+        <!-- 采美豆弹窗 -->
+        <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>
+                        </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>
     </div>
+    <!--loading-->
+    <div v-else class="loading">
+        <img src="/img/base/loading.gif">
+    </div>
 </div>
 
 <!-- 引入底部 -->

src/main/resources/templates/user-center/order/detail.html

@@ -248,7 +248,8 @@
             <div class="cmbeans-alert-content-text">恭喜您获得采美豆！</div>
             <div class="cmbeans-alert-content-bean">
                 <div class="cmbeans-alert-main">
-                    <img class="cmbeans-alert-icon" src="/img/account/bean-icon@3x.png" mode="">
+                    <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>

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

@@ -144,7 +144,8 @@
             <div class="cmbeans-alert-content-text">恭喜您获得采美豆！</div>
             <div class="cmbeans-alert-content-bean">
                 <div class="cmbeans-alert-main">
-                    <img class="cmbeans-alert-icon" src="/img/account/bean-icon@3x.png" mode="">
+                    <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>

src/main/resources/templates/user-center/setting/upgrade.html

@@ -169,7 +169,7 @@
                                 <span class="errTips icon mIcon" tips="" :class="userMainProflag?'show':''">请选择或添加主营产品</span>
                             </div>
                             <div class="subLine">
-                                <button class="btn" type="button" @click="SubComfirUpgradeFn()">确认升级并提交审核</button>
+                                <button class="btn" type="button" @click="SubComfirUpgradeFn()" onclick="_czc.push(['_trackEvent','升级页面','点击','用户确认升级','','Um_Event_ConfirmClubUpgrade'])">确认升级并提交审核</button>
                             </div>
                         </form>
                     </div>