diff --git a/apis/modules/parner.js b/apis/modules/parner.js index b6a7e9d..c062921 100644 --- a/apis/modules/parner.js +++ b/apis/modules/parner.js @@ -40,3 +40,11 @@ export const queryTeamMembers = (data) => { export const updatePartner = (data) => { return post('nakadai/nakadai/partnerClassification/update', data) } + +export const editProvinceCity = data => { + return post(`nakadai/nakadai/partner-team/editProvinceCity`, data) +} + +export const getPartnerTeamRates = data => { + return post(`nakadai/nakadai/partner-team/getPartnerTeamRates`, data) +} \ No newline at end of file diff --git a/apis/modules/product.js b/apis/modules/product.js index 739f421..4726020 100644 --- a/apis/modules/product.js +++ b/apis/modules/product.js @@ -3,4 +3,48 @@ const { get, post } = request export const AppletsDataProductList = (data) => { return post('nakadai/nakadai/dataProduct/AppletsDataProductList', data) +} + +export const tagsList = () => { + return get('nakadai/tags/tagsList') +} + +export const listOfGoods = (data) => { + return post('nakadai/mall/listOfGoods', data) +} + +export const detailsOfGoods = (id) => { + return get('nakadai/mall/detailsOfGoods?mallId=' + id) +} + +export const productCategoryList = () => { + return get('nakadai/productClassification/productCategoryList') +} + +export const productTypeList = () => { + return get('nakadai/productType/productTypeList') +} + +export const addToShoppingCart = (data) => { + return post('nakadai/mini/program/shopping/cart/addToShoppingCart', data) +} + +export const delCart = (data) => { + return post('nakadai/mini/program/shopping/cart/batchDeletion', data) +} + +export const shoppingCartList = (data) => { + return post('nakadai/mini/program/shopping/cart/shoppingCartList', data) +} + +export const courseDiscipline = () => { + return get('nakadai/nakadai/subject/courseDiscipline') +} + +export const courseProfessionalClass = id => { + return get('nakadai/nakadai/subject/courseProfessionalClass?disciplineId=' + id) +} + +export const courseProfessional = id => { + return get('nakadai/nakadai/subject/courseProfessional?professionalClassId=' + id) } \ No newline at end of file diff --git a/config/request.js b/config/request.js index 6748186..042bc89 100644 --- a/config/request.js +++ b/config/request.js @@ -5,9 +5,9 @@ */ export default { - baseURL: 'https://huorantech.cn/', + // baseURL: 'https://huorantech.cn/', // baseURL: 'http://192.168.31.151:9000/', - // baseURL: 'http://121.37.12.51/', + baseURL: 'http://121.37.12.51/', headers: { 'Content-Type': 'application/json;charset=UTF-8' }, diff --git a/libs/util.js b/libs/util.js index 70d94da..82b2221 100644 --- a/libs/util.js +++ b/libs/util.js @@ -103,5 +103,17 @@ export default { uni.hideLoading() } }) - } + }, + // 产品管理的产品分类（classificationId）有6个，订单管理的产品分类（authority）有5个，后者是由前者决定的，但是id不一样。把产品管理的分类id传入这个函数，即可返回订单的分类id + getOrderType(id) { + if (id == 1 || id == 2) return 1 + if (id == 3) return 2 + if (id == 4) return 3 + if (id == 5) return 0 + if (id == 6) return 4 + }, + // 去掉html标签 + removeTag(str) { + return str.replace(/(<[^>]+>)|(( )+)/g , '') + }, } \ No newline at end of file diff --git a/pages/clientDetail/clientDetail.vue b/order/clientDetail/clientDetail.vue similarity index 100% rename from pages/clientDetail/clientDetail.vue rename to order/clientDetail/clientDetail.vue diff --git a/pages/clients/clients.vue b/order/clients/clients.vue similarity index 100% rename from pages/clients/clients.vue rename to order/clients/clients.vue diff --git a/order/orderDetail/orderDetail.vue b/order/orderDetail/orderDetail.vue index 90e0a06..a55b4ff 100644 --- a/order/orderDetail/orderDetail.vue +++ b/order/orderDetail/orderDetail.vue @@ -6,7 +6,10 @@ 客户名称 {{ form.customerName }} - {{ form.customerName || '请选择客户' }} + + {{ form.customerName || '请选择客户' }} + 找不到客户？马上创建 + 省份 @@ -552,6 +555,11 @@ const { customerId, orderType } = this.form this.$util.to(`../editCourse/editCourse?orderType=${orderType}&customerId=${customerId}&action=${this.isEdit ? 'edit' : this.isRenew ? 'renew' : this.isHandle ? 'handle' : !this.orderId ? 'add' : ''}`) }, + // 前往创建客户 + toClient() { + uni.setStorageSync('courses', this.courseList) + this.$util.to(`/order/clientDetail/clientDetail`) + }, // 删除课程 delCourse(c, i) { const that = this @@ -887,6 +895,16 @@ bottom: 100rpx; } } +.form-list { + .customer-wrap { + text-align: right; + } + .create { + margin-top: 10rpx; + font-size: 20rpx; + color: #f00; + } +} .pro-wrap { position: relative; padding: 0; diff --git a/pages/products/products.vue b/order/products/products.vue similarity index 66% rename from pages/products/products.vue rename to order/products/products.vue index 3a85085..41a5634 100644 --- a/pages/products/products.vue +++ b/order/products/products.vue @@ -5,8 +5,14 @@ -