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

fix

Browse Source
master
yujialong 10 months ago
parent 3a48b8e2af
commit 433cdbe421
9 changed files with 38 additions and 26 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
      config/request.js
  2. 2
      other/follow/follow.vue
  3. 2
      other/procureDetail/procureDetail.vue
  4. 1
      other/registeredActivity/registeredActivity.vue
  5. 9
      other/vouchers/vouchers.vue
  6. 16
      pages/index/index.vue
  7. 23
      pages/login/login.vue
  8. 5
      pages/person/person.vue
  9. 4
      team/auth/auth.vue

2
config/request.js
Unescape View File

@ -5,7 +5,7 @@
*/ */
export default { export default {
// 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'

2
other/follow/follow.vue
Unescape View File

@ -22,7 +22,7 @@
</view> </view>
<view class="actions"> <view class="actions">
<view class="star" @click.stop="collect(item)"> <view class="star" @click.stop="collect(item)">
<uni-icons class="star-icon" color="#ffcf47" :type="item.whetherAttention ? 'star' : 'star-filled'" size="25" @click.stop="collect(item)"></uni-icons> <uni-icons class="star-icon" color="#ffcf47" :type="item.whetherAttention ? 'star-filled' : 'star'" size="25" @click.stop="collect(item)"></uni-icons>
{{ item.whetherAttention ? '取消关注' : '关注' }} {{ item.whetherAttention ? '取消关注' : '关注' }}
</view> </view>
<view class="order" @click.stop="toOrder(item)">我想采购</view> <view class="order" @click.stop="toOrder(item)">我想采购</view>

2
other/procureDetail/procureDetail.vue
Unescape View File

@ -17,7 +17,7 @@
<view v-for="(item, i) in info.orderItemDtos" :key="i" class="item"> <view v-for="(item, i) in info.orderItemDtos" :key="i" class="item">
<view class="prod"> <view class="prod">
<view class="name">{{ item.prodName}}</view> <view class="name">{{ item.prodName}}</view>
<view class="price">￥{{ item.price }}</view> <view class="price">{{ item.price ? '￥' + item.price : '面议' }}</view>
</view> </view>
<text class="count">{{ item.prodCount }}件</text> <text class="count">{{ item.prodCount }}件</text>
</view> </view>

1
other/registeredActivity/registeredActivity.vue
Unescape View File

@ -38,6 +38,7 @@
</uni-swipe-action-item> </uni-swipe-action-item>
</uni-swipe-action> </uni-swipe-action>
</view> </view>
<empty v-else text="暂无数据"></empty>
</view> </view>
<uni-popup ref="popup" type="dialog"> <uni-popup ref="popup" type="dialog">

9
other/vouchers/vouchers.vue
Unescape View File

@ -2,11 +2,11 @@
<view class="page"> <view class="page">
<ul class="tab-wrap"> <ul class="tab-wrap">
<scroll-view scroll-x :scroll-left="scrollLeft" class="tab tab-scroll"> <scroll-view scroll-x :scroll-left="scrollLeft" class="tab tab-scroll">
<li v-for="(tab, i) in tabs" :key="i" :class="{active: curTab === tab.id}" @click="tabChange(tab)">{{ tab.name }}</li> <li v-for="(tab, i) in tabs" :key="i" :class="{active: curTab === tab.id}" @click="tabChange(tab.id)">{{ tab.name }}</li>
</scroll-view> </scroll-view>
</ul> </ul>
<view class="list"> <view v-if="list.length && curTab === 1" class="list">
<view v-for="(item, i) in list" :key="i" class="item"> <view v-for="(item, i) in list" :key="i" class="item">
<view class="texts"> <view class="texts">
<view class="name">{{ item.competitionName }}</view> <view class="name">{{ item.competitionName }}</view>
@ -15,6 +15,7 @@
<view :class="['use', {ing: item.status}]" @click.stop="use(item)">{{ item.status === 1 ? '电子入场券' : '使用' }}</view> <view :class="['use', {ing: item.status}]" @click.stop="use(item)">{{ item.status === 1 ? '电子入场券' : '使用' }}</view>
</view> </view>
</view> </view>
<empty v-else text="暂无数据"></empty>
<uni-popup ref="popup" type="dialog"> <uni-popup ref="popup" type="dialog">
<view class="sign-popup"> <view class="sign-popup">
@ -151,8 +152,8 @@
this.info = result this.info = result
}, },
// tab切换 // tab切换
tabChange(tab) { tabChange(id) {
this.curTab = tab.id this.curTab = id
this.initList() this.initList()
}, },
// 展示电子券 // 展示电子券

16
pages/index/index.vue
Unescape View File

@ -3,6 +3,7 @@
<view class="page"> <view class="page">
<!-- <view class="bg"></view> --> <!-- <view class="bg"></view> -->
<view class="search-wrap" :style="{paddingRight: menuBtnInfo.width + 8 + 'px', paddingTop: menuBtnInfo.top + 'px'}"> <view class="search-wrap" :style="{paddingRight: menuBtnInfo.width + 8 + 'px', paddingTop: menuBtnInfo.top + 'px'}">
<image class="logo" src="http://124.71.79.122/images/logo2.png" mode="widthFix"></image>
<uni-search-bar class="search" radius="30" placeholder="请输入" v-model="keyword" clearButton="auto" cancelButton="none" @confirm="initList" /> <uni-search-bar class="search" radius="30" placeholder="请输入" v-model="keyword" clearButton="auto" cancelButton="none" @confirm="initList" />
</view> </view>
@ -10,7 +11,7 @@
<uni-swiper-dot class="swiper" v-if="banners.length" :current="curBanner" :info="banners" field="id" mode="round" :dotsStyles="dotsStyles"> <uni-swiper-dot class="swiper" v-if="banners.length" :current="curBanner" :info="banners" field="id" mode="round" :dotsStyles="dotsStyles">
<swiper class="swiper-box" autoplay @change="bannerChange"> <swiper class="swiper-box" autoplay @change="bannerChange">
<swiper-item v-for="(item, i) in banners" :key="i"> <swiper-item v-for="(item, i) in banners" :key="i">
<image class="pic" :src="item.coverUrl"></image> <image class="pic" :src="item.coverUrl" @click="toLink(item, 1)"></image>
</swiper-item> </swiper-item>
</swiper> </swiper>
</uni-swiper-dot> </uni-swiper-dot>
@ -26,7 +27,7 @@
<uni-swiper-dot class="swiper" v-if="hots.length" :current="curHot" :info="hots" field="id" mode="round" :dotsStyles="dotsStyles1"> <uni-swiper-dot class="swiper" v-if="hots.length" :current="curHot" :info="hots" field="id" mode="round" :dotsStyles="dotsStyles1">
<swiper class="swiper-box" autoplay @change="hotChange"> <swiper class="swiper-box" autoplay @change="hotChange">
<swiper-item v-for="(item, i) in hots" :key="i"> <swiper-item v-for="(item, i) in hots" :key="i">
<image class="hot" :src="item.coverUrl" @click="toLink(item)"></image> <image class="hot" :src="item.coverUrl" @click="toLink(item, 0)"></image>
</swiper-item> </swiper-item>
</swiper> </swiper>
</uni-swiper-dot> </uni-swiper-dot>
@ -134,7 +135,6 @@
}, },
onShow() { onShow() {
// #ifdef MP-WEIXIN // #ifdef MP-WEIXIN
console.log(33, uni.getMenuButtonBoundingClientRect())
this.menuBtnInfo = uni.getMenuButtonBoundingClientRect() this.menuBtnInfo = uni.getMenuButtonBoundingClientRect()
// .top + 8 + 'px' // .top + 8 + 'px'
// #endif // #endif
@ -255,9 +255,9 @@
this.curHot = e.detail.current; this.curHot = e.detail.current;
}, },
// 跳转链接 // 跳转链接
toLink(item) { toLink(item, type) {
// details 1: 详情，2：链接 // details 1: 详情，2：链接 (爆款才有详情，banner只有链接)
if (item.details === '1') { if (item.details === '1' && !type) {
this.$util.to('/other/hotDetail/hotDetail?id=' + item.id) this.$util.to('/other/hotDetail/hotDetail?id=' + item.id)
} else { } else {
// link 1小程序内链接，2外连接 // link 1小程序内链接，2外连接
@ -355,6 +355,10 @@
/deep/.search-wrap { /deep/.search-wrap {
padding-bottom: 30rpx; padding-bottom: 30rpx;
background-color: $uni-primary; background-color: $uni-primary;
.logo {
width: 70rpx;
margin: 0 10rpx 0 10rpx;
}
.uni-searchbar { .uni-searchbar {
padding: 0 10rpx !important; padding: 0 10rpx !important;
} }

23
pages/login/login.vue
Unescape View File

@ -1,7 +1,7 @@
<template> <template>
<view class="page"> <view class="page">
<view class="wrap"> <view class="wrap">
<!-- <image class="logo" src="@/static/image/logo.png" mode="widthFix"></image> --> <image class="logo" src="http://124.71.79.122/images/logo1.png" mode="widthFix"></image>
<view class="hello">幼教产业B2B产业平台登录</view> <view class="hello">幼教产业B2B产业平台登录</view>
<template v-if="isLogin"> <template v-if="isLogin">
<button class="btn phone" open-type="getPhoneNumber" @getphonenumber="onGetPhoneNumber"> <button class="btn phone" open-type="getPhoneNumber" @getphonenumber="onGetPhoneNumber">
@ -59,9 +59,9 @@
<view class="avatar-wrap"> <view class="avatar-wrap">
<button class="avatar-btn" open-type="chooseAvatar" @chooseavatar="onChooseAvatar"> <button class="avatar-btn" open-type="chooseAvatar" @chooseavatar="onChooseAvatar">
<image class="avatar" :src="avatar ? avatar : Common.avatar" mode=""></image> <image class="avatar" :src="avatar ? avatar : Common.avatar" mode=""></image>
<view class="btn">选择头像</view>
</button> </button>
<view class="text">请选择头像</view> <view class="next" @click="showPlatform">下一步</view>
<view class="btn" @click="showPlatform">下一步</view>
</view> </view>
</uni-popup> </uni-popup>
</view> </view>
@ -92,6 +92,7 @@
teamName: '', teamName: '',
// avatar: Common.avatar, // avatar: Common.avatar,
avatar: '', avatar: '',
clickNum: 0,
} }
}, },
onShow() { onShow() {
@ -320,13 +321,13 @@
.wrap { .wrap {
position: relative; position: relative;
height: 60vh; height: 60vh;
padding: 214rpx 74rpx 28rpx; padding: 190rpx 74rpx 28rpx;
margin: 0 61rpx; margin: 0 61rpx;
text-align: center; text-align: center;
background-color: #fff; background-color: #fff;
border-radius: 20rpx; border-radius: 20rpx;
.logo { .logo {
width: 393rpx; width: 200rpx;
} }
.hello { .hello {
margin: 36rpx 0; margin: 36rpx 0;
@ -460,13 +461,13 @@
} }
.avatar-wrap { .avatar-wrap {
padding: 30rpx 0; padding: 30rpx 0;
text-align: center;
.avatar-btn { .avatar-btn {
padding: 0; padding: 0;
line-height: 0; line-height: normal;
border: 0 !important; border: 0 !important;
background-color: transparent; background-color: transparent;
outline: none; outline: none;
border-radius: 50%;
&:after { &:after {
display: none; display: none;
} }
@ -483,16 +484,20 @@
text-align: center; text-align: center;
color: #7d7d7d; color: #7d7d7d;
} }
.btn { .btn {
width: 300rpx; width: 300rpx;
padding: 20rpx 0; padding: 20rpx 0;
margin: 30rpx auto 0; margin: 5rpx auto 0;
font-size: 28rpx; font-size: 28rpx;
color: #fff; color: #fff;
text-align: center; text-align: center;
background-color: $uni-primary; background-color: $uni-primary;
border-radius: 20px; border-radius: 20px;
} }
.next {
margin-top: 30rpx;
font-size: 26rpx;
color: #9e9e9e;
}
} }
</style> </style>

5
pages/person/person.vue
Unescape View File

@ -181,7 +181,6 @@
}, },
enterInfo: {}, enterInfo: {},
headerTop: 0, headerTop: 0,
auditStatus: '',
isMember: true, // 成员标识 isMember: true, // 成员标识
curAccount: { curAccount: {
account: '' account: ''
@ -209,6 +208,7 @@
// #endif // #endif
this.platformId = uni.getStorageSync('platformId') this.platformId = uni.getStorageSync('platformId')
this.per = true this.per = true
this.enterInfo = {}
this.enterDisabled = 0 this.enterDisabled = 0
this.getInfo() this.getInfo()
this.getEnterInfo() this.getEnterInfo()
@ -238,7 +238,7 @@
// 团队信息 // 团队信息
const org = result.organizationInfoList.filter(e => !e.isEnable) const org = result.organizationInfoList.filter(e => !e.isEnable)
if (org && org.length) { if (org && org.length) {
if (this.teams) { if (org.length) {
/** /**
* @description 如果是第一次进，则默认选中第一个团队，并把该团队的信息存入缓存 * @description 如果是第一次进，则默认选中第一个团队，并把该团队的信息存入缓存
* 或者团队列表里没有该id，则说明超管已经被转让，也需要重新选中团队 * 或者团队列表里没有该id，则说明超管已经被转让，也需要重新选中团队
@ -304,7 +304,6 @@
async getEnterInfo() { async getEnterInfo() {
const { data } = await enterpriseCertificationStatus(this.openId) const { data } = await enterpriseCertificationStatus(this.openId)
if (data) { if (data) {
this.auditStatus = Common.authenticationStatus.find(e => e.id === data.authenticationStatus).name
this.enterInfo = data this.enterInfo = data
} }
}, },

4
team/auth/auth.vue
Unescape View File

@ -195,7 +195,9 @@
uni.hideLoading() uni.hideLoading()
this.publicNotice() this.publicNotice()
} catch(e) { } catch(e) {
uni.hideLoading() setTimeout(() => {
uni.hideLoading()
}, 1500)
this.submiting = false this.submiting = false
} }
}, },

Write Preview
Loading…
Cancel
Save