Merge branch 'develop/3.1.0' into test

src/pages/activity/index.vue

@@ -1,6 +1,6 @@
 <template>
-  <view class='app-container' :style="{ 'height': pic ? '' : '100%' }">
-    <img v-if="pic" :src="pic" />
+  <view v-if="pic" class='app-container'>
+    <img :src="pic" />
     <button class="submit" type="submit" circle @click="getSubmit">立即兑换</button>
 
     <!-- 弹窗 -->