From 91036322a8ae3b3a1bf1e1e6ae5cfb48fbdddc0e Mon Sep 17 00:00:00 2001 From: PQZ Date: Tue, 24 Sep 2024 14:08:50 +0800 Subject: [PATCH 1/4] 1 --- config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.js b/config.js index ad9bd5c..ba4d5e4 100644 --- a/config.js +++ b/config.js @@ -1,7 +1,7 @@ // 应用全局配置 module.exports = { //baseUrl: 'https://www.nuoyunr.com/admin-api', - baseUrl: 'http://192.168.1.4:48080/userClient', + baseUrl: 'http://192.168.1.4:48080', imagesUrl: 'http://shequ.0315e.com/static/images/pages/', baseImageUrl: 'https://www.nuoyunr.com/minio', //wsUrl: 'wss://www.nuoyunr.com/admin-api', From fd6ddb51228b31aadc3125e04fcd2c8b34f5f177 Mon Sep 17 00:00:00 2001 From: ChuShiZ Date: Tue, 24 Sep 2024 16:02:12 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=8D=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/my/cardRoll.vue | 180 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 175 insertions(+), 5 deletions(-) diff --git a/pages/my/cardRoll.vue b/pages/my/cardRoll.vue index 72fcccf..6c0b2b6 100644 --- a/pages/my/cardRoll.vue +++ b/pages/my/cardRoll.vue @@ -1,6 +1,36 @@ @@ -13,12 +43,152 @@ }, data() { return { - + tabList: [{ + value: 0, + title: '优惠卷' + }, + { + value: 1, + title: '卡包' + } + ], + activeKey: 0 }; } } - + display: flex; + flex-direction: column; + + .body { + flex: 1; + height: 0; + box-sizing: border-box; + padding: 30rpx 0; + margin: 0 32rpx; + + display: flex; + flex-direction: column; + row-gap: 20rpx; + + overflow: auto; + + + .cardItem { + background: #FFFFFF; + border-radius: 16rpx 16rpx 16rpx 16rpx; + padding: 30rpx; + } + + .cardItemTop { + display: flex; + align-items: center; + column-gap: 16rpx; + padding-bottom: 32rpx; + border-bottom: 1px solid #ddd; + } + + .cardImg { + width: 136rpx; + height: 100rpx; + background-color: #efefef; + } + + .cardInfo { + flex: 1; + width: 0; + display: flex; + flex-direction: column; + justify-content: space-between; + + padding: 6rpx 0; + + .cardName { + font-size: 32rpx; + color: #333333; + } + + .cardEndDate { + font-size: 24rpx; + color: #999999; + } + } + + .cardInfoRight { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + font-size: 24rpx; + color: #FC4D4A; + + .cardNumValue { + font-size: 64rpx; + } + + .cardLabel { + color: #999999; + } + } + } + + .cardItemBottom { + display: flex; + align-items: center; + justify-content: space-between; + padding: 30rpx 0 0; + + .useSm { + font-size: 24rpx; + color: #999999; + } + + .useBtn { + width: 144rpx; + height: 60rpx; + border-radius: 30rpx 30rpx 30rpx 30rpx; + border: 1rpx solid #FC4D4A; + font-size: 28rpx; + color: #FC4D4A; + display: flex; + align-items: center; + justify-content: center; + } + } + } + + .tabbar { + background-color: #fff; + display: flex; + align-items: center; + + .tabItem { + flex: 1; + width: 0; + + display: flex; + justify-content: center; + padding: 30rpx 0; + + position: relative; + } + + .activeLine { + width: 52rpx; + height: 8rpx; + background: #009EDA; + border-radius: 4rpx 4rpx 4rpx 4rpx; + + position: absolute; + left: 50%; + bottom: 2rpx; + transform: translate(-50%, 0); + } + } + \ No newline at end of file From f84f9fc04329bf4660650d58e2f5525f4ba2ac36 Mon Sep 17 00:00:00 2001 From: sunliwei Date: Tue, 24 Sep 2024 16:03:57 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/orderList/orderList.vue | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/pages/orderList/orderList.vue b/pages/orderList/orderList.vue index 72c408c..6b526e7 100644 --- a/pages/orderList/orderList.vue +++ b/pages/orderList/orderList.vue @@ -42,15 +42,15 @@ 评价订单 - + - + - + - + 长按识别图中二维码支付 @@ -64,7 +64,7 @@ import VNavigationBar from '@/components/VNavigationBar.vue' import tabBarVue from '@/components/tabBar/tabBar.vue' import drawQrcode from 'weapp-qrcode'; - + export default { components: { tabBarVue, @@ -160,10 +160,10 @@ method: 'get', params: {orderId:data.id} }).then((res) => { - + this.$refs.popup.open() setTimeout(()=>{ - + drawQrcode({ width: 200, height: 200, @@ -174,11 +174,11 @@ }, 60) }) }, - - convertToImage() { - + + convertToImage() { + uni.canvasToTempFilePath({ - + canvasId: 'myQrcode', success: function(res) { // 在H5平台下，tempFilePath 为 base64 @@ -187,11 +187,11 @@ this.$forceUpdate() console.log(this.imageUrl,200); } - }) + }) } , popupChange({show}) { if (show) { - + } }, gotoDetail() { @@ -220,6 +220,7 @@ flex: 1; height: 0; padding: 24rpx 32rpx; + overflow: auto; } .tabList { @@ -337,4 +338,4 @@ } } } - \ No newline at end of file + From d6ad3e73d81847f4d29d80abea6e1657fa5cf9f9 Mon Sep 17 00:00:00 2001 From: sunliwei Date: Tue, 24 Sep 2024 16:14:08 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/my/my.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pages/my/my.vue b/pages/my/my.vue index c1bef75..c485e22 100644 --- a/pages/my/my.vue +++ b/pages/my/my.vue @@ -48,7 +48,7 @@ - + @@ -80,6 +80,7 @@ menuCard2: [ { title: '客服中心', icon: require('@/static/icons/my-menu-icon4.png') }, { title: '操作指南', icon: require('@/static/icons/my-menu-icon5.png'), path: "/pages/guideList/guideList" }, + { title: '我的卡卷', icon: require('@/static/icons/my-menu-icon5.png'), path: "/pages/my/cardRoll" }, ] } }, @@ -240,7 +241,7 @@ height: 32rpx; } } - + .menuCard { width: 686rpx; margin: 30rpx auto 0; @@ -275,11 +276,11 @@ display: flex; align-items: center; justify-content: center; - + font-weight: bold; font-size: 20rpx; color: #FFFFFF; } } } - \ No newline at end of file +