Merge branch 'develop/3.1.0' into test

src/pages/activity/index.vue

@@ -8,7 +8,7 @@
       <view v-if="isShow" class="popup">
         <h3>兑换成功</h3>
         <view class="center">{{ content }}</view>
-        <button @click="getClose">确定</button>
+        <button type="submit" circle @click="getClose">确定</button>
         <span>该套餐内容仅可在WIFI/移动数据模式下收听</span>
       </view>
       <view v-else class="popup-catch">
@@ -121,7 +121,6 @@ img {
   padding: 48rpx 0;
   display: flex;
   flex-direction: column;
-
   align-items: center;
 
   .center {
@@ -134,7 +133,7 @@ img {
     line-height: 80rpx;
     font-size: 32rpx;
     position: absolute;
-    bottom: 48rpx;
+    bottom: 88rpx;
   }
 
   span {

src/pages/help/index.vue

@@ -49,6 +49,7 @@ export default {
       },
       // 图片列表
       imageFiles: [],
+      length: 0,
       // 单选
       active: 0,
       // 反馈类型
@@ -78,12 +79,13 @@ export default {
 
     // 上传
     upload() {
-      selectImageCount.postMessage(`${this.form.imageFiles.length}`)
+      selectImageCount.postMessage(this.length)
       selectImage.postMessage('获取相册信息')
       window['receiveImageAddress'] = e => {
         JSON.parse(e).addressList.map(i => {
           this.imageFiles.push(i)
         })
+        this.length = this.imageFiles.length
       }
     },