Forráskód Böngészése

调整样式,DEP统计功能

zhengjinyi 1 éve
szülő
commit
029a6cda67

+ 1 - 1
src/main/resources/static/css/account/login.css

@@ -29,7 +29,7 @@ li{list-style:none}
  .loginForm .forget .btn{float: left;color: #E15621;}
  .loginForm .submit{height:44px;line-height:0;font-size:0;text-align:justify;margin-top:10px;width: 100%;float: left;}
  .loginForm .submit:after{content:'';display:inline-block;width:100%}
- .loginForm .submit .btn{display:inline-block;box-sizing:border-box;width:100%;height:44px;line-height:44px;background-color:#ffe6dc;border-radius:22px;border:solid 1px #FF5B00;text-align:center;color:#FF5B00;font-size:14px;cursor:pointer}
+ .loginForm .submit .btn{display:inline-block;box-sizing:border-box;width:100%;height:48px;line-height:48px;background-color:#ffe6dc;border-radius:24px;border:solid 1px #FF5B00;text-align:center;color:#FF5B00;font-size:14px;cursor:pointer}
  .loginForm .submit button.btn{background:linear-gradient(90deg, #FF9300 0%, #FF5B00 100%);color:#FFF}
  .loginForm .submit button.disabled{background-color:#E1E1E1;color:#F7F7F7;border-color:#E1E1E1;}
  .loginForm .login-line{width: 100%;height: 1px;background: #E2E2E2;margin-top: 10px;float: left;position: relative;}

+ 2 - 0
src/main/resources/static/js/account/register-club.js

@@ -311,6 +311,8 @@
         clubLoginIndex:function(){// 跳过升级直接去个人中心
             const partnerShopId = CAIMEI.Storage.getItem('partnerShopId')
             if(partnerShopId){
+                CAIMEI.Storage.removeItem('partnerShopId')
+                CAIMEI.Storage.removeItem('partnerId')
                 window.location.href=`/supplier-${partnerShopId}.html`
             }else{
                 window.location.href = '/user/dashboard.html';

+ 1 - 2
src/main/resources/static/js/mixins/cmSysMixins.js

@@ -55,10 +55,9 @@ var cmSysVitaMixins = function () {
             handleCmSysNetInfo() {
                 //设置定时器
                 const globalUserData = JSON.parse(localStorage.getItem('userInfo'));
-                const partnerId = CAIMEI.Storage.getItem('partnerId')
-                if(partnerId){ this.cmSysParams.partnerId = partnerId * 1  }
                 if(globalUserData){ this.cmSysParams.userId = globalUserData.userId * 1; }
                 if( this.handleProsId || this.handleShopId || this.handlearticleId || this.handleProsKey || this.handleShopKey ){
+                    this.popUpParams.partnerId = globalUserData.partnerId
                     this.popUpParams.shopId = this.handleShopId
                     this.popUpParams.productId = this.handleProsId
                     this.popUpParams.infoId = this.handlearticleId

+ 0 - 3
src/main/resources/static/js/shopping/confirm.js

@@ -13,7 +13,6 @@ const defaultCartParam = {
         userId:0			// 用户Id
 };
 const defaultConfirmParam = {
-        partnerId:0, // 外部来源下单默认 0
         cartType:1, 		// 购买类型:(1自主下单, 3协销下单)
         orderMiniType:0,    // 订单提交状态 0初始提交 1 继续提交
         orderSource:1,		// 订单来源 1WWW 6小程序[采美,星范]
@@ -819,9 +818,7 @@ var shoppingConfirm = new Vue({
         const _self = this;
         this.urlType = getUrlParam("type") ? getUrlParam("type") * 1 : "";
         if(globalUserData){
-            const partnerId = CAIMEI.Storage.getItem('partnerId')
             this.userId = this.productParam.userId = this.cartParam.userId = this.supportParm.userId =   globalUserData.userId;
-            this.confirmParam.partnerId = partnerId ? partnerId * 1 : 0
             this.confirmParam.unionId = globalUserData.unionId ? globalUserData.unionId : '';
             this.confirmParam.clubId = globalUserData.clubId
             this.userIdentity = globalUserData.identity;

+ 0 - 3
src/main/resources/static/js/supplier/index.js

@@ -261,9 +261,6 @@ var supplierHome = new Vue({
     mounted: function () {
         const _self = this;
         const userInfo = localStorage.getItem('userInfo');
-        const partnerId = $("#partnerId").val();
-        console.log('partnerId', partnerId)
-        CAIMEI.Storage.setItem('partnerId',partnerId)
         if(this.params.id !== 0) {
             this.getShopInfo();
             this.getMainProducts();