From e6cd88d6a22dc2ab81fd911533a126f089fb92a5 Mon Sep 17 00:00:00 2001 From: "952108534@qq.com" <952108534@qq.com> Date: Thu, 20 Jan 2022 11:27:21 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E5=9C=B0=E5=9D=80=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rc-busness/assets/css/openaddress.less | 300 +++++++++++++++++- ...Forms-Switch-Off@3x.png => userselect.png} | Bin rc-busness/pages/useraddress/openaddress.vue | 35 +- 3 files changed, 323 insertions(+), 12 deletions(-) rename rc-busness/assets/image/{Forms-Switch-Off@3x.png => userselect.png} (100%) diff --git a/rc-busness/assets/css/openaddress.less b/rc-busness/assets/css/openaddress.less index 689de33e..ceb34702 100644 --- a/rc-busness/assets/css/openaddress.less +++ b/rc-busness/assets/css/openaddress.less @@ -1,11 +1,309 @@ -@media screen and (max-width:768px){ +.rc-margin-bottom--lg{ + margin: 0; +} +.usercontend { + display:inline-block; +} + +@media screen and (max-width:768px){ + .online{ + width:100%; + background:#d7d7d7; + margin-top:1.5rem; + height:.06rem; + &.bold{ + height:8px; + background:#f6f6f6; + } + } + .useredit{ + display: none; + } + .rc-button{ + display: flex; + align-items: center; + justify-content: center; + width: 375px; +height: 80px; +background: #FFFFFF; +box-shadow: 0px -3px 6px rgba(0, 0, 0, 0.1); +opacity: 1; +border-radius: 0px; + } + .rc-footbutton { + width: 164px; +height: 48px; +border: 2px solid #E2001A; +opacity: 1; +border-radius: 30px; +background: #E2001A; +display: flex; +justify-content: center; +align-items: center; +font-size: 16px; +color: #FFFFFF; + + + } +.rc-max-width--xl{ + + .rc-title { + display: flex; + align-items: center; + color: #333333; + font-size: 14px; + em { + font-style: normal; + font-size: 14px; + } + span { + display: block; + margin-left: 8px; + } + } + .rc-center{ + padding-top: 24px; + } + +} + + + + .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; + } + } + } + } @media screen and (min-width: 769px) + { + .usercontshow{ + .rc-button{ + display: none; + } + } + + .usercontend{ + margin-top: 40px; + } + .online{ + display: none; + } + .rc-button{ + display: none; + } + .useredit{ + width: 680px; +height: 164px; +background: #FFFFFF; +border: 1px solid #D7D7D7; +opacity: 1; +border-radius: 3px; +display: flex; +align-items: center; +justify-content: center; +img{ + width: 31px; + height: 31px; +} +span{ + color: #333333; + font-size: 18px; +} + } + .usercontend{ + .useradd{ + width: 680px; +height: 164px; +background: #FFFFFF; +border-radius: 3px; +img{ + width: 31px; + height: 31px; + display: block; +} + } + +} + .rc-max-width--xl{ + + .rc-center{ + margin-top: 24px; + margin-left: 24px; + } + .rc-cat{ + width: 640px; + border: 1px solid #D7D7D7; + border-radius: 3px; + position: relative; + margin-left: 40px; + height: 164px; + } + .rc-title { + display: flex; + align-items: center; + color: #333333; + font-size: 20px; + em { + font-style: normal; + } + span { + display: block; + margin-left: 32px; + font-size: 20px; + } + } + .rc-footer { + display: flex; + justify-content: space-between; + align-items: center; + margin-top: 20px; + display: flex; + align-items: center; + .rc-right { + position: absolute; + right: 24px; + top: 24px; + 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: 16px; + margin-top: 16px; + span{ + margin-left: 8px; + } + } + } + + } + .rc-max-width--xl{ + + + .rc-button { + height: 80px; + background: #ffffff; + box-shadow: 0px -3px 6px rgba(0, 0, 0, 0.1); + opacity: 1; + display: flex; + align-items: center; + justify-content: center; + display: block; + + .rc-footbutton { + width: 164px; + height: 48px; + border: 2px solid #e2001a; + opacity: 1; + border-radius: 30px; + display: flex; + align-items: center; + background: #e2001a; + span { + display: block; + text-align: center; + color: white; + font-size: 16px; + width: 100%; + } + } + } + .rc-header { + display: flex; + align-items: center; + color: #333333; + em { + font-style: normal; + font-size: 14px; + } + span { + display: block; + margin-left: 8px; + } + } + .rc-address { + margin-top: 16px; + 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: 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/image/Forms-Switch-Off@3x.png b/rc-busness/assets/image/userselect.png similarity index 100% rename from rc-busness/assets/image/Forms-Switch-Off@3x.png rename to rc-busness/assets/image/userselect.png diff --git a/rc-busness/pages/useraddress/openaddress.vue b/rc-busness/pages/useraddress/openaddress.vue index fc17013c..7c1a1f95 100644 --- a/rc-busness/pages/useraddress/openaddress.vue +++ b/rc-busness/pages/useraddress/openaddress.vue @@ -2,9 +2,11 @@
-
-
-
+
+
+
+
+
@@ -31,28 +33,39 @@
- +
- - +
-
+
+ +
+ +
+ + + 添加收货地址 +
新增收货地址
+
+ +
+ + \ No newline at end of file From e86acd1e858ed455113b7a89e2b1241fe0aa8166 Mon Sep 17 00:00:00 2001 From: "952108534@qq.com" <952108534@qq.com> Date: Thu, 20 Jan 2022 11:52:43 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rc-busness/assets/css/global.less | 97 +- rc-busness/assets/css/index.less | 319 +- rc-busness/assets/css/login.less | 6 +- rc-busness/assets/css/openaddress.less | 9 +- rc-busness/components/header.vue | 136 +- rc-busness/components/rc-footer.vue | 55 +- rc-busness/package-lock.json | 24974 ++++++++++++++++ rc-busness/pages/index.vue | 984 +- rc-busness/pages/myorder/userrecord.vue | 1399 +- rc-busness/pages/personal/discount.vue | 97 +- rc-busness/pages/personal/settlement.vue | 360 +- rc-busness/pages/personal/userpay.vue | 796 +- rc-busness/pages/productdetails/producted.vue | 719 +- rc-busness/pages/useraddress/openaddress.vue | 3 +- rc-busness/pages/userlogin/edit.vue | 3 +- rc-busness/pages/userlogin/login.vue | 3 +- 16 files changed, 27452 insertions(+), 2508 deletions(-) create mode 100644 rc-busness/package-lock.json diff --git a/rc-busness/assets/css/global.less b/rc-busness/assets/css/global.less index a7b638fe..8da2ca1c 100644 --- a/rc-busness/assets/css/global.less +++ b/rc-busness/assets/css/global.less @@ -8,38 +8,17 @@ body{ .fade-leave-active { opacity: 0; } -.ts-no-data{ - text-align: center; - margin:3rem 0; -} -.ts-mask{ - width:100%; - height:100%; - position: fixed; - top:0; - left:0; - display:flex; - flex-direction: column; - justify-content: center; - align-items: center; - z-index:99; - - .ts-mask-bg{ - background-color:#000; - opacity:.6; - width:100%; - height:100%; - z-index:0; - position:absolute; - left:0; - top:0; - } -} .userloding { + position: fixed; + left: 50%; + margin-left: -1.56rem; + top: 50%; + margin-top: -3.75rem; background: url(../image/onloading.png) center center no-repeat; width: 3.12rem; background-size: contain; - height: 3.12rem; + height: 7.5rem; + z-index: 1000; animation: rolling 4s infinite; -webkit-animation:rolling 4s infinite; } @@ -69,6 +48,8 @@ body{ } //用户光点 .rc-screen-reader{ + width: 0.81rem; + height: 0.81rem; border-radius: 50%; position: absolute; background-color: red; @@ -78,13 +59,6 @@ body{ width: 0.37rem; height: 0.37rem; } -.rc-menu--xs .rc-screen-reader{ - left: 30%; -} -.rc-list__link.ts-login--xs .rc-screen-reader{ - left:16%; -} - img, picture { display: block; max-width: 100%; @@ -111,8 +85,7 @@ img, picture { li{ border: 1px solid #D7D7D7; display: inline-flex; - border-bottom-left-radius: 4px; - border-bottom-right-radius: 4px; + border-radius: 4px; flex-direction: column; max-width:10rem; .rc-column @@ -144,7 +117,7 @@ img, picture { } img{ width:10rem; - min-height:10rem; + height:10rem; object-fit: contain; display: flex; margin: 0 auto; @@ -256,12 +229,13 @@ img, picture { right: 0; top: 30%; background: #FFFFFF; - box-shadow: 0 0 10px rgba(0, 0, 0, 0.16); + box-shadow: 0px 0px .62rem rgba(0, 0, 0, 0.16); border-radius: .25rem; z-index:3; ul{ width: 60px; height: 181px; + box-shadow: 0px 0px 6px rgb(0 0 0 / 10%); background-color: white; display: flex; flex-direction: column; @@ -339,9 +313,6 @@ img, picture { html { //font-size:100px; } - .rc-list__link.ts-login--xs .rc-screen-reader{ - left:7%; - } .rc-md-up { display: none!important; } @@ -352,7 +323,9 @@ img, picture { margin-top: 90px; } .rc-list__header { - + background: none; + padding: .5rem 0; + border-bottom: none; } .ts-right-arr { border-bottom:1px solid #E1001A; @@ -443,13 +416,8 @@ img, picture { display:block; li{ max-width:20rem; - min-width:18.75rem; - width:22.8vw; //margin-right:.875rem; - margin-left:2vw; - padding-left:1px; - padding-right:1px; - box-sizing: border-box; + margin-left:2.2vw; .rc-column{ span{ font-size:1.875rem; @@ -464,7 +432,7 @@ img, picture { } } img{ - width:100%; + width:21.7vw; max-width:320px; min-width:160px; } @@ -571,40 +539,35 @@ img, picture { } h2{ font-size:20px; - padding-bottom:1rem; } .ts-scrollable { - padding-bottom:1rem; - scrollbar-width: thin; li { margin-left: 30px; width: 8.125rem; height: 2.5rem; - //line-height: 40px; + line-height: 40px; font-size: .875rem; - padding:.375rem; } - + /* &::-webkit-scrollbar{ - height: 6px; - width:50%; - background:transparent; + background:unset; + height:4px; } &::-webkit-scrollbar-thumb{ background-color:#d7d7d7; - border-radius:10px; - width:50%; + height:2px; } &::-webkit-scrollbar-track{ - //background-color:#ddd; - background-color:transparent; + background-color:ddd; + + height:2px; } &::-webkit-scrollbar-button{ background:unset; } - /* */ + */ } } @@ -626,10 +589,10 @@ img, picture { { .ts-product-list { display:flex; - //justify-content: space-between; + justify-content: space-between; li{ - //margin-left:0; - //margin-right:0; + margin-left:0; + margin-right:0; } } } \ No newline at end of file diff --git a/rc-busness/assets/css/index.less b/rc-busness/assets/css/index.less index 24dc4cef..fc6f260e 100644 --- a/rc-busness/assets/css/index.less +++ b/rc-busness/assets/css/index.less @@ -5,98 +5,47 @@ /deep/.van-swipe__indicator--active{ background-color: #E1001A; } - -.ts-carousel-indicator{ - /deep/.swiper-pagination-bullet{ - margin-left:.5rem; - } - /deep/.swiper-pagination-bullet-active{ - background:#E2001A; - } - &.center{ - width:100%; - text-align: center; - } -} -.ts-position-identifier{ - -} -.ul-zhuan,.ul-dog{ - li{ - background: unset; - img{ - border-radius: 50%; - } - &:first-child{ - margin-left:0; - } - &.active { +.rc-ma{ + .ul-zhuan{ + li{ + background: unset;; img{ - border: 3px solid #E2001A; + border-radius: 50%; } - color: #E2001A; - - } - &.unactive { - color: #444444; - img{ - border: 3px solid #D7D7D7; + &.active { + img{ + border: 3px solid #E2001A; + } + color: #E2001A; + + } + &.unactive { + color: #444444; + img{ + border: 3px solid #D7D7D7; + } } } } } - .uservideo{ overflow: hidden; video{ - width:100%; - height:auto; - } -} -.ul-dog{ - width: 100%; - display: flex; - justify-content: center; - flex-wrap: wrap; - flex-direction: row; - - span{ - margin-top: .5rem; - display: block; - } - img{ - width: 9.5rem; - height: auto; - display: block; - } - li{ - cursor: pointer; - font-size: 16px; - text-align: center; - margin-top:3rem; - margin-left:3rem; + height:100%; + width:auto; } } @media screen and (max-width:768px){ .ul-dog{ - justify-content: space-evenly; - img{ - width:4rem; - height:auto; - } - li{ - margin-top:1.875rem; - } + display: none; } - .ts-banner-swiper-container{ - margin-bottom:2.5rem; - } - .searchBara{ + .searchBara{ + position: fixed; width: 100%; position: fixed; - top:3.75rem; + top:66px; background: white; - z-index: 60; + z-index: 9999; overflow-x: auto; white-space: nowrap; overflow-y:hidden; @@ -113,14 +62,16 @@ display: inline-block; margin-left: 0.20rem; text-align: center; + background: #F6F6F6; border-radius: 50%; opacity: 1; } - } - .rc-login{ - width: 92%; - margin:0 auto; - } + } + + .rc-login{ + width: 92%; + margin:0 auto; + } .userunlogin{ width: 100%; height: 0.60rem; @@ -150,6 +101,9 @@ } } + .van-swipe{ + z-index: 2; + } .rc-usermessage{ span{ font-size: 1rem; @@ -165,12 +119,10 @@ height: auto; object-fit: cover; } - - .van-swipe{ - z-index: 2; - } + .van-swipe-item { color: #fff; + height: 26.31rem; width: 100%; font-size: 0.20px; text-align: center; @@ -182,44 +134,52 @@ display: none; } #xxxFullScreen { - background-color: white; - margin-top: 0.40rem; - .swiper-container{ - height: 6.45rem; - } - .swiper-container { - width: 100%; - height: 100%; - position: relative; - } - .swiper-container .swiper-wrapper .swiper-slide { - width: 17.25rem; - //height: 6.45rem !important; //Auto adaption - } + background-color: white; + margin-top: 0.40rem; + #swiper1 { + overflow: hidden; + } + .swiper-container{ + height: 6.45rem; + } + .swiper-container, .swiper-container2 { + width: 100%; + // overflow: visible !important; + height: 100%; + position: relative; + } + #swiper1 .swiper-container .swiper-wrapper .swiper-slide { + width: 17.25rem; + //height: 6.45rem !important; //Auto adaption + } - /* 上一张 */ - swiper-container .swiper-wrapper .swiper-slide-prev { - margin-top: 0.05rem; - height: 100%; - } - /* 下一张 */ - .swiper-container .swiper-wrapper .swiper-slide-next { - margin-top: 0.05rem; - height: 100%; - } - .swiper-container .swiper-wrapper .swiper-slide-active { - height: 100%; - } - .uservideo{ - width: 100%; - height:auto; - display: block; - video{ - max-width:100%; - max-height:100%; - } + /* 上一张 */ + #swiper1 .swiper-container .swiper-wrapper .swiper-slide-prev { + margin-top: 0.05rem; + height: 100%; + + } + /* 下一张 */ + #swiper1 .swiper-container .swiper-wrapper .swiper-slide-next { + margin-top: 0.05rem; + height: 100%; + + } + .swiper-container .swiper-wrapper .swiper-slide-active { + height: 100%; + + } + .uservideo{ + width: 100%; + height:auto; + max-height: 15.68rem; + display: block; + video{ + max-width:100%; + max-height:100%; } } + } .sw-center{ width: 100%; display: flex; @@ -232,9 +192,8 @@ width: 100%; display: flex; flex-direction: column; - justify-content: flex-start; + justify-content: center; align-items: center; - vertical-align: top; } img{ width: 10rem; @@ -250,7 +209,6 @@ margin-top: 1.25rem; } p{ - color: #666666; font-size: .875rem; text-overflow: -o-ellipsis-lastline; overflow: hidden; @@ -273,14 +231,16 @@ /* 中间的图片 */ .swiper-container .swiper-wrapper .swiper-slide-active { - + height: 165px !important; } .swiperWrap{ - height: 469px; - width: 100%; + height: 469px; + width: 100%; img{ - height: 469px; - width: 100%; + height: 469px; + width: 100%; + + } /deep/.swiper-pagination-bullet-active{ background: red; @@ -341,22 +301,22 @@ } } + .active { + font-size: 0.14rem; + img{ + border-width: 1px; + } + } + .unactive { + font-size: 0.14rem; + img{ + border-width: 1px; + } + } // .usermain{ // display: none; // } } -.active { - font-size: 0.14rem; - img{ - border-width: 1px; - } -} -.unactive { - font-size: 0.14rem; - img{ - border-width: 1px; - } -} @media screen and (min-width: 769px) @@ -364,24 +324,14 @@ .rc-selection{ display: none; } - .sw-center{ - display: none; - } - .useraimg{ - width: 100%; - // height: 29.31rem; - object-fit: cover; - } - .ts-banner-swiper-container{ - position:relative; - img{ - margin:0 auto; - } - .ts-carousel-indicator{ - position:absolute; - bottom:.4rem; - } - } + .sw-center{ + display: none; + } +.useraimg{ +width: 100%; +// height: 29.31rem; +object-fit: cover; +} .van-swipe-item { color: #fff; height: 100%; @@ -400,12 +350,15 @@ #xxxFullScreen { background-color: white; // margin-top: 100px; - #swiper1,#swiper2 { + #swiper1 { + width: 100%; overflow: hidden; margin-top: 2.31rem; - } - h2{ - padding-bottom: 5rem; + + h2{ + padding-bottom: 5rem; + } + } .swiper-container2 { @@ -414,10 +367,10 @@ // overflow: visible !important; position: relative; } - #swiper1 .swiper-container .swiper-wrapper .swiper-slide { - width: 100%; - //height: 6.18rem; - } +#swiper1 .swiper-container .swiper-wrapper .swiper-slide { + width: 100%; + //height: 6.18rem; +} /* 上一张 */ #swiper1 .swiper-container .swiper-wrapper .swiper-slide-prev { @@ -565,18 +518,14 @@ img{ display: block; } img{ - width:100%; - height: auto; - object-fit: contain; + width: 10vw; + height: 10vw; display: block; } li{ - width: 10vw; - max-width:11rem; cursor: pointer; font-size: 16px; text-align: center; - overflow:hidden; } } @@ -591,7 +540,33 @@ img{ } .usermain{ - + .ul-dog{ + width: 100%; + display: flex; + justify-content: center; + flex-wrap: wrap; + flex-direction: row; + + span{ + margin-top: 2.5rem; + display: block; + } + img{ + width: 9.5rem; + height: 9.5rem; + display: block; + } + li{ + cursor: pointer; + font-size: 16px; + width: 9.875rem; + text-align: center; + height: 9.875rem; + background: #F6F6F6; + border-radius: 50%; + margin-left:3rem; + } + } } .rc-main{ width: 100%; diff --git a/rc-busness/assets/css/login.less b/rc-busness/assets/css/login.less index f302c4a0..8ba135c4 100644 --- a/rc-busness/assets/css/login.less +++ b/rc-busness/assets/css/login.less @@ -1,9 +1,7 @@ .container{ - min-height:100vh; + min-height:80vh; height:100%; background-color:#f6f6f6; - display: flex; - flex-direction: column; } .ts-max-width--460{ border-radius: 3px; @@ -55,13 +53,11 @@ } .container { font-size: 0.1rem; - background-color:#fff; .van-field__body { border-bottom: 1px solid red; } .content { margin-top: 24px; - box-shadow: unset; } .userfoget { font-size: 14px; diff --git a/rc-busness/assets/css/openaddress.less b/rc-busness/assets/css/openaddress.less index ceb34702..265696d3 100644 --- a/rc-busness/assets/css/openaddress.less +++ b/rc-busness/assets/css/openaddress.less @@ -3,9 +3,7 @@ .rc-margin-bottom--lg{ margin: 0; } -.usercontend { - display:inline-block; -} + @media screen and (max-width:768px){ .online{ @@ -48,7 +46,7 @@ color: #FFFFFF; } .rc-max-width--xl{ - + padding: 24px 20px 24px 20px; .rc-title { display: flex; align-items: center; @@ -117,6 +115,9 @@ color: #FFFFFF; @media screen and (min-width: 769px) { + .usercontend { + display:inline-block; +} .usercontshow{ .rc-button{ display: none; diff --git a/rc-busness/components/header.vue b/rc-busness/components/header.vue index ab013a1b..7c10461f 100644 --- a/rc-busness/components/header.vue +++ b/rc-busness/components/header.vue @@ -6,7 +6,6 @@
  • @@ -68,16 +75,16 @@
  • - +
  • - +
  • - 定制营养方案 + 定制营养方案
  • + + + + +
    \ No newline at end of file diff --git a/rc-busness/pages/personal/discount.vue b/rc-busness/pages/personal/discount.vue index 7767e6e3..bc4b7994 100644 --- a/rc-busness/pages/personal/discount.vue +++ b/rc-busness/pages/personal/discount.vue @@ -75,7 +75,79 @@ export default { userstates:0, userimage: require("../../assets/image/unused.png"), newlist: [ - + { + price: "30", + pricestype: "新客优惠券", + special: "全场每满299-30", + period: "有效期", + starttime: "2021.11.29-2022.01.28", + catimage: require("../../assets/image/unused.png"), + }, + { + price: "30", + pricestype: "新客优惠券", + special: "全场每满299-30", + period: "有效期", + starttime: "2021.11.29-2022.01.28", + catimage: require("../../assets/image/unused.png"), + }, + { + price: "30", + pricestype: "新客优惠券", + special: "全场每满299-30", + period: "有效期", + starttime: "2021.11.29-2022.01.28", + catimage: require("../../assets/image/unused.png"), + }, + { + price: "30", + pricestype: "新客优惠券", + special: "全场每满299-30", + period: "有效期", + starttime: "2021.11.29-2022.01.28", + }, + { + price: "30", + pricestype: "新客优惠券", + special: "全场每满299-30", + period: "有效期", + starttime: "2021.11.29-2022.01.28", + }, + { + price: "30", + pricestype: "新客优惠券", + special: "全场每满299-30", + period: "有效期", + starttime: "2021.11.29-2022.01.28", + }, + { + price: "30", + pricestype: "新客优惠券", + special: "全场每满299-30", + period: "有效期", + starttime: "2021.11.29-2022.01.28", + }, + { + price: "30", + pricestype: "新客优惠券", + special: "全场每满299-30", + period: "有效期", + starttime: "2021.11.29-2022.01.28", + }, + { + price: "30", + pricestype: "新客优惠券", + special: "全场每满299-30", + period: "有效期", + starttime: "2021.11.29-2022.01.28", + }, + { + price: "30", + pricestype: "新客优惠券", + special: "全场每满299-30", + period: "有效期", + starttime: "2021.11.29-2022.01.28", + }, ], discountlist: [ { @@ -90,7 +162,27 @@ export default { ], preferential: [ - + { + price: "30", + pricestype: "新客优惠券", + special: "全场每满299-30", + period: "有效期", + starttime: "2021.11.29-2022.01.28", + }, + { + price: "30", + pricestype: "新客优惠券", + special: "全场每满299-30", + period: "有效期", + starttime: "2021.11.29-2022.01.28", + }, + { + price: "30", + pricestype: "新客优惠券", + special: "全场每满299-30", + period: "有效期", + starttime: "2021.11.29-2022.01.28", + }, ], userdiscount:[], activeIndex: 0, @@ -189,5 +281,6 @@ import Myheader from "~/components/header.vue"; \ No newline at end of file diff --git a/rc-busness/pages/personal/settlement.vue b/rc-busness/pages/personal/settlement.vue index f600c887..878947ec 100644 --- a/rc-busness/pages/personal/settlement.vue +++ b/rc-busness/pages/personal/settlement.vue @@ -1,5 +1,5 @@ @@ -113,18 +112,23 @@ export default { meta: {title: '订单结算'}, data() { return { - goldmedal: [], + goldmedal:[], addressstype: null, - orderstatus: "", - userisdelivery: "待收货", + orderstatus: '', + userisdelivery:'待收货', userdelivery: "派送中", - isshow: true, + isshow:true, leftico: require("../../assets/image/rc-left.png"), - orderNumber: "", - dialogAdd: false, - editAddressData: {}, - curAddress: {}, - saveType: "", + orderNumber:'', + + // delivery: [ + // { + // state: "派送中", + // time: "2021-11-21", + // address: "广州天河—刘某某【15124617917】正在派送中", + // }, + // ], + useraddress: [ { state: "李某某", @@ -166,166 +170,40 @@ export default { promotion: "¥167.00", payment: "¥0.00 ", }, + information: { + reference: "1111111111111111", + ordertime: "2012-12-01 11:20:00", + paymentmethod: "微信支付", + distribution: "快递", + trackingnumber: "11111111111111", + catimage: require("../../assets/image/rc-left.png"), + }, }; }, - computed: { - // 总价计算 - sumPrice() { - return this.goldmedal - .reduce((pre, cur) => { - console.log(pre); - return pre + cur.buyCount * cur.productPrice; - }, 0); - }, - }, methods: { - async getAddressList() { - let memberId = JSON.parse(localStorage.getItem("userInfo")).data.id; - let { data } = await memberAddress("getAll", { memberId: memberId }); - data.forEach((item) => { - item.address = - item.provinceName + - item.cityName + - item.districtName + - item.detailAddress; - }); - this.useraddress = data; - console.log(data); - }, - editAddress(item) { - this.editAddressData = { - memberId: item.memberId, - name: item.recipient, - tel: item.recipientPhone, - detailAddress: item.detailAddress, - id: item.id, - city: item.cityName, - districtId: item.districtName, - saveType: "edit", - }; - this.dialogAdd = true; - }, - addAddress() { - this.editAddressData = {}; - this.dialogAdd = true; - }, - selectAddress(cur) { - this.useraddress.forEach((item) => { - if (item.id == cur.id) { - item.isDefault = true; - } else { - item.isDefault = false; - } - }); - - }, - dialogCtrl(parm) { - this.dialogAdd = parm; - this.getAddressList(); - }, - async jiesuan() { - let orderAddress = this.useraddress.filter(item=>item.isDefault) - let postData =[] - this.goldmedal.forEach(item=>{ - let oneProduct={ - productName: item.productName, - buyCount: item.buyCount, - productId:item. productCode, - payAmount: item.productPrice, - memberId: item.memberId, - phoneNumber: item.mobile, - // couponId: "NGQ2022P12", - // couponTypeId: "4", - // couponName: "内购券", - // couponAmount: "0.3175", - // couponCode: "0007792402", - orderAddress: { - addressPhoneNumber:orderAddress[0].recipientPhone, - addressUserName:orderAddress[0].recipient, - addressProvinceName: orderAddress[0].provinceName, - addressCityName:orderAddress[0].cityName, - addressCountyName: orderAddress[0].districtName, - addressDetailInfo: orderAddress[0].detailAddress, - }, - } - postData.push(oneProduct) - }) - // let postData = [ - // { - // productName: this.goldmedal.productName, - // buyCount: "2", - // productId: "20030200", - // payAmount: "147.00", - // memberId: "844350", - // phoneNumber: "18112621098", - // couponId: "NGQ2022P12", - // couponTypeId: "4", - // couponName: "内购券", - // couponAmount: "0.3175", - // couponCode: "0007792402", - // orderAddress: { - // addressPhoneNumber:orderAddress[0].recipientPhone, - // addressUserName:orderAddress[0].recipient, - // addressProvinceName: orderAddress[0].provinceName, - // addressCityName:orderAddress[0].cityName, - // addressCountyName: orderAddress[0].districtName, - // addressDetailInfo: orderAddress[0].detailAddress, - // }, - // }, - // // { - // // productName: "幼猫全价粮", - // // buyCount: "2", - // // productId: "20030200", - // // payAmount: "147.00", - // // memberId: "844350", - // // phoneNumber: "18112621098", - // // couponId: "NGQ2022P12", - // // couponTypeId: "4", - // // couponName: "内购券", - // // couponAmount: "0.3175", - // // couponCode: "0007792402", - // // orderAddress: { - // // addressPhoneNumber: "13602898745", - // // addressUserName: "张三", - // // addressProvinceName: "江苏省", - // // addressCityName: "无锡市", - // // addressCountyName: "江阴市", - // // addressDetailInfo: "东苑一村", - // // }, - // // }, - // ]; - // let res = await generateOrderWX(postData); - // if (res.success) { - // let payData=res.data - let userPayData={ - postData:postData, - wxPay:'weixin://wxpay/bizpayurl?pr=4RJbokxzz' - - } +jiesuan(){ + // let userdata=this.$route.query.wxdata this.$router.push({ - path: "/personal/userpay", - query: { - userPayData: userPayData, - }, - }); - // } - }, - async canceldanhao(orderNumber) { - let data = await userin(orderNumber); - console.log(data); - // this.goldmedal=data; - console.log(this.goldmedal); - }, + path: "/personal/userpay", + query: { + wxdata:userdata + }, + + }); +}, + async canceldanhao(orderNumber){ + let data=await userin(orderNumber); + console.log(data); +// this.goldmedal=data; + console.log(this.goldmedal); +}, }, mounted() { - this.goldmedal = this.$route.query.list; - console.log(this.$route.query.list); - this.getAddressList(); - // this.addressstype = this.$route.query.stype; - // this.orderNumber = this.$route.query.orderNumber; - // this.canceldanhao(this.orderNumber); - // console.log(this.$refs.rccolor); - // this.$refs.rccolor.style.background = "gray"; + this.addressstype = this.$route.query.stype; + this.orderNumber=this.$route.query.orderNumber; + this.canceldanhao(this.orderNumber) + console.log(this.$refs.rccolor) + this.$refs.rccolor.style.background='gray'; }, components: { Myheader, diff --git a/rc-busness/pages/personal/userpay.vue b/rc-busness/pages/personal/userpay.vue index 2e3c85fb..a3070243 100644 --- a/rc-busness/pages/personal/userpay.vue +++ b/rc-busness/pages/personal/userpay.vue @@ -1,320 +1,578 @@ \ No newline at end of file diff --git a/rc-busness/pages/productdetails/producted.vue b/rc-busness/pages/productdetails/producted.vue index 96b4f4c9..dc8b3529 100644 --- a/rc-busness/pages/productdetails/producted.vue +++ b/rc-busness/pages/productdetails/producted.vue @@ -73,222 +73,159 @@
    +
    +
    +
    +
    + 商品规格:
    - -
    -
    - -
    -
    -
    -
    -
    -

    {{ item.productName }}

    -
    -
    -
    -
    -
    -
    - 商品价格: - ¥{{ item.rsp }} - ¥{{ item.ecPrice }} - -
    -
    -
    - 活动促销: - 全场商品限时优惠 -
    - 立即领取 -
    -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    - 商品规格: -
    - - - {{ item.specifications }} - -
    -
    -
    -
    -
    商品数量:
    - - {{ sales_num }} - -
    -
    -
    -
    -
    -
    -
    -
    - 加入购物车 - 立即购买 -
    -
    -
      -
    • - 服务说明:当天14点前完成付款即日安排发货;当天14点后完成付款次日安排发货(周日及国家法定节假日顺延至下一个工作日发货,活动期间发货或有延迟敬请理解) -
    • -
    • - 商品运费:全场包邮(港澳除外) -
    • + + {{ item.specifications }} + +
    +
    +
    +
    +
    商品数量:
    + + {{sales_num}} + +
    +
    +
    +
    +
    +
    +
    +
    +
      +
    • + 服务说明:当天14点前完成付款即日安排发货;当天14点后完成付款次日安排发货(周日及国家法定节假日顺延至下一个工作日发货,活动期间发货或有延迟敬请理解) +
    • +
    • + 商品运费:全场包邮(港澳除外) +
    • -
    • - 商品编号:{{ item.brandCode }} -
    • -
    +
  • + 商品编号:{{ item.brandCode }} +
  • + +
    +
    + 加入购物车 + 立即购买 +
    +
    +
    +
    +
    + +
    +
    +
    + + +
    +
    + +
    + + 回到顶部 +
    +
    + + + +
    +
    + +
    +
    +
    + {{ item.couponAmount }}
    -
    -
    -
    -
    - -
    - -
    -
    -
      -
    • - - {{ userfixed.title }} -
    • -
    -
    - - 回到顶部 -
    -
    - - - -
    -
    - -
    -
    -
    -

    -
    -
    - - {{ item.special }} - -
    - 有效期 - {{ item.starttime }} -
    -
    -
    -
    - - -
    -
    - -
    -
    -

    温馨提示

    - 请先点击下方进行登录/注册 -
    - -
    - 立即登录 -
    -
    -
    -
    -
    - 加入购物车 - 立即购买 + +
    + + + +
    +
    + +
    +
    +

    温馨提示

    + 请先点击下方进行登录/注册 + +
    + +
    + 立即登录 + +
    +
    + + +
    +
    + 加入购物车 + 立即购买 +