Merge branch 'develop/3.1.0' into test

src/pages/activity/index.vue

@@ -1,6 +1,6 @@
 <template>
   <view class='app-container'>
-    <image :src="pic" mode="aspectFill" />
+    <img :src="pic" />
     <button class="submit" type="submit" circle @click="getSubmit">立即兑换</button>
 
     <!-- 弹窗 -->
@@ -86,18 +86,19 @@ export default {
 <style lang="scss" scoped>
 .app-container {
   padding: 0;
-  height: 100%;
   overflow: hidden;
+  position: relative;
 }
 
-uni-image {
+img {
   width: 100%;
   height: 100%;
+  display: block;
 }
 
 .submit {
   position: absolute;
-  bottom: 40rpx;
+  bottom: 20rpx;
   left: 50%;
   transform: translate(-50%);
   width: calc(100% - 120rpx);