huoran
/
FE_preschoolEdu_miniProgram
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

fix

Browse Source
master
yujialong 1 year ago
parent 36566437fc
commit 0893a628ef
10 changed files with 183 additions and 149 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      components/sideSelect/sideSelect.vue
  2. 10
      other/registeredActivity/registeredActivity.vue
  3. 10
      pages.json
  4. 6
      pages/index/index.vue
  5. 15
      pages/person/person.vue
  6. 188
      pages/supplier/supplier.vue
  7. 6
      team/auth/auth.vue
  8. 73
      team/certified/certified.vue
  9. 2
      team/info/info.vue
  10. 21
      team/infoEdit/infoEdit.vue

1
components/sideSelect/sideSelect.vue
Unescape View File

@ -21,6 +21,7 @@
methods: {
menuChange(item) {
this.cur = item.id
this.$emit('menuClick', item)
}
}
}

10
other/registeredActivity/registeredActivity.vue
Unescape View File

@ -6,7 +6,7 @@
</view>
<view class="wrap">
<sideSelect :menus="menus" />
<sideSelect :menus="menus" @menuClick="menuClick" />
<view class="list">
<uni-swipe-action>
<uni-swipe-action-item
@ -300,18 +300,18 @@
})
}
},
// 左侧分类点击回调
menuClick(e) {
}
}
}
</script>
<style scoped lang="scss">
.page {
// background-color: #fff;
}
.wrap {
display: flex;
align-items: flex-start;
margin: 0 0;
}
.list {
flex: 1;

10
pages.json
Unescape View File

@ -154,6 +154,14 @@
"navigationBarTitleText" : "信息维护",
"enablePullDownRefresh" : false
}
},
{
"path" : "certified/certified",
"style" :
{
"navigationBarTitleText" : "幼儿园认证",
"enablePullDownRefresh" : false
}
}
]
}
@ -161,7 +169,7 @@
"preloadRule": {
"pages/index/index": {
"network": "all",
"packages": ["order"]
"packages": ["other"]
}
},
"condition": { //模式配置，仅开发期间生效

6
pages/index/index.vue
Unescape View File

@ -2,7 +2,7 @@
<view :class="[{oh: !per}]">
<view class="page">
<view class="search-wrap">
<uni-search-bar class="search" radius="30" placeholder="请输入" v-model="keyword" clearButton="auto" cancelButton="none" @confirm="searchConfirm" />
<uni-search-bar class="search" radius="30" placeholder="请输入" v-model="keyword" clearButton="auto" cancelButton="none" @confirm="initList" />
<view>
<uni-icons type="notification" size="20"></uni-icons>
</view>
@ -173,10 +173,6 @@
this.$set(item, 'signing', signing)
},
// 模糊查询回调
searchConfirm() {
this.initList()
},
// 跳转活动详情
toDetail(item) {
this.$util.to('/other/activityDetail/activityDetail?id=' + item.id)

15
pages/person/person.vue
Unescape View File

@ -18,7 +18,7 @@
<view class="title">基础功能</view>
<ul class="func">
<li @click="toPage('')">
<li @click="tips">
<image src="https://occupationlab.com/images/preschoolEdu/icon1.png" />
<view class="text ell">我的电子券</view>
</li>
@ -49,7 +49,7 @@
<view class="supplier">
<view class="title">我是供应商</view>
<view class="badge">供应商负责人</view>
<view class="auth">未认证</view>
<view class="auth" @click="toPage('/team/certified/certified')">未认证</view>
</view>
</view>
@ -122,7 +122,8 @@
teams: [],
my: {
info: {
phone: ''
userName: '谢道韫',
phone: '1356413671'
},
teamInfo: {
annualMarketingFee: '',
@ -310,8 +311,8 @@
border-radius: 50%;
}
.avatar {
width: 120rpx;
height: 120rpx;
width: 100rpx;
height: 100rpx;
border: 0;
}
.text {
@ -319,11 +320,11 @@
}
.name {
margin-bottom: 10rpx;
font-size: 40rpx;
font-size: 32rpx;
color: #333;
}
.phone {
font-size: 28rpx;
font-size: 26rpx;
color: #333;
}
.tag {

188
pages/supplier/supplier.vue
Unescape View File

@ -5,32 +5,30 @@
<uni-search-bar class="search" radius="30" placeholder="请输入" v-model="keyword" clearButton="auto" cancelButton="none" @confirm="searchConfirm" />
</view>
<view class="banner">
<image class="pic" src="@/static/image/info-bg.jpg" mode="widthFix"></image>
</view>
<image class="banner" src="@/static/image/info-bg.jpg" mode="widthFix"></image>
<ul class="tab">
<li v-for="(tab, i) in tabs" :class="{active: curTab === tab.id}" @click="tabChange(tab)">{{ tab.name }}</li>
</ul>
<view class="list">
<li v-for="(item, i) in list" :key="i" @click="toDetail(item)">
<view class="pro-name">
<image class="icon" src="@/static/image/info-bg.jpg"></image>
{{ item.productName }}
</view>
<view class="info">
<view class="line">
<text class="name">产品简介：</text>
<view class="val ell-wrap">
<view class="ell">{{ item.productIntroduction }}</view>
</view>
<view class="wrap">
<sideSelect :menus="menus" @menuClick="menuClick" />
<view class="list">
<view class="item" v-for="(item, i) in list" :key="i" @click="toDetail(item)">
<view class="pro-name">
<image class="icon" src="@/static/image/info-bg.jpg"></image>
{{ item.productName }}
</view>
<view class="line">
<text class="name">产品类型：</text>
<text class="val">{{ item.typeName }}</text>
<view class="info">
<view class="line">
<text class="name">产品简介：</text>
<view class="val ell-wrap">
<view class="ell">{{ item.productIntroduction }}</view>
</view>
</view>
<view class="line">
<text class="name">产品类型：</text>
<text class="val">{{ item.typeName }}</text>
</view>
</view>
</view>
</li>
</view>
</view>
</view>
<view v-if="!per" class="per-mask">功能升级中，敬请期待...</view>
@ -46,6 +44,40 @@
return {
per: true, // 是否有权限
teamId: uni.getStorageSync('teamId') || '',
menus: [
{
id: '',
name: '全部'
},
{
id: 1,
name: '服装'
},
{
id: 2,
name: '教具'
},
{
id: 3,
name: '课程'
},
{
id: 4,
name: '家具'
},
{
id: 4,
name: '设备'
},
{
id: 4,
name: '服务'
},
{
id: 4,
name: '其它'
},
],
list: [],
keyword: '',
tags: [],
@ -69,7 +101,7 @@
this.keyword = ''
this.per = true
// this.getInfo()
// this.getShopCart()
// this.getProducts()
},
methods: {
// 初始化权限
@ -79,85 +111,6 @@
}
// this.getProducts()
},
// 查询当前角色权限
getAuth() {
uni.getStorageSync('token') && getUserRolesPermissionMenu({
teamId: this.list.find(e => e.teamId == this.teamId).partnerClassificationId,
platformId: 4
}).then(({ permissionMenu }) => {
uni.hideLoading()
const auth = []
// 生成权限数组
const generateAuth = (list, parent) => {
list.map(e => {
const name = `${parent ? parent + ':' : ''}${e.name}`
auth.push(name)
generateAuth(e.children, name)
})
}
generateAuth(permissionMenu[0].children, '')
uni.setStorageSync('auth', auth)
this.$forceUpdate()
this.initRole()
}).catch(e => {
uni.hideLoading()
uni.setStorageSync('auth', [])
this.initRole()
})
},
// 获取团队
getInfo() {
uni.showLoading({
title: '加载中'
})
getTeamsByAccountId().then(({ data }) => {
data.map(e => {
const n = e.partnerClassificationList
e.id = n.id
// parnerId是商务经理id，teamId则是下面这个，其他地方要用的话直接uni.getStorageSync('team').partnerId去使用
e.teamId = e.isTeam == 1 ? +e.partnerClassificationId : n.id
e.partnerClassificationName = n.partnerClassificationName
delete e.partnerClassificationList
})
if (data.length) {
/**
* @description 如果是第一次进，则默认选中第一个团队，并把该团队的信息存入缓存
* 或者团队列表里没有该id，则说明超管已经被转让，也需要重新选中团队
*/
if (!uni.getStorageSync('team') || !data.find(e => e.teamId == this.teamId)) {
this.teamId = data[0].teamId
uni.setStorageSync('team', data[0])
}
} else {
// 如果没有团队，则退出登录
uni.hideLoading()
uni.clearStorageSync()
uni.navigateTo({
url: '../login/login'
})
}
this.list = data
this.getAuth()
}).catch(e => {
uni.hideLoading()
})
},
// 热门标签
getTags() {
tagsList().then(res => {
this.tags = res.tagsList.slice(0, 8)
}).catch(e => {})
},
// 获取购物车数量
getShopCart() {
shoppingCartList({
pageNum: 1,
pageSize: 1000,
}).then(({ data }) => {
this.total = data.total
}).catch(e => {})
},
// 产品
getProducts() {
// 热销产品
@ -173,25 +126,10 @@
})
this.hotProducts = page.records
}).catch(e => {})
// 官方推荐
listOfGoods({
pageNum: 1,
pageSize: 5,
sort: 0,
isShelves: 0,
hotTag: 1,
selection: 1
}).then(({ page }) => {
page.records.forEach(e => {
e.productIntroduction = this.$util.removeTag(e.productIntroduction)
})
this.offcialProducts = page.records
}).catch(e => {})
},
// 模糊查询回调
searchConfirm(e) {
e.value && this.$util.to(`/order/products/products?keyword=${e.value}`)
},
// 跳转热门标签
toHot(item) {
@ -216,13 +154,17 @@
<style scoped lang="scss">
.banner {
position: relative;
.pic {
width: 100%;
}
display: block;
width: 100%;
border: 0;
}
.wrap {
display: flex;
align-items: flex-start;
}
.list {
li {
flex: 1;
.item {
padding: 24rpx;
margin: 16rpx 24rpx;
background-color: #fff;

6
team/auth/auth.vue
Unescape View File

@ -70,9 +70,9 @@
uploadYY() {
const that = this
uni.chooseImage({
success: (chooseImageRes) => {
const tempFilePaths = chooseImageRes.tempFilePaths[0];
OSS(tempFilePaths, (name) => {
success: (res) => {
const file = res.tempFilePaths[0];
OSS(file, (name) => {
that.yy = name
})
}

73
team/certified/certified.vue
Unescape View File

@ -0,0 +1,73 @@
<template>
<view>
<view class="block">
<view class="certified">
<image class="icon" src="https://occupationlab.com/images/preschoolEdu/icon7.png" mode="widthFix" />
<view class="text">您已经通过幼儿园认证</view>
</view>
<view class="form-list">
<view class="line">
<view class="name">幼儿园名称</view>
<view class="val">测试测试</view>
</view>
<view class="line">
<view class="name">统一社会信用代码</view>
<view class="val">测试测试</view>
</view>
<view class="line">
<view class="name">法人</view>
<view class="val">测试测试</view>
</view>
</view>
</view>
<view class="btn-wrap">
<view class="btn" @click="back">确定</view>
</view>
</view>
</template>
<script>
import { my } from '@/apis/modules/parner.js'
export default {
data() {
return {
}
},
onShow() {
// this.getInfo()
},
methods: {
// 获取个人信息
getInfo() {
const { partnerId, teamId } = uni.getStorageSync('team')
my({
partnerId,
teamId
}).then(({ my }) => {
this.info = my.info
}).catch(e => {})
},
// 返回
back() {
uni.navigateBack()
}
}
}
</script>
<style scoped lang="scss">
.certified {
padding: 100rpx 0;
text-align: center;
.icon {
width: 80rpx;
margin-bottom: 20rpx;
}
.text {
font-size: 26rpx;
color: #333;
}
}
</style>

2
team/info/info.vue
Unescape View File

@ -53,7 +53,7 @@
}
},
onShow() {
this.getInfo()
// this.getInfo()
},
methods: {
// 获取个人信息

21
team/infoEdit/infoEdit.vue
Unescape View File

@ -4,8 +4,8 @@
<view class="form-list">
<view class="line with-arrow">
<view class="name">LOGO</view>
<view class="val">
<image class="avatar" src="@/static/image/info-bg.jpg"></image>
<view class="val" @click="uploadLogo">
<image class="avatar" :src="logo"></image>
<uni-icons type="right" size="18" color="#ababab"></uni-icons>
</view>
</view>
@ -53,14 +53,15 @@
<script>
import { my } from '@/apis/modules/parner.js'
import OSS from '@/libs/Oss/upload'
export default {
data() {
return {
logo: 'https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png'
}
},
onShow() {
this.getInfo()
// this.getInfo()
},
methods: {
// 获取个人信息
@ -73,6 +74,18 @@
this.info = my.info
}).catch(e => {})
},
// 上传logo
uploadLogo() {
const that = this
uni.chooseImage({
success: (res) => {
const file = res.tempFilePaths[0];
OSS(file, (name) => {
that.logo = name
})
}
});
},
// 提交
submit() {

Write Preview
Loading…
Cancel
Save