Merge remote-tracking branch 'remotes/origin/developerC' into developerA

src/main/resources/static/css/supplier-center/order/logistics.css

@@ -17,7 +17,8 @@
     .pro-information li {list-style: none;}
     .pro-information li {width: 100%;padding: 10px 0;}
     .pro-information li div {display: inline-block;width: 11%;text-align: center;color: #627386;}
-    .pro-information li div.product-img {width: 50%;text-align: left;}
+    .pro-information li div.product-img {width: 50%;text-align: left;position: relative;}
+    .product-img .tips{width: 40px;height: 20px;border-radius: 2px;font-size: 12px;line-height: 20px;text-align: center;display: block;position: absolute;top: 0;left: 0;color: #FFFFFF; background-image: linear-gradient(214deg, #ff4500 0%, #ff5800 53%, #ff4367 100%);}
     .product-img img {width: 70px;height: 70px;border: solid 1px #e2e7ef;}
     .product-img h3 {display: inline-block;width: 300px;margin-left: 10px;font-size: 16px;color: #22272e;vertical-align: middle;word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-inline-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical}
     .add-logistics{height: auto;background-color: #ffffff;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);margin-top: 10px;padding: 20px;color: #627386;}
@@ -76,7 +77,8 @@
     .pro-information li {list-style: none;}
     .pro-information li {width: 100%;padding: 2.7vw 0;}
     .pro-information li div {display: inline-block;color: #22272e;top: 11.6vw;width: 21vw;position: relative}
-    .pro-information li div.product-img {width: 100%;text-align: left;top: 0}
+    .pro-information li div.product-img {width: 100%;text-align: left;top: 0;position: relative;}
+    .product-img .tips{position:absolute;background:#ff4500;line-height:5vw;height:5vw;padding:0 2vw;white-space:nowrap;font-size:3.1vw;color:#FFF;top:0;left:0}
     .product-img img {width: 18.7vw;height: 18.7vw;border: solid .27vw #e2e7ef;}
     .product-img h3 {display: inline-block;width: 40vw;margin-left: 2.7vw;font-size: 3.4VW;color: #22272e;vertical-align: middle;word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-inline-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical}
     .add-logistics{height: auto;background-color: #ffffff;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);margin-top: 2.7vw;padding: 20px;color: #627386;}

src/main/resources/static/css/supplier-center/order/record.css

@@ -17,6 +17,8 @@
     .product {padding: 0 20px;background: #fff;overflow: hidden;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07); }
     .product-title {height: 56px;line-height: 56px;color: #627386;border-bottom: solid 1px #e2e7ef}
     .product-info li {width: 100%;padding: 15px 0}
+    .product-img{position: relative;}
+    .product-img .tips{width: 40px;height: 20px;border-radius: 2px;font-size: 12px;line-height: 20px;text-align: center;display: block;position: absolute;top: 0;left: 0;color: #FFFFFF; background-image: linear-gradient(214deg, #ff4500 0%, #ff5800 53%, #ff4367 100%);}
     .product-img h3 {display: inline-block;width: 300px;margin-left: 10px;font-size: 16px;vertical-align: middle;word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-inline-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical}
     .product-info li div.product-img {width: 50%;text-align: left}
     .product-img img {width: 70px;height: 70px;border: solid 1px #e2e7ef;}
@@ -56,7 +58,9 @@
     .record-product{    background: #fff; margin-top: 2.7vw}
     .product-title{height: 5.3vw;line-height: 5.3vw;position: relative;width: 100%}
     .product-info li{width: 100%;padding-top: 2.7vw;height: 36vw}
+    .product-img{position: relative;}
     .product-img h3{display: inline-block;width: 40vw;margin-left: 10px;font-size: 3.4vw;color: #22272e;vertical-align: middle;word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-inline-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical}
+    .product-img .tips{position:absolute;background:#ff4500;line-height:5vw;height:5vw;padding:0 2vw;white-space:nowrap;font-size:3.1vw;color:#FFF;top:0;left:0}
     .product-info li div.product-img{width: 100%;text-align: left;top: 0;}
     .product-img img{width: 15vw;height: 15vw;border: solid .27vw #e2e7ef;}
     .product-info li div{display: inline-block;color: #22272e;top: 13.6vw;width: 21vw;position: relative}

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

@@ -151,7 +151,7 @@ var payContainer = new Vue({
         PaySubmitFn:function(){//立即支付
             var _self = this;
             if(_self.payInfo.payBankNum == ''){
-                layer.msg('请选择银行！');
+                CAIMEI.dialog('请选择银行！');
                 return;
             }
             var params = {

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

@@ -79,7 +79,7 @@ var payContainer = new Vue({
                         }
 
                     }else{
-                        layer.msg(response.msg, {icon: 7});
+                        CAIMEI.Alert(response.msg,'确定',false);
                     }
                 })
             }
@@ -149,11 +149,12 @@ var payContainer = new Vue({
             PayApi.PayOrderPayWhetherSuccess({orderId: _self.payInfo.payOrderId, paySuccessCounter:_self.paySuccessCounter},function(response){
                 // console.log(response);
                 if(response.code === 0){
+                    CAIMEI.dialog('支付成功');
                     clearTimeout(timer); //清理定时任务
-                    layer.msg('支付成功', {icon: 1});
                     setTimeout(function(){
                         window.location.href = '/index.html';
-                    },3000);
+                    },2000);
+
                 }else{
                     timer = setTimeout(function(){
                         _self.setTimerWechatPay()
@@ -167,8 +168,8 @@ var payContainer = new Vue({
             PayApi.PayOrderFindOrderStatus({mbOrderId:_self.mbOrderId},function(response){
                 var data = response.data.data;
                 if(data.status === '1'){
+                    CAIMEI.dialog('支付成功');
                     clearTimeout(timer); //清理定时任务
-                    layer.msg('支付成功', {icon: 1});
                     setTimeout(function(){
                         window.location.href = '/index.html';
                     },3000);

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

@@ -152,7 +152,7 @@ var payContainer = new Vue({
         PaySubmitFn:function(){//立即支付
             var _self = this;
             if(_self.payInfo.PAY_BANK_NUM == ''){
-                layer.msg('请选择银行！');
+                CAIMEI.dialog('请选择银行！');
                 return;
             }
             var params = {

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

@@ -276,10 +276,8 @@ var shoppingCart = new Vue({
                 shop.cartList.forEach(function(pros){
                     if(_self.submitIds.includes(pros.productId*1)){
                         _self.totalCouponList.forEach(function (coupon,index){//循环优惠券
-                            console.log('asdasdasdada')
                             switch(coupon.couponType){
                                 case 0:// 活动券
-                                    console.log('00000000000')
                                     if(coupon.productType == 1){// 活动券-全商城商品
                                         if(_self.totalPrice >= coupon.touchPrice){
                                             eligibleCoupons.push(coupon)
@@ -293,7 +291,6 @@ var shoppingCart = new Vue({
                                     }
                                     break;
                                 case 1:// 品类券适用于产品或者仪器 categoryType(commodityType) : 1 产品  2 仪器
-                                    console.log('111111111111')
                                     if( coupon.categoryType && coupon.categoryType == pros.commodityType){
                                         if(_self.totalPrice >= coupon.touchPrice){
                                             eligibleCoupons.push(coupon)
@@ -301,21 +298,18 @@ var shoppingCart = new Vue({
                                     }
                                     break;
                                 case 2:// 用户专享券 适用于商城全部商品
-                                    console.log('2222222222')
                                     if(_self.totalPrice >= coupon.touchPrice){
                                         eligibleCoupons.push(coupon)
                                     }
                                     break;
                                 case 3:// 店铺券适用于某个供应商的全部商品
                                     if(coupon.shopId && pros.shopId == coupon.shopId){
-                                        console.log('33333333333')
                                         if(_self.totalPrice >= coupon.touchPrice){
                                             eligibleCoupons.push(coupon)
                                         }
                                     }
                                     break;
                                 case 4://新用户券 适用于商城全部商品
-                                    console.log('444444444444')
                                     if(_self.totalPrice >= coupon.touchPrice){
                                         eligibleCoupons.push(coupon)
                                     }

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

@@ -718,7 +718,7 @@ var shoppingConfirm = new Vue({
             }
             _self.confirmParam.payInfo.postage = parseInt(_self.hanldPostage).toFixed(2);
             _self.confirmParam.payInfo.postageFlag = parseInt(_self.hanldPostageFlag);
-            _self.confirmParam.payInfo.orderShouldPayFee = _self.hanldShouldPayFee.toFixed(2);
+            _self.confirmParam.payInfo.orderShouldPayFee = parseFloat(_self.hanldShouldPayFee).toFixed(2);
             _self.confirmParam.payInfo = JSON.stringify(_self.confirmParam.payInfo);
             _self.confirmParam.orderInfo = JSON.stringify(_self.confirmParam.orderInfo);
             _self.confirmParam.orderInvoice = JSON.stringify(_self.confirmParam.orderInvoice);
@@ -753,20 +753,21 @@ var shoppingConfirm = new Vue({
     },
     created: function () {
         var _self = this;
-        _self.type = getUrlParam("type") ? getUrlParam("type")*1 : "";
+        var urlType = getUrlParam("type") ? getUrlParam("type")*1 : "";
+        console.log('urlType',urlType)
         if(globalUserData){
             _self.userId = _self.productParam.userId = _self.cartParam.userId = _self.postageParam.userId =   globalUserData.userId;
             _self.confirmParam.clubId = globalUserData.clubId
             _self.userIdentity = globalUserData.identity;
             _self.userToken = globalUserData.token;
             // type:（1购物车提交[对应表cm_cart]，2直接购买提交, 3协销下单）
-            if(_self.type === 1) {
-                _self.productParam.cartType = 1;
+            if(urlType === 1) {//购物车提交
+                _self.confirmParam.cartType = 1;
                 _self.cartParam.productIds = _self.postageParam.productIds = _self.productIds = window.localStorage.getItem("shoppingProductIds");
                 // 获取列表数据
                 _self.getCartCreateOrderInfo();
-            }else if(_self.type === 2){
-                _self.productParam.cartType = 2;
+            }else if(urlType === 2){//立即购买
+                _self.confirmParam.cartType = 2;
                 _self.productParam.productId = _self.postageParam.productIds = _self.productIds = getUrlParam("productId");
                 _self.productParam.productCount = getUrlParam("count");
                 if(_self.productParam.productId && _self.productParam.productCount) {

src/main/resources/templates/supplier-center/order/delivery-record.html

@@ -33,7 +33,7 @@
                     </p>
                     <div class="user">
                         <p>买家名称：<span>{{userInfo.name}}</span></p>
-                        <p>收货人：<span>{{userInfo.shouHuoRen}}</span></p>
+                        <p>收货人：<span>{{userInfo.receiver}}</span></p>
                         <p>联系方式：<span>{{userInfo.mobile}}</span></p>
                     </div>
                     <p class="address">收货地址：<span>{{userInfo.address}}</span></p>
@@ -53,6 +53,7 @@
                                 <li v-for="order in r.logisticsRecordList">
                                     <div class="product-img">
                                         <img :src="order.image"/>
+<!--                                        <span class="tips" v-if="order.productType==2||order.productType==1">赠品</span>-->
                                         <h3>{{order.productName}}</h3>
                                     </div>
                                     <div>{{order.buyNum}}</div>

src/main/resources/templates/supplier-center/order/logistics-add.html

@@ -56,6 +56,7 @@
                             <li :orderProductId = 'order.orderProductID' :shopOrderId="order.shopOrderId" v-for="order in orderList ">
                                 <div class="product-img">
                                     <img :src="order.image"/>
+<!--                                    <span class="tips" v-if="order.productType==2||order.productType==1">赠品</span>-->
                                     <h3>{{order.productName}}</h3>
                                 </div>
                                 <div>{{order.buyNum}}</div>

src/main/resources/templates/supplier-center/order/logistics-detail.html

@@ -52,6 +52,7 @@
                             <li v-for="order in listData.logisticsRecordList">
                                 <div class="product-img">
                                     <img :src="order.image"/>
+<!--                                    <span class="tips" v-if="order.productType==2||order.productType==1">赠品</span>-->
                                     <h3>{{order.productName}}</h3>
                                 </div>
                                 <div>{{order.buyNum}}</div>