Merge branch 'dev' into sit

Jacob

4 天以前 bf50dc43351d1a9781a84faf775913e813ea6ecb

 components/popActivity/index.vue
..
..
@@ -138,7 +138,7 @@
138
138
 	.box {
139
139
 		width: 600rpx;
140
140
 		padding: 90rpx 0 70rpx 0;
141
-		background: url("https://ossacmall.bluedeer.com.cn/app/static/images/confirm_bg.png") center 0rpx/100% auto no-repeat;
141
+		background: url("https://ossacmall.bluedeer.com.cn/app/static/images/confirm_bg.png") center 0rpx / 100% auto no-repeat;
142
142
 		background-color: #f5f5f5;
143
143
 		position: absolute;
144
144
 		left: 50%;