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

fix

Browse Source
master
yujialong 11 months ago
parent 8fff33bfb2
commit b675fda8c9
9 changed files with 151 additions and 97 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      apis/modules/supplier.js
  2. 16
      apis/modules/user.js
  3. 4
      config/request.js
  4. 4
      other/activityDetail/activityDetail.vue
  5. 144
      other/supplierDetail/supplierDetail.vue
  6. 5
      pages.json
  7. 34
      pages/person/person.vue
  8. 29
      team/auth/auth.vue
  9. 8
      team/infoEdit/infoEdit.vue

2
apis/modules/supplier.js
Unescape View File

@ -2,5 +2,5 @@ import request from '@/apis/request.js'
const { get, post } = request const { get, post } = request
export const selectEnterpriseCertificationList = (data) => { export const selectEnterpriseCertificationList = (data) => {
return post('users/enterprise/certification/selectEnterpriseCertificationList', data) return post('nakadai/enterprise/certification/selectEnterpriseCertificationList', data)
} }

16
apis/modules/user.js
Unescape View File

@ -8,22 +8,22 @@ export const kindergartenWeChatApplication = (data) => {
return post('nakadai/kindergarten/platformTeamAccount/kindergartenWeChatApplication', data) return post('nakadai/kindergarten/platformTeamAccount/kindergartenWeChatApplication', data)
} }
export const realNameAuthentication = (data) => { export const realNameAuthentication = (data) => {
return post(`users/users/autonym/realNameAuthentication`, data) return post(`nakadai/users/autonym/realNameAuthentication`, data)
} }
export const faceAuthentication = (data) => { export const faceAuthentication = (data) => {
return post(`users/users/autonym/faceAuthentication?imgFile=${data.imgFile}&side=${data.side}`) return post(`nakadai/users/autonym/faceAuthentication?imgFile=${data.imgFile}&side=${data.side}`)
} }
export const authenticationOrNot = () => { export const authenticationOrNot = () => {
return post(`users/users/autonym/authenticationOrNot`) return post(`nakadai/users/autonym/authenticationOrNot`)
} }
export const businessLicensePictureVerification = (imgFile) => { export const businessLicensePictureVerification = (imgFile) => {
return post(`users/users/autonym/businessLicensePictureVerification?imgFile=${imgFile}`) return post(`nakadai/users/autonym/businessLicensePictureVerification?imgFile=${imgFile}`)
} }
export const creditCodeAuthentication = (data) => { export const creditCodeAuthentication = (data) => {
return post(`users/users/autonym/creditCodeAuthentication`, data) return post(`nakadai/users/autonym/creditCodeAuthentication`, data)
} }
export const organizationCertification = (data) => { export const organizationCertification = (data) => {
return post(`users/users/autonym/organizationCertification`, data) return post(`nakadai/users/autonym/organizationCertification`, data)
} }
export const updateTeamInfo = (data) => { export const updateTeamInfo = (data) => {
return post(`nakadai/kindergarten/platformTeamAccount/updateTeamInfo`, data) return post(`nakadai/kindergarten/platformTeamAccount/updateTeamInfo`, data)
@ -35,10 +35,10 @@ export const viewUserDetails = (data) => {
return get(`users/users/userAccount/viewUserDetails`, data) return get(`users/users/userAccount/viewUserDetails`, data)
} }
export const enterpriseCertificationStatus = (openId) => { export const enterpriseCertificationStatus = (openId) => {
return post(`users/enterprise/certification/enterpriseCertificationStatus?openId=${openId}`) return post(`nakadai/enterprise/certification/enterpriseCertificationStatus?openId=${openId}`)
} }
export const saveCertification = (data) => { export const saveCertification = (data) => {
return post(`users/enterprise/certification/save`, data) return post(`nakadai/enterprise/certification/save`, data)
} }

4
config/request.js
Unescape View File

@ -6,8 +6,8 @@
export default { export default {
// baseURL: 'https://huorantech.cn/', // baseURL: 'https://huorantech.cn/',
baseURL: 'http://192.168.31.51:10010/', // baseURL: 'http://192.168.31.217:10010/',
// baseURL: 'http://124.71.79.122/', baseURL: 'http://124.71.79.122/',
headers: { headers: {
'Content-Type': 'application/json;charset=UTF-8' 'Content-Type': 'application/json;charset=UTF-8'
}, },

4
other/activityDetail/activityDetail.vue
Unescape View File

@ -50,9 +50,6 @@
<image class="avatar" :src="item.userAvatars || Common.avatar"></image> <image class="avatar" :src="item.userAvatars || Common.avatar"></image>
<view class="name">{{ item.username }}</view> <view class="name">{{ item.username }}</view>
</view> </view>
<view class="meta">组织名称：</view>
<view class="meta">手机号：{{ item.phone }}</view>
</view> </view>
</view> </view>
@ -275,7 +272,6 @@
.top { .top {
display: flex; display: flex;
align-items: center; align-items: center;
margin-bottom: 20rpx;
} }
.avatar { .avatar {
width: 60rpx; width: 60rpx;

144
other/supplierDetail/supplierDetail.vue
Unescape View File

@ -2,48 +2,65 @@
<view class="wrap"> <view class="wrap">
<view class="top"> <view class="top">
<view class="name">{{ form.classificationName }}</view> <view class="name">{{ form.classificationName }}</view>
<view class="slogan" v-html="form.slogan"></view>
</view> </view>
<view class="detail"> <view class="block">
<ul class="tabs"> <ul class="tabs">
<li :class="{active: curTab === 0}" @click="tabChange(0)">主页</li> <li :class="{active: curTab === 0}" @click="tabChange(0)">主页</li>
<li :class="{active: curTab === 1}" @click="tabChange(1)">商品</li> <li :class="{active: curTab === 1}" @click="tabChange(1)">商品</li>
</ul> </ul>
</view>
<view v-if="!curTab" class="detail"> <view v-if="!curTab" class="detail">
<view class="title">公司简介</view> <view class="title">公司简介</view>
<view v-html="form.briefIntroduction"></view> <uni-swiper-dot class="pics" :info="desPics" :current="curPic" mode="round" :dots-styles="dotsStyles">
</view> <swiper class="swiper-box" @change="picChange">
<view v-else class="list"> <swiper-item v-for="(item ,i) in desPics" :key="i">
<!-- <view class="item"> <image class="pic" :src="item"></image>
<image class="pic" src="@/static/image/info-bg.jpg"></image> </swiper-item>
<view class="texts"> </swiper>
<view class="name">测试标题</view> </uni-swiper-dot>
<view class="price">￥12.8</view> <view class="des" v-html="form.briefIntroduction"></view>
</view>
</view> </view>
<view class="item">
<image class="pic" src="@/static/image/info-bg.jpg"></image> <view v-else class="list">
<view class="texts"> <!-- <view class="item">
<view class="name">测试标题</view> <image class="pic" src="@/static/image/info-bg.jpg"></image>
<view class="price">￥12.8</view> <view class="texts">
<view class="name">测试标题</view>
<view class="price">￥12.8</view>
</view>
</view> </view>
</view> <view class="item">
<view class="item"> <image class="pic" src="@/static/image/info-bg.jpg"></image>
<image class="pic" src="@/static/image/info-bg.jpg"></image> <view class="texts">
<view class="texts"> <view class="name">测试标题</view>
<view class="name">测试标题</view> <view class="price">￥12.8</view>
<view class="price">￥12.8</view> </view>
</view> </view>
</view> <view class="item">
<view class="item"> <image class="pic" src="@/static/image/info-bg.jpg"></image>
<image class="pic" src="@/static/image/info-bg.jpg"></image> <view class="texts">
<view class="texts"> <view class="name">测试标题</view>
<view class="name">测试标题</view> <view class="price">￥12.8</view>
<view class="price">￥12.8</view> </view>
</view> </view>
</view> --> <view class="item">
<image class="pic" src="@/static/image/info-bg.jpg"></image>
<view class="texts">
<view class="name">测试标题</view>
<view class="price">￥12.8</view>
</view>
</view> -->
</view>
</view>
<view class="block">
<view class="title">联系我们</view>
<view class="">
</view>
</view> </view>
</view> </view>
</template> </template>
@ -55,32 +72,19 @@
return { return {
teamId: '', teamId: '',
curTab: 0, curTab: 0,
tabs: [
{
name: '详情介绍',
id: 0
},
{
name: '界面图',
id: 1
},
{
name: '参数',
id: 2
}
],
form: { form: {
classificationName: '', classificationName: '',
slogan: '',
briefIntroduction: '' briefIntroduction: ''
}, },
shopCartTotal: 0, desPics: [],
types: [], curPic: 0,
dotsStyles: { dotsStyles: {
backgroundColor: 'rgba(83, 200, 249,0.3)', backgroundColor: 'rgba(83, 200, 249,0.3)',
border: '1px rgba(83, 200, 249,0.3) solid', border: '1px rgba(83, 200, 249,0.3) solid',
color: '#fff', color: '#fff',
selectedBackgroundColor: 'rgba(83, 200, 249,0.9)', selectedBackgroundColor: 'rgba(255, 255, 249,0.9)',
selectedBorder: '1px rgba(83, 200, 249,0.9) solid' selectedBorder: '1px rgba(251, 251, 251,0.9) solid'
}, },
mpStyle: { mpStyle: {
p: 'font-size: 25rpx !important;font-family: Microsoft Yahei !important;font-weight: 400 !important;color: #333 !important;', p: 'font-size: 25rpx !important;font-family: Microsoft Yahei !important;font-weight: 400 !important;color: #333 !important;',
@ -103,9 +107,20 @@
const res = await queryTeamInfo({ const res = await queryTeamInfo({
teamId: this.teamId teamId: this.teamId
}) })
this.form = res.teamInfo const data = res.teamInfo
if (data) {
// 处理描述图片
if (data.pictureUrl) {
this.desPics = data.pictureUrl.split(',')
}
}
this.form = data
uni.hideLoading() uni.hideLoading()
}, },
// 描述图片切换
picChange(e) {
this.curPic = e.detail.current;
},
// tab切换 // tab切换
tabChange(id) { tabChange(id) {
this.curTab = id this.curTab = id
@ -122,6 +137,11 @@
padding: 20rpx; padding: 20rpx;
.name { .name {
font-size: 30rpx; font-size: 30rpx;
font-weight: 600;
}
.slogan {
margin: 20rpx 0;
font-size: 28rpx;
} }
} }
.tabs { .tabs {
@ -148,11 +168,27 @@
} }
} }
} }
.block {
padding: 24rpx;
}
.detail { .detail {
padding: 34rpx 32rpx; .title {
margin: 16rpx 0; margin-bottom: 20rpx;
border-radius: 20px; font-size: 28rpx;
background-color: #fff; font-weight: 600;
}
.pics {
margin: 20rpx 0;
.pic {
width: 100%;
height: 300rpx;
}
}
.des {
margin-top: 20rpx;
font-size: 26rpx;
line-height: 1.6;
}
} }
.list { .list {
display: flex; display: flex;

5
pages.json
Unescape View File

@ -212,11 +212,6 @@
"iconPath": "static/image/tab2.png", "iconPath": "static/image/tab2.png",
"selectedIconPath": "static/image/tab2-1.png", "selectedIconPath": "static/image/tab2-1.png",
"text": "供应商" "text": "供应商"
},{
"pagePath": "pages/shop/shop",
"iconPath": "static/image/tab3.png",
"selectedIconPath": "static/image/tab3-1.png",
"text": "商城"
}, { }, {
"pagePath": "pages/person/person", "pagePath": "pages/person/person",
"iconPath": "static/image/tab4.png", "iconPath": "static/image/tab4.png",

34
pages/person/person.vue
Unescape View File

@ -14,14 +14,18 @@
<button class="avatar-btn" open-type="chooseAvatar" @chooseavatar="onChooseAvatar"> <button class="avatar-btn" open-type="chooseAvatar" @chooseavatar="onChooseAvatar">
<image class="avatar" :src="info.userAvatars" mode=""></image> <image class="avatar" :src="info.userAvatars" mode=""></image>
</button> </button>
<view class="text"> <view>
<view class="name">{{ info.userName || userName }}</view> <view class="person">
<view class="name">{{ info.userName || userName }}</view>
<view class="auth" @click="toAuth">
{{ info.authentication }}
<uni-icons class="icon" type="right" size="16" color="#4876f9"></uni-icons>
</view>
</view>
<view class="phone">{{ curAccount.account || info.phone }}</view> <view class="phone">{{ curAccount.account || info.phone }}</view>
</view> </view>
<view class="auth" @click="toAuth">
{{ info.authentication }}
<uni-icons class="icon" type="right" size="16" color="#4876f9"></uni-icons>
</view>
</view> </view>
<view class="block" style="padding-bottom: 0;"> <view class="block" style="padding-bottom: 0;">
@ -128,10 +132,6 @@
<image src="https://occupationlab.com/images/preschoolEdu/icon15.png" /> <image src="https://occupationlab.com/images/preschoolEdu/icon15.png" />
<view class="text ell">我要采购</view> <view class="text ell">我要采购</view>
</li> </li>
<li @click="tips">
<image src="https://occupationlab.com/images/preschoolEdu/icon13.png" />
<view class="text ell">对账管理</view>
</li>
<template v-if="isSupplier"> <template v-if="isSupplier">
<li @click="tips"> <li @click="tips">
<image src="https://occupationlab.com/images/preschoolEdu/icon14.png" /> <image src="https://occupationlab.com/images/preschoolEdu/icon14.png" />
@ -172,7 +172,9 @@
openId: uni.getStorageSync('openId'), openId: uni.getStorageSync('openId'),
userName: uni.getStorageSync('userName'), userName: uni.getStorageSync('userName'),
teams: [], teams: [],
info: {}, info: {
authentication: ''
},
enterInfo: {}, enterInfo: {},
headerTop: 0, headerTop: 0,
auditStatus: '', auditStatus: '',
@ -360,7 +362,7 @@
} }
.info { .info {
display: flex; display: flex;
align-items: flex-start; align-items: center;
padding: 26rpx 0; padding: 26rpx 0;
.avatar-btn { .avatar-btn {
padding: 0; padding: 0;
@ -376,12 +378,13 @@
height: 100rpx; height: 100rpx;
border: 0; border: 0;
} }
.text { .person {
margin-right: 20rpx; display: flex;
align-items: center;
margin-bottom: 10rpx;
} }
.name { .name {
max-width: 49vw; max-width: 49vw;
margin-bottom: 10rpx;
font-size: 32rpx; font-size: 32rpx;
font-weight: 600; font-weight: 600;
color: #333; color: #333;
@ -394,6 +397,7 @@
display: inline-flex; display: inline-flex;
align-items: center; align-items: center;
padding: 4rpx 16rpx; padding: 4rpx 16rpx;
margin-left: 20rpx;
font-size: 24rpx; font-size: 24rpx;
color: $uni-primary; color: $uni-primary;
white-space: nowrap; white-space: nowrap;

29
team/auth/auth.vue
Unescape View File

@ -108,6 +108,28 @@
} }
}); });
}, },
// 消息推送授权
publicNotice() {
const that = this
uni.requestSubscribeMessage({
tmplIds: ['ZB6wTenlv13mivxXwi-DWwjgVoNJ6eUr1vBvNdQGbJw'],
success: (res) => {
that.$util.sucMsg('提交成功，请重新登录！')
setTimeout(() => {
uni.clearStorageSync()
that.$util.to('/pages/login/login')
}, 1500)
},
fail: function(err) {
uni.showToast({
title: err,
duration: 2000,
icon: 'error'
});
}
})
},
// 提交
async submit() { async submit() {
if (this.submiting) return false if (this.submiting) return false
const { form } = this const { form } = this
@ -147,11 +169,8 @@
classificationName: form.companyName classificationName: form.companyName
}) })
} }
this.$util.sucMsg('提交成功，请重新登录！') uni.hideLoading()
setTimeout(() => { this.publicNotice()
uni.clearStorageSync()
this.$util.to('/pages/login/login')
}, 1500)
} catch(e) { } catch(e) {
uni.hideLoading() uni.hideLoading()
this.submiting = false this.submiting = false

8
team/infoEdit/infoEdit.vue
Unescape View File

@ -123,7 +123,8 @@
provinces: [], provinces: [],
cities: [], cities: [],
desPics: [], desPics: [],
submiting: false submiting: false,
uploading: false,
} }
}, },
computed: { computed: {
@ -132,7 +133,7 @@
return this.info.platformSource === '6' ? '供应商' : this.info.platformSource === '5' ? '幼儿园' : '' return this.info.platformSource === '6' ? '供应商' : this.info.platformSource === '5' ? '幼儿园' : ''
}, },
}, },
onShow() { onLoad() {
this.getEnterInfo() this.getEnterInfo()
this.getProvince() this.getProvince()
}, },
@ -272,5 +273,8 @@
.arrow-area { .arrow-area {
display: none; display: none;
} }
.input-value, .selected-list {
padding: 0;
}
} }
</style> </style>

Write Preview
Loading…
Cancel
Save