Skip to content

Y
ybf
Commit bfd85761 authored by leiqingsong's avatar leiqingsong
Browse files
Options

Merge branch 'master' of http://114.67.93.201/xulili/ybf

parents 8d41890d eafb8c60
Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 222 deletions
wx_application/src/views/mainSale/active/main/index.vue
View file @ bfd85761
...@@ -445,6 +445,8 @@ export default { ...@@ -445,6 +445,8 @@ export default {
if (res.data.stallInfo != null) { if (res.data.stallInfo != null) {
sessionStorage.setItem("barName", res.data.stallInfo.name) sessionStorage.setItem("barName", res.data.stallInfo.name)
resolve(res.data.stallInfo.name) resolve(res.data.stallInfo.name)
}else {
resolve('')
} }
}).catch(err => { }).catch(err => {
reject(err) reject(err)
......
ybf_admin/src/pages/in/contact/components/addGroup.vue
View file @ bfd85761
...@@ -224,11 +224,11 @@ export default { ...@@ -224,11 +224,11 @@ export default {
handleAddCancel() { handleAddCancel() {
this.$emit("handleAddCancel") this.$emit("handleAddCancel")
}, },
handleAddFinish(formName) { handleAddFinish(formName) {
this.formLoading = true
this.loadText = "处理中"
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
if (valid) { if (valid) {
this.formLoading = true
this.loadText = "处理中"
this.addForm.clerkIds = this.addForm.clerkIds + "" this.addForm.clerkIds = this.addForm.clerkIds + ""
// let data = Object.assign(this.addForm,{ clerkIdss }) // let data = Object.assign(this.addForm,{ clerkIdss })
// delete data.clerkIds // delete data.clerkIds
......
ybf_admin/src/pages/in/contact/components/editGroup.vue
View file @ bfd85761
...@@ -250,11 +250,11 @@ export default { ...@@ -250,11 +250,11 @@ export default {
handleEditCancel() { handleEditCancel() {
this.$emit("handleEditCancel") this.$emit("handleEditCancel")
}, },
handleEditFinish(formName) { handleEditFinish(formName) {
this.formLoading = true this.$refs[formName].validate((valid) => {
this.loadText = "处理中"
this.$refs[formName].validate((valid) => {
if (valid) { if (valid) {
this.formLoading = true
this.loadText = "处理中"
this.addForm.clerkIds = this.addForm.clerkIds + "" this.addForm.clerkIds = this.addForm.clerkIds + ""
editDept(this.addForm).then(res => { editDept(this.addForm).then(res => {
if(res.result == 'success') { if(res.result == 'success') {
......
ybf_wx/src/views/home.vue
View file @ bfd85761
...@@ -71,8 +71,8 @@ ...@@ -71,8 +71,8 @@
if (sessionStorage.getItem("userId")) { if (sessionStorage.getItem("userId")) {
this.zcache.userId = sessionStorage.getItem("userId") this.zcache.userId = sessionStorage.getItem("userId")
}else{ }else{
this.zReadyUserId(); this.zReadyUserId()
this.zTestGetNowUrlInfo(); this.zTestGetNowUrlInfo()
} }
}, },
......
ybf_wx/src/views/sideNav/discount/index.vue
View file @ bfd85761
...@@ -107,7 +107,6 @@ export default { ...@@ -107,7 +107,6 @@ export default {
alert('您当前没有绑定店铺') alert('您当前没有绑定店铺')
this.isShow = false this.isShow = false
}else { }else {
// this.memberIdJudge('BH01','181')
let list = [] let list = []
res.data.forEach(item => { res.data.forEach(item => {
let obj = this.getVoucherList(item.oyStallCode) let obj = this.getVoucherList(item.oyStallCode)
...@@ -172,25 +171,7 @@ export default { ...@@ -172,25 +171,7 @@ export default {
} }
) )
}, },
///
// memberIdJudge(oyStallMemberId,oyStallCode) {
// const postData = {
// appCode: "0728", // j接口编码
// wxmpcode: oyStallMemberId,
// crmcode: oyStallCode
// }
// judgeMemberId(postData).then(res => {
// if(res.errCode == 0) {
// console.log(res,'res')
// }else {
// console.log(res,'?')
// }
// })
// .catch(err => {
// console.log(err)
// })
// },
} }
}; };
</script> </script>
......
ybf_wx/src/views/sideNav/register/index.vue
View file @ bfd85761
<template> <template>
<div class="register_container"> <div class="register_container">
<div v-for="(item, index) of list" :key="index" > <div v-for="(item, index) of list" :key="index" v-show="isShow">
<div class="list"> <div class="list">
<div> <div>
<img class="list-logo" :src="item.logoUrl" alt/> <img class="list-logo" :src="item.logoUrl" alt/>
...@@ -12,12 +12,13 @@ ...@@ -12,12 +12,13 @@
<button class="button-send" @click="sendMessage(item.oyStallMemberId)">邀请</button> <button class="button-send" @click="sendMessage(item.oyStallMemberId)">邀请</button>
</div> </div>
</div> </div>
<div class="no" v-show="!isShow">暂无门店信息...</div>
</div> </div>
</template> </template>
<script> <script>
import { getUserInfoByUserId } from "@/api/sidebar/voucher"; import { getUserInfoByUserId } from "@/api/sidebar/voucher";
import { judgeMemberId} from "@/api/sidebar/ea"
export default { export default {
name: 'register', name: 'register',
data() { data() {
...@@ -27,7 +28,9 @@ import { getUserInfoByUserId } from "@/api/sidebar/voucher"; ...@@ -27,7 +28,9 @@ import { getUserInfoByUserId } from "@/api/sidebar/voucher";
oyStallCode: '', oyStallCode: '',
userId: '', userId: '',
logoUrl: "/mainSale/4.png", logoUrl: "/mainSale/4.png",
dsc: "推荐完成注册，完成会员拉新" dsc: "推荐完成注册，完成会员拉新",
storeList: [],
isShow: true
} }
}, },
created() { created() {
...@@ -46,18 +49,55 @@ import { getUserInfoByUserId } from "@/api/sidebar/voucher"; ...@@ -46,18 +49,55 @@ import { getUserInfoByUserId } from "@/api/sidebar/voucher";
getUserInfoByUserId({ userName }).then(res => { getUserInfoByUserId({ userName }).then(res => {
if(res.data.length == 0) { if(res.data.length == 0) {
alert('您当前没有绑定店铺') alert('您当前没有绑定店铺')
this.isShow = false
}else { }else {
console.log(res,'店铺');
this.storeList = res.data
let ary = []
res.data.forEach(item => { res.data.forEach(item => {
item.logoUrl = this.logoUrl let obj = this.memberIdJudge(item.oyStallMemberId,item.oyStallCode)
item.dsc = this.dsc ary.push(obj)
}) })
this.list = res.data let promiseAll = Promise.all([ ...ary]).then(res => {
} res.forEach((item,index)=> {
// this.storeCode = res.data[0].oyStallMemberId if(item.check == 1 || item.check == 3) {
this.storeList[index].logoUrl = this.logoUrl
this.storeList[index].dsc = this.dsc
this.list.push(this.storeList[index])
}
})
if(this.list.length>0) {
this.isShow = true
}else {
this.isShow = false
}
})
}
}) })
.catch(err => { .catch(err => {
}) })
}, },
memberIdJudge(oyStallMemberId,oyStallCode) {
const postData = {
appCode: "0728", // j接口编码
crmcode: oyStallCode,
wxmpcode: oyStallMemberId
}
return new Promise(function(resolve, reject) {
judgeMemberId(postData).then(res => {
if(res.errCode == 0) {
resolve(res.result)
console.log(res.result,'res')
}else {
console.log(res)
}
})
.catch(err => {
reject(err)
})
})
},
sendMessage(oyStallMemberId){ sendMessage(oyStallMemberId){
let url = `http://oysales.oywanhao.com/register?storeCode=${oyStallMemberId}` let url = `http://oysales.oywanhao.com/register?storeCode=${oyStallMemberId}`
wx.invoke( wx.invoke(
...@@ -84,6 +124,11 @@ import { getUserInfoByUserId } from "@/api/sidebar/voucher"; ...@@ -84,6 +124,11 @@ import { getUserInfoByUserId } from "@/api/sidebar/voucher";
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.no {
font-size: 20px;
margin-top: 40px;
text-align: center;
}
.register_container{ .register_container{
padding: 4px 12px 40px 12px; padding: 4px 12px 40px 12px;
.list { .list {
......
ybf_wx/src/views/sideNav/register/index1.vue deleted 100644 → 0
View file @ 8d41890d
<template>
<div class="register_container">
<div v-for="(item, index) of list" :key="index" >
<div class="list">
<div>
<img class="list-logo" :src="item.logoUrl" alt/>
</div>
<div class="list-infos">
<div class="list-info-title">{{item.name}}</div>
<div class="list-info-dsc">{{item.dsc}}</div>
</div>
<button class="button-send" @click="sendMessage">邀请</button>
</div>
</div>
</div>
</template>
<script>
import { configWx, getUserInfo } from "@/utils/aCommon"
import { getUserInfoByUserId } from "@/api/sidebar/voucher";
import { judgeMemberId } from "@/api/sidebar/ea"
export default {
name: 'register',
data() {
return {
list:[
{
name: "会员拉新",
dsc: "推荐完成注册，完成会员拉新",
logoUrl: "/mainSale/4.png"
}
],
storeCode: '',
oyStallCode: '',
userId: ''
}
},
created() {
if(this.$route.params.userId) {
this.userId = this.$route.params.userId;
}else {
this.userId = sessionStorage.getItem("userId")
}
this.userId = "ShanDian"
// this.zReadyGetUserFromId()
this.getAgentAuth()
this.memberIdJudge('BH03',181)
this.getVoucherList()
},
methods:{
zReadyGetUserFromId() {
let userName = this.userId
getUserInfoByUserId({ userName }).then(res => {
this.storeCode = res.data[0].oyStallMemberId
})
.catch(err => {
})
},
memberIdJudge(oyStallMemberId,oyStallCode) {
const postData = {
appCode: "0728", // j接口编码
wxmpcode: oyStallMemberId,
crmcode: oyStallCode
}
judgeMemberId(postData).then(res => {
if(res.errCode == 0) {
console.log(res,'res');
}else {
console.log(res,'?');
}
})
.catch(err => {
console.log(err)
})
},
// memberIdJudge(oyStallMemberId,oyStallCode) {
// const postData = {
// appCode: "0728", // j接口编码
// wxmpcode: oyStallMemberId,
// crmcode: oyStallCode
// }
// return new Promise(function(resolve, reject) {
// judgeMemberId(postData).then(res => {
// if(res.errCode == 0) {
// resolve(res.result.check)
// }else {
// resolve('')
// }
// })
// .catch(err => {
// reject(err)
// })
// })
// },
sendMessage(){
if(this.storeCode == '') {
alert('您当前没有绑定店铺')
}else {
let url = `http://oysales.oywanhao.com/register?storeCode=${this.storeCode}`
wx.invoke(
"sendChatMessage",
{
msgtype: "news", //消息类型，必填
news: {
link: url, //H5消息页面url 必填
title: "注册邀请", //H5消息标题
desc: "注册成为欧亚会员", //H5消息摘要
imgUrl: "" //H5消息封面图片URL
}
},
function(res) {
// alert('sendChatMessage')
if (res.err_msg == "sendChatMessage:ok") {
} else if (res.err_msg != "sendChatMessage:ok") {
}
}
)
}
},
}
}
</script>
<style lang="scss" scoped>
.register_container{
padding: 4px 12px 40px 12px;
.list {
height: 140px;
box-shadow: 0px 2px 4px 0px rgb(187, 187, 187);
margin: 6px 0px;
padding: 0px 12px;
border-radius: 6px;
display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: center;
.list-logo {
width: 80px;
height: 80px;
border-radius: 6px;
}
.list-infos {
height: 80px;
padding-left: 12px;
display: flex;
flex-direction: column;
justify-content: flex-start;
align-items: flex-start;
}
.list-info-title {
width: 100%;
height: 18px;
font-size: 16px;
font-weight: bold;
line-height: 18px;
}
.list-info-dsc {
margin-top: 6px;
width: 100%;
height: 16px;
font-size: 12px;
font-weight: normal;
line-height: 18px;
}
.button-send {
border: 0px solid blue;
margin-left: 5px;
height: 40px;
width: 84px;
border-radius: 4px;
background-color: rgba(68, 93, 251, 1);
color: white;
font-size: 16px;
}
}
}
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment