From f1901a30e15e1e2fd239cc33c13baafefd2dc8fa Mon Sep 17 00:00:00 2001 From: 396316021 <396316021@qq.com> Date: Fri, 27 Oct 2023 13:55:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/PetPage/components/index.scss | 107 ++++++++++++++++++ pages/CardDetail/index.vue | 2 +- pages/Index/components/OrderPage/index.vue | 3 +- pages/Index/components/UserPage/index.vue | 1 + pages/OrderConfirm/end.vue | 2 +- pages/PetDetail/index.vue | 2 +- pages/UserDetail/index.vue | 4 +- uni_modules/m-view/changelog.md | 2 + .../m-view/components/m-card/m-card.vue | 27 +++++ uni_modules/m-view/package.json | 83 ++++++++++++++ uni_modules/m-view/readme.md | 3 + 11 files changed, 229 insertions(+), 7 deletions(-) create mode 100644 uni_modules/m-view/changelog.md create mode 100644 uni_modules/m-view/components/m-card/m-card.vue create mode 100644 uni_modules/m-view/package.json create mode 100644 uni_modules/m-view/readme.md diff --git a/components/PetPage/components/index.scss b/components/PetPage/components/index.scss index 9559b3e..069c59a 100644 --- a/components/PetPage/components/index.scss +++ b/components/PetPage/components/index.scss @@ -242,4 +242,111 @@ } } } +} + +.order-item.pet-page-item{ + padding:{ + left:0 !important; + right:0 !important; + } + border-bottom: none !important; +} +.pet-page-group{ + margin-top:20rpx; + padding:0 20rpx; + background:{ + color:#F3FDFC; + } + border-radius: 20rpx; +} +.pet-page-button{ + width: 100%; + text-align: center; + padding:55rpx 0 15rpx 0; + justify-content: center; +} +.order-item { + padding: 25rpx 10rpx; + align-items: center; + border-bottom: 1rpx solid #BBB; + box-sizing: border-box; + &:last-child { + border-bottom: none; + } + .item-content { + justify-content: flex-end; + box-sizing: border-box; + } +} +.detail-container{ + position: relative; + box-sizing: border-box; + .detail-background-container{ + box-sizing: border-box; + padding:0 10rpx; + position: absolute; + top:0rpx; + left:0; + width:100%; + height:100%; + .detail-background{ + position: relative; + // top:10rpx; + left:0; + width:100%; + height:100%; + z-index: 1; + background-color: #fff; + border: 2rpx solid #262626; + box-shadow: 1rpx 4rpx 6rpx 0rpx rgba(103,131,131,0.3); + border-radius: 50rpx; + } + } + .detail-content-container{ + position: relative; + z-index: 2; + padding:15rpx 0; + .detail-content{ + border: 2rpx solid #262626; + border-radius: 50rpx; + background-color:#fff; + padding:40rpx; + } + } + .detail-container{ + position: relative; + box-sizing: border-box; + .detail-background-container{ + box-sizing: border-box; + padding:0 10rpx; + position: absolute; + top:0rpx; + left:0; + width:100%; + height:100%; + .detail-background{ + position: relative; + // top:10rpx; + left:0; + width:100%; + height:100%; + z-index: 1; + background-color: #fff; + border: 2rpx solid #262626; + box-shadow: 1rpx 4rpx 6rpx 0rpx rgba(103,131,131,0.3); + border-radius: 50rpx; + } + } + .detail-content-container{ + position: relative; + z-index: 2; + padding:15rpx 0; + .detail-content{ + border: 2rpx solid #262626; + border-radius: 50rpx; + background-color:#fff; + padding:40rpx; + } + } + } } \ No newline at end of file diff --git a/pages/CardDetail/index.vue b/pages/CardDetail/index.vue index 279ff8f..622836d 100644 --- a/pages/CardDetail/index.vue +++ b/pages/CardDetail/index.vue @@ -209,7 +209,7 @@ - + diff --git a/pages/Index/components/OrderPage/index.vue b/pages/Index/components/OrderPage/index.vue index 47178c7..11fa289 100644 --- a/pages/Index/components/OrderPage/index.vue +++ b/pages/Index/components/OrderPage/index.vue @@ -92,8 +92,7 @@ diff --git a/pages/Index/components/UserPage/index.vue b/pages/Index/components/UserPage/index.vue index 70cf200..77080a9 100644 --- a/pages/Index/components/UserPage/index.vue +++ b/pages/Index/components/UserPage/index.vue @@ -9,6 +9,7 @@ + diff --git a/pages/OrderConfirm/end.vue b/pages/OrderConfirm/end.vue index 8f25474..df70caa 100644 --- a/pages/OrderConfirm/end.vue +++ b/pages/OrderConfirm/end.vue @@ -1993,7 +1993,7 @@ export default { let result = []; try { data.forEach(item => { - result.push({url: item.url}) + result.push({url: item.url, type: item.type}) }) } catch (e) { this.images[fileName] = []; diff --git a/pages/PetDetail/index.vue b/pages/PetDetail/index.vue index b161a56..3aceec9 100644 --- a/pages/PetDetail/index.vue +++ b/pages/PetDetail/index.vue @@ -142,7 +142,7 @@ - + diff --git a/pages/UserDetail/index.vue b/pages/UserDetail/index.vue index dac0f98..70556bc 100644 --- a/pages/UserDetail/index.vue +++ b/pages/UserDetail/index.vue @@ -54,8 +54,8 @@ 背景 - - + + diff --git a/uni_modules/m-view/changelog.md b/uni_modules/m-view/changelog.md new file mode 100644 index 0000000..cab993e --- /dev/null +++ b/uni_modules/m-view/changelog.md @@ -0,0 +1,2 @@ +## 1.0.0 +m-view diff --git a/uni_modules/m-view/components/m-card/m-card.vue b/uni_modules/m-view/components/m-card/m-card.vue new file mode 100644 index 0000000..b88bc32 --- /dev/null +++ b/uni_modules/m-view/components/m-card/m-card.vue @@ -0,0 +1,27 @@ + + + + + diff --git a/uni_modules/m-view/package.json b/uni_modules/m-view/package.json new file mode 100644 index 0000000..1a59946 --- /dev/null +++ b/uni_modules/m-view/package.json @@ -0,0 +1,83 @@ +{ + "id": "m-view", + "displayName": "m-view 卡片", + "version": "1.0.1", + "description": "m-view", + "keywords": [ + "卡片" + ], + "repository": "", + "engines": { + "HBuilderX": "^3.1.0" + }, + "dcloudext": { + "type": "component-vue", + "sale": { + "regular": { + "price": "0.00" + }, + "sourcecode": { + "price": "0.00" + } + }, + "contact": { + "qq": "" + }, + "declaration": { + "ads": "无", + "data": "插件不采集任何数据", + "permissions": "无" + }, + "npmurl": "" + }, + "uni_modules": { + "dependencies": [ + + ], + "encrypt": [], + "platforms": { + "cloud": { + "tcb": "y", + "aliyun": "y" + }, + "client": { + "Vue": { + "vue2": "y", + "vue3": "y" + }, + "App": { + "app-vue": "y", + "app-nvue": "y" + }, + "H5-mobile": { + "Safari": "y", + "Android Browser": "y", + "微信浏览器(Android)": "y", + "QQ浏览器(Android)": "y" + }, + "H5-pc": { + "Chrome": "y", + "IE": "y", + "Edge": "y", + "Firefox": "y", + "Safari": "y" + }, + "小程序": { + "微信": "y", + "阿里": "y", + "百度": "y", + "字节跳动": "y", + "QQ": "y", + "钉钉": "u", + "快手": "u", + "飞书": "u", + "京东": "u" + }, + "快应用": { + "华为": "u", + "联盟": "u" + } + } + } + } +} \ No newline at end of file diff --git a/uni_modules/m-view/readme.md b/uni_modules/m-view/readme.md new file mode 100644 index 0000000..a0584ed --- /dev/null +++ b/uni_modules/m-view/readme.md @@ -0,0 +1,3 @@ +## 常用功能封装 + +> **组件名：m-view** \ No newline at end of file