作者 李康

合并分支 'lk' 到 'master'

update



查看合并请求 !26
... ... @@ -211,7 +211,6 @@
text-overflow: ellipsis;
-webkit-box-orient: vertical;
-webkit-line-clamp: 1;
height: 38rpx;
}
.selectText {
... ... @@ -364,3 +363,13 @@
bottom: 4rpx;
left: 36rpx;
}
.hdListText {
color: #323233;
font-size: 44rpx;
}
.likeSortText {
color: #323233;
font-size: 28rpx;
}
... ...
... ... @@ -160,3 +160,8 @@
.pinglunBox {
margin-left: 60rpx;
}
.diatyFa {
position: fixed;
bottom: 40rpx;
right: 0;
}
\ No newline at end of file
... ...
... ... @@ -43,7 +43,6 @@
"van-uploader": "/wxcomponents/vant/dist/uploader/index",
"van-field": "/wxcomponents/vant/dist/field/index",
"van-popup": "/wxcomponents/vant/dist/popup/index",
"van-datetime-picker": "/wxcomponents/vant/dist/datetime-picker/index",
"van-button": "/wxcomponents/vant/dist/button/index"
}
... ... @@ -100,13 +99,17 @@
{
"path": "pages/index/length-norm",
"style": {
"navigationBarTitleText": "体长标准"
"navigationBarTitleText": "体长标准",
"navigationBarTextStyle": "black",
"navigationBarBackgroundColor": "#FFFFFF"
}
},
{
"path": "pages/index/weight-norm",
"style": {
"navigationBarTitleText": "体重标准"
"navigationBarTitleText": "体重标准",
"navigationBarTextStyle": "black",
"navigationBarBackgroundColor": "#FFFFFF"
}
},
{
... ...
... ... @@ -28,10 +28,15 @@
<view class="myPet">
<text style="width:160rpx;font-size: 28rpx;color: #323233;">我的宠物:</text>
<picker @change="bindPickerPet" :value="petIndex" :range="petNameList">
<view class="select" v-if="petIndex==''">
请选择宠物
<view style="display:flex;align-items: center;">
<view class="select" v-if="petIndex==''">
请选择宠物
</view>
<view class="uni-input" v-if="petIndex!==''">{{petNameList[petIndex]}}</view>
<image src="../../static/image/xuanze_icon@2x.png" style="width: 12rpx;height: 12rpx;margin: 12rpx 0 0 12rpx;"
mode=""></image>
</view>
<view class="uni-input" v-if="petIndex!==''">{{petNameList[petIndex]}}</view>
</picker>
</view>
<view class="petBtn" @click="fenxi">
... ... @@ -65,7 +70,8 @@
<view class='date-head' @click='lookHuoDong' :data-year='year' :data-month='month' :data-datenum='item.dateNum'
style="position: relative;">
<view v-if="item.dateNum">{{item.dateNum}}
<view class="" style="position: absolute;top: 40rpx;font-size: 20rpx;width: 26px;display: flex;align-items: center;" v-if="today==item.isToday">
<view class="" style="position: absolute;top: 40rpx;font-size: 20rpx;width: 26px;display: flex;align-items: center;left: 1px;"
v-if="today==item.isToday">
今日
</view>
<view class="" v-if="sbDate.indexOf(item.isToday)!==-1">
... ... @@ -203,7 +209,7 @@
<view class="">
体长
<view class="zhuyi" style="display: inline-block;">
<view class="zhuyi" style="display: inline-block;" @click="golenght">
<image src="/static/image/zhuyi.png" mode="" class="zhuyiPic"></image>
(体长标准)
</view>
... ... @@ -213,9 +219,9 @@
</view>
</view>
<view class="pickerItem">
<view class="">
<view class="" >
体重
<view class="zhuyi" style="display: inline-block;">
<view class="zhuyi" style="display: inline-block;" @click="goweight">
<image src="/static/image/zhuyi.png" mode="" class="zhuyiPic"></image>
(体重标准)
</view>
... ... @@ -347,6 +353,16 @@
}
},
methods: {
goweight(){
uni.navigateTo({
url:'/pages/index/weight-norm'
})
},
golenght(){
uni.navigateTo({
url:'/pages/index/length-norm'
})
},
//宠物分析
fenxi(){
let token =uni.getStorageSync('token')
... ...
... ... @@ -9,20 +9,21 @@
</template>
<script>
export default{
data(){
return{
export default {
data() {
return {
}
},
created() {
}
}
</script>
<style>
.container{
.container {
padding: 50rpx 32rpx;
border-top: 1px solid #EDEDED;
}
</style>
... ...
... ... @@ -9,20 +9,21 @@
</template>
<script>
export default{
data(){
return{
export default {
data() {
return {
}
},
created() {
}
}
</script>
<style>
.container{
.container {
padding: 50rpx 32rpx;
border-top: 1px solid #EDEDED;
}
</style>
... ...
... ... @@ -183,7 +183,7 @@
//体长
petLenghtArray: ['35cm', '45cm', '55cm', '65cm'],
//Age
petAgeArray: ['1年', '2年', '3年', '4年', '5年', '6年'],
petAgeArray: ['1月', '2月', '3月', '4月', '5月', '6月','7月', '8月', '9月', '10月', '11月', '1岁','2岁','3岁','4岁','5岁','6岁','7岁','8岁','9岁','10岁','11岁','12岁','13岁','14岁','15岁','16岁','17岁','18岁','19岁','20岁','21岁'],
petClass: '请选择宠物种类',
petHeight: "请选择身高",
petWeight: "请选择体重",
... ...
... ... @@ -66,6 +66,14 @@
deleteImg(index) {
this.fileList.splice(index, 1);
this.urlImg.splice(index, 1);
uni.getStorageSync('petImg').splice(index,1);
uni.getStorageSync('petUrlImg').splice(index,1);
if (this.fileList.length <= 0 || this.urlImg.length <= 0) {
this.petInfo()
} else {
this.fileList = uni.getStorageSync('petImg')
this.urlImg = uni.getStorageSync('petUrlImg')
}
},
//宠物详情
petInfo() {
... ...
... ... @@ -15,7 +15,6 @@
<text class="releBody">{{item.title}}</text>
</view>
<view class="releImageBox" @click="circleDetail(item.id)">
<view class="releImage">
<view class="" v-for="(imgItem,index) in item.images">
<image :src="imgItem" style="width: 188rpx;height: 188rpx;" mode=""></image>
... ... @@ -37,7 +36,7 @@
mode=""></image> -->
<text :class="[isShow?'releZanSum':'releYiZanSum']">{{item.up_num}}</text>
</view>
<view class="releBonPing" @click="circleDetail(item.id)">
<view class="releBonPing">
<image src="../../static/image/pinglun_icon@2x.png" style="width:32rpx;height:32rpx;margin-right: 6rpx;" mode=""></image>
<text class="relePingSum">{{item.discuss_num}}</text>
</view>
... ...
<template>
<view style="border-top: 1px solid #F2F2F2;">
<scroll-view scroll-y style='height:724px;' @bindscrolltolower="loadMore">
<view :class="[item.type==1?'replyBody':'replyBody1']" v-for="(item,index) in dataList" :key="index">
<view :class="[item.type==1?'replyBody':'replyBody1']" v-for="(item,index) in dataList" :key="index" @click="circleDetail(item.c_id)">
<view class="replyBodyImg">
<image :src="item.avatar" style="width: 68rpx;height: 68rpx;" mode=""></image>
</view>
... ... @@ -43,6 +43,12 @@
}
},
methods: {
//圈子详情
circleDetail(id) {
uni.navigateTo({
url: '/pages/pet/post-detail?id=' + id
})
},
replyList() {
let param = {
page: 1
... ...
... ... @@ -31,8 +31,8 @@
</view>
</view>
<view class="mesBtn">
<text class="mesBtnText" @click="save">保存</text>
<view class="mesBtn" @click="save">
<text class="mesBtnText">保存</text>
</view>
</view>
</template>
... ... @@ -67,7 +67,7 @@
icon: 'none',
duration: 1000
})
} else if (!this.userPhone) {
} else if (!this.userPhone || this.userPhone.length < 11 || !/^1[34578]\d{9}$/.test(this.userPhone)) {
uni.showToast({
title: '请完善手机号',
icon: 'none',
... ...
... ... @@ -115,6 +115,7 @@
give() {
this.tabIndex = 0
let postData = {
cid: this.classifyId,
up: 1
}
request.postRequest('/api/Circle/circleList', postData, data => {
... ... @@ -127,6 +128,7 @@
hot() {
this.tabIndex = 1
let postData = {
cid: this.classifyId,
discuss: 1
}
request.postRequest('/api/Circle/circleList', postData, data => {
... ... @@ -149,7 +151,7 @@
classifyList() {
let that = this;
let postData = {
id: that.classifyId
cid: this.classifyId
}
request.postRequest('/api/Circle/circleList', postData, data => {
this.list = data.data.list;
... ...
... ... @@ -3,11 +3,11 @@
<view class="topBj">
<image src="/static/image/bg_icon@2x.png" mode=""></image>
<view class="inoutBox">
<input type="text" value="" placeholder="搜索" @focus="inputFocus"/>
<input type="text" value="" placeholder="搜索" @focus="inputFocus" />
</view>
</view>
<view class="classifyBox">
<view class="classifyPic" v-for="(item,index) in ClassifyList" :key="index" v-if="index<=2" @click="classifyDeatil(item.id)">
<view class="classifyPic" v-for="(item,index) in ClassifyList" :key="index" v-if="index<=2" @click="classifyDeatil(item.id)">
<image :src="item.c_image" mode=""></image>
<text class="classifyText">{{item.name}}</text>
</view>
... ... @@ -29,7 +29,7 @@
</view>
</view>
</view>
<view class="listBox" v-for="(item,index) in list" :key="index" >
<view class="listBox" v-for="(item,index) in list" :key="index">
<view class="userInfo">
<image :src="item.avatar" mode=""></image>
{{item.nickname}}
... ... @@ -37,28 +37,31 @@
<view class="content" @click="postDetail(item.id)">
{{item.title}}
</view>
<view class="picList" @click="postDetail(item.id)">
<view class="picList" @click="postDetail(item.id)">
<view class="picItem" v-for="(items,indexs) in item.images" :key="indexs">
<image :src="items" mode=""></image>
<image :src="items" mode=""></image>
</view>
</view>
<view class="bottomBox">
<view class="timeBox">
{{item.day}}发布
</view>
<view class="" style="display: flex;">
<view class="zanBox" @click="zan(item.id,1)">
<image src="/static/image/zan_icon@2x.png" mode="" v-if="item.up==0"></image>
<image src="/static/image/yizan_icon@2x.png" mode="" v-if="item.up==1"></image>
{{item.up_num}}
</view>
<view class="pinglunBox zanBox" @click="zan(item.id,2)">
<image src="/static/image/pinglun_icon@2x.png" mode=""></image>
{{item.discuss_num}}
</view>
<view class="" style="display: flex;">
<view class="zanBox" @click="zan(item.id,1)">
<image src="/static/image/zan_icon@2x.png" mode="" v-if="item.up==0"></image>
<image src="/static/image/yizan_icon@2x.png" mode="" v-if="item.up==1"></image>
{{item.up_num}}
</view>
<view class="pinglunBox zanBox" @click="zan(item.id,2)">
<image src="/static/image/pinglun_icon@2x.png" mode=""></image>
{{item.discuss_num}}
</view>
</view>
</view>
</view>
<view class="diatyFa" @click="addDetail()">
<image src="../../static/image/fabu_btn@2x.png" style="width: 168rpx;height: 88rpx;" mode=""></image>
</view>
</view>
</template>
... ... @@ -84,117 +87,125 @@
content: '新入手的小猫咪,可爱不,有人也想要吗?这里有英短、橘猫。',
picList: [{
image: '/static/image/bg_icon@2x.png'
},{
}, {
image: '/static/image/bg_icon@2x.png'
},{
}, {
image: '/static/image/bg_icon@2x.png'
}],
time:'4',
zan:'666',
pinglun:'888'
},{
time: '4',
zan: '666',
pinglun: '888'
}, {
image: '/static/image/biaoqing1_icon@2x.png',
userName: '杰尼猫咪',
content: '新入手的小猫咪,可爱不,有人也想要吗?这里有英短、橘猫。',
picList: [{
image: '/static/image/bg_icon@2x.png'
},{
}, {
image: '/static/image/bg_icon@2x.png'
},{
}, {
image: '/static/image/bg_icon@2x.png'
}],
time:'4',
zan:'666',
pinglun:'888'
time: '4',
zan: '666',
pinglun: '888'
}]
}
},
methods:{
methods: {
//发布帖子
addDetail() {
uni.navigateTo({
url: '/pages/pet/publish-post'
})
},
//搜索
inputFocus(){
inputFocus() {
uni.navigateTo({
url:'/pages/pet/search'
url: '/pages/pet/search'
})
},
//全部分类
goClass(){
uni.navigateTo({
url:'/pages/pet/more-classify'
})
},
goClass() {
uni.navigateTo({
url: '/pages/pet/more-classify'
})
},
//分类列表
classify(){
let postData={};
request.postRequest('/api/Circle/classifyList',postData,data=>{
if(data.code==1){
this.ClassifyList=data.data.list
classify() {
let postData = {};
request.postRequest('/api/Circle/classifyList', postData, data => {
if (data.code == 1) {
this.ClassifyList = data.data.list
}
})
},
//圈子列表
postList(){
let postData={};
request.postRequest('/api/Circle/circleList',postData,data=>{
if(data.code==1){
this.list=data.data.list
postList() {
let postData = {};
request.postRequest('/api/Circle/circleList', postData, data => {
if (data.code == 1) {
this.list = data.data.list
}
})
},
//分类详情
classifyDeatil(id){
classifyDeatil(id) {
uni.navigateTo({
url:'/pages/pet/classify-detail?id='+id
url: '/pages/pet/classify-detail?id=' + id
})
},
},
//点赞最多
give(){
let postData={
up:1
give() {
let postData = {
up: 1
}
request.postRequest('/api/Circle/circleList',postData,data=>{
if(data.code==1){
this.list=data.data.list
request.postRequest('/api/Circle/circleList', postData, data => {
if (data.code == 1) {
this.list = data.data.list
}
})
},
//最热
hot(){
let postData={
discuss:1
hot() {
let postData = {
discuss: 1
}
request.postRequest('/api/Circle/circleList',postData,data=>{
if(data.code==1){
this.list=data.data.list
request.postRequest('/api/Circle/circleList', postData, data => {
if (data.code == 1) {
this.list = data.data.list
}
})
},
//帖子详情
postDetail(id){
uni.navigateTo({
url:'/pages/pet/post-detail?id='+id
})
postDetail(id) {
uni.navigateTo({
url: '/pages/pet/post-detail?id=' + id
})
},
//点赞
zan(id,type){
let postData={
id:id,
type:type,
zan(id, type) {
let postData = {
id: id,
type: type,
}
if(type==1){
request.postRequest('/api/Circle/Up',postData,data=>{
if(data.code==1){
uni.showToast({
content:'点赞成功'
})
this.postList()
if (type == 1) {
request.postRequest('/api/Circle/Up', postData, data => {
if (data.code == 1) {
uni.showToast({
title: '点赞成功',
duration: 1000,
icon: 'success'
})
this.postList()
}
})
}else{
} else {
uni.navigateTo({
url:"/pages/pet/post-detail?id="+id
url: "/pages/pet/post-detail?id=" + id
})
}
}
},
// created() {
... ...
... ... @@ -45,8 +45,8 @@
<view class="UserName">
{{item.nickname}}
<view class="" @click="cricleZan('',2,item.id)">
<image src="/static/image/zan_icon@2x.png" mode="" v-if="postData.up==0"></image>
<image src="/static/image/yizan_icon@2x.png" mode="" v-if="postData.up==1"></image>
<image src="/static/image/zan_icon@2x.png" mode="" v-if="item.up==0"></image>
<image src="/static/image/yizan_icon@2x.png" mode="" v-if="item.up==1"></image>
</view>
</view>
<view class="evaluateContent">
... ... @@ -59,7 +59,7 @@
</view>
</view>
<view class="replayBox" v-if="item.child.length!==0" style="max-height: 200rpx;position: relative;">
<view class="" >
<view class="">
<view class="" v-for="(items,indexs) in item.child" :key="index" style="font-size: 24rpx;margin-bottom: 6rpx;">
<view class="inlineA namePublic">
... ... @@ -170,7 +170,12 @@
}
request.postRequest('/api/Circle/Up', postData, data => {
if (data.code == 1) {
this.circleDetail(id)
this.circleDetail(this.id)
uni.showToast({
title: '点赞成功',
duration: 2000,
icon: 'success'
})
}
})
},
... ... @@ -192,9 +197,6 @@
},
//发送评论
send() {
console.log('send')
console.log(this.placeholder)
console.log(this.placeholder.indexOf('写评论'))
if (this.placeholder.indexOf('写评论') < 0) {
this.evaluate()
} else {
... ... @@ -213,11 +215,11 @@
this.circleDetail(this.id);
this.inputValue = '';
this.placeholder = '写评论'
}else{
} else {
uni.showToast({
title:'请输入评论',
icon:'none',
duration:2000
title: '请输入评论',
icon: 'none',
duration: 2000
})
}
})
... ... @@ -236,18 +238,17 @@
this.circleDetail(this.id);
this.inputValue = '';
this.placeholder = '写评论'
}else{
} else {
uni.showToast({
title:'请输入评论',
icon:'none',
duration:2000
title: '请输入评论',
icon: 'none',
duration: 2000
})
}
})
}
},
mounted() {
}
mounted() {}
}
</script>
... ...