From 61d23835932a187601872bd9f71d880761ad2c2e Mon Sep 17 00:00:00 2001 From: yujialong <479214531@qq.com> Date: Tue, 4 Jul 2023 14:53:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=AD=89=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .hbuilderx/launch.json | 4 + apis/modules/article.js | 14 + config/request.js | 4 +- order/clientDetail/clientDetail.vue | 5 - order/curClient/curClient.vue | 3 +- order/editCourse/editCourse.vue | 8 +- order/orderDetail/orderDetail.vue | 121 +++++--- pages.json | 10 +- pages/person/person.vue | 2 +- static/image/unfold.png | Bin 0 -> 197 bytes styles/common.scss | 8 + team/plans/plans.vue | 267 +++++++++++------- team/scheme/scheme.vue | 83 ++++++ team/send/send.vue | 22 +- team/teamDetail/teamDetail.vue | 2 +- uni_modules/uni-tooltip/changelog.md | 10 + .../components/uni-tooltip/uni-tooltip.vue | 70 +++++ uni_modules/uni-tooltip/package.json | 83 ++++++ uni_modules/uni-tooltip/readme.md | 8 + 19 files changed, 557 insertions(+), 167 deletions(-) create mode 100644 apis/modules/article.js create mode 100644 static/image/unfold.png create mode 100644 team/scheme/scheme.vue create mode 100644 uni_modules/uni-tooltip/changelog.md create mode 100644 uni_modules/uni-tooltip/components/uni-tooltip/uni-tooltip.vue create mode 100644 uni_modules/uni-tooltip/package.json create mode 100644 uni_modules/uni-tooltip/readme.md diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index 81f13f4..32f4dc5 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -6,6 +6,10 @@ { "launchtype" : "local" }, + "h5" : + { + "launchtype" : "local" + }, "mp-weixin" : { "launchtype" : "local" diff --git a/apis/modules/article.js b/apis/modules/article.js new file mode 100644 index 0000000..eb4b2b6 --- /dev/null +++ b/apis/modules/article.js @@ -0,0 +1,14 @@ +import request from '@/apis/request.js' +const { get, post } = request + +export const queryClassificationByType = id => { + return post('nakadai/nakadai/partner/article/classification/queryClassificationByType?typeId=' + 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/config/request.js b/config/request.js index 042bc89..6748186 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/order/clientDetail/clientDetail.vue b/order/clientDetail/clientDetail.vue index 844ac0e..0c36909 100644 --- a/order/clientDetail/clientDetail.vue +++ b/order/clientDetail/clientDetail.vue @@ -39,7 +39,6 @@ {{ form.name }} @@ -47,7 +46,6 @@ {{ form.phone }} @@ -55,7 +53,6 @@ {{ form.account }} @@ -63,7 +60,6 @@ {{ form.position }} @@ -71,7 +67,6 @@ {{ form.email }} diff --git a/order/curClient/curClient.vue b/order/curClient/curClient.vue index 1d04bf0..79a81ab 100644 --- a/order/curClient/curClient.vue +++ b/order/curClient/curClient.vue @@ -12,6 +12,7 @@ v-for="item in list" :threshold="0" :right-options="delOption" + :disabled="!auth('订单管理:删除')" @click="del(item)" > @@ -54,7 +55,7 @@ - + diff --git a/order/editCourse/editCourse.vue b/order/editCourse/editCourse.vue index 5f0653a..6d2d80c 100644 --- a/order/editCourse/editCourse.vue +++ b/order/editCourse/editCourse.vue @@ -43,12 +43,12 @@ 数量 - 1 + 1 {{ item.authority ? '市场价' : '市场单价' }} - {{ item.marketValue }}元 + {{ item.marketValue }}元 结算价 @@ -59,11 +59,11 @@ 折扣率 - {{ item.discountRate }} + {{ item.discountRate }} 平台服务费 - {{ item.serviceFee }}元 + {{ item.serviceFee }}元 成交价 diff --git a/order/orderDetail/orderDetail.vue b/order/orderDetail/orderDetail.vue index 065af02..4b38644 100644 --- a/order/orderDetail/orderDetail.vue +++ b/order/orderDetail/orderDetail.vue @@ -1,5 +1,5 @@ - + 添加产品 @@ -169,7 +174,7 @@ 提交({{ courses.length }}) - {{ courses.find(e => !e.ship) ? '一键发货' : '取消全部发货' }} + {{ courses.find(e => !e.ship) ? '一键发货' : '取消全部发货' }} @@ -186,12 +191,12 @@ 续费 - + 处理 - + 删除 @@ -208,8 +213,14 @@ - - + + @@ -637,7 +648,7 @@ handleDeliver(c, i) { const row = this.courseList[c].list[i] row.ship = row.ship ? 0 : 1 - this.isEdit && ship(row).then(res => {}).catch(res => {}) // 编辑的情况下，需要调接口去直接发货 + if (row.ship == 1) row.isEnable = 1 // 发货后直接启用 }, // 计算订单总额 calcTotal(out) { @@ -723,7 +734,7 @@ copy() { const that = this uni.setClipboardData({ - data: this.shipInfo, + data: that.isDetail ? that.shipContent : this.shipInfo, success() { that.$util.sucMsg('复制成功') } @@ -759,6 +770,7 @@ for (const i in list) { list[i].list.forEach(e => { e.ship = ship + if (e.ship == 1) e.isEnable = 1 courses.push(e) }) } @@ -790,7 +802,7 @@ const unit = row.options // 使用期限单位 const useUnit = row.periodOfUse // 使用期限 // 计算市场价 - const price = row.marketPrice // 市场单价 + const price = row.marketPrice || 0 // 市场单价 // 结算单价是元/年，所以如果选择的不是年，要进行换算（日：/365,月：/12) row.marketValue = (!unit ? price / 365 * useUnit : @@ -1017,6 +1029,7 @@ display: inline-flex; align-items: center; max-width: 480rpx; + margin-right: 10rpx; } .course-action { display: inline-flex; @@ -1026,6 +1039,7 @@ padding: 0 16rpx; margin-right: 10rpx; font-size: 28rpx; + white-space: nowrap; &.mg { margin-left: 10rpx; } @@ -1053,6 +1067,10 @@ font-size: 28rpx; color: #999; } + .ph { + font-size: 28rpx; + color: #999; + } .val { font-size: 28rpx; color: #333; @@ -1158,15 +1176,16 @@ .product-btns { display: inline-flex; align-items: center; - margin-left: 20rpx; + margin-left: 10rpx; } .btn { padding: 0 20rpx; - margin-left: 16rpx; + margin-left: 8rpx; line-height: 80rpx; - font-size: 30rpx; + font-size: 26rpx; text-align: center; color: #fff; + white-space: nowrap; border-radius: 10rpx; background-color: #007EFF; } @@ -1207,18 +1226,46 @@ font-size: 28rpx; text-align: center; } - -.defaultBox { - font-size: 28rpx; -} .ship-info { + height: 400rpx; padding: 30rpx; white-space: pre-wrap; font-size: 28rpx; + overflow: auto; .ship-text { margin-bottom: 20rpx; } } + .ship-links { + position: relative; + display: flex; + justify-content: flex-end; + align-items: center; + margin-top: 20rpx; + font-size: 24rpx; + color: #007eff; + .tooltip { + z-index: 1000; + display: none; + position: absolute; + top: 40rpx; + left: 0; + max-width: 90%; + padding: 12px; + color: #fff; + font-size: 12px; + text-align: left; + line-height: 16px; + background-color: #333; + border-radius: 8px; + } + &:hover { + .tooltip { + display: block; + } + } + } + .ship-btns { display: flex; justify-content: center; diff --git a/pages.json b/pages.json index 3dba9a4..7d984d1 100644 --- a/pages.json +++ b/pages.json @@ -202,7 +202,15 @@ "navigationBarTitleText": "产品方案", "enablePullDownRefresh": false } - } + }, + { + "path" : "scheme/scheme", + "style" : + { + "navigationBarTitleText": "方案详情", + "enablePullDownRefresh": false + } + } ] } ], diff --git a/pages/person/person.vue b/pages/person/person.vue index d0bf4b5..6e0c9eb 100644 --- a/pages/person/person.vue +++ b/pages/person/person.vue @@ -10,7 +10,7 @@ - + 设置 diff --git a/static/image/unfold.png b/static/image/unfold.png new file mode 100644 index 0000000000000000000000000000000000000000..62ca6e5969b4705115ff802afb1c3488aa43c796 GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAd3?%E9GuQzs-2k5uS0L?!1iZby;XDW%NCJVo zyE{<)KI3dhpa#B@AirP+hlc%YLS^2+o8MEAEOfv5NhVOn($mE;gyVYh0Y;XE4ULUo zWkoa;Iv+9QoIB>QU<2EcFeXMu>-Zf@?shX+e6D1OX_St+owI<)bS^VPfU8v2MosJK QKtmWjUHx3vIVCg!0EDzUfB*mh literal 0 HcmV?d00001 diff --git a/styles/common.scss b/styles/common.scss index fffe021..0df766e 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; @@ -232,6 +237,9 @@ ul { border-top: 1px solid #f3f3f3; box-shadow: 0 -2px 2px #f5f5f5; box-sizing: border-box; + &:empty { + padding: 0 !important; + } .item { text-align: center; } diff --git a/team/plans/plans.vue b/team/plans/plans.vue index bdac8e1..100e4d0 100644 --- a/team/plans/plans.vue +++ b/team/plans/plans.vue @@ -1,140 +1,159 @@ diff --git a/team/scheme/scheme.vue b/team/scheme/scheme.vue new file mode 100644 index 0000000..c8902d4 --- /dev/null +++ b/team/scheme/scheme.vue @@ -0,0 +1,83 @@ + + + + + diff --git a/team/send/send.vue b/team/send/send.vue index fe861e4..cac20db 100644 --- a/team/send/send.vue +++ b/team/send/send.vue @@ -25,7 +25,6 @@ export default { data() { return { - id: '', email: '', otherEmail: '', myVal: 1, @@ -34,27 +33,15 @@ 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.getInfo() }, methods: { // 获取个人信息 getInfo() { - const team = uni.getStorageSync('team') - my({ - partnerId: team.partnerId, - teamId: team.teamId - }).then(({ my }) => { + my().then(({ my }) => { this.email = my.info.email }).catch(e => {}) }, @@ -69,10 +56,9 @@ const { otherEmail } = this if (this.myVal && !this.email) return this.$util.errMsg('请选择其他邮箱！') if (this.otherVal && !otherEmail) return this.$util.errMsg('请输入邮箱！') - mailFileSend({ - copyWriting: this.files[this.id], - mail: this.myVal ? this.email : otherEmail - }).then(res => { + const data = uni.getStorageSync('files') + data.mail = this.myVal ? this.email : otherEmail + mailFileSend(data).then(res => { this.$util.sucMsg('发送成功！') setTimeout(() => { uni.navigateBack() diff --git a/team/teamDetail/teamDetail.vue b/team/teamDetail/teamDetail.vue index 54bcb53..7f72392 100644 --- a/team/teamDetail/teamDetail.vue +++ b/team/teamDetail/teamDetail.vue @@ -24,7 +24,7 @@ - + diff --git a/uni_modules/uni-tooltip/changelog.md b/uni_modules/uni-tooltip/changelog.md new file mode 100644 index 0000000..00f1572 --- /dev/null +++ b/uni_modules/uni-tooltip/changelog.md @@ -0,0 +1,10 @@ +## 0.2.1（2022-05-09） +- 修复 content 为空时仍然弹出的bug +## 0.2.0（2022-05-07） +**注意：破坏性更新** +- 更新 text 属性变更为 content +- 更新 移除 width 属性 +## 0.1.1（2022-04-27） +- 修复 组件根 text 嵌套组件 warning +## 0.1.0（2022-04-21） +- 初始化 diff --git a/uni_modules/uni-tooltip/components/uni-tooltip/uni-tooltip.vue b/uni_modules/uni-tooltip/components/uni-tooltip/uni-tooltip.vue new file mode 100644 index 0000000..8757dc3 --- /dev/null +++ b/uni_modules/uni-tooltip/components/uni-tooltip/uni-tooltip.vue @@ -0,0 +1,70 @@ + + + + + + diff --git a/uni_modules/uni-tooltip/package.json b/uni_modules/uni-tooltip/package.json new file mode 100644 index 0000000..b626efb --- /dev/null +++ b/uni_modules/uni-tooltip/package.json @@ -0,0 +1,83 @@ +{ + "id": "uni-tooltip", + "displayName": "uni-tooltip", + "version": "0.2.1", + "description": "Tooltip 提示文字", + "keywords": [ + "uni-tooltip", + "uni-ui", + "tooltip", + "tip", + "文字提示" +], + "repository": "", +"engines": { + }, + "dcloudext": { + "category": [ + "前端组件", + "通用组件" + ], + "sale": { + "regular": { + "price": "0.00" + }, + "sourcecode": { + "price": "0.00" + } + }, + "contact": { + "qq": "" + }, + "declaration": { + "ads": "无 ", + "data": "无", + "permissions": "无" + }, + "npmurl": "" + }, + "uni_modules": { + "dependencies": [], + "encrypt": [], + "platforms": { + "cloud": { + "tcb": "y", + "aliyun": "y" + }, + "client": { + "Vue": { + "vue2": "y", + "vue3": "y" + }, + "App": { + "app-vue": "y", + "app-nvue": "u" + }, + "H5-mobile": { + "Safari": "y", + "Android Browser": "y", + "微信浏览器(Android)": "y", + "QQ浏览器(Android)": "y" + }, + "H5-pc": { + "Chrome": "y", + "IE": "y", + "Edge": "y", + "Firefox": "y", + "Safari": "y" + }, + "小程序": { + "微信": "y", + "阿里": "u", + "百度": "u", + "字节跳动": "u", + "QQ": "u" + }, + "快应用": { + "华为": "u", + "联盟": "u" + } + } + } + } +} \ No newline at end of file diff --git a/uni_modules/uni-tooltip/readme.md b/uni_modules/uni-tooltip/readme.md new file mode 100644 index 0000000..faafa2e --- /dev/null +++ b/uni_modules/uni-tooltip/readme.md @@ -0,0 +1,8 @@ +## Badge 数字角标 +> **组件名：uni-tooltip** +> 代码块： `uTooltip` + +数字角标一般和其它控件（列表、9宫格等）配合使用，用于进行数量提示，默认为实心灰色背景， + +### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-tooltip) +#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839