Merge branch 'dev' into 'test'

h5海报

See merge request quanshu/mp-ui-user!59

src/packagePrize/choice/index.vue

@@ -162,8 +162,8 @@
 						fontSize: 26, //字体大小
 						color: "#fff", //颜色
 						lineHeight: 44, //行高#4F4F4F 100%
-						mt: -340, //margin-top
-						w: 303,
+						mt: 90, //margin-top
+						w: 310,
 						align: "left"
 					},
 					mainImg: {
@@ -180,7 +180,7 @@
 						w: 60, //宽度
 						h: 60, //高度
 						r: 2, //圆角半径
-						mt: 385
+						mt: 550
 					},
 					tips: []
 				},

src/packagePrize/components/hch-poster/hch-poster.vue

@@ -87,7 +87,7 @@
 				let system = this.system
 				let posterTitle = data.title
 				posterTitle.x = (system.w - data.title.w * system.scale) / 2
-				posterTitle.y = this.poster.y + data.poster.p + data.mainImg.mt * system.scale
+				posterTitle.y = this.poster.y + data.poster.p + data.title.mt * system.scale
 				return posterTitle
 			},
 			/**
@@ -189,8 +189,7 @@
 		},
 		created() {
 			// 获取设备信息
-			this.system = getSystem()
-			console.log(this.system);
+			this.system = getSystem()
 		},
 		methods: {
 			/**