+ 
+ 
+ 
+
-
@@ -65,7 +99,7 @@
-
@@ -279,7 +313,7 @@
-
@@ -295,7 +329,7 @@
-
@@ -739,22 +773,19 @@
userserachlist:[{}],
doggan:[],
dogtype:[
- {
- title: "幼犬",
- },
- {
- title: "成犬",
- },
- {
- title: "老年犬",
- },
- {
- title: "品种犬",
- },
- {
- title: "亚健康",
- }
- ],
+ {
+ title: "离乳期",
+ },
+ {
+ title: "幼年",
+ },
+ {
+ title: "成年",
+ },
+ {
+ title: "老年",
+ }
+ ],
anchor:'',
dogshi:[],
catlist:[],
@@ -823,22 +854,17 @@
],
discoun: [
{
- title: "幼猫",
+ title: "<4月龄",
},
{
- title: "成猫",
+ title: "4-12月龄",
},
{
- title: "老年猫",
- },
- {
- title: "品种猫",
-
-
+ title: "1-7岁",
},
{
- title: "亚健康猫"
- },
+ title: ">7岁"
+ }
],
discountlist: [
@@ -1065,7 +1091,11 @@
centeredSlides: true,
speed:1000,
spaceBetween: 0,
- autoplay: true,
+ autoplay: {
+ delay: 3000,
+ stopOnLastSlide: false,
+ disableOnInteraction: false,
+ },
pagination: {
el: '#homeBannerSwiperPagnation',
clickable:true
@@ -1370,13 +1400,14 @@
userdogShi(){
this.activeIndex5=(this.activeIndex5?this.activeIndex5:0);
let apiDogSize=this.userdoglist[this.activeIndex5].title;
- let apiDogFoodType=this.dogtype[this.quanshiCurIndex].title;
+ let apiDogAgeType=this.dogtype[this.quanshiCurIndex].title;
this.userstype=1;
let petType={
petType:1,
- categoryName:"皇家犬湿粮",
- name:apiDogFoodType,
+ tagStatus:2,
+ tagUsedAge:apiDogAgeType,
+ name:apiDogSize
}
for(let i =0;i
-
-
-
-
- 
- 商品
+
+
- 商品
+
+
+
+
-
-
+
+ 商品
-
- 单价
- 数量
- 操作
-
-
-
-
- 
- 编辑
-
-
- 编辑
-
-
-
\ No newline at end of file
diff --git a/rc-busness/pages/personal/settlement.less b/rc-busness/pages/personal/settlement.less
new file mode 100644
index 00000000..692f3bc5
--- /dev/null
+++ b/rc-busness/pages/personal/settlement.less
@@ -0,0 +1,415 @@
+ul li ol li em strong i {
+ list-style: none;
+ font-style: normal;
+}
+
+.rc-header {
+ width: 100%;
+}
+
+
+
+.settlement {
+ padding-top: 100px;
+}
+
+
+.rc-main {
+ width: 92%;
+ margin: 0 auto;
+ max-width: 1400px;
+
+ .rc-userbottomm {
+ display: none;
+ }
+
+ .rc-border {
+ width: 100%;
+ border-bottom: 1px solid #d7d7d7;
+ margin-top: 32px;
+ }
+
+ .rc-receiving {
+ width: 100%;
+ height: 80px;
+ display: flex;
+ flex-direction: column;
+
+ em {
+ font-style: normal;
+ color: #e1001a;
+ font-size: 26px;
+ }
+
+ span {
+ color: #666666;
+ font-size: 16px;
+ display: block;
+ margin-top: 25px;
+ }
+ }
+
+ .delivery {
+ display: flex;
+ flex-direction: column;
+ height: 140px;
+ display: flex;
+ justify-content: center;
+
+ .viewdetails {
+ display: flex;
+ align-items: center;
+ justify-content: flex-end;
+
+ span {
+ color: #444444;
+ font-size: 18px;
+ display: block;
+ margin-right: 8px;
+ }
+
+ img {
+ width: 8px;
+ height: 16px;
+ }
+ }
+
+ .to-delivery {
+ display: flex;
+ align-items: center;
+ font-style: normal;
+
+ span {
+ display: block;
+ // margin-left: 16px;
+ font-size: 18px;
+ color: #333333;
+ }
+
+ i {
+ font-style: normal;
+ margin-left: 8px;
+ display: block;
+ font-size: 18px;
+ color: #999999;
+ }
+ }
+
+ .bo-delivery {
+ span {
+ font-size: 16px;
+ color: #666666;
+ display: block;
+ margin-top: 16px;
+ }
+ }
+ }
+
+ .address-list {
+ display: flex;
+
+ .mypersonal {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ border: 1px solid #808285;
+ height: 118px;
+ width: 320px;
+ padding: 15px;
+ color: #333333;
+ margin: 20px 40px 20px 0;
+ position: relative;
+ cursor: pointer;
+
+ &.active {
+ border: 1px solid #E2001A;
+ }
+
+ .edit {
+ position: absolute;
+ top: 5px;
+ right: 8px;
+ display: none;
+ cursor: pointer;
+ }
+
+ &:hover {
+ .edit {
+ display: block;
+ }
+ }
+
+ .my-delivery {
+ display: flex;
+ align-items: center;
+ font-style: normal;
+
+ span {
+ display: block;
+ margin-left: 3px;
+
+ }
+
+ i {
+ font-style: normal;
+ margin-left: 3px;
+ display: block;
+ }
+ }
+
+ .per-delivery {
+ span {
+ color: #666666;
+ display: block;
+ margin-top: 5px;
+ }
+ }
+ }
+ }
+
+
+ .rc-usermain {
+ display: flex;
+ padding: 20px 0;
+
+ .rc-image {
+ border: 1px solid #d8d8d8;
+ margin-right: 20px;
+
+ img {
+ width: 96px;
+ height: 96px;
+ display: block;
+ }
+ }
+
+ .rc-right {
+ .rc-usercenter {
+ display: flex;
+ justify-content: center;
+ flex-direction: column;
+
+ h3,
+ .price {
+ font-style: normal;
+ display: block;
+ font-size: 18px;
+ font-weight: bold;
+ margin-top: 17px;
+ color: #e1001a;
+ }
+ }
+
+ display: flex;
+ justify-content: space-between;
+ width: 100%;
+ }
+
+ .rc-userright {
+ display: flex;
+ flex-direction: column;
+ color: #666666;
+ font-size: 16px;
+
+ span {
+ display: block;
+ margin-top: 16px;
+ font-size: 16px;
+ }
+ }
+
+ .rc-userbottom {
+ display: flex;
+ width: 60%;
+ justify-content: space-between;
+ align-items: center;
+
+ .price {
+ font-style: normal;
+ color: #e1001a;
+ font-size: 20px;
+ font-weight: bold;
+ }
+
+ }
+ }
+
+ .rc-merchandise {
+
+ padding: 15px 0;
+
+ &::after {
+ display: block;
+ content: '';
+ clear: both;
+ }
+
+ ul {
+ width: 25%;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ line-height: 40px;
+ float: right;
+
+ i {
+ font-style: normal;
+ color: #666666;
+ }
+
+ li {
+ list-style: none;
+ font-style: normal;
+ display: flex;
+ justify-content: space-between;
+
+ span {
+ color: #333333;
+ }
+ }
+
+ li .red {
+ color: #e1001a;
+ font-size: 20px;
+ font-style: normal;
+ }
+ }
+ }
+
+ .rc-payment {
+ width: 100%;
+ margin-top: 80px;
+
+ .u-trackingnumber {
+ display: flex;
+ align-items: center;
+
+ i {
+ font-size: 18px;
+ font-style: normal;
+ margin-right: 16px;
+ }
+
+ img {
+ width: 8px;
+ height: 16px;
+ }
+ }
+
+ ul {
+ width: 100%;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ line-height: 40px;
+ font-size: 18px;
+
+ i {
+ font-style: normal;
+ color: #666666;
+ display: block;
+ }
+
+ li {
+ list-style: none;
+ font-style: normal;
+ display: flex;
+ justify-content: space-between;
+
+ span {
+ color: #333333;
+ }
+ }
+ }
+ }
+
+ .rc-foot {
+ display: flex;
+ flex-direction: column;
+
+ .rc-foo {
+ display: flex;
+ justify-content: flex-end;
+ flex-direction: column;
+ align-items: self-end;
+
+ i {
+ font-style: normal;
+ color: #333333;
+ font-size: 20px;
+ margin-right: 20px;
+ }
+
+ em {
+ font-style: normal;
+ color: #e1001a;
+ font-size: 26px;
+ }
+
+ span {
+ display: block;
+ width: 164px;
+ margin-top: 36px;
+ background: #e2001a;
+ line-height: 48px;
+ text-align: center;
+ color: white;
+ font-size: 16px;
+
+ height: 48px;
+
+ border-radius: 30px;
+ }
+ }
+ }
+}
+.diallog_width{
+ width: 100%;
+ max-width: 440px;
+ margin: 0 auto;
+}
+.el-dialog{
+ width: 100%;
+}
+//手机端
+@media screen and (max-width: 768px) {
+
+ .diallog_width{
+ width: 100%;
+
+ }
+ .rc-main {
+ .address-list {
+ display: contents;
+
+ .mypersonal {
+ width: 100%;
+ height: auto;
+ }
+ }
+ .rc-usermain {
+ .rc-right { display: table}
+ }
+ .rc-merchandise{
+ padding: 15px 0 120px;
+ ul{
+ float: none;
+ width: 100%;
+ }
+ }
+ .rc-foot{
+ .rc-foo{
+ display: flex;
+ justify-content: space-around;
+ flex-direction: row;
+ align-items: self-end;
+ position: fixed;
+ bottom: 0;
+ background: #fff;
+ width: 100%;
+ padding: 10px;
+ }
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/rc-busness/pages/personal/settlement.vue b/rc-busness/pages/personal/settlement.vue
index 878947ec..c8d0fd6f 100644
--- a/rc-busness/pages/personal/settlement.vue
+++ b/rc-busness/pages/personal/settlement.vue
@@ -1,168 +1,146 @@
-
-
-
-
-
-
-
-
-
- {{ item.productName }}
- 规格:{{ item.specifications }}
-
-
- ￥{{ item.productPrice }}
-
- 
- {{item.buyCount}}
- 
-
+
-
-
-
- {{item.buyCount}}
-
-
+
+
+
+
+
+ {{ editState }}
+
+
+
+
+ 全选
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
- 删除
规格：{{ item.specifications }}
-
+
- ￥{{ item.productPrice }} +
-
+ ++
+
+
+
+
- 删除 +
+
-
+
+
+
+
-
-
+ 编辑
+
- {{ dataaddress.state }}
- {{ dataaddress.tel }}
+ {{ item.recipient }}
+ {{ item.recipientPhone }}
- {{ dataaddress.address }}
+ {{ item.address }}
-
-
+
\ No newline at end of file
diff --git a/rc-busness/pages/personal/useraddress.vue b/rc-busness/pages/personal/useraddress.vue
index c9a878dc..3bbf2525 100644
--- a/rc-busness/pages/personal/useraddress.vue
+++ b/rc-busness/pages/personal/useraddress.vue
@@ -2,8 +2,8 @@
-
-
-
+
+
-
- ![]()
-
-
-
-
-
- {{ item.usereat }}
-
-
- 规格:{{ item.num }}
-
-
- 数量:{{ item.specification }}件
- ￥{{ item.userprice }}
-
-
-
- 联系客服申请售后
+
-
+
-
+
+ 添加收货地址
-
- 联系客服申请售后
-
-
-
-
-
-
- -
-
- - 配送方式: - {{ shopprice.price }} - -
- - 活动促销: - {{ shopprice.distribution }} - -
- - 商品总价: - {{ shopprice.promotion }} - -
- - 配送费用: - {{ shopprice.payment }} - -
-
-
-
-
-
- 合计金额:
- ￥167.00
-
-
- 再次购买
-
-
+
+
+
+
+
+ ![]()
+
+
+
+
+
+ {{ item.productName }}
+规格:{{ item.specifications }}
+
+
+ ￥{{ item.productPrice }}
+X{{ item.buyCount }}
+￥{{ item.productPrice }}
+
+
+
+
+
+
+ -
+
- + 配送方式: + {{ shopprice.price }} + +
- + 活动促销: + {{ shopprice.distribution }} + +
- + 商品总价: + {{ sumPrice }} + +
- + 配送费用: + {{ shopprice.payment }} + +
+
+
+
+
+
+
+ 合计金额:
+ {{ sumPrice }}
+
+
+ 提交订单
+
+
+
+
-
+
+
+
@@ -300,360 +298,6 @@ async canceldanhao(orderNumber){
\ No newline at end of file
diff --git a/rc-busness/pages/personal/userpay.vue b/rc-busness/pages/personal/userpay.vue
index a3070243..6122d45f 100644
--- a/rc-busness/pages/personal/userpay.vue
+++ b/rc-busness/pages/personal/userpay.vue
@@ -1,578 +1,303 @@
-
{{item.title}}
@@ -22,7 +23,7 @@
-
-
+
订单编号:{{ item.orderNumber }}
@@ -41,15 +42,13 @@
-
+
{{ item.usereat }}
- 规格:{{ userlist.num }}
+ 规格:{{ item.num }}
- 数量:{{ userlist.pcs}}件
- ￥{{ userlist.ecPrice }}
+ 数量:{{ item.pcs}}件
+ ￥{{ item.ecPrice }}
-
-
￥{{ item.userprice }}
{{item.orderstype}}
@@ -62,14 +61,13 @@
查看订单
+
-
-
-
-
- 订单提交成功等待付款
-
-
-
-
- 付款金额:
- {{ userprice }}
+
+
-
-
+
\ No newline at end of file
diff --git a/rc-busness/pages/productdetails/producted.vue b/rc-busness/pages/productdetails/producted.vue
index dc8b3529..2e853e76 100644
--- a/rc-busness/pages/productdetails/producted.vue
+++ b/rc-busness/pages/productdetails/producted.vue
@@ -1,256 +1,308 @@
-
+
+
+
+
+
+
- -
+
-
+
+
+ -
+
订单提交成功
+等待付款
+
+
+
- 付款金额:
+{{ userPayData.userprice }}
- 收货信息:
- {{ userinformation }}
+
-
-
+
- 收货信息:
+{{ userPayData.userinformation }}
-
-
-
-
-
- 请选择支付方式
-
-
-
-
-
+
+
+
+
+
+
+
+
+ 请选择支付方式
+
+ ![]()
+ {{ item.paytype }}支付
+
+
+
+
+
+ -
+
-
- --
- {{ item.price }} -
--
-
+
+ {{ paytype }}扫一扫立即支付
+
+
+
+
-
-
-
+
+
+
+ 支付成功
+您的商品我们正在抓紧打包，请耐心等候！
+ +
+ 
+
+ 微信扫一扫，识别二维码
+加入社群0元试用商品随单发放
-
+
+
+
-
-
-
-
+
-
+ 
+
+
+ 支付失败
+请返回商品结算页面重新支付
-
-
-
-
-
-
-
-
-
-
- 支付成功
- {{usermessage}} - -
-
-
- 微信扫一扫，识别二维码
- 加入社群0元试用商品随单发放
-
-
- 微信扫一扫，识别二维码
- 加入社群0元试用商品随单发放
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Product caption text
-
-
-
-
- Product caption text
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item.productName }}
-
-
-
-
-
-
- 商品价格：
- ￥{{ item.rsp }}
- ￥{{ item.ecPrice }}
-
-
-
-
- 活动促销：
- 全场商品限时优惠
-
- 立即领取
-
-
-
+
+
-
+
-
+
-
+
-
-
+
-
+
+
+
+
+
-
+ ![]()
+
+
+
-
+
-
+
-
+
- 商品规格：
+
+
-
+
+
+
+
+
+ ![]()
+
+
+
-
+
+
-
+
+
+
+
+ {{ item.productName }}
+
+
+
+
+
+
+ 商品价格：
+ ￥{{ item.rsp }}
+ ￥{{ item.ecPrice }}
+
+
+
+
+
+ 活动促销：
+ 全场商品限时优惠
+
+ 立即领取
+
+
+
+
+
+
+
+
+
+
+ 商品规格：
+
+
-
- {{ item.specifications }}
-
+
+ {{ item.specifications }}
+
+
+
+
+
+ {{ sales_num }}
+
+
+ 商品数量：
+
+ {{ sales_num }}
+
+
+
+
+
+
+
+
+
+
+
+ -
+
- + 服务说明：当天14点前完成付款即日安排发货;当天14点后完成付款次日安排发货(周日及国家法定节假日顺延至下一个工作日发货,活动期间发货或有延迟敬请理解) + +
- + 商品运费：全场包邮(港澳除外) + + +
- + 商品编号：{{ item.brandCode }} + +
-
-
-
- {{sales_num}}
-
-
- 商品数量：
-
- {{sales_num}}
-
-
-
-
-
-
-
-
-
-
- -
-
- - 服务说明：当天14点前完成付款即日安排发货;当天14点后完成付款次日安排发货(周日及国家法定节假日顺延至下一个工作日发货,活动期间发货或有延迟敬请理解) - -
- - 商品运费：全场包邮(港澳除外) - - -
- - 商品编号：{{ item.brandCode }} - -
- ![]()
-
-
-
-
- -
-
-
-
- {{userfixed.title}} -
-
- 
- 回到顶部
-
-
- 回到顶部
-
-
+
+
+
+
+
-
+
-
-
-
-+-+- ￥{{ item.couponAmount }} -++ {{ userfixed.title }} + + +
++
+ 回到顶部
+ + + ++ \ No newline at end of file diff --git a/rc-busness/static/favicon.ico b/rc-busness/static/favicon.ico index d751f60c..d7ff9973 100644 Binary files a/rc-busness/static/favicon.ico and b/rc-busness/static/favicon.ico differ diff --git a/rc-busness/static/images/adddress.png b/rc-busness/static/images/adddress.png new file mode 100644 index 00000000..5eebb39c Binary files /dev/null and b/rc-busness/static/images/adddress.png differ diff --git a/rc-busness/static/images/banner/four.jpg b/rc-busness/static/images/banner/four.jpg index caa40751..4e623ce6 100644 Binary files a/rc-busness/static/images/banner/four.jpg and b/rc-busness/static/images/banner/four.jpg differ diff --git a/rc-busness/static/images/banner/one.jpg b/rc-busness/static/images/banner/one.jpg index 457a4832..577aeca0 100644 Binary files a/rc-busness/static/images/banner/one.jpg and b/rc-busness/static/images/banner/one.jpg differ diff --git a/rc-busness/static/images/banner/three.jpg b/rc-busness/static/images/banner/three.jpg index ee69b3b8..a56624af 100644 Binary files a/rc-busness/static/images/banner/three.jpg and b/rc-busness/static/images/banner/three.jpg differ diff --git a/rc-busness/static/images/banner/two.jpg b/rc-busness/static/images/banner/two.jpg index 7ce0fdef..7372c9ad 100644 Binary files a/rc-busness/static/images/banner/two.jpg and b/rc-busness/static/images/banner/two.jpg differ++ ++
+- - -+- -+ ￥{{ item.couponAmount }}-- - {{ item.couponDesc }} - -+- 有效期 - {{ item.validTo }} -- ++ + {{ item.couponDesc }} + ++ 有效期 + {{ item.validTo }} ++ - -- -+--
- --温馨提示
- 请先点击下方进行登录/注册 - -- +- 立即登录 - --+ + - - - -++++
+ ++温馨提示
+ 请先点击下方进行登录/注册 ++ ++ 立即登录 ++