修改问题

1 year ago · f1901a30e1
11 changed files with 229 additions and 7 deletions
--- 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;
+			}
+		}
+	}
 }
--- a/pages/CardDetail/index.vue
+++ b/pages/CardDetail/index.vue
@ -209,7 +209,7 @@
          </view>
        </view>
      </view>
-      <view class="" style="padding: 0 50rpx 50rpx;">
+      <view class="" style="padding: 0 50rpx 25rpx;">
        <PetPage class="pet-page" :showCancel="true" type="lists" @change="selectPet" @del="delPet"></PetPage>
      </view>
      <view class="" style="padding:30rpx;">
--- a/pages/Index/components/OrderPage/index.vue
+++ b/pages/Index/components/OrderPage/index.vue
@ -92,8 +92,7 @@
 								</view>
                <view v-if="item.status === 2" class="card-button" @click="navTo('/pages/OrderConfirm/end?type=edit&id=' + item.id)">
                  <MzButton
-                      title="修改完成表单"
-                      font-size="24rpx"
+                      title="修改完成"
                      font-color="#4DC3B8"
                      button-color="#D6FFF6"
                      button-width="100%"></MzButton>
--- a/pages/Index/components/UserPage/index.vue
+++ b/pages/Index/components/UserPage/index.vue
@ -9,6 +9,7 @@
 <!--		}">-->
 <!--		-->
 <!--	</view>-->
+  <official-account></official-account>
 	<view class="app-wallpaper" :style="{
 		backgroundImage:'url('+staticImage.wallpaperBgImage+')'
 		}">
--- 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] = [];
--- a/pages/PetDetail/index.vue
+++ b/pages/PetDetail/index.vue
@ -142,7 +142,7 @@
            </view>
          </view>

-          <view class="content-item pet-detail-video-group">
+          <view class="content-item pet-detail-video-group" v-if="pet.video">
            <view class="video-title">
              <image class="img" mode="heightFix" :src="staticImage.petVideoTitle"/>
            </view>
--- a/pages/UserDetail/index.vue
+++ b/pages/UserDetail/index.vue
@ -54,8 +54,8 @@
 					<view class="detail-content-item">
 						<view class="detail-item-title">背景</view>
 						<view class="detail-item-content">
-							<u-upload :file-list="background" :maxCount="1" @delete="backgroundDel" @afterRead="backgroundRead">
-							</u-upload>
+							<uv-upload width="139rpx" height="87rpx" :file-list="background" :maxCount="1" @delete="backgroundDel" @afterRead="backgroundRead">
+							</uv-upload>
 						</view>
 					</view>
 					<view class="detail-logout-button" @click="loginout">
--- a/uni_modules/m-view/changelog.md
+++ b/uni_modules/m-view/changelog.md
@ -0,0 +1,2 @@
+## 1.0.0
+m-view
--- a/uni_modules/m-view/components/m-card/m-card.vue
+++ b/uni_modules/m-view/components/m-card/m-card.vue
@ -0,0 +1,27 @@
+<template>
+  <view class="" style="padding:26rpx;border-radius: 20rpx;background-color:#fff;box-shadow:0rpx 0rpx 30rpx #dfdfdf">
+    <slot></slot>
+  </view>
+</template>
+
+<script>
+	/**
+	 * 卡片
+	 * @description
+	 * 
+	 * @property {String}			title       显示的文字
+	 */
+	export default {
+		name: 'm-card',
+		methods: {
+
+		},
+    mounted() {
+
+    },
+	}
+</script>
+
+<style lang="scss" scoped>
+
+</style>
--- a/uni_modules/m-view/package.json
+++ 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"
+				}
+			}
+		}
+	}
+}
--- a/uni_modules/m-view/readme.md
+++ b/uni_modules/m-view/readme.md
@ -0,0 +1,3 @@
+## 常用功能封装
+
+> **组件名：m-view**