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 @@
+
+
+
+
+
+ 修改
+
+
+
+ 续费
+
+
+
+
+ 处理
+
+
+
+
+ 删除
+
+
+
邀请二维码失效日期:{{ 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 @@
-
+
-
-
@@ -44,6 +43,7 @@
{{ item.invitationAccount }}
+
@@ -68,7 +68,8 @@
keyword: '',
list: [],
page: 1,
- pageSize: 10
+ pageSize: 10,
+ isClose: 0
}
},
watch: {
@@ -107,14 +108,17 @@
},
orgClick(e) {
this.orgTemp = e.id
+ this.org = e.id
+ this.initList()
},
// 组织关闭回调
- orgClose(e) {
- this.org = this.orgTemp
- this.initList()
+ orgClose() {
+ // this.org = this.orgTemp
+ // this.isClose = 1
+ // this.initList()
},
// 获取列表
- getList() {
+ async getList() {
uni.showLoading({
title: '加载中'
})
@@ -126,7 +130,7 @@
partnerClassificationId: this.org || ''
}).then(({ pageList }) => {
uni.hideLoading()
- const { records } = pageList
+ const { records } = pageList
// 未加载完所有数据,并且不是筛选,则拼接list,否则直接赋值
this.list = this.reachBottom > 0 ? [...this.list, ...records] : records
this.page++ // 每次获取了数据后page+1
@@ -145,6 +149,10 @@
// 查看团队成员
toTeam(e) {
this.$util.to(`../teamDetail/teamDetail?id=${e.teamId}`)
+ },
+ // 编辑区域
+ toEdit(e) {
+ this.$util.to(`../editTeam/editTeam?id=${e.teamId}&areaId=${e.partnerClassificationId}`)
}
}
}
@@ -159,6 +167,7 @@
margin-top: 20rpx;
background-color: #fff;
li {
+ position: relative;
display: flex;
align-items: center;
padding: 20rpx 40rpx;
@@ -192,6 +201,12 @@
font-size: 28rpx;
color: #333;
}
+ .iconfont {
+ position: absolute;
+ right: 50rpx;
+ font-size: 52rpx;
+ color: #0196ff;
+ }
}
.plus {
position: fixed;
diff --git a/static/image/1.jpg b/static/image/1.jpg
new file mode 100644
index 0000000..b399e49
Binary files /dev/null and b/static/image/1.jpg differ
diff --git a/static/image/wechat-code.jpeg b/static/image/wechat-code.jpeg
new file mode 100644
index 0000000..07a86ee
Binary files /dev/null and b/static/image/wechat-code.jpeg differ
diff --git a/styles/common.scss b/styles/common.scss
index 65f0dda..fffe021 100644
--- a/styles/common.scss
+++ b/styles/common.scss
@@ -218,4 +218,25 @@ ul {
-webkit-user-drag: none;
-webkit-user-select: none;
user-select: none;
+}
+.action {
+ z-index: 2;
+ position: fixed;
+ bottom: 0;
+ display: flex;
+ justify-content: space-around;
+ width: 100%;
+ padding: 5px 10px;
+ padding-bottom: env(safe-area-inset-bottom);
+ background-color: #fff;
+ border-top: 1px solid #f3f3f3;
+ box-shadow: 0 -2px 2px #f5f5f5;
+ box-sizing: border-box;
+ .item {
+ text-align: center;
+ }
+ .text {
+ font-size: 10px;
+ color: #959595;
+ }
}
\ No newline at end of file