shish %!s(int64=6) %!d(string=hai) anos
pai
achega
f7fcc1a388
Modificáronse 2 ficheiros con 3 adicións e 33 borrados
  1. 2 32
      mall/src/pages/callback/success.vue
  2. 1 1
      mall/src/pages/pay/index.vue

+ 2 - 32
mall/src/pages/callback/success.vue

@@ -8,17 +8,12 @@
           </div>
         </block>
         <div class="status-text app-size-36 app-bold">{{ pageTit }}</div>
-        <block v-if="pageStatus == 3 || pageStatus == 4 || pageStatus == 5"></block>
+        <block></block>
       </div>
     </div>
   </div>
 </template>
 <script>
-import { mapGetters } from "vuex";
-import wexinPay from "@/utils/pay/wxPay";
-import { getMerchantInfo } from "@/api/common";
-import { getShopUser } from "@/utils/auth";
-import { balancePay, wxPay } from "@/api/order";
 export default {
   name: "callback",
   components: {},
@@ -38,39 +33,14 @@ export default {
       merchantInfo: {}
     };
   },
-  computed: {
-    ...mapGetters({ shopUser: "getShopUser" }),
-    isYeBtnShow() {
-      if (this.$util.isEmpty(this.shopUser)) {
-        return false;
-      }
-      return this.shopUser.userAsset.balance > this.option.totalPrice;
-    }
-  },
+  computed: {},
   onLoad() {},
   methods: {
     init() {
       this.pageStatus = this.option.pageStatus;
-      console.log("pageStatus 值发生变化");
-      console.log(this.pageStatus);
       this.payDiscountPrice = this.option.payDiscountPrice;
       this.payDiscountType = this.option.payDiscountType;
       this.initClass(this.pageStatus);
-      getShopUser();
-      getMerchantInfo().then(res => {
-        this.merchantInfo = res.data;
-      });
-    },
-    passwordModalClick(e) {
-      if (e.index === 0) {
-        this.modalCancel();
-      } else {
-        this._balancePay();
-      }
-    },
-    modalCancel() {
-      this.passwordModal = false;
-      this.form.payPassword = "";
     },
     //初始样式
     initClass(val) {

+ 1 - 1
mall/src/pages/pay/index.vue

@@ -327,7 +327,7 @@ export default {
     },
     // 支付成功
     paySuccess() {
-      let url = this.form.payWay == 1 ? '/pages/callback/success' : '/pages/callback/index';
+      // alert('支付成功!')
       this.$util.pageTo({
         url: "/pages/callback/index",
         type: 2,