diff --git a/sub-operation-service/src/apis/agricultural.js b/sub-operation-service/src/apis/agricultural.js index 472280a..1d17497 100644 --- a/sub-operation-service/src/apis/agricultural.js +++ b/sub-operation-service/src/apis/agricultural.js @@ -18,6 +18,14 @@ export function agriculturalList(params) { }); } +// 获取商品详情接口 +export function getGoodDetail(id, params) { + return request(`goods/goodInfoManage/getGoodInfo/${id}`, { + method: 'GET', + params, + }); +} + // 获取用户评价列表 export function agriculturalContent(params) { return request('goods/goodInfoManage/contentPage', { diff --git a/sub-operation-service/src/apis/brand.js b/sub-operation-service/src/apis/brand.js index 776f299..cab6c49 100644 --- a/sub-operation-service/src/apis/brand.js +++ b/sub-operation-service/src/apis/brand.js @@ -27,3 +27,22 @@ export function brandList(params) { params, }); } +export function goodList(params) { + return request('brand/applicationrecord/getGoodsListByUserId', { + method: 'GET', + params, + }); +} +export function authList(params) { + return request('brand/applicationrecord/page', { + method: 'GET', + params, + }); +} + +export function saveRecords(data) { + return request('brand/applicationrecord/save', { + method: 'POST', + data, + }); +} diff --git a/sub-operation-service/src/assets/images/inputs/1.png b/sub-operation-service/src/assets/images/inputs/1.png new file mode 100644 index 0000000..40b5029 Binary files /dev/null and b/sub-operation-service/src/assets/images/inputs/1.png differ diff --git a/sub-operation-service/src/assets/images/inputs/2.png b/sub-operation-service/src/assets/images/inputs/2.png new file mode 100644 index 0000000..e574c33 Binary files /dev/null and b/sub-operation-service/src/assets/images/inputs/2.png differ diff --git a/sub-operation-service/src/assets/images/inputs/3.png b/sub-operation-service/src/assets/images/inputs/3.png new file mode 100644 index 0000000..a84c7a4 Binary files /dev/null and b/sub-operation-service/src/assets/images/inputs/3.png differ diff --git a/sub-operation-service/src/assets/images/inputs/4.png b/sub-operation-service/src/assets/images/inputs/4.png new file mode 100644 index 0000000..c004d15 Binary files /dev/null and b/sub-operation-service/src/assets/images/inputs/4.png differ diff --git a/sub-operation-service/src/assets/images/inputs/5.png b/sub-operation-service/src/assets/images/inputs/5.png new file mode 100644 index 0000000..d8081c9 Binary files /dev/null and b/sub-operation-service/src/assets/images/inputs/5.png differ diff --git a/sub-operation-service/src/assets/images/inputs/6.png b/sub-operation-service/src/assets/images/inputs/6.png new file mode 100644 index 0000000..eaa725e Binary files /dev/null and b/sub-operation-service/src/assets/images/inputs/6.png differ diff --git a/sub-operation-service/src/assets/images/inputs/bg_label.png b/sub-operation-service/src/assets/images/inputs/bg_label.png new file mode 100644 index 0000000..47d29b8 Binary files /dev/null and b/sub-operation-service/src/assets/images/inputs/bg_label.png differ diff --git a/sub-operation-service/src/assets/images/inputs/bg_title.png b/sub-operation-service/src/assets/images/inputs/bg_title.png new file mode 100644 index 0000000..946a461 Binary files /dev/null and b/sub-operation-service/src/assets/images/inputs/bg_title.png differ diff --git a/sub-operation-service/src/assets/images/inputs/bg_value.png b/sub-operation-service/src/assets/images/inputs/bg_value.png new file mode 100644 index 0000000..5c61e1c Binary files /dev/null and b/sub-operation-service/src/assets/images/inputs/bg_value.png differ diff --git a/sub-operation-service/src/assets/images/inputs/order.webp b/sub-operation-service/src/assets/images/inputs/order.webp new file mode 100644 index 0000000..eeb19c4 Binary files /dev/null and b/sub-operation-service/src/assets/images/inputs/order.webp differ diff --git a/sub-operation-service/src/assets/images/inputs/order2x.webp b/sub-operation-service/src/assets/images/inputs/order2x.webp new file mode 100644 index 0000000..cee5ff6 Binary files /dev/null and b/sub-operation-service/src/assets/images/inputs/order2x.webp differ diff --git a/sub-operation-service/src/components/custom-echart-hyaline-cake/index.vue b/sub-operation-service/src/components/custom-echart-hyaline-cake/index.vue index 4c7e3e5..933857a 100644 --- a/sub-operation-service/src/components/custom-echart-hyaline-cake/index.vue +++ b/sub-operation-service/src/components/custom-echart-hyaline-cake/index.vue @@ -1,5 +1,5 @@ diff --git a/sub-operation-service/src/views/brand/components/Auth.vue b/sub-operation-service/src/views/brand/components/Auth.vue index 3a84398..e8ce17f 100644 --- a/sub-operation-service/src/views/brand/components/Auth.vue +++ b/sub-operation-service/src/views/brand/components/Auth.vue @@ -37,35 +37,42 @@ - - - - + + + + +
-
+
- product + product
- {{ product.name }} + {{ product.productName }}
- {{ product.batch }} + 2
- {{ product.duration }} + {{ product.timeNum + }}{{ product.timeNumUnit === 1 ? '天' : product.timeNumUnit === 2 ? '月' : product.timeNumUnit === 3 ? '年' : '' }}
- {{ product.expireDate }} + {{ product.endTime }}
- {{ product.statusLabel }} + 已授权 + 审批中 + 被驳回 + 已失效 diff --git a/sub-operation-service/src/views/dashboard/breed/components/benefitCharts.vue b/sub-operation-service/src/views/dashboard/breed/components/benefitCharts.vue new file mode 100644 index 0000000..7ded6d9 --- /dev/null +++ b/sub-operation-service/src/views/dashboard/breed/components/benefitCharts.vue @@ -0,0 +1,403 @@ + + + diff --git a/sub-operation-service/src/views/dashboard/breed/components/benefitChartsl.vue b/sub-operation-service/src/views/dashboard/breed/components/benefitChartsl.vue new file mode 100644 index 0000000..5c465d5 --- /dev/null +++ b/sub-operation-service/src/views/dashboard/breed/components/benefitChartsl.vue @@ -0,0 +1,397 @@ + + + diff --git a/sub-operation-service/src/views/dashboard/breed/components/businessFour.vue b/sub-operation-service/src/views/dashboard/breed/components/businessFour.vue new file mode 100644 index 0000000..c42ea3c --- /dev/null +++ b/sub-operation-service/src/views/dashboard/breed/components/businessFour.vue @@ -0,0 +1,231 @@ + + + diff --git a/sub-operation-service/src/views/dashboard/breed/components/businessMap.vue b/sub-operation-service/src/views/dashboard/breed/components/businessMap.vue new file mode 100644 index 0000000..66c0fb0 --- /dev/null +++ b/sub-operation-service/src/views/dashboard/breed/components/businessMap.vue @@ -0,0 +1,207 @@ + + + + + diff --git a/sub-operation-service/src/views/dashboard/breed/components/deviceCharts.vue b/sub-operation-service/src/views/dashboard/breed/components/deviceCharts.vue new file mode 100644 index 0000000..f3f5957 --- /dev/null +++ b/sub-operation-service/src/views/dashboard/breed/components/deviceCharts.vue @@ -0,0 +1,161 @@ + + + + + diff --git a/sub-operation-service/src/views/dashboard/breed/components/entitieslist.vue b/sub-operation-service/src/views/dashboard/breed/components/entitieslist.vue new file mode 100644 index 0000000..f79e3fd --- /dev/null +++ b/sub-operation-service/src/views/dashboard/breed/components/entitieslist.vue @@ -0,0 +1,196 @@ + + + + + diff --git a/sub-operation-service/src/views/dashboard/breed/components/environment.vue b/sub-operation-service/src/views/dashboard/breed/components/environment.vue new file mode 100644 index 0000000..8b6714f --- /dev/null +++ b/sub-operation-service/src/views/dashboard/breed/components/environment.vue @@ -0,0 +1,174 @@ + + + diff --git a/sub-operation-service/src/views/dashboard/breed/components/growthIndexesCharts.vue b/sub-operation-service/src/views/dashboard/breed/components/growthIndexesCharts.vue new file mode 100644 index 0000000..6b70295 --- /dev/null +++ b/sub-operation-service/src/views/dashboard/breed/components/growthIndexesCharts.vue @@ -0,0 +1,226 @@ + + + diff --git a/sub-operation-service/src/views/dashboard/breed/components/healthStatusCharts.vue b/sub-operation-service/src/views/dashboard/breed/components/healthStatusCharts.vue new file mode 100644 index 0000000..a91ad91 --- /dev/null +++ b/sub-operation-service/src/views/dashboard/breed/components/healthStatusCharts.vue @@ -0,0 +1,122 @@ + + + + + diff --git a/sub-operation-service/src/views/dashboard/breed/components/irrigationCharts.vue b/sub-operation-service/src/views/dashboard/breed/components/irrigationCharts.vue new file mode 100644 index 0000000..a342cc1 --- /dev/null +++ b/sub-operation-service/src/views/dashboard/breed/components/irrigationCharts.vue @@ -0,0 +1,179 @@ + + + diff --git a/sub-operation-service/src/views/dashboard/breed/components/monitoringScreen.vue b/sub-operation-service/src/views/dashboard/breed/components/monitoringScreen.vue new file mode 100644 index 0000000..194144c --- /dev/null +++ b/sub-operation-service/src/views/dashboard/breed/components/monitoringScreen.vue @@ -0,0 +1,25 @@ + + + diff --git a/sub-operation-service/src/views/dashboard/breed/components/noticeBar.vue b/sub-operation-service/src/views/dashboard/breed/components/noticeBar.vue new file mode 100644 index 0000000..fdd47d0 --- /dev/null +++ b/sub-operation-service/src/views/dashboard/breed/components/noticeBar.vue @@ -0,0 +1,73 @@ + + + + + diff --git a/sub-operation-service/src/views/dashboard/breed/components/plantgs.vue b/sub-operation-service/src/views/dashboard/breed/components/plantgs.vue new file mode 100644 index 0000000..5dd4bbc --- /dev/null +++ b/sub-operation-service/src/views/dashboard/breed/components/plantgs.vue @@ -0,0 +1,116 @@ + + + diff --git a/sub-operation-service/src/views/dashboard/breed/components/waterIntakeCharts.vue b/sub-operation-service/src/views/dashboard/breed/components/waterIntakeCharts.vue new file mode 100644 index 0000000..9ba1904 --- /dev/null +++ b/sub-operation-service/src/views/dashboard/breed/components/waterIntakeCharts.vue @@ -0,0 +1,196 @@ + + + diff --git a/sub-operation-service/src/views/dashboard/breed/index.vue b/sub-operation-service/src/views/dashboard/breed/index.vue new file mode 100644 index 0000000..951dba6 --- /dev/null +++ b/sub-operation-service/src/views/dashboard/breed/index.vue @@ -0,0 +1,200 @@ + + + diff --git a/sub-operation-service/src/views/dashboard/components/common.vue b/sub-operation-service/src/views/dashboard/components/common.vue new file mode 100644 index 0000000..8a5f8dd --- /dev/null +++ b/sub-operation-service/src/views/dashboard/components/common.vue @@ -0,0 +1,57 @@ + + + diff --git a/sub-operation-service/src/views/dashboard/index.vue b/sub-operation-service/src/views/dashboard/index.vue deleted file mode 100644 index 073c075..0000000 --- a/sub-operation-service/src/views/dashboard/index.vue +++ /dev/null @@ -1,138 +0,0 @@ - - diff --git a/sub-operation-service/src/views/ecommerce/agriculturalDetail.vue b/sub-operation-service/src/views/ecommerce/agriculturalDetail.vue index 5d4c2a5..a294095 100644 --- a/sub-operation-service/src/views/ecommerce/agriculturalDetail.vue +++ b/sub-operation-service/src/views/ecommerce/agriculturalDetail.vue @@ -14,9 +14,10 @@ -

{{ mockData[currentIndex].titleName }}

+

{{ currentGood.goodName }}

- {{ mockData[currentIndex].price }} - {{ mockData[currentIndex].sold }} + {{ currentPrice }} + {{ currentGood.salesVolume }}
- 发货地址:{{ mockData[currentIndex].soldAddress }} - 保       障:{{ mockData[currentIndex].right }} + 发货地址:{{ currentGood.detailAddress }} + 保       障:{{ + currentGood.safeguard ? currentGood.safeguard.options[0].text : '' + }}
规格:
- {{ item }} + {{ item.goodSpecs }}/{{ item.unit }}
@@ -79,96 +85,18 @@
-
- - +
+ + - 童涵春堂 + {{ item.value.value }} - - - 农用百货 - - - - 种子种苗 - - - - 耿马县 - - - - 云南省 - - - - 临沧市 - - - - 15~25℃(避免高温或冷冻) - - - - 盒装 - - - - 50g、100g、250g、500g - - - - 种植 - - - - - - - - - - - - - - - - - - -
- +
@@ -207,16 +135,18 @@