Merge remote-tracking branch 'remotes/origin/mutou' into dev_yijun

src/views/PartakeChallenge.vue

@@ -70,21 +70,18 @@
         </div>
       </div>
     </div>
-    <!-- 弹框 -->
+    <!-- 支付失败弹框 -->
     <PayFailModal v-if="isShowPayFail" @close="togglePayFail()"></PayFailModal>
+    <!-- 通用弹框 -->
     <div class="modal" v-if="modalShown">
       <Modal v-on:close="closeModal" v-on:confirmModal="confirmModal" v-bind:title="modalTitle" v-bind:desc="modalDesc" :option="modalOption"></Modal>
     </div>
-    <div class="modal" v-if="showFreeModal">
-      <Free v-bind:page_type="1" v-on:close="closeFree" v-bind:v_data="contract_data" @showModal="showModal" @success="showSuccess" :days="0"></Free>
-    </div>
   </div>
 </template>
 
 <script>
 import Title from "@/components/Title.vue";
 import PayFailModal from "@/components/PayFailModal.vue";
-import Free from "@/components/Free.vue";
 import Modal from "@/components/Modal.vue";
 import { daka_info } from "@/components/axios/api";
 import { dakaPay } from "@/components/axios/api";
@@ -94,13 +91,11 @@ export default {
   components: {
     Title,
     PayFailModal,
-    Modal,
-    Free
+    Modal
   },
   data() {
     return {
       isShowPayFail: false,
-      showFreeModal: false,
       modalTitle: "",
       modalDesc: "",
       modalShown: false,
@@ -210,7 +205,9 @@ export default {
                 // res.err_msg将在用户支付成功后返回ok，但并不保证它绝对可靠。
                 // 支付成功后的回调函数
                 console.log("支付成功");
-                this.showSuccess();
+                sessionStorage.setItem("userHaveJoinGame", "true");
+                sessionStorage.setItem("userHavePaidGame", "true");
+                this.$router.push({ name: "HaveJoinedGame" });
               } else if (res.err_msg === "get_brand_wcpay_request:fail" || res.err_msg === "get_brand_wcpay_request:cancel") {
                 // 支付服务繁忙，请稍后重试 || 支付取消
                 this.togglePayFail();
@@ -228,22 +225,6 @@ export default {
       this.modalShown = true;
     },
     // 弹窗
-    showSuccess() {
-      sessionStorage.setItem("userHaveJoinGame", "true");
-      sessionStorage.setItem("userHavePaidGame", "true");
-      this.$router.push({ name: "HaveJoinedGame" });
-      // this.showModal("温馨提示", "报名成功", {
-      //     scb: () => {
-      //         sessionStorage.setItem('userHaveJoinGame', 'true')
-      //         sessionStorage.setItem('userHavePaidGame', 'true');
-      //     }
-      // })
-    },
-    // 弹窗
-    closeFree() {
-      this.showFreeModal = false;
-    },
-    // 弹窗
     closeModal() {
       this.modalShown = false;
     },