diff --git a/sub-government-affairs-service/src/views/productOperateMain/individual/index.vue b/sub-government-affairs-service/src/views/productOperateMain/individual/index.vue index 5e7e9eb..aeafb0d 100644 --- a/sub-government-affairs-service/src/views/productOperateMain/individual/index.vue +++ b/sub-government-affairs-service/src/views/productOperateMain/individual/index.vue @@ -115,6 +115,26 @@ const state = reactive({ trigger: 'blur', }, }, + // { + // label: '主体类型', + // prop: 'dictType', + // type: 'select', + // search: true, + // props: { + // label: 'dictName', + // value: 'dictType', + // }, + // dicUrl: `${VITE_APP_BASE_API}/system/dept/list?dictType=sys_business_product_type¤t=1&size=10`, + // dicHeaders: { + // authorization: UserStore.token, + // }, + // dicFormatter: (res) => res.data, + // rules: { + // required: true, + // message: '请选择', + // trigger: 'blur', + // }, + // }, { label: '经营产品种类', prop: 'landId', diff --git a/sub-government-screen-service/.env.development b/sub-government-screen-service/.env.development index cd7a991..66695c9 100644 --- a/sub-government-screen-service/.env.development +++ b/sub-government-screen-service/.env.development @@ -7,4 +7,4 @@ VITE_APP_NAME = 'sub-government-screen-service' VITE_APP_BASE_API = '/apis' VITE_APP_BASE_URL = 'http://192.168.18.99:8080' VITE_APP_UPLOAD_API = '/uploadApis' -VITE_APP_UPLOAD_URL = 'http://192.168.18.99:9300' +VITE_APP_UPLOAD_URL = 'http://192.168.18.99:8080' diff --git a/sub-operation-service/src/App.vue b/sub-operation-service/src/App.vue index 680b269..e891659 100644 --- a/sub-operation-service/src/App.vue +++ b/sub-operation-service/src/App.vue @@ -36,6 +36,7 @@ body { --el-color-primary-light-5: #8cddbd; --el-color-primary-light-9: rgba(37, 191, 130, 0.1); --el-color-primary-light-8: rgba(37, 191, 130, 0.5); + .el-input { --el-input-focus-border-color: #25bf82; --el-input-focus-border: #25bf82; diff --git a/sub-operation-service/src/apis/index.js b/sub-operation-service/src/apis/index.js index c461776..d39309c 100644 --- a/sub-operation-service/src/apis/index.js +++ b/sub-operation-service/src/apis/index.js @@ -1,5 +1,18 @@ import request from '@/utils/axios'; +/** + * @Title: 上传图片 + */ +export function CommonUpload(data, params) { + return request(`/upload`, { + method: 'POST', + apisType: 'upload', + uploadType: 'multipart/form-data', + data, + params, + }); +} + //云南省所有区域信息 export function getRegion(code) { let codeVal = code ? code : '530000'; diff --git a/sub-operation-service/src/assets/images/ecommerce/goods.png b/sub-operation-service/src/assets/images/ecommerce/goods.png new file mode 100644 index 0000000..a29345a Binary files /dev/null and b/sub-operation-service/src/assets/images/ecommerce/goods.png differ diff --git a/sub-operation-service/src/components/upImg.vue b/sub-operation-service/src/components/upImg.vue new file mode 100644 index 0000000..cee8eda --- /dev/null +++ b/sub-operation-service/src/components/upImg.vue @@ -0,0 +1,48 @@ + + + diff --git a/sub-operation-service/src/router/index.js b/sub-operation-service/src/router/index.js index 91a9acd..d305e5b 100644 --- a/sub-operation-service/src/router/index.js +++ b/sub-operation-service/src/router/index.js @@ -38,33 +38,48 @@ export const constantRoutes = [ ], }, { - path: '/ecommerce', + path: '/sub-operation-service/ecommerce', name: 'ecommerce', component: Layout, - redirect: '/sub-operation-service/ecommerce', + redirect: '/sub-operation-service/ecommerce-agricultural', meta: { title: '电商交易' }, children: [ { - path: '/sub-operation-service/ecommerce', - component: () => import('@/views/ecommerce/index.vue'), - name: 'agricultural', + path: '/ecommerce', + component: Views, + redirect: '/sub-operation-service/ecommerce-agricultural', + name: 'agriculturalParent', meta: { title: '农资交易' }, + children: [ + { + path: '/sub-operation-service/ecommerce-agricultural', + component: () => import('@/views/ecommerce/index.vue'), + name: 'agricultural', + meta: { title: '农资交易' }, + }, + { + path: '/sub-operation-service/ecommerce-agriculturalDetai', + component: () => import('@/views/ecommerce/agriculturalDetail.vue'), + name: 'agriculturalDetail', + meta: { title: '农资详情' }, + }, + ], }, { - path: '/purchaser', + path: '/sub-operation-service/purchaser', component: Views, - redirect: '/sub-operation-service/purchaser', + redirect: '/sub-operation-service/ecommerce-purchaser', name: 'purchaserParent', meta: { title: '采购商服务' }, children: [ { - path: '/sub-operation-service/purchaser', + path: '/sub-operation-service/ecommerce-purchaser', component: () => import('@/views/ecommerce/purchaser.vue'), name: 'purchaser', meta: { title: '采购商服务' }, }, { - path: '/sub-operation-service/purchaserDetail', + path: '/sub-operation-service/ecommerce-purchaserDetail', component: () => import('@/views/ecommerce/purchaserDetail.vue'), name: 'purchaserDetail', meta: { title: '采购详情' }, @@ -73,26 +88,26 @@ export const constantRoutes = [ }, { - path: '/sub-operation-service/supplier', + path: '/sub-operation-service/ecommerce-supplier', component: () => import('@/views/ecommerce/supplier.vue'), name: 'supplier', meta: { title: '供应商服务' }, }, { - path: '/land', + path: '/sub-operation-service/ecommerce-land', component: Views, - redirect: '/sub-operation-service/land', + redirect: '/sub-operation-service/ecommerce-land', name: 'landParent', meta: { title: '土地交易' }, children: [ { - path: '/sub-operation-service/land', + path: '/sub-operation-service/ecommerce-land', component: () => import('@/views/ecommerce/land.vue'), name: 'land', meta: { title: '土地交易' }, }, { - path: '/sub-operation-service/landDetail', + path: '/sub-operation-service/ecommerce-landDetail', component: () => import('@/views/ecommerce/landDetail.vue'), name: 'landDetail', meta: { title: '土地详情' }, diff --git a/sub-operation-service/src/styles/global.scss b/sub-operation-service/src/styles/global.scss index 84fa919..ad77285 100644 --- a/sub-operation-service/src/styles/global.scss +++ b/sub-operation-service/src/styles/global.scss @@ -6,28 +6,31 @@ $color-main-border:rgba(37, 191, 130, 0.5); $color-5a:#5A5A5A; $color-000:#000; $color-fff:#fff; +$color-da:#dadada; +$color-000:#000; +$color-f5:#f5f5f5; $color-primary: #20a0ff; $color-success: #13ce66; $color-warning: #FFBE4D; $color-danger: #ff4949; $color-info: #50bfff; $color-secondary: #2e90fe; -$color-white: #ffffff; +$color-white: #fff; $color-black: #1f2d3d; $color-black-light: #324057; $color-black-lighter: #475669; $color-blue-light: #5da9ff; $color-blue-lighter: #5da9ff; -$color-black: #000000; +$color-black: #000; $color-silver: #8492a6; $color-silver-light: #99a9bf; $color-silver-lighter: #c0ccda; $color-gray: #d3dce6; $color-gray-light: #e5e9f2; $color-gray-lighter: #eff2f7; -$color-333: #333333; +$color-333: #333; $color-666: #666; -$color-999: #999999; +$color-999: #999; $color-border-gray: #d1dbe5; $color-input-border: #dcdfe6; $color-border: $color-border-gray; diff --git a/sub-operation-service/src/styles/style.scss b/sub-operation-service/src/styles/style.scss index 6536e99..bf01a36 100644 --- a/sub-operation-service/src/styles/style.scss +++ b/sub-operation-service/src/styles/style.scss @@ -23,6 +23,8 @@ -webkit-box-orient: vertical; overflow: hidden; text-overflow: ellipsis; + word-break: break-all; + white-space: normal } .clamp1{ -webkit-line-clamp: 1; diff --git a/sub-operation-service/src/views/ecommerce/agriculturalDetail.vue b/sub-operation-service/src/views/ecommerce/agriculturalDetail.vue new file mode 100644 index 0000000..c234984 --- /dev/null +++ b/sub-operation-service/src/views/ecommerce/agriculturalDetail.vue @@ -0,0 +1,496 @@ + + + diff --git a/sub-operation-service/src/views/ecommerce/components/banner.vue b/sub-operation-service/src/views/ecommerce/components/banner.vue index 5578411..62a4d4e 100644 --- a/sub-operation-service/src/views/ecommerce/components/banner.vue +++ b/sub-operation-service/src/views/ecommerce/components/banner.vue @@ -3,6 +3,7 @@ + diff --git a/sub-operation-service/src/views/ecommerce/components/evaluate.vue b/sub-operation-service/src/views/ecommerce/components/evaluate.vue new file mode 100644 index 0000000..ae83ec7 --- /dev/null +++ b/sub-operation-service/src/views/ecommerce/components/evaluate.vue @@ -0,0 +1,343 @@ + + + diff --git a/sub-operation-service/src/views/ecommerce/components/goodsItem.vue b/sub-operation-service/src/views/ecommerce/components/goodsItem.vue index 8c3f5a0..13334e4 100644 --- a/sub-operation-service/src/views/ecommerce/components/goodsItem.vue +++ b/sub-operation-service/src/views/ecommerce/components/goodsItem.vue @@ -1,5 +1,5 @@