刘晓艳 / informationPlatform · 提交

转到一个项目

作者 吴孟雨
提交 5751206509bfb0eff25371ad8abd925746a850cd 2 个父辈 d25dc799 c2714e74

Merge remote-tracking branch 'origin/liaolinfeng' into wumengyu 

# Conflicts:
#	app.json
#	project.config.json
#	wxParse/html2json.js
#	wxParse/wxParse.js
#	wxParse/wxParse.wxss
内嵌 并排对比
正在显示 100 个修改的文件 包含 490 行增加 和 235 行删除

要显示太多修改。
重新载入完整差异 差异文件 邮件补丁

为保证性能只显示 100 of 100+ 个文件。

{
"pages": [
"pages/start/start",
"pages/service/release/release",
"pages/service/service",
... ... @@ -15,6 +14,9 @@
"pages/my/commentsDetail/commentsDetail",
"pages/consult/consult",
"pages/consult/consultDetail/consultDetail",
"pages/consult/userrecommend_detail/userrecommend_detail",
"pages/consult/adminrecommend_detail/adminrecommend_detail",
"pages/consult/release_consult/release_consult",
"pages/my/myindex/myindex",
"pages/my/my",
"pages/release/release",
... ...
... ... @@ -64,7 +64,9 @@
left: 50%;
transform: translateX(-50%);
}
.wxParse-strong .WxEmojiView{
font-weight:bold;
}
/* ---------------- */
/**app.wxss**/
... ...
// pages/consult/adminrecommend_detail/adminrecommend_detail.js
const app=getApp();
var wxParse = require("../../../wxParse/wxParse.js")
Page({
/**
... ... @@ -7,8 +8,8 @@ Page({
*/
data: {
listdata:[],
id:''
id:'',
},
//getrecommend_info
getrecommend_info() {
... ... @@ -24,13 +25,13 @@ Page({
that.setData({
listdata:res
})
wxParse.wxParse('content', 'html', res.content, that, 5)
}).catch((errMsg) => {
console.log(errMsg)
})
},
/**
* 生命周期函数--监听页面加载
*/
... ...
<!--pages/consult/adminrecommend_detail/adminrecommend_detail.wxml-->
<view class='banner_box'>
<image src='{{listdata.thumbnail}}'></image>
<image src='{{listdata.thumbnail1}}'></image>
</view>
<view class='content_box'>
<view class='content_item'>
<view class='content_title'>{{listdata.title}}</view>
<view>{{listdata.content}}</view>
<!-- <view>{{listdata.content}}</view> -->
<view>
<import src="../../../wxParse/wxParse.wxml" />
<template is='wxParse' data='{{wxParseData:content.nodes}}' />
<!-- <rich-text nodes="{{html}}" bindtap="tap"></rich-text> -->
</view>
</view>
</view>
... ...
... ... @@ -29,6 +29,14 @@ Page({
})
}
},
//进入搜索页
goSearch() {
const self = this;
wx.navigateTo({
url: '/pages/service/renting/search/search'
})
},
//底部服务导航
service(e) {
... ... @@ -102,6 +110,12 @@ Page({
// url: '/pages/wish/release/release',
// })
},
//发布资讯跳转
releaseconsult(){
wx.navigateTo({
url: '../consult/release_consult/release_consult',
})
},
//底部导航心愿点击事件
wish(e) {
var tindex = e.currentTarget.dataset.tindex
... ...
<!--pages/consult/consult.wxml-->
<view class='box'>
<view class='serach_box'>
<view class='serach_box' bindtap='goSearch'>
<view class='iconfont icon-fangdajing'></view>
<view class='search_input'>
<input placeholder='请输入要搜索的服务' placeholder-class='input_size'></input>
<input placeholder='请输入要搜索的服务' placeholder-class='input_size' disabled='true'></input>
</view>
</view>
<view class=''>
<view class='item_list' style='background-image:url({{item.thumbnail}})' wx:for='{{listdata}}' wx:key='' bindtap='listDetail' id='{{item.id}}'>
<view class='list_box'>
... ... @@ -16,7 +15,7 @@
<view class='info_title'>{{item.name}}</view>
<view class='line'></view>
</view>
<view class='list_info'>全球趣玩任你挑选</view>
<view class='list_info'>{{item.description}}</view>
</view>
</view>
</view>
... ... @@ -33,7 +32,7 @@
<view class='iconfont icon-zonghe popup_zonghe'></view>
<view class='mianpopup_title'>发布服务</view>
</view>
<view class='mianpopup_item' bindtap='releaseService'>
<view class='mianpopup_item' bindtap='releaseconsult'>
<view class='iconfont icon-pinglun popup_pinglun'></view>
<view class='mianpopup_title'>发布资讯</view>
</view>
... ...
// pages/consult/consultDetail/consultDetail.js
const app=getApp();
Page({
Page({
/**
* 页面的初始数据
*/
data: {
current: 0,
current: 0,//0用户推荐,1平台推荐
moudel:false,
id:'',//进入界面的id
listdata:[],//用户推荐
listdata2:[]//平台推荐
listdata2:[],//平台推荐
userId:'',
showrent_mask:false,
currentSort:true,
sort: [{ id: 0, name: '默认排序'}, { id: 1, name: '热度排序'}],
sort_id: 0//选择的排序id,默认是0
},
//tab点击事件
chargeTab(e) {
this.setData({
... ... @@ -24,7 +28,7 @@ Page({
let that=this;
let index=e.currentTarget.dataset.index;
let listdata=that.data.listdata;
let url = 'home/home/collect';
let url = '/home/home/collect';
let params = {
id: listdata[index].id
}
... ... @@ -49,7 +53,8 @@ Page({
let that = this;
let index = e.currentTarget.dataset.index;
let listdata = that.data.listdata;
let url = 'home/home/collect_del';
let url = '/home/home/collect_del';
let params = {
id: listdata[index].id
}
... ... @@ -74,7 +79,12 @@ Page({
let that=this;
let index = e.currentTarget.dataset.index;
let listdata = that.data.listdata;
let url = '/home/home/like';
let url='';
if (listdata[index].is_paise==1){
url ='/home/home/like_del'//取消点赞
}else{
url = '/home/home/like';//点赞
}
let params = {
id: listdata[index].id
}
... ... @@ -82,15 +92,8 @@ Page({
'XX-Token': wx.getStorageSync('token')
}
app.post(url,params,header).then((res)=>{
console.log(res)
if (listdata[index].is_paise == 0) {
listdata[index].is_paise = 1
} else {
listdata[index].is_paise = 0
}
that.setData({
listdata: listdata
})
that.getuser_recommend();
}).catch((errMsg)=>{
console.log(errMsg)
})
... ... @@ -99,31 +102,132 @@ Page({
gopost(e){
let post_id=e.currentTarget.id;
wx.navigateTo({
url: '../../my/comment/comment?post_id=' + post_id,
url: '../../service/comment/comment?post_id=' + post_id + '&is_post_list=' + true,
success: function(res) {},
fail: function(res) {},
complete: function(res) {},
})
},
//显示个人信息
showInfo() {
this.setData({
moudel:true
showInfo(e) {
let that=this;
let index=e.currentTarget.dataset.index;
let listdata = this.data.listdata;
listdata[index].showlabel_box=true;
that.setData({
listdata:listdata
})
},
//举报
report(e) {
let self = this;
const current = e.currentTarget.dataset.index;
let url = '/home/home/report';
let header = {
"XX-Token": wx.getStorageSync('token')
};
let params = {
to_user_id: self.data.listdata[current].user_id,
post_id: self.data.listdata[current].id,
};
app.post(url, params, header).then((res) => {
wx.showToast({ title: '举报成功', icon: 'none' });
self.setData({
[`listdata[${current}].showlabel_box`]: false
});
})
},
//复制微信号
clickCopy(e) {
let that=this;
let index = e.currentTarget.dataset.index;
wx.setClipboardData({
data: this.data.listdata[index].wxn,
success: function (res) {
that.setData({
[`listdata[${index}].showlabel_box`]: false
});
}
});
},
//进入主页
enterHomePage(e) {
let self = this;
let current = e.currentTarget.dataset.index;
wx.navigateTo({
url: '/pages/service/myindex/myindex?user_id=' + self.data.listdata[current].user_id
});
self.setData({
[`listdata[${current}].showlabel_box`]: false
});
},
//获取用户id
personInfo() {
let url = '/home/me/index'
let header = {
"XX-Token": wx.getStorageSync('token')
}
let params = {}
app.post(url, params, header).then((res) => {
// console.log(res)
this.setData({
userId: res.id
})
console.log(this.data.userId)
})
},
//进入搜索页
goSearch() {
const self = this;
wx.navigateTo({
url: '/pages/service/renting/search/search'
})
},
//
setdown(){
let that=this;
that.setData({
showrent_mask: true,
})
},
closeMask(){
let that=this;
that.setData({
showrent_mask: false
})
},
funvoid(){
},
//(筛选)
chooseSelect(e) {
let that=this;
const current = e.currentTarget.dataset.index;
that.setData({
sort_id: that.data.sort[current].id,
showrent_mask: false
});
that.getuser_recommend();
},
//获取用户推荐
getuser_recommend(){
let that=this;
let url ='/home/consult/user_recommend';
let params={
id:that.data.id
id:that.data.id,
order: that.data.sort_id
}
let header={
'XX-Token':wx.getStorageSync('token')
}
app.post(url,params,header).then((res)=>{
let listdata=res;
for(let obj of listdata){
obj.more =JSON.parse(obj.more)
obj.showlabel_box=false
}
that.setData({
listdata:res
listdata:listdata
})
}).catch((errMsg)=>{
console.log(errMsg)
... ... @@ -140,6 +244,7 @@ Page({
"XX-Token": wx.getStorageSync('token')
}
app.post(url,params,header).then((res)=>{
that.setData({
listdata2:res
})
... ... @@ -149,14 +254,22 @@ Page({
},
//到用户推荐详情
gouserrecommend_detail(e){
//计算点击量
let url = '/home/home/hits';
let params = {
id: e.currentTarget.id,
};
let header = { "XX-Token": wx.getStorageSync('token') };
app.post(url, params, header).then((res) => {
})
wx.navigateTo({
url: '../userrecommend_detail/userrecommend_detail?id='+e.currentTarget.id,
success: function(res) {},
fail: function(res) {},
complete: function(res) {},
url: '../userrecommend_detail/userrecommend_detail?id=' + e.currentTarget.id,
success: function (res) { },
fail: function (res) { },
complete: function (res) { },
})
},
//到平台推荐详情
goadminrecommend_detail(e){
wx.navigateTo({
... ... @@ -176,6 +289,7 @@ Page({
})
that.getuser_recommend();
that.getadmin_recommend();
that.personInfo();//获取用户Id
},
/**
... ... @@ -189,9 +303,11 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow: function() {
let that=this;
that.getuser_recommend();
that.getadmin_recommend();
that.personInfo();//获取用户Id
},
/**
* 生命周期函数--监听页面隐藏
*/
... ... @@ -219,7 +335,6 @@ Page({
onReachBottom: function() {
},
/**
* 用户点击右上角分享
*/
... ...
<!--pages/consult/consultDetail/consultDetail.wxml-->
<view class='head_box'>
<view class='banner_box'>
<view class='search_box'>
<view class='search_box' bindtap='goSearch'>
<view class='iconfont icon-fangdajing'></view>
<view class='input_box'>
<input placeholder='请输入要搜索的服务' placeholder-class='font-size'></input>
<input placeholder='请输入要搜索的服务' placeholder-class='font-size' disabled='true'></input>
</view>
</view>
<view class='iconfont icon-Group-'></view>
<!--排序按钮-->
<block wx:if='{{current==0}}'>
<view class='iconfont icon-paixu-sheng' wx:if='{{showrent_mask}}' bindtap='setdown'></view>
<view class='iconfont icon-paixu-jiang' wx:else bindtap='setdown'></view>
</block>
</view>
<view class='tab_box'>
<view class="tab_item {{current==0?'active':''}}" data-current='0' bindtap='chargeTab'>用户推荐</view>
... ... @@ -16,45 +20,26 @@
</view>
<!--用户推荐-->
<view class='content_box' wx:if='{{current==0}}'>
<view class='content_item' wx:for='{{listdata}}' wx:for-item='items' wx:key id='{{items.id}}' bindtap='gouserrecommend_detail'>
<view class='content_item' wx:for='{{listdata}}' wx:for-item='items' wx:key id='{{items.id}}' bindtap='gouserrecommend_detail' >
<view class='left_box'>
<view class='head_portrait'catchtap='showInfo'>
<view class='head_portrait' catchtap='showInfo' data-index='{{index}}'>
<image src='{{items.avatar}}'></image>
</view>
<!--弹窗1-->
<view class='label_box' wx:if='{{moudel}}'>
<view class='triangle'></view>
<view class='wx_num'>微信号：
<text>961110</text>
</view>
<view class='line'>|</view>
<view class='label'>复制</view>
<view class='line'>|</view>
<view class='label'>
<text class='iconfont icon-jubao0201'></text>
<text>举报</text>
</view>
<view class='line'>|</view>
<view class='label'>
<text class='iconfont icon-jubao0201'></text>
<text>举报</text>
</view>
</view>
<!--弹窗2-->
<view class='label_box2' wx:if='{{moudel1}}'>
<view class='label_box2' wx:if='{{items.showlabel_box}}' catchtap='funvoid'>
<view class='triangle'></view>
<view class='wx_num'>微信号：
<text>961110</text>
<text>{{items.wxn}}</text>
</view>
<view class='line'>|</view>
<view class='label'>复制</view>
<view class='label' catchtap='clickCopy' data-index='{{index}}'>复制</view>
<view class='line'>|</view>
<view class='label'>
<view class='label' catchtap="enterHomePage" data-index="{{index}}">
<text class='iconfont icon-zhuye'></text>
<text>进入主页</text>
</view>
<view class='line'>|</view>
<view class='label'>
<view class='label' catchtap="report" data-index="{{index}}">
<text class='iconfont icon-jubao0201'></text>
<text>举报</text>
</view>
... ... @@ -80,20 +65,14 @@
</view>
</view>
</view>
<!-- <view class='list_info_box'>
<text>主校区 </text>
<text> 大一 </text>
<text>男生 </text>
</view> -->
<view class='list_content'>{{items.post_content}}</view>
<view class='list_img_box'>
<!--wx:for='{{items.more}}' wx:key -->
<!-- <image src='{{item.url}}'></image> -->
<image src='/images/img3.png'></image>
<image src='/images/img3.png'></image>
<view class='list_img_box' wx:if="{{item.more.photos[0].url !== ''}}">
<block wx:for="{{items.more.photos}}" wx:key="key">
<image src='{{item.url}}'></image>
</block>
</view>
<view class='list_state_box'>
<view class='time'>20分钟前</view>
<view class='time'>{{items.time}}</view>
<view>
<text catchtap='setpaise' data-index='{{index}}'>
<text class="iconfont icon-heart xin1 "></text>
... ... @@ -106,12 +85,7 @@
</view>
</view>
<view class='list_comment_box'>
<!-- <view class='comment_list'>
<text class='iconfont icon-pinglun pinglun2'></text>
<text>报答：</text>
<text class='comment_content'>请吃饭</text>
</view> -->
<view class='comment_list'>
<view class='comment_list' wx:if='{{items.is_paise != 0}}'>
<text class='iconfont icon-heart xin2'></text>
<view class='head_img_cell' wx:for='{{items.paise_user}}' wx:key >
<image src='{{item}}'></image>
... ... @@ -126,10 +100,19 @@
<view class='list_item' wx:for='{{listdata2}}' wx:key id='{{item.id}}' bindtap='goadminrecommend_detail'>
<view class='list_box'>
<view class='list_title'>{{item.title}}</view>
<view>{{item.content}}</view>
<view>{{item.abstract}}</view>
<view>
</view>
</view>
<view class='list_img'>
<image class='img' src='{{item.thumbnail}}'></image>
</view>
</view>
</view>
<!--筛选列表-->
<view class='rent_mask' wx:if='{{showrent_mask}}' bindtap="closeMask">
<view class='rent_popup' catchtap='funvoid()'>
<view class="rent_item {{sort_id===item.id?'active':''}}" wx:for="{{sort}}" wx:key="index"
catchtap='chooseSelect' data-index="{{index}}">{{item.name}}</view>
</view>
</view>
\ No newline at end of file
... ...
/* pages/consult/consultDetail/consultDetail.wxss */
@import "/pages/wish/wish.wxss";
@import "/pages/my/commentsDetail/commentsDetail.wxss";
page{
padding:200rpx 0 0 0;
}
.label_box2 {
width:630rpx;
}
.tab_box {
padding: 0 100rpx;
}
... ...
... ... @@ -25,17 +25,21 @@ Page({
number: e.detail.value
})
},
//选择分类
choosetab(e){
console.log(e);
let that = this;
let index=e.currentTarget.dataset.index;
let classify = that.data.classify;
for (let obj of classify){
obj.state=false;
}
classify[index].state = !classify[index].state;
that.setData({
classify: classify
})
},
//发布咨询页面分类
getclassify(){
... ... @@ -55,17 +59,48 @@ Page({
console.log(errMsg)
})
},
getwx(){
let that=this;
let header = {
"XX-Token": wx.getStorageSync('token')
}
let url ='/home/home/wxn'
app.post(url, {}, header).then((res) => {
that.setData({
number: res
})
}).catch((errMsg) => {
console.log(errMsg)
})
},
//发布资讯表单 --Wang
submit_consult(){
let that=this;
let bannerimgs = that.data.bannerimgs;
let classify = that.data.classify;
let file='';
let category_id='';//标签ID
for (let obj of classify){
if (obj.state){
category_id +=obj.id+','
for (let i in classify){
if (classify[i].state){
if (i == (classify.length-1)){
category_id += classify[i].id
}else{
category_id += classify[i].id + ','
}
}
}
for (let i in bannerimgs){
if (i == (bannerimgs.length-1)){
file += bannerimgs[i]
}else{
file += bannerimgs[i] + ','
}
}
if (that.data.content==''){
wx.showToast({
title: '请输入内容',
... ... @@ -73,14 +108,13 @@ Page({
duration:2000
})
}
// else if (that.data.file==''){
// wx.showToast({
// title: '请上传图片',
// icon: 'none',
// duration: 2000
// })
// } else if (category_id==''){
else if (category_id == '') {
else if (that.data.bannerimgs.length==0){
wx.showToast({
title: '请上传图片',
icon: 'none',
duration: 2000
})
}else if (category_id == '') {
wx.showToast({
title: '请选择标签',
icon: 'none',
... ... @@ -101,16 +135,26 @@ Page({
category_id: category_id,
number: that.data.number,
content: that.data.content,
file:that.data.file
file:file
}
app.post(url,params,header).then((res)=>{
console.log(res)
wx.showToast({
title: '发布成功',
icon: 'none',
duration: 2000,
complete:function(){
setTimeout(function(){
wx.navigateTo({
url: '/pages/consult/consult',
})
},1000)
}
})
}).catch((errMsg)=>{
console.log(errMsg)
})
}
},
//上传图片
//上传多个文件的方法
uploadImages() {
let that = this;
... ... @@ -138,6 +182,7 @@ Page({
},
uploadAllfile(filePaths, successUp, failUp, i, length) {
let that = this
let bannerimgs = that.data.bannerimgs;
let url = 'http://informationxcx.w.bronet.cn/api/home/home/upload'
wx.uploadFile({
url: url, //仅为示例，非真实的接口地址
... ... @@ -145,9 +190,13 @@ Page({
name: 'file',
formData: {},
success: function (res) {
wx.hideNavigationBarLoading()
wx.hideLoading()
console.log('upimg',JSON.parse(res.data))
wx.hideNavigationBarLoading();
wx.hideLoading();
bannerimgs.push(JSON.parse(res.data).msg);
that.setData({
bannerimgs: bannerimgs
})
},
fail: function (res) {
wx.hideNavigationBarLoading()
... ... @@ -164,12 +213,23 @@ Page({
},
})
},
//删除图片
del_img(e){
let that=this;
let index=e.currentTarget.dataset.index;
let bannerimgs = that.data.bannerimgs;
bannerimgs.splice(index, 1);
that.setData({
bannerimgs: bannerimgs
})
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
let that=this;
that.getclassify();
that.getwx();
},
/**
... ...
... ... @@ -5,17 +5,18 @@
<textarea class='textarea' placeholder='详细描述会为您带来最快速的成交哦' placeholder-class='textarea_size' value='{{content}}' bindinput='setcontent'></textarea>
</view>
<view class='upload_box' bindtap='uploadImages'>
<view class='upload_img'>
<view class='upload_img' wx:for='{{bannerimgs}}' wx:key='key'>
<view class='icon_box' catchtap='del_img'
data-index='{{index}}'> <view class='iconfont icon-jia1' ></view>
</view>
<image src='{{item}}'></image>
</view>
<view class='upload_img'>
<view class='iconfont icon-jia'></view>
</view>
<view class='upload_img'>
<view class='icon_box'> <view class='iconfont icon-jia1'></view>
</view>
<image src='/images/img4.png'></image>
</view>
</view>
</view>
<view class='content_box'>
<view class='tab_box'>
<scroll-view scroll-x>
... ... @@ -26,7 +27,7 @@
<view class='list_input'>
<text>微信号 :</text>
<view class='input_box'>
<input placeholder='请输入您的微信号' value='{{number}}' placeholder-class='input_size' bindinput='setnumber'></input>
<input placeholder='请输入您的微信号' value='{{number}}' placeholder-class='input_size' ></input>
</view>
</view>
</view>
... ...
// pages/consult/userrecommend_detail/userrecommend_detail.js
const app=getApp();
const app = getApp();
Page({
/**
* 页面的初始数据
*/
data: {
id:'',//用户推荐id
listdata:[]
id: '', //用户推荐id
userId: '',
listdata: []
},
//设置收藏
sethits(e) {
//设置收藏(收藏)
sethits_yes(e) {
let that = this;
let index = e.currentTarget.dataset.index;
let listdata = that.data.listdata;
// let url ='/home/home/like';
// let params={
// id: listdata[index].id
// }
// let header={
// 'XX-Token':wx.getStorageSync('token')
// }
if (listdata[index].is_hits == 0) {
listdata[index].is_hits = 1
} else {
listdata[index].is_hits = 0
let url = '/home/home/collect';
let params = {
id: listdata[index].id
}
that.setData({
listdata: listdata
let header = {
'XX-Token': wx.getStorageSync('token')
}
app.post(url, params, header).then((res) => {
if (listdata[index].is_hits == 0) {
listdata[index].is_hits = 1
} else {
listdata[index].is_hits = 0
}
that.setData({
listdata: listdata
})
}).catch((errMsg) => {
console.log(errMsg)
})
},
//设置收藏（取消收藏）
sethits_no(e) {
let that = this;
let index = e.currentTarget.dataset.index;
let listdata = that.data.listdata;
let url = '/home/home/collect_del';
let params = {
id: listdata[index].id
}
let header = {
'XX-Token': wx.getStorageSync('token')
}
app.post(url, params, header).then((res) => {
if (listdata[index].is_hits == 0) {
listdata[index].is_hits = 1
} else {
listdata[index].is_hits = '0'
}
that.setData({
listdata: listdata
})
}).catch((errMsg) => {
console.log(errMsg)
})
},
//点击评论
gopost(e) {
let post_id = e.currentTarget.id;
//举报
report(e) {
let self = this;
const current = e.currentTarget.dataset.index;
let url = '/home/home/report';
let header = {
"XX-Token": wx.getStorageSync('token')
};
let params = {
to_user_id: self.data.listdata[current].user_id,
post_id: self.data.listdata[current].id,
};
app.post(url, params, header).then((res) => {
wx.showToast({
title: '举报成功',
icon: 'none'
});
self.setData({
[`listdata[${current}].showlabel_box`]: false
});
})
},
//复制微信号
clickCopy(e) {
let that = this;
let index = e.currentTarget.dataset.index;
wx.setClipboardData({
data: this.data.listdata[index].wxn,
success: function(res) {
that.setData({
[`listdata[${index}].showlabel_box`]: false
});
}
});
},
//进入主页
enterHomePage(e) {
let self = this;
let current = e.currentTarget.dataset.index;
wx.navigateTo({
url: '../../my/comment/comment?post_id=' + post_id,
success: function (res) { },
fail: function (res) { },
complete: function (res) { },
url: '/pages/service/myindex/myindex?user_id=' + self.data.listdata[current].user_id
});
self.setData({
[`listdata[${current}].showlabel_box`]: false
});
},
//获取用户id
personInfo() {
let url = '/home/me/index'
let header = {
"XX-Token": wx.getStorageSync('token')
}
let params = {}
app.post(url, params, header).then((res) => {
// console.log(res)
this.setData({
userId: res.id
})
})
},
//设置点赞
setpaise(e) {
let that = this;
let index = e.currentTarget.dataset.index;
let listdata = that.data.listdata;
let url = '/home/home/like';
let url = '';
if (listdata[index].is_paise == 1) {
url = '/home/home/like_del'//取消点赞
} else {
url = '/home/home/like';//点赞
}
let params = {
id: listdata[index].id
}
... ... @@ -55,15 +141,7 @@ Page({
'XX-Token': wx.getStorageSync('token')
}
app.post(url, params, header).then((res) => {
console.log(res)
if (listdata[index].is_paise == 0) {
listdata[index].is_paise = 1
} else {
listdata[index].is_paise = 0
}
that.setData({
listdata: listdata
})
that.getdata_detail();
}).catch((errMsg) => {
console.log(errMsg)
})
... ... @@ -72,89 +150,108 @@ Page({
gopost(e) {
let post_id = e.currentTarget.id;
wx.navigateTo({
url: '../../my/comment/comment?post_id=' + post_id,
success: function (res) { },
fail: function (res) { },
complete: function (res) { },
url: '../../service/comment/comment?post_id=' + post_id,
success: function(res) {},
fail: function(res) {},
complete: function(res) {},
})
},
//显示个人信息
showInfo(e) {
let that = this;
let index = e.currentTarget.dataset.index;
let listdata = this.data.listdata;
listdata[index].showlabel_box = true;
that.setData({
listdata: listdata
})
},
voidfun() {
},
//获取详情信息
getdata_detail(){
let that=this;
let url ='/home/consult/post_info';
let header={
'XX-Token':wx.getStorageSync('token')
getdata_detail() {
let that = this;
let url = '/home/consult/post_info';
let header = {
'XX-Token': wx.getStorageSync('token')
}
let params={
let params = {
id: that.data.id
}
app.post(url,params,header).then((res)=>{
app.post(url, params, header).then((res) => {
let listdata = res;
for (let obj of listdata) {
obj.more = JSON.parse(obj.more)
obj.showlabel_box = false
}
that.setData({
listdata:res
listdata: listdata
})
}).catch((errMsg)=>{
}).catch((errMsg) => {
console.log(errMsg)
})
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
let that=this;
onLoad: function(options) {
let that = this;
that.setData({
id:options.id
id: options.id
})
that.getdata_detail();
that.personInfo();
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
onReady: function() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
onShow: function() {
let that=this;
that.getdata_detail();
that.personInfo();
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
onHide: function() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
onUnload: function() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
onPullDownRefresh: function() {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
onReachBottom: function() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
onShareAppMessage: function() {
}
})
\ No newline at end of file
... ...
... ... @@ -2,43 +2,24 @@
<view class='content_box'>
<view class='content_item' wx:for='{{listdata}}' wx:key>
<view class='left_box'>
<view class='head_portrait'>
<view class='head_portrait' catchtap='showInfo' data-index='{{index}}'>
<image src='{{item.avatar}}'></image>
</view>
<!--弹框1-->
<view class='label_box' wx:if='{{showlabel_box}}'>
<view class='triangle'></view>
<view class='wx_num'>微信号：
<text>961110</text>
</view>
<view class='line'>|</view>
<view class='label'>复制</view>
<view class='line'>|</view>
<view class='label'>
<text class='iconfont icon-jubao0201'></text>
<text>举报</text>
</view>
<view class='line'>|</view>
<view class='label'>
<text class='iconfont icon-jubao0201'></text>
<text>举报</text>
</view>
</view>
<!--弹框2-->
<view class='label_box2' wx:if='{{showlabel_box2}}'>
<view class='label_box2' wx:if='{{item.showlabel_box}}' catchtap='funvoid' >
<view class='triangle'></view>
<view class='wx_num'>微信号：
<text>961110</text>
<text>{{item.wxn}}</text>
</view>
<view class='line'>|</view>
<view class='label'>复制</view>
<view class='label' catchtap='clickCopy' data-index='{{index}}'>复制</view>
<view class='line'>|</view>
<view class='label'>
<view class='label' catchtap="enterHomePage" data-index="{{index}}">
<text class='iconfont icon-zhuye'></text>
<text>进入主页</text>
</view>
<view class='line'>|</view>
<view class='label'>
<view class='label' catchtap="report" data-index="{{index}}">
<text class='iconfont icon-jubao0201'></text>
<text>举报</text>
</view>
... ... @@ -52,24 +33,24 @@
<text class='iconfont icon-eye ' bindtap='Stick'></text>
<text>{{item.post_hits}}</text>
</view>
<view class='collect_box' bindtap='delArticles' wx:if='{{item.is_hits==0}}' data-index='{{index}}' catchtap='sethits'>
<view class='collect_box' bindtap='delArticles' wx:if='{{item.is_hits==0}}' catchtap='sethits_yes' data-index='{{index}}'>
<text class='iconfont icon-shoucang1 '></text>
<text>收藏</text>
</view>
<view class='collect_box active' data-index='{{index}}' catchtap='sethits' wx:else>
<view class='collect_box active' catchtap='sethits_no' data-index='{{index}}' wx:else>
<text class='iconfont icon-shoucang0 star2'></text>
<text>收藏</text>
</view>
</view>
</view>
<view class='list_content'>{{item.post_content}}</view>
<view class='list_img_box'><!--wx:for='{{item.more}}' wx:key-->
<!-- <image src='{{item.url}}'></image> -->
<image src='/images/img3.png'></image>
<image src='/images/img3.png'></image>
<view class='list_img_box' wx:for='{{item.more.photos}}' wx:key>
<image src='{{item.url}}'></image>
<!-- <image src='/images/img3.png'></image>
<image src='/images/img3.png'></image> -->
</view>
<view class='list_state_box'>
<view class='time'>20分钟前</view>
<view class='time'>{{item.time}}</view>
<view>
<text catchtap='setpaise' data-index='{{index}}'>
<text class='iconfont icon-heart xin1'></text>
... ... @@ -81,30 +62,24 @@
</text>
</view>
</view>
<view class='list_comment_box'>
<view class='comment_list'>
<view class='list_comment_box' >
<view class='comment_list' wx:if="{{item.is_paise != '0'}}">
<text class='iconfont icon-heart xin2'></text>
<view class='head_img_cell' wx:for='{{item.paise_user}}'
wx:key wx:for-item='{{item1}}'>
wx:key wx:for-item='item1'>
<image src='{{item1}}'></image>
</view>
<!-- <view class='head_img_cell'>
<image src='/images/head.png'></image>
</view>
<view class='head_img_cell'>
<image src='/images/head.png'></image>
</view> -->
</view>
<view class='comment_list'>
<view class='comment_list' wx:if="{{item.comments.length != '0'}}">
<view class='iconfont icon-pinglun pinglun2'></view>
<view class='comment_box'>
<view class='comment_content' wx:for='{{item.comments}}' wx:key=' ' wx:for-item='item2'>
<view class='comment_info'>
<view class='head_portrait'>
<image src='/images/head.png'></image>
<image src='{{item2.avatar}}'></image>
</view>
<view class='comment_content_info'>
<view class='comment_name'>巴布亚bbay：</view>
<view class='comment_name'>{{item2.user_nickname}}：</view>
<view class=''>{{item2.content}}</view>
</view>
</view>
... ...
... ... @@ -2,4 +2,7 @@
@import '../../service/renting/renting.wxss';
page{
padding:0 0 0 0;
}
\ No newline at end of file
}
.label_box2 {
width:630rpx;
}
... ...
... ... @@ -3,8 +3,8 @@
page {
background: #fff;
}
.content_box {
margin-top: 0;
}
... ...
... ... @@ -324,7 +324,7 @@ Page({
},
onLoad: function (options) {
// console.log('options', options);
//console.log('options', options);
const self = this;
self.personInfo();
self.setData({
... ... @@ -335,7 +335,6 @@ Page({
wx.setNavigationBarTitle({'title': options.title});
self.getDetail();
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
... ... @@ -360,7 +359,6 @@ Page({
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
... ...
<!--pages/service/renting/renting.wxml-->
<view class='banner_box1'>
<view class='head_box1'>
<view class='head_left_box'>
<view class='head_left_box'>
<!--筛选按钮-->
<view class='rent_box' bindtap='showrent_mask_yes' wx:if="{{select.length >0}}">
<text>{{select[currentSelect].name}}</text>
... ...
// pages/service/rentingDetail/rentingDetail.js
const app = getApp();
Page({
/**
* 页面的初始数据
*/
... ... @@ -50,7 +49,6 @@ Page({
})
})
},
//点击头像
showlabel_box() {
let that = this;
... ... @@ -58,7 +56,6 @@ Page({
showlabel_box: !that.data.showlabel_box
})
},
//复制微信号
clickCopy() {
wx.setClipboardData({
... ...
... ... @@ -36,9 +36,7 @@ Page({
}
})
},
example() {
app.post(url, {
id: 1
}, {}).then((res) => {
... ... @@ -66,7 +64,6 @@ Page({
session_key: ret.session_key
})
})
},
fail: function (res) {
},
... ...