Skip to content

Y
ybf
Commit e0df22c6 authored by xd's avatar xd
Browse files
Options

去掉alert

parent 52a28bce
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 132 additions and 1044 deletions
3.22.doc deleted 100644 → 0
View file @ 52a28bce
File deleted
wx_application/src/router/index.js
View file @ e0df22c6
...@@ -121,17 +121,7 @@ const routes = [ ...@@ -121,17 +121,7 @@ const routes = [
path: '/qrCode', path: '/qrCode',
name: 'qrCode', name: 'qrCode',
component: () => import('@/views/qrCode/index') component: () => import('@/views/qrCode/index')
}, }
{
path: '/manInfo',
name: 'ManInfo',
component: () => import('@/views/sideNav/manInfo/index')
},
{
path: '/goodPost',
name: 'GoodPost',
component: () => import('@/views/sideNav/goodPost/index')
},
// { // {
// path: '/about', // path: '/about',
// name: 'about', // name: 'about',
......
wx_application/src/utils/aCommon.js
View file @ e0df22c6
...@@ -196,7 +196,7 @@ function configWx(to) { ...@@ -196,7 +196,7 @@ function configWx(to) {
wx.ready(function () { wx.ready(function () {
// JS-SDK配置信息验证失败时会进入此方法 // JS-SDK配置信息验证失败时会进入此方法
wx.error(function (res) { wx.error(function (res) {
alert("JS-SDK配置信息验证失败 \r\n" + JSON.stringify(res)); // alert("JS-SDK配置信息验证失败 \r\n" + JSON.stringify(res))
}) })
// 配置成功后验证API接口在当前客户端是否支持：判断当前客户端版本是否支持指定JS接口 // 配置成功后验证API接口在当前客户端是否支持：判断当前客户端版本是否支持指定JS接口
wx.checkJsApi({ wx.checkJsApi({
...@@ -249,7 +249,7 @@ function configWx(to) { ...@@ -249,7 +249,7 @@ function configWx(to) {
// alert(`--->A: err =${JSON.stringify(res)}`) // alert(`--->A: err =${JSON.stringify(res)}`)
if (res.errMsg.indexOf('is not a function') > -1) { if (res.errMsg.indexOf('is not a function') > -1) {
alert('<i class="weui-icon-warn">版本过低请升级</i>') // alert('<i class="weui-icon-warn">版本过低请升级</i>')
} }
} }
}) })
......
wx_application/src/views/mainSale/me/main/index.vue
View file @ e0df22c6
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
<div class="list-title">任务列表</div> <div class="list-title">任务列表</div>
<img class="list-icon" :src="cache.icon.arrowRightDark" /> <img class="list-icon" :src="cache.icon.arrowRightDark" />
</div> </div>
<div class="list"><span>111</span><span>{{ userInfo }}</span></div>
<div class="list list-latest"> <div class="list list-latest">
<div class="list-title">我的收益</div> <div class="list-title">我的收益</div>
<img class="list-icon" :src="cache.icon.arrowRightDark" /> <img class="list-icon" :src="cache.icon.arrowRightDark" />
...@@ -155,7 +154,6 @@ export default { ...@@ -155,7 +154,6 @@ export default {
}, },
// 获取code // 获取code
zReadyUserId() { zReadyUserId() {
alert('没code111')
/* zlog( /* zlog(
"%c--->this.zcache.code =", "%c--->this.zcache.code =",
"color: orange;", "color: orange;",
...@@ -163,31 +161,28 @@ export default { ...@@ -163,31 +161,28 @@ export default {
) */ ) */
if (this.$route.query.code === undefined){ if (this.$route.query.code === undefined){
alert('没code') // alert('没code')
this.zTestPreAuthCode() this.zTestPreAuthCode()
} else { } else {
alert('有code') // alert('有code')
alert(this.$route.query.code)
this.zTestGetNowUrlInfo(); this.zTestGetNowUrlInfo();
this.zTestGetUserInfoByOldToken(); this.zTestGetUserInfoByOldToken();
} }
}, },
// 测试-获取当前Url信息 // 测试-获取当前Url信息
zTestGetNowUrlInfo() { zTestGetNowUrlInfo() {
alert('获取url') // alert('获取url')
this.zcache.nowUrl = JSON.stringify(this.$route.query); this.zcache.nowUrl = JSON.stringify(this.$route.query);
this.zcache.code = String(this.$route.query.code); this.zcache.code = String(this.$route.query.code);
alert(this.zcache.code)
alert(this.zcache.nowUrl)
this.url = this.zcache.nowUrl this.url = this.zcache.nowUrl
}, },
zTestPreAuthCode() { zTestPreAuthCode() {
alert('获取code') // alert('获取code')
const basicInfo = { const basicInfo = {
head: "https://open.weixin.qq.com/connect/oauth2/authorize?", head: "https://open.weixin.qq.com/connect/oauth2/authorize?",
// appId: "wwd1cdbca7b8b2b6c4", // appId: "wwd1cdbca7b8b2b6c4",
appId: "ww4df265003b43fa0d", appId: "ww4df265003b43fa0d",
redirectUrI: encodeURIComponent("qywx2.100smartdata.com:8087"), redirectUrI: encodeURIComponent("oysales.oywanhao.com:8087"),
responseType: "code", responseType: "code",
scope: "snsapi_base", scope: "snsapi_base",
state: "ztest", state: "ztest",
...@@ -212,7 +207,7 @@ export default { ...@@ -212,7 +207,7 @@ export default {
}, },
// 测试-获取用户信息 // 测试-获取用户信息
zTestGetUserInfoByOldToken() { zTestGetUserInfoByOldToken() {
alert('获取用户信息') // alert('获取用户信息')
let postData = { let postData = {
code: this.zcache.code, code: this.zcache.code,
}; };
...@@ -227,7 +222,7 @@ export default { ...@@ -227,7 +222,7 @@ export default {
headers: headerData, headers: headerData,
}) })
.then(res => { .then(res => {
alert('获取用户信息接口成功') // alert('获取用户信息接口成功')
this.userInfo = JSON.stringify(res); this.userInfo = JSON.stringify(res);
this.zcache.userInfoResNew = "RESOK:" + res.data.data.userId; this.zcache.userInfoResNew = "RESOK:" + res.data.data.userId;
sessionStorage.setItem("userId", String(res.data.data.userId)); sessionStorage.setItem("userId", String(res.data.data.userId));
......
wx_application/src/views/sideNav/discount/index.vue deleted 100644 → 0
View file @ 52a28bce
This diff is collapsed.
wx_application/src/views/sideNav/goodPost/index.vue deleted 100644 → 0
View file @ 52a28bce
<template>
<div class="main" style="display: flex;flex-direction: column;justify-content: flex-start;font-size: 14px;">
<div>建设中...</div>
</div>
</template>
<script>
import Vue from "vue";
const zlog = console.log.bind(console);
export default {
name: "goodPostIndex",
data() {
return {
};
},
created() {
},
mounted() {
},
methods: {
}
};
</script>
<style scoped>
.main {
background-color: white;
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
justify-content: start;
}
</style>
wx_application/src/views/sideNav/manInfo/index.vue deleted 100644 → 0
View file @ 52a28bce
<template>
<div class="main" style="display: flex;flex-direction: column;justify-content: flex-start;font-size: 14px;">
<div>建设中...</div>
</div>
</template>
<script>
import Vue from "vue";
const zlog = console.log.bind(console);
export default {
name: "manInfoIndex",
data() {
return {
};
},
created() {
},
mounted() {
},
methods: {
}
};
</script>
<style scoped>
.main {
background-color: white;
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
justify-content: start;
}
</style>
wx_application/src/views/sideNav/register/index.vue deleted 100644 → 0
View file @ 52a28bce
<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>
export default {
name: 'register',
data() {
return {
list:[
{
name: "会员拉新",
dsc: "推荐完成注册，完成会员拉新",
logoUrl: "/mainSale/4.png"
}
]
}
},
created() {
this.getAgentAuth();
},
mounted(){
},
methods:{
sendMessage(){
wx.invoke(
"sendChatMessage",
{
msgtype: "text", //消息类型，必填
news: {
link: `http://qywx2.100smartdata.com/register`, //H5消息页面url 必填
title: "会员拉新", //H5消息标题
desc: '注册成为欧亚会员', //H5消息摘要
imgUrl: "" //H5消息封面图片URL
}
},
function(res) {
if (res.err_msg == "sendChatMessage:ok") {
// alert("--->register.vue: zpick: h5 分享成功！");
} else if (res.err_msg != "sendChatMessage:ok") {
// alert(`--->register.vue: zpick: h5 分享失败.`);
}
}
);
}
}
}
</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>
ybf_admin/src/api/in/mail.js
View file @ e0df22c6
...@@ -116,4 +116,19 @@ export function getHistoryList(data) { ...@@ -116,4 +116,19 @@ export function getHistoryList(data) {
method: 'delete', method: 'delete',
params:data params:data
}) })
}
export function getAllPeopleList(params) {
return request({
url: '/admin/auth/addressbook/orgnization/getClerkByWXDeptId',
method: 'get',
params
})
}
export function getWxAllDeptList(params) {
return request({
url: '/admin/auth/addressbook/orgnization/getAllInWX',
method: 'get',
params
})
} }
\ No newline at end of file
ybf_admin/src/pages/in/contact/components/addGroup.vue
View file @ e0df22c6
...@@ -8,56 +8,53 @@ ...@@ -8,56 +8,53 @@
:close-on-click-modal="false" :close-on-click-modal="false"
> >
<el-form :model="addForm" label-width="auto" ref="addStore" :rules="rules" > <el-form :model="addForm" label-width="auto" ref="addStore" :rules="rules" >
<el-form-item label="部门名称:" prop="deptName"> <el-form-item label="部门名称:" prop="label">
<el-input <el-input
size="small" size="small"
v-model="addForm.deptName" v-model="addForm.label"
placeholder="请输入部门名称" placeholder="请输入部门名称"
style="width: 50%;" style="width: 50%;"
/> />
</el-form-item> </el-form-item>
<el-form-item label="上级部门:" prop="parentId">
<el-form-item label="上级部门:" prop="dept"> <!-- <div class="block">
<div class="block">
<el-cascader <el-cascader
v-model="addForm.dept" v-model="addForm.parentId"
placeholder="请选择上级部门" placeholder="请选择上级部门"
:options="options" :options="parentDeptList"
filterable filterable
style="width: 50%;" style="width: 50%;"
></el-cascader> ></el-cascader>
</div> </div> -->
<el-cascader :props="props" :options="parentDeptList" filterable ></el-cascader>
</el-form-item> </el-form-item>
<el-form-item label="门店名称:" prop="name"> <el-form-item label="门店名称:" prop="oyStallName">
<el-input <el-input
size="small" size="small"
v-model="addForm.name" v-model="addForm.oyStallName"
placeholder="请输入门店名称" placeholder="请输入门店名称"
style="width: 50%;" style="width: 50%;"
/> />
</el-form-item> </el-form-item>
<el-form-item label="门店Id:" prop="oyStallCode">
<el-form-item label="门店Id:" prop="storeId">
<el-input <el-input
size="small" size="small"
v-model="addForm.storeId" v-model="addForm.oyStallCode"
placeholder="请输入门店Id" placeholder="请输入门店Id"
style="width: 50%;" style="width: 50%;"
/> />
</el-form-item> </el-form-item>
<el-form-item label="门店会员id:" prop="oyStallMemberId">
<el-form-item label="门店会员id:" prop="memberId">
<el-input <el-input
size="small" size="small"
v-model="addForm.memberId" v-model="addForm.oyStallMemberId"
placeholder="门店会员id:" placeholder="门店会员id:"
style="width: 50%;" style="width: 50%;"
/> />
</el-form-item> </el-form-item>
<el-form-item label="设置主管:" prop="supervisor">
<el-form-item label="设置主管:" prop="director">
<el-cascader <el-cascader
v-model="director" v-model="addForm.supervisor"
placeholder="请选择主管" placeholder="请选择主管"
:options="options" :options="options"
:props="{ multiple: true }" :props="{ multiple: true }"
...@@ -66,40 +63,6 @@ ...@@ -66,40 +63,6 @@
</el-cascader> </el-cascader>
</el-form-item> </el-form-item>
</el-form> </el-form>
<!-- <div class="config_item">
<label class="config_name">部门名称</label>
<el-input class="config_value" v-model="params.d_name" placeholder="请输入部门名称" />
</div>
<div class="config_item">
<span class="config_name">上级部门</span>
<div>
<div @click="showTreeData" class="config_value father_group">
<span class="father_name_text">{{ paramsForShow.father_name }}</span>
<span :class="showTree ? 'arrow_up' : 'arrow_down'"></span>
</div>
</div>
</div>
<div class="tree_data" v-if="showTree">
<el-tree
ref="tree"
class="tree"
:check-strictly="true"
:data="treeData"
node-key="id"
@node-click="handleNodeClick"
@check-change="checkChange"
>
</el-tree>
</div>
<div class="config_item">
<label class="config_name">店铺编号</label>
<el-input class="config_value" v-model="params.code" placeholder="请输入店铺编号" />
</div>
<div class="tips" v-if="checked">请将表单填写完整</div>-->
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="handleAddCancel" size="small">取 消</el-button> <el-button @click="handleAddCancel" size="small">取 消</el-button>
<el-button type="primary" @click="handleAddFinish" size="small">确 定</el-button> <el-button type="primary" @click="handleAddFinish" size="small">确 定</el-button>
...@@ -110,7 +73,7 @@ ...@@ -110,7 +73,7 @@
</template> </template>
<script> <script>
import { addGroup, getOrgTree } from "@/api/in/mail"; import { addGroup, getWxAllDeptList, getAllMemberList,getGroupById,getAllPeopleList } from "@/api/in/mail";
import { log } from "util"; import { log } from "util";
export default { export default {
...@@ -135,11 +98,7 @@ export default { ...@@ -135,11 +98,7 @@ export default {
group_name: "", group_name: "",
shop_code: "", shop_code: "",
showTree: false, showTree: false,
paramsForShow: {
name: "",
father_name: "",
code: ""
},
params: { params: {
d_name: "", d_name: "",
d_parentId: "", d_parentId: "",
...@@ -148,33 +107,55 @@ export default { ...@@ -148,33 +107,55 @@ export default {
checked: false, checked: false,
//// ////
addForm: { addForm: {
deptName: '', label: '',
dept: '', parentId: '',
name: '', oyStallName: '',
memberId: '', oyStallMemberId: '',
storeId: '', oyStallCode: '',
director: [] supervisor: []
}, },
// 上级部门
parentDeptList: [],
peopleList: [],
rules: { rules: {
deptName: [ label: [
{ required: true, message: "请输入部门名称", trigger: "blur" }, { required: true, message: "请输入部门名称", trigger: "blur" },
{ validator: nameValidate, trigger: "blur" }, { validator: nameValidate, trigger: "blur" },
{ max: 50, message: "长度在50个字符以内", trigger: "blur" } { max: 50, message: "长度在50个字符以内", trigger: "blur" }
], ],
dept: [{ required: true, message: "请选择上级部门", trigger: "change" }] parentId: [{ required: true, message: "请选择上级部门", trigger: "change" }]
}, },
}; props: {
lazy: true,
emitPath: false,
checkStrictly: true,
lazyLoad (node, resolve) {
const { level } = node;
setTimeout(() => {
const nodes = Array.from({ length: level + 1 })
.map(item => ({
value: level.id,
label: level.label,
leaf: level >= 2
}));
// 通过调用resolve将子节点数据返回，通知组件数据加载完成
resolve(nodes);
}, 1000);
}
}
}
}, },
created() { created() {
this.getList(); this.getList();
this. getGroupMember()
}, },
methods: { methods: {
getList() { getList() {
getOrgTree() getWxAllDeptList()
.then(res => { .then(res => {
console.log(res.data.organizations); console.log(res,'全部部门')
this.treeData = [res.data.organizations]; this.parentDeptList = res.data
}) })
.catch(err => { .catch(err => {
console.log(err); console.log(err);
...@@ -190,6 +171,14 @@ export default { ...@@ -190,6 +171,14 @@ export default {
// console.log(addGroup) // console.log(addGroup)
this.$emit("handleAddFinish"); this.$emit("handleAddFinish");
}, },
// 获取所有人员
getGroupMember() {
let id = ''
getAllPeopleList({ id }).then(res => {
console.log(res,'人员')
this.peopleList = res.data
});
},
/* handleNodeClick(item, node, self) { /* handleNodeClick(item, node, self) {
// console.log(item,node,self) // console.log(item,node,self)
this.params.d_parentId = item.id; this.params.d_parentId = item.id;
......
ybf_admin/src/pages/in/contact/components/move.vue
View file @ e0df22c6
...@@ -7,52 +7,6 @@ ...@@ -7,52 +7,6 @@
:show-close="false" :show-close="false"
:close-on-click-modal="false" :close-on-click-modal="false"
> >
<!-- <div class="choose">
<div class="title">
<div class="cg">选择分组</div>
<div class="circle" @click="handleClose">
<d2-icon-svg name="close" class="icon" />
</div>
</div>
<tree-transfer
:title="title"
:button_text="['添加', '删除']"
:from_data="fromData"
:to_data="toData"
:defaultProps="{ label: 'label' }"
@addBtn="add"
@removeBtn="remove"
:mode="mode"
height="540px"
:filter="false"
openAll
>
</tree-transfer>
<div class="title">
<div class="cg">选择分组</div>
<div class="circle" @click="handleClose">
<d2-icon-svg name="close" class="icon" />
</div>
</div>
<div class="br">
<div style="text-align: center">
<el-transfer
style="text-align: left; display: inline-block"
v-model="value4"
:left-default-checked="[]"
:right-default-checked="[]"
:titles="['选择', '已选']"
:button-texts="['删除', '添加']"
@change="handleChange"
:data="data"
>
<span slot-scope="{ option }"
>{{ option.key }} - {{ option.label }}</span
>
</el-transfer>
</div>
</div>
</div> -->
<el-tree <el-tree
ref="tree" ref="tree"
class="tree" class="tree"
...@@ -97,7 +51,8 @@ export default { ...@@ -97,7 +51,8 @@ export default {
}; };
}, },
created() { created() {
this.getList(); console.log(this.idList,'idList')
this.getList()
}, },
methods: { methods: {
handleCancel() { handleCancel() {
...@@ -108,38 +63,13 @@ export default { ...@@ -108,38 +63,13 @@ export default {
let groupId = this.$refs.tree.getCheckedKeys()[0] let groupId = this.$refs.tree.getCheckedKeys()[0]
let data = { let data = {
departmentId: groupId, departmentId: groupId,
ids: this.idList ids: this.idList+""
} }
moveMember(data).then(res=> { moveMember(data).then(res=> {
this.$emit("handleFinish", false); this.$emit("handleFinish", false);
}) })
}, },
/* handleChange() {},
handleClose() {
this.$emit("handleCancel");
},
changeMode() {
if (this.mode == "transfer") {
this.mode = "addressList";
} else {
this.mode = "transfer";
}
},
add(fromData, toData, obj) {
// 树形穿梭框模式transfer时，返回参数为左侧树移动后数据、右侧树移动后数据、移动的{keys,nodes,halfKeys,halfNodes}对象
// 通讯录模式addressList时，返回参数为右侧收件人列表、右侧抄送人列表、右侧密送人列表
console.log("fromData:", fromData);
console.log("toData:", toData);
console.log("obj:", obj);
},
remove(fromData, toData, obj) {
// 树形穿梭框模式transfer时，返回参数为左侧树移动后数据、右侧树移动后数据、移动的{keys,nodes,halfKeys,halfNodes}对象
// 通讯录模式addressList时，返回参数为右侧收件人列表、右侧抄送人列表、右侧密送人列表
console.log("fromData:", fromData);
console.log("toData:", toData);
console.log("obj:", obj);
}, */
handleNodeClick(item, node, self) { handleNodeClick(item, node, self) {
//自己定义的editCheckId，防止单选出现混乱 //自己定义的editCheckId，防止单选出现混乱
this.editCheckId = item.id; this.editCheckId = item.id;
......
ybf_admin/src/pages/in/contact/mail.vue
View file @ e0df22c6
...@@ -7,13 +7,13 @@ ...@@ -7,13 +7,13 @@
<div class="ty" @click="getMailList(1)"> <div class="ty" @click="getMailList(1)">
<div> <div>
<span>全部</span> <span>全部</span>
<span class="number">{{ allNumber }}</span> <span class="number">（{{ allNumber }}）</span>
</div> </div>
</div> </div>
<div class="ty" style="margin:12px 0;" @click="getNoGroupMember(1,1)"> <div class="ty" style="margin:12px 0;" @click="getNoGroupMember(1,1)">
<div> <div>
<span>未分组</span> <span>未分组</span>
<span class="number">{{ wNumber }}</span> <span class="number">（{{ wNumber }}）</span>
</div> </div>
</div> </div>
<div class="tree"> <div class="tree">
...@@ -32,18 +32,12 @@ ...@@ -32,18 +32,12 @@
</div> </div>
<div class="right"> <div class="right">
<div class="line"> <div class="line">
<span class="number">店铺名{{groupName}}</span> <span class="number">{{groupName}}</span>
</div> </div>
<div class="line lines"> <div class="line lines">
<div > <div >
<el-button class="button button_group" size="small" @click="addChild">添加子部门</el-button <el-button class="button button_group" size="small" @click="addChild">添加子部门</el-button>
> <el-button class="button button_group" size="small" @click="addChild">编辑部门</el-button>
<el-button
class="button buttonlight"
size="small"
@click="synchronismMember"
>同步记录</el-button
>
<el-button class="button buttondark" :disabled="groupId ? false : true" size="small" @click="deleteChild">删除部门</el-button <el-button class="button buttondark" :disabled="groupId ? false : true" size="small" @click="deleteChild">删除部门</el-button
> >
</div> </div>
...@@ -60,8 +54,8 @@ ...@@ -60,8 +54,8 @@
</el-form> </el-form>
</div> </div>
<div class="line"> <div class="line">
<span class="number">全部{{totalNumber}}</span> <span class="number">全部（{{totalNumber}}）</span>
<el-button class="button buttondark" size="small" style="margin-left:20px;" @click="handleMove" :disabled="idList.length>0? false:true ">批量移动</el-button> <el-button class="button buttondark" size="small" style="margin-left:20px;" @click="handleMove" :disabled="idList.length>0? false:true">批量移动</el-button>
</div> </div>
<el-table <el-table
stripe stripe
...@@ -74,46 +68,22 @@ ...@@ -74,46 +68,22 @@
@selection-change="handleMemberChange" @selection-change="handleMemberChange"
> >
<el-table-column type="selection" width="60"></el-table-column> <el-table-column type="selection" width="60"></el-table-column>
<el-table-column <el-table-column prop="userName" label="姓名" align="center"></el-table-column>
prop="userName" <el-table-column prop="userId" label="企业微信ID" align="center"></el-table-column>
label="姓名" <el-table-column prop="oyStallName" label="门店" align="center"></el-table-column>
align="center" <el-table-column prop="oyStallCode" label="门店ID" align="center"></el-table-column>
></el-table-column> <el-table-column prop="oyStallMemberId" label="门店会员ID" align="center"></el-table-column>
<el-table-column
prop="userId"
label="企业微信ID"
align="center"
></el-table-column>
<el-table-column
prop="stall"
label="部门"
align="center"
></el-table-column>
<el-table-column prop="isManager" label="角色" align="center"> <el-table-column prop="isManager" label="角色" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.isManager == 0">普通用户</span> <span v-if="scope.row.isSupervisor == false">普通用户</span>
<span v-if="scope.row.isManager == 1">管理员</span> <span v-if="scope.row.isSupervisor == true">主管</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="mobile" label="手机号" align="center"></el-table-column>
prop="mobile" <el-table-column prop="synchronization" label="同步时间" align="center"></el-table-column>
label="手机号" <el-table-column prop="isManager" label="操作" align="center">
align="center"
></el-table-column>
<el-table-column
label="同步时间"
width="180"
align="center"
prop="synchronization"
/>
<el-table-column
prop="isManager"
label="操作"
align="center"
>
<template slot-scope="scope"> <template slot-scope="scope">
<span @click="setAdmin(scope.row)" class="setAdmin" v-if="scope.row.isManager == 0">设为管理员</span> <el-button :disabled="scope.row.isSupervisor? true:false" @click="handleSingleMove(scope.row.id)">移动</el-button>
<span @click="cancelAdmin(scope.row)" class="cancelAdmin" v-if="scope.row.isManager == 1">取消管理员</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -224,7 +194,7 @@ export default { ...@@ -224,7 +194,7 @@ export default {
this.data1 = [data.organizations]; this.data1 = [data.organizations];
}); });
}, },
handleTreeClick(data) { handleTreeClick(data) {
this.nowNode = data this.nowNode = data
this.groupName = data.label this.groupName = data.label
this.groupId = data.id this.groupId = data.id
...@@ -265,6 +235,10 @@ export default { ...@@ -265,6 +235,10 @@ export default {
handleMove() { handleMove() {
this.moveDialogShow = true; this.moveDialogShow = true;
}, },
handleSingleMove(val) {
this.moveDialogShow = true;
this.idList = [val]
},
removeFinish() { removeFinish() {
this.handleTypeChange(1,1) this.handleTypeChange(1,1)
this.moveDialogShow = false; this.moveDialogShow = false;
...@@ -305,14 +279,12 @@ export default { ...@@ -305,14 +279,12 @@ export default {
this.page.total = this.totalNumber = this.wNumber = Number(res.data.pageInfo.total); this.page.total = this.totalNumber = this.wNumber = Number(res.data.pageInfo.total);
}); });
}, },
handleMemberChange(val) { handleMemberChange(val) {
let ids = [] let ids = []
val.map(function(item) { val.map(function(item) {
ids.push(item.id) ids.push(item.id)
}); });
this.idList = ids this.idList = ids
console.log(this.idList,",");
}, },
handleTypeChange(val,ctPage) { handleTypeChange(val,ctPage) {
if(this.type == 1) { if(this.type == 1) {
......
ybf_wx/public/qrCodeV2/index.html
View file @ e0df22c6
...@@ -234,7 +234,7 @@ ...@@ -234,7 +234,7 @@
// alert(`--->qrCode: ajax: res: res =${JSON.stringify(res)}`) // alert(`--->qrCode: ajax: res: res =${JSON.stringify(res)}`)
console.log(res) console.log(res)
$('#image').attr('src', res.data) $('#image').attr('src', res.data)
// $('#image').attr('src', 'http://qywx2.100smartdata.com/qrCode/1584512690487.jpeg') // $('#image').attr('src', 'http://oysales.oywanhao.com/qrCode/1584512690487.jpeg')
}, },
error: function (data) { error: function (data) {
alert(`--->qrCode: ajax: err.`) alert(`--->qrCode: ajax: err.`)
......
ybf_wx/src/utils/aCommon.js
View file @ e0df22c6
...@@ -53,8 +53,6 @@ function isIosOrAndroid() { ...@@ -53,8 +53,6 @@ function isIosOrAndroid() {
} }
Vue.prototype.getAgentAuth = function () { Vue.prototype.getAgentAuth = function () {
zlog('%c--->IN: getAgentAuth: location.href =', 'color: orange;', location.href)
// alert(`--->zCommon.js: IN.`)
let postData = { let postData = {
// businessId: sessionStorage.getItem('businessId'), // businessId: sessionStorage.getItem('businessId'),
// pageUrl: encodeURIComponent(this.isIosOrAndroid() === 'android' ? location.href.split('#')[0] : window.initUrl) // pageUrl: encodeURIComponent(this.isIosOrAndroid() === 'android' ? location.href.split('#')[0] : window.initUrl)
...@@ -111,7 +109,7 @@ Vue.prototype.getAgentAuth = function () { ...@@ -111,7 +109,7 @@ Vue.prototype.getAgentAuth = function () {
jsApiList: ['config', 'agentConfig', 'sendChatMessage'], jsApiList: ['config', 'agentConfig', 'sendChatMessage'],
success: function (res) { success: function (res) {
if (res.errMsg != "checkJsApi:ok") { if (res.errMsg != "checkJsApi:ok") {
alert("JS-SDK接口检测失败:" + JSON.stringify(res)); // alert("JS-SDK接口检测失败:" + JSON.stringify(res));
return false; return false;
} else { } else {
wxRequest('/workWx/auth/base/getAgentJsSdkSignature', qs.stringify(postData), header) wxRequest('/workWx/auth/base/getAgentJsSdkSignature', qs.stringify(postData), header)
...@@ -130,7 +128,7 @@ Vue.prototype.getAgentAuth = function () { ...@@ -130,7 +128,7 @@ Vue.prototype.getAgentAuth = function () {
signature: agentConfig.agentJsApiSignature.signature,// 必填，签名，agentConfig所以为应用签名 signature: agentConfig.agentJsApiSignature.signature,// 必填，签名，agentConfig所以为应用签名
jsApiList: ['sendChatMessage'], //必填 jsApiList: ['sendChatMessage'], //必填
success: function (res) { success: function (res) {
alert('agentConfigSuccess') // alert('agentConfigSuccess')
// alert(`!-->zCommon.js: getJsSdkSignature: then: wx.ready: wx.checkJsApi: getAgentJsSdkSignature: wx.agentConfig: res.`) // alert(`!-->zCommon.js: getJsSdkSignature: then: wx.ready: wx.checkJsApi: getAgentJsSdkSignature: wx.agentConfig: res.`)
// alert(`!-->zCommon.js: getJsSdkSignature: then: wx.ready: wx.checkJsApi: getAgentJsSdkSignature: wx.agentConfig: res =${JSON.stringify(res)}`) // alert(`!-->zCommon.js: getJsSdkSignature: then: wx.ready: wx.checkJsApi: getAgentJsSdkSignature: wx.agentConfig: res =${JSON.stringify(res)}`)
// alert('agentConfig:ok') // alert('agentConfig:ok')
...@@ -141,7 +139,7 @@ Vue.prototype.getAgentAuth = function () { ...@@ -141,7 +139,7 @@ Vue.prototype.getAgentAuth = function () {
// alert('wx.agentConfig 回调'+res.errMsg); // alert('wx.agentConfig 回调'+res.errMsg);
}, },
fail: function (res) { fail: function (res) {
alert('agentConfigFailed') // alert('agentConfigFailed')
// alert('回调失败：'+res.errMsg) // alert('回调失败：'+res.errMsg)
if (res.errMsg.indexOf('is not a function') > -1) { if (res.errMsg.indexOf('is not a function') > -1) {
alert('<i class="weui-icon-warn">版本过低请升级</i>') alert('<i class="weui-icon-warn">版本过低请升级</i>')
...@@ -201,7 +199,6 @@ function configWx(to) { ...@@ -201,7 +199,6 @@ function configWx(to) {
wx.ready(function () { wx.ready(function () {
// JS-SDK配置信息验证失败时会进入此方法 // JS-SDK配置信息验证失败时会进入此方法
wx.error(function (res) { wx.error(function (res) {
alert("JS-SDK配置信息验证失败 \r\n" + JSON.stringify(res));
}) })
// 配置成功后验证API接口在当前客户端是否支持：判断当前客户端版本是否支持指定JS接口 // 配置成功后验证API接口在当前客户端是否支持：判断当前客户端版本是否支持指定JS接口
wx.checkJsApi({ wx.checkJsApi({
...@@ -250,9 +247,6 @@ function configWx(to) { ...@@ -250,9 +247,6 @@ function configWx(to) {
// alert('wx.agentConfig 回调'+res.errMsg); // alert('wx.agentConfig 回调'+res.errMsg);
}, },
fail: function (res) { fail: function (res) {
// alert(`--->A: err =${res}`)
// alert(`--->A: err =${JSON.stringify(res)}`)
if (res.errMsg.indexOf('is not a function') > -1) { if (res.errMsg.indexOf('is not a function') > -1) {
alert('<i class="weui-icon-warn">版本过低请升级</i>') alert('<i class="weui-icon-warn">版本过低请升级</i>')
} }
......
ybf_wx/src/views/home.vue
View file @ e0df22c6
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
head: "https://open.weixin.qq.com/connect/oauth2/authorize?", head: "https://open.weixin.qq.com/connect/oauth2/authorize?",
// appId: "wwd1cdbca7b8b2b6c4", // appId: "wwd1cdbca7b8b2b6c4",
appId: "ww4df265003b43fa0d", appId: "ww4df265003b43fa0d",
redirectUrI: encodeURIComponent("qywx2.100smartdata.com"), redirectUrI: encodeURIComponent("oysales.oywanhao.com"),
responseType: "code", responseType: "code",
scope: "snsapi_base", scope: "snsapi_base",
state: "ztest", state: "ztest",
......
ybf_wx/src/views/sideNav/discount/index.vue
View file @ e0df22c6
...@@ -102,7 +102,7 @@ export default { ...@@ -102,7 +102,7 @@ export default {
head: "https://open.weixin.qq.com/connect/oauth2/authorize?", head: "https://open.weixin.qq.com/connect/oauth2/authorize?",
// appId: "wwd1cdbca7b8b2b6c4", // appId: "wwd1cdbca7b8b2b6c4",
appId: "ww4df265003b43fa0d", appId: "ww4df265003b43fa0d",
redirectUrI: encodeURIComponent("qywx2.100smartdata.com"), redirectUrI: encodeURIComponent("oysales.oywanhao.com"),
responseType: "code", responseType: "code",
scope: "snsapi_base", scope: "snsapi_base",
state: "ztest", state: "ztest",
...@@ -143,16 +143,15 @@ export default { ...@@ -143,16 +143,15 @@ export default {
}, },
// 获取优惠券列表 // 获取优惠券列表
zReadySetVoucherList() { zReadySetVoucherList() {
alert('获取优惠券') // alert('获取优惠券')
this.zReadyDelVoucherList(); this.zReadyDelVoucherList();
const postData = { const postData = {
appCode: "0696", // j接口编码 appCode: "0696", // j接口编码
// mdid: this.zcache.storeId // mdid: this.zcache.storeId
mdid: 1 mdid: 1
} }
alert('准备进入请求优惠券列表')
getVoucherList(postData).then(res => { getVoucherList(postData).then(res => {
alert('getVoucherList') // alert('getVoucherList')
zlog("%c--->VoucherList: RD =", "background: limegreen;", res); zlog("%c--->VoucherList: RD =", "background: limegreen;", res);
this.zVoucherSet(res.result.coupons); this.zVoucherSet(res.result.coupons);
}) })
...@@ -165,7 +164,6 @@ export default { ...@@ -165,7 +164,6 @@ export default {
}, },
zVoucherPick(inActiveId, inVoucherId) { zVoucherPick(inActiveId, inVoucherId) {
alert('推送')
this.zcache.now.activeId = String(inActiveId) this.zcache.now.activeId = String(inActiveId)
this.zcache.now.voucherId = String(inVoucherId) this.zcache.now.voucherId = String(inVoucherId)
...@@ -181,7 +179,7 @@ export default { ...@@ -181,7 +179,7 @@ export default {
getVoucherWxUrl(postData).then(res => { getVoucherWxUrl(postData).then(res => {
this.zVoucherUrlSet(res.result.link) this.zVoucherUrlSet(res.result.link)
alert('获取列表成功') // alert('获取列表成功')
}); });
}, },
...@@ -199,33 +197,33 @@ export default { ...@@ -199,33 +197,33 @@ export default {
}, },
function(res) { function(res) {
if (res.err_msg == "sendChatMessage:ok") { if (res.err_msg == "sendChatMessage:ok") {
alert("--->discount.vue: zpick: text 分享成功！") // alert("--->discount.vue: zpick: text 分享成功！")
} else if (res.err_msg != "sendChatMessage:ok") { } else if (res.err_msg != "sendChatMessage:ok") {
alert('分享失败') // alert('分享失败')
} }
} }
); );
break; break;
case "h5": case "h5":
// alert(`--->discount.vue: zpick: H5: IN.`); // alert(`--->discount.vue: zpick: H5: IN.`);
alert('zpick') // alert('zpick')
wx.invoke( wx.invoke(
"sendChatMessage", "sendChatMessage",
{ {
msgtype: "news", //消息类型，必填 msgtype: "news", //消息类型，必填
news: { news: {
link: `http://qywx2.100smartdata.com/qrCode?Url=${inUrl}&activeId=${this.zcache.now.activeId}&voucherId=${this.zcache.now.voucherId}&unionId=1234`, //H5消息页面url 必填 link: `http://oysales.oywanhao.com/qrCode?Url=${inUrl}&activeId=${this.zcache.now.activeId}&voucherId=${this.zcache.now.voucherId}&unionId=1234`, //H5消息页面url 必填
title: "领取优惠券", //H5消息标题 title: "领取优惠券", //H5消息标题
desc: inUrl, //H5消息摘要 desc: inUrl, //H5消息摘要
imgUrl: inUrl //H5消息封面图片URL imgUrl: inUrl //H5消息封面图片URL
} }
}, },
function(res) { function(res) {
alert('sendChatMessage') // alert('sendChatMessage')
if (res.err_msg == "sendChatMessage:ok") { if (res.err_msg == "sendChatMessage:ok") {
alert("--->discount.vue: zpick: h5 分享成功！") // alert("--->discount.vue: zpick: h5 分享成功！")
} else if (res.err_msg != "sendChatMessage:ok") { } else if (res.err_msg != "sendChatMessage:ok") {
alert(`--->discount.vue: zpick: h5 分享失败.`) // alert(`--->discount.vue: zpick: h5 分享失败.`)
// alert( // alert(
// `--->discount.vue: zpick: h5 分享失败: res =${res.err_msg}` // `--->discount.vue: zpick: h5 分享失败: res =${res.err_msg}`
// ); // );
...@@ -238,7 +236,7 @@ export default { ...@@ -238,7 +236,7 @@ export default {
} }
}, },
zVoucherSet(inArray) { zVoucherSet(inArray) {
alert('zVoucherSet') // alert('zVoucherSet')
this.zlist.voucher = inArray; this.zlist.voucher = inArray;
}, },
......
ybf_wx/src/views/sideNav/register/index.vue
View file @ e0df22c6
...@@ -42,8 +42,8 @@ ...@@ -42,8 +42,8 @@
{ {
msgtype: "news", //消息类型，必填 msgtype: "news", //消息类型，必填
news: { news: {
link: "http://qywx2.100smartdata.com/register", //H5消息页面url 必填 link: "http://oysales.oywanhao.com/register", //H5消息页面url 必填
title: "会员拉新", //H5消息标题 title: "注册邀请", //H5消息标题
desc: "注册成为欧亚会员", //H5消息摘要 desc: "注册成为欧亚会员", //H5消息摘要
imgUrl: "" //H5消息封面图片URL imgUrl: "" //H5消息封面图片URL
} }
...@@ -56,11 +56,9 @@ ...@@ -56,11 +56,9 @@
} */ } */
}, },
function(res) { function(res) {
alert('sendChatMessage') // alert('sendChatMessage')
if (res.err_msg == "sendChatMessage:ok") { if (res.err_msg == "sendChatMessage:ok") {
// alert("--->register.vue: zpick: h5 分享成功！");
} else if (res.err_msg != "sendChatMessage:ok") { } else if (res.err_msg != "sendChatMessage:ok") {
// alert(`--->register.vue: zpick: h5 分享失败.`);
} }
} }
); );
......
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