Commit 6fa3a2b8 by 肖康

x

parent 14203aa6
Showing with 199 additions and 24 deletions
......@@ -63,6 +63,10 @@ export const apis = {
*/
loginCheck: productionUrlApi + 'login/check',
/**
* 获取购物车内赠品
*/
getCartMZInfo: productionUrlApi + 'cart/getCartMZInfo',
/**
* 获取购物车数量
*/
cartCount: productionUrlApi + 'cart/count',
......@@ -545,6 +549,10 @@ export const services = {
}
})
},
getCartMZInfo(params) {
return axios.post(apis.getCartMZInfo, params)
},
customsrService(params) {
return axios.get(apis.customsrService, {
params: {
......
html{-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}html *{outline:0;-webkit-text-size-adjust:none !important;-webkit-tap-highlight-color:transparent !important}html,body{font-family:PingFangSC-Regular,PingFang SC "Microsoft Yahei",sans-serif;font-style:normal;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;background:#f8f8f8}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td,hr,button,article,aside,details,figcaption,figure,footer,header,menu,nav,section{margin:0;padding:0}button,input,select,textarea{font-size:100%;border:none;-webkit-appearance:none}input[type=button],input[type=file],input[type=submit]{cursor:pointer}table{border-collapse:collapse;border-spacing:0}ol,ul,dl{list-style:none}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:500}em,b,i{font-style:normal}a{text-decoration:none}img{border:none}.clr{*zoom:1;clear:both}.clr:after{content:".";clear:both;height:0;visibility:hidden;display:block}.fl{float:left;_display:inline}.f-orange{color:#FF693D !important}.fr{float:right;_display:inline}.va-t{vertical-align:top}.va-m{vertical-align:middle}.va-b{vertical-align:bottom}.i-hide{display:none}.i-show{display:block}.lineBlock{display:inline-block;*display:inline;zoom:1;letter-spacing:normal;word-spacing:normal}.lbBox{font-size:0 !important;*word-spacing:-1px !important}.boxsiz{-webkit-box-sizing:border-box;box-sizing:border-box}html,body{width:100%;height:100%;-webkit-overflow-scrolling:touch}body{overflow-x:hidden}.f-blue{color:#1080d0}.f-red{color:#ff0000}.f-999{color:#999}.f-333{color:#666}.fw{font-weight:bold}.ta-c{text-align:center}.ta-l{text-align:left}.ta-r{text-align:right}.mt-10{margin-top:10px}.emptys{margin-left:-1px;width:1px;height:100%;font-size:0;vertical-align:middle}@media (min-width: 750px){html{background:rgba(0,0,0,0.5)}html body{max-width:480px;margin:0 auto;background:#fff}html body .main-interface .container-wrap::-webkit-scrollbar{width:10px;height:11px}html body .main-interface .container-wrap::-webkit-scrollbar-thumb{background-color:#ffffff;box-shadow:0px 0px 0px 0px rgba(73,73,73,0.92);border-radius:10px;border:solid 1px #e5e5e5;padding:2px}html body .main-interface .container-wrap::-webkit-scrollbar-track{background-color:#eeeeee;box-shadow:inset 1px 3px 5px 0px rgba(192,186,186,0.75);border-radius:10px}}.column{display:flex;flex-direction:column}.row{display:flex;flex-direction:row}.boxsiz{-webkit-box-sizing:border-box;box-sizing:border-box}.bothSide{justify-content:space-between}.avarage{justify-content:space-around}.rowCenter{justify-content:center}.verCenter{align-items:center}.boxFlex{-webkit-box-flex:1;-moz-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1}
html{-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}html *{outline:0;-webkit-text-size-adjust:none !important;-webkit-tap-highlight-color:transparent !important}html,body{font-family:PingFangSC-Regular,PingFang SC "Microsoft Yahei",sans-serif;font-style:normal;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;background:#f8f8f8}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td,hr,button,article,aside,details,figcaption,figure,footer,header,menu,nav,section{margin:0;padding:0}button,input,select,textarea{font-size:100%;border:none;-webkit-appearance:none}input[type=button],input[type=file],input[type=submit]{cursor:pointer}table{border-collapse:collapse;border-spacing:0}ol,ul,dl{list-style:none}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:500}em,b,i{font-style:normal}a{text-decoration:none}img{border:none}.clr{*zoom:1;clear:both}.clr:after{content:".";clear:both;height:0;visibility:hidden;display:block}.fl{float:left;_display:inline}.f-orange{color:#FF693D !important}.fr{float:right;_display:inline}.va-t{vertical-align:top}.va-m{vertical-align:middle}.va-b{vertical-align:bottom}.i-hide{display:none}.i-show{display:block}.lineBlock{display:inline-block;*display:inline;zoom:1;letter-spacing:normal;word-spacing:normal}.lbBox{font-size:0 !important;*word-spacing:-1px !important}.boxsiz{-webkit-box-sizing:border-box;box-sizing:border-box}html,body{width:100%;height:100%;-webkit-overflow-scrolling:touch}body{overflow-x:hidden}.f-blue{color:#1969F9}.f-red{color:#ff0000}.f-999{color:#999}.f-333{color:#666}.fw{font-weight:bold}.ta-c{text-align:center}.ta-l{text-align:left}.ta-r{text-align:right}.mt-10{margin-top:10px}.emptys{margin-left:-1px;width:1px;height:100%;font-size:0;vertical-align:middle}@media (min-width: 750px){html{background:rgba(0,0,0,0.5)}html body{max-width:480px;margin:0 auto;background:#fff}html body .main-interface .container-wrap::-webkit-scrollbar{width:10px;height:11px}html body .main-interface .container-wrap::-webkit-scrollbar-thumb{background-color:#ffffff;box-shadow:0px 0px 0px 0px rgba(73,73,73,0.92);border-radius:10px;border:solid 1px #e5e5e5;padding:2px}html body .main-interface .container-wrap::-webkit-scrollbar-track{background-color:#eeeeee;box-shadow:inset 1px 3px 5px 0px rgba(192,186,186,0.75);border-radius:10px}}.column{display:flex;flex-direction:column}.row{display:flex;flex-direction:row}.boxsiz{-webkit-box-sizing:border-box;box-sizing:border-box}.bothSide{justify-content:space-between}.avarage{justify-content:space-around}.rowCenter{justify-content:center}.verCenter{align-items:center}.boxFlex{-webkit-box-flex:1;-moz-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1}
......@@ -136,7 +136,7 @@ body {
}
.f-blue {
color: #1080d0;
color: #1969F9;
}
.f-red {
......
.car-page{
background:#fff;
background:#f8f8f8;
color:#333;
min-height:100vh;
.lxBox{
padding-bottom: 44px;
.logintip{
top:88px;
top:98px;
}
.dataBox{
padding-top: 88px;
padding-top: 98px;
}
}
.zyBox{
......@@ -28,7 +28,7 @@
}
.dataBox{
padding-top: 88px;
padding-top: 98px;
}
}
......@@ -60,22 +60,25 @@
}
.editBox{
position: fixed;
padding:0 3%;
padding:0 10px;
height:44px;
line-height: 44px;
color:#666;
color:#6f6f6f;
left:0px;
right: 0px;
font-size: 12px;
border-bottom:1px solid #d6d7dc;
box-shadow: 0px 0px 7px 0px rgba(180, 202, 211, 0.38);
border-radius: 6px;
z-index: 3;
background: #fff;
box-sizing: border-box;
margin:0 8px;
margin-top: 10px;
.remind{
color:#999;
i{color:#ffa200;position: relative;top:2px;left:5px;}
}
a{color:#1080d0;font-size: 14px;}
a{color:#333;font-size: 14px;}
}
.lyNav{
color:#333;
......@@ -84,7 +87,6 @@
top:44px;
right:0px;
height:44px;
border-bottom:1px solid #d6d7dc;
z-index:3;
background-color: #fff;
box-sizing: border-box;
......@@ -95,18 +97,35 @@
font-size: 14px;
text-align: center;
line-height: 44px;
font{color:#333;}
position: relative;
font{color:#e5e5e5;font-size: 18px;position: absolute;right:0px;top:0px;}
i{
display: block;
height:42px;
line-height: 42px;
width:83px;
margin:0 auto;
border-bottom: 2px solid #fff;
}
&.act{
color:#1080d0;
color:#1969F9;
i{
border-bottom: 2px solid #1969F9 ;
}
}
}
}
}
.shop-block{ font-size: 12px;border-bottom: 1px solid #d6d7dc;}
.shop-block{ font-size: 12px;background: #fff;
box-shadow: 0px 0px 7px 0px rgba(180, 202, 211, 0.38);
border-radius: 6px;margin:0 8px;margin-top: 10px;padding-top: 10px;}
.shop-block .t-r{text-align: right;}
.shop-block .delete-tier{position: relative;top:2px;font-size: 20px;}
.shop-block h4{ font-size: 14px; padding: 12px 0; font-weight: 400; line-height: 20px; border-bottom: 1px solid #d6d7dc; word-wrap: break-word; word-break: break-all; }
.shop-block h4{ font-size: 14px; padding: 12px 0; font-weight: 400; line-height: 20px; word-wrap: break-word; word-break: break-all;padding-left: 7px;padding-bottom: 4px; }
.shop-block h4 a{color:#333;font-size: 15px;}
.shop-block ul{ padding: 2% 3%; padding-left: 0; }
.shop-block li{ font-size: 12px; word-wrap: break-word;height:22px;line-height: 22px; word-break: break-all; position: relative;overflow:hidden;text-overflow:ellipsis;white-space: nowrap;}
.shop-block li span{float: left;width: 50px; }
......@@ -131,18 +150,18 @@
.shop-lose .lose-but{ height: 30px; padding-right: 3%; margin-bottom: 10px;}
.shop-lose .lose-but span{float: left; display:block; margin-top: 3px; font-size: 12px; background-color: #999; color: #fff; padding: 0 10px; height: 22px;line-height:22px; border-radius: 14px;}
.shop-lose .lose-but .but-bor-red{ display: block; color: #e10601; border: 1px solid #e10601; height: 28px; line-height: 28px; padding:0 10px; border-radius: 14px; }
.shop-but{ height: 44px;border-top: 1px solid #d6d7dc; position: fixed; bottom: 0; width: 100%; background-color: #fff; z-index: 99; }
.shop-but{ height: 44px;border-top: 1px solid #d6d6d6; position: fixed; bottom: 0; width: 100%; background-color: #fff; z-index: 99; }
.shop-but .mui-checkbox label{/* height: 26px; */ line-height: 45px;}
.shop-but .mui-checkbox span{padding-left: 20px; font-size: 14px; }
.shop-but .sum{ text-align: right;padding-right: 10px; padding-bottom: 0;box-sizing: border-box; }
.shop-but .sum h4{ font-size: 16px; line-height: 22px; padding-top: 4px; }
.shop-but .sum h4{ font-size: 12px; line-height: 22px; padding-top: 4px;color:#666; }
.shop-but .sum p{ font-size: 12px; line-height: 16px;}
.shop-but .button{position: relative;}
.shop-but .button a{display: block; height: 44px; line-height: 44px; font-size: 16px; border-radius: 0; text-align: center; color: #fff; background:red}
.shop-but .button a{display: block; height: 44px; line-height: 44px; font-size: 16px; border-radius: 0; text-align: center; color: #fff; background:#F3632C;}
.shop-but .button.dis a{background: #ccc;}
.shop-but .button span{ font-size: 12px; }
.shop-but .button .sxx{position: absolute;color:#1080d0;line-height: 44px;top:0px;left:-113%;background: #fff;display:none;}
.shop-but .checkallbox{line-height: 40px;padding-left:10px;box-sizing: border-box;margin-top: 10px;}
.shop-but .checkallbox{line-height: 40px;padding-left:18px;box-sizing: border-box;margin-top: 10px;}
.shop-but .button .but-orange{background: #ffa200;}
.shop-but .clearbtn{line-height: 44px;font-size: 14px!important;margin-right: 20px;}
.shop-but .delbtn{width:130px;}
......@@ -314,4 +333,46 @@
position:relative;
top:10px;
left:10px;
}
\ No newline at end of file
}
.zp-box{
margin:0 8px;
background: #FFFFFF;
box-shadow: 0px 0px 7px 0px rgba(180, 202, 211, 0.38);
border-radius:6px ;
margin-top: 10px;
}
.zp-box .zpc{
padding: 0 10px;
background: #fff;
padding-top: 10px;
z-index: 6;
padding-bottom: 10px;
}
.zp-box .zp-ti{
height: 27px;
background: #F7EDFF;
border-radius: 2px;
color:#5F0C9D;
line-height: 27px;
font-size: 12px;
padding: 0 6px;
margin-bottom: 5px;
}
.zp-box .zp-ti img{
height:21px;
width:21px;
vertical-align: middle;
}
.van-checkbox__icon--square{
background-color: #e7e7e7
}
.zy12{
position: relative;
left:-8.33333333%;
padding-left: 8px!important;
}
.f-red{
color:#FF693D!important;
}
.subtotal{position: relative;top:10px;}
\ No newline at end of file
......@@ -108,7 +108,7 @@ body {
overflow-x: hidden; }
.f-blue {
color: #1080d0; }
color: #1969F9; }
.f-red {
color: #ff0000; }
......
......@@ -16,7 +16,9 @@ const state = {
ly1LoseData:[],
ly2LoseData:[],
priceInit:false,
totlaMState:false
totlaMState:false,
isZpState:false,
zpInfo:[]
}
const mutations = {
......@@ -118,6 +120,7 @@ const actions = {
Services.cartList(qs.stringify(params)).then((res) => {
state.loading=false;
state.loading1=false;
state.isZpState=true;
let data = res.data;
if(types_==1){
//大陆
......@@ -143,7 +146,28 @@ const actions = {
state.loading1=false;
});
},
getCartMZInfo({commit},payload){
state.loading=true;
var params = {
cart_id: String(payload.cart_id)
}
Services.getCartMZInfo(qs.stringify(params)).then((res) => {
state.loading=false;
state.isZpState=false;
let data = res.data;
if (data.err_code == 0) {
state.zpInfo=data.data
}else{
state.zpInfo=[]
}
}).catch(function (err) {
state.loading = false;
});
},
cartDelete({commit},payload){
state.loading=true;
var params = {
......@@ -152,6 +176,7 @@ const actions = {
}
Services.cartDelete(qs.stringify(params)).then((res) => {
state.loading=false;
state.isZpState=true;
let data = res.data;
if (data.err_code == 0) {
commit({
......@@ -196,6 +221,7 @@ const actions = {
Services.changenum(qs.stringify(params)).then((res) => {
state.loading=false;
let data = res.data;
state.isZpState=true;
if (data.err_code == 0) {
commit({
type: 'changenum',
......
This diff is collapsed. Click to expand it.
{"h":"df7a2c19b6356e52cd6b","c":{"33":true}}
\ No newline at end of file
{"h":"f666077af6485d386b31","c":{"33":true}}
\ No newline at end of file
{"h":"cf01dd02580ff4ec4d06","c":{"app":true}}
\ No newline at end of file
{"h":"242232053f9635e4b110","c":{"33":true}}
\ No newline at end of file
{"h":"57f39c09188ffe4581cd","c":{"33":true}}
\ No newline at end of file
{"h":"d2e540e655b852fdd2a6","c":{"33":true}}
\ No newline at end of file
{"h":"efe66943c200001e0ff8","c":{"33":true}}
\ No newline at end of file
{"h":"b89b6d620e74bd25452e","c":{"33":true}}
\ No newline at end of file
This diff is collapsed. Click to expand it.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
{"h":"65f45b97c86f3b9c9b78","c":{"33":true}}
\ No newline at end of file
{"h":"b10908d0ac08e43cf953","c":{}}
\ No newline at end of file
This diff could not be displayed because it is too large.
{"h":"ab2f73763c6ec98c090d","c":{"33":true}}
\ No newline at end of file
This diff could not be displayed because it is too large.
{"h":"eb894c962c7715402876","c":{"33":true}}
\ No newline at end of file
This diff could not be displayed because it is too large.
{"h":"919918126fac38742505","c":{"33":true}}
\ No newline at end of file
{"h":"ff8bd744f2be85c4e778","c":{"33":true}}
\ No newline at end of file
This diff could not be displayed because it is too large.
{"h":"ad99d2eeb0d0d4548aee","c":{"33":true}}
\ No newline at end of file
{"h":"02c84c08bc7baefd092c","c":{"33":true}}
\ No newline at end of file
This diff could not be displayed because it is too large.
{"h":"97ae6ec3fcd05d28d7f4","c":{"33":true}}
\ No newline at end of file
This diff could not be displayed because it is too large.
{"h":"05b2c09fff42d9d382ec","c":{"app":true}}
\ No newline at end of file
This diff could not be displayed because it is too large.
{"h":"733acd25a4ff3570fbca","c":{"33":true}}
\ No newline at end of file
This diff could not be displayed because it is too large.
{"h":"af01db08e2d3971ff80a","c":{"app":true}}
\ No newline at end of file
{"h":"3204dbed493e9017ee5e","c":{"33":true}}
\ No newline at end of file
{"h":"6c0eeebef60a2936df08","c":{"33":true}}
\ No newline at end of file
{"h":"a4eadf97caa535833b5a","c":{"33":true}}
\ No newline at end of file
{"h":"5cf0bd80ef9ac37041e0","c":{"33":true}}
\ No newline at end of file
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
{"h":"b8b825d4a9adf6c86b3f","c":{"33":true}}
\ No newline at end of file
This diff is collapsed. Click to expand it.
This diff could not be displayed because it is too large.
{"h":"9fc3686f52d4aa04f6a2","c":{"33":true}}
\ No newline at end of file
This diff is collapsed. Click to expand it.
{"h":"9fc48a903e5eab6f7254","c":{"33":true}}
\ No newline at end of file
This diff could not be displayed because it is too large.
{"h":"15885e0e2a0d4a9c5bf6","c":{"33":true}}
\ No newline at end of file
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
{"h":"0699dd214cfdd741078a","c":{"33":true}}
\ No newline at end of file
This diff is collapsed. Click to expand it.
{"h":"ee6fae3f3a5a6f933c52","c":{"33":true}}
\ No newline at end of file
{"h":"14807ae7efb9b9c92471","c":{"33":true}}
\ No newline at end of file
This diff is collapsed. Click to expand it.
{"h":"ed2f43ba582d6315f47b","c":{"app":true}}
\ No newline at end of file
{"h":"536400d20c742f2d358e","c":{"app":true}}
\ No newline at end of file
{"h":"a33336ec30d6bb0ebae9","c":{}}
\ No newline at end of file
{"h":"ad91afc6b0b3949d9b4f","c":{"33":true}}
\ No newline at end of file
{"h":"c8d345aaac21b07f1a99","c":{"33":true}}
\ No newline at end of file
{"h":"19e042ec636297fcc409","c":{}}
\ No newline at end of file
{"h":"0974ef252f67d54adcfe","c":{"33":true}}
\ No newline at end of file
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
{"h":"e3aa0129c3807842f69e","c":{"app":true}}
\ No newline at end of file
This diff is collapsed. Click to expand it.
{"h":"8875f493f941ec8a7d55","c":{"33":true}}
\ No newline at end of file
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff could not be displayed because it is too large.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff could not be displayed because it is too large.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff could not be displayed because it is too large.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff is collapsed. Click to expand it.
This diff could not be displayed because it is too large.
This diff is collapsed. Click to expand it.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff is collapsed. Click to expand it.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff could not be displayed because it is too large.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment