diff --git a/common/js/request.js b/common/js/request.js index 0ec28a0..b308fe3 100644 --- a/common/js/request.js +++ b/common/js/request.js @@ -487,6 +487,14 @@ export default { } }) return res[1].data; + }, + async countOrderList(params = {}) { + let res = await uni.request({ + url: '/order/master/app/count', + method: 'POST', + data: params + }) + return res[1].data; }, async updateOrder(params = {}) { let res = await uni.request({ @@ -577,6 +585,14 @@ export default { }) return res[1].data; }, + async getCustomerPlaceList(params = {}) { + let res = await uni.request({ + url: '/customer/place/app/list', + method: 'POST', + data: params + }) + return res[1].data; + }, async qryCustomerList(params = {}) { let res = await uni.request({ url: '/customer/app/list', @@ -605,6 +621,14 @@ export default { }) return res[1].data; }, + async countAfterList(params = {}) { + let res = await uni.request({ + url: '/order/master/after/count', + method: 'POST', + data: params + }) + return res[1].data; + }, async addAfterServiceRecord(params = {}) { let res = await uni.request({ url: '/worker/record/add', @@ -657,5 +681,5 @@ export default { data: params }) return res[1].data; - }, + } } diff --git a/components/multi-level-nav/vertical-nav.vue b/components/multi-level-nav/vertical-nav.vue index 4f2e6b7..8173d57 100644 --- a/components/multi-level-nav/vertical-nav.vue +++ b/components/multi-level-nav/vertical-nav.vue @@ -31,12 +31,15 @@ - - + + {{type.goodsCategoryName}} + + + - + {{subType.goodsCategoryName}} @@ -73,7 +76,8 @@ data() { return { tabCur: 0, - navTabCur: 0, + navTabCur: 0, + isShowParentNode: [], // mainCur: 0, // load: true, // verticalNavTop: 0, @@ -105,6 +109,17 @@ }, searchGoods(e) { uni.$emit(this.$globalFun.VERTICAL_NAV_SEARCH, e.detail.value); + }, + triggerTypeCollapse(index1, index2) { + if (this.isShowParentNode[index1] == null || this.isShowParentNode[index1] == undefined) { + this.isShowParentNode[index1] = []; + this.isShowParentNode[index1][index2] = true; + } else if (!this.isShowParentNode[index1][index2]) { + this.isShowParentNode[index1][index2] = true; + } else { + this.isShowParentNode[index1][index2] = false; + } + this.isShowParentNode = [].concat(this.isShowParentNode); } } } @@ -173,5 +188,13 @@ .bottom-border { border-bottom: 1rpx solid rgba(0, 0, 0, 0.1); + } + + .hidelist { + display: none; + } + + .showlist { + display: block; } diff --git a/pages.json b/pages.json index 6a9318d..6c212c8 100644 --- a/pages.json +++ b/pages.json @@ -36,6 +36,10 @@ "path": "edit-address" }, { "path": "apply-operator" + }, { + "path": "apply-joining-project" + }, { + "path": "apply-community-operator" }, { "path": "my-operator" }, { diff --git a/pages/index/my-home.vue b/pages/index/my-home.vue index 5410517..5c4c830 100644 --- a/pages/index/my-home.vue +++ b/pages/index/my-home.vue @@ -78,8 +78,8 @@ - - {{myInfo.serOrderNum.wait2Pay}} + + {{waitForPayOrderCount}} 待付款 @@ -110,16 +110,16 @@ --> - - {{myInfo.serOrderNum.processing}} + + {{waitForServOrderCount}} 待服务 - - {{myInfo.serOrderNum.afterServ}} + + {{servingOrderCount}} 进行中 @@ -134,16 +134,16 @@ --> - - {{myInfo.serOrderNum.afterServ}} + + {{afterOrderCount}} 售后中 - - {{myInfo.serOrderNum.wait2Forward}} + + {{finishedOrderCount}} 已完成 @@ -261,6 +261,14 @@ {{curUserInfo.placeStatus == 0 ? '运营商申请' : '运营商登录'}} + + + + 项目加盟 + + + + 社区代理 + + 返回 + 申请社区代理 + + + 上门到家服务需求，时刻围绕着社区。修水龙头、保洁、电器维修、上门住家饭、二手空调、社区跑腿、手机维护等等近千项日常生活中的需求数不胜数，应有尽有！目前，大多数社区服务不够优质、资源对接不够多、价格不够实惠、服务不够保障，市场尚大有可为！而社区服务的更加齐全、更加标准、更加丰富，需有赖于经营者的细心服务与打造创建。平台正开启有志于社区创业运营的人成为社区服务联合经营者，共同打造社区服务更多选择、更快捷、更优质、更细致的社区服务体系。 + + + + + + + + + + 我有社区运营经验 + 申请社区经营者 + + + + + + + + + + + 我无社区经验但有经营意向 + 申请社区经营者 + + + + + + + + + + + 我有社区开拓经验 + 申请社区站点开拓经营者 + + + + + + + + + + + 我有经营经验 + 申请城市经营 + + + + + + + + + + 申请信息 + +
+ + 您的姓名* + + + + 注册电话* + + + + 申请城市* + + + {{formData.area && formData.area.length ? formData.area[0].areaName + '-' + formData.area[1].areaName : '请选择'}} + + + + + 验证码* + + 发送验证码 + + 已发送({{countDownNum}}) + + + + 关联信息 + + + + + + + 合同同意书链接 + + + + + +
+ + + + + + + + diff --git a/pages/my/apply-joining-project.vue b/pages/my/apply-joining-project.vue new file mode 100644 index 0000000..bbc271b --- /dev/null +++ b/pages/my/apply-joining-project.vue @@ -0,0 +1,330 @@ + + + + + diff --git a/pages/my/apply-operator.vue b/pages/my/apply-operator.vue index 503f915..33d42ab 100644 --- a/pages/my/apply-operator.vue +++ b/pages/my/apply-operator.vue @@ -108,7 +108,7 @@ multiIndex: [0, 0], countDownNum: 0, formData: { - operatorType: '', + subType: '', agreeContract: false, area: null }, @@ -123,7 +123,7 @@ this.loadAreaList(); }, changeOperatorType(e) { - this.formData.operatorType = e.detail.value; + this.formData.subType = e.detail.value; }, changeAgreeContract() { this.formData.agreeContract = !this.formData.agreeContract; @@ -231,7 +231,8 @@ ...e.detail.value, ...this.formData, city: this.formData.area && this.formData.area.length ? this.formData.area[this.formData.area.length - 1].areaId : null, - customerId: this.curUserInfo.customerId + customerId: this.curUserInfo.customerId, + type: 'distribution' } let formValid = this.validateForm(formData); if (formValid) { diff --git a/pages/product/shop-detail.vue b/pages/product/shop-detail.vue index 6a565fd..1ae229c 100644 --- a/pages/product/shop-detail.vue +++ b/pages/product/shop-detail.vue @@ -137,12 +137,14 @@ this.loadData(params); }, methods: { - async loadData(params) { + async loadData(params) { + let workerAreas = params.workerAreas; // this.shopInfo = await this.$api.data('shopInfo'); let res = await this.$request.getWorkerAllDetailById({ workerId: params.workerId }) this.shopInfo = res.data; + this.shopInfo.workerAreas = workerAreas; this.loadCategoryList(); // 获取当前定位 await this.getCurAreaArr();