diff --git a/apis/addressManageApi.js b/apis/addressManageApi.js index 67b164f..e9eb485 100644 --- a/apis/addressManageApi.js +++ b/apis/addressManageApi.js @@ -24,7 +24,22 @@ export const createAddress = (data = {}) => { // 删除收货地址 export const delAddress = (data = {}) => { return http.post({ - url: '/uec​/delete​/enterprise-shipping-address', + url: '/uec/delete/enterprise-shipping-address', + data + }) +} +// 设置默认地址 +export const setDefaultAddress = (data = {}) => { + return http.post({ + url: '/uec/set/enterprise-shipping-address/as/default', + data + }) +} +// 通过id查询企业收货地址 /uec/get/enterprise-shipping-address-detail + +export const getAddressDetail = (data = {}) => { + return http.get({ + url: '/uec/get/enterprise-shipping-address-detail', data }) } \ No newline at end of file diff --git a/apis/enquiryListApi.js b/apis/enquiryListApi.js new file mode 100644 index 0000000..921dea6 --- /dev/null +++ b/apis/enquiryListApi.js @@ -0,0 +1,26 @@ +import http from '../utils/http/index.js' +// 获取获取询价结果列表 +export function getEnquiryOrder(data) { + return http.get( + { + url: '/base-paper-trading/get/enquiry-order/result-list', + data + }, + { + hideLoading: true + } + ) +} +/** + * 询价单去下单 + * swagger:https://api-ops-yyt-test.qniao.cn//base-paper-trading/swagger-ui/index.html?urls.primaryName=CustomerApi#/%E5%8E%9F%E7%BA%B8%E8%AE%A2%E5%8D%95/createCustomerOrderByEnquiryUsingPOST + * + */ +export function createByEnquiry(data) { + return http.post( + { + url: '/base-paper-trading/buyer/paper/goods/reserve/by-enquiry', + data + } + ) +} \ No newline at end of file diff --git a/apis/setting.js b/apis/setting.js new file mode 100644 index 0000000..742b965 --- /dev/null +++ b/apis/setting.js @@ -0,0 +1,32 @@ +import http from '../utils/http/index.js' +// 修改员工姓名 +export function employeeName(data) { + return http.post({ + url: '/yyt-uec/update/my/employee-name?userId='+data.userId +'&enterpriseId=' +data.enterpriseId, + data + }) +} +// 新增员工 +export function addEmployee(data) { + return http.post({ + url: '/yyt-uec/enterprise/add/employee?userId='+data.userId +'&enterpriseId=' +data.enterpriseId, + data + }) +} +// 员工列表 +export function employeeList(data) { + return http.get({ + url: '/yyt-uec/enterprise/get/employee-list', + data + }) +} +// 删除员工 +export function deleteEmployee(data) { + return http.post({ + url: '/yyt-uec/enterprise/delete/employee?enterpriseId='+data.enterpriseId, + data + }) +} + + + diff --git a/components/qn-input-number/qn-input-number.vue b/components/qn-input-number/qn-input-number.vue index 599604b..9651ea7 100644 --- a/components/qn-input-number/qn-input-number.vue +++ b/components/qn-input-number/qn-input-number.vue @@ -15,7 +15,7 @@ export default { props: { quantity: { - type: Number, + type: [Number, String], default: 0 } }, diff --git a/pages.json b/pages.json index 4096a8b..f32c716 100644 --- a/pages.json +++ b/pages.json @@ -137,7 +137,23 @@ "navigationStyle": "custom", "enablePullDownRefresh": false } - } + }, + { + "path": "pages/account-management/index", + "style": { + "navigationBarTitleText": "账号管理", + "navigationStyle": "custom", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/add-account/index", + "style": { + "navigationBarTitleText": "新增企业账号", + "navigationStyle": "custom", + "enablePullDownRefresh": false + } + } ], "globalStyle": { "navigationBarTextStyle": "black", diff --git a/pages/account-management/index.vue b/pages/account-management/index.vue new file mode 100644 index 0000000..320c480 --- /dev/null +++ b/pages/account-management/index.vue @@ -0,0 +1,208 @@ + + + + + diff --git a/pages/add-account/index.vue b/pages/add-account/index.vue new file mode 100644 index 0000000..41f470a --- /dev/null +++ b/pages/add-account/index.vue @@ -0,0 +1,262 @@ + + + + + diff --git a/pages/add-address-manage/index.vue b/pages/add-address-manage/index.vue index 8f3139c..0111af3 100644 --- a/pages/add-address-manage/index.vue +++ b/pages/add-address-manage/index.vue @@ -63,7 +63,7 @@ import { getArea } from '@/apis/commonApi.js' import { back } from '@/utils/hook.js' import qnFooter from '@/components/qn-footer/qn-footer.vue' import qnDataPicker from '@/components/qn-data-picker/qn-data-picker.vue' -import { createAddress } from '@/apis/addressManageApi.js' +import { createAddress, getAddressDetail } from '@/apis/addressManageApi.js' export default { components: { uGap, qnFooter, qnDataPicker }, data() { @@ -85,7 +85,8 @@ export default { streetName: '', }, hasSelected: false, - items: [] + items: [], + id: null, } }, mounted() { @@ -95,8 +96,22 @@ export default { } }) }, - onLoad() {}, - methods: { + onLoad(option) { + if(option.id) { + this.id = option.id + this.getAddressDetail() + } + }, + methods: { + // 通过id查询收货地址 + getAddressDetail() { + getAddressDetail({id: this.id}).then(res => { + // console.log('收货地址详情', res) + if(res) { + this.form = Object.assign({}, res) + } + }) + }, onAreaChange(e) { if (e.detail.value && e.detail.value.length > 0) { const [province, city, district, street] = e.detail.value @@ -127,9 +142,9 @@ export default { // 保存 addTap() { createAddress(this.form).then(res => { - if (res) { + if (res) { uni.showToast({ - title: '添加成功', + title: '保存成功', icon: 'success' }) setTimeout(() => { diff --git a/pages/address-manage/index.vue b/pages/address-manage/index.vue index 12818a1..eb51d80 100644 --- a/pages/address-manage/index.vue +++ b/pages/address-manage/index.vue @@ -2,15 +2,15 @@ - + {{item.receiver}} {{item.receiverMobile}} {{item.provinceName}}{{item.cityName}}{{item.districtName}}{{item.streetName}}{{item.detail}} - @@ -51,7 +51,7 @@ - - diff --git a/pages/enquiry-list/index.vue b/pages/enquiry-list/index.vue index e042861..6475ec5 100644 --- a/pages/enquiry-list/index.vue +++ b/pages/enquiry-list/index.vue @@ -1,20 +1,325 @@ - - - - - + + + + + diff --git a/pages/for-comparison/index.vue b/pages/for-comparison/index.vue index ec39fc8..c02a2a4 100644 --- a/pages/for-comparison/index.vue +++ b/pages/for-comparison/index.vue @@ -1,5 +1,6 @@