diff --git a/apis/modules/article.js b/apis/modules/article.js index f9e2af9..a3683b2 100644 --- a/apis/modules/article.js +++ b/apis/modules/article.js @@ -15,4 +15,8 @@ export const queryClassificationByType = id => { export const schemeList = data => { return post('nakadai/nakadai/partner/schemeManagement/schemeList', data) +} + +export const schemeFindById = id => { + return post('nakadai/nakadai/partner/schemeManagement/findById?id=' + id) } \ No newline at end of file diff --git a/apis/request.js b/apis/request.js index e60efea..7cb0904 100644 --- a/apis/request.js +++ b/apis/request.js @@ -19,8 +19,8 @@ const request = options => { const { url } = options uni.request({ header, - url: (otherUrl.find(e => url.includes(e)) ? 'http://192.168.31.116:9000/' : config.baseURL) + url, - // url: config.baseURL + url, + // url: (otherUrl.find(e => url.includes(e)) ? 'http://192.168.31.116:9000/' : config.baseURL) + url, + url: config.baseURL + url, method: options.method || 'GET', // 请求类型，默认为GET data: options.data || {}, // 请求参数，默认空对象 success: ({ data }) => { diff --git a/config/request.js b/config/request.js index 042bc89..3656ab0 100644 --- a/config/request.js +++ b/config/request.js @@ -6,8 +6,8 @@ export default { // baseURL: 'https://huorantech.cn/', - // baseURL: 'http://192.168.31.151:9000/', - baseURL: 'http://121.37.12.51/', + baseURL: 'http://192.168.31.151:9000/', + // 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..8431e21 100644 --- a/libs/util.js +++ b/libs/util.js @@ -7,6 +7,7 @@ const files = [ 'https://huorantech.cn/%E5%A4%A7%E6%95%B0%E6%8D%AE%E7%AE%A1%E7%90%86%E4%B8%8E%E5%BA%94%E7%94%A8%E4%B8%93%E4%B8%9A%E5%BB%BA%E8%AE%BE%E6%96%B9%E6%A1%88.docx', // 大数据 'https://huorantech.cn/%E9%87%91%E8%9E%8D%E7%A7%91%E6%8A%80%E5%AE%9E%E9%AA%8C%E5%AE%A4%E5%BB%BA%E8%AE%BE%E6%96%B9%E6%A1%88V2.0.docx', // 金融科技 ] +const docExts = ['doc', 'xls', 'ppt', 'pdf', 'docx', 'xlsx', 'pptx'] export default { // 路由跳转 to(url) { @@ -71,6 +72,10 @@ export default { getIcon(e) { return e.miniProgramPictureAddress || (e.productType === 2 ? Product.dataIcon : Product.normalIcon) }, + // 判断文件类型是否能够通过uni.openDocument打开（doc, xls, ppt, pdf, docx, xlsx, pptx） + isDoc(ext) { + return docExts.includes(ext) + }, // 预览文档 openFile(id) { uni.showLoading({ diff --git a/order/editCourse/editCourse.vue b/order/editCourse/editCourse.vue index 9c002ad..df8cdb1 100644 --- a/order/editCourse/editCourse.vue +++ b/order/editCourse/editCourse.vue @@ -275,7 +275,7 @@ row.settlementPrice = this.$util.handleNaN(sPrice) // 平台服务费（结算价*10%） if (row.settlementPrice) { - row.serviceFee = (row.finalPrice * (this.rate ? this.rate / 100 : 1)).toFixed(2) + row.serviceFee = (row.finalPrice * (this.rate / 100)).toFixed(2) } } }, @@ -284,7 +284,7 @@ getPartnerTeamRates({ teamId: uni.getStorageSync('team').teamId }).then(({ teamRates }) => { - this.rate = teamRates.annualMarketingFee + this.rate = teamRates.annualMarketingFee || 0 }).catch(res => {}) }, // 计算折扣率 diff --git a/order/orderDetail/orderDetail.vue b/order/orderDetail/orderDetail.vue index 0dd413f..d1d8314 100644 --- a/order/orderDetail/orderDetail.vue +++ b/order/orderDetail/orderDetail.vue @@ -287,7 +287,7 @@ } // 3个分类的课程分别push到不同数组(0->理论 1-实训 2 数据产品) list.map(e => { - e.serviceFee = (e.settlementPrice * (this.rate ? this.rate / 100 : 1)).toFixed(2) // 服务费 != 0 && 才需要算 + e.serviceFee = (e.settlementPrice * (this.rate / 100)).toFixed(2) // 服务费 != 0 && 才需要算 const type = e.productType !type ? courses.theory.list.push(e) : @@ -349,7 +349,7 @@ getPartnerTeamRates({ teamId: uni.getStorageSync('team').teamId }).then(({ teamRates }) => { - this.rate = teamRates.annualMarketingFee + this.rate = teamRates.annualMarketingFee || 0 }).catch(res => {}) }, // 跳转 @@ -427,9 +427,9 @@ profit += +e.finalPrice - curPurchase } }) - form.purchaseCost = Math.round(purchase) - form.profit = Math.round(profit) - form.orderAmount = +form.purchaseCost + +form.profit + form.purchaseCost = purchase + form.profit = profit + form.orderAmount = (+form.purchaseCost + +form.profit).toFixed(2) }, // 处理错误提示 handleErr(val) { diff --git a/pages.json b/pages.json index a395d8a..444d410 100644 --- a/pages.json +++ b/pages.json @@ -40,14 +40,6 @@ "enablePullDownRefresh": false } }, - { - "path" : "pages/addStaff/addStaff", - "style" : - { - "navigationBarTitleText": "邀请成员", - "enablePullDownRefresh": false - } - }, { "path" : "pages/plans/plans", "style" : @@ -63,14 +55,6 @@ "navigationBarTitleText": "我的", "enablePullDownRefresh": false } - }, - { - "path" : "pages/send/send", - "style" : - { - "navigationBarTitleText": "下载发送", - "enablePullDownRefresh": false - } } ,{ "path" : "pages/reg/reg", @@ -181,6 +165,14 @@ "enablePullDownRefresh": true } }, + { + "path" : "addStaff/addStaff", + "style" : + { + "navigationBarTitleText": "邀请成员", + "enablePullDownRefresh": false + } + }, { "path" : "account/account", "style" : @@ -221,6 +213,22 @@ "enablePullDownRefresh": false } } + ,{ + "path" : "scheme/scheme", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + }, + { + "path" : "send/send", + "style" : + { + "navigationBarTitleText": "下载发送", + "enablePullDownRefresh": false + } + } ] } ], diff --git a/pages/index/index.vue b/pages/index/index.vue index 58af744..88a06bd 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -33,11 +33,15 @@ - + 学习速递 + + 全部 + + @@ -65,21 +69,21 @@ 本月新增试用客户 - {{ sell.trialUser }} + {{ sell.trialUser || 0 }} 本月成单客户 - {{ sell.regularUser }} + {{ sell.regularUser || 0 }} 本月新增产品试用 - {{ sell.trialProduct }} + {{ sell.trialProduct || 0 }} 本月成交订单产品 - {{ sell.officialProduct }} + {{ sell.officialProduct || 0 }} @@ -96,20 +100,20 @@ - - {{ analysis.finalPrice }} + + {{ handleNum(analysis.finalPrice) }} 总成交金额 - - {{ analysis.settlementPrice }} + + {{ handleNum(analysis.settlementPrice) }} 总结算金额 - - {{ analysis.marketingServiceCharge }} + + {{ handleNum(analysis.marketingServiceCharge) }} 市场服务费 - {{ analysis.projectBenefit }} + {{ handleNum(analysis.projectBenefit) }} 项目收益 @@ -128,17 +132,22 @@ data() { return { per: true, // 是否有权限 - // teamId: uni.getStorageSync('team').teamId || '', - teamId: '', + teamId: uni.getStorageSync('teamId') || '', list: [], id: '', teamList: [], studies: [], sell: {}, - analysis: {} + analysis: { + finalPrice: 0, + settlementPrice: 0, + marketingServiceCharge: 0, + projectBenefit: 0, + } } }, onShow() { + console.log(444, this.teamId) this.per = true this.getInfo() }, @@ -155,7 +164,7 @@ // 查询当前角色权限 getAuth() { uni.getStorageSync('token') && getUserRolesPermissionMenu({ - teamId: this.list.find(e => e.teamId === this.teamId).partnerClassificationId, + teamId: this.list.find(e => e.teamId == this.teamId).partnerClassificationId, platformId: 4 }).then(({ permissionMenu }) => { uni.hideLoading() @@ -188,7 +197,7 @@ const n = e.partnerClassificationList e.id = n.id // parnerId是商务经理id，teamId则是下面这个，其他地方要用的话直接uni.getStorageSync('team').partnerId去使用 - e.teamId = e.isTeam == 1 ? e.partnerClassificationId : n.id + e.teamId = e.isTeam == 1 ? +e.partnerClassificationId : n.id e.partnerClassificationName = n.partnerClassificationName delete e.partnerClassificationList }) @@ -197,7 +206,7 @@ * @description 如果是第一次进，则默认选中第一个团队，并把该团队的信息存入缓存 * 或者团队列表里没有该id，则说明超管已经被转让，也需要重新选中团队 */ - if (!this.teamId || !data.find(e => e.teamId == this.teamId)) { + if (!uni.getStorageSync('team') || !data.find(e => e.teamId == this.teamId)) { this.teamId = data[0].teamId uni.setStorageSync('team', data[0]) } @@ -219,15 +228,21 @@ // 学习速递 getStudy() { partnerOperatingList({ + createTimeSort: 'desc', pageNum: 1, pageSize: 5, querySource: 4, typeId: 1, - articleNameSort: 'desc' - }).then(({ data }) => { - this.studies = data.records + }).then(({ page }) => { + this.studies = page }).catch(e => {}) }, + // 跳转学习 + toStudy() { + uni.switchTab({ + url: '/pages/study/study' + }) + }, // 跳转学习详情 toDetail(item) { this.$util.to(`/team/article/article?id=` + item.id) @@ -241,13 +256,18 @@ this.sell = res }).catch(e => {}) }, + // 处理年度经营分析数值 除以10000 + w + handleNum(num) { + // return num ? parseInt(num / 10000) + 'w' : 0 + return num + }, // 获取年度经营分析 getAnalysis() { annualOperatingAnalysis({ businessManagerId: uni.getStorageSync('team').partnerId, teamId: this.teamId, }).then(({ data }) => { - this.analysis = data + if (data) this.analysis = data }).catch(e => {}) }, // 团队选择回调 @@ -387,12 +407,40 @@ } } .second { - padding: 38rpx 36rpx; - .line { - justify-content: space-between; - } + padding: 38rpx 10rpx; .item { + position: relative; text-align: center; + &:after { + content: ''; + position: absolute; + bottom: 14rpx; + right: -35rpx; + width: 22rpx; + height: 2px; + background-color: #ccc; + } + &.item1 { + margin-right: 53rpx; + } + &.item2 { + margin-right: 54rpx; + } + &.equal { + margin-right: 50rpx; + &:after { + bottom: 6rpx; + right: -39rpx; + height: 2px; + padding-bottom: 5px; + border-bottom: 2px solid #ccc; + background-clip:content-box; + box-sizing: content-box; + } + } + &:last-child:after { + display: none; + } } .val { margin-bottom: 10rpx; diff --git a/pages/info/info.vue b/pages/info/info.vue index 9fcea0c..fde7e18 100644 --- a/pages/info/info.vue +++ b/pages/info/info.vue @@ -17,10 +17,10 @@ @@ -42,13 +51,9 @@ export default { data() { return { - curTab: '', - classifications: [ - { - id: '', - classificationName: '不限' - } - ], + active: '', + typeVisible: false, + classifications: [], reachBottom: 0, // 是否是上拉加载。0->否,1->是,-1->加载完所有数据 status: 'more', // 上拉加载状态 more|loading|noMore searchTimer: null, @@ -83,25 +88,29 @@ } }, onShow() { + this.keyword = '' + this.active = '' this.initList() this.getClassification() }, methods: { getList() { - const data = { + uni.showLoading({ + title: '加载中' + }) + schemeList({ keyWord: this.keyword, pageNum: this.page, pageSize: this.pageSize, querySource: 4, - classificationId: this.curTab - } - uni.showLoading({ - title: '加载中' - }) - schemeList(data).then(({ data }) => { + classificationId: this.active + }).then(({ data }) => { uni.hideLoading() // 未加载完所有数据，并且不是筛选，则拼接list，否则直接赋值 const list = data.records + list.forEach(e => { + e.toggle = false + }) this.list = this.reachBottom > 0 ? [...this.list, ...list] : list this.page++ // 每次获取了数据后page+1 const noMore = this.list.length === data.total // 是否加载完所有数据 @@ -119,17 +128,33 @@ // 获取所属分类 getClassification() { queryClassificationByType(3).then(({ data }) => { + this.classifications = [ + { + id: '', + classificationName: '不限' + } + ] this.classifications.push(...data) }).catch(e => {}) }, + // 所属分类点击回调 + classificationClick(item, query) { + this.active = item.id + query && this.initList() + }, + // 关闭所属分类弹框 + closeType() { + this.typeVisible = false + this.initList() + }, // tab切换 tabChange(tab) { - this.curTab = tab.id + this.active = tab.id this.initList() }, // 跳转详情 - toDetail(id) { - this.$util.openFile(id) + toDetail(item) { + this.$util.to(`/team/scheme/scheme?id=` + item.id) }, // 发送邮箱 toEmail(id) { @@ -144,6 +169,21 @@ diff --git a/pages/study/study.vue b/pages/study/study.vue index 3418a30..ee95ad9 100644 --- a/pages/study/study.vue +++ b/pages/study/study.vue @@ -18,9 +18,9 @@ - {{ item.title }} + {{ item.title }} - {{ label }} + {{ label }} @@ -55,18 +55,13 @@ export default { data() { return { - classifications: [ - { - id: '', - classificationName: '不限' - } - ], + classifications: [], active: '', typeVisible: false, reachBottom: 0, // 是否是上拉加载。0->否,1->是,-1->加载完所有数据 status: 'more', // 上拉加载状态 more|loading|noMore searchTimer: null, - articleNameSort: 'desc', + articleNameSort: '', keyword: '', list: [], page: 1, @@ -97,6 +92,9 @@ } }, onShow() { + this.keyword = '' + this.active = '' + this.typeVisible = false this.initRole() }, methods: { @@ -121,13 +119,13 @@ uni.showLoading({ title: '加载中' }) - partnerOperatingList(data).then(({ data }) => { + partnerOperatingList(data).then(({ page, total }) => { uni.hideLoading() // 未加载完所有数据，并且不是筛选，则拼接list，否则直接赋值 - const list = data.records + const list = page this.list = this.reachBottom > 0 ? [...this.list, ...list] : list this.page++ // 每次获取了数据后page+1 - const noMore = this.list.length === data.total // 是否加载完所有数据 + const noMore = this.list.length === total // 是否加载完所有数据 this.status = noMore ? 'noMore' : 'more' // 加载完了则设置为noMore this.reachBottom = noMore ? -1 : 0 // 加载完了则设置为-1 }).catch(e => { @@ -142,6 +140,12 @@ // 获取所属分类 getClassification() { queryClassificationByType(1).then(({ data }) => { + this.classifications = [ + { + id: '', + classificationName: '不限' + } + ] this.classifications.push(...data) }).catch(e => {}) }, @@ -215,44 +219,6 @@ width: 40rpx; } } -.type-popup { - z-index: 10; - position: fixed; - top: 0; - left: 0; - width: 100%; - height: 100%; - padding: 10rpx; - background-color: #fff; - .close { - position: absolute; - top: 50rpx; - right: 50rpx; - } - .title { - margin: 150rpx 20rpx 30rpx; - font-size: 30rpx; - color: #333; - } - .types { - display: flex; - flex-wrap: wrap; - } - .item { - width: calc((100% - 80rpx) / 3); - margin: 10rpx; - font-size: 28rpx; - line-height: 3; - text-align: center; - color: #1f1f1f; - background-color: #dbebff; - border-radius: 2px; - &.active { - color: #fff; - background-color: #007EFF; - } - } -} .list { background-color: #fff; .item { @@ -273,6 +239,7 @@ width: calc(100% - 280rpx); } .title { + margin-bottom: 15rpx; font-size: 32rpx; font-weight: 600; color: #333; @@ -281,7 +248,6 @@ display: flex; flex-wrap: wrap; align-items: center; - margin-top: 15rpx; } .label { padding: 2px 6px; diff --git a/static/image/info-bg.jpg b/static/image/info-bg.jpg index 32d2d68..81e14be 100644 Binary files a/static/image/info-bg.jpg and b/static/image/info-bg.jpg differ diff --git a/styles/common.scss b/styles/common.scss index 65f0dda..38a4c67 100644 --- a/styles/common.scss +++ b/styles/common.scss @@ -17,6 +17,11 @@ ul { border-radius: 16rpx; background-color: #fff; } +.ell { + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; +} .l-title { display: flex; align-items: center; @@ -125,6 +130,7 @@ ul { li { padding: 0 20rpx; font-size: 28rpx; + white-space: nowrap; line-height: 100rpx; border-bottom: 3px solid transparent; } @@ -179,6 +185,44 @@ ul { } } } +.type-popup { + z-index: 10; + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 100%; + padding: 10rpx; + background-color: #fff; + .close { + position: absolute; + top: 50rpx; + right: 50rpx; + } + .title { + margin: 150rpx 20rpx 30rpx; + font-size: 30rpx; + color: #333; + } + .types { + display: flex; + flex-wrap: wrap; + } + .item { + width: calc((100% - 80rpx) / 3); + margin: 10rpx; + font-size: 28rpx; + line-height: 3; + text-align: center; + color: #1f1f1f; + background-color: #dbebff; + border-radius: 2px; + &.active { + color: #fff; + background-color: #007EFF; + } + } +} .btn-wrap { z-index: 10; position: fixed; diff --git a/pages/addStaff/addStaff.vue b/team/addStaff/addStaff.vue similarity index 100% rename from pages/addStaff/addStaff.vue rename to team/addStaff/addStaff.vue diff --git a/team/article/article.vue b/team/article/article.vue index 22a25cc..cb0ebdc 100644 --- a/team/article/article.vue +++ b/team/article/article.vue @@ -1,21 +1,31 @@ @@ -25,6 +35,7 @@ data() { return { id: '', + isInfo: 0, // 是否从资讯进来（学习详情跟资讯详情公用这个页面） form: { totalBrowsing: '' } @@ -34,6 +45,7 @@ const pages = getCurrentPages() const { options } = pages[pages.length - 1] this.id = options.id + this.isInfo = options.info this.getInfo() }, methods: { @@ -49,6 +61,34 @@ uni.hideLoading() }) }, + // 下载附件 + download(item) { + this.$util.to(`../send/send?url=${item.filePath}`) + // uni.showLoading({ + // title: '正在下载...', + // mask: true + // }) + // const url = item.filePath + // const that = this + // // 下载文件资源到本地 + // uni.downloadFile({ + // url, + // success: function(res) { + // console.log(444, res) + // uni.saveFile({ + // tempFilePath: res.tempFilePath, + // success: function(res) { + // console.log(555, res) + // uni.hideLoading() + // that.$util.sucMsg('文件已保存！') + // } + // }) + // }, + // fail: function(err) { + // uni.hideLoading() + // } + // }) + } } } @@ -58,8 +98,11 @@ padding: 30rpx; background-color: #fff; } +.banner { + width: 100%; +} .title { - font-size: 30rpx; + font-size: 34rpx; font-weight: 600; color: #333; } @@ -85,10 +128,32 @@ display: inline-flex; align-items: center; white-space: nowrap; + font-size: 24rpx; + color: #ccc; + } + .icon { + margin-right: 8rpx; } } .text { font-size: 28rpx; line-height: 1.6; } +.files { + margin-top: 20rpx; + .item { + display: flex; + align-items: center; + margin-bottom: 20rpx; + } + .file { + margin-right: 20rpx; + font-size: 26rpx; + color: #5a5a5a; + } + .download { + font-size: 26rpx; + color: #007EFF; + } +} diff --git a/team/qrcode/qrcode.vue b/team/qrcode/qrcode.vue index 4ad21d6..bc6c539 100644 --- a/team/qrcode/qrcode.vue +++ b/team/qrcode/qrcode.vue @@ -11,8 +11,11 @@ {{ team.partnerClassificationName }} - - 扫一扫，加入我们吧 + + + + 扫一扫，加入我们吧 + 长按可转发至微信好友和保存图片 邀请二维码失效日期：{{ expireTime }} @@ -31,6 +34,7 @@ expireTime: '', qrcode: '', link: '', + qrcodeImg: '', size: uni.upx2px(420), team: uni.getStorageSync('team') } @@ -58,9 +62,37 @@ const date = new Date(Date.now() + expireTime * 1000) // 返回的秒，要*1000 this.expireTime = `${date.getFullYear()}-${this.$util.preZero(date.getMonth() + 1)}-${this.$util.preZero(date.getDate())} ${this.$util.preZero(date.getHours())}:${this.$util.preZero(date.getMinutes())}:${this.$util.preZero(date.getMinutes())}` // this.link = `https://huorantech.cn/#/join?accountId=${team.accountId}&id=${team.teamId}&isTeam=0&teamName=${this.my.info.userName}` - this.link = `http://121.37.12.51/backstage/#/join?accountId=${team.accountId}&id=${team.teamId}&isTeam=0&teamName=${this.my.info.userName}` + this.link = `http://121.37.12.51/backstage/#/join?accountId=${team.accountId}&id=${team.teamId}&isTeam=0&teamName=${this.my.info.userName}&provinceId=${uni.getStorageSync('provinceId')}&cityId=${uni.getStorageSync('cityId')}` }).catch(e => {}) }, + // 二维码组件生成完成钩子。生成后把图片导出给image组件，image组件才可以长按二维码转发 + qrcodeComplete() { + this.$refs.qrcode.toTempFilePath({ + success: res => { + this.qrcodeImg = res.tempFilePath + } + }); + }, + previewImage(e){ + uni.previewImage({ + // 需要预览的图片链接列表。若无需预览，可以注释urls + urls: [e.target.src], + // 为当前显示图片的链接/索引值 + current: e.target.src, + // 图片指示器样式 + indicator:'default', + // 是否可循环预览 + loop:false, + // 长按图片显示操作菜单，如不填默认为保存相册 + // longPressActions:{ + // itemList:[this.l('发送给朋友'),this.l] + // }, + success: res => { + console.log('previewImage res', res); + }, + fail: err => {} + }) + }, } } @@ -78,6 +110,7 @@ text-align: center; background-color: #fff; .inner { + position: relative; display: flex; flex-direction: column; justify-content: center; @@ -87,6 +120,7 @@ .info { display: flex; align-items: center; + margin-bottom: 40rpx; text-align: left; } .avatar { @@ -107,12 +141,20 @@ margin: 20rpx 0; font-size: 30rpx; } + .qrcode { + display: none; + } + .qrcode-img { + width: 420rpx; + height: 420rpx; + } .tips { - margin: 30rpx 0 20rpx; + margin-bottom: 10rpx; font-size: 24rpx; color: #333; } .warn { + margin-top: 10rpx; font-size: 24rpx; color: #f00; } diff --git a/team/scheme/scheme.vue b/team/scheme/scheme.vue new file mode 100644 index 0000000..630d805 --- /dev/null +++ b/team/scheme/scheme.vue @@ -0,0 +1,110 @@ + + + + + diff --git a/pages/send/send.vue b/team/send/send.vue similarity index 89% rename from pages/send/send.vue rename to team/send/send.vue index fe861e4..c9904b9 100644 --- a/pages/send/send.vue +++ b/team/send/send.vue @@ -25,7 +25,7 @@ export default { data() { return { - id: '', + url: '', email: '', otherEmail: '', myVal: 1, @@ -34,17 +34,12 @@ text: '', value: 1 }], - files: [ - '人工智能实验室建设方案-2020.1.docx', - '大数据管理与应用专业建设方案.docx', - '金融科技实验室建设方案V2.0.docx' - ] } }, onShow() { const pages = getCurrentPages() const { options } = pages[pages.length - 1] - this.id = options.id + this.url = options.url this.getInfo() }, methods: { @@ -70,7 +65,7 @@ if (this.myVal && !this.email) return this.$util.errMsg('请选择其他邮箱！') if (this.otherVal && !otherEmail) return this.$util.errMsg('请输入邮箱！') mailFileSend({ - copyWriting: this.files[this.id], + copyWriting: this.url, mail: this.myVal ? this.email : otherEmail }).then(res => { this.$util.sucMsg('发送成功！') diff --git a/team/teams/teams.vue b/team/teams/teams.vue index 074a0d4..0cdacf9 100644 --- a/team/teams/teams.vue +++ b/team/teams/teams.vue @@ -25,7 +25,7 @@ - + 功能升级中，敬请期待... @@ -35,6 +35,7 @@ export default { data() { return { + isTeam: uni.getStorageSync('team').isTeam == 1, // 成员不能显示邀请按钮 per: true, // 是否有权限 reachBottom: 0, // 是否是上拉加载。0->否,1->是,-1->加载完所有数据 status: 'more', // 上拉加载状态 more|loading|noMore