学习?学个屁 1 неделя назад
Родитель
Сommit
81a262bb85
2 измененных файлов с 18 добавлено и 7 удалено
  1. 4 4
      .env.development
  2. 14 3
      src/views/orderManagement/order/index.vue

+ 4 - 4
.env.development

@@ -7,16 +7,16 @@ VITE_PUBLIC_PATH = /
 
 
 # 跨域代理,您可以配置多个 ,请注意,没有换行符
-# VITE_PROXY = [["/jeecgboot","http://192.168.0.217:8080/jeecg-boot"],["/upload","http://192.168.0.217:8080/jeecg-boot"]]
-VITE_PROXY = [["/jeecgboot","http://192.168.0.11:8080/jeecg-boot"],["/upload","http://192.168.0.11:8080/upload"]]
+VITE_PROXY = [["/jeecgboot","http://192.168.0.217:8080/jeecg-boot"],["/upload","http://192.168.0.217:8080/jeecg-boot"]]
+# VITE_PROXY = [["/jeecgboot","http://192.168.0.11:8080/jeecg-boot"],["/upload","http://192.168.0.11:8080/upload"]]
 # VITE_PROXY = [["/jeecgboot","http://192.168.1.253:8080/jeecg-boot"],["/upload","http://192.168.1.253:8080/upload"]]
 # VITE_PROXY = [["/jeecgboot","http://192.168.1.166:8080/jeecg-boot"],["/upload","http://192.168.1.166:8080/upload"]]
 # VITE_PROXY = [["/jeecgboot","http://47.109.18.141:8080/jeecg-boot"],["/upload","http://47.109.18.141:8080/upload"]]
 # VITE_PROXY = [["/jeecgboot","https://api.qlapp.cn/jeecg-boot"],["/upload","https://api.qlapp.cn/upload"]]
 
 #后台接口全路径地址(必填)
-# VITE_GLOB_DOMAIN_URL=http://192.168.0.217:8080/jeecg-boot #//黄
-VITE_GLOB_DOMAIN_URL=http://192.168.0.11:8080/jeecg-boot  #李
+VITE_GLOB_DOMAIN_URL=http://192.168.0.217:8080/jeecg-boot #//黄
+# VITE_GLOB_DOMAIN_URL=http://192.168.0.11:8080/jeecg-boot  #李
 # VITE_GLOB_DOMAIN_URL=http://192.168.1.253:8080/jeecg-boot  #张
 # VITE_GLOB_DOMAIN_URL=http://192.168.1.166:8080/jeecg-boot  #张
 # VITE_GLOB_DOMAIN_URL=http://47.109.18.141:8080/jeecg-boot  #fwq

+ 14 - 3
src/views/orderManagement/order/index.vue

@@ -102,7 +102,11 @@
         <div class="flex items-center justify-between pt2">
           <div>团购优惠</div>
           <div v-if="editOrderInfo && editOrderInfo.orderProInfoList && editOrderInfo.orderProInfoList.length > 0">
-            <a-tag color="green">-{{ editOrderInfo?.orderProInfoList[0].originalPrice - editOrderInfo?.orderProInfoList[0].price }} </a-tag>
+            <a-tag color="green"
+              >-{{
+                editOrderInfo?.orderProInfoList[0].originalPrice - editOrderInfo?.orderProInfoList[0].price * editOrderInfo?.orderProInfoList.length
+              }}
+            </a-tag>
           </div>
         </div>
       </div>
@@ -232,7 +236,7 @@
     submitButtonOptions: { text: '提交', preIcon: '' },
     actionColOptions: { span: 17 },
   });
-  const [refundFrom, { getFieldsValue, validate }] = useForm({
+  const [refundFrom, { getFieldsValue, validate, resetFields }] = useForm({
     schemas: formRefundSchemas,
     showResetButton: false,
     submitButtonOptions: { text: '确认退款', preIcon: '' },
@@ -322,11 +326,17 @@
   function submitRefund(record) {
     console.log('提交退款参数', record);
     submitOrderRefundFrom.value.orderCode = record.orderCode;
+    // const ids = record.orderProInfoList
+    //   .filter((item) => item.type !== 6)
+    //   .map((item) => item.id)
+    //   .join(',');
+    // submitOrderRefundFrom.value.orderProInfoIds = ids;
     orderRefund.value = true;
   }
 
   const submitOrderRefundFrom = ref({
     orderCode: '',
+    // orderProInfoIds: '',
     reason: '',
   });
 
@@ -340,6 +350,7 @@
       orderRefund.value = false;
     } finally {
       RefundLoading.value = false;
+      await resetFields();
     }
   }
 
@@ -377,7 +388,7 @@
       },
       {
         label: '改价',
-        ifShow: record.orderStatus==0,
+        ifShow: record.orderStatus == 0,
         onClick: async () => {
           console.log(record, '选中数据');
           orderPriceEdit.value = true;