Merge branch 'develop/3.0.1' into test

src/pages/lottery/index.vue

@@ -40,7 +40,7 @@
         <button v-if="form.resultGoodType === 5" @click="getAgain">再抽一次</button>
         <button v-if="form.resultGoodType === 3" @click="getDetail">填写收货信息</button>
       </view>
-      <uni-icons class="close" type="close" size="45" color="#FFF" @click="close" />
+      <uni-icons class="close" type="close" size="45" color="#FFF" @click="closePopup" />
     </uni-popup>
   </view>
 </template>
@@ -205,7 +205,7 @@ export default {
     },
 
     // 关闭弹窗
-    close() {
+    closePopup() {
       this.$refs.popup.close()
     }
   }