diff --git a/rc-busness/ajax/getData.js b/rc-busness/ajax/getData.js index 816fb394..638b729c 100644 --- a/rc-busness/ajax/getData.js +++ b/rc-busness/ajax/getData.js @@ -56,7 +56,7 @@ export const getleckCourse = (name, offset) => { * 加入购物车 */ -export const postCourseId = (productCode, buyCount, memberId, mobile, productImg, productName, productPrice, specifications, leftAllotment) => { +export const postCourseId = (productCode, buyCount, memberId, mobile, productImg, productName, productPrice, specifications, leftAllotment, basePiont) => { var data = { buyCount: buyCount, memberId: memberId, @@ -66,7 +66,8 @@ export const postCourseId = (productCode, buyCount, memberId, mobile, productImg productName: productName, productPrice: productPrice, specifications: specifications, - leftAllotment: leftAllotment + leftAllotment: leftAllotment, + basePiont: basePiont } return fetch('/insertCartProductInfo', data, 'POST') } @@ -78,11 +79,18 @@ export const isexistCart = (id, pet, address) => { return fetch('getCartProductInfo?memberId=' + id, data, 'POST') } +/** + * 支付监听 + */ +export const monitorOrderNotify = (OrderNumber) => { + var data = {} + return fetch('monitorOrderNotify?OrderNumber=' + OrderNumber, data, 'POST') +} + /** * 删除购物车 */ export const deleteCart = ( productCode) => { - debugger; var data = { productCode } diff --git a/rc-busness/app.html b/rc-busness/app.html new file mode 100644 index 00000000..cf5975e7 --- /dev/null +++ b/rc-busness/app.html @@ -0,0 +1,9 @@ + + + + {{ HEAD }} + + + {{ APP }} + + \ No newline at end of file diff --git a/rc-busness/app/views/error.html b/rc-busness/app/views/error.html new file mode 100644 index 00000000..15794e35 --- /dev/null +++ b/rc-busness/app/views/error.html @@ -0,0 +1,56 @@ + + + + + + + + + + + + +
+ +
+

检测到系统错误

+
+ 请联系管理员或尝试其他操作 +

+ 回到首页 +
+
+
+ + + \ No newline at end of file diff --git a/rc-busness/assets/css/global.less b/rc-busness/assets/css/global.less index 47fa1655..f9ca05fc 100644 --- a/rc-busness/assets/css/global.less +++ b/rc-busness/assets/css/global.less @@ -4,6 +4,12 @@ body { line-height: 1.5; color: #666; } +.el-message-box .el-button--primary{ + background-color: #e1001a !important; + color:#fff; + border:unset; +} + .rc-menu--xs .rc-screen-reader{ left:28%; } @@ -311,7 +317,7 @@ picture { height: auto; position: fixed; right: 0; - top: 30%; + top: 40%; background: #FFFFFF; box-shadow: 0 0 10px rgba(0, 0, 0, 0.16); border-radius: .25rem; diff --git a/rc-busness/assets/css/mypersonal.less b/rc-busness/assets/css/mypersonal.less index 0fcd7e58..9b2d6dc8 100644 --- a/rc-busness/assets/css/mypersonal.less +++ b/rc-busness/assets/css/mypersonal.less @@ -433,7 +433,7 @@ ul li ol li em strong i { text-align: center; li{ float: left; - + cursor:pointer; } img{ width: 96px; @@ -464,6 +464,7 @@ ul li ol li em strong i { margin: 0 auto; } .rc-buy{ + cursor: pointer; img{ width: 96px; height: 96px; diff --git a/rc-busness/assets/css/openaddress.less b/rc-busness/assets/css/openaddress.less index ee841367..6cd9ae5d 100644 --- a/rc-busness/assets/css/openaddress.less +++ b/rc-busness/assets/css/openaddress.less @@ -16,6 +16,9 @@ background:#f6f6f6; } } + .usercontshow.rc-max-width--xl{ + min-height:72vh; + } .useredit{ display: none; } @@ -44,12 +47,12 @@ justify-content: center; align-items: center; font-size: 16px; color: #FFFFFF; +margin:0 auto; } .rc-max-width--xl{ - padding: 0px 20px 24px 20px; - min-height: 60vh; + padding: 0px 20px 0px 20px; .rc-cat{ margin-top: 20px; } @@ -121,12 +124,17 @@ color: #FFFFFF; { .rc-max-width--xl{ - margin-bottom: 80px; display: flex; flex-direction: row; flex-wrap: wrap; justify-content: space-between } + .usercontshow{ + min-height: 20vh; + margin-bottom: 2rem; + padding-left:.5rem; + padding-right:.5rem; + } .rc-button{ display: none; @@ -134,8 +142,8 @@ display: none; .usercontend { display:inline-block; width: 48%; - margin-top: 40px; - padding: 24px 20px; + //margin-bottom: 40px; + //padding: 24px 20px; } .online{ @@ -230,7 +238,7 @@ display: none; -webkit-line-clamp: 2; line-clamp: 2; -webkit-box-orient: vertical; - font-size: 20px; + font-size: .875rem; color: #333333; } @@ -253,19 +261,13 @@ display: none; } .userdit{ - width: 45%; + width: 48%; height: 164px; display: inline-block; - height: 164px; - border: 1px solid #D7D7D7; - border-radius: 3px; - margin-top: 65px; box-sizing: border-box; border: 1px solid #D7D7D7; border-radius: 3px; position: relative; - height: 164px; - box-sizing: border-box; margin-left: 20px; } diff --git a/rc-busness/assets/css/orderquantity.less b/rc-busness/assets/css/orderquantity.less index a5ff465c..9b12653e 100644 --- a/rc-busness/assets/css/orderquantity.less +++ b/rc-busness/assets/css/orderquantity.less @@ -107,7 +107,7 @@ width: 96px; height: 96px; display: block; - + object-fit:contain; } } diff --git a/rc-busness/assets/css/search.less b/rc-busness/assets/css/search.less index b42920c0..23f69fe2 100644 --- a/rc-busness/assets/css/search.less +++ b/rc-busness/assets/css/search.less @@ -12,7 +12,6 @@ ul li ol li em strong i { } .rc-main { position: relative; - margin-top: 5.25rem; .active{ border: 2px solid #E2001A; @@ -33,7 +32,6 @@ ul li ol li em strong i { width: 100%; margin: 0 auto; overflow: hidden; - margin-top: 20px; .ts-scrollable-container{ h2{ font-weight: bold; @@ -382,9 +380,9 @@ border-radius: 100px; @media screen and (min-width: 768px){ .usersearch { width: 100%; - margin: 0 auto; + margin-left:auto; + margin-right:auto; overflow: hidden; - margin-top: 40px; .ts-scrollable-container{ h2{ font-weight: bold; @@ -441,7 +439,6 @@ cursor: pointer; } .rc-main { - margin-top: 7.25rem; } .ts-scrollable-container{ diff --git a/rc-busness/components/addressInput.vue b/rc-busness/components/addressInput.vue index a4178f7a..c2a5aab2 100644 --- a/rc-busness/components/addressInput.vue +++ b/rc-busness/components/addressInput.vue @@ -459,11 +459,11 @@ export default { font-size: 16px; margin-left: 2px; width:100%; - padding-bottom:.25rem; + padding-bottom:.5rem; background:url("../assets/image/ico-location.png") no-repeat 98% center; background-size:16px; position:relative; - top:.5rem; + top:.45rem; padding-left:.875rem; } .ts-area-picker-mobile{ diff --git a/rc-busness/components/fixed-right.vue b/rc-busness/components/fixed-right.vue index d22ea92a..6fbcad19 100644 --- a/rc-busness/components/fixed-right.vue +++ b/rc-busness/components/fixed-right.vue @@ -14,6 +14,7 @@ diff --git a/rc-busness/layouts/error.vue b/rc-busness/layouts/error.vue new file mode 100644 index 00000000..506a8797 --- /dev/null +++ b/rc-busness/layouts/error.vue @@ -0,0 +1,67 @@ + + + + \ No newline at end of file diff --git a/rc-busness/middleware/metaTitle.js b/rc-busness/middleware/metaTitle.js index da7bfc34..888018f1 100644 --- a/rc-busness/middleware/metaTitle.js +++ b/rc-busness/middleware/metaTitle.js @@ -1,7 +1,5 @@ - export default ({store, route, redirect}) => { route.matched.forEach((item, index) => { item.meta.title = route.meta[index].title || ''; - item.meta.redirect = route.meta[index].redirect || '';//设置重定向 }) -} +} \ No newline at end of file diff --git a/rc-busness/pages/myorder/userrecord.vue b/rc-busness/pages/myorder/userrecord.vue index 7ff2c4c2..79732038 100644 --- a/rc-busness/pages/myorder/userrecord.vue +++ b/rc-busness/pages/myorder/userrecord.vue @@ -1,14 +1,14 @@