Skip to content

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

首页加入Loadind未测试

parent 21d3670f
master
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 613 additions and 107 deletions
wx_application/src/views/mainSale/active/main/index.vue
View file @ 5fdc149f
<template>
<div class="main">
<van-loading size="80px" color="#1989fa" class="ld" v-if="overlayShow">加载中...</van-loading>
<van-overlay :show="overlayShow" />
<div class="main-manInfos">
<div class="manInfo-logos">
<img class="logos-logo" :src="test.manInfo.logoUrl" />
......@@ -224,10 +226,12 @@ export default {
userInfoResOld: "",
userInfoResNew: ""
},
flag: 1
flag: 1,
overlayShow: false
};
},
created() {
this.overlayShow = true
this.checkNowMenuBar();
if (sessionStorage.getItem("userId")) {
if (sessionStorage.getItem("avatar")) {
......@@ -554,23 +558,33 @@ export default {
},
getUserFromId(id) {
let userName = id;
getUserInfoByUserId({ userName })
.then(res => {
sessionStorage.setItem("oyStallCode", res.data[0].oyStallCode);
this.oyStallCode = res.data[0].oyStallCode;
this.getStore();
this.getFans();
this.getAllFans();
this.getNewFans();
this.getAllNewFans();
})
.catch(err => {});
getUserInfoByUserId({ userName }).then(res => {
sessionStorage.setItem("oyStallCode", res.data[0].oyStallCode)
this.oyStallCode = res.data[0].oyStallCode;
this.getStore()
this.getFans()
this.getAllFans()
this.getNewFans()
this.getAllNewFans()
this.overlayShow = false
})
.catch(err => {})
}
}
};
</script>
<style scoped>
.ld >>> .van-loading__text {
color: #fff;
}
.ld {
z-index: 1000;
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%,-50%);
}
.testCube {
width: 60px;
height: 10px;
......
ybf_admin/src/pages/in/contact/components/addGroup.vue
View file @ 5fdc149f
......@@ -7,7 +7,7 @@
:show-close="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" v-loading="formLoading" element-loading-text="加载中">
<el-form-item label="部门名称:" prop="label">
<el-input
size="small"
......@@ -27,13 +27,7 @@
style="width: 50%;"
/>
</el-form-item>
<el-form-item label="是否设置详细信息:">
<el-radio-group v-model="detail" @change="handleDetailChange">
<el-radio :label="1">是</el-radio>
<el-radio :label="2">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="门店Id:" prop="oyStallCode" v-if="detail == 1">
<el-form-item label="门店Id:" prop="oyStallCode">
<el-input
size="small"
v-model="addForm.oyStallCode"
......@@ -41,7 +35,7 @@
style="width: 50%;"
/>
</el-form-item>
<el-form-item label="门店会员id:" prop="oyStallMemberId" v-if="detail == 1">
<el-form-item label="门店会员id:" prop="oyStallMemberId" >
<el-input
size="small"
v-model="addForm.oyStallMemberId"
......@@ -49,7 +43,7 @@
style="width: 50%;"
/>
</el-form-item>
<el-form-item label="设置主管:" prop="clerkId" v-if="detail == 1">
<el-form-item label="设置主管:" prop="clerkId" >
<el-cascader :props="props" v-model="deptId" :disabled="ifDisabled" :options="parentDeptList" :show-all-levels="false" filterable style="width: 30%;margin-right:15px;" @change="handleParentChange" ></el-cascader>
<el-select v-model="addForm.clerkId" filterable multiple placeholder="请选择" style="width: 30%;" clearble>
<el-option
......@@ -107,7 +101,7 @@ export default {
group_name: "",
shop_code: "",
showTree: false,
formLoading: false,
params: {
d_name: "",
d_parentId: "",
......@@ -136,7 +130,7 @@ export default {
{ max: 50, message: "长度在50个字符以内", trigger: "blur" }
],
parentId: [{ required: true, message: "请选择上级部门", trigger: "change" }],
oyStallCode: [{ validator: idNumber, trigger: "blur" }]
oyStallCode: [{ required: true, validator: idNumber, trigger: "blur" }]
},
deptOption: {
value: 'id',
......@@ -181,7 +175,9 @@ export default {
}
},
created() {
this.formLoading = true
this.getOrgTree()
this.getDeptList()
},
methods: {
handleDpetChange(val) {
......@@ -190,21 +186,13 @@ export default {
getOrgTree() {
getOrgTree().then(res => {
this.orgTree = [res.data.organizations]
this.formLoading = false
});
},
handleDetailChange(val) {
this.deptId = ''
this.addForm.clerkId = []
this.peopleList = []
if(val == 1) {
this.getDeptList()
}
},
handleParentChange(val) {
this.addForm.clerkId = []
if(this.detail == 1) {
this.getGroupMember(val)
}
this.getGroupMember(val)
},
getDeptList() {
getWxAllDeptList()
......@@ -233,7 +221,7 @@ export default {
this.$emit("handleAddFinish")
}
}else {
this.$message.error(res.data)
this.$message.error(res.errorMsg)
}
})
......
ybf_admin/src/pages/in/contact/components/editGroup.vue
View file @ 5fdc149f
......@@ -5,10 +5,10 @@
:visible.sync="editDialog"
width="58%"
:show-close="false"
:close-on-click-modal="false"
:close-on-click-modal="false"
>
<el-form :model="addForm" label-width="auto" ref="addStore" :rules="rules" >
<el-form-item label="部门名称:" prop="label">
<el-form :model="addForm" label-width="auto" ref="addStore" :rules="rules" v-loading="formLoading" element-loading-text="数据加载中">
<el-form-item label="部门名称:" prop="label" >
<el-input
size="small"
v-model="addForm.label"
......@@ -27,21 +27,16 @@
style="width: 50%;"
/>
</el-form-item>
<el-form-item label="是否设置详细信息:">
<el-radio-group v-model="detail" @change="handleDetailChange">
<el-radio :label="1">是</el-radio>
<el-radio :label="2">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="门店Id:" prop="oyStallCode" v-if="detail == 1">
<el-form-item label="门店Id:" prop="oyStallCode" >
<el-input
size="small"
v-model="addForm.oyStallCode"
placeholder="请输入门店Id"
style="width: 50%;"
disabled
/>
</el-form-item>
<el-form-item label="门店会员id:" prop="oyStallMemberId" v-if="detail == 1">
<el-form-item label="门店会员id:" prop="oyStallMemberId" >
<el-input
size="small"
v-model="addForm.oyStallMemberId"
......@@ -49,7 +44,7 @@
style="width: 50%;"
/>
</el-form-item>
<el-form-item label="设置主管:" prop="clerkId" v-if="detail == 1">
<el-form-item label="设置主管:" prop="clerkId" >
<el-cascader :props="props" v-model="deptId" :options="parentDeptList" :disabled="ifDisabled" :show-all-levels="false" filterable style="width: 30%;margin-right:15px;" @change="handleParentChange" ></el-cascader>
<el-select v-model="addForm.clerkId" filterable multiple placeholder="请选择" style="width: 30%;" clearble>
<el-option
......@@ -139,7 +134,7 @@ export default {
{ max: 50, message: "长度在50个字符以内", trigger: "blur" },
],
parentId: [{ required: true, message: "请选择上级部门", trigger: "change" }],
oyStallCode: [{ validator: idNumber, trigger: "blur" }]
oyStallCode: [{ required: true, validator: idNumber, trigger: "blur" }]
},
deptOption: {
value: 'id',
......@@ -162,6 +157,7 @@ export default {
}
},
ifDisabled: false,
formLoading: false,
props: {
value: 'id',
children: 'children',
......@@ -190,13 +186,11 @@ export default {
},
methods: {
getDetail() {
this.formLoading = true
getDeptDetail({id:this.groupId}).then(res=> {
console.log(res,"详情")
this.addForm.clerkId = clerkId
this.addForm = res.data.organization
if(this.addForm.oyStallCode !== '' || this.addForm.oyStallMemberId !== '' || this.addForm.clerkId !== []) {
this.detail = 1
}
const clerkId = []
res.data.supervisors.forEach(item => {
clerkId.push(item.id)
......@@ -207,35 +201,28 @@ export default {
const deptId = ''
this.deptId = res.data.supervisors[0].departmentId
this.getGroupMember(this.deptId)
})
},
handleDpetChange(val) {
console.log(val,'val')
},
getOrgTree() {
getOrgTree().then(res => {
this.orgTree = [res.data.organizations]
});
},
handleDetailChange(val) {
this.deptId = ''
this.addForm.clerkId = []
this.peopleList = []
if(val == 1) {
this.getDeptList()
}
getOrgTree().then(res => {
this.orgTree = [res.data.organizations]
})
},
handleParentChange(val) {
this.addForm.clerkId = []
if(this.detail == 1) {
this.getGroupMember(val)
}
this.getGroupMember(val)
},
getDeptList() {
getWxAllDeptList()
.then(res => {
console.log(res,'全部部门')
this.parentDeptList = res.data
this.formLoading = false
})
.catch(err => {
console.log(err)
......
ybf_admin/src/pages/in/contact/mail.vue
View file @ 5fdc149f
......@@ -230,16 +230,17 @@ export default {
}
},
getGroupMember(page,ctPage) {
this.tableLoading = true
this.page.currentPage = ctPage
this.type = this.sType = 3
let params = {
pageNum: page,
id: this.groupId
};
getGroupById(params).then(res => {
this.tableData = res.data.pageInfo.list;
this.page.total = this.totalNumber = Number(res.data.pageInfo.total);
this.tableLoading = false
});
},
getStoreMember(page,ctPage) {
......
ybf_wx/src/views/sideNav/discount/index copy.vue 0 → 100644
View file @ 5fdc149f
This diff is collapsed.
ybf_wx/src/views/sideNav/discount/index.vue
View file @ 5fdc149f
......@@ -97,51 +97,18 @@ export default {
this.getAgentAuth();
// this.zReadySetVoucherList()
},
mounted() {
},
methods: {
// 测试-获取预授权码
zTestPreAuthCode() {
const basicInfo = {
head: "https://open.weixin.qq.com/connect/oauth2/authorize?",
// appId: "wwd1cdbca7b8b2b6c4",
appId: "ww4df265003b43fa0d",
redirectUrI: encodeURIComponent("oysales.oywanhao.com"),
responseType: "code",
scope: "snsapi_base",
state: "ztest",
tail: "#wechat_redirect"
};
let url =
basicInfo.head +
"appid=" +
basicInfo.appId +
"&redirect_uri=" +
basicInfo.redirectUrI +
"&response_type=" +
basicInfo.responseType +
"&scope=" +
basicInfo.scope +
"&state=" +
basicInfo.state +
basicInfo.tail;
zlog("%c--->zTestPreAuthCode: Url =", "background: orange", url);
// window.location.href = url
},
zReadyGetUserFromId() {
let postData = {
userName: this.zcache.userId
}
getUserInfoByUserId(postData)
.then(res => {
// alert(`--->userInfoFromId: res = ${JSON.stringify(res.data)}`);
// this.zcache.userInfo = String(res.data[0].departmentId);
if(res.data[0].oyStallCode == '') {
if(res.data.length == 0) {
alert('您当前没有绑定店铺')
}else {
this.zcache.storeId = res.data[0].oyStallCode
// this.zcache.storeId = Number(res.data[0].stall);
this.zReadySetVoucherList()
}
})
......@@ -155,11 +122,15 @@ export default {
mdid: this.zcache.storeId
}
getVoucherList(postData).then(res => {
if(res.result.coupons.length == 0) {
alert('当前店铺暂无优惠券可发放')
}else {
this.zVoucherSet(res.result.coupons)
}
if(res.errCode == 0) {
if(res.result.coupons.length != 0) {
}
else {
this.zVoucherSet(res.result.coupons)
}
}
})
.catch(err => {
})
......
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