From 3f0c29dd6a32d6f0ac9541e92b001b90ca120533 Mon Sep 17 00:00:00 2001 From: longjieli <11918793+longjieli@user.noreply.gitee.com> Date: Wed, 1 Jan 2025 12:36:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 2 +- api/model/index.js | 25 ++ api/model/info.js | 59 +++-- api/model/vip.js | 2 +- components/couponPopup/couponPopup.vue | 14 +- components/product/productItem.vue | 57 ++++- components/user/productList.vue | 37 ++- pages/index/center.vue | 112 +++++---- pages/index/index.vue | 104 ++++---- pages/index/order.vue | 183 +++++++------- pages_order/components/address/addressList.vue | 250 +++++++++---------- pages_order/components/product/submit.vue | 5 +- pages_order/mine/coupon.vue | 212 ++-------------- pages_order/mine/help.vue | 106 ++++---- pages_order/mine/memberCenter.vue | 72 +++--- pages_order/mine/moreCommodity.vue | 29 +-- pages_order/mine/partner.vue | 69 +++++- pages_order/mine/recruit.vue | 115 ++++++--- pages_order/mine/runningWater.vue | 255 +++++++++++++++----- pages_order/mine/withdraw.vue | 136 ++++------- pages_order/order/createOrder.vue | 187 ++++++++++----- pages_order/order/orderDetail.vue | 266 +++++++++++++-------- pages_order/product/productDetail.vue | 32 +-- pages_order/static/coupon/bg.png | Bin 411231 -> 0 bytes pages_order/static/coupon/examine.png | Bin 63250 -> 0 bytes pages_order/static/coupon/register-success.png | Bin 104588 -> 0 bytes pages_order/static/home/4.png | Bin 551976 -> 0 bytes pages_order/static/recruit/bg.png | Bin 254238 -> 0 bytes .../static => static/image}/coupon/close-btn.png | Bin static/image/home/1.png | Bin 0 -> 25829 bytes store/store.js | 93 +++---- 31 files changed, 1328 insertions(+), 1094 deletions(-) delete mode 100644 pages_order/static/coupon/bg.png delete mode 100644 pages_order/static/coupon/examine.png delete mode 100644 pages_order/static/coupon/register-success.png delete mode 100644 pages_order/static/home/4.png delete mode 100644 pages_order/static/recruit/bg.png rename {pages_order/static => static/image}/coupon/close-btn.png (100%) create mode 100644 static/image/home/1.png diff --git a/App.vue b/App.vue index 73ac7a4..078d0b0 100644 --- a/App.vue +++ b/App.vue @@ -15,7 +15,7 @@ // 公共css @import url("common.scss"); - body{ + body { background-color: #f7f7f7; font-size: 30rpx; } diff --git a/api/model/index.js b/api/model/index.js index 72092e0..eda59d6 100644 --- a/api/model/index.js +++ b/api/model/index.js @@ -117,6 +117,31 @@ const api = { url: '/index_common/getRiceAdList', method: 'GET', }, + //获取优惠券信息 + getRiceCouponList: { + url: '/info_common/getRiceCouponList', + method: 'GET', + }, + //增加或者修改合伙人申请信息 + addOrUpdateCommonUser: { + url: '/index_common/addOrUpdateCommonUser', + method: 'POST', + }, + //根据用户查询渠合伙人申请信息表单 + getCommonUser: { + url: '/index_common/getCommonUser', + method: 'GET' + }, + //提交反馈信息 + addFeedback: { + url: '/info_common/addFeedback', + method: 'POST' + }, + // 获取我的直接推荐间接推荐用户列表带分页 + getHanHaiMemberUser: { + url: '/info_common/getHanHaiMemberUser', + method: 'GET' + }, } export default api \ No newline at end of file diff --git a/api/model/info.js b/api/model/info.js index 6ffb32b..7e061c5 100644 --- a/api/model/info.js +++ b/api/model/info.js @@ -1,87 +1,86 @@ - // 个人相关接口 const api = { // 充值 recharge: { - url: '/info_common/recharge', + url: '/info_common/withdraw', method: 'GET', - auth : true, - limit : 1000, - showLoading : true, + auth: true, + limit: 1000, + showLoading: true, }, // 提现 withdraw: { url: '/info_common/withdraw', method: 'GET', - auth : true, - limit : 1000, - showLoading : true, + auth: true, + limit: 1000, + showLoading: true, }, // 获取地址列表带分页 getAddressPageList: { url: '/info_common/getAddressPageList', method: 'GET', - auth : true, + auth: true, }, // 增加或修改地址信息 addOrUpdateAddress: { url: '/info_common/addOrUpdateAddress', method: 'POST', - limit : 500, - auth : true, - showLoading : true, + limit: 500, + auth: true, + showLoading: true, }, // 删除地址 deleteAddress: { url: '/info_common/deleteAddress', method: 'GET', - limit : 500, - auth : true, - showLoading : true, + limit: 500, + auth: true, + showLoading: true, }, // 修改默认地址 updateDefaultAddress: { url: '/info_common/updateDefaultAddress', method: 'GET', - auth : true, - limit : 1000, + auth: true, + limit: 1000, }, // 获取粉丝列表带分页 getFansPageList: { url: '/info_common/getFansPageList', method: 'GET', - auth : true, + auth: true, }, // 获取相关介绍 getInfoIntroduce: { url: '/info_common/getInfoIntroduce', method: 'GET', - auth : true, + auth: true, }, // 获取个人邀请码 getInviteCode: { url: '/info_common/getInviteCode', method: 'GET', - auth : true, + auth: true, }, // 获取订单列表带分页 getOrderPageList: { url: '/info_common/getOrderPageList', method: 'GET', - auth : true, + auth: true, }, // 获取订单详情 getOrderDetail: { url: '/info_common/getOrderDetail', method: 'GET', - auth : true, + auth: true, }, // 获取流水记录带分页 getWaterPageList: { url: '/info_common/getWaterPageList', method: 'GET', - auth : true, + auth: true, }, // 获取相关介绍 getInfoIntroduce: { @@ -97,7 +96,7 @@ const api = { getRiceInfo: { url: '/info_common/getRiceInfo', method: 'GET', - limit : 500, + limit: 500, }, // 获取购物车信息列表带分页 getCartPageList: { @@ -108,17 +107,17 @@ const api = { addOrUpdateCommonUser: { url: '/info_common/addOrUpdateCommonUser', method: 'POST', - limit : 500, - auth : true, - showLoading : true, + limit: 500, + auth: true, + showLoading: true, }, // 查询渠道申请信息 getCommonUser: { url: '/info_common/getCommonUser', method: 'GET', - limit : 500, - auth : true, - showLoading : true, + limit: 500, + auth: true, + showLoading: true, }, } diff --git a/api/model/vip.js b/api/model/vip.js index b7573a8..c2d4b7b 100644 --- a/api/model/vip.js +++ b/api/model/vip.js @@ -4,7 +4,7 @@ const api = { // 获取会员权益列表 getRiceVipList: { - url: '/rice_vip/getRiceVipList', + url: '/index_common/getVipInfoList', method: 'GET', }, // 申请成为会员 diff --git a/components/couponPopup/couponPopup.vue b/components/couponPopup/couponPopup.vue index ea0a3c2..0f2a825 100644 --- a/components/couponPopup/couponPopup.vue +++ b/components/couponPopup/couponPopup.vue @@ -5,8 +5,8 @@ - - + @@ -15,11 +15,10 @@ 20 - + （购物即可抵扣！） - + @@ -37,7 +36,7 @@ closeCouponPopup() { this.show = false; }, - + //查看优惠券 examineCoupon() { this.$emit("examine") @@ -75,7 +74,8 @@ .body { position: relative; - .coupon-bg {} + .coupon-bg { + } .close-btn { position: absolute; diff --git a/components/product/productItem.vue b/components/product/productItem.vue index b9a0d22..d501db3 100644 --- a/components/product/productItem.vue +++ b/components/product/productItem.vue @@ -17,13 +17,17 @@ - ￥{{ item.vipPrice }}/元每件 + + ￥{{ getPriceByRole(item) }} + /元每件 - - + - + + + @@ -35,12 +39,12 @@ - 已售出32490+单 + 已售出{{ item.num }}+单 - + 购买 @@ -48,19 +52,47 @@ @@ -70,12 +102,12 @@ width: 100%; padding: 10rpx 20rpx; align-items: center; - margin-bottom: 20rpx; display: flex; box-sizing: border-box; border-bottom: 1rpx solid #00000012; background: white; border-radius: 20rpx; + margin-bottom: 20rpx; // 商品图片 .item-image { @@ -85,7 +117,6 @@ image { height: 100%; width: 100%; - border-radius: 20rpx; } } @@ -99,12 +130,12 @@ // 商品标题 .title { - width: 100%; + width: 280rpx; font-size: 28rpx; font-weight: bold; overflow: hidden; //超出的文本隐藏 text-overflow: ellipsis; //溢出用省略号显示 - // white-space: nowrap; //溢出不换行 + white-space: nowrap; //溢出不换行 } // 价格 @@ -116,6 +147,10 @@ .money { font-size: 30rpx; + + .unit { + font-size: 20rpx; + } } .price-imgs { diff --git a/components/user/productList.vue b/components/user/productList.vue index eadcb93..008145a 100644 --- a/components/user/productList.vue +++ b/components/user/productList.vue @@ -16,15 +16,15 @@ ￥{{ item.price }}/件 - ￥{{ item.oldPrice }}/件 + ￥{{ item.oldPrice }} - 已售卖5000+件 + 已售卖{{ item.num }}+件 - + 购买 @@ -47,7 +47,20 @@ }; }, methods: { - + // 购买商品(创建订单) + purchase(id) { + this.$api('getRiceProductDetail', { + id + }, res => { + if (res.code == 200) { + res.result.num = 1 + this.$store.commit('setPayOrderProduct', [ + res.result + ]) + this.$utils.navigateTo('/pages_order/order/createOrder') + } + }) + }, }, } @@ -65,6 +78,7 @@ background-color: #fff; border-radius: 20rpx; margin-left: 20rpx; + margin-bottom: 20rpx; .image { width: 300rpx; @@ -75,10 +89,23 @@ .product-info { font-size: 24rpx; - .product-title {} + .product-title { + font-weight: bold; + display: -webkit-box; + /* 兼容WebKit内核浏览器 */ + -webkit-line-clamp: 2; + /* 显示最大3行 */ + -webkit-box-orient: vertical; + /* 设置垂直方向上的排列方式 */ + overflow: hidden; + /* 隐藏溢出内容 */ + text-overflow: ellipsis; + /* 当文本溢出时显示省略号 */ + } .product-main { display: flex; + align-items: flex-end; .sale-information { width: 75%; diff --git a/pages/index/center.vue b/pages/index/center.vue index 9d39a06..4e8469c 100644 --- a/pages/index/center.vue +++ b/pages/index/center.vue @@ -6,7 +6,7 @@ - + @@ -14,20 +14,22 @@ {{ userInfo.nickName}} - - + - + + - 合伙人 + {{ userRole[userInfo.isPay] }} - + 修改资料 @@ -35,19 +37,19 @@ - 手机号:1820000000 + 手机号:{{ userInfo.phone }} - - + + - + 已开通29天 @@ -60,22 +62,23 @@ - + - +
我的佣金
-
￥240
+
￥{{ riceInfo.canWithdraw || 0 }}
 - +
我的余额
-
￥1200
+
￥{{ riceInfo.balance || 0 }}
 @@ -87,15 +90,15 @@ - + 我的订单 - + 我的团队 - + 联系客服 @@ -106,15 +109,15 @@ - + 广告招商 - + 会员权益 - + 优惠券 @@ -129,14 +132,14 @@
- + - + - +
- +
@@ -155,38 +158,35 @@ mapState } from 'vuex' import customerServicePopup from '@/components/config/customerServicePopup.vue' - + export default { components: { tabber, customerServicePopup, }, computed: { - ...mapState(['userInfo', 'riceInfo','configList']), + ...mapState(['userInfo', 'riceInfo', 'configList']), + adList() { + let arr = []; + if (this.configList?.shop_get_image) { + arr = this.configList?.shop_get_image?.split(',') + } + return arr + } }, data() { return { vipType: ['普通会员', '黄金会员', '渠道商'], vipImage: ['vip_vip', 'vip_user', 'vip_shop'], - memberList: [{ - id: 1, - memberBg: "/pages_order/static/card/diamond.png", - }, - { - id: 2, - memberBg: "/pages_order/static/card/gold.png", - }, - { - id: 3, - memberBg: "/pages_order/static/card/silver.png", - } - ], + vipList: [], showAdvertising: true, + userRole: ['会员', '用户', '渠道'] } }, onShow() { this.$store.commit('getUserInfo') this.$store.commit('getRiceInfo') + this.getMemberCardData(); }, methods: { clickNo() { @@ -198,6 +198,15 @@ //关闭广告 closeAdvertising() { this.showAdvertising = false; + }, + + //获取会员卡片数据 + getMemberCardData() { + this.$api('getRiceVipList', res => { + if (res.code == 200) { + this.vipList = res.result + } + }) } } } @@ -222,7 +231,7 @@ background-size: 100%; overflow: hidden; border-radius: 50%; - margin-right: 40rpx; + margin-right: 20rpx; image { width: 100%; @@ -258,6 +267,7 @@ .level { width: 120rpx; + height: 60rpx; } } @@ -282,6 +292,7 @@ .edit-icon { width: 30rpx; + height: 30rpx; } .edit-btn { @@ -300,15 +311,17 @@ // 会员卡片 .earnings { - padding: 20rpx; + padding: 0rpx 20rpx; box-sizing: border-box; - margin-top: -22%; + margin-top: -18%; .member-item { position: relative; .member-image { width: 100%; + height: 300rpx; + border-radius: 20rpx; } .member-info { @@ -329,6 +342,7 @@ .pro-img { width: 60rpx; height: 60rpx; + border-radius: 50%; } .open-status { @@ -356,7 +370,7 @@ display: flex; flex-wrap: wrap; box-sizing: border-box; - margin: 0rpx 20rpx 20rpx 20rpx; + margin: 20rpx 20rpx 20rpx 20rpx; .brokerage, .balance { @@ -367,6 +381,7 @@ .brokerage-img, .balance-img { width: 50%; + height: auto; } .main { @@ -390,6 +405,10 @@ } } + .brokerage-data-mt { + margin-top: 50rpx; + } + // 我的服务 .myServer { margin: 0rpx 20rpx 20rpx 20rpx; @@ -451,6 +470,8 @@ .swiper-main-img { width: 100%; + height: 200rpx; + border-radius: 20rpx; } .ad-tag { @@ -459,7 +480,8 @@ bottom: 20rpx; .ad-tag-img { - width: 100rpx; + width: 120rpx; + height: auto; } } } diff --git a/pages/index/index.vue b/pages/index/index.vue index 8debda1..39b1d8f 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -39,46 +39,42 @@ - + - + - - - - + + + {{ item.title }} + - + 视频 - - - - - - + + 推荐宝贝 - 更多 + 更多 - + @@ -125,9 +121,9 @@ commonProductList: [], //常规产品 riceProductList: [], //体验产品 newList: [], //新闻列表 - mixinsListApi: 'getClassShophomeList', - showCouponPopup: true, - adList : [] + mixinsListApi: 'getClassShopPageList', + showCouponPopup: false, + adList: [] } }, computed: {}, @@ -141,7 +137,7 @@ this.getRiceNoticeList() this.getRiceIconList() this.getRiceAdList() - // this.getRiceCommonProductList() + this.getRiceInfo() }, onPullDownRefresh() { this.getBanner() @@ -174,16 +170,6 @@ }) }, - // 获取常规产品【废弃】 - // getRiceCommonProductList() { - // this.$api('getRiceCommonProductList', res => { - // uni.stopPullDownRefresh() - // if (res.code == 200) { - // this.commonProductList = res.result - // } - // }) - // }, - // 获取首页体验产品 getRiceProductList() { this.$api('getRiceProductList', res => { @@ -220,11 +206,23 @@ }) }, + //获取用户相关信息 + getRiceInfo() { + this.$api('getRiceInfo', { + token: uni.getStorageSync('token') || '' + }, res => { + if (res.code == 200) { + this.showCouponPopup = res?.result?.isGetCoupon + } + }) + }, + //跳转 toUrl(url) { if (!url) { uni.showToast({ - title: '功能暂未开放' + title: '功能暂未开放', + icon: 'none' }) return } @@ -257,7 +255,7 @@ uni.navigateTo({ url: "/pages_order/mine/coupon" }) - } + }, }, } @@ -339,6 +337,7 @@ image { width: 80px; + height: 40rpx; } } } @@ -353,7 +352,8 @@ width: 20%; image { - width: 80%; + width: 120rpx; + height: 120rpx; } } @@ -367,12 +367,22 @@ border-radius: 10px; image { - width: 80%; + width: 100rpx; + height: 100rpx; + } + + .title { + background: $uni-color; + color: white; + border-radius: 20rpx; + font-size: 24rpx; + padding: 5rpx 20rpx; + margin: 10rpx 0rpx; } .product-price { color: $uni-color; - + font-size: 24rpx; } } } @@ -395,21 +405,15 @@ } } - .video-list { - .scroll-view_H { - white-space: nowrap; - width: 750rpx; - - .video-item { - display: inline-block; - width: 35%; - border: 1px solid #ccc; + .video-item { + display: flex; + justify-content: center; + align-items: center; + margin: 20rpx 0rpx; - .product-video { - width: 100%; - height: 70px; - } - } + .product-video { + border-radius: 20rpx; + width: calc(710rpx); } } diff --git a/pages/index/order.vue b/pages/index/order.vue index 773e1b2..d275cfb 100644 --- a/pages/index/order.vue +++ b/pages/index/order.vue @@ -12,61 +12,62 @@ - - - - - - - {{ tabs[Number(item.state) + 1].name }} - - - - - - - - - - - 商品：{{good.title}} + + + {{ good.title }} - - 规格：{{good.sku}} + + {{ tabs[Number(item.state) + 1].name }} - - 数量：{{good.num}} + + + + + - + + + 客户姓名：{{item.name}} + + + 下单时间：{{item.createTime}} + + + 联系电话：{{item.phone}} + + + - 实付款：{{item.price}}元 + 总价格： + ￥ + {{item.price}} + 元 - - - + 立即付款 - + 确认收货 + + + 联系客服 + + + @@ -79,10 +80,13 @@ import mixinsList from '@/mixins/list.js' import mixinsOrder from '@/mixins/order.js' import tabber from '@/components/base/tabbar.vue' + import customerServicePopup from '@/components/config/customerServicePopup.vue' + export default { mixins: [mixinsList, mixinsOrder], components: { tabber, + customerServicePopup }, computed: {}, data() { @@ -94,13 +98,10 @@ name: '待付款' }, { - name: '待发货' - }, - { - name: '待收货' + name: '已完成' }, { - name: '已完成' + name: '已取消' } ], current: 0, @@ -113,13 +114,11 @@ index: this.current }) }, - onShow() {}, methods: { //点击tab栏 clickTabs({ index }) { - console.log(index); if (index == 0) { delete this.queryParams.state } else { @@ -153,44 +152,51 @@ border-radius: 16rpx; padding: 30rpx; - .top { - display: flex; - justify-content: space-between; - align-items: center; - font-size: 30rpx; - - .service {} + .content { + .top { + display: flex; + justify-content: space-between; + align-items: center; + font-size: 34rpx; - .status { - font-size: 26rpx; - font-weight: 600; + .status { + font-weight: 600; + color: #FFAC2F; + } } - } - - .content { - display: flex; - margin: 10rpx 0; - .left { - width: 150rpx; - height: 150rpx; - border-radius: 10rpx; + .main { + display: flex; + margin: 20rpx 0rpx; + + .left { + display: flex; + align-items: center; + justify-content: center; + width: 180rpx; + height: 180rpx; + + image { + width: 95%; + height: 95%; + border-radius: 10rpx; + } + } - image { - width: 150rpx; - height: 150rpx; + .right { + display: flex; + flex-direction: column; + justify-content: space-between; + width: calc(100% - 200rpx); + color: #777; + font-size: 26rpx; + padding: 30rpx 20rpx; + box-sizing: border-box; + margin-left: 20rpx; border-radius: 10rpx; + background-color: #F8F8F8; } } - - .right { - width: calc(100% - 160rpx); - color: #777; - font-size: 24rpx; - padding-left: 20rpx; - line-height: 40rpx; - background-color: #F8F8F8; - } } .bottom { @@ -199,33 +205,24 @@ font-size: 25rpx; .price { - font-weight: 900; + .total-title {} - text { - color: #ff780099; - font-size: 30rpx; + .num { + font-size: 36rpx; } - } - .b1 { - border: 1px solid #777; - color: #777; - box-sizing: border-box; - } - - .b2 { - background: $uni-color; - color: #fff; - display: flex; - align-items: center; - justify-content: center; + .num, + .unit, + .c-unit { + color: $uni-color; + } } - view { - margin: 12rpx; - border-radius: 28rpx; - padding: 16rpx 48rpx; - margin-bottom: 0; + .btn { + border: 1px solid #C7C7C7; + padding: 10rpx 20rpx; + border-radius: 40rpx; + color: #575757; } } } diff --git a/pages_order/components/address/addressList.vue b/pages_order/components/address/addressList.vue index f9a9abf..95bbdcb 100644 --- a/pages_order/components/address/addressList.vue +++ b/pages_order/components/address/addressList.vue @@ -1,89 +1,73 @@ + \ No newline at end of file diff --git a/pages_order/components/product/submit.vue b/pages_order/components/product/submit.vue index 0d034f8..0f55ab4 100644 --- a/pages_order/components/product/submit.vue +++ b/pages_order/components/product/submit.vue @@ -73,16 +73,17 @@ .title { font-size: 26rpx; + color: #666666; } } .submit-btn { - width: calc(100% - 100rpx); + width: calc(100% - 140rpx); height: 80rpx; color: #fff; border-radius: 40rpx; font-size: 28rpx; - margin: 20rpx auto; + margin-left: 40rpx; display: flex; justify-content: center; align-items: center; diff --git a/pages_order/mine/coupon.vue b/pages_order/mine/coupon.vue index 3a399cf..4f33ee5 100644 --- a/pages_order/mine/coupon.vue +++ b/pages_order/mine/coupon.vue @@ -1,5 +1,5 @@ + \ No newline at end of file diff --git a/pages_order/mine/withdraw.vue b/pages_order/mine/withdraw.vue index 644d7c1..d478501 100644 --- a/pages_order/mine/withdraw.vue +++ b/pages_order/mine/withdraw.vue @@ -5,23 +5,23 @@ - + 总佣金 - 999999元 + {{ riceInfo.canWithdraw}}元 - + 余额记录 | - + 提现记录 | - + 佣金记录 @@ -31,15 +31,18 @@ 我要提现 - - + + + ￥ + + - + 提现说明 - + @@ -57,50 +60,25 @@ } from 'vuex' export default { mixins: [mixinsList], - data() { - return { - mixinsListApi: 'getWaterPageList', - list: [], - type: ['+', '-'], - state: ['未到账', '已到账'], - form: { - money: '' - }, - } - }, computed: { ...mapState(['userInfo', 'riceInfo']), }, data() { return { form: { - type: 1, - price: undefined, - bank: '', - card: '' + money: '' }, } }, - onShow() { - this.getConfig() - this.getUserInfo() - this.getTenRealName() - }, + onShow() {}, methods: { - - getConfig() { //获取配置信息 - this.$api('getConfig', {}, res => { - if (res.code == 200) { - res.result.forEach(item => { - if (item.keyValue === 'withdraw') { - this.withdrawalStatement = item.content - } - }) - } - }) - }, - withdraw() { //立即提现 + if (this.form.money < 300) { + return uni.showToast({ + title: '未满300元不可提现哦！', + icon: 'none' + }) + } let isOk = this.parameterVerification(); if (isOk && !isOk.auth) { return uni.showToast({ @@ -119,54 +97,26 @@ }) }, - getTenRealName() { //获取技师实名认证 - this.$api('getTenRealName', {}, res => { - if (res.code == 200) { - let result = res.result; - if (result && result.bank && result.card) { - this.form.bank = result.bank - this.form.card = result.card - } - } - }) - }, - parameterVerification() { //验证用户参数合法性 let { - price, - bank, - card + money } = this.form - if (!price) { + if (!money) { return { title: '请填写提现金额', auth: false } - } else if (price <= 0) { - return { - title: '提现金额必须大于0', - auth: false - } - } else if (price > this.userInfo.price) { - return { - title: '提现金额大于余额', - auth: false - } - } else if (bank.trim() == '') { - return { - title: '请填写开户行', - auth: false - } - } else if (card.trim() == '') { - return { - title: '请填写卡号', - auth: false - } } return { title: '验证通过', auth: true } + }, + + toRunningWater() { + uni.navigateTo({ + url: "/pages_order/mine/runningWater" + }) } } } @@ -218,7 +168,7 @@ display: flex; justify-content: center; color: white; - + .operation-item { margin: 0rpx 20rpx; } @@ -231,20 +181,40 @@ text-align: left; color: #333333; } - - .from-body .title{ + + .from-body .title { font-size: 36rpx; } + .money-form { + display: flex; + flex-wrap: wrap; + align-items: center; + background: #ebebeb; + border-radius: 10rpx; + margin-top: 20rpx; + } + + .money-form .unit { + display: flex; + justify-content: flex-end; + color: $uni-color; + width: 60rpx; + } + + &::v-deep .uv-border { + border: none; + } + .money { margin: 20rpx 0rpx; } - + // 提现说明 .withdrawal-statement { padding: 0rpx 20rpx; box-sizing: border-box; - + .title { font-size: 36rpx; margin-bottom: 20rpx; diff --git a/pages_order/order/createOrder.vue b/pages_order/order/createOrder.vue index 9080ad4..43396ca 100644 --- a/pages_order/order/createOrder.vue +++ b/pages_order/order/createOrder.vue @@ -7,24 +7,24 @@ - + - + - MOMEIREN双面黑钻项链 + {{ item.title }} - 材质：S25银 + 材质：暂无 - + - 已售出 666+ 单 + 已售出 {{ item.num }}单 @@ -42,42 +42,45 @@ - - - - - - 账户余额 - (余额: {{ userInfo.money}}) + + + + + + + + 账户余额 + (余额: {{ userInfo.money}}) + + + + - + + + + + + 微信支付 + + + + + - - - - - - - - 微信支付 - - - - - - + - + 优惠券 - $20 + (￥{{ coupon.money || 0}}) - + @@ -88,8 +91,8 @@ - - 本人已同意《用户使用协议》 + + 本人已同意《用户使用协议》 @@ -98,7 +101,7 @@ 合计 ￥{{ count }}元 + font-weight: 600;">{{ totalPrice }}元 @@ -108,26 +111,38 @@ - + + + 新增地址 + + + + + + + + @@ -337,6 +382,7 @@ &::v-deep .uv-number-box__input { color: $uni-color !important; + width: 100rpx !important; } } @@ -414,7 +460,7 @@ // 提示 .hint { font-size: 26rpx; - margin-top: 60rpx; + margin-top: 80rpx; color: #BFBFBF; } @@ -464,5 +510,28 @@ } } } + + //新增地址按钮 + .add-btn { + width: 100%; + + .button-submit { + display: flex; + align-items: center; + justify-content: center; + width: 596rpx; + height: 90rpx; + background: #E3441A; + border-radius: 46rpx; + + margin: 20rpx auto; + + font-size: 28rpx; + font-family: PingFang SC, PingFang SC-Regular; + font-weight: 400; + text-align: center; + color: #ffffff; + } + } } \ No newline at end of file diff --git a/pages_order/order/orderDetail.vue b/pages_order/order/orderDetail.vue index 6419ea9..3d263fe 100644 --- a/pages_order/order/orderDetail.vue +++ b/pages_order/order/orderDetail.vue @@ -1,11 +1,7 @@ @@ -242,8 +261,8 @@ background: linear-gradient(#4899a6, #6fc6ad, #6fc6ad); padding-bottom: 10px; } - - .controls{ + + .controls { margin: 20rpx; background-color: #fff; height: 400rpx; @@ -253,26 +272,31 @@ border-radius: 20rpx; justify-content: center; align-items: center; - .title{ + + .title { display: flex; justify-content: center; align-items: center; font-size: 40rpx; - image{ + + image { width: 100rpx; height: 100rpx; margin-right: 20rpx; } } - .tips{ + + .tips { font-size: 26rpx; color: #FD5100; margin-top: 10rpx; } - .btns{ + + .btns { margin-top: 50rpx; display: flex; - view{ + + view { margin: 0 20rpx; display: flex; justify-content: center; @@ -282,14 +306,16 @@ padding: 15rpx 40rpx; border-radius: 40rpx; } - .btn2{ + + .btn2 { background-color: #FFFFFF; border: 1px solid #A7A7A7; color: #A7A7A7; } } } - .steps{ + + .steps { margin: 20rpx; background-color: #fff; display: flex; @@ -297,7 +323,8 @@ width: 710rpx; border-radius: 20rpx; padding: 70rpx 0; - /deep/ .uv-text__value{ + + /deep/ .uv-text__value { font-size: 22rpx !important; } } @@ -319,8 +346,8 @@ font-size: 25rpx; margin-right: 10rpx; } - - .btc{ + + .btc { background: #ccc; } } @@ -352,14 +379,16 @@ width: 100%; .img-box { - width: 150rpx; - height: 150rpx; + width: 180rpx; + height: 180rpx; border-radius: 10rpx; overflow: hidden; + box-sizing: border-box; image { width: 100%; height: 100%; + border-radius: 10rpx; } } @@ -369,11 +398,26 @@ justify-content: space-around; width: calc(100% - 180rpx); box-sizing: border-box; - padding: 10rpx 15rpx; + padding: 20rpx 15rpx; .server-title { display: flex; - margin-bottom: 10rpx; + font-weight: bold; + } + + .texture, + .num { + font-size: 24rpx; + color: #717171; + } + + .total-price { + display: flex; + justify-content: space-between; + + .price { + color: #F85023; + } } .coupon { @@ -433,22 +477,51 @@ } .address { - - .address-top{ + + .address-top { display: flex; justify-content: space-between; align-items: center; - - image{ + + image { width: 30rpx; height: 30rpx; } } - + .addressDetail { color: #777; font-size: 22rpx; padding: 5px 0; + + .address-line { + display: flex; + flex-wrap: wrap; + align-items: center; + + .main { + width: 88%; + box-sizing: border-box; + padding-right: 20rpx; + overflow: hidden; // 超出的文本隐藏 + text-overflow: ellipsis; // 溢出用省略号显示 + display: -webkit-box; // 将对象作为弹性伸缩盒子模型显示。 + -webkit-line-clamp: 2; // 这个属性不是css的规范属性，需要组合上面两个属性，表示显示的行数。 + -webkit-box-orient: vertical; // 从上到下垂直排列子元素（设置伸缩盒子的子元素排列方式） + } + + .copy { + width: 12%; + background: #FEBC3A; + color: white; + font-size: 20rpx; + border-radius: 20rpx; + display: flex; + align-items: center; + justify-content: center; + height: 40rpx; + } + } } text { @@ -499,13 +572,13 @@ position: relative; display: flex; align-items: center; - + image { height: 45rpx; width: 90rpx; vertical-align: middle; } - + .auth { position: absolute; white-space: nowrap; @@ -540,13 +613,14 @@ .btns { display: flex; justify-content: center; + margin-top: 100rpx; .btn { - color: #6fc6ad; - border: 1px solid #6fc6ad; + color: #A9A7A7; + border: 1px solid #A9A7A7; padding: 10rpx 20rpx; border-radius: 30rpx; } } } - + \ No newline at end of file diff --git a/pages_order/product/productDetail.vue b/pages_order/product/productDetail.vue index 25aa676..286591d 100644 --- a/pages_order/product/productDetail.vue +++ b/pages_order/product/productDetail.vue @@ -16,7 +16,7 @@ - + - + 参数 - 品牌；适应人群 + {{ productDetail.sku }} @@ -53,16 +53,22 @@ + + +