Browse Source

修改bug

master
slj 4 years ago
parent
commit
93442c1336
  1. 4
      pages/topics/activity/activityDetail/index.wxss
  2. 1
      pages/topics/attract/oceanDetail/index.js
  3. 11
      pages/topics/index.js
  4. 4
      pages/topics/interactive/topicArticle/index.wxss
  5. 2
      pages/topics/reportDemand/index.wxml
  6. 7
      pages/topics/reportDemand/index.wxss
  7. 1
      pages/user/index.js
  8. 6
      pages/user/index.wxml
  9. 15
      pages/user/myFavorite/index.wxml
  10. 42
      pages/user/myInfo/index.js
  11. 10
      pages/user/myInfo/index.wxml
  12. 6
      project.config.json

4
pages/topics/activity/activityDetail/index.wxss

@ -138,8 +138,8 @@
} }
.praiseIcon{ .praiseIcon{
margin-left: 5px; margin-left: 5px;
width: 10px; width: 14px;
height: 10px; height: 14px;
} }
.section_line { .section_line {
padding: 0; padding: 0;

1
pages/topics/attract/oceanDetail/index.js

@ -105,6 +105,7 @@ Page({
}, },
//关联链接跳转 //关联链接跳转
goLinkPage(e) { goLinkPage(e) {
console.log('链接--',e)
if (e.currentTarget.dataset.association == '1') { if (e.currentTarget.dataset.association == '1') {
app.globalData.currentTab = "3" app.globalData.currentTab = "3"
wx.switchTab({ wx.switchTab({

11
pages/topics/index.js

@ -72,9 +72,8 @@ Page({
centerList: [], centerList: [],
activityList: [], activityList: [],
page: 1, page: 1,
next: true next: true,
}) })
if (!this.data.tab) { if (!this.data.tab) {
this.setData({ this.setData({
tab: '1' tab: '1'
@ -116,8 +115,6 @@ Page({
} }
}) })
} }
} }
} else { } else {
console.log('未绑定微信') console.log('未绑定微信')
@ -159,21 +156,22 @@ Page({
} }
}, },
changeTabs: function (e) { changeTabs: function (e) {
console.log('点击tab--',e)
var tab = e.detail.name; var tab = e.detail.name;
this.setData({ this.setData({
page: 1, page: 1,
next: true, next: true,
tab: tab, tab: tab,
active: tab,
topicList: [], topicList: [],
centerList: [], centerList: [],
activityList: [], activityList: [],
}) })
this.getData(tab); this.getData(tab);
}, },
getData: function (tab) { getData: function (tab) {
console.log(tab) console.log('tab--',tab)
switch (tab) { switch (tab) {
case "3": case "3":
return this.fetchCenterList() return this.fetchCenterList()
@ -232,6 +230,7 @@ Page({
//赋能中心 //赋能中心
fetchCenterList() { fetchCenterList() {
// let page = this.data.currPage; // let page = this.data.currPage;
console.log('fetchCenterList赋能中心')
var th = this; var th = this;
var page = th.data.page; var page = th.data.page;
var list = th.data.centerList; var list = th.data.centerList;

4
pages/topics/interactive/topicArticle/index.wxss

@ -165,8 +165,8 @@ image{
} }
.praiseIcon{ .praiseIcon{
margin-left: 5px; margin-left: 5px;
width: 10px; width: 14px;
height: 10px; height: 14px;
} }
.touch-item { .touch-item {

2
pages/topics/reportDemand/index.wxml

@ -34,7 +34,7 @@
<view class="select-view"> <view class="select-view">
<!-- 字体图标 --> <!-- 字体图标 -->
<view class="select-mark"> <view class="select-mark">
<text class="fa fa-navicon fa-lg"></text> <text class="fa fa-laptop fa-lg"></text>
</view> </view>
<view class="select-con"> <view class="select-con">
<text>工作单位</text> <text>工作单位</text>

7
pages/topics/reportDemand/index.wxss

@ -85,15 +85,16 @@
/* margin-bottom: 100px; */ /* margin-bottom: 100px; */
} }
.select-mark{ .select-mark{
width:15px; width:30px;
text-align: center;
} }
.select-picker{ .select-picker{
flex: 1; flex: 1;
margin:0px 20px; margin:0px 10px;
} }
.select-con{ .select-con{
margin-left:20px; margin-left:10px;
flex:1; flex:1;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;

1
pages/user/index.js

@ -349,7 +349,6 @@ Page({
if (type === 'myInfo') { if (type === 'myInfo') {
console.log('进入个人信息页面'); console.log('进入个人信息页面');
console.log(this.data.userInfo); console.log(this.data.userInfo);
wx.navigateTo({ wx.navigateTo({
url: `/pages/user/${type}/index?userIcon=${this.data.userInfo.avatarUrl}&userName=${this.data.userInfo.nickName}&userPhone=${this.data.userInfo.phone || ''}&company=${this.data.userInfo.company || ''}&position=${this.data.userInfo.position || ''}&street=${this.data.userInfo.departId || ''}&age=${this.data.userInfo.age || ''}&genderIndex=${this.data.userInfo.gender || ''}&education=${this.data.userInfo.education || ''}&professionalTitle=${this.data.userInfo.title || ''}&talentTitle=${this.data.userInfo.designation || ''}&prize=${this.data.userInfo.honor || ''}`, url: `/pages/user/${type}/index?userIcon=${this.data.userInfo.avatarUrl}&userName=${this.data.userInfo.nickName}&userPhone=${this.data.userInfo.phone || ''}&company=${this.data.userInfo.company || ''}&position=${this.data.userInfo.position || ''}&street=${this.data.userInfo.departId || ''}&age=${this.data.userInfo.age || ''}&genderIndex=${this.data.userInfo.gender || ''}&education=${this.data.userInfo.education || ''}&professionalTitle=${this.data.userInfo.title || ''}&talentTitle=${this.data.userInfo.designation || ''}&prize=${this.data.userInfo.honor || ''}`,
}) })

6
pages/user/index.wxml

@ -26,7 +26,6 @@
<text class="fa fa-angle-right fa-lg" style="margin-left:5px;"></text></van-tag> <text class="fa fa-angle-right fa-lg" style="margin-left:5px;"></text></van-tag>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
@ -34,13 +33,12 @@
<text class="fa fa-angle-right fa-lg" <text class="fa fa-angle-right fa-lg"
style="font-size:26px;margin-left:5px;margin-bottom:1px;color:rgb(178,178,178)"></text> style="font-size:26px;margin-left:5px;margin-bottom:1px;color:rgb(178,178,178)"></text>
</view> </view>
</view> </view>
<!-- wx:if="{{talentsType != 0 && talentsType != 9}}"--> <!-- wx:if="{{talentsType != 0 && talentsType != 9}}"-->
<view class="title-cell" wx:if="{{talentsType}}"> <view class="title-cell" wx:if="{{talentsType}}">
<view class="con"> <view class="con">
<view class="t">人才服务</view> <view class="t">人才服务</view>
<view class="t2" bindtap="service"><text>我的服务</text><text class="fa fa-angle-right fa-lg" <view class="t2" bindtap="service" wx:if="{{talentsType != 0 && talentsType != 9}}"><text>我的服务</text><text class="fa fa-angle-right fa-lg"
style="margin-left:5px;margin-bottom:1px;color:rgb(178,178,178);font-size: 20px;"></text></view> style="margin-left:5px;margin-bottom:1px;color:rgb(178,178,178);font-size: 20px;"></text></view>
</view> </view>
</view> </view>
@ -105,7 +103,7 @@
</swiper> </swiper>
<!--普通人才、企业人才--> <!--普通人才、企业人才-->
<swiper class="nav" indicator-dots="{{true}}" indicator-color="rgb(217,217,217)" <swiper class="nav" indicator-dots="{{false}}" indicator-color="rgb(217,217,217)"
indicator-active-color="rgb(230,208,68)" wx:if="{{talentsType == 0 || talentsType == 9}}"> indicator-active-color="rgb(230,208,68)" wx:if="{{talentsType == 0 || talentsType == 9}}">
<block wx:for="{{servicePublic}}"> <block wx:for="{{servicePublic}}">
<swiper-item> <swiper-item>

15
pages/user/myFavorite/index.wxml

@ -30,7 +30,6 @@
<view class="content"> <view class="content">
<block wx:for="{{list}}" wx:key="{{index}}"> <block wx:for="{{list}}" wx:key="{{index}}">
<block wx:if="{{item.type === '1' || item.type ==='3' || item.type ==='4'}}">
<artice-cell <artice-cell
cId="{{item.topicId}}" cId="{{item.topicId}}"
title="{{item.title}}" title="{{item.title}}"
@ -38,8 +37,16 @@
time="{{item.time}}" time="{{item.time}}"
type="{{item.type}}" type="{{item.type}}"
bind:clickListItem="clickListItem"/> bind:clickListItem="clickListItem"/>
</block> <!-- <block wx:if="{{item.type === '1' || item.type ==='3' || item.type ==='4'}}">
<block wx:else> <artice-cell
cId="{{item.topicId}}"
title="{{item.title}}"
image="{{item.topicImg}}"
time="{{item.time}}"
type="{{item.type}}"
bind:clickListItem="clickListItem"/>
</block> -->
<!-- <block wx:else>
<cell <cell
topicId="{{item.topicId}}" topicId="{{item.topicId}}"
title="{{item.title}}" title="{{item.title}}"
@ -50,7 +57,7 @@
type="{{item.type}}" type="{{item.type}}"
userIcon="{{item.userIcon || '/images/topic/avatar.png'}}" userIcon="{{item.userIcon || '/images/topic/avatar.png'}}"
bind:clickListItem="clickListItem"/> bind:clickListItem="clickListItem"/>
</block> </block> -->
</block> </block>
<e-empty empty="{{list.length <= 0}}" message="暂无内容"/> <e-empty empty="{{list.length <= 0}}" message="暂无内容"/>
</view> </view>

42
pages/user/myInfo/index.js

@ -1,8 +1,16 @@
// pages/user/myInfo/index.js // pages/user/myInfo/index.js
import { store } from '../../../utils/store.js' import {
import { config } from '../../../config.js' store
import { UserModel } from '../../../models/user.js' } from '../../../utils/store.js'
import { TopicModel } from '../../../models/topic.js' import {
config
} from '../../../config.js'
import {
UserModel
} from '../../../models/user.js'
import {
TopicModel
} from '../../../models/topic.js'
let topicModel = new TopicModel() let topicModel = new TopicModel()
let userModel = new UserModel() let userModel = new UserModel()
@ -43,7 +51,9 @@ Page({
console.log(event); console.log(event);
}, },
onClose() { onClose() {
this.setData({ close: false }); this.setData({
close: false
});
}, },
vantConfirm() { vantConfirm() {
this.setData({ this.setData({
@ -158,6 +168,7 @@ Page({
}, },
onLoad: function (options) { onLoad: function (options) {
console.log(options)
this.setData({ this.setData({
avatarUrl: options.userIcon, avatarUrl: options.userIcon,
nickName: options.userName, nickName: options.userName,
@ -169,7 +180,7 @@ Page({
genderIndex: options.genderIndex || '', genderIndex: options.genderIndex || '',
educationIndex: options.education || '', educationIndex: options.education || '',
professionalTitle: options.professionalTitle || '', professionalTitle: options.professionalTitle || '',
talentTitle:options.talentTitle || '', talentTitle: this.getTalentTitle(options.talentTitle) || '',
prize: options.prize || '', prize: options.prize || '',
}) })
topicModel.getStreetList(res => { topicModel.getStreetList(res => {
@ -184,14 +195,27 @@ Page({
}) })
resultss.forEach((value, index) => { resultss.forEach((value, index) => {
if (value.id == this.data.streetsID) { if (value.id == this.data.streetsID) {
return this.setData({streetsIndex: index+1}) return this.setData({
streetsIndex: index + 1
})
} }
}) })
}) })
}, },
getTalentTitle(item) {
switch (item) {
case '0':
return '普通人才';
case '1':
return '高层次人才'
case '2':
return '企业人才'
}
},
onTapItem(e) { onTapItem(e) {
const { type } = e.currentTarget.dataset const {
type
} = e.currentTarget.dataset
console.log('onTapItem'); console.log('onTapItem');
console.log(type); console.log(type);
console.log(e); console.log(e);

10
pages/user/myInfo/index.wxml

@ -110,13 +110,15 @@
<!-- <view slot="footer" class="msg_footer" >{{phone}}</view> --> <!-- <view slot="footer" class="msg_footer" >{{phone}}</view> -->
<input slot="footer" class="footer_input_phone" maxlength="45" value="{{professionalTitle}}" disabled placeholder="请输入" style="text-align:right;"></input> <input slot="footer" class="footer_input_phone" maxlength="45" value="{{professionalTitle}}" disabled placeholder="请输入" style="text-align:right;"></input>
</mp-cell> </mp-cell>
<mp-cell link="true" <mp-cell title="人才称号" data-type="userTalentTitle" ext-class="cell-item">
<input slot="footer" style="text-align:right;" class="footer_input_phone" maxlength="45" value="{{talentTitle}}" disabled placeholder="请输入" disabled></input>
</mp-cell>
<!-- <mp-cell link="true"
bindtap="onTapItem" data-type="userTalentTitle" bindtap="onTapItem" data-type="userTalentTitle"
title="人才称号" title="人才称号"
ext-class="cell-item"> ext-class="cell-item">
<!-- <view slot="footer" class="msg_footer" >{{phone}}</view> --> <input slot="footer" style="text-align:right;" class="footer_input_phone" maxlength="45" value="{{talentTitle}}" placeholder="请输入" disabled></input>
<input slot="footer" style="text-align:right;" class="footer_input_phone" maxlength="45" value="{{talentTitle}}" disabled placeholder="请输入"></input> </mp-cell> -->
</mp-cell>
<mp-cell link="true" <mp-cell link="true"
bindtap="onTapItem" data-type="userPrize" bindtap="onTapItem" data-type="userPrize"
title="获得奖项(荣誉)" title="获得奖项(荣誉)"

6
project.config.json

@ -22,9 +22,9 @@
"uploadWithSourceMap": true, "uploadWithSourceMap": true,
"compileHotReLoad": false, "compileHotReLoad": false,
"lazyloadPlaceholderEnable": false, "lazyloadPlaceholderEnable": false,
"useMultiFrameRuntime": true, "useMultiFrameRuntime": false,
"useApiHook": true, "useApiHook": false,
"useApiHostProcess": true, "useApiHostProcess": false,
"babelSetting": { "babelSetting": {
"ignore": [], "ignore": [],
"disablePlugins": [], "disablePlugins": [],

Loading…
Cancel
Save