diff --git a/.env.development b/.env.development index b8ccd8b..fbcc74b 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ VITE_APP_NAME=后台管理(开发环境) -#VITE_API_URL=http://127.0.0.1:9200/api +VITE_API_URL=http://127.0.0.1:9200/api #VITE_SERVER_API_URL=http://127.0.0.1:8000/api diff --git a/src/views/glt/shopDealerApply/components/search.vue b/src/views/glt/shopDealerApply/components/search.vue deleted file mode 100644 index 054a3a1..0000000 --- a/src/views/glt/shopDealerApply/components/search.vue +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - diff --git a/src/views/glt/shopDealerApply/components/shopDealerApplyEdit.vue b/src/views/glt/shopDealerApply/components/shopDealerApplyEdit.vue deleted file mode 100644 index 777e3b3..0000000 --- a/src/views/glt/shopDealerApply/components/shopDealerApplyEdit.vue +++ /dev/null @@ -1,645 +0,0 @@ - - - - - - diff --git a/src/views/glt/shopDealerApply/index.vue b/src/views/glt/shopDealerApply/index.vue deleted file mode 100644 index 5eaa246..0000000 --- a/src/views/glt/shopDealerApply/index.vue +++ /dev/null @@ -1,458 +0,0 @@ - - - - - diff --git a/src/views/glt/shopDealerCapital/components/search.vue b/src/views/glt/shopDealerCapital/components/search.vue deleted file mode 100644 index ad1a2c6..0000000 --- a/src/views/glt/shopDealerCapital/components/search.vue +++ /dev/null @@ -1,117 +0,0 @@ - - - - diff --git a/src/views/glt/shopDealerCapital/components/shopDealerCapitalEdit.vue b/src/views/glt/shopDealerCapital/components/shopDealerCapitalEdit.vue deleted file mode 100644 index 35917d9..0000000 --- a/src/views/glt/shopDealerCapital/components/shopDealerCapitalEdit.vue +++ /dev/null @@ -1,406 +0,0 @@ - - - - - - diff --git a/src/views/glt/shopDealerCapital/index.vue b/src/views/glt/shopDealerCapital/index.vue deleted file mode 100644 index e73f34a..0000000 --- a/src/views/glt/shopDealerCapital/index.vue +++ /dev/null @@ -1,295 +0,0 @@ - - - - - - - diff --git a/src/views/glt/shopDealerOrder/components/Import.vue b/src/views/glt/shopDealerOrder/components/Import.vue deleted file mode 100644 index 5f99953..0000000 --- a/src/views/glt/shopDealerOrder/components/Import.vue +++ /dev/null @@ -1,89 +0,0 @@ - - - - diff --git a/src/views/glt/shopDealerOrder/components/search.vue b/src/views/glt/shopDealerOrder/components/search.vue deleted file mode 100644 index 355d4c3..0000000 --- a/src/views/glt/shopDealerOrder/components/search.vue +++ /dev/null @@ -1,182 +0,0 @@ - - - diff --git a/src/views/glt/shopDealerOrder/components/shopDealerOrderEdit.vue b/src/views/glt/shopDealerOrder/components/shopDealerOrderEdit.vue deleted file mode 100644 index 7f8420e..0000000 --- a/src/views/glt/shopDealerOrder/components/shopDealerOrderEdit.vue +++ /dev/null @@ -1,363 +0,0 @@ - - - - - - diff --git a/src/views/glt/shopDealerOrder/index.vue b/src/views/glt/shopDealerOrder/index.vue deleted file mode 100644 index b3950f8..0000000 --- a/src/views/glt/shopDealerOrder/index.vue +++ /dev/null @@ -1,448 +0,0 @@ - - - - - - - diff --git a/src/views/glt/shopDealerOrder2/components/Import.vue b/src/views/glt/shopDealerOrder2/components/Import.vue deleted file mode 100644 index 0b81392..0000000 --- a/src/views/glt/shopDealerOrder2/components/Import.vue +++ /dev/null @@ -1,79 +0,0 @@ - - - - diff --git a/src/views/glt/shopDealerOrder2/components/search.vue b/src/views/glt/shopDealerOrder2/components/search.vue deleted file mode 100644 index 4b85f74..0000000 --- a/src/views/glt/shopDealerOrder2/components/search.vue +++ /dev/null @@ -1,143 +0,0 @@ - - - - diff --git a/src/views/glt/shopDealerOrder2/components/shopDealerOrderEdit.vue b/src/views/glt/shopDealerOrder2/components/shopDealerOrderEdit.vue deleted file mode 100644 index 5267361..0000000 --- a/src/views/glt/shopDealerOrder2/components/shopDealerOrderEdit.vue +++ /dev/null @@ -1,333 +0,0 @@ - - - - - - diff --git a/src/views/glt/shopDealerOrder2/index.vue b/src/views/glt/shopDealerOrder2/index.vue deleted file mode 100644 index 392cec5..0000000 --- a/src/views/glt/shopDealerOrder2/index.vue +++ /dev/null @@ -1,500 +0,0 @@ - - - - - - - diff --git a/src/views/glt/shopDealerReferee/components/RefereeTree.vue b/src/views/glt/shopDealerReferee/components/RefereeTree.vue deleted file mode 100644 index 45a0f6c..0000000 --- a/src/views/glt/shopDealerReferee/components/RefereeTree.vue +++ /dev/null @@ -1,204 +0,0 @@ - - - - - diff --git a/src/views/glt/shopDealerReferee/components/search.vue b/src/views/glt/shopDealerReferee/components/search.vue deleted file mode 100644 index b237175..0000000 --- a/src/views/glt/shopDealerReferee/components/search.vue +++ /dev/null @@ -1,185 +0,0 @@ - - - - - - diff --git a/src/views/glt/shopDealerReferee/components/shopDealerRefereeEdit.vue b/src/views/glt/shopDealerReferee/components/shopDealerRefereeEdit.vue deleted file mode 100644 index 0fe37c5..0000000 --- a/src/views/glt/shopDealerReferee/components/shopDealerRefereeEdit.vue +++ /dev/null @@ -1,158 +0,0 @@ - - - - diff --git a/src/views/glt/shopDealerReferee/index.vue b/src/views/glt/shopDealerReferee/index.vue deleted file mode 100644 index 4f72029..0000000 --- a/src/views/glt/shopDealerReferee/index.vue +++ /dev/null @@ -1,563 +0,0 @@ - - - - - - - diff --git a/src/views/glt/shopDealerWithdraw/components/Import.vue b/src/views/glt/shopDealerWithdraw/components/Import.vue deleted file mode 100644 index 5f99953..0000000 --- a/src/views/glt/shopDealerWithdraw/components/Import.vue +++ /dev/null @@ -1,89 +0,0 @@ - - - - diff --git a/src/views/glt/shopDealerWithdraw/components/search.vue b/src/views/glt/shopDealerWithdraw/components/search.vue deleted file mode 100644 index 472b7dc..0000000 --- a/src/views/glt/shopDealerWithdraw/components/search.vue +++ /dev/null @@ -1,101 +0,0 @@ - - - diff --git a/src/views/glt/shopDealerWithdraw/components/shopDealerWithdrawEdit.vue b/src/views/glt/shopDealerWithdraw/components/shopDealerWithdrawEdit.vue deleted file mode 100644 index 8721290..0000000 --- a/src/views/glt/shopDealerWithdraw/components/shopDealerWithdrawEdit.vue +++ /dev/null @@ -1,697 +0,0 @@ - - - - - - diff --git a/src/views/glt/shopDealerWithdraw/index.vue b/src/views/glt/shopDealerWithdraw/index.vue deleted file mode 100644 index 2999e31..0000000 --- a/src/views/glt/shopDealerWithdraw/index.vue +++ /dev/null @@ -1,464 +0,0 @@ - - - - - - - diff --git a/src/views/glt/shopDealerApplyRs/components/search.vue b/src/views/shop/shopDealerApplyRs/components/search.vue similarity index 100% rename from src/views/glt/shopDealerApplyRs/components/search.vue rename to src/views/shop/shopDealerApplyRs/components/search.vue diff --git a/src/views/glt/shopDealerApplyRs/components/shop-dealer-apply-import.vue b/src/views/shop/shopDealerApplyRs/components/shop-dealer-apply-import.vue similarity index 100% rename from src/views/glt/shopDealerApplyRs/components/shop-dealer-apply-import.vue rename to src/views/shop/shopDealerApplyRs/components/shop-dealer-apply-import.vue diff --git a/src/views/glt/shopDealerApplyRs/components/shopDealerApplyEdit.vue b/src/views/shop/shopDealerApplyRs/components/shopDealerApplyEdit.vue similarity index 100% rename from src/views/glt/shopDealerApplyRs/components/shopDealerApplyEdit.vue rename to src/views/shop/shopDealerApplyRs/components/shopDealerApplyEdit.vue diff --git a/src/views/glt/shopDealerApplyRs/index.vue b/src/views/shop/shopDealerApplyRs/index.vue similarity index 100% rename from src/views/glt/shopDealerApplyRs/index.vue rename to src/views/shop/shopDealerApplyRs/index.vue diff --git a/src/views/shop/shopDealerCapital/components/search.vue b/src/views/shop/shopDealerCapital/components/search.vue index 82fea9d..ad1a2c6 100644 --- a/src/views/shop/shopDealerCapital/components/search.vue +++ b/src/views/shop/shopDealerCapital/components/search.vue @@ -1,19 +1,28 @@ diff --git a/src/views/shop/shopDealerOrder/components/shopDealerOrderEdit.vue b/src/views/shop/shopDealerOrder/components/shopDealerOrderEdit.vue index 7f8420e..5267361 100644 --- a/src/views/shop/shopDealerOrder/components/shopDealerOrderEdit.vue +++ b/src/views/shop/shopDealerOrder/components/shopDealerOrderEdit.vue @@ -24,66 +24,36 @@ - - - {{ form.title }} - - {{ form.orderNo }} - - {{ parseFloat(form.orderPrice || 0).toFixed(2) }} - - - - - {{ parseFloat(form.degreePrice || 0).toFixed(2) }} - - - - - {{ form.rate }} - - - - - {{ form.price }} - - - - - {{ parseFloat(form.settledPrice || 0).toFixed(2) }} - - - - + {{ parseFloat(form.payPrice || 0).toFixed(2) }} -
开发调试
-
-
业务员({{ form.userId }}):{{ form.nickname }}
-
一级分销商({{ form.firstUserId }}):{{ - form.firstNickname - }},一级佣金30%:{{ form.firstMoney }}
-
二级分销商({{ form.secondUserId }}):{{ - form.secondNickname - }},二级佣金10%:{{ form.secondMoney }}
-
三级分销商({{ form.thirdUserId }}):{{ - form.thirdNickname - }},三级佣金60%:{{ form.thirdMoney }}
-
+ + + + + + + + + + + + + + + + + + + 收益计算 @@ -92,7 +62,7 @@

- 一级佣金30% + 一级佣金10%

@@ -105,7 +75,7 @@ - {{ '30%' }} + {{ '10%' }} {{ form.firstMoney }} @@ -179,7 +149,7 @@ import { assignObject } from 'ele-admin-pro'; import { ShopDealerOrder } from '@/api/shop/shopDealerOrder/model'; import { FormInstance } from 'ant-design-vue/es/form'; - import { updateShopDealerOrder} from '@/api/shop/shopDealerOrder'; + import { updateShopDealerOrder } from '@/api/shop/shopDealerOrder'; // 是否是修改 const isUpdate = ref(false); diff --git a/src/views/shop/shopDealerOrder/index.vue b/src/views/shop/shopDealerOrder/index.vue index b3950f8..acf3f1f 100644 --- a/src/views/shop/shopDealerOrder/index.vue +++ b/src/views/shop/shopDealerOrder/index.vue @@ -7,7 +7,6 @@ :columns="columns" :datasource="datasource" :customRow="customRow" - v-model:selection="selection" tool-class="ele-toolbar-form" class="sys-org-table" > @@ -24,11 +23,13 @@