diff --git a/other/activityDetail/activityDetail.vue b/other/activityDetail/activityDetail.vue
index ad86eb9..e12554c 100644
--- a/other/activityDetail/activityDetail.vue
+++ b/other/activityDetail/activityDetail.vue
@@ -309,60 +309,12 @@
this.sign()
},
download(item) {
- uni.showLoading({
- title: '加载中',
- mask: true
- })
- // 下载文件资源到本地
- uni.downloadFile({
- url: item.filePath,
- success: function(res) {
- console.log('result:', res)
- // uni.hideLoading();
-
- if (res.statusCode === 200) {
- uni.getFileSystemManager().saveFile({
- tempFilePath: res.tempFilePath,
- success(res) {
- console.log('saveFile:',res.savedFilePath)
- uni.openDocument({
- filePath: res.savedFilePath,
- showMenu: true, //是否可以分享
- success: (res) => {
- uni.hideLoading()
- console.log(res);
- },
- fail: (e) => {
- uni.showToast({
- title: '打开失败',
- icon: "error"
- })
- }
- })
- }
- })
- }
- // uni.showLoading({
- // title: '正在打开',
- // mask: true
- // })
- // 新开页面打开文档,支持格式:doc, xls, ppt, pdf, docx, xlsx, pptx。
- // uni.openDocument({
- // filePath: res.tempFilePath,
- // fileType: 'docx', // 文件类型,指定文件类型打开文件,有效值 doc, xls, ppt, pdf, docx, xlsx, pptx
- // showMenu: true, // 允许出现分享功能
- // success: res => {
- // uni.hideLoading()
- // },
- // fail: openError => {
- // uni.hideLoading()
- // }
- // })
- },
- fail: function(err) {
- uni.hideLoading()
- }
+ uni.setStorageSync('files', {
+ copyWriting: this.form.name,
+ fileName: [item.fileName],
+ urls: [item.filePath]
})
+ this.$util.to(`/other/send/send`)
},
}
}
diff --git a/other/goodsDetail/goodsDetail.vue b/other/goodsDetail/goodsDetail.vue
index 6144802..5ea8958 100644
--- a/other/goodsDetail/goodsDetail.vue
+++ b/other/goodsDetail/goodsDetail.vue
@@ -136,7 +136,8 @@
toOrder() {
const el = this.$refs.order
el.remarks = ''
- el.getGoods(this.teamId)
+ el.shopId = this.info.shopId
+ el.goods = this.info.skuList
el.$refs.popup.open()
},
}
diff --git a/other/send/send.vue b/other/send/send.vue
new file mode 100644
index 0000000..4af19f0
--- /dev/null
+++ b/other/send/send.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+ 邮箱
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages.json b/pages.json
index c6547bf..693fb2f 100644
--- a/pages.json
+++ b/pages.json
@@ -149,6 +149,14 @@
"navigationBarTitleText" : "商品详情",
"enablePullDownRefresh" : false
}
+ },
+ {
+ "path" : "send/send",
+ "style" :
+ {
+ "navigationBarTitleText" : "下载发送",
+ "enablePullDownRefresh" : false
+ }
}
]
},
diff --git a/pages/person/person.vue b/pages/person/person.vue
index 7217a12..060828e 100644
--- a/pages/person/person.vue
+++ b/pages/person/person.vue
@@ -237,7 +237,7 @@
}
// 团队信息
- const org = result.organizationInfoList.filter(e => !e.isEnable)
+ const org = result.organizationInfoList.filter(e => !e.isEnable) // 这里的isEnable为0启用,1禁用,下面userAccountList里的是0禁用,1启用
if (org && org.length) {
if (org.length) {
/**
@@ -250,7 +250,9 @@
uni.setStorageSync('team', org[0])
this.curTeam = org[0]
} else {
- this.curTeam = org.find(e => e.teamId == this.teamId)
+ const team = org.find(e => e.teamId == this.teamId)
+ this.curTeam = team
+ uni.setStorageSync('team', team)
}
}
this.isMember = uni.getStorageSync('team').isTeam == 0 // 成员
diff --git a/team/qrcode/qrcode.vue b/team/qrcode/qrcode.vue
index b41bd6c..d4df763 100644
--- a/team/qrcode/qrcode.vue
+++ b/team/qrcode/qrcode.vue
@@ -50,9 +50,9 @@
// 监听用户点击右上角菜单的「转发」按钮时触发的事件
onShareAppMessage(e) {
return {
- title: "GPAC",
+ title: `${this.info.userName}邀请你加入${this.team.organizationName}`,
path: `/team/join/join?accountId=${this.team.accountId}&id=${this.teamId}&isTeam=0&teamName=${this.info.userName}&platformId=${this.platformId}`,
- imageUrl: "",
+ imageUrl: "http://124.71.79.122/images/miniProgram/share.jpg",
success: function(res) {
if (res.errMsg == 'shareAppMessage:ok') {
console.log("成功", res)
diff --git a/team/teams/teams.vue b/team/teams/teams.vue
index b3282a4..22b1bda 100644
--- a/team/teams/teams.vue
+++ b/team/teams/teams.vue
@@ -188,7 +188,7 @@
padding: 8rpx 16rpx;
font-size: 24rpx;
color: #fff;
- background-color: #2979ff;
+ background-color: #1fbd02;
border-radius: 20px;
}
.btn {