diff --git a/rc-busness/ajax/getData.js b/rc-busness/ajax/getData.js index 9805de0b..c5b9404b 100644 --- a/rc-busness/ajax/getData.js +++ b/rc-busness/ajax/getData.js @@ -608,3 +608,16 @@ export const getOrderList = (user, status) => { return fetch('/api/getOrderList', data) } + + + //购物车操作 + export const memberAddress = (type,data) => { + return fetch('memberAddress?type='+type, data, 'POST' ) + } + + + //支付宝支付二维码 + export const generateOrderAlipay = (data) => { + return fetch('generateOrderAlipay', data, 'POST' ) + } + \ No newline at end of file diff --git a/rc-busness/assets/css/global.less b/rc-busness/assets/css/global.less index fab7ae2a..4c1f0fd5 100644 --- a/rc-busness/assets/css/global.less +++ b/rc-busness/assets/css/global.less @@ -625,4 +625,73 @@ img, picture { //margin-right:0; } } -} \ No newline at end of file +} +.rc_contline { + border-bottom: 3px solid #f6f6f6; + height: 0px; + margin: 0; + clear: both; +} + +.page_modules { + padding-top: 60px; +} + +.cont_modules { + margin: 0 auto; + max-width: 1400px; +} + +.inline_right { + display: flex; + justify-content: space-between; + width: 100%; +} + +.inline_mid { + display: flex; + justify-content: space-around; + width: 100%; +} + +.inline_left { + display: flex; + justify-content: space-evenly; + width: 100%; + +} + +.li_inline { + li { + display: inline-block; + vertical-align: middle; + } + +} + +.color_red { + color: #E2001A; +} + +.tc { + text-align: center; +} + +.tr { + text-align: right; +} +.el-dialog{ + width: 90%; + max-width: 440px; +} +#tns2-iw{ height: 90px;} +.rc-carousel:not(.rc-carousel--loaded){visibility:visible!important} +@media screen and (max-width: 768px) { + .el-message-box{ + width: 300px; + } + .el-dialog{ + width: 90%; + } + } + \ No newline at end of file diff --git a/rc-busness/assets/css/openaddress.less b/rc-busness/assets/css/openaddress.less index e7169c56..a5cdbf3a 100644 --- a/rc-busness/assets/css/openaddress.less +++ b/rc-busness/assets/css/openaddress.less @@ -69,46 +69,6 @@ color: #FFFFFF; - .rc-address { - margin-top: 8px; - text-overflow: -o-ellipsis-lastline; - overflow: hidden; - text-overflow: ellipsis; - display: -webkit-box; - -webkit-line-clamp: 2; - line-clamp: 2; - -webkit-box-orient: vertical; - font-size: 14px; - color: #333333; - } - .rc-footer { - display: flex; - justify-content: space-between; - align-items: center; - margin-top: 20px; - display: flex; - align-items: center; - .rc-right { - span { - border-bottom: 1px solid #666666; - } - span:first-child { - margin-right: 16px; - } - } - img{ - width: 43px; - } - .rc-foot{ - display: flex; - align-items: center; - color: #333333; - font-size: 14px; - span{ - margin-left: 8px; - } - } - } } @@ -274,24 +234,5 @@ img{ font-size: 20px; color: #333333; - } - .rc-footer { - display: flex; - justify-content: space-between; - align-items: center; - padding-bottom: 20px; - margin-top: 8px; - .rc-right { - span { - border-bottom: 1px solid #666666; - } - span:first-child { - margin-right: 16px; - } - } - } - - } - } \ No newline at end of file diff --git a/rc-busness/assets/css/producted.less b/rc-busness/assets/css/producted.less index 26d06bdf..1233788a 100644 --- a/rc-busness/assets/css/producted.less +++ b/rc-busness/assets/css/producted.less @@ -144,10 +144,6 @@ } } } - /deep/.el-dialog { - width: 80%; - position: relative; - } .rc-discount { position: relative; width: 100%; @@ -169,8 +165,7 @@ align-items: center; justify-content: center; color: #e1001a; - padding-right: 21px; - width: 30%; + width: 34%; float: left; height: 100%; i { @@ -190,7 +185,7 @@ .rc-right { display: flex; flex-direction: column; - margin-left: 36px; + padding-left: 20px; justify-content: center; height: 100%; i { @@ -204,7 +199,7 @@ } span { display: block; - margin-top: 8px; + margin-top: 2px; } em { font-style: normal; @@ -405,11 +400,6 @@ } } } - /deep/.el-dialog { - width: 440px; - height: 432px; - position: relative; - } .rc-discount { position: relative; img { @@ -430,8 +420,7 @@ align-items: center; justify-content: center; color: #e1001a; - padding-right: 21px; - width: 30%; + width: 34%; float: left; height: 100%; i { @@ -451,7 +440,7 @@ .rc-right { display: flex; flex-direction: column; - margin-left: 36px; + padding-left: 20px; justify-content: center; height: 100%; i { @@ -465,7 +454,7 @@ } span { display: block; - margin-top: 8px; + margin-top: 2px; } em { font-style: normal; @@ -586,4 +575,17 @@ } } +} + +.rc-carousel__gallery-thumbnail{ + display: inline; + .rc-img--square{ + border: 1px solid #ddd; + border-radius: 3px; + } + &.rc-carousel__gallery-thumbnail--active{ + .rc-img--square{ + border: 1px solid #E2001A; + } + } } \ No newline at end of file diff --git a/rc-busness/assets/pay/fail.png b/rc-busness/assets/pay/fail.png new file mode 100644 index 00000000..71821a9b Binary files /dev/null and b/rc-busness/assets/pay/fail.png differ diff --git a/rc-busness/assets/pay/wx.png b/rc-busness/assets/pay/wx.png new file mode 100644 index 00000000..7316a9d7 Binary files /dev/null and b/rc-busness/assets/pay/wx.png differ diff --git a/rc-busness/assets/pay/zfb.png b/rc-busness/assets/pay/zfb.png new file mode 100644 index 00000000..c68db2ab Binary files /dev/null and b/rc-busness/assets/pay/zfb.png differ diff --git a/rc-busness/components/addressInput.vue b/rc-busness/components/addressInput.vue index d3dc23b1..98337ec5 100644 --- a/rc-busness/components/addressInput.vue +++ b/rc-busness/components/addressInput.vue @@ -1,6 +1,6 @@