diff --git a/src/api/shop/shopDealerOrder/model/index.ts b/src/api/shop/shopDealerOrder/model/index.ts index 9e3b90d..e76f732 100644 --- a/src/api/shop/shopDealerOrder/model/index.ts +++ b/src/api/shop/shopDealerOrder/model/index.ts @@ -8,6 +8,8 @@ export interface ShopDealerOrder { id?: number; // 买家用户ID userId?: number; + // 商品名称 + title?: string; // 买家用户昵称 nickname?: string; // 订单编号 @@ -16,6 +18,8 @@ export interface ShopDealerOrder { orderPrice?: string; // 结算金额 settledPrice?: string; + // 换算成度 + degreePrice?: string; // 支付金额 payPrice?: string; // 分销商用户id(一级) diff --git a/src/utils/request.ts b/src/utils/request.ts index bca94d7..1285742 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -19,7 +19,7 @@ const getBaseUrl = (): string => { try { // 如果store中没有,则尝试从localStorage获取 const ApiUrl = localStorage.getItem('ApiUrl'); - if (ApiUrl) { + if (ApiUrl && import.meta.env.PROD) { return ApiUrl; } } catch (error) { diff --git a/src/views/sdy/shopDealerCapital/components/search.vue b/src/views/sdy/shopDealerCapital/components/search.vue new file mode 100644 index 0000000..82fea9d --- /dev/null +++ b/src/views/sdy/shopDealerCapital/components/search.vue @@ -0,0 +1,42 @@ + + + + diff --git a/src/views/sdy/shopDealerCapital/components/shopDealerCapitalEdit.vue b/src/views/sdy/shopDealerCapital/components/shopDealerCapitalEdit.vue new file mode 100644 index 0000000..6557d9c --- /dev/null +++ b/src/views/sdy/shopDealerCapital/components/shopDealerCapitalEdit.vue @@ -0,0 +1,398 @@ + + + + + + diff --git a/src/views/sdy/shopDealerCapital/index.vue b/src/views/sdy/shopDealerCapital/index.vue new file mode 100644 index 0000000..ebe174d --- /dev/null +++ b/src/views/sdy/shopDealerCapital/index.vue @@ -0,0 +1,285 @@ + + + + + + + diff --git a/src/views/sdy/shopDealerOrder/components/Import.vue b/src/views/sdy/shopDealerOrder/components/Import.vue index cc7cdef..e636ecf 100644 --- a/src/views/sdy/shopDealerOrder/components/Import.vue +++ b/src/views/sdy/shopDealerOrder/components/Import.vue @@ -19,6 +19,10 @@

将文件拖到此处,或点击上传

+
+
1、必须按导入模版的格式上传
+
2、导入成功确认结算完成佣金的发放
+
diff --git a/src/views/sdy/shopDealerOrder/components/shopDealerOrderEdit.vue b/src/views/sdy/shopDealerOrder/components/shopDealerOrderEdit.vue index e927d56..e8312c4 100644 --- a/src/views/sdy/shopDealerOrder/components/shopDealerOrderEdit.vue +++ b/src/views/sdy/shopDealerOrder/components/shopDealerOrderEdit.vue @@ -25,8 +25,8 @@ - - {{ form.comments }} + + {{ form.title }} @@ -39,6 +39,11 @@ {{ parseFloat(form.orderPrice || 0).toFixed(2) }} + + + {{ parseFloat(form.degreePrice || 0).toFixed(2) }} + + {{ form.rate }} @@ -60,18 +65,22 @@ - - - +
开发调试
+
+
业务员({{ 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 }}
+
收益计算 - +

- 间推收益 + 一级佣金30%

@@ -88,49 +97,31 @@ {{ form.firstMoney }} - - - - - - - - -
- +

- {{ form.thirdUserId > 0 ? '推荐收益' : '获取收益' }} + 二级佣金10%

- - {{ form.userId }} + + {{ form.secondUserId }} - {{ form.nickname }} + {{ form.secondNickname }} - {{ form?.thirdUserId > 0 ? '10%' : '70%' }} + 10% {{ form.secondMoney }} - - - - - - - - - @@ -139,15 +130,15 @@

- {{ form.thirdUserId > 0 ? '获取收益' : '推荐收益' }} + 三级佣金60%

- - {{ form.secondUserId }} + + {{ form.thirdUserId }} - - {{ form.secondNickname }} + + {{ form.thirdNickname }} @@ -156,15 +147,6 @@ {{ form.thirdMoney }} - - - - - - - - - @@ -174,167 +156,171 @@ {{ form.settleTime }} +