Merge branch 'master' into 2.0

src/views/operationManage/advertisingManage/addAdv.vue

@@ -121,10 +121,18 @@ export default {
         {
           label:'首页广告位',
           value:2
+        },
+        {
+          label:'贵大奶茶Banner',
+          value:3
+        },
+        {
+          label:'贵大奶茶广告位',
+          value:4
         }
       ],
       belongTypeOptions:[
-        { 
+        {
           label: "贵大",
           value: 1,
         },
@@ -170,11 +178,11 @@ export default {
                   message: '操作成功',
                   type: 'success'
                 });
-               
+
                   this.$router.push('/operationManage/advertisingManage/index')
             }
           })
-              
+
         }
       });
     },
@@ -196,4 +204,4 @@ export default {
     justify-content: center;
   }
 }
-</style>
+</style>

src/views/operationManage/advertisingManage/index.vue

@@ -40,7 +40,7 @@
       v-loading="loading"
       style="width: 100%"
     >
-     
+
       <el-table-column
         prop="advertsName"
         align="center"
@@ -116,7 +116,7 @@
     </div>
   </div>
 </template>
-  
+
   <script>
 import { debounce } from "@/utils/index";
 import {advList,delAdv} from '@/api/appConfig'
@@ -133,6 +133,14 @@ export default {
         {
           label:'首页广告位',
           value:2
+        },
+        {
+          label:'贵大奶茶Banner',
+          value:3
+        },
+        {
+          label:'贵大奶茶广告位',
+          value:4
         }
       ],
       loading: false,
@@ -210,14 +218,14 @@ export default {
         }
       })
     },
-    
+
   },
   created() {
     this.advList()
   },
 };
 </script>
-  
+
 <style lang="scss" scoped>
 .bannerManage {
   .search{
@@ -229,4 +237,3 @@ export default {
   }
 }
 </style>
-  

src/views/operationManage/orderManage/orderDetail.vue

@@ -4,9 +4,9 @@
  * @LastEditors: wenjie 1454560336@qq.com
  * @LastEditTime: 2024-05-07 16:35:56
  * @FilePath: \admin-manage\src\views\operationManage\orderManage\orderDetail.vue
- * @Description: 
- * 
- * Copyright (c) 2023 by ${git_name_email}, All Rights Reserved. 
+ * @Description:
+ *
+ * Copyright (c) 2023 by ${git_name_email}, All Rights Reserved.
 -->
 <template>
     <div class="orderDetail app-container">
@@ -35,7 +35,7 @@
        <template slot-scope="scope">
        {{ formatData(scope.row).paymentTime || '-'}}
       </template>
-     
+
       </el-table-column>
       <el-table-column
         prop="payAmount"
@@ -98,7 +98,7 @@
         label="订单金额"
         show-overflow-tooltip
       >
-     
+
       </el-table-column>
       <el-table-column
         prop="discountAmount"
@@ -168,7 +168,7 @@
     </el-table>
 
     <template v-if="tableData[0].goodsList[0].verifyModel">
-       
+
         <div class="title">核销信息</div>
 
       <el-table
@@ -218,7 +218,7 @@
             {{scope.row.goodsList[0].verifyModel.employeeName }}
         </template>
         </el-table-column>
-      
+
         </el-table>
     </template>
 
@@ -305,7 +305,6 @@ import {auditRefund,transfer,orderDetail,subOrdersConfirm} from '@/api/order'
                      platformAmount: [
                     { required: true, message: "请输入平台退款金额", trigger: "blur" },
                     ],
-                    
                 },
                  options: [
                     {
@@ -316,7 +315,6 @@ import {auditRefund,transfer,orderDetail,subOrdersConfirm} from '@/api/order'
                         value: "2",
                         label: "部分退款",
                     },
-                   
                 ],
                 tableData: [],
                 goodsTypeObj:{}
@@ -355,6 +353,8 @@ import {auditRefund,transfer,orderDetail,subOrdersConfirm} from '@/api/order'
                     return '支付宝支付'
                 }else if(val == 'uac.miniOrder'){
                     return '云闪付支付'
+                }else if(val == 'wx.miniPreOrder'){
+                    return '银联支付'
                 }else{
                     return '-'
                 }
@@ -406,10 +406,9 @@ import {auditRefund,transfer,orderDetail,subOrdersConfirm} from '@/api/order'
 
                     }
                 }
-                
             },
             timeFormat(val){
-                 return timeFormat(val)
+                return timeFormat(val)
             },
             handleBtn() {
                 if(this.tableData[0].payment.transferAll){
@@ -560,4 +559,4 @@ import {auditRefund,transfer,orderDetail,subOrdersConfirm} from '@/api/order'
         color: #666;
     }
 }
-</style>
+</style>

src/views/operationManage/orderManage/payDetail.vue

@@ -4,9 +4,9 @@
  * @LastEditors: wenjie 1454560336@qq.com
  * @LastEditTime: 2024-04-29 11:33:30
  * @FilePath: \admin-manage\src\views\operationManage\orderManage\payDetail.vue
- * @Description: 
- * 
- * Copyright (c) 2023 by ${git_name_email}, All Rights Reserved. 
+ * @Description:
+ *
+ * Copyright (c) 2023 by ${git_name_email}, All Rights Reserved.
 -->
 <template>
   <div class="payDetail app-container">
@@ -176,6 +176,8 @@ export default {
         return "支付宝支付";
       } else if (val == "uac.miniOrder") {
         return "云闪付支付";
+      }else if (val == 'wx.miniPreOrder'){
+        return '银联支付'
       } else {
         return "-";
       }
@@ -295,4 +297,4 @@ export default {
     color: #666;
   }
 }
-</style>
+</style>