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
Split 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. 146
      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
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)
}
export const realNameAuthentication = (data) => {
return post(`users/users/autonym/realNameAuthentication`, data)
return post(`nakadai/users/autonym/realNameAuthentication`, 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 = () => {
return post(`users/users/autonym/authenticationOrNot`)
return post(`nakadai/users/autonym/authenticationOrNot`)
}
export const businessLicensePictureVerification = (imgFile) => {
return post(`users/users/autonym/businessLicensePictureVerification?imgFile=${imgFile}`)
return post(`nakadai/users/autonym/businessLicensePictureVerification?imgFile=${imgFile}`)
}
export const creditCodeAuthentication = (data) => {
return post(`users/users/autonym/creditCodeAuthentication`, data)
return post(`nakadai/users/autonym/creditCodeAuthentication`, data)
}
export const organizationCertification = (data) => {
return post(`users/users/autonym/organizationCertification`, data)
return post(`nakadai/users/autonym/organizationCertification`, data)
}
export const updateTeamInfo = (data) => {
return post(`nakadai/kindergarten/platformTeamAccount/updateTeamInfo`, data)
@ -35,10 +35,10 @@ export const viewUserDetails = (data) => {
return get(`users/users/userAccount/viewUserDetails`, data)
}
export const enterpriseCertificationStatus = (openId) => {
return post(`users/enterprise/certification/enterpriseCertificationStatus?openId=${openId}`)
return post(`nakadai/enterprise/certification/enterpriseCertificationStatus?openId=${openId}`)
}
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 {
// baseURL: 'https://huorantech.cn/',
baseURL: 'http://192.168.31.51:10010/',
// baseURL: 'http://124.71.79.122/',
// baseURL: 'http://192.168.31.217:10010/',
baseURL: 'http://124.71.79.122/',
headers: {
'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>
<view class="name">{{ item.username }}</view>
</view>
<view class="meta">组织名称：</view>
<view class="meta">手机号：{{ item.phone }}</view>
</view>
</view>
@ -275,7 +272,6 @@
.top {
display: flex;
align-items: center;
margin-bottom: 20rpx;
}
.avatar {
width: 60rpx;

146
other/supplierDetail/supplierDetail.vue
Unescape View File

@ -2,48 +2,65 @@
<view class="wrap">
<view class="top">
<view class="name">{{ form.classificationName }}</view>
<view class="slogan" v-html="form.slogan"></view>
</view>
<view class="detail">
<view class="block">
<ul class="tabs">
<li :class="{active: curTab === 0}" @click="tabChange(0)">主页</li>
<li :class="{active: curTab === 1}" @click="tabChange(1)">商品</li>
</ul>
</view>
<view v-if="!curTab" class="detail">
<view class="title">公司简介</view>
<view v-html="form.briefIntroduction"></view>
</view>
<view v-else class="list">
<!-- <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 v-if="!curTab" class="detail">
<view class="title">公司简介</view>
<uni-swiper-dot class="pics" :info="desPics" :current="curPic" mode="round" :dots-styles="dotsStyles">
<swiper class="swiper-box" @change="picChange">
<swiper-item v-for="(item ,i) in desPics" :key="i">
<image class="pic" :src="item"></image>
</swiper-item>
</swiper>
</uni-swiper-dot>
<view class="des" v-html="form.briefIntroduction"></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 v-else class="list">
<!-- <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 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 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 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 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 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>
</template>
@ -55,32 +72,19 @@
return {
teamId: '',
curTab: 0,
tabs: [
{
name: '详情介绍',
id: 0
},
{
name: '界面图',
id: 1
},
{
name: '参数',
id: 2
}
],
form: {
classificationName: '',
slogan: '',
briefIntroduction: ''
},
shopCartTotal: 0,
types: [],
desPics: [],
curPic: 0,
dotsStyles: {
backgroundColor: 'rgba(83, 200, 249,0.3)',
border: '1px rgba(83, 200, 249,0.3) solid',
color: '#fff',
selectedBackgroundColor: 'rgba(83, 200, 249,0.9)',
selectedBorder: '1px rgba(83, 200, 249,0.9) solid'
selectedBackgroundColor: 'rgba(255, 255, 249,0.9)',
selectedBorder: '1px rgba(251, 251, 251,0.9) solid'
},
mpStyle: {
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({
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()
},
// 描述图片切换
picChange(e) {
this.curPic = e.detail.current;
},
// tab切换
tabChange(id) {
this.curTab = id
@ -122,6 +137,11 @@
padding: 20rpx;
.name {
font-size: 30rpx;
font-weight: 600;
}
.slogan {
margin: 20rpx 0;
font-size: 28rpx;
}
}
.tabs {
@ -148,11 +168,27 @@
}
}
}
.block {
padding: 24rpx;
}
.detail {
padding: 34rpx 32rpx;
margin: 16rpx 0;
border-radius: 20px;
background-color: #fff;
.title {
margin-bottom: 20rpx;
font-size: 28rpx;
font-weight: 600;
}
.pics {
margin: 20rpx 0;
.pic {
width: 100%;
height: 300rpx;
}
}
.des {
margin-top: 20rpx;
font-size: 26rpx;
line-height: 1.6;
}
}
.list {
display: flex;

5
pages.json
Unescape View File

@ -212,11 +212,6 @@
"iconPath": "static/image/tab2.png",
"selectedIconPath": "static/image/tab2-1.png",
"text": "供应商"
},{
"pagePath": "pages/shop/shop",
"iconPath": "static/image/tab3.png",
"selectedIconPath": "static/image/tab3-1.png",
"text": "商城"
}, {
"pagePath": "pages/person/person",
"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">
<image class="avatar" :src="info.userAvatars" mode=""></image>
</button>
<view class="text">
<view class="name">{{ info.userName || userName }}</view>
<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>
<view class="auth" @click="toAuth">
{{ info.authentication }}
<uni-icons class="icon" type="right" size="16" color="#4876f9"></uni-icons>
</view>
</view>
<view class="block" style="padding-bottom: 0;">
@ -128,10 +132,6 @@
<image src="https://occupationlab.com/images/preschoolEdu/icon15.png" />
<view class="text ell">我要采购</view>
</li>
<li @click="tips">
<image src="https://occupationlab.com/images/preschoolEdu/icon13.png" />
<view class="text ell">对账管理</view>
</li>
<template v-if="isSupplier">
<li @click="tips">
<image src="https://occupationlab.com/images/preschoolEdu/icon14.png" />
@ -172,7 +172,9 @@
openId: uni.getStorageSync('openId'),
userName: uni.getStorageSync('userName'),
teams: [],
info: {},
info: {
authentication: ''
},
enterInfo: {},
headerTop: 0,
auditStatus: '',
@ -360,7 +362,7 @@
}
.info {
display: flex;
align-items: flex-start;
align-items: center;
padding: 26rpx 0;
.avatar-btn {
padding: 0;
@ -376,12 +378,13 @@
height: 100rpx;
border: 0;
}
.text {
margin-right: 20rpx;
.person {
display: flex;
align-items: center;
margin-bottom: 10rpx;
}
.name {
max-width: 49vw;
margin-bottom: 10rpx;
font-size: 32rpx;
font-weight: 600;
color: #333;
@ -394,6 +397,7 @@
display: inline-flex;
align-items: center;
padding: 4rpx 16rpx;
margin-left: 20rpx;
font-size: 24rpx;
color: $uni-primary;
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() {
if (this.submiting) return false
const { form } = this
@ -147,11 +169,8 @@
classificationName: form.companyName
})
}
this.$util.sucMsg('提交成功，请重新登录！')
setTimeout(() => {
uni.clearStorageSync()
this.$util.to('/pages/login/login')
}, 1500)
uni.hideLoading()
this.publicNotice()
} catch(e) {
uni.hideLoading()
this.submiting = false

8
team/infoEdit/infoEdit.vue
Unescape View File

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

Write Preview
Loading…
Cancel
Save