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 1/2] =?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 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 }} +
    • + +
    +
    + 加入购物车 + 立即购买 +
    +
    +
    +
    +
    + +
    +
    +
    + + +
    +
    +
      +
    • + + {{userfixed.title}} +
      • +
    +
    + + 回到顶部 +
    +
    + +
    + +
    +
    + +
    +
    +
    + ￥{{ item.couponAmount }}
    -
    -
    -
    -
    -
    -
    - -
    -
    - -
    - - 回到顶部 -
    -
    - - - -
    -
    - -
    -
    -
    ￥
    -

    -
    -
    - - {{ item.special }} - -
    - 有效期 - {{ item.starttime }} -
    -
    - 立即领取 +
    + + {{ item.couponDesc }} + +
    + 有效期 + {{ item.validTo }} +
    +
    + 立即领取 +
    + +
    -
    -
    - - -
    -
    - -
    -
    -

    温馨提示

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

    温馨提示

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