From 08bce81031018ffc8f6b7c55c34172671b28f0d2 Mon Sep 17 00:00:00 2001 From: yujialong <479214531@qq.com> Date: Fri, 17 Mar 2023 15:44:26 +0800 Subject: [PATCH] fix --- apis/modules/parner.js | 4 ++ config/request.js | 4 +- manifest.json | 7 ++- order/editCourse/editCourse.vue | 10 ++- order/orderDetail/orderDetail.vue | 82 +++++++++++++++++++++---- order/orders/orders.vue | 71 ++++++---------------- pages.json | 13 +++- pages/addStaff/addStaff.vue | 6 -- pages/clientDetail/clientDetail.vue | 21 ------- pages/editTeam/editTeam.vue | 91 ++++++++++++++++++++++++++++ pages/index/index.vue | 1 - pages/products/products.vue | 1 + pages/qrcode/qrcode.vue | 51 ++++++++++++++-- pages/teamDetail/teamDetail.vue | 2 +- pages/teams/teams.vue | 31 +++++++--- static/image/1.jpg | Bin 0 -> 29838 bytes static/image/wechat-code.jpeg | Bin 0 -> 50217 bytes styles/common.scss | 21 +++++++ 18 files changed, 304 insertions(+), 112 deletions(-) create mode 100644 pages/editTeam/editTeam.vue create mode 100644 static/image/1.jpg create mode 100644 static/image/wechat-code.jpeg diff --git a/apis/modules/parner.js b/apis/modules/parner.js index 568f362..51ff78a 100644 --- a/apis/modules/parner.js +++ b/apis/modules/parner.js @@ -35,4 +35,8 @@ export const teamPartnerList = (data) => { export const queryTeamMembers = (data) => { return post('nakadai/nakadai/partnerAccount/queryTeamMembers', data) +} + +export const updatePartner = (data) => { + return post('nakadai/nakadai/partnerClassification/update', data) } \ 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/manifest.json b/manifest.json index e80ec91..dc40105 100644 --- a/manifest.json +++ b/manifest.json @@ -1,5 +1,5 @@ { - "name" : "或然crm", + "name" : "或然科技产业平台运营版", "appid" : "__UNI__2E89BA6", "description" : "", "versionName" : "1.0.0", @@ -54,7 +54,10 @@ "es6" : true, "minified" : true }, - "usingComponents" : true + "usingComponents" : true, + "optimization" : { + "subPackages" : true + } }, "vueVersion" : "2" } diff --git a/order/editCourse/editCourse.vue b/order/editCourse/editCourse.vue index a498484..6cd791e 100644 --- a/order/editCourse/editCourse.vue +++ b/order/editCourse/editCourse.vue @@ -47,7 +47,10 @@ 结算价 - {{ item.settlementPrice }}元 + + + 元 + 折扣率 @@ -359,6 +362,11 @@ msg = '请输入数量！' break } + if (e.settlementPrice === '') { + this.err = 'settlementPrice' + suf + msg = '请输入结算价！' + break + } if (e.finalPrice === '') { this.err = 'finalPrice' + suf msg = '请输入成交价！' diff --git a/order/orderDetail/orderDetail.vue b/order/orderDetail/orderDetail.vue index 46835af..2da3736 100644 --- a/order/orderDetail/orderDetail.vue +++ b/order/orderDetail/orderDetail.vue @@ -85,7 +85,7 @@ 市场价（元） - {{ item.marketValue }}元 + {{ item.marketValue || 0 }}元 结算价 @@ -139,6 +139,29 @@ + + + + + 删除 + + + 请选择客户 @@ -153,7 +176,7 @@ + + diff --git a/pages/index/index.vue b/pages/index/index.vue index b4b2669..f41911b 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -28,7 +28,6 @@ 产品 - diff --git a/pages/products/products.vue b/pages/products/products.vue index e5ad68e..3a85085 100644 --- a/pages/products/products.vue +++ b/pages/products/products.vue @@ -178,6 +178,7 @@ border-bottom: 1px solid #E6E8ED; .icon { width: 52rpx; + height: 52rpx; margin-right: 20rpx; } } diff --git a/pages/qrcode/qrcode.vue b/pages/qrcode/qrcode.vue index c31f5a8..bc1bcae 100644 --- a/pages/qrcode/qrcode.vue +++ b/pages/qrcode/qrcode.vue @@ -10,8 +10,11 @@ - - 扫一扫，加入我们吧 + + + + 扫一扫，加入我们吧 + 长按可转发至微信好友和保存图片 邀请二维码失效日期：{{ expireTime }} @@ -32,6 +35,7 @@ qrcode: '', link: '', size: uni.upx2px(420), + qrcodeImg: '' } }, onShow() { @@ -55,10 +59,38 @@ generateInvitationCode(accountId).then(({ expireTime }) => { 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=${accountId}&id=${this.id}&isTeam=0` - this.link = `http://121.37.12.51/backstage/#/join?accountId=${accountId}&id=${this.id}&isTeam=0` + this.link = `https://huorantech.cn/#/join?accountId=${accountId}&id=${this.id}&isTeam=1` + // this.link = `http://121.37.12.51/backstage/#/join?accountId=${accountId}&id=${this.id}&isTeam=1` }).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 => {} + }) + }, } } @@ -76,6 +108,7 @@ text-align: center; background-color: #fff; .inner { + position: relative; display: flex; flex-direction: column; justify-content: center; @@ -106,12 +139,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/pages/teamDetail/teamDetail.vue b/pages/teamDetail/teamDetail.vue index d374c4d..54bcb53 100644 --- a/pages/teamDetail/teamDetail.vue +++ b/pages/teamDetail/teamDetail.vue @@ -42,7 +42,7 @@ keyword () { clearTimeout(this.searchTimer) this.searchTimer = setTimeout(() => { - this.initList() + this.getList() }, 500) } }, diff --git a/pages/teams/teams.vue b/pages/teams/teams.vue index 82e8724..ed0e796 100644 --- a/pages/teams/teams.vue +++ b/pages/teams/teams.vue @@ -4,11 +4,10 @@ - + -