needcode 2 yıl önce
ebeveyn
işleme
2ef8579d87

+ 4 - 0
src/api/index.ts

@@ -26,3 +26,7 @@ export function fetchHomeBanner() {
 export function fetchInvoiceList() {
   return indexHttp.get("/invoice/list?status=1");
 }
+
+export function cancelApplyInvoice() {
+  return indexHttp.get("/invoice/cancelApplyInvoice");
+}

+ 14 - 11
src/pages-charge/orders/orders.vue

@@ -54,13 +54,6 @@
 
   <style-bottom-view>
     <view class="foot flex-align-center" v-if="!isInvoice">
-      <!-- <view
-        class="flex-center height-72 br-72"
-        style="width: 176rpx"
-        @click="openInvoiceHistory"
-      >
-        <view class="fs-28 color-333 mr-12">发票历史</view>
-      </view> -->
       <view
         class="flex-center ml-auto mr-40 height-72 br-72"
         style="width: 176rpx; border: 1rpx solid rgba(0, 0, 0, 0.2)"
@@ -106,7 +99,11 @@ import {
   onShow,
 } from "@dcloudio/uni-app";
 import { fetchOrders } from "../../api/user";
-import { applyInvoice, fetchInvoiceList } from "../../api/index";
+import {
+  applyInvoice,
+  cancelApplyInvoice,
+  fetchInvoiceList,
+} from "../../api/index";
 import { useInfiniteScroll } from "../../utils/infinite-scroll";
 import { ref } from "vue";
 import { to } from "@/utils/navigate";
@@ -228,9 +225,15 @@ onLoad(() => {
 });
 onShow(() => {
   if (isInvoiceing.value) {
-    isInvoiceing.value = false;
-    isInvoice.value = false;
-    infiniteScroller.refresh();
+    uni.showLoading({
+      title: "加载中",
+    });
+    cancelApplyInvoice().then(() => {
+      uni.hideLoading();
+      isInvoiceing.value = false;
+      isInvoice.value = false;
+      infiniteScroller.refresh();
+    });
   }
 });
 onPullDownRefresh(() => {

+ 12 - 4
src/pages-common/activity/activity.vue

@@ -29,9 +29,15 @@
         >{{ item }}</view
       >
     </view>
-    <view class="mt-64"
-      ><style-button type="primary" @click="to('/pages-user/wallet-recharge/wallet-recharge')">去充值</style-button></view
-    >
+    <style-bottom-view>
+      <view class="pl-40 pr-40 pb-30 pt-30" style="background-color: #fff">
+        <style-button
+          type="primary"
+          @click="to('/pages-user/wallet-recharge/wallet-recharge')"
+          >去充值</style-button
+        >
+      </view>
+    </style-bottom-view>
   </view>
 </template>
 
@@ -49,7 +55,9 @@ onLoad((options: any) => {
     title: "加载中",
   });
   fetchProfile().then((res) => {
-    const activity = res.activityList.find((item: any) => item.id === options.id);
+    const activity = res.activityList.find(
+      (item: any) => item.id === options.id
+    );
     uni.setNavigationBarTitle({
       title: activity.name,
     });

+ 1 - 1
src/pages-user/wallet-refund/wallet-refund.vue

@@ -103,7 +103,7 @@ onLoad(() => {
 
 const allRefund = () => {
   if (user.value) {
-    value.value = 1 // Number(user.value.balance);
+    value.value = Number(user.value.balance);
   }
 };
 const changeReason = (i: number) => {

+ 1 - 1
src/pages/map/map.vue

@@ -91,7 +91,7 @@
             class="full-percent"
             v-for="(item, index) in mapBanner"
             :key="index"
-            @click="to(`/pages-common/activity/activity?id=${item.activityId}`)"
+            @click="to(item.linkUrl)"
           >
             <view
               class="full-percent"