From 02115b5248cd23233a1164d6882ff218def01e16 Mon Sep 17 00:00:00 2001 From: yujialong <479214531@qq.com> Date: Mon, 23 May 2022 17:04:30 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apis/request.js | 2 +- pages.json | 56 ++-- pages/clientDetail/clientDetail.vue | 194 ++++------- pages/invite/invite.vue | 19 +- pages/orderDetail/orderDetail.vue | 502 +++++++++++++++++++--------- styles/common.scss | 54 ++- 6 files changed, 492 insertions(+), 335 deletions(-) diff --git a/apis/request.js b/apis/request.js index 0d41bab..f18e6cd 100644 --- a/apis/request.js +++ b/apis/request.js @@ -12,7 +12,7 @@ const request = options => { }) } const header = Object.assign({}, config.headers, { - token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1c2VyIiwiaWF0IjoxNjUzMDEyOTQ1LCJleHAiOjE2NTMwNTYxNDUsImFjY291bnRJZCI6IjEifQ.wlon-ETOzb3GvveRnetICH5Joa4u7XzaywGcDEbfqtU' + token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1c2VyIiwiaWF0IjoxNjUzMjcyMjMyLCJleHAiOjE2NTMzMTU0MzIsImFjY291bnRJZCI6IjEifQ.gf5myNnrLmVjUcIWfqfohWyvdPXXwr9butZo75CXk64' }) return new Promise((resolve, reject)=>{ uni.request({ diff --git a/pages.json b/pages.json index 34addde..c9df0d3 100644 --- a/pages.json +++ b/pages.json @@ -1,5 +1,21 @@ { "pages": [ + { + "path" : "pages/invite/invite", + "style" : + { + "navigationBarTitleText": "加入团队", + "enablePullDownRefresh": false + } + }, + { + "path" : "pages/clients/clients", + "style" : + { + "navigationBarTitleText": "客户列表", + "enablePullDownRefresh": true + } + }, { "path" : "pages/orderDetail/orderDetail", "style" : @@ -16,12 +32,20 @@ "enablePullDownRefresh": false } }, - { - "path" : "pages/clients/clients", + { + "path" : "pages/addMember/addMember", "style" : { - "navigationBarTitleText": "客户列表", - "enablePullDownRefresh": true + "navigationBarTitleText": "添加成员", + "enablePullDownRefresh": false + } + }, + { + "path" : "pages/addStaff/addStaff", + "style" : + { + "navigationBarTitleText": "添加成员", + "enablePullDownRefresh": false } }, { @@ -54,14 +78,6 @@ "navigationBarTitleText": "首页" } }, - { - "path" : "pages/invite/invite", - "style" : - { - "navigationBarTitleText": "加入团队", - "enablePullDownRefresh": false - } - }, { "path" : "pages/qrcode/qrcode", "style" : @@ -78,22 +94,6 @@ "enablePullDownRefresh": false } }, - { - "path" : "pages/addStaff/addStaff", - "style" : - { - "navigationBarTitleText": "添加成员", - "enablePullDownRefresh": false - } - }, - { - "path" : "pages/addMember/addMember", - "style" : - { - "navigationBarTitleText": "添加成员", - "enablePullDownRefresh": false - } - }, { "path" : "pages/password/password", "style" : diff --git a/pages/clientDetail/clientDetail.vue b/pages/clientDetail/clientDetail.vue index bce538b..c316b96 100644 --- a/pages/clientDetail/clientDetail.vue +++ b/pages/clientDetail/clientDetail.vue @@ -8,64 +8,65 @@ - - - 基本信息 - - - 客户名称 - {{ form.customerName || '请选择学校' }} - - - 省份 - {{ form.provinceName }} - - - 城市 - {{ form.cityName }} - - - 行业类型 - {{ form.industryClassName }} - - - - 行业 - {{ form.industryName }} - - - - 联系人姓名 - {{ form.name }} - - - - 手机 - {{ form.phone }} - - - - 账号 - {{ form.account }} - - - - 职务 - {{ form.position }} - - - - 邮箱 - {{ form.email }} - - - - 产品到期时间 - {{ form.expireDate }} - - - 客户类型 - {{ customerType }} + + 基本信息 + + + 客户名称 + {{ form.customerName }} + {{ form.customerName || '请选择学校' }} + + + 省份 + {{ form.provinceName }} + + + 城市 + {{ form.cityName }} + + + 行业类型 + {{ form.industryClassName }} + + + + 行业 + {{ form.industryName }} + + + + 联系人姓名 + {{ form.name }} + + + + 手机 + {{ form.phone }} + + + + 账号 + {{ form.account }} + + + + 职务 + {{ form.position }} + + + + 邮箱 + {{ form.email }} + + + + 产品到期时间 + {{ form.expireDate }} + + + 客户类型 + {{ customerType }} + @@ -84,8 +85,8 @@ - - + + 请选择学校 @@ -143,39 +144,6 @@ email: '', schoolId: '' }, - // 校验规则 - rules: { - schoolId: { - rules: [{ - required: true, - errorMessage: '请选择客户' - }] - }, - industryClassId: { - rules: [{ - required: true, - errorMessage: '请选择行业类型' - }] - }, - industryId: { - rules: [{ - required: true, - errorMessage: '请选择行业' - }] - }, - name: { - rules: [{ - required: true, - errorMessage: '联系人姓名不能为空' - }] - }, - account: { - rules: [{ - required: true, - errorMessage: '账号不能为空' - }] - }, - }, customerType: '', } }, @@ -351,44 +319,4 @@ color: #959595; } } -.mask { - z-index: 9; - position: fixed; - top: 0; - left: 0; - bottom: 0; - right: 0; - background-color: rgba(0, 0, 0, .5); -} -.school-popup { - z-index: 10; - position: fixed; - bottom: 0%; - width: 100%; - height: 90vh; - background-color: #fff; - border-top-left-radius: 8px; - border-top-right-radius: 8px; - .top { - text-align: center; - line-height: 50px; - font-size: 14px; - color: #333; - border-bottom: 1px solid #f1f1f1; - } - .close { - position: absolute; - top: 15px; - right: 15px; - } - .list { - max-height: calc(90vh - 103px); - padding: 0 15px; - overflow: auto; - .item { - line-height: 34px; - font-size: 12px; - } - } -} diff --git a/pages/invite/invite.vue b/pages/invite/invite.vue index cc09bcc..cf01cde 100644 --- a/pages/invite/invite.vue +++ b/pages/invite/invite.vue @@ -8,7 +8,10 @@ 或然科技城市合伙人计划 加入并自动为你创建一个团队群组 - + + + + @@ -17,6 +20,9 @@ {{ btnText }} + + + @@ -28,9 +34,14 @@ data() { return { form: { + isTeam: 1, // 0为团队，1为成员 + partnerClassificationId: 167, + token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1c2VyIiwiaWF0IjoxNjUzMjcyMjMyLCJleHAiOjE2NTMzMTU0MzIsImFjY291bnRJZCI6IjEifQ.gf5myNnrLmVjUcIWfqfohWyvdPXXwr9butZo75CXk64', userName: '', + account: '', phone: '', code: '', + email: '' }, codeDisabled: false, phoneTimer: null, @@ -44,9 +55,11 @@ methods: { // 提交 submit() { - const { userName, phone } = this.form + const { form } = this + const { userName, phone } = form if (!userName) return this.$util.errMsg('请输入姓名！') if (!phone) return this.$util.errMsg('请输入手机号！') + form.uniqueIdentification = Date.now() savePartnerAccount(this.form).then(res => { this.$util.sucMsg('加入成功') setTimeout(() => { @@ -149,6 +162,8 @@ border-radius: 5px; } .submit { + line-height: 38px; + font-size: 14px; border-radius: 40px; } } diff --git a/pages/orderDetail/orderDetail.vue b/pages/orderDetail/orderDetail.vue index 4027c91..fd3faef 100644 --- a/pages/orderDetail/orderDetail.vue +++ b/pages/orderDetail/orderDetail.vue @@ -1,98 +1,143 @@ diff --git a/styles/common.scss b/styles/common.scss index 508447d..59ef01c 100644 --- a/styles/common.scss +++ b/styles/common.scss @@ -1,10 +1,16 @@ button[type=primary] { background-color: #007eff; } - +.block { + padding: 0 24rpx; + margin: 20rpx 24rpx; + border-radius: 16rpx; + background-color: #fff; +} .l-title { display: flex; align-items: center; + padding: 28rpx 0; font-size: 28rpx; color: #333; &:before { @@ -17,10 +23,7 @@ button[type=primary] { } } .form-list { - padding: 0 24rpx; - margin: 20rpx 24rpx; - border-radius: 16rpx; - background-color: #fff; + border-top: 1px solid #E6E8ED; .line { display: flex; justify-content: space-between; @@ -78,4 +81,45 @@ button[type=primary] { position: fixed; bottom: 20px; right: 20px; +} + +.popup-mask { + z-index: 9; + position: fixed; + top: 0; + left: 0; + bottom: 0; + right: 0; + background-color: rgba(0, 0, 0, .5); +} +.popup { + z-index: 10; + position: fixed; + bottom: 0%; + width: 100%; + height: 90vh; + background-color: #fff; + border-top-left-radius: 8px; + border-top-right-radius: 8px; + .top { + text-align: center; + line-height: 50px; + font-size: 14px; + color: #333; + border-bottom: 1px solid #f1f1f1; + } + .close { + position: absolute; + top: 15px; + right: 15px; + } + .list { + max-height: calc(90vh - 103px); + padding: 0 15px; + overflow: auto; + .item { + line-height: 34px; + font-size: 12px; + } + } } \ No newline at end of file