diff --git a/App.vue b/App.vue index deb94b9..5ebf3ca 100644 --- a/App.vue +++ b/App.vue @@ -54,8 +54,7 @@ export default { return new Promise((resolve, reject) => { uni.getSystemInfo({ success: function (e) { - console.log(e,88888888855); - Vue.prototype.addBottom = e.safeArea.top > 20; + Vue.prototype.addBottom = e.safeArea.top > 20; Vue.prototype.StatusBar = e.statusBarHeight // #ifdef H5 Vue.prototype.CustomBar = e.statusBarHeight + 45 @@ -71,7 +70,6 @@ export default { // #ifdef MP-WEIXIN let custom = wx.getMenuButtonBoundingClientRect(); - console.log(custom,7774447); Vue.prototype.Custom = custom; Vue.prototype.CustomBarLeft = custom.left; Vue.prototype.CustomBar = custom.bottom + custom.top - e.statusBarHeight; diff --git a/assets/css/base.css b/assets/css/base.css index eb24673..fb7fbb2 100644 --- a/assets/css/base.css +++ b/assets/css/base.css @@ -1,2 +1,176 @@ -@charset "UTF-8";.font-color-red{color:#eb3729 !important}.bg-color-red{background-color:#eb3729 !important}.icon-color{color:#eb3729}.cart-color{color:#eb3729 !important;border:1px solid #eb3729 !important}.padding20{padding:20rpx}.pad20{padding:0 20rpx}.padding30{padding:30rpx}.pad30{padding:0 30rpx}.acea-row{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap}.acea-row.row-middle{-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center}.acea-row.row-top{-webkit-box-align:start;-webkit-align-items:flex-start;-ms-flex-align:start;align-items:flex-start}.acea-row.row-bottom{-webkit-box-align:end;-webkit-align-items:flex-end;-ms-flex-align:end;align-items:flex-end}.acea-row.row-center{-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center}.acea-row.row-right{-webkit-box-pack:end;-webkit-justify-content:flex-end;-ms-flex-pack:end;justify-content:flex-end}.acea-row.row-left{-webkit-box-pack:start;-webkit-justify-content:flex-start;-ms-flex-pack:start;justify-content:flex-start}.acea-row.row-between{-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between}.acea-row.row-around{-webkit-justify-content:space-around;-ms-flex-pack:distribute;justify-content:space-around}.acea-row.row-column-around{-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-justify-content:space-around;-ms-flex-pack:distribute;justify-content:space-around}.acea-row.row-column{-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column}.acea-row.row-column-between{-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between}.acea-row.row-center-wrapper{-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center}.acea-row.row-between-wrapper{-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between}.slider-banner{position:relative;width:100%;overflow:hidden}.slider-banner .swiper-container{height:100%}.slider-banner image{display:block;width:100%;height:100%}.start{width:122rpx;height:30rpx;background-image:url("https://wx.yixiang.co/static/images/start.png");background-repeat:no-repeat;-webkit-background-size:122rpx auto;background-size:122rpx auto}.start.star5{background-position:0 3rpx}.start.star4{background-position:0 -30rpx}.start.star3{background-position:0 -70rpx}.start.star2{background-position:0 -105rpx}.start.star1{background-position:0 -140rpx}.start.star0{background-position:0 -175rpx}.checkbox-wrapper{position:relative}.checkbox-wrapper input{display:none}.checkbox-wrapper .icon{position:absolute;left:0;top:50%;display:inline-block;width:18px;height:18px;border:1px solid #cccccc;-webkit-border-radius:50%;border-radius:50%;-webkit-transform:translate(0, -50%);-ms-transform:translate(0, -50%);transform:translate(0, -50%)}.checkbox-wrapper input:checked+.icon{background-color:#e93323;border-color:#e93323;background-image:url("https://wx.yixiang.co/static/images/enter.png");-webkit-background-size:21rpx 15rpx;background-size:21rpx 15rpx;background-repeat:no-repeat;background-position:center center}.Loads{height:80rpx;font-size:25rpx;color:#000}.Loads .iconfont{font-size:30rpx;margin-right:10rpx;height:32rpx;line-height:32rpx}@-webkit-keyframes load{from{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes load{from{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.loadingpic{-webkit-animation:load 3s linear 1s infinite;animation:load 3s linear 1s infinite}.loading{-webkit-animation:load linear 1s infinite;animation:load linear 1s infinite} -/*# sourceMappingURL=./base.css.map */ \ No newline at end of file +@charset "UTF-8"; +/** + *相关初始化 +*/ +.font-color-red { + color: #2DB5AE !important; +} +.bg-color-red { + background-color: #2DB5AE !important; + color: #ffffff !important; +} +.icon-color { + color: #2DB5AE; +} +.cart-color { + color: #2DB5AE !important; + border: 1px solid #2DB5AE !important; +} +/* padding20 */ +.padding20 { + padding: 20rpx; +} +/* pad20 */ +.pad20 { + padding: 0 20rpx; +} +/* padding30 */ +.padding30 { + padding: 30rpx; +} +/*pad30 */ +.pad30 { + padding: 0 30rpx; +} +/* layout */ +.acea-row { + display: flex; + flex-wrap: wrap; + /* 辅助类 */ +} +.acea-row.row-middle { + align-items: center; +} +.acea-row.row-top { + align-items: flex-start; +} +.acea-row.row-bottom { + align-items: flex-end; +} +.acea-row.row-center { + justify-content: center; +} +.acea-row.row-right { + justify-content: flex-end; +} +.acea-row.row-left { + justify-content: flex-start; +} +.acea-row.row-between { + justify-content: space-between; +} +.acea-row.row-around { + justify-content: space-around; +} +.acea-row.row-column-around { + flex-direction: column; + justify-content: space-around; +} +.acea-row.row-column { + flex-direction: column; +} +.acea-row.row-column-between { + flex-direction: column; + justify-content: space-between; +} +/* 上下左右垂直居中 */ +.acea-row.row-center-wrapper { + align-items: center; + justify-content: center; +} +/* 上下两边居中对齐 */ +.acea-row.row-between-wrapper { + align-items: center; + justify-content: space-between; +} +.acea-row.row-center-column { + flex-direction: column; + align-items: center; + justify-content: center; +} +/* 轮播图 */ +.slider-banner { + position: relative; + width: 100%; + /* height:750rpx; */ + overflow: hidden; +} +.slider-banner .swiper-container { + height: 100%; +} +.slider-banner image { + display: block; + width: 100%; + height: 100%; +} +.start { + width: 122rpx; + height: 30rpx; + background-image: url("https://wx.yixiang.co/static/images/start.png"); + background-repeat: no-repeat; + background-size: 122rpx auto; +} +.start.star5 { + background-position: 0 3rpx; +} +.start.star4 { + background-position: 0 -30rpx; +} +.start.star3 { + background-position: 0 -70rpx; +} +.start.star2 { + background-position: 0 -105rpx; +} +.start.star1 { + background-position: 0 -140rpx; +} +.start.star0 { + background-position: 0 -175rpx; +} +/* 单选框和多选框 */ +.Loads { + font-size: 24rpx; + font-family: PingFang SC; + font-weight: 500; + color: #3A3A3C; + height: 80rpx; +} +.Loads .iconfont { + font-size: 30rpx; + margin-right: 10rpx; + height: 32rpx; + line-height: 32rpx; +} +/*加载动画*/ +@keyframes load { + from { + transform: rotate(0deg); + } + to { + transform: rotate(360deg); + } +} +.loadingpic { + animation: load 3s linear 1s infinite; +} +.loading { + animation: load linear 1s infinite; +} +/* 多选框样式 */ +checkbox .wx-checkbox-input { + width: 40rpx; + height: 40rpx; + border-radius: 50% !important; + color: #ffffff !important; + border: 2rpx solid #2DB5AE !important; + box-sizing: border-box; +} +checkbox .wx-checkbox-input.wx-checkbox-input-checked { + border: none !important; + color: #fff; + background: linear-gradient(135deg, #39D396 0%, #1B8DCC 100%); +} +checkbox .wx-checkbox-input.wx-checkbox-input-checked::before { + font-size: 28rpx; +} diff --git a/assets/css/base.less b/assets/css/base.less index 03db2e5..a42d539 100644 --- a/assets/css/base.less +++ b/assets/css/base.less @@ -159,9 +159,11 @@ // background-position: center center; // } .Loads { - height: 0.8*100rpx; - font-size: 0.25*100rpx; - color: #000; + font-size: 24rpx; + font-family: PingFang SC; + font-weight: 500; + color: #3A3A3C; + height: 80rpx; } .Loads .iconfont { font-size: 0.3*100rpx; @@ -185,21 +187,21 @@ animation: load linear 1s infinite; } -/* 多选框样式 */ -checkbox .wx-checkbox-input { - width: 40rpx; - height: 40rpx; - border-radius: 50% !important; - color: #ffffff !important; - border: 2rpx solid #2DB5AE !important; - box-sizing: border-box; -} -checkbox .wx-checkbox-input.wx-checkbox-input-checked { - border: none !important; - color: #fff; +/* 多选框样式 */ +checkbox .wx-checkbox-input { + width: 40rpx; + height: 40rpx; + border-radius: 50% !important; + color: #ffffff !important; + border: 2rpx solid #2DB5AE !important; + box-sizing: border-box; +} +checkbox .wx-checkbox-input.wx-checkbox-input-checked { + border: none !important; + color: #fff; // background: #9FCD69; - background: linear-gradient(135deg, #39D396 0%, #1B8DCC 100%); -} -checkbox .wx-checkbox-input.wx-checkbox-input-checked::before { - font-size: 28rpx; + background: linear-gradient(135deg, #39D396 0%, #1B8DCC 100%); +} +checkbox .wx-checkbox-input.wx-checkbox-input-checked::before { + font-size: 28rpx; } \ No newline at end of file diff --git a/pages/activity/activity/index.vue b/pages/activity/activity/index.vue index 433cdf9..0c4b2a4 100644 --- a/pages/activity/activity/index.vue +++ b/pages/activity/activity/index.vue @@ -39,14 +39,14 @@ - 活动抢购中 + {{timeList[seckillActive].status == 2 ? '活动即将开始' : '活动抢购中'}} 下期预告 - 本轮结束仅剩 + {{timeList[seckillActive].status == 2 ? timeList[seckillActive].time + '即将开始' : '本轮结束仅剩'}} @@ -77,7 +77,7 @@ ¥{{item.otPrice}} - {{activityType == 0?'立即秒杀':'发起' + (activityType == 1?'拼团':'砍价')}} + {{activityType == 0?(timeList[seckillActive].status == 2?'即将开始':'立即秒杀'):'发起' + (activityType == 1?'拼团':'砍价')}} diff --git a/pages/home/index.vue b/pages/home/index.vue index e431cf0..328271a 100644 --- a/pages/home/index.vue +++ b/pages/home/index.vue @@ -1181,4 +1181,4 @@ margin-bottom: 0; } } - + diff --git a/pages/order/GoodsReturn/index.vue b/pages/order/GoodsReturn/index.vue index 3512107..4d76ec2 100644 --- a/pages/order/GoodsReturn/index.vue +++ b/pages/order/GoodsReturn/index.vue @@ -84,7 +84,7 @@ 联系方式 - 联系方式 + 联系人 @@ -190,7 +190,7 @@ 仅退款 - + 退货退款 --> @@ -350,13 +350,23 @@ export default { }); return } + if (!this.userName || !this.phoneNumber) { + uni.showToast({ + title: "请将联系方式填写完整！", + icon: 'none', + duration: 2000 + }); + return + } submitAfterSealsOrder({ orderCode: this.orderInfo.orderId, serviceType: this.serviceType, reasonForApplication: this.reason, applicationInstructions: refund_reason_wap_explain, applicationDescriptionPicture: this.refund_reason_wap_img.join(","), - productParamList: this.productParamList + productParamList: this.productParamList, + applicationName: this.userName, + applicationPhone: this.phoneNumber }).then(res => { if (res.status === 200) { uni.showToast({ diff --git a/pages/order/OrderReturnDetail/index.vue b/pages/order/OrderReturnDetail/index.vue index 6a63412..cfe55d7 100644 --- a/pages/order/OrderReturnDetail/index.vue +++ b/pages/order/OrderReturnDetail/index.vue @@ -443,7 +443,7 @@ export default { width: 204rpx; height: 204rpx; border-radius: 16rpx; - background: #dddddd; + // background: #dddddd; margin-right: 17rpx; } image:last-child { diff --git a/pages/order/ReturnList/index.vue b/pages/order/ReturnList/index.vue index 5c929d7..ec17c40 100644 --- a/pages/order/ReturnList/index.vue +++ b/pages/order/ReturnList/index.vue @@ -13,10 +13,10 @@ - - - - + + + + 全部 @@ -27,20 +27,19 @@ 已完成 - - - - - - - - - - + + + + + + + + + @@ -129,34 +128,30 @@ export default { } } - .content-box { - padding-top: 4rpx; - width: 100vw; - position: relative; - .content { - width: 100%; - height: 100%; - overflow-y: scroll; - background: #FFFFFF; - border-radius: 28rpx 28rpx 0rpx 0rpx; - .list { - padding-top: 76rpx; - } + .content { + width: 100%; + overflow-y: scroll; + background: #FFFFFF; + border-radius: 28rpx 28rpx 0rpx 0rpx; + .nav-box { + width: 100vw; + padding-top: 4rpx; + position: fixed; + left: 0; + z-index: 5; + background: #F1F1F1; + } + .list { + padding-top: 108rpx; } } .return-list{ .nav{ - // background-color: #FFF; - // display: flex; - // justify-content: space-around; width: 100vw; background: #FFFFFF; height: 92rpx; padding: 34rpx 32rpx 16rpx; - position: fixed; - left: 0; - z-index: 5; border-radius: 28rpx 28rpx 0rpx 0rpx; .item { width: 112rpx; @@ -193,4 +188,13 @@ export default { } } } + + .noCart { + padding-top: 100rpx; + text-align: center; + .pictrue { + width: 446rpx; + margin: 0rpx auto; + } + } diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue index 68cc8db..bb70b84 100644 --- a/pages/shop/GoodsCon/index.vue +++ b/pages/shop/GoodsCon/index.vue @@ -206,10 +206,9 @@ - - + @@ -415,10 +414,9 @@ showEntry: false, tagStyle: { a: 'color:#2DB5AE;text-decoration:underline;', - span: 'padding: 0rpx 30rpx; display: inline-block;text-align: justify;text-justify: auto;text-indent:2em' - - }, - description: "

title

asdfgh" + // span: 'padding: 0rpx 30rpx;text-indent:2em;text-align: justify;text-justify: auto;' + span: 'padding: 0rpx 30rpx; display: inline-block;' + } } }, computed: mapGetters(['isLogin', 'location']), @@ -575,7 +573,6 @@ ' - - + + - + - - 下一等级还需成长值 {{'50'}}/{{100}} + + 下一等级还需成长值 {{userInfo.growth}}/{{vipList[activeIndex+1].growthValue}} @@ -104,11 +104,11 @@ 权益说明 - + 会员规则说明 - +