删除支付宝沙箱部分、excel报表部分

src/api/tools.ts

@@ -12,11 +12,3 @@ export const uploadImage = payload => {
             return res
         })
 }
-
-// 获取excel的链接
-export const getExcelUrl = () => {
-    return axios.get(`${API_MODULE}/excel`, )
-        .then(res => {
-            return res
-        })
-}

src/components/OrderItem.vue

@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import {ref, computed} from "vue"
 import {ElTable} from "element-plus"
-import {RefreshRight} from "@element-plus/icons-vue"
 import {deliverOrder, getOrder, getOrderById, payOrder, commentOrder, calculateOrder} from "../api/order.ts"
 import {getAvailableCouponsByStoreId} from "../api/coupon.ts"
 
@@ -64,9 +63,6 @@ function handlePay() {
   getAvailableCouponList()
 }
 
-const isLoading = ref(false)
-const refreshButtonVisible = ref(false)
-
 function handleConfirmOrder() {
   payOrder(props.orderId, couponId.value).then(res => {
     if (res.code === '000') {
@@ -75,11 +71,7 @@ function handleConfirmOrder() {
         type: 'success',
         center: true,
       })
-      isLoading.value = true
-      refreshButtonVisible.value = true
-      const paymentWindow = window.open('', '_blank');
-      paymentWindow.document.write(res.result);
-      paymentWindow.document.forms[0].submit(); // 提交表单
+      getOrderDetail()
     } else if (res.code === '400') {
       ElMessage({
         message: res.msg,
@@ -90,15 +82,9 @@ function handleConfirmOrder() {
   })
 }
 
-function refreshPage() {
-  location.reload();
-}
-
 function handlePayDialogClose() {
   orderDialogVisible.value = false
   couponId.value = 0
-  isLoading.value = false
-  refreshButtonVisible.value = false
 }
 
 function handleDeliver() {
@@ -345,16 +331,9 @@ function parseNull(value) {
   <el-dialog v-model="orderDialogVisible" :before-close="handlePayDialogClose">
     <el-row>
       <span class="pay-dialog-title">订单支付</span>
-      <el-button v-if="refreshButtonVisible" @click="refreshPage()"
-                 type="primary" plain class="pay-dialog-refresh-button">
-        已完成支付，刷新界面
-        <el-icon>
-          <RefreshRight/>
-        </el-icon>
-      </el-button>
     </el-row>
 
-    <div v-loading="isLoading">
+    <div>
       <el-form>
         <el-form-item>
           <label>购买数量：</label>
@@ -458,9 +437,4 @@ function parseNull(value) {
   font-size: 30px;
   margin-bottom: 20px;
 }
-
-.pay-dialog-refresh-button {
-  margin-left: 15px;
-  margin-top: 5px;
-}
 </style>

src/views/order/AllOrder.vue

@@ -1,32 +1,20 @@
 <script setup lang="ts">
 import {ref} from "vue"
 import {getAllOrder} from "../../api/order.ts"
-import {getExcelUrl} from "../../api/tools.ts"
 import OrderItem from "../../components/OrderItem.vue"
 
 const role = sessionStorage.getItem("role")
 
 const orderList = ref()
-const excelUrl = ref('')
 
 getAllOrder().then(res => {
   orderList.value = res.result
 })
-
-getExcelUrl().then(res => {
-  excelUrl.value = res.result
-})
 </script>
 
 
 <template>
   <el-main>
-    <div v-if="role === 'STAFF' || role === 'MANAGER' || role === 'CEO'">
-      <a :href="excelUrl">
-        <el-button class="get-excel-button" type="success" plain>下载订单报表</el-button>
-      </a>
-    </div>
-
     <div class="order-item-list">
       <OrderItem
           v-for="orderVO in orderList" :orderId="orderVO.id"/>
@@ -42,10 +30,4 @@ getExcelUrl().then(res => {
   flex-flow: wrap;
   justify-content: center;
 }
-
-.get-excel-button {
-  margin-top: 20px;
-  margin-left: 50px;
-
-}
 </style>

src/views/product/ProductDetail.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import {ref, onMounted, computed} from "vue"
 import {router} from '../../router'
-import {Back, RefreshRight} from "@element-plus/icons-vue"
+import {Back} from "@element-plus/icons-vue"
 import {ElTable} from "element-plus"
 import {addStock, getProductById} from "../../api/product.ts"
 import {calculateOrder, createOrder, payOrder} from "../../api/order.ts"
@@ -121,10 +121,6 @@ function handleCreateOrder() {
   })
 }
 
-const showForm = ref(false)
-const isLoading = ref(false)
-const refreshButtonVisible = ref(false)
-
 // 确定订单按钮
 function handleConfirmOrder() {
   payOrder(orderId.value, couponId.value).then(res => {
@@ -134,12 +130,6 @@ function handleConfirmOrder() {
         type: 'success',
         center: true,
       })
-      isLoading.value = true
-      refreshButtonVisible.value = true
-      const paymentWindow = window.open('', '_blank')
-      paymentWindow.document.write(res.result)
-      paymentWindow.document.forms[0].submit() // 提交表单
-      showForm.value = false // 隐藏表单
     } else if (res.code === '400') {
       ElMessage({
         message: res.msg,
@@ -150,15 +140,9 @@ function handleConfirmOrder() {
   })
 }
 
-function refreshPage() {
-  location.reload()
-}
-
 function handlePayDialogClose() {
   orderDialogVisible.value = false
   couponId.value = 0
-  isLoading.value = false
-  refreshButtonVisible.value = false
 }
 
 onMounted(() => {
@@ -358,16 +342,9 @@ function toBackPage() {
     <el-dialog v-model="orderDialogVisible" :before-close="handlePayDialogClose">
       <el-row>
         <span class="pay-dialog-title">订单支付</span>
-        <el-button v-if="refreshButtonVisible" @click="refreshPage()"
-                   type="primary" plain class="pay-dialog-refresh-button">
-          已完成支付，刷新界面
-          <el-icon>
-            <RefreshRight/>
-          </el-icon>
-        </el-button>
       </el-row>
 
-      <div v-loading="isLoading">
+      <div>
         <el-form>
           <el-form-item>
             <label for="amount">购买数量：</label>
@@ -469,6 +446,7 @@ function toBackPage() {
 .buy-form {
   margin-top: 20px;
   margin-left: 30px;
+  width: 20%;
 }
 
 .add-stock-main {
@@ -485,9 +463,4 @@ function toBackPage() {
   font-size: 30px;
   margin-bottom: 20px;
 }
-
-.pay-dialog-refresh-button {
-  margin-left: 15px;
-  margin-top: 5px;
-}
 </style>