diff --git a/rc-busness/ajax/getData.js b/rc-busness/ajax/getData.js index 319db10f..674d0f3d 100644 --- a/rc-busness/ajax/getData.js +++ b/rc-busness/ajax/getData.js @@ -468,19 +468,20 @@ export const goodsmessage = (productCode) => { //微信支付 - export const generateOrderWX = (list) => { - var data = [{ - - - }] - return fetch('generateOrderWX', list, 'POST' ) + export const generateOrderWX = (list,isH5Pay) => { + if(!isH5Pay) + return fetch('generateOrderWX', list, 'POST' ) + else + return fetch('generateOrderWXH5', list, 'POST' ) } //再次支付 - export const repayOrde = (ordernumber) => { - console.log(ordernumber); - return fetch('repayOrderWX?orderNo='+ordernumber,'', 'POST' ) - } + export const repayOrde = (ordernumber,isH5Pay) => { + if(!isH5Pay) + return fetch('repayOrderWX?orderNo='+ordernumber,'', 'POST' ) + else + return fetch('repayOrderWXH5?orderNo='+ordernumber,'', 'POST' ) + } //用户所有的优惠券 export const allConfig = (memberId,channelSecurity,mobile) => { var data = { diff --git a/rc-busness/app.html b/rc-busness/app.html index cf5975e7..afb50e74 100644 --- a/rc-busness/app.html +++ b/rc-busness/app.html @@ -5,5 +5,14 @@ {{ APP }} + \ No newline at end of file diff --git a/rc-busness/assets/css/global.less b/rc-busness/assets/css/global.less index 4bdbade1..4c11f919 100644 --- a/rc-busness/assets/css/global.less +++ b/rc-busness/assets/css/global.less @@ -543,7 +543,11 @@ picture { .rc-top { margin-top: 124px; } - + + .useruantity{ + margin: 1rem 0rem; + } + .ts-product-list { text-align: left; //display:block; diff --git a/rc-busness/assets/css/usertion.less b/rc-busness/assets/css/usertion.less index 018274ad..a853383b 100644 --- a/rc-busness/assets/css/usertion.less +++ b/rc-busness/assets/css/usertion.less @@ -6,6 +6,12 @@ ul li ol li em strong i { margin: 0; padding: 0; } + + .ts-button-container { + cursor: pointer; + display:flex; + flex-direction:row; + } //手机端 @media screen and (max-width: 768px) { .online{ @@ -36,6 +42,11 @@ ul li ol li em strong i { } } + .ts-button-container { + justify-content: space-evenly; + align-items: center; + box-shadow: 0px -5px 6px rgba(0, 0, 0, 0.1); + } //快递列表 .delivery { display: flex; @@ -103,34 +114,6 @@ ul li ol li em strong i { } } } - - - - .rc-margin-y--md{ - width: 100%; -height: 80px; -background: #FFFFFF; -box-shadow: 0px -5px 6px rgba(0, 0, 0, 0.1); -padding: 0; -display: flex; -align-items: center; -justify-content: flex-end; -margin: 0; -.ts-standard-btn{ - width: 155px; -height: 48px; -background: #E2001A; -border-radius: 30px; -color: #FFFFFF; -font-size: 14px; -display: flex; -align-items: center; -justify-content: center; -margin: 0; -padding: 0; -margin-right: 20px; -} - } .rc-main { .rc-userbottom{ display: none; @@ -326,8 +309,15 @@ margin-right: 20px; //pc端 -@media screen and (min-width: 768px){ +@media screen and (min-width: 769px){ + .ts-button-container{ + .ts-standard-btn{ + &:first-child{ + margin-right:1rem; + } + } + } //快递列表 .delivery { display: flex; @@ -369,9 +359,6 @@ margin-right: 20px; } } } - .rc-margin-y--md{ - display: none; - } .rc-main { margin: 0 auto; margin-top: 90px; @@ -501,17 +488,18 @@ margin-right: 20px; display: none; } .rc-usercenter{ - display: flex; - justify-content: center; - flex-direction: column; - em { - font-style: normal; - display: block; - font-size: 18px; - font-weight: bold; - margin-top: 17px; - color: #e1001a; - } + display: flex; + justify-content: center; + flex-direction: column; + em { + font-style: normal; + display: block; + font-size: 18px; + font-weight: bold; + margin-top: 17px; + color: #e1001a; + width:16rem; + } } display: flex; @@ -678,21 +666,6 @@ margin-right: 20px; 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; - } - } } diff --git a/rc-busness/components/header.vue b/rc-busness/components/header.vue index 03921b0e..f953ad07 100644 --- a/rc-busness/components/header.vue +++ b/rc-busness/components/header.vue @@ -364,6 +364,7 @@ export default { let usernot=this.$store.state.userInfo; //console.log(usernot); if(usernot){ + window._hmt.push(['_setUserId', usernot.data.mobile]); this.loginornot=false }else{ this.loginornot=true diff --git a/rc-busness/pages/myorder/usertion.vue b/rc-busness/pages/myorder/usertion.vue index e066f05e..ed06b6d5 100644 --- a/rc-busness/pages/myorder/usertion.vue +++ b/rc-busness/pages/myorder/usertion.vue @@ -19,8 +19,7 @@ }} {{ orderstatus }} -
-
+
@@ -36,7 +35,7 @@
-
+
@@ -72,12 +71,7 @@
数量:{{ userlist.pcs }}件 ￥{{ userlist.ecPrice }} -
- {{ customer }} -
-
-
- {{ customer }} +