Merge remote-tracking branch 'origin/ckf' into develop

src/pages/index/index.vue

@@ -146,8 +146,8 @@ export default {
                 isclick:false,
 				icon: {
 					type: 'image',
-					image: '../../static/img/location-icon.png',
-					size: [24, 24],
+					image: 'https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/b0364bd1-f193-4b93-ac9f-cfb6e2624d6b.png',
+					size: [32, 32],
 					anchor: 'bottom-center',
 				},
 			};
@@ -601,7 +601,7 @@ export default {
       flex-direction: column;
       justify-content: center;
       align-items: center;
-      img {
+      image {
         width: 32rpx;
         height: 32rpx;
       }