From 1548543a2949c6ac67ba4009b82a2ae8281c7950 Mon Sep 17 00:00:00 2001
From: lihongjuan <18848113498@163.com>
Date: Wed, 7 Aug 2019 16:59:27 +0800
Subject: [PATCH] 345324
---
app.js | 3 ++-
app.json | 8 ++++++--
app.wxss | 22 ++++++++++++++++++++++
pages/find/find.js | 14 ++++++++++----
pages/find/find.wxml | 50 +++++++++++++++++++++++++-------------------------
pages/find/find.wxss | 12 ++++++++++--
pages/findblock/jiudandetail/jiudandetail.js | 13 +++++++++++++
pages/findblock/jiudandetail/jiudandetail.wxml | 16 ++++++++++------
pages/findblock/jiulist/jiulist.js | 1 +
pages/findblock/jiulist/jiulist.wxml | 70 ++++++++++++++++++++++++++++++++++++++++------------------------------
pages/findblock/jiulist/jiulist.wxss | 7 ++++++-
pages/findblock/meirixinjiu/meirixinjiu.wxml | 19 +++++++++++++------
pages/findblock/meirixinjiu/meirixinjiu.wxss | 7 +++++++
pages/findblock/niangjiushi/niangjiushi.wxml | 72 +++++++++++++++++++++++++++++++++++++++++-------------------------------
pages/findblock/putongwenzhang/putongwenzhang.js | 21 ++++++++++++---------
pages/findblock/putongwenzhang/putongwenzhang.wxml | 4 +++-
pages/findblock/wenzhangdetail/wenzhangdetail.js | 3 +++
pages/findblock/wenzhangdetail/wenzhangdetail.wxss | 4 ++--
pages/findblock/zhuanjiapinjiu/zhuanjiapinjiu.wxml | 20 +++++++++++++++-----
pages/findblock/zhuanjiapinjiu/zhuanjiapinjiu.wxss | 14 +++++++++++---
pages/findblock/zhuanjiapinjiudetail/zhuanjiapinjiudetail.js | 8 +++++---
pages/findblock/zhuanjiapinjiudetail/zhuanjiapinjiudetail.wxml | 2 +-
pages/findblock/zhuanjiapinjiudetail/zhuanjiapinjiudetail.wxss | 9 ++++++++-
pages/forgetmima/forgetmima.js | 14 +++++++++-----
pages/forgetmima/forgetmima.wxml | 7 +++++--
pages/homapage/homepage.js | 137 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------
pages/homeblock/brandlist/brandlist.js | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
pages/homeblock/brandlist/brandlist.wxml | 10 ++++++----
pages/homeblock/brandpage/brandpage.js | 8 +++++++-
pages/homeblock/brandpage/brandpage.wxml | 4 ++--
pages/homeblock/companyintro/companyintro.js | 16 ++++++++++------
pages/homeblock/companyintro/companyintro.wxml | 6 +++---
pages/homeblock/companyintro/companyintro.wxss | 4 +++-
pages/homeblock/evalute/evalute.js | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------
pages/homeblock/evalute/evalute.wxml | 4 ++--
pages/homeblock/evalute/evalute.wxss | 6 ++++--
pages/homeblock/evalutecontent/evalutecontent.js | 15 +++++++++++++++
pages/homeblock/evalutecontent/evalutecontent.wxml | 6 +++---
pages/homeblock/evalutecontent/evalutecontent.wxss | 11 ++++++++---
pages/homeblock/guanimg/guanimg.wxml | 24 ++++++++++++++++++------
pages/homeblock/jiuzidian/jiuzidian.js | 283 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------------------------------
pages/homeblock/jiuzidian/jiuzidian.wxml | 222 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------
pages/homeblock/jiuzidian/jiuzidian.wxss | 128 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
pages/homeblock/niangjiuteacher/niangjiuteacher.js | 11 +++++++++--
pages/homeblock/niangjiuteacher/niangjiuteacher.wxml | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
pages/homeblock/niangjiuteacher/niangjiuteacher.wxss | 8 ++++++--
pages/homeblock/search/search.js | 41 ++++++++++++++++++++++++++++++-----------
pages/homeblock/search/search.wxml | 132 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------
pages/homeblock/shipaiimg/shipaiimg.wxml | 11 ++++++++---
pages/homeblock/shortvideo/shortvideo.js | 3 ---
pages/homeblock/shortvideo/shortvideo.wxml | 33 +++++++++++++++++++++++++--------
pages/homeblock/shortvideo/shortvideo.wxss | 29 +++++++++++++++++++++++++++++
pages/homeblock/shuxing/shuxing.js | 21 ++++++++++++++++++---
pages/homeblock/shuxing/shuxing.wxml | 10 +++++-----
pages/homeblock/zhinengselect/zhinengselect.js | 1178 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
pages/homeblock/zhinengselect/zhinengselect.json | 5 ++++-
pages/homeblock/zhinengselect/zhinengselect.wxml | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------
pages/homeblock/zhinengselect/zhinengselect.wxss | 196 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
pages/jiudan/jiudan.wxss | 6 +++---
pages/login/login.js | 53 +++++++++++++++++++++++++++++++++++++++++++++--------
pages/login/login.wxml | 11 +++++++----
pages/mine/mine.js | 16 +++++++++++++---
pages/mine/mine.wxml | 30 +++++++++++++++---------------
pages/myblock/guanzhu/guanzhu.js | 198 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
pages/myblock/guanzhu/guanzhu.wxml | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
pages/myblock/guanzhu/guanzhu.wxss | 3 ++-
pages/myblock/history/history.js | 515 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
pages/myblock/history/history.wxml | 124 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------
pages/myblock/history/history.wxss | 30 +++++++++++++++++++++++++++---
pages/myblock/huanbangshouji/huanbangshouji.js | 11 ++++++++++-
pages/myblock/huanbangshouji/huanbangshouji.wxml | 2 +-
pages/myblock/jifenjilu/jifenjilu.js | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++-
pages/myblock/jifenjilu/jifenjilu.wxml | 14 +++++++-------
pages/myblock/jifenjilu/jifenjilu.wxss | 10 +++++++++-
pages/myblock/jiupin/jiupin.js | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++--
pages/myblock/jiupin/jiupin.wxml | 8 ++++----
pages/myblock/message/message.js | 11 ++++++++++-
pages/myblock/personpage/personpage.js | 7 +++++++
pages/myblock/personpage/personpage.wxml | 8 ++++----
pages/myblock/pingjia/pingjia.js | 17 +++++++++++++----
pages/myblock/pingjia/pingjia.wxml | 12 +++++++++---
pages/myblock/pingjia/pingjia.wxss | 2 +-
pages/myblock/pinglun/pinglun.js | 48 +++++++++++++++++++++++++++++++++++++++---------
pages/myblock/pinglun/pinglun.wxml | 13 +++++++++----
pages/myblock/pinpai/pinpai.js | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
pages/myblock/pinpai/pinpai.wxml | 8 ++++----
pages/myblock/shezhimima/shezhimima.js | 39 ++++++++++++++++++++++++++-------------
pages/myblock/zhanghaobangding/zhanghaobangding.js | 4 ++--
pages/myblock/zhanghaoyuanquan/zhanghaoyuanquan.js | 27 +++++++++++++++++++++++++++
pages/myblock/zhanghaoyuanquan/zhanghaoyuanquan.wxml | 8 ++++----
project.config.json | 27 +++++++++++++++++++++++----
utils/util.js | 26 ++++++++++++++++++++++++--
92 files changed, 3894 insertions(+), 936 deletions(-)
diff --git a/app.js b/app.js
index a5ab26e..dbe66dd 100644
--- a/app.js
+++ b/app.js
@@ -15,6 +15,7 @@ App({
// 获取用户信息
wx.getSetting({
success: res => {
+
if (res.authSetting['scope.userInfo']) {
// 已经授权，可以直接调用 getUserInfo 获取头像昵称，不会弹框
wx.getUserInfo({
@@ -155,7 +156,7 @@ App({
},
globalData: {
userInfo: null,
- url:'http://winesbook.cn/static/images_mini/',
+ url:'https://winesbook.cn/static/images_mini/',
baseUrl:'https://winesbook.cn/api'
}
})
\ No newline at end of file
diff --git a/app.json b/app.json
index 32e5eeb..e291028 100644
--- a/app.json
+++ b/app.json
@@ -1,11 +1,12 @@
{
"pages": [
+
"pages/homapage/homepage",
+ "pages/login/login",
"pages/forgetmima/forgetmima",
"pages/setmima/setmima",
"pages/myblock/shezhimima/shezhimima",
"pages/enteryanzheng/enteryanzheng",
- "pages/login/login",
"pages/homeblock/zhinengselect/zhinengselect",
"pages/homeblock/search/search",
"pages/find/find",
@@ -52,7 +53,10 @@
"pages/findblock/jiulist/jiulist",
"pages/findblock/putongwenzhang/putongwenzhang",
"pages/findblock/wenzhangdetail/wenzhangdetail",
- "pages/homeblock/bofangexample/bofangexample"
+ "pages/homeblock/bofangexample/bofangexample",
+ "pages/myblock/jiudan/jiudan",
+ "pages/myblock/yonghufankui/yonghufankui",
+ "pages/myblock/xiugaimima/xiugaimima"
],
"window": {
"backgroundTextStyle": "light",
diff --git a/app.wxss b/app.wxss
index b65dac6..5752088 100644
--- a/app.wxss
+++ b/app.wxss
@@ -110,3 +110,25 @@ image {
.nambottom .namebottomitem:first-child {
padding-left: 0;
}
+
+.nodataimg{
+ width:124rpx;
+ height:249rpx;
+ font-size: 0;
+ margin:350rpx auto 0;
+}
+.nodataimg image{
+ width:100%;
+ height:100%;
+}
+
+.cannodataimg{
+ width:124rpx;
+ height:249rpx;
+ font-size: 0;
+ margin:73rpx auto 0;
+}
+.cannodataimg image{
+ width:100%;
+ height:100%;
+}
\ No newline at end of file
diff --git a/pages/find/find.js b/pages/find/find.js
index eee8b12..ee1c414 100644
--- a/pages/find/find.js
+++ b/pages/find/find.js
@@ -10,7 +10,7 @@ Page({
'http://winesbook.cn/static/images_mini/aicon_60@2x.png'
],
indicatorDots: false,
- autoplay: false,
+ autoplay: true,
interval: 2000,
duration: 1000,
currentSwiper: 0,
@@ -23,9 +23,13 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
- this.setData({
- url: app.globalData.url
- })
+ let that=this;
+ setTimeout(function(){
+ that.setData({
+ url: app.globalData.url
+ })
+ },1000)
+
},
@@ -168,6 +172,7 @@ Page({
}
},
+
/**
* 生命周期函数--监听页面初次渲染完成
*/
@@ -214,6 +219,7 @@ Page({
* 用户点击右上角分享
*/
onShareAppMessage: function (e) {
+ console.log(9090)
let that = this;
console.log(e)
let id=e.target.dataset.id;
diff --git a/pages/find/find.wxml b/pages/find/find.wxml
index 0f0fed1..8337728 100644
--- a/pages/find/find.wxml
+++ b/pages/find/find.wxml
@@ -1,8 +1,8 @@
<view class="swiper_image">
- <swiper indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}" class="swiper_item_img" bindchange="swiperChange">
+ <swiper indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}" class="swiper_item_img" bindchange="swiperChange" circular="true">
<block wx:for="{{imgUrls}}" wx:key="doct">
- <swiper-item >
- <image src="{{item.image}}" data-index='{{index}}' class="slide-image" width="355" height="150" />
+ <swiper-item>
+ <image src="{{item.image}}" data-index='{{index}}' class="slide-image" width="355" height="150" />
</swiper-item>
</block>
</swiper>
@@ -18,10 +18,10 @@
<view class="middlehead" bindtap="everyjiu">
<view class="rilihead">
<view class="rili">
- <image src="{{url}}aicon_62x.png"></image>
+ <image src="{{url}}aicon_62x.png" mode="aspectFit"></image>
</view>
<view class="every">
- <image src="{{url}}aicon_63x.png"></image>
+ <image src="{{url}}aicon_63x.png" mode="aspectFit"></image>
</view>
</view>
@@ -34,22 +34,22 @@
</view>
<view class="dayjiu" bindtap="everyjiu">
-<view class="tast" wx:for="{{news}}" wx:key='' catchtap="jumpnewdetail" data-id="{{item.wine_id}}">
- <view class="tastimg">
- <image src="{{item.thumb}}"></image>
- </view>
+ <view class="tast" wx:for="{{news}}" wx:key='' catchtap="jumpnewdetail" data-id="{{item.wine_id}}">
+ <view class="tastimg">
+ <image src="{{item.thumb}}"></image>
+ </view>
- <view class="tastcontent">
- <view class="tasttitle">{{item.title}}</view>
- <view class="tasttext">{{item.description}}</view>
- </view>
+ <view class="tastcontent">
+ <view class="tasttitle">{{item.title}}</view>
+ <view class="tasttext">{{item.description}}</view>
+ </view>
-</view>
+ </view>
</view>
-<view class="wineblock" wx:for="{{list}}" wx:key="" bindtap="jump" data-type="{{item.type}}" data-id="{{item.id}}">
- <view class="middlehead">
+<view class="wineblock" wx:for="{{list}}" wx:key="">
+ <view class="middlehead" bindtap="jump" data-type="{{item.type}}" data-id="{{item.id}}">
<view class="rilihead">
<view class="rili">
<image src="{{item.icon}}" mode="aspectFit"></image>
@@ -67,18 +67,18 @@
</view>
</view>
- <view class="winetitle" catchtap='enterdetail' data-id="{{item.article.id}}" data-type="{{item.type}}">{{item.article.share_content}}</view>
+ <view class="winetitle" bindtap='enterdetail' data-id="{{item.article.id}}" data-type="{{item.type}}" data-winemaker_id="{{item.article.winemaker_id}}">{{item.article.title}}</view>
+
-
- <view class="wineimg" wx:if="{{item.type==2}}" data-url="{{item.article.video}}" catchtap='entervideo' catchtap='enterdetail' data-id="{{item.article.id}}" data-type="{{item.type}}">
+ <view class="wineimg" wx:if="{{item.type==2}}" data-url="{{item.article.video}}" catchtap='entervideo' bindtap='enterdetail' data-id="{{item.article.id}}" data-type="{{item.type}}">
<image src="{{item.article.video_image}}"></image>
<view class="vioimg">
- <image src="{{url}}/aicon_70x.png"></image>
+ <image src="{{url}}/aicon_70x.png"></image>
</view>
</view>
- <view class="wineimg" wx:else catchtap='enterdetail' data-id="{{item.article.id}}" data-type="{{item.type}}" data-winemaker_id="{{item.article.winemaker_id}}">
+ <view class="wineimg" wx:else bindtap='enterdetail' data-id="{{item.article.id}}" data-type="{{item.type}}" data-winemaker_id="{{item.article.winemaker_id}}">
<image src="{{item.article.thumb}}"></image>
</view>
@@ -95,8 +95,8 @@
<view class="winerighttou">
<view class="winerighttouimg" catchtap='dianzan' data-userid="{{item.article.user_id}}" data-type="{{item.type}}" data-id="{{item.article.id}}" data-winemaker_id="{{item.article.winemaker_id}}">
<image src="{{url}}aicon_71x.png" wx:if="{{item.article.is_good==1}}"></image>
- <image src="{{url}}aicon_66x.png"wx:else></image>
-
+ <image src="{{url}}aicon_66x.png" wx:else></image>
+
</view>
<view class="winezan">{{item.article.good_count}}</view>
</view>
@@ -110,9 +110,9 @@
<view class="winerighttou">
<view class="winerighttouimg" catchtap='share'>
<image src="{{url}}aicon_68x.png"></image>
- <button class="lj_share" bindtap="buildshare" open-type='share' data-id="{{item.article.id}}" data-type="{{item.type}}" data-winemaker_id="{{item.article.winemaker_id}}"></button>
+ <button class="lj_share" bindtap="buildshare" open-type='share' data-id="{{item.article.id}}" data-type="{{item.type}}" data-winemaker_id="{{item.article.winemaker_id}}"></button>
</view>
-
+
</view>
</view>
diff --git a/pages/find/find.wxss b/pages/find/find.wxss
index 5fc5259..5ae82e5 100644
--- a/pages/find/find.wxss
+++ b/pages/find/find.wxss
@@ -191,10 +191,15 @@ image{
justify-content: space-around
}
.winerighttouimg{
- width:30rpx;
+ width:60rpx;
height:28rpx;
font-size: 0;
position:relative;
+ text-align: center
+}
+.winerighttouimg image{
+ width:30rpx;
+ margin:0 auto;
}
.lj_share{
width:60rpx;
@@ -215,7 +220,7 @@ button::after{
align-items: center
}
.wineeng{
- color:#666666;
+ color:#666666;
font-size: 28rpx;
margin-left: 20rpx;
}
@@ -223,6 +228,9 @@ button::after{
color:#666666;
font-size:28rpx;
margin-left:10rpx;
+ /* height:28rpx;
+ line-height:28rpx; */
+ margin-top:1rpx;
}
.wineblock{
border-bottom: 14rpx solid #F2F2F2;
diff --git a/pages/findblock/jiudandetail/jiudandetail.js b/pages/findblock/jiudandetail/jiudandetail.js
index 0815470..59416c6 100644
--- a/pages/findblock/jiudandetail/jiudandetail.js
+++ b/pages/findblock/jiudandetail/jiudandetail.js
@@ -148,6 +148,15 @@ Page({
})
},
+
+ jumpbrand(e) {
+ let id = e.currentTarget.dataset.id
+ wx.navigateTo({
+ url: '/pages/homeblock/jiuzidian/jiuzidian?id=' + id,
+ })
+
+
+ },
/**
* 生命周期函数--监听页面初次渲染完成
@@ -160,6 +169,10 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow: function () {
+ this.setData({
+ page:1,
+ rec_list:[]
+ })
this.getjiudandetail()
},
diff --git a/pages/findblock/jiudandetail/jiudandetail.wxml b/pages/findblock/jiudandetail/jiudandetail.wxml
index a8662b8..f794ee2 100644
--- a/pages/findblock/jiudandetail/jiudandetail.wxml
+++ b/pages/findblock/jiudandetail/jiudandetail.wxml
@@ -18,27 +18,27 @@
<view class="jiudanfenitem">
<view class="jiudanfenimg" bindtap="collect" data-id="{{info.user_id}}">
<image src="{{url}}/aicon_10x.png" wx:if="{{info.is_favorite==1}}"></image>
- <image src="{{url}}/aicon_09x.png" wx:else></image>
+ <image src="{{url}}aicon_09x.png" wx:else></image>
</view>
<view class="collect">收藏</view>
</view>
<view class="jiudanfenitem">
<view class="jiudanfenimg zhuan">
- <image src="{{url}}/aicon_68x.png"></image>
+ <image src="{{url}}aicon_68x.png"></image>
<button class="lj_share" catchtap="buildshare" open-type='share'></button>
</view>
<view class="collect">转发</view>
</view>
<view class="jiudanfenitem" bindtap="pinglun" data-id="{{info.id}}">
<view class="jiudanfenimg">
- <image src="{{url}}/aicon_67x.png"></image>
+ <image src="{{url}}aicon_67x.png"></image>
</view>
<view class="collect">{{info.comment_count}}</view>
</view>
<view class="jiudanfenitem" bindtap="dianzan" data-id="{{info.user_id}}">
<view class="jiudanfenimg">
- <image src="{{url}}/aicon_46x.png" wx:if="{{info.is_good==1}}"></image>
- <image src="{{url}}/aicon_47x.png" wx:else></image>
+ <image src="{{url}}aicon_46x.png" wx:if="{{info.is_good==1}}"></image>
+ <image src="{{url}}aicon_47x.png" wx:else></image>
</view>
<view class="collect">{{info.good_count}}</view>
@@ -50,7 +50,11 @@
<view class="jiupin" >
- <view class="searchitem" wx:for="{{rec_list}}" wx:key=''>
+ <view class="nodataimg" wx:if="{{rec_list.length==0}}">
+<image src="/img/wushuju.png"></image>
+</view>
+
+ <view class="searchitem" wx:for="{{rec_list}}" wx:key='' bindtap="jumpbrand" data-id="{{item.id}}">
<view class="searchitemleft">
<view class="itemleftimg">
<image src="{{item.logo}}"></image>
diff --git a/pages/findblock/jiulist/jiulist.js b/pages/findblock/jiulist/jiulist.js
index 091162e..8a3fcec 100644
--- a/pages/findblock/jiulist/jiulist.js
+++ b/pages/findblock/jiulist/jiulist.js
@@ -166,6 +166,7 @@ Page({
},
//进入详情页
detail(e){
+ console.log(9090)
let id=e.currentTarget.dataset.id;
wx.navigateTo({
url: '/pages/findblock/jiudandetail/jiudandetail?id='+id,
diff --git a/pages/findblock/jiulist/jiulist.wxml b/pages/findblock/jiulist/jiulist.wxml
index 13211d3..1c397bf 100644
--- a/pages/findblock/jiulist/jiulist.wxml
+++ b/pages/findblock/jiulist/jiulist.wxml
@@ -1,40 +1,50 @@
+<view class="nodataimg" wx:if="{{peoplelist.length==0}}">
+<image src="/img/wushuju.png"></image>
+</view>
+
+<block wx:else>
<view class="wineblock" wx:for="{{peoplelist}}" wx:key=''>
-<view class="date">{{item.date}}</view>
-<view class='wine_list' >
- <view class='list_item' wx:for="{{item.list}}" wx:key="" bindtap="detail" data-id="{{item.id}}">
- <view class='img_box'>
- <image src='{{item.avatar}}'></image>
- </view>
- <view class='wine_title'>{{item.title}}</view>
- <view class='wine_name'>{{item.user_nickname}}</view>
- <view class='wine_leavel'>lv{{item.level}}</view>
- <view class='action_box'>
- <view class='single_action' catchtap="zan" data-id="{{item.user_id}}">
- <view class='zan_icon'>
- <image src='/img/aicon_46.png' mode='widthFix' wx:if="{{item.is_good==1}}"></image>
- <image src='/img/aicon_47.png' mode='widthFix' wx:else></image>
+ <view class="date">{{item.date}}</view>
+ <view class='wine_list'>
+ <view class='list_item' wx:for="{{item.list}}" wx:key="">
+
+ <view class="tou" bindtap="detail" data-id="{{item.id}}">
+ <view class='img_box'>
+ <image src='{{item.avatar}}'></image>
</view>
- {{item.good_count}}
+ <!-- <view class='wine_title'>{{item.title}}</view> -->
+ <view class='wine_name'>{{item.user_nickname}}</view>
+ <view class='wine_leavel'>lv{{item.level}}</view>
</view>
- <view class='single_action' catchtap="pinglun" data-id="{{item.id}}">
- <view class='zan_icon'>
- <image src='/img/aicon_67.png' mode='widthFix'></image>
+
+ <view class='action_box'>
+ <view class='single_action' catchtap="zan" data-id="{{item.user_id}}">
+ <view class='zan_icon'>
+ <image src='/img/aicon_46.png' mode='widthFix' wx:if="{{item.is_good==1}}"></image>
+ <image src='/img/aicon_47.png' mode='widthFix' wx:else></image>
+ </view>
+ {{item.good_count}}
</view>
- {{item.comment_count}}
- </view>
- <view class='single_action {{item.choose?"active":""}}' catchtap='shareAction' data-id="{{item.id}}">
- <image src='/img/gengduo.png' mode='widthFix' class='moreIcon'></image>
- <view class='min_action_box'>
- <view class='action_btn' wx:if="{{item.is_favorite==0}}" catchtap="collect" data-id="{{item.user_id}}">收藏</view>
- <view class='action_btn yishou' wx:else catchtap="collect" data-id="{{item.user_id}}">已收藏</view>
+ <view class='single_action' catchtap="pinglun" data-id="{{item.id}}">
+ <view class='zan_icon'>
+ <image src='/img/aicon_67.png' mode='widthFix'></image>
+ </view>
+ {{item.comment_count}}
+ </view>
+ <view class='single_action {{item.choose?"active":""}}' catchtap='shareAction' data-id="{{item.id}}">
+ <image src='/img/gengduo.png' mode='widthFix' class='moreIcon'></image>
+ <view class='min_action_box'>
+ <view class='action_btn' wx:if="{{item.is_favorite==0}}" catchtap="collect" data-id="{{item.user_id}}">收藏</view>
+ <view class='action_btn yishou' wx:else catchtap="collect" data-id="{{item.user_id}}">已收藏</view>
- <view class='action_btn'>分享</view>
- <button class="lj_share" catchtap="buildshare" open-type='share' data-id="{{item.id}}" ></button>
- </view>
+ <view class='action_btn'>分享</view>
+ <button class="lj_share" catchtap="buildshare" open-type='share' data-id="{{item.id}}"></button>
+ </view>
+ </view>
</view>
</view>
+
</view>
-
-</view>
</view>
+</block>
\ No newline at end of file
diff --git a/pages/findblock/jiulist/jiulist.wxss b/pages/findblock/jiulist/jiulist.wxss
index 78ac271..505200f 100644
--- a/pages/findblock/jiulist/jiulist.wxss
+++ b/pages/findblock/jiulist/jiulist.wxss
@@ -71,7 +71,7 @@ page{
margin-right: 10rpx;
}
.moreIcon{
- width: 4rpx;
+ width: 5rpx;
}
.min_action_box{
width: 134rpx;
@@ -141,4 +141,9 @@ button::after{
border:none;
outline: none;
background: transparent
+}
+.tou{
+ display:flex;
+ flex-direction: column;
+ align-items: center
}
\ No newline at end of file
diff --git a/pages/findblock/meirixinjiu/meirixinjiu.wxml b/pages/findblock/meirixinjiu/meirixinjiu.wxml
index 80f5edd..8c8b9d4 100644
--- a/pages/findblock/meirixinjiu/meirixinjiu.wxml
+++ b/pages/findblock/meirixinjiu/meirixinjiu.wxml
@@ -1,9 +1,14 @@
+<view class="nodataimg" wx:if="{{winelist.length==0}}">
+ <image src="/img/wushuju.png"></image>
+</view>
+
+<block wx:else>
<view class="jiupin" wx:for="{{winelist}}" wx:key=''>
<view class="date">{{item.date}}</view>
- <view class="searchitem" wx:for="{{item.list}}" wx:key="" bindtap="jump" data-id="{{item.wine_id}}">
- <view class="searchitemleft">
+ <view class="searchitem" wx:for="{{item.list}}" wx:key="" >
+ <view class="searchitemleft" bindtap="jump" data-id="{{item.wine_id}}">
<view class="itemleftimg">
<image src="{{item.thumb}}"></image>
</view>
@@ -19,12 +24,14 @@
</view>
</view>
- <view class="starimg" catchtap="collect" data-id="{{item.wine_id}}">
+ <view class="searchitemright" bindtap="collect" data-id="{{item.wine_id}}">
+
+ <view class="starimg">
<image src="{{url}}aicon_10x.png" wx:if="{{item.is_favorite==1}}"></image>
<image src="{{url}}aicon_09x.png" wx:else></image>
-
</view>
-
+ </view>
</view>
-</view>
\ No newline at end of file
+</view>
+</block>
\ No newline at end of file
diff --git a/pages/findblock/meirixinjiu/meirixinjiu.wxss b/pages/findblock/meirixinjiu/meirixinjiu.wxss
index 1229608..8a737f6 100644
--- a/pages/findblock/meirixinjiu/meirixinjiu.wxss
+++ b/pages/findblock/meirixinjiu/meirixinjiu.wxss
@@ -7,6 +7,7 @@
border-bottom: 1rpx solid #f5f5f5;
}
.searchitemleft{
+ width:670rpx;
display:flex;
align-items: center
}
@@ -76,4 +77,10 @@
padding: 11rpx 32rpx;
box-sizing: border-box;
background: #F2F2F2
+ }
+ .searchitemright{
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ flex:1;
}
\ No newline at end of file
diff --git a/pages/findblock/niangjiushi/niangjiushi.wxml b/pages/findblock/niangjiushi/niangjiushi.wxml
index 798e351..15e57a5 100644
--- a/pages/findblock/niangjiushi/niangjiushi.wxml
+++ b/pages/findblock/niangjiushi/niangjiushi.wxml
@@ -1,34 +1,44 @@
-<view class="niangjiulist">
- <view class="niangjiuitem" wx:for="{{list}}" wx:key="" bindtap="niangjiuteacherdetail" data-id="{{item.winemaker_id}}">
- <view class="teachimg">
- <image src="{{item.avatar}}"></image>
+
+<view class="nodataimg" wx:if="{{list.length==0}}">
+<image src="/img/wushuju.png"></image>
+</view>
+
+<view class="niangjiulist" wx:else>
+ <view class="niangjiuitem" wx:for="{{list}}" wx:key="" >
+
+ <view bindtap="niangjiuteacherdetail" data-id="{{item.winemaker_id}}">
+ <view class="teachimg">
+ <image src="{{item.avatar}}"></image>
+ </view>
+ <view class="jiuname">{{item.name}}</view>
+
+ <view class="atten" wx:if="{{item.is_concern==0}}" catchtap="atten" data-id="{{item.winemaker_id}}">关注</view>
+ <view class="atten aten1" wx:else catchtap="atten" data-id="{{item.winemaker_id}}">取消关注</view>
+
+ </view>
+
+
+ <view class="jiubottom">
+ <view class="jiuleft">
+ <view class="jiuleftimg" catchtap="zan" data-id="{{item.winemaker_id}}">
+ <image src="{{url}}/aicon_47x.png" wx:if="{{item.is_good==0}}"></image>
+ <image src="{{url}}/aicon_46x.png" wx:else></image>
</view>
- <view class="jiuname">{{item.name}}</view>
-
- <view class="atten" wx:if="{{item.is_concern==0}}" catchtap="atten" data-id="{{item.winemaker_id}}">关注</view>
- <view class="atten aten1" wx:else catchtap="atten" data-id="{{item.winemaker_id}}">取消关注</view>
-
- <view class="jiubottom">
- <view class="jiuleft">
- <view class="jiuleftimg" catchtap="zan" data-id="{{item.winemaker_id}}">
- <image src="{{url}}/aicon_47x.png" wx:if="{{item.is_good==0}}"></image>
- <image src="{{url}}/aicon_46x.png" wx:else></image>
- </view>
- <view class="jiuzan">{{item.good_count}}</view>
- </view>
-
- <view class="jiumiddle" catchtap="ping" data-id="{{item.winemaker_id}}">
- <view class="middleimg">
- <image src="{{url}}/aicon_67x.png"></image>
- </view>
- <view class="tiao">{{item.comment_count}}</view>
- </view>
-
- <view class="jiuright">
- <image src="{{url}}/aicon_68x.png"></image>
- <button class="lj_share" bindtap="buildshare" open-type='share' data-id="{{item.winemaker_id}}" ></button>
- </view>
+ <view class="jiuzan">{{item.good_count}}</view>
+ </view>
+
+ <view class="jiumiddle" catchtap="ping" data-id="{{item.winemaker_id}}">
+ <view class="middleimg">
+ <image src="{{url}}/aicon_67x.png"></image>
</view>
+ <view class="tiao">{{item.comment_count}}</view>
+ </view>
+
+ <view class="jiuright">
+ <image src="{{url}}/aicon_68x.png"></image>
+ <button class="lj_share" bindtap="buildshare" open-type='share' data-id="{{item.winemaker_id}}"></button>
+ </view>
</view>
-
-</view>
+ </view>
+
+</view>
\ No newline at end of file
diff --git a/pages/findblock/putongwenzhang/putongwenzhang.js b/pages/findblock/putongwenzhang/putongwenzhang.js
index bf22104..1d75fdf 100644
--- a/pages/findblock/putongwenzhang/putongwenzhang.js
+++ b/pages/findblock/putongwenzhang/putongwenzhang.js
@@ -63,17 +63,20 @@ Page({
let newlist=that.data.list;
for(var obj of newlist){
- if (obj.is_good==0){
- obj.is_good=1;
- obj.good_count = obj.good_count+1
- }else{
- obj.is_good=0;
- if (obj.good_count==0){
- obj.obj.good_count=0
- }else{
- obj.good_count = obj.good_count-1
+ if(obj.id==id){
+ if (obj.is_good == 0) {
+ obj.is_good = 1;
+ obj.good_count = obj.good_count + 1
+ } else {
+ obj.is_good = 0;
+ if (obj.good_count == 0) {
+ obj.obj.good_count = 0
+ } else {
+ obj.good_count = obj.good_count - 1
+ }
}
}
+
}
that.setData({
diff --git a/pages/findblock/putongwenzhang/putongwenzhang.wxml b/pages/findblock/putongwenzhang/putongwenzhang.wxml
index 818982d..8662c4d 100644
--- a/pages/findblock/putongwenzhang/putongwenzhang.wxml
+++ b/pages/findblock/putongwenzhang/putongwenzhang.wxml
@@ -1,5 +1,7 @@
+<view class="nodataimg" wx:if="{{list.length==0}}">
+<image src="/img/wushuju.png"></image>
+</view>
-<view class="nodata" wx:if="{{list.length==0}}" class="nodata">暂无数据</view>
<block wx:else>
<view class="wineblock" wx:for="{{list}}" wx:key='' bindtap="detail" data-id="{{item.id}}">
diff --git a/pages/findblock/wenzhangdetail/wenzhangdetail.js b/pages/findblock/wenzhangdetail/wenzhangdetail.js
index 2bf061e..6e4d6bd 100644
--- a/pages/findblock/wenzhangdetail/wenzhangdetail.js
+++ b/pages/findblock/wenzhangdetail/wenzhangdetail.js
@@ -44,6 +44,9 @@ Page({
info: res.info,
})
+ wx.setNavigationBarTitle({
+ title: res.info.title //页面切换，更换页面标题
+ })
diff --git a/pages/findblock/wenzhangdetail/wenzhangdetail.wxss b/pages/findblock/wenzhangdetail/wenzhangdetail.wxss
index 8aff432..ec052f4 100644
--- a/pages/findblock/wenzhangdetail/wenzhangdetail.wxss
+++ b/pages/findblock/wenzhangdetail/wenzhangdetail.wxss
@@ -128,11 +128,11 @@ image{
}
.lj_share{
- width:20rpx;
+ width:100rpx;
height:30rpx;
border:none;
position: absolute;
- right:0;
+ right:-52rpx;
top:0;
background: transparent
diff --git a/pages/findblock/zhuanjiapinjiu/zhuanjiapinjiu.wxml b/pages/findblock/zhuanjiapinjiu/zhuanjiapinjiu.wxml
index ea9d40a..53c38c3 100644
--- a/pages/findblock/zhuanjiapinjiu/zhuanjiapinjiu.wxml
+++ b/pages/findblock/zhuanjiapinjiu/zhuanjiapinjiu.wxml
@@ -1,4 +1,4 @@
-<view class="wineblock" wx:for="{{list}}" wx:key='' bindtap="detail" data-id="{{item.id}}">
+<!-- <view class="wineblock" wx:for="{{list}}" wx:key='' bindtap="detail" data-id="{{item.id}}">
<view class="winetitle">{{item.title}}</view>
<view class="wineimg" catchtap="entervideo" data-url="{{item.video}}">
<image src="{{item.video_image}}"></image>
@@ -25,13 +25,22 @@
</view>
</view>
</view>
+</view> -->
+
+<view class="nodataimg" wx:if="{{list.length==0}}">
+<image src="/img/wushuju.png"></image>
</view>
-<view class="wineblock">
- <view class="winetitle">浓香酒酿酒大师：沈才宏</view>
+<block wx:else>
+<view class="wineblock" wx:for="{{list}}" wx:key='' bindtap="detail" data-id="{{item.id}}">
+
+ <view class="winetitle">{{item.title}}</view>
- <view class="wineimg">
- <image src="{{url}}aicon_64.png"></image>
+ <view class="wineimg" catchtap="entervideo" data-url="{{item.video}}">
+ <image src="{{item.video_image}}"></image>
+ <view class="vimg">
+ <image src="{{url}}/aicon_70x.png"></image>
+ </view>
</view>
<view class="winebottom">
@@ -69,3 +78,4 @@
</view>
</view>
+</block>
\ No newline at end of file
diff --git a/pages/findblock/zhuanjiapinjiu/zhuanjiapinjiu.wxss b/pages/findblock/zhuanjiapinjiu/zhuanjiapinjiu.wxss
index dc78400..efdaaf8 100644
--- a/pages/findblock/zhuanjiapinjiu/zhuanjiapinjiu.wxss
+++ b/pages/findblock/zhuanjiapinjiu/zhuanjiapinjiu.wxss
@@ -1,7 +1,9 @@
.winetitle{
color:#1A1A1A;
font-size: 28rpx;
- margin-left:36rpx;
+ /* margin-left:36rpx; */
+ padding: 0 36rpx;
+ box-sizing: border-box;
font-weight: bold
}
.wineimg{
@@ -14,6 +16,8 @@
display:flex;
justify-content: space-between;
align-items: center;
+
+ padding: 0 30rpx;
box-sizing: border-box;
margin-top:30rpx;
}
@@ -40,10 +44,14 @@
justify-content: space-between
}
.winerighttouimg{
- width:30rpx;
+ width:60rpx;
height:28rpx;
font-size: 0;
- position: relative
+ position: relative;
+ text-align: center
+}
+.winerighttouimg image{
+ width:30rpx;
}
.winerighttou{
display:flex;
diff --git a/pages/findblock/zhuanjiapinjiudetail/zhuanjiapinjiudetail.js b/pages/findblock/zhuanjiapinjiudetail/zhuanjiapinjiudetail.js
index 962b7ff..339ead3 100644
--- a/pages/findblock/zhuanjiapinjiudetail/zhuanjiapinjiudetail.js
+++ b/pages/findblock/zhuanjiapinjiudetail/zhuanjiapinjiudetail.js
@@ -138,10 +138,11 @@ Page({
},
send(e){
let that=this;
- let content=e.detail.value;
- if(content==''){
+
+ if(that.data.content==''){
wx.showToast({
title: '请输入评论内容',
+ icon:'none'
})
}else{
let url = 'index/Common/comment', params = {
@@ -158,7 +159,8 @@ Page({
})
that.setData({
page:1,
- comment_list:[]
+ comment_list:[],
+ content:''
})
diff --git a/pages/findblock/zhuanjiapinjiudetail/zhuanjiapinjiudetail.wxml b/pages/findblock/zhuanjiapinjiudetail/zhuanjiapinjiudetail.wxml
index 33a901f..2d4558e 100644
--- a/pages/findblock/zhuanjiapinjiudetail/zhuanjiapinjiudetail.wxml
+++ b/pages/findblock/zhuanjiapinjiudetail/zhuanjiapinjiudetail.wxml
@@ -59,7 +59,7 @@
</view>
<view class="pingjiabottom">
<view class="pbleft">
- <input placeholder='输入评论的内容' placeholder-class='enterping' bindinput="entercontent"/>
+ <input placeholder='输入评论的内容' placeholder-class='enterping' value="{{content}}" bindinput="entercontent"/>
</view>
<view class="pbright" bindtap="send">发送</view>
diff --git a/pages/findblock/zhuanjiapinjiudetail/zhuanjiapinjiudetail.wxss b/pages/findblock/zhuanjiapinjiudetail/zhuanjiapinjiudetail.wxss
index cc33371..02e26b4 100644
--- a/pages/findblock/zhuanjiapinjiudetail/zhuanjiapinjiudetail.wxss
+++ b/pages/findblock/zhuanjiapinjiudetail/zhuanjiapinjiudetail.wxss
@@ -1,3 +1,7 @@
+page{
+ overflow-x:hidden;
+}
+
.detailhead {
width: 750rpx;
height: 483rpx;
@@ -94,7 +98,7 @@
.winezan {
color: #666;
font-size: 28rpx;
- margin-left: 5rpx;
+ margin-left: 10rpx;
}
.wineblock {
@@ -224,4 +228,7 @@ image {
button::after{
border:none;
outline:none;
+}
+.niangjiubox{
+ overflow-x: hidden;
}
\ No newline at end of file
diff --git a/pages/forgetmima/forgetmima.js b/pages/forgetmima/forgetmima.js
index 837e2ff..3bf8773 100644
--- a/pages/forgetmima/forgetmima.js
+++ b/pages/forgetmima/forgetmima.js
@@ -17,7 +17,9 @@ Page({
disabled:false,
yanzhengcode:'',
newpassword:'',
- dengshow:false
+ dengshow:false,
+ newmima:true,
+
},
/**
@@ -27,15 +29,13 @@ Page({
this.setData({
url: app.globalData.url
})
-
-
},
enterphone(e){
this.setData({
phone:e.detail.value
})
- this.yanhzengphone()
+ this.yanhzengphone();
},
@@ -51,6 +51,11 @@ Page({
})
}
},
+ showmima(){
+ this.setData({
+ newmima:false
+ })
+ },
clearphone(){
console.log(342)
this.setData({
@@ -70,7 +75,6 @@ Page({
first:false,
second:true
})
-
this.getcode()
}
diff --git a/pages/forgetmima/forgetmima.wxml b/pages/forgetmima/forgetmima.wxml
index 22c061e..e81612e 100644
--- a/pages/forgetmima/forgetmima.wxml
+++ b/pages/forgetmima/forgetmima.wxml
@@ -41,11 +41,14 @@
<view class="yanzheng mima">
<view class="yanzhengmiddle yanzhengma">
- <input placeholder='设置新密码' placeholder-class='enterphone' bindinput="setnewmima" type="password" value="{{newpassword}}"/>
+ <input placeholder='设置新密码' placeholder-class='enterphone' bindinput="setnewmima" type="password" value="{{newpassword}}" wx:if="{{newmima}}"/>
+
+ <input placeholder='设置新密码' placeholder-class='enterphone' bindinput="setnewmima" type="text" value="{{newpassword}}" wx:else/>
+
</view>
<view class="mimaimg">
- <view class="eyeimg">
+ <view class="eyeimg" bindtap="showmima">
<image src="{{url}}/bicon_13x.png"></image>
</view>
</view>
diff --git a/pages/homapage/homepage.js b/pages/homapage/homepage.js
index 448a6c5..27c4a04 100644
--- a/pages/homapage/homepage.js
+++ b/pages/homapage/homepage.js
@@ -175,10 +175,15 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function(options) {
- this.setData({
- url: app.globalData.url
- })
- console.log(this.data.url)
+ let that=this;
+ setTimeout(function(){
+ that.setData({
+ url: app.globalData.url
+ })
+ },1000)
+
+
+
this.getshailist();
this.getcity();
@@ -453,37 +458,58 @@ Page({
let newshaikind = this.data.shaikind;
for (var obj of newshaikind) {
- if (obj.id == id) {
- obj.sel = !obj.sel
- } else {
- obj.sel = false
- }
+
if (this.data.type == 1) {
- if (obj.sel == true) {
- this.setData({
- sort_id: obj.id,
-
- })
+ if (obj.id == id) {
+ obj.sel = !obj.sel;
+ if (obj.sel == true) {
+ this.setData({
+ sort_id: obj.id,
- let newkindlist=this.data.kindlist;
- newkindlist[0].name = obj.sort_name;
- this.setData({
- kindlist:newkindlist
- })
+ })
+
+ let newkindlist = this.data.kindlist;
+ newkindlist[0].name = obj.sort_name;
+ this.setData({
+ kindlist: newkindlist
+ })
+ } else {
+ let newkindlist = this.data.kindlist;
+ newkindlist[0].name = "品类";
+ this.setData({
+ kindlist: newkindlist
+ })
+ }
+ } else {
+ obj.sel = false
}
+
} else if (this.data.type == 4) {
- if (obj.sel == true) {
- this.setData({
- odor_id: obj.id
- })
- let newkindlist = this.data.kindlist;
- newkindlist[3].name = obj.odor_name;
- this.setData({
- kindlist: newkindlist
- })
+ if(obj.id==id){
+ obj.sel = !obj.sel;
+ if (obj.sel == true) {
+ this.setData({
+ odor_id: obj.id
+ })
+
+ let newkindlist = this.data.kindlist;
+ newkindlist[3].name = obj.odor_name;
+ this.setData({
+ kindlist: newkindlist
+ })
+ }else{
+ let newkindlist = this.data.kindlist;
+ newkindlist[3].name = "香型";
+ this.setData({
+ kindlist: newkindlist
+ })
+ }
+ }else{
+ obj.sel = false
}
+
}
@@ -548,19 +574,30 @@ Page({
for (var obj of newcountrylist) {
obj.sel = !obj.sel;
- if (obj.sel == true) {
+
if (obj.id == countryid) {
- let newkindlist = this.data.kindlist;
+ if (obj.sel == true) {
+ let newkindlist = this.data.kindlist;
- newkindlist[1].name = obj.country_name
- this.setData({
- kindlist: newkindlist,
- country: obj.country_name
- })
+ newkindlist[1].name = obj.country_name
+ this.setData({
+ kindlist: newkindlist,
+ country: obj.country_name
+ })
+ }else{
+ let newkindlist = this.data.kindlist;
+
+ newkindlist[1].name = "国别"
+ this.setData({
+ kindlist: newkindlist,
+ country: ''
+ })
+ }
+
} else {
obj.sel = false
}
- }
+
}
@@ -609,17 +646,25 @@ Page({
for(var i=0;i<newreginlist.length;i++){
// newreginlist[i].sel = !newreginlist[i].sel
if(i==reginindex){
- console.log(243782347)
- newreginlist[i].sel=true;
- let newkindlist = this.data.kindlist;
- newkindlist[2].name = newreginlist[i].name;
- this.setData({
- kindlist: newkindlist,
- region: newreginlist[i].name
- })
+ newreginlist[i].sel = !newreginlist[i].sel;
+ if (newreginlist[i].sel==true){
+ // newreginlist[i].sel=true;
+ let newkindlist = this.data.kindlist;
+ newkindlist[2].name = newreginlist[i].name;
+ this.setData({
+ kindlist: newkindlist,
+ region: newreginlist[i].name
+ })
- console.log(this.data.kindlist)
-
+ console.log(this.data.kindlist)
+ }else{
+ let newkindlist = this.data.kindlist;
+ newkindlist[2].name = "产区";
+ this.setData({
+ kindlist: newkindlist,
+ region: ""
+ })
+ }
}else{
newreginlist[i].sel=false
}
diff --git a/pages/homeblock/brandlist/brandlist.js b/pages/homeblock/brandlist/brandlist.js
index 3d7e03f..954980f 100644
--- a/pages/homeblock/brandlist/brandlist.js
+++ b/pages/homeblock/brandlist/brandlist.js
@@ -21,9 +21,15 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
+ let that = this;
+ setTimeout(function () {
+ that.setData({
+ url: app.globalData.url
+ })
+ }, 1000)
console.log(options)
this.setData({
- url: app.globalData.url,
+
brandid:options.id
})
@@ -36,6 +42,10 @@ Page({
status:e.currentTarget.dataset.idx+1
})
+ this.setData({
+ page:1,
+ brandlist:[]
+ })
this.getbrandlist()
},
@@ -54,7 +64,7 @@ Page({
console.log(res);
that.setData({
info: res.info,
- brandlist:res.list
+ brandlist:that.data.brandlist.concat(res.list)
})
@@ -77,9 +87,23 @@ Page({
console.log(res);
wx.showToast({
title: res,
- icon:'none'
+ icon:'none',
+
+ })
+ let newinfo=that.data.info;
+ if (newinfo.is_favorite==0){
+ newinfo.is_favorite=1
+ }else{
+ newinfo.is_favorite = 0
+ }
+ that.setData({
+ info:newinfo
})
- that.getbrandlist()
+ // that.setData({
+ // page: 1,
+ // brandlist: []
+ // })
+ // that.getbrandlist()
}).catch((err) => {
@@ -102,7 +126,24 @@ Page({
title: res,
icon:'none'
})
- that.getbrandlist()
+
+ let newbrandlist=that.data.brandlist;
+ console.log(newbrandlist)
+ console.log(id)
+ for (var obj of newbrandlist){
+
+ if(obj.id==id){
+ console.log(888)
+ if (obj.is_favorite==0){
+ obj.is_favorite=1
+ } else {
+ obj.is_favorite = 0
+ }
+ }
+ }
+ that.setData({
+ brandlist: newbrandlist
+ })
}).catch((err) => {
@@ -118,6 +159,15 @@ Page({
url: '/pages/homeblock/brandpage/brandpage?id='+id,
})
},
+ jumpbrand(e) {
+ let id = e.currentTarget.dataset.id
+ wx.navigateTo({
+ url: '/pages/homeblock/jiuzidian/jiuzidian?id=' + id,
+ })
+
+
+ },
+
/**
* 生命周期函数--监听页面初次渲染完成
*/
@@ -157,7 +207,13 @@ Page({
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
+ let page=this.data.page;
+ page++;
+ this.setData({
+ page:page
+ })
+ this.getbrandlist()
},
/**
diff --git a/pages/homeblock/brandlist/brandlist.wxml b/pages/homeblock/brandlist/brandlist.wxml
index 8034361..72f1932 100644
--- a/pages/homeblock/brandlist/brandlist.wxml
+++ b/pages/homeblock/brandlist/brandlist.wxml
@@ -26,10 +26,12 @@
<view class="baiyun">{{info.name}}</view>
<view>
-
-<view class="nodata" wx:if="{{brandlist.length==0}}">暂无数据</view>
+<view class="nodataimg" wx:if="{{brandlist.length==0}}">
+<image src="/img/wushuju.png"></image>
+</view>
+<!-- <view class="nodata" wx:if="{{brandlist.length==0}}">暂无数据</view> -->
<block wx:else>
- <view class="searchitem" wx:for="{{brandlist}}" wx:key=''>
+ <view class="searchitem" wx:for="{{brandlist}}" wx:key='' bindtap="jumpbrand" data-id="{{item.id}}">
<view class="searchitemleft">
<view class="itemleftimg">
<image src="{{item.logo}}"></image>
@@ -46,7 +48,7 @@
</view>
</view>
- <view class="starimg" bindtap="collectwine" data-id="{{item.id}}">
+ <view class="starimg" catchtap="collectwine" data-id="{{item.id}}">
<image src="{{url}}aicon_10x.png" wx:if="{{item.is_favorite==1}}"></image>
<image src="{{url}}aicon_09x.png" wx:else></image>
diff --git a/pages/homeblock/brandpage/brandpage.js b/pages/homeblock/brandpage/brandpage.js
index 334b40d..467d40b 100644
--- a/pages/homeblock/brandpage/brandpage.js
+++ b/pages/homeblock/brandpage/brandpage.js
@@ -17,8 +17,14 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
+ let that = this;
+ setTimeout(function () {
+ that.setData({
+ url: app.globalData.url
+ })
+ }, 1000)
this.setData({
- url: app.globalData.url,
+
id:options.id
})
this.getbrandtail()
diff --git a/pages/homeblock/brandpage/brandpage.wxml b/pages/homeblock/brandpage/brandpage.wxml
index 1e5d9e2..49a6c2e 100644
--- a/pages/homeblock/brandpage/brandpage.wxml
+++ b/pages/homeblock/brandpage/brandpage.wxml
@@ -32,11 +32,11 @@
<view class="brandbox">
<view class="brandboxitem" wx:for="{{attr}}" wx:key='' wx:for-index="idxs">
- <view class="boxtop">
+ <view class="boxtop" bindtap="showinfo" data-idx="{{idxs}}">
<view class="boxtopleft">
{{item.name}}
</view>
- <view class="boxright" bindtap="showinfo" data-idx="{{idxs}}">
+ <view class="boxright" >
<image src="{{url}}aicon_53x.png" wx:if="{{item.show}}"></image>
<image src="{{url}}aicon_52x.png" wx:else></image>
</view>
diff --git a/pages/homeblock/companyintro/companyintro.js b/pages/homeblock/companyintro/companyintro.js
index 0fc507c..ffb7e94 100644
--- a/pages/homeblock/companyintro/companyintro.js
+++ b/pages/homeblock/companyintro/companyintro.js
@@ -8,11 +8,9 @@ Page({
*/
data: {
url:'',
- imgUrls: ["http://winesbook.cn/static/images_mini/aicon_23@2x.png",
- "http://winesbook.cn/static/images_mini/aicon_23@2x.png",
- "http://winesbook.cn/static/images_mini/aicon_23@2x.png"],
+ imgUrls: [],
indicatorDots: false,
- autoplay: false,
+ autoplay: true,
interval: 2000,
duration: 1000,
currentSwiper: 0,
@@ -26,8 +24,14 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
+ let that=this;
+ setTimeout(function(){
+ that.setData({
+ url: app.globalData.url,
+ })
+ },1500)
this.setData({
- url: app.globalData.url,
+
id:options.id
})
this.getcompanydetail()
@@ -137,7 +141,7 @@ Page({
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
-
+ wx.setStorageSync("guantype", "")
},
/**
diff --git a/pages/homeblock/companyintro/companyintro.wxml b/pages/homeblock/companyintro/companyintro.wxml
index 8439481..d786bc9 100644
--- a/pages/homeblock/companyintro/companyintro.wxml
+++ b/pages/homeblock/companyintro/companyintro.wxml
@@ -13,7 +13,7 @@
</view>
<view class="swiper_image">
- <swiper indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}" class="swiper_item_img" bindchange="swiperChange">
+ <swiper indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}" class="swiper_item_img" bindchange="swiperChange" circular='true'>
<block wx:for="{{imgUrls}}" wx:key="doct">
<swiper-item style="border-radius:10px;">
<image src="{{item.url}}" data-index='{{index}}' class="slide-image" bindtap='viewImg' width="355" height="150" />
@@ -31,11 +31,11 @@
<view class="brandbox">
<view class="brandboxitem" wx:for="{{attr}}" wx:key='' wx:for-index="idxs">
- <view class="boxtop">
+ <view class="boxtop" bindtap="showinfo" data-idx="{{idxs}}">
<view class="boxtopleft">
{{item.name}}
</view>
- <view class="boxright" bindtap="showinfo" data-idx="{{idxs}}">
+ <view class="boxright" >
<image src="{{url}}aicon_53x.png" wx:if="{{item.show}}"></image>
<image src="{{url}}aicon_52x.png" wx:else></image>
</view>
diff --git a/pages/homeblock/companyintro/companyintro.wxss b/pages/homeblock/companyintro/companyintro.wxss
index 9f154aa..dbdcad7 100644
--- a/pages/homeblock/companyintro/companyintro.wxss
+++ b/pages/homeblock/companyintro/companyintro.wxss
@@ -75,7 +75,9 @@ image{
.boxtop{
display:flex;
justify-content: space-between;
- align-items: center
+ align-items: center;
+ padding: 10rpx 0;
+ box-sizing: border-box
}
.boxtopleft{
color:#1A1A1A;
diff --git a/pages/homeblock/evalute/evalute.js b/pages/homeblock/evalute/evalute.js
index 64792cd..f722597 100644
--- a/pages/homeblock/evalute/evalute.js
+++ b/pages/homeblock/evalute/evalute.js
@@ -7,7 +7,7 @@ Page({
*/
data: {
url: '',
- star1: 0,
+ star1: 5,
sepic: true,
id: '',
biaoqian: false,
@@ -180,7 +180,12 @@ Page({
sureadd() {
let that = this;
- if (that.data.labelname.length > 10) {
+ if (that.data.labelname==''){
+ wx.showToast({
+ title: '请输入标签名字',
+ icon: 'none'
+ })
+ }else if (that.data.labelname.length > 10) {
wx.showToast({
title: '请输入10以下的字符',
icon: 'none'
@@ -392,54 +397,73 @@ Page({
//发布
publish() {
let that = this;
- let newfiles = [];
- let newimages = that.data.chuanimages;
- if (that.data.chuanvideoimg != '') {
- newfiles.push(that.data.chuanvideoimg)
+ if (that.data.star1==0){
+ wx.showToast({
+ title: '请滑动选择星星评分',
+ icon: 'none'
+ })
+ }else if (that.data.content==''){
+ wx.showToast({
+ title: '请输入评论内容',
+ icon:'none'
+ })
+ } else if (that.data.labelid.length==0){
+ wx.showToast({
+ title: '请选择标签',
+ icon: 'none'
+ })
}
-
- if (newimages.length != 0) {
- for (var i = 0; i < newimages.length; i++) {
- newfiles.push(newimages[i])
+ else{
+ let newfiles = [];
+ let newimages = that.data.chuanimages;
+ if (that.data.chuanvideoimg != '') {
+ newfiles.push(that.data.chuanvideoimg)
}
- }
- newfiles = newfiles.join(",");
- console.log(newfiles)
- let newlabelid=that.data.labelid;
- newlabelid= newlabelid.join(",")
- console.log(newlabelid)
+ if (newimages.length != 0) {
+ for (var i = 0; i < newimages.length; i++) {
+ newfiles.push(newimages[i])
+ }
+ }
+ newfiles = newfiles.join(",");
+ console.log(newfiles)
+ let newlabelid = that.data.labelid;
+ newlabelid = newlabelid.join(",")
+ console.log(newlabelid)
- let url = 'index/Wine/create_comment',
- params = {
- wine_id: that.data.id,
- score: that.data.star1,
- content: that.data.content,
- files: newfiles,
- position: that.data.currentCity,
- tags: newlabelid
- }
- app.post(url, params).then((res) => {
- console.log(res);
+ let url = 'index/Wine/create_comment',
+ params = {
+ wine_id: that.data.id,
+ score: that.data.star1,
+ content: that.data.content,
+ files: newfiles,
+ position: that.data.currentCity,
+ tags: newlabelid
- wx.showToast({
- title: '发布成功',
- icon:'none'
- })
+ }
+ app.post(url, params).then((res) => {
+ console.log(res);
- setTimeout(function(){
- wx.navigateBack({
- checked:true
+ wx.showToast({
+ title: '发布成功',
+ icon: 'none'
})
- },1500)
+ setTimeout(function () {
+ wx.navigateBack({
+ checked: true
+ })
+ }, 1500)
- }).catch((err) => {
- })
+ }).catch((err) => {
+
+ })
+ }
+
},
/**
diff --git a/pages/homeblock/evalute/evalute.wxml b/pages/homeblock/evalute/evalute.wxml
index 6e8e2f2..4cb44bb 100644
--- a/pages/homeblock/evalute/evalute.wxml
+++ b/pages/homeblock/evalute/evalute.wxml
@@ -40,11 +40,11 @@
</view>
-<view class="biaoqian">
+<view class="biaoqian" bindtap="se">
<view class="biaoqianleft">
选择标签
</view>
- <view class="biaoqianright" bindtap="se">
+ <view class="biaoqianright" >
<image src="{{sepic==true?'http://winesbook.cn/static/images_mini/aicon_53x.png':'http://winesbook.cn/static/images_mini/aicon_52x.png'}}"></image>
</view>
</view>
diff --git a/pages/homeblock/evalute/evalute.wxss b/pages/homeblock/evalute/evalute.wxss
index 8300b3c..bda53cb 100644
--- a/pages/homeblock/evalute/evalute.wxss
+++ b/pages/homeblock/evalute/evalute.wxss
@@ -21,7 +21,7 @@
display:flex;
align-items: center;
justify-content: center;
- margin-top:105rpx;
+ margin-top:95rpx;
}
.biaoqianright{
width:24rpx;
@@ -39,6 +39,7 @@
flex-wrap: wrap;
padding: 0 32rpx 0 32rpx;
box-sizing: border-box;
+ margin-top:20rpx;
}
.showpicitem{
@@ -212,5 +213,6 @@ font-size: 32rpx
font-size: 32rpx;
}
.labelactive{
- border:1rpx solid #E81825
+ background: #E81825;
+ color:#fff;
}
\ No newline at end of file
diff --git a/pages/homeblock/evalutecontent/evalutecontent.js b/pages/homeblock/evalutecontent/evalutecontent.js
index 6a7fc09..f57645d 100644
--- a/pages/homeblock/evalutecontent/evalutecontent.js
+++ b/pages/homeblock/evalutecontent/evalutecontent.js
@@ -89,6 +89,21 @@ Page({
})
},
+ //图片预览
+ viewImg(e) {
+
+ let that = this;
+ let parindex = e.currentTarget.dataset.paridx;
+ let childindex = e.currentTarget.dataset.childidx;
+ wx.previewImage({
+ current: that.data.list[parindex].files[childindex].url,
+ urls: that.data.list[parindex].files,
+ success: function (res) { },
+ fail: function (res) { },
+ complete: function (res) { },
+ })
+ },
+
//进入视频页面
entervido(e){
let url=e.currentTarget.dataset.url
diff --git a/pages/homeblock/evalutecontent/evalutecontent.wxml b/pages/homeblock/evalutecontent/evalutecontent.wxml
index 442b6bc..9358c50 100644
--- a/pages/homeblock/evalutecontent/evalutecontent.wxml
+++ b/pages/homeblock/evalutecontent/evalutecontent.wxml
@@ -142,7 +142,7 @@
<view class="hotticket">热门标签</view>
<view class="botlabet">
- <view class="labelitem" wx:for="{{hot_tag}}" wx:key=''>
+ <view class="labelitem" wx:for="{{hot_tag}}" wx:key='' >
<text>{{item.name}}</text>
<text class="labelitemright">{{item.comment_count}}</text>
</view>
@@ -152,7 +152,7 @@
</view>
<view class="boxmiddle">
- <view class="boxmiddleitem" wx:for="{{list}}" wx:key=''>
+ <view class="boxmiddleitem" wx:for="{{list}}" wx:key='' wx:for-index='par'>
<view class="evaluteitemleft">
<image src="{{item.avatar}}"></image>
</view>
@@ -195,7 +195,7 @@
<view class="evaltext">{{item.content}}</view>
<view class="medioblock">
<block wx:if="{{item.files.length!=0}}">
- <view class="evalimgitem" wx:for='{{item.files}}' wx:key="">
+ <view class="evalimgitem" wx:for='{{item.files}}' wx:key="" bindtap='viewImg' data-paridx="{{par}}" wx:for-index='sec' data-childidx="{{sec}}">
<image src="{{item}}"></image>
</view>
diff --git a/pages/homeblock/evalutecontent/evalutecontent.wxss b/pages/homeblock/evalutecontent/evalutecontent.wxss
index ae406c4..966acf9 100644
--- a/pages/homeblock/evalutecontent/evalutecontent.wxss
+++ b/pages/homeblock/evalutecontent/evalutecontent.wxss
@@ -205,14 +205,19 @@ image {
}
.zanimg{
- width:30rpx;
+ width:60rpx;
+
height:28rpx;
- font-size: 0
+ font-size: 0;
+ text-align: center
+}
+.zanimg image{
+ width:30rpx;
}
.zannum{
color:#999999;
font-size: 28rpx;
- margin-left:20rpx;
+ margin-left:0rpx;
}
.writeimg{
width:126rpx;
diff --git a/pages/homeblock/guanimg/guanimg.wxml b/pages/homeblock/guanimg/guanimg.wxml
index e2cab05..4a08b6a 100644
--- a/pages/homeblock/guanimg/guanimg.wxml
+++ b/pages/homeblock/guanimg/guanimg.wxml
@@ -2,11 +2,19 @@
标准图
</view>
+
+
+
<view class="biaozhaunbox">
- <view class="biaozhuanitem" wx:for="{{banner}}" wx:key="" bindtap='viewImg' data-index="{{index}}">
- <image src="{{item.url}}"></image>
+
+ <view class="nodataimg" wx:if="{{banner.length==0}}">
+ <image src="/img/wushuju.png"></image>
</view>
-
+ <block wx:else>
+ <view class="biaozhuanitem" wx:for="{{banner}}" wx:key="" bindtap='viewImg' data-index="{{index}}">
+ <image src="{{item.url}}"></image>
+ </view>
+ </block>
</view>
@@ -16,8 +24,12 @@
</view>
<view class="biaozhaunbox">
- <view class="biaozhuanitem" wx:for="{{picture}}" wx:key='' bindtap='viewImg1' data-index="{{index}}">
- <image src="{{item.url}}"></image>
+ <view class="nodataimg" wx:if="{{picture.length==0}}">
+ <image src="/img/wushuju.png"></image>
</view>
-
+ <block wx:else>
+ <view class="biaozhuanitem" wx:for="{{picture}}" wx:key='' bindtap='viewImg1' data-index="{{index}}">
+ <image src="{{item.url}}"></image>
+ </view>
+ </block>
</view>
\ No newline at end of file
diff --git a/pages/homeblock/jiuzidian/jiuzidian.js b/pages/homeblock/jiuzidian/jiuzidian.js
index 148925f..4728e21 100644
--- a/pages/homeblock/jiuzidian/jiuzidian.js
+++ b/pages/homeblock/jiuzidian/jiuzidian.js
@@ -1,6 +1,6 @@
// pages/homeblock/jiuzidian/jiuzidian.js
var WxParse = require('../../../wxParse/wxParse.js');
-const app=getApp()
+const app = getApp()
Page({
/**
@@ -10,63 +10,75 @@ Page({
navarr: [],
current: 0,
- url:'',
- kind:0,
- picindex:0,
- id:'',
- wineinfo:'',
- selectid:-1,
- canshu:[],
- qiye:[],
- jiushi:[],
+ url: '',
+ kind: 0,
+ picindex: 0,
+ id: '',
+ wineinfo: '',
+ selectid: -1,
+ canshu: [],
+ qiye: [],
+ jiushi: [],
jiushiarr: [],
- zhuanye:[],
- jiben:[],
- jiushishow:true,
- othercontent:[],
- qiyearr:[],
- score:'',
- panorama:[],
- imglogo:'',
- videoimg:''
-
+ zhuanye: [],
+ jiben: [],
+ jiushishow: true,
+ othercontent: [],
+ qiyearr: [],
+ score: '',
+ panorama: [],
+ imglogo: '',
+ videoimg: '',
+ autoplay: true,
+ interval: 2000,
+ duration: 1000,
+ currentSwiper: 0,
+
},
/**
* 生命周期函数--监听页面加载
*/
- onLoad: function (options) {
+ onLoad: function(options) {
+ let that = this;
+ setTimeout(function () {
+ that.setData({
+ url: app.globalData.url
+ })
+ }, 1000)
+
console.log(options)
this.setData({
- url: app.globalData.url,
- id:options.id,
- wineinfo:''
+
+ id: options.id,
+ wineinfo: ''
})
-
- this.getwinedetail();
- let token=wx.getStorageSync("token");
- if(token==''){
+
+
+ let token = wx.getStorageSync("token");
+ if (token == '') {
wx.navigateTo({
- url: '/pages/login/login?id=' + this.data.id+'&type=' +2,//type=2酒字典详情页
+ url: '/pages/login/login?id=' + this.data.id + '&type=' + 2, //type=2酒字典详情页
})
wx.setStorageSync("url", "/pages/homeblock/jiuzidian/jiuzidian")
}
},
//获取酒品详情
- getwinedetail(){
+ getwinedetail() {
let that = this;
- let url = 'index/Wine/detail', params = {
- wine_id: that.data.id,
+ let url = 'index/Wine/detail',
+ params = {
+ wine_id: that.data.id,
- }
+ }
app.post(url, params).then((res) => {
console.log(res);
that.setData({
- wineinfo:res,
+ wineinfo: res,
navarr: res.wine_attr,
- score: res.score*10,
+ score: res.score * 10,
panorama: res.panorama,
imglogo: res.panorama[0].product_thumbnail,
videoimg: res.panorama[0].product_url,
@@ -74,23 +86,23 @@ Page({
wx.setStorageSync("quanurl", res.panorama[0].product_url)
-
+
let newnavarr = that.data.navarr;
- for (var obj of newnavarr){
- if(obj.id==-1){
+ for (var obj of newnavarr) {
+ if (obj.id == -1) {
that.setData({
- canshu:obj.value
+ canshu: obj.value
})
- }else if(obj.id==-2){
-
+ } else if (obj.id == -2) {
+
that.setData({
- qiye:obj.value[0].attr,
- qiyearr:obj.value[0]
+ qiye: obj.value[0].attr,
+ qiyearr: obj.value[0]
})
-
+
let newqiye = obj.value[0].attr;
-
+
for (let i = 0; i < newqiye.length; i++) {
newqiye[i].show = true
@@ -106,12 +118,12 @@ Page({
qiye: newqiye
})
-
+
} else if (obj.id == -3) {
that.setData({
- jiushi: obj.value[0],
- jiushiarr:obj.value[0].attr
+ jiushi: obj.value[0],
+ jiushiarr: obj.value[0].attr
})
let newjiushiarr = obj.value[0].attr
@@ -129,9 +141,9 @@ Page({
}
that.setData({
- jiushiarr:newjiushiarr
+ jiushiarr: newjiushiarr
})
-
+
} else if (obj.id == -4) {
that.setData({
zhuanye: obj.value
@@ -157,7 +169,7 @@ Page({
that.setData({
jiben: obj.value
})
- }else{
+ } else {
that.setData({
othercontent: obj.value
})
@@ -187,25 +199,83 @@ Page({
})
},
- jiushinfoshow(){
+ //酒师点赞和取消点赞
+ dianzan(e) {
+ let id = e.currentTarget.dataset.id;
+
+
+ let that = this;
+ let url = 'index/Common/good',
+ params = {
+ sort: 3,
+ id: id
+
+ }
+ app.post(url, params).then((res) => {
+ console.log(res);
+ wx.showToast({
+ title: res,
+ icon: 'none'
+ })
+
+
+ let newjiushi = that.data.jiushi;
+ console.log(newjiushi)
+
+ if (newjiushi.is_good == 0) {
+
+ newjiushi.is_good = 1
+ } else {
+ newjiushi.is_good = 0
+ }
+ that.setData({
+ jiushi: newjiushi
+ })
+ console.log(that.data.jiushi)
+
+
+ }).catch((err) => {
+
+ })
+
+ },
+
+ //进入评论页面
+ ping(e) {
+ // + '&winemaker_id=' + winemaker_id,
+ let id = e.currentTarget.dataset.id;
+
+
+ wx.navigateTo({
+ url: '/pages/myblock/pingjia/pingjia?type=' + 3 + '&winemaker_id=' + id
+ })
+ },
+
+ swiperChange: function(e) {
+ this.setData({
+ currentSwiper: e.detail.current
+ })
+ },
+ jiushinfoshow() {
this.setData({
jiushishow: !this.data.jiushishow
})
},
//关注酒师
- attenjiushi(e){
+ attenjiushi(e) {
let that = this;
- let id=e.currentTarget.dataset.id
- let url = 'index/Common/concern', params = {
- sort: 2,
- id:id
+ let id = e.currentTarget.dataset.id
+ let url = 'index/Common/concern',
+ params = {
+ sort: 2,
+ id: id
- }
+ }
app.post(url, params).then((res) => {
console.log(res);
wx.showToast({
title: res,
- icon:'none'
+ icon: 'none'
})
that.getwinedetail()
@@ -215,14 +285,15 @@ Page({
})
},
//关注企业
- attenqiye(e){
+ attenqiye(e) {
let that = this;
let id = e.currentTarget.dataset.id
- let url = 'index/Common/concern', params = {
- sort: 1,
- id: id
+ let url = 'index/Common/concern',
+ params = {
+ sort: 1,
+ id: id
- }
+ }
app.post(url, params).then((res) => {
console.log(res);
wx.showToast({
@@ -236,25 +307,25 @@ Page({
})
},
- selectkind(e){
+ selectkind(e) {
this.setData({
- kind:e.currentTarget.dataset.kind
+ kind: e.currentTarget.dataset.kind
})
let kind = e.currentTarget.dataset.kind;
- if(kind==0){
+ if (kind == 0) {
this.setData({
imglogo: this.data.panorama[0].product_thumbnail,
videoimg: this.data.panorama[0].product_url
})
wx.setStorageSync("quanurl", this.data.panorama[0].product_url)
- }else if(kind==1){
+ } else if (kind == 1) {
this.setData({
imglogo: this.data.panorama[1].product_thumbnail,
videoimg: this.data.panorama[1].product_url
})
wx.setStorageSync("quanurl", this.data.panorama[1].product_url)
- }else {
+ } else {
this.setData({
imglogo: this.data.panorama[2].product_thumbnail,
videoimg: this.data.panorama[2].product_url
@@ -263,10 +334,10 @@ Page({
wx.setStorageSync("quanurl", this.data.panorama[2].product_url)
}
},
- entervideo(e){
+ entervideo(e) {
console.log(e)
- let url=e.currentTarget.dataset.url;
- wx.setStorageSync('quanurl', url)
+ let url = e.currentTarget.dataset.url;
+ wx.setStorageSync('quanurl', url)
wx.navigateTo({
url: '/pages/homeblock/bofangexample/bofangexample',
})
@@ -275,35 +346,35 @@ Page({
console.log(e)
this.setData({
current: e.currentTarget.dataset.idx,
- selectid:e.currentTarget.dataset.id
+ selectid: e.currentTarget.dataset.id
})
console.log(this.data.selectid)
},
- selectpic(e){
+ selectpic(e) {
let pic = e.currentTarget.dataset.pic
this.setData({
- picindex:e.currentTarget.dataset.pic
+ picindex: e.currentTarget.dataset.pic
})
- if (pic==1){
+ if (pic == 1) {
wx.navigateTo({
- url: '/pages/homeblock/guanimg/guanimg?wineid='+this.data.id,
+ url: '/pages/homeblock/guanimg/guanimg?wineid=' + this.data.id,
})
- }else if(pic==2){
+ } else if (pic == 2) {
wx.navigateTo({
- url: '/pages/homeblock/shipaiimg/shipaiimg?wineid='+this.data.id,
+ url: '/pages/homeblock/shipaiimg/shipaiimg?wineid=' + this.data.id,
})
- }else if(pic==3){
+ } else if (pic == 3) {
wx.navigateTo({
- url: '/pages/homeblock/shortvideo/shortvideo?wineid='+this.data.id,
+ url: '/pages/homeblock/shortvideo/shortvideo?wineid=' + this.data.id,
})
- }else if(pic==0){
+ } else if (pic == 0) {
wx.navigateTo({
url: '/pages/homeblock/bofangexample/bofangexample',
})
}
-
+
},
showinfo(e) {
@@ -320,7 +391,7 @@ Page({
})
},
- showjiushi(e){
+ showjiushi(e) {
let idx = e.currentTarget.dataset.idx;
console.log(idx)
let newjiushiarr = this.data.jiushiarr;
@@ -334,7 +405,7 @@ Page({
})
},
- showzhuanye(e){
+ showzhuanye(e) {
let idx = e.currentTarget.dataset.idx;
console.log(idx)
let newzhuanye = this.data.zhuanye;
@@ -349,14 +420,14 @@ Page({
},
//评价页面
- evalute(){
-
+ evalute() {
+
wx.navigateTo({
- url: '/pages/homeblock/evalutecontent/evalutecontent?wineid='+this.data.id,
+ url: '/pages/homeblock/evalutecontent/evalutecontent?wineid=' + this.data.id,
})
},
//进入属性页面
- entershu(){
+ entershu() {
wx.navigateTo({
url: '/pages/homeblock/shuxing/shuxing',
})
@@ -365,63 +436,73 @@ Page({
/**
* 生命周期函数--监听页面初次渲染完成
*/
- onReady: function () {
+ onReady: function() {
},
/**
* 生命周期函数--监听页面显示
*/
- onShow: function () {
-
+ onShow: function() {
+ this.getwinedetail();
},
/**
* 生命周期函数--监听页面隐藏
*/
- onHide: function () {
+ onHide: function() {
},
/**
* 生命周期函数--监听页面卸载
*/
- onUnload: function () {
+ onUnload: function() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
- onPullDownRefresh: function () {
+ onPullDownRefresh: function() {
},
/**
* 页面上拉触底事件的处理函数
*/
- onReachBottom: function () {
+ onReachBottom: function() {
},
/**
* 用户点击右上角分享
*/
- onShareAppMessage: function () {
+ onShareAppMessage: function(e) {
let that = this;
+ let id = e.target.dataset.id;
+
+ let type = e.target.dataset.type;
+ let url=''
+
+ if (type == 3) {
+ url = '/pages/homeblock/niangjiuteacher/niangjiuteacher?id=' + id
+ } else {
+ url = '/pages/homeblock/jiuzidian/jiuzidian?id=' + that.data.id
+ }
+
- let url = '/pages/homeblock/jiuzidian/jiuzidian?id=' + that.data.id
return {
title: '发现', // 转发后 所显示的title
// path: '/pages/home/buildtextdetail/buildtextdetail?buildid='+buildid+'&gettoken='+newtoken, // 相对的路径
- path: url,//建档攻略分享1
+ path: url, //建档攻略分享1
// path:'',
- success: (res) => { // 成功后要做的事情
+ success: (res) => { // 成功后要做的事情
console.log(res)
},
- fail: function (res) {
+ fail: function(res) {
// 分享失败
console.log(res)
}
diff --git a/pages/homeblock/jiuzidian/jiuzidian.wxml b/pages/homeblock/jiuzidian/jiuzidian.wxml
index de3a134..fa39a0d 100644
--- a/pages/homeblock/jiuzidian/jiuzidian.wxml
+++ b/pages/homeblock/jiuzidian/jiuzidian.wxml
@@ -85,11 +85,17 @@
<!-- 基本参数 -->
<view class="jibencanshu" wx:if="{{selectid==-1}}">
- <view class="canshuitem" wx:for='{{canshu}}' wx:key="">
- <view class="canleft">{{item.name}}</view>
- <view class='cantext'>{{item.content}}</view>
+
+ <view class="cannodataimg" wx:if="{{canshu.length==0}}">
+ <image src="/img/wushuju.png"></image>
</view>
+ <block wx:else>
+ <view class="canshuitem" wx:for='{{canshu}}' wx:key="">
+ <view class="canleft">{{item.name}}</view>
+ <view class='cantext'>{{item.content}}</view>
+ </view>
+ </block>
</view>
<!-- 生产企业 -->
@@ -108,30 +114,53 @@
</view>
+ <view class="swiper_image">
+ <swiper indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}" class="swiper_item_img" bindchange="swiperChange" circular="true">
+ <block wx:for="{{qiyearr.banner}}" wx:key="doct">
+ <swiper-item>
+ <image src="{{item.url}}" data-index='{{index}}' class="slide-image" width="355" height="150" />
+ </swiper-item>
+ </block>
+ </swiper>
+
+ <view class="dots">
+ <block wx:for="{{qiyearr.banner}}" wx:key="">
+ <view class="dot{{index == currentSwiper ? ' active' : ''}}"></view>
+ </block>
+ </view>
+
+ </view>
+
<view class="brandbox">
- <view class="brandboxitem" wx:for="{{qiye}}" wx:key='' wx:for-index="idxs">
- <view class="boxtop">
- <view class="boxtopleft">
- {{item.name}}
- </view>
- <view class="boxright" bindtap="showinfo" data-idx="{{idxs}}">
- <image src="{{url}}aicon_53x.png" wx:if="{{item.show}}"></image>
- <image src="{{url}}aicon_52x.png" wx:else></image>
+
+ <view class="cannodataimg" wx:if="{{qiye.length==0}}">
+ <image src="/img/wushuju.png"></image>
+ </view>
+
+ <block wx:else>
+ <view class="brandboxitem" wx:for="{{qiye}}" wx:key='' wx:for-index="idxs">
+ <view class="boxtop" bindtap="showinfo" data-idx="{{idxs}}">
+ <view class="boxtopleft">
+ {{item.name}}
+ </view>
+ <view class="boxright">
+ <image src="{{url}}aicon_53x.png" wx:if="{{item.show}}"></image>
+ <image src="{{url}}aicon_52x.png" wx:else></image>
+ </view>
</view>
- </view>
- <view class="brandtext" wx:if="{{item.show}}">
- <block wx:for="{{artileList}}" wx:for-item="item" wx:for-index="idx" wx:key=''>
- <block wx:if="{{idxs==idx}}">
- <template is="wxParse" data="{{wxParseData:item}}" />
+ <view class="brandtext" wx:if="{{item.show}}">
+ <block wx:for="{{artileList}}" wx:for-item="item" wx:for-index="idx" wx:key=''>
+ <block wx:if="{{idxs==idx}}">
+ <template is="wxParse" data="{{wxParseData:item}}" />
+ </block>
</block>
- </block>
- </view>
-
+ </view>
- </view>
+ </view>
+ </block>
</view>
@@ -162,6 +191,33 @@
</view>
</view>
+ <view class="winebottonright">
+
+ <view class="winerighttou">
+ <view class="winerighttouimg" catchtap='dianzan' data-id="{{jiushi.id}}" >
+ <image src="{{url}}aicon_71x.png" wx:if="{{jiushi.is_good==1}}"></image>
+ <image src="{{url}}aicon_66x.png" wx:else></image>
+
+ </view>
+ <view class="winezan">{{jiushi.good_count}}</view>
+ </view>
+ <view class="winerighttou" bindtap="ping" data-id="{{jiushi.id}}" >
+ <view class="winerighttouimg">
+ <image src="{{url}}aicon_67x.png"></image>
+ </view>
+ <view class="winezan">{{jiushi.comment_count}}</view>
+ </view>
+
+ <view class="winerighttou">
+ <view class="winerighttouimg" catchtap='share'>
+ <image src="{{url}}aicon_68x.png"></image>
+ <button class="lj_share" open-type='share' data-id="{{jiushi.id}}" data-type="3"></button>
+ </view>
+
+
+ </view>
+ </view>
+
<view class="wineimg">
<image src="{{jiushi.thumb}}"></image>
</view>
@@ -169,11 +225,11 @@
<view class="niangjiubox">
<view class="brandboxitem">
- <view class="boxtop">
+ <view class="boxtop" bindtap="jiushinfoshow">
<view class="boxtopleft">
基本信息
</view>
- <view class="boxright" bindtap="jiushinfoshow">
+ <view class="boxright">
<image src="{{url}}aicon_53x.png" wx:if="{{jiushishow}}"></image>
<image src="{{url}}aicon_52x.png" wx:else></image>
</view>
@@ -197,32 +253,32 @@
</view>
- <view class="brandboxitem" wx:for="{{jiushiarr}}" wx:key='' wx:for-index="idxs">
- <view class="boxtop">
- <view class="boxtopleft">
- {{item.name}}
- </view>
- <view class="boxright" bindtap="showjiushi" data-idx="{{idxs}}">
- <image src="{{url}}aicon_53x.png" wx:if="{{item.show}}"></image>
- <image src="{{url}}aicon_52x.png" wx:else></image>
- </view>
- </view>
-
- <view class="brandtext" wx:if="{{item.show}}">
-
- <block wx:for="{{artileList1}}" wx:for-item="item" wx:for-index="idx" wx:key=''>
- <block wx:if="{{idxs==idx}}">
- <template is="wxParse" data="{{wxParseData:item}}" />
- </block>
- </block>
-
+ <view class="cannodataimg" wx:if="{{jiushiarr.length==0}}">
+ <image src="/img/wushuju.png"></image>
+ </view>
+ <block wx:else>
+ <view class="brandboxitem" wx:for="{{jiushiarr}}" wx:key='' wx:for-index="idxs">
+ <view class="boxtop" bindtap="showjiushi" data-idx="{{idxs}}">
+ <view class="boxtopleft">
+ {{item.name}}
+ </view>
+ <view class="boxright">
+ <image src="{{url}}aicon_53x.png" wx:if="{{item.show}}"></image>
+ <image src="{{url}}aicon_52x.png" wx:else></image>
+ </view>
+ </view>
+ <view class="brandtext" wx:if="{{item.show}}">
+ <block wx:for="{{artileList1}}" wx:for-item="item" wx:for-index="idx" wx:key=''>
+ <block wx:if="{{idxs==idx}}">
+ <template is="wxParse" data="{{wxParseData:item}}" />
+ </block>
+ </block>
+ </view>
</view>
-
-
- </view>
+ </block>
@@ -231,30 +287,36 @@
<!-- 专业品评 -->
<view class="jiuqiye" wx:elif="{{selectid==-4}}">
<view class="brandbox">
- <view class="brandboxitem" wx:for="{{zhuanye}}" wx:key='' wx:for-index="idxs">
- <view class="boxtop">
- <view class="boxtopleft">
- {{item.title}}
- </view>
- <view class="boxright" bindtap="showzhuanye" data-idx="{{idxs}}">
- <image src="{{url}}aicon_53x.png" wx:if="{{item.show}}"></image>
- <image src="{{url}}aicon_52x.png" wx:else></image>
+
+ <view class="cannodataimg" wx:if="{{zhuanye.length==0}}">
+ <image src="/img/wushuju.png"></image>
+ </view>
+
+ <block wx:else>
+ <view class="brandboxitem" wx:for="{{zhuanye}}" wx:key='' wx:for-index="idxs">
+ <view class="boxtop" bindtap="showzhuanye" data-idx="{{idxs}}">
+ <view class="boxtopleft">
+ {{item.title}}
+ </view>
+ <view class="boxright">
+ <image src="{{url}}aicon_53x.png" wx:if="{{item.show}}"></image>
+ <image src="{{url}}aicon_52x.png" wx:else></image>
+ </view>
</view>
- </view>
- <view class="brandtext" wx:if="{{item.show}}">
- <block wx:for="{{artileList2}}" wx:for-item="item" wx:for-index="idx" wx:key=''>
- <block wx:if="{{idxs==idx}}">
- <template is="wxParse" data="{{wxParseData:item}}" />
+ <view class="brandtext" wx:if="{{item.show}}">
+ <block wx:for="{{artileList2}}" wx:for-item="item" wx:for-index="idx" wx:key=''>
+ <block wx:if="{{idxs==idx}}">
+ <template is="wxParse" data="{{wxParseData:item}}" />
+ </block>
</block>
- </block>
- </view>
-
+ </view>
- </view>
+ </view>
+ </block>
</view>
@@ -263,14 +325,23 @@
<!-- 关键词 -->
<view class="keyword" wx:elif="{{selectid==-5}}">
- <view class="keyworditem" wx:for="{{jiben}}" wx:key="">{{item.content}}</view>
-
+ <view class="cannodataimg" wx:if="{{jiben.length==0}}">
+ <image src="/img/wushuju.png"></image>
+ </view>
+ <block wx:else>
+ <view class="keyworditem" wx:for="{{jiben}}" wx:key="">{{item.content}}</view>
+ </block>
</view>
<view wx:else>
<view class="brandbox">
- <view class="brandboxitem" wx:for="{{othercontent}}" wx:key='' wx:for-index="idxs">
- <!-- <view class="boxtop">
+ <view class="cannodataimg" wx:if="{{othercontent.length==0}}">
+ <image src="/img/wushuju.png"></image>
+ </view>
+
+ <block wx:else>
+ <view class="brandboxitem" wx:for="{{othercontent}}" wx:key='' wx:for-index="idxs">
+ <!-- <view class="boxtop">
<view class="boxtopleft">
{{item.name}}
</view>
@@ -280,26 +351,23 @@
</view>
</view> -->
- <view class="brandtext" wx:if="{{item.show}}">
- <block wx:for="{{artileList4}}" wx:for-item="item" wx:for-index="idx" wx:key=''>
- <block wx:if="{{idxs==idx}}">
- <template is="wxParse" data="{{wxParseData:item}}" />
+ <view class="brandtext" wx:if="{{item.show}}">
+ <block wx:for="{{artileList4}}" wx:for-item="item" wx:for-index="idx" wx:key=''>
+ <block wx:if="{{idxs==idx}}">
+ <template is="wxParse" data="{{wxParseData:item}}" />
+ </block>
</block>
- </block>
- </view>
-
-
-
- </view>
+ </view>
+ </view>
+ </block>
</view>
-
</view>
<view class='pingjia' bindtap="evalute">
- <image src="/img/aicon_29@2x.png"></image>
+ <image src="/img/pingjia.png"></image>
<view class="pingcount">{{wineinfo.comment_count}}</view>
<view class="pingname">评价</view>
diff --git a/pages/homeblock/jiuzidian/jiuzidian.wxss b/pages/homeblock/jiuzidian/jiuzidian.wxss
index 0d091dd..76ee9fd 100644
--- a/pages/homeblock/jiuzidian/jiuzidian.wxss
+++ b/pages/homeblock/jiuzidian/jiuzidian.wxss
@@ -158,15 +158,15 @@ page{
color:#FFFFFF;
font-size:24rpx;
position: fixed;
- bottom:113rpx;
+ bottom:118rpx;
right:67rpx;
}
.pingname{
color:#FFFFFF;
font-size:24rpx;
position: fixed;
- bottom:81rpx;
- right:56rpx;
+ bottom:89rpx;
+ right:60rpx;
}
.page-section{
@@ -177,4 +177,126 @@ page{
}
.heig{
height:100rpx;
+}
+
+ .swiper_image{
+ width:750rpx;
+ height:300rpx;
+ font-size: 0;
+ position: relative
+
+
+}
+.swiper_item_img{
+
+ height:300rpx;
+}
+.swiper_image image{
+ width:100%;
+ height:100%;
+ /* box-shadow:0px -1px 6px 0px rgba(212,137,96,0.11); */
+ /* border-radius:10px; */
+}
+.swiper_item_img swiper-item{
+ width:750rpx;
+ height:300rpx;
+
+
+
+}
+.swiper_item_img swiper-item image{
+ width:100%;
+ height:100%;
+
+}
+
+
+.dots{
+ /* width: 156rpx; */
+ height: 36rpx;
+ display: flex;
+ flex-direction: row;
+ position: absolute;
+ justify-content: center;
+ align-items: center;
+ left: 0;
+ right:0;
+ bottom: 20rpx;
+}
+/*未选中时的小圆点样式 */
+.dot{
+ width: 10rpx;
+ height: 10rpx;
+ border-radius: 50%;
+ margin-right: 26rpx;
+ background-color:#000000
+}
+/*选中以后的小圆点样式 */
+.active{
+ width: 10rpx;
+ height: 10rpx;
+ border-radius:50%;
+ background-color: #E81825;
+
+
+}
+
+.winebottonright{
+ /* width:345rpx; */
+ display:flex;
+ align-items: center;
+ justify-content: space-between;
+ padding: 0 32rpx;
+ box-sizing: border-box
+}
+.winerighttouimg{
+ width:60rpx;
+ height:28rpx;
+ font-size: 0;
+ position:relative;
+ text-align: center
+}
+.winerighttouimg image{
+ width:30rpx;
+ margin:0 auto;
+}
+.lj_share{
+ width:60rpx;
+ height:40rpx;
+ border:none;
+ position: absolute;
+ right:0;
+ top:0;
+ background: transparent
+
+}
+button::after{
+ border:none;
+ background: transparent
+}
+.winerighttou{
+ display:flex;
+ align-items: center
+}
+.wineeng{
+ color:#666666;
+ font-size: 28rpx;
+ margin-left: 20rpx;
+}
+.winezan{
+ color:#666666;
+ font-size:28rpx;
+ margin-left:10rpx;
+ /* height:28rpx;
+ line-height:28rpx; */
+ margin-top:1rpx;
+}
+.wineblock{
+ border-bottom: 14rpx solid #F2F2F2;
+ padding-bottom: 30rpx;
+}
+.pin{
+ width:16rpx;
+ height:32rpx;
+ font-size: 0
}
\ No newline at end of file
diff --git a/pages/homeblock/niangjiuteacher/niangjiuteacher.js b/pages/homeblock/niangjiuteacher/niangjiuteacher.js
index 2c11f2b..9661736 100644
--- a/pages/homeblock/niangjiuteacher/niangjiuteacher.js
+++ b/pages/homeblock/niangjiuteacher/niangjiuteacher.js
@@ -9,7 +9,8 @@ Page({
data: {
url:'',
id:'',
- page:1
+ page:1,
+ jiushishow:true
},
/**
@@ -168,6 +169,12 @@ Page({
url: '/pages/myblock/pingjia/pingjia?winemaker_id='+id+'&type='+3,
})
},
+
+ jiushinfoshow() {
+ this.setData({
+ jiushishow: !this.data.jiushishow
+ })
+ },
/**
* 生命周期函数--监听页面初次渲染完成
*/
@@ -193,7 +200,7 @@ Page({
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
-
+ wx.setStorageSync("guantype", 1)
},
/**
diff --git a/pages/homeblock/niangjiuteacher/niangjiuteacher.wxml b/pages/homeblock/niangjiuteacher/niangjiuteacher.wxml
index 83fb8ba..9209368 100644
--- a/pages/homeblock/niangjiuteacher/niangjiuteacher.wxml
+++ b/pages/homeblock/niangjiuteacher/niangjiuteacher.wxml
@@ -37,21 +37,83 @@
<view class="lastimg">
- <view class="jiuright">
- <image src="{{url}}/aicon_68x.png"></image>
- <button class="lj_share" catchtap="buildshare" open-type='share'></button>
- </view>
- <view class="tiao">分享</view>
-
+ <view class="jiuright">
+ <image src="{{url}}/aicon_68x.png"></image>
+ <button class="lj_share" catchtap="buildshare" open-type='share'></button>
+ </view>
+ <view class="tiao">分享</view>
+
</view>
-
+
</view>
<view class="wineimg">
<image src="{{info.thumb}}"></image>
</view>
+<view class="niangjiubox">
+
+ <view class="brandboxitem">
+ <view class="boxtop" bindtap="jiushinfoshow">
+ <view class="boxtopleft">
+ 基本信息
+ </view>
+ <view class="boxright">
+ <image src="{{url}}aicon_53x.png" wx:if="{{jiushishow}}"></image>
+ <image src="{{url}}aicon_52x.png" wx:else></image>
+ </view>
+ </view>
+
+ <view class="brandtext" wx:if="{{jiushishow}}">
+ <view class="baisinfo">
+ <view class="basinfoleft">性别</view>
+ <view class="baisinforight" wx:if="{{info.sex==1}}">男</view>
+ <view class="baisinforight" wx:if="{{info.sex==2}}">女</view>
+ </view>
+ <view class="baisinfo">
+ <view class="basinfoleft">年龄</view>
+ <view class="baisinforight">{{info.age}}</view>
+ </view>
+ <view class="baisinfo">
+ <view class="basinfoleft">所属酒厂</view>
+ <view class="baisinforight">{{info.company_name}}</view>
+ </view>
+ </view>
+
+
+ </view>
+
+ <view class="cannodataimg" wx:if="{{jiushiarr.length==0}}">
+ <image src="/img/wushuju.png"></image>
+ </view>
+
+ <block wx:else>
+ <view class="brandboxitem" wx:for="{{jiushiarr}}" wx:key='' wx:for-index="idxs">
+ <view class="boxtop" bindtap="showjiushi" data-idx="{{idxs}}">
+ <view class="boxtopleft">
+ {{item.name}}
+ </view>
+ <view class="boxright">
+ <image src="{{url}}aicon_53x.png" wx:if="{{item.show}}"></image>
+ <image src="{{url}}aicon_52x.png" wx:else></image>
+ </view>
+ </view>
+
+ <view class="brandtext" wx:if="{{item.show}}">
+ <block wx:for="{{artileList1}}" wx:for-item="item" wx:for-index="idx" wx:key=''>
+ <block wx:if="{{idxs==idx}}">
+ <template is="wxParse" data="{{wxParseData:item}}" />
+ </block>
+ </block>
+ </view>
+ </view>
+ </block>
+
+
+
+</view>
+
<view class="niangjiubox">
diff --git a/pages/homeblock/niangjiuteacher/niangjiuteacher.wxss b/pages/homeblock/niangjiuteacher/niangjiuteacher.wxss
index 1eb264e..dc54a0f 100644
--- a/pages/homeblock/niangjiuteacher/niangjiuteacher.wxss
+++ b/pages/homeblock/niangjiuteacher/niangjiuteacher.wxss
@@ -1,4 +1,5 @@
@import '../brandpage/brandpage.wxss';
+/* @import '../jiuzidian/jiuzidian.wxss'; */
image{
width:100%;
@@ -127,11 +128,11 @@ image{
align-items: center
}
.lj_share{
- width:20rpx;
+ width:101rpx;
height:30rpx;
border:none;
position: absolute;
- right:0;
+ right:-52rpx;
top:0;
background: transparent
@@ -139,4 +140,7 @@ image{
button::after{
border:none;
outline:none;
+}
+.brandboxitem:first-child{
+ padding-bottom: 20rpx;
}
\ No newline at end of file
diff --git a/pages/homeblock/search/search.js b/pages/homeblock/search/search.js
index 1144355..e559d63 100644
--- a/pages/homeblock/search/search.js
+++ b/pages/homeblock/search/search.js
@@ -79,7 +79,9 @@ Page({
select:e.currentTarget.dataset.id,
searchshow: false,
recordshow: true,
- searchlist:false
+ searchlist:false,
+ page:1,
+ searchlistarr:[]
})
this.getsearchtext()
@@ -88,7 +90,10 @@ Page({
searchlist(){
this.setData({
searchlist:true,
- searchshow:false
+ searchshow:false,
+ page:1,
+ searchlistarr:[]
+
})
this.getlist()
},
@@ -103,7 +108,7 @@ Page({
app.post(url, params).then((res) => {
console.log(res);
that.setData({
- searchlistarr:res.list
+ searchlistarr: that.data.searchlistarr.concat(res.list)
})
// let newsearchlistarr = that.data.searchlistarr;
@@ -181,13 +186,10 @@ Page({
}
}
}
-
that.setData({
searchlistarr: newsearchlistarr
})
-
-
}).catch((err) => {
})
@@ -206,9 +208,6 @@ Page({
that.setData({
searchlist:res.list
})
-
-
-
}).catch((err) => {
this.setData({
searchshow: false,
@@ -229,7 +228,21 @@ Page({
keyword:e.detail.value
})
- this.getkeyword()
+
+
+ if (this.data.keyword!=''){
+ this.getkeyword()
+ }else{
+ this.setData({
+ searchshow: false,
+ recordshow: true,
+ searchlist: false,
+ keyword: e.detail.value
+ })
+
+ }
+
+
},
searchhistory(e){
@@ -285,7 +298,7 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow: function () {
- this.getlist()
+ // this.getlist()
},
@@ -314,7 +327,13 @@ Page({
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
+ let page=this.data.page;
+ page++;
+ this.setData({
+ page:page
+ })
+ this.getlist()
},
/**
diff --git a/pages/homeblock/search/search.wxml b/pages/homeblock/search/search.wxml
index 7851a79..c1549d6 100644
--- a/pages/homeblock/search/search.wxml
+++ b/pages/homeblock/search/search.wxml
@@ -48,8 +48,8 @@
<view class="seahead">
<view class="searword" wx:for="{{list}}" wx:key="" bindtap="enterwine" data-id="{{item.id}}" wx:if="{{select==1}}">{{item.name}}</view>
- <view class="searword" wx:for="{{list}}" wx:key="" bindtap="enterpinpai" data-id="{{item.id}}" wx:if="{{select==2}}">{{item.name}}</view>
- <view class="searword" wx:for="{{list}}" wx:key="" bindtap="enterjiuqi" data-id="{{item.id}}" wx:if="{{select==3}}">{{item.name}}</view>
+ <view class="searword" wx:for="{{list}}" wx:key="" bindtap="enterpinpai" data-id="{{item.id}}" wx:if="{{select==2}}">{{item.name}}</view>
+ <view class="searword" wx:for="{{list}}" wx:key="" bindtap="enterjiuqi" data-id="{{item.id}}" wx:if="{{select==3}}">{{item.name}}</view>
</view>
@@ -76,8 +76,8 @@
<view class="seahead">
<view class="searword" wx:for="{{favorite}}" wx:key='' wx:key="" bindtap="enterwine" data-id="{{item.id}}" wx:if="{{select==1}}">{{item.name}}</view>
- <view class="searword" wx:for="{{favorite}}" wx:key='' wx:key="" bindtap="enterpinpai" data-id="{{item.id}}" wx:if="{{select==2}}">{{item.name}}</view>
- <view class="searword" wx:for="{{favorite}}" wx:key='' wx:key="" bindtap="enterjiuqi" data-id="{{item.id}}" wx:if="{{select==3}}">{{item.name}}</view>
+ <view class="searword" wx:for="{{favorite}}" wx:key='' wx:key="" bindtap="enterpinpai" data-id="{{item.id}}" wx:if="{{select==2}}">{{item.name}}</view>
+ <view class="searword" wx:for="{{favorite}}" wx:key='' wx:key="" bindtap="enterjiuqi" data-id="{{item.id}}" wx:if="{{select==3}}">{{item.name}}</view>
</view>
@@ -88,87 +88,105 @@
<view class="jiupin" wx:if="{{select==1}}">
- <view class="searchitem" wx:for="{{searchlistarr}}" wx:key='' bindtap="jumpbrand" data-id="{{item.id}}">
- <view class="searchitemleft">
- <view class="itemleftimg">
- <image src="{{item.logo}}"></image>
- </view>
+ <view class="nodataimg" wx:if="{{searchlistarr.length==0}}">
+ <image src="/img/wushuju.png"></image>
+ </view>
+ <block wx:else>
- <view class="itemiddle">
- <view class="itemidelename">{{item.name}}</view>
- <view class="nambottom">
- <text class="namebottomitem">{{item.degree_name}}</text>
- <text class="namebottomitem">{{item.odor_name}}</text>
- <text class="namebottomitem">{{item.price}}</text>
- <text class="namebottomitem">{{item.ml}}</text>
+ <view class="searchitem" wx:for="{{searchlistarr}}" wx:key='' bindtap="jumpbrand" data-id="{{item.id}}">
+ <view class="searchitemleft">
+ <view class="itemleftimg">
+ <image src="{{item.logo}}"></image>
</view>
- </view>
- </view>
- <view class="starimg" catchtap="collect" data-id="{{item.id}}">
- <image src="{{url}}aicon_10x.png" wx:if="{{item.is_favorite==1}}"></image>
- <image src="{{url}}aicon_09x.png" wx:else></image>
+ <view class="itemiddle">
+ <view class="itemidelename">{{item.name}}</view>
+ <view class="nambottom">
+ <text class="namebottomitem">{{item.degree_name}}</text>
+ <text class="namebottomitem">{{item.odor_name}}</text>
+ <text class="namebottomitem">{{item.price}}</text>
+ <text class="namebottomitem">{{item.ml}}</text>
+ </view>
+ </view>
+ </view>
- </view>
+ <view class="starimg" catchtap="collect" data-id="{{item.id}}">
+ <image src="{{url}}aicon_10x.png" wx:if="{{item.is_favorite==1}}"></image>
+ <image src="{{url}}aicon_09x.png" wx:else></image>
- </view>
+ </view>
+ </view>
+ </block>
</view>
<view class="brand" wx:if="{{select==2}}">
- <view class="searchitem" wx:for="{{searchlistarr}}" wx:key='' bindtap="jumpbrand" data-id="{{item.id}}">
- <view class="searchitemleft">
- <view class="branditemleftimg">
- <image src="{{url}}aicon_12@2x.png"></image>
- </view>
+ <view class="nodataimg" wx:if="{{searchlistarr.length==0}}">
+ <image src="/img/wushuju.png"></image>
+ </view>
+
+ <block wx:else>
- <view class="itemiddle">
- <view class="itemidelename">{{item.name}}</view>
- <view class="nambottom">
- <text class="namebottomitem">{{item.sort_name}}</text>
- <text class="namebottomitem">{{item.country}}</text>
- <text class="namebottomitem">{{item.city}}</text>
- <text class="namebottomitem">{{item.odor_name}}</text>
+ <view class="searchitem" wx:for="{{searchlistarr}}" wx:key='' bindtap="jumpbrand" data-id="{{item.id}}">
+ <view class="searchitemleft">
+ <view class="branditemleftimg">
+ <image src="{{url}}aicon_12@2x.png"></image>
+ </view>
+
+ <view class="itemiddle">
+ <view class="itemidelename">{{item.name}}</view>
+ <view class="nambottom">
+ <text class="namebottomitem">{{item.sort_name}}</text>
+ <text class="namebottomitem">{{item.country}}</text>
+ <text class="namebottomitem">{{item.city}}</text>
+ <text class="namebottomitem">{{item.odor_name}}</text>
+ </view>
</view>
</view>
- </view>
- <view class="starimg" catchtap="collect" data-id="{{item.id}}">
+ <view class="starimg" catchtap="collect" data-id="{{item.id}}">
- <image src="{{url}}aicon_10x.png" wx:if="{{item.is_favorite==1}}"></image>
- <image src="{{url}}aicon_09x.png" wx:else></image>
+ <image src="{{url}}aicon_10x.png" wx:if="{{item.is_favorite==1}}"></image>
+ <image src="{{url}}aicon_09x.png" wx:else></image>
+ </view>
+
</view>
- </view>
+ </block>
</view>
<view class="brand" wx:if="{{select==3}}">
+ <view class="nodataimg" wx:if="{{searchlistarr.length==0}}">
+ <image src="/img/wushuju.png"></image>
+ </view>
- <view class="searchitem" wx:for="{{searchlistarr}}" wx:key='' bindtap="jumpcompany" data-id="{{item.id}}">
- <view class="searchitemleft">
- <view class="jiuqiimg">
- <image src="{{url}}aicon_13@2x.png"></image>
- </view>
+ <block>
- <view class="itemiddle">
- <view class="itemidelename">{{item.name}}</view>
- <view class="nambottom">
- <text class="namebottomitem">{{item.country}}</text>
- <text class="namebottomitem">{{item.city}}</text>
- <text class="namebottomitem">{{item.sort_name}}</text>
- <text class="namebottomitem">{{item.concern_count}}关注</text>
+ <view class="searchitem" wx:for="{{searchlistarr}}" wx:key='' bindtap="jumpcompany" data-id="{{item.id}}">
+ <view class="searchitemleft">
+ <view class="jiuqiimg">
+ <image src="{{item.logo}}"></image>
</view>
- </view>
- </view>
- <view class="atten" wx:if="{{item.is_concern==1}}" data-id="{{item.id}}" catchtap="attention">取消关注</view>
- <view class="atten" data-id="{{item.id}}" wx:else catchtap="attention">关注</view>
+ <view class="itemiddle">
+ <view class="itemidelename">{{item.name}}</view>
+ <view class="nambottom">
+ <text class="namebottomitem">{{item.country}}</text>
+ <text class="namebottomitem">{{item.city}}</text>
+ <text class="namebottomitem">{{item.sort_name}}</text>
+ <text class="namebottomitem">{{item.concern_count}}关注</text>
+ </view>
+ </view>
+ </view>
- </view>
+ <view class="atten" wx:if="{{item.is_concern==1}}" data-id="{{item.id}}" catchtap="attention">取消关注</view>
+ <view class="atten" data-id="{{item.id}}" wx:else catchtap="attention">关注</view>
+ </view>
+ </block>
</view>
</view>
\ No newline at end of file
diff --git a/pages/homeblock/shipaiimg/shipaiimg.wxml b/pages/homeblock/shipaiimg/shipaiimg.wxml
index 1b3384f..1177260 100644
--- a/pages/homeblock/shipaiimg/shipaiimg.wxml
+++ b/pages/homeblock/shipaiimg/shipaiimg.wxml
@@ -1,7 +1,12 @@
<view class="containerbox">
+
+<view class="nodataimg" wx:if="{{shipaiarr.length==0}}">
+ <image src="/img/wushuju.png"></image>
+ </view>
+ <block wx:else>
<view class="boxitem" wx:for="{{shipaiarr}}" wx:key='' >
- <view class="itemimg" bindtap='viewImg' data-index="{{index}}">
- <image src="{{item.url}}"></image>
+ <view class="itemimg" bindtap='viewImg' data-index="{{index}}" >
+ <image src="{{item.url}}" ></image>
</view>
<view class="itembottom">
@@ -21,5 +26,5 @@
</view>
</view>
-
+ </block>
</view>
\ No newline at end of file
diff --git a/pages/homeblock/shortvideo/shortvideo.js b/pages/homeblock/shortvideo/shortvideo.js
index 4e2c385..d6702e6 100644
--- a/pages/homeblock/shortvideo/shortvideo.js
+++ b/pages/homeblock/shortvideo/shortvideo.js
@@ -87,9 +87,6 @@ Page({
}
app.post(url, params).then((res) => {
console.log(res);
-
-
-
}).catch((err) => {
})
diff --git a/pages/homeblock/shortvideo/shortvideo.wxml b/pages/homeblock/shortvideo/shortvideo.wxml
index 9117585..b03be87 100644
--- a/pages/homeblock/shortvideo/shortvideo.wxml
+++ b/pages/homeblock/shortvideo/shortvideo.wxml
@@ -4,7 +4,7 @@
<image src="{{video.video_image}}"></image>
<view class="boimg">
- <image src="{{url}}/aicon_70x.png"></image>
+ <image src="{{url}}/aicon_70x.png"></image>
</view>
</view>
@@ -21,22 +21,39 @@
<view class="biaozhuantitle xiaovideo">小视频</view>
<view class="shortvideobox">
- <view class="videoitem" wx:for='{{list}}' wx:key=''>
- <view class="itemvid" bindtap="shortentervideo" data-url="{{item.video}}" data-id="{{item.id}}">
- <image src="{{item.video_image}}"></image>
- <view class="boimg">
- <image src="{{url}}/aicon_70x.png"></image>
- </view>
+<view class="nodataimg" wx:if="{{list.length==0}}">
+ <image src="/img/wushuju.png"></image>
</view>
+ <block wx:else>
+ <view class="videoitem" wx:for='{{list}}' wx:key=''>
+
+ <view class="itemvid" bindtap="shortentervideo" data-url="{{item.video}}" data-id="{{item.id}}">
+ <image src="{{item.video_image}}"></image>
+ <view class="boimg">
+ <image src="{{url}}/aicon_70x.png"></image>
+ </view>
+ </view>
<!-- <video src="{{item.video}}" class="itemvid" controls object-fit="fill"></video> -->
<view class="videoittitle">{{item.content}}</view>
+ <view class="bofanglist">
+ <view class="bofangleft">
+ {{item.video_count}}次播放
+ </view>
+ <view class="bofangright">
+ <view class="bofangrightimg">
+ <image src="/img/zan.png"></image>
+ </view>
+
+ <view class="zanshu">{{item.good_count}}</view>
+ </view>
+ </view>
<view class="">
</view>
</view>
-
+</block>
diff --git a/pages/homeblock/shortvideo/shortvideo.wxss b/pages/homeblock/shortvideo/shortvideo.wxss
index 9826b71..c8b0bd8 100644
--- a/pages/homeblock/shortvideo/shortvideo.wxss
+++ b/pages/homeblock/shortvideo/shortvideo.wxss
@@ -75,4 +75,33 @@ page{
top:50%;
left:50%;
transform: translate(-50%,-50%)
+}
+.bofanglist{
+ width:338rpx;
+ margin:0 auto;
+ padding: 0 12rpx;
+ box-sizing: border-box;
+ display:flex;
+ justify-content: space-between;
+ align-items: center;
+ position: absolute;
+ bottom:14rpx;
+}
+.bofangrightimg{
+ width:30rpx;
+ height:30rpx;
+ font-size:0
+}
+.bofangright{
+ display:flex;
+ align-items: cnter
+}
+.zanshu{
+ color:#FFFFFF;
+ font-size: 28rpx;
+ margin-left:10rpx;
+}
+.nodataimg {
+ margin:200rpx auto 0;
+
}
\ No newline at end of file
diff --git a/pages/homeblock/shuxing/shuxing.js b/pages/homeblock/shuxing/shuxing.js
index 98eefba..414d5f6 100644
--- a/pages/homeblock/shuxing/shuxing.js
+++ b/pages/homeblock/shuxing/shuxing.js
@@ -9,7 +9,7 @@ Page({
url: '',
user_list: [],
list: [],
- type: 1,
+ type: 2,
arr: []
},
@@ -150,6 +150,18 @@ Page({
user_list: newuser_list
})
},
+ //长按显示叉号
+ xianshicha(){
+ this.setData({
+ type:3
+ })
+ },
+ //编辑事件
+ edit(){
+ this.setData({
+ type:3
+ })
+ },
//完成事件
finish() {
@@ -200,8 +212,11 @@ Page({
})
setTimeout(function() {
- wx.navigateBack({
- checked: true
+ // wx.navigateBack({
+ // checked: true
+ // })
+ that.setData({
+ type:2
})
}, 1500)
diff --git a/pages/homeblock/shuxing/shuxing.wxml b/pages/homeblock/shuxing/shuxing.wxml
index a531159..9f22d13 100644
--- a/pages/homeblock/shuxing/shuxing.wxml
+++ b/pages/homeblock/shuxing/shuxing.wxml
@@ -1,5 +1,5 @@
-<view class="clear" wx:if="{{type==1}}" bindtap="qingchu">清除</view>
-<view class="clear" wx:if="{{type==2}}">编辑</view>
+<!-- <view class="clear" wx:if="{{type==1}}" bindtap="qingchu">清除</view> -->
+<view class="clear" wx:if="{{type==2}}" bindtap="edit">编辑</view>
<view class="clear" wx:if="{{type==3}}" bindtap="finish">完成</view>
<view class="morenshu">
@@ -7,11 +7,11 @@
<view class="longan">长按可拖动排序</view>
</view>
-<view class="shubox">
- <view class="shuitem" wx:for="{{user_list}}" wx:key="">
+<view class="shubox" >
+ <view class="shuitem" wx:for="{{user_list}}" wx:key="" bindlongpress="xianshicha">
{{item.name}}
- <view class="cancelmg" wx:if="{{type!=1}}" bindtap="shanchu" data-id="{{item.id}}">
+ <view class="cancelmg" wx:if="{{type!=2&&item.id>0}}" bindtap="shanchu" data-id="{{item.id}}">
<image src="{{url}}/bicon_09x.png"></image>
</view>
</view>
diff --git a/pages/homeblock/zhinengselect/zhinengselect.js b/pages/homeblock/zhinengselect/zhinengselect.js
index ee6463a..569a0b9 100644
--- a/pages/homeblock/zhinengselect/zhinengselect.js
+++ b/pages/homeblock/zhinengselect/zhinengselect.js
@@ -3,6 +3,7 @@ const app = getApp()
Page({
/**
+ *
* 页面的初始数据
*/
data: {
@@ -43,6 +44,8 @@ Page({
zhinengwrap: false,
citychose: false,
pricechose:false,
+ morechose:false,
+ fenchose:false,
use_id: '',
odor_id: '',
package_id: '',
@@ -55,7 +58,47 @@ Page({
zhinenglist: [],
page:1,
priceyuan:'0元',
- pricevalue:0
+ pricevalue:'',
+
+
+ leftMin: '', //左边滑块最小值
+ rightMax:'', //右边滑块最大值
+ leftValue: '', //左边滑块默认值
+ rightValue: '', //右边滑块默认值
+ min:'',
+ max:'',
+ morelist:[],
+ morecan:[],
+ conetentarr:[],
+ low: 0,
+ heigh: 100,
+ number:'',
+ fenleftMin:'',
+ fenrightMax:'',
+ fenmin:'',
+ fenmax:'',
+ fennumber:'',
+ score:'',
+ pricezhi:'',
+ selectinfo:'',
+
+ // 智能筛选默认值
+ min: 0,
+ rmax: 100,
+ leftValue: 0,
+ rightValue: 100,
+ ppvalue: 100,
+ ppleft: 0,
+ totalLength: 0,
+ bigLength: 0,
+ ratio: 0.5,
+ sliderLength: 20,
+ containerLeft: 0, //标识整个组件，距离屏幕左边的距离
+ hideOption: '', //初始状态为显示组件
+ maxValue:0
+
+
+
},
/**
@@ -68,10 +111,572 @@ Page({
})
- this.getshaicontent()
+ // this.getshaicontent();
this.getmorenconetent();
+ // this.propertyLeftValueChange();
+
+
+
+ },
+
+ _propertyLeftValueChange: function () {
+ console.log(this.data.minValue);
+ console.log(this.data.max);
+ console.log(this.data.bigLength)
+
+ let minValue = this.data.minValue / this.data.max * this.data.bigLength;
+ console.log(minValue)
+ let min = this.data.min / this.data.max * this.data.bigLength;
+ console.log(min)
+ this.setData({
+ leftValue: minValue - min,
+ ppleft: minValue - min
+ })
+
+ console.log(this.data.ppleft)
+ },
+
+ /**
+ * 设置右边滑块的值
+ */
+ _propertyRightValueChange: function () {
+ let right = this.data.maxValue / this.data.max * this.data.bigLength + this.data.sliderLength
+ this.setData({
+ rightValue: right,
+ ppvalue: right
+ })
+
+ console.log(this.data.rightValue)
+ },
+
+
+
+
+ //获取筛选内容
+ getshaicontent() {
+ let that = this;
+ let url = 'index/Filter/filter',
+ params = {
+
+ }
+ app.post(url, params).then((res) => {
+ console.log(res);
+ that.setData({
+ selectinfo: res
+ })
+ let newselectinfo=that.data.selectinfo
+ newselectinfo.price[0].realmin = newselectinfo.price[0].min;
+ newselectinfo.price[0].realmax = newselectinfo.price[0].max;
+ newselectinfo.score_list[0].realmin = newselectinfo.score_list[0].min;
+ newselectinfo.score_list[0].realmax = newselectinfo.score_list[0].max
+
+ that.setData({
+ selectinfo: newselectinfo
+ })
+ console.log(that.data.selectinfo)
+
+
+
+
+
+
+
+ // that._propertyLeftValueChange()
+ // that._propertyRightValueChange()
+
+ }).catch((err) => {
+
+ })
+ },
+ //显示更多选项
+
+ mores(){
+ let that=this;
+ this.setData({
+ morechose:true,
+ citychose: false,
+ zhinengwrap: false,
+ pricechose: false,
+ conetentarr:[],
+ page:1,
+ zhinenglist:[]
+ })
+
+ let newmorelist = that.data.morelist;
+ for (var obj of newmorelist) {
+ obj.sel = false;
+ obj.contentarr = []
+ if (obj.basic_sort == 1) {
+ for (var p of obj.value_list) {
+ p.twsel = false;
+
+ }
+ } else if (obj.basic_sort == 2) {
+
+ obj.zmin = parseInt(obj.min) - parseInt(obj.number);
+ obj.zmax = parseInt(obj.max) + parseInt(obj.number);
+ obj.between = obj.realmin + '-' + obj.realmax + obj.unit;
+
+ }
+ }
+ that.setData({
+ morelist: newmorelist
+ })
+ console.log(that.data.morelist)
+
+
+
+ // this.getmorecan()
+ },
+ //隐藏更多选项
+ hidemorechose(){
+ this.setData({
+ morechose: false,
+ citychose: false,
+ zhinengwrap: false,
+ pricechose: false,
+ fenchose: false
+ })
+
+ let newnavarr = this.data.navarr;
+ for (var obj of newnavarr) {
+ obj.sel = false
+ }
+
+ this.setData({
+ navarr: newnavarr
+ })
+
+ this.getmorenconetent()
+ },
+
+ //隐藏评分
+ hidefen(){
+ this.setData({
+ morechose: false,
+ citychose: false,
+ zhinengwrap: false,
+ pricechose: false,
+ fenchose:false,
+ page: 1,
+ zhinenglist: []
+ })
+ console.log(9099090)
+ console.log(this.data.zhinenglist)
+
+ let newnavarr = this.data.navarr;
+ newnavarr[5].name = this.data.score
+ for (var obj of newnavarr) {
+ obj.sel = false
+ }
+
+ this.setData({
+ navarr: newnavarr,
+
+ })
+
+ this.getmorenconetent()
+ },
+
+ //获取更多参数
+ getmorecan(){
+ let that = this;
+ let url = 'index/Filter/more', params = {
+
+
+ }
+ app.post(url, params).then((res) => {
+ console.log(res);
+ that.setData({
+ morelist:res.list
+ })
+
+ let newmorelist = that.data.morelist;
+ for (var obj of newmorelist) {
+ obj.sel = false;
+ obj.contentarr = []
+ if (obj.basic_sort == 1) {
+ for (var p of obj.value_list) {
+ p.twsel = false;
+
+ }
+ } else if (obj.basic_sort == 2) {
+ obj.realmin = obj.min;
+ obj.realmax = obj.max;
+ obj.zmin = parseInt(obj.min) - parseInt(obj.number);
+ obj.zmax = parseInt(obj.max) + parseInt(obj.number);
+ obj.between = obj.realmin + '-' + obj.realmax + obj.unit;
+
+ }
+ }
+ that.setData({
+ morelist: newmorelist
+ })
+
+
+ }).catch((err) => {
+
+ })
},
+
+ //更多参数向左滑动效果
+ lowValueChangeAction1(e){
+ let that = this;
+ let index = e.currentTarget.dataset.parindex;
+ console.log(index)
+ let id=e.currentTarget.dataset.id;
+ let basic_sort = e.currentTarget.dataset.basic_sort;
+
+
+ let newmorelist=that.data.morelist;
+ // newmorelist[index].min = e.detail.lowValue;
+ newmorelist[index].realmin = e.detail.lowValue
+
+
+
+
+ if (e.detail.lowValue < newmorelist[index].zmin + newmorelist[index].number && newmorelist[index].max <= newmorelist[index].zmax - newmorelist[index].number) {
+
+ newmorelist[index].between = '<' + newmorelist[index].realmax + newmorelist[index].unit;
+ newmorelist[index].chuanbetween = 0 + '-' + newmorelist[index].realmax
+
+
+ } else if (e.detail.lowValue < newmorelist[index].zmin + newmorelist[index].number && newmorelist[index].max > newmorelist[index].zmax - newmorelist[index].number) {
+ newmorelist[index].between = '不限';
+ newmorelist[index].chuanbetween = 0 + '-' +0
+
+ } else if (e.detail.lowValue >= newmorelist[index].zmin + newmorelist[index].number && newmorelist[index].max <= newmorelist[index].zmax - newmorelist[index].number) {
+
+ newmorelist[index].between = newmorelist[index].realmin + newmorelist[index].unit + '-' + newmorelist[index].realmax + newmorelist[index].unit
+ newmorelist[index].chuanbetween = newmorelist[index].realmin + '-' + newmorelist[index].realmax
+
+
+ } else if (e.detail.lowValue >= newmorelist[index].zmin + newmorelist[index].number && newmorelist[index].max > newmorelist[index].zmax - newmorelist[index].number) {
+
+ newmorelist[index].between = ">" + newmorelist[index].realmin + newmorelist[index].unit;
+ newmorelist[index].chuanbetween = newmorelist[index].realmax + '-'+0
+
+
+ }
+
+ this.setData({
+ morelist: newmorelist
+ })
+
+
+
+ let chuanobj = {};
+ let chuancontent = newmorelist[index].chuanbetween;
+
+ chuanobj.id = id;
+ chuanobj.basic_sort = basic_sort;
+ chuanobj.content = chuancontent;
+ let newmorecan = this.data.morecan;
+ newmorecan[index] = chuanobj;
+ // for (var i = 0; i < newmorecan.length;i++){
+ // if (newmorecan[i]==undefined){
+ // newmorecan.splice(i,1)
+ // }
+
+ // }
+ that.setData({
+ morecan: newmorecan
+ })
+
+ console.log(that.data.morecan)
+
+
+
+ },
+
+ //更多参数向右滑动
+ heighValueChangeAction1(e){
+ let that=this;
+ let index = e.currentTarget.dataset.parindex;
+ console.log(index)
+ let id = e.currentTarget.dataset.id;
+ let basic_sort = e.currentTarget.dataset.basic_sort;
+ console.log(index)
+ let newmorelist = that.data.morelist;
+ newmorelist[index].realmax = e.detail.heighValue
+
+ if (newmorelist[index].min < newmorelist[index].zmin + newmorelist[index].number && e.detail.heighValue <= newmorelist[index].zmax - newmorelist[index].number) {
+
+ newmorelist[index].between = '<' + newmorelist[index].realmax + newmorelist[index].unit;
+ newmorelist[index].chuanbetween = 0 + '-' + newmorelist[index].realmax
+
+ } else if (newmorelist[index].min < newmorelist[index].zmin + newmorelist[index].number && e.detail.heighValue > newmorelist[index].zmax - newmorelist[index].number) {
+
+ newmorelist[index].between = '不限';
+ newmorelist[index].chuanbetween = 0 + '-' + 0
+
+ } else if (newmorelist[index].min >= newmorelist[index].zmin + newmorelist[index].number && e.detail.heighValue <= newmorelist[index].zmax - newmorelist[index].number) {
+ newmorelist[index].between = newmorelist[index].realmin + newmorelist[index].unit + '-' + newmorelist[index].realmax + newmorelist[index].unit;
+ newmorelist[index].chuanbetween = newmorelist[index].realmin + '-' + newmorelist[index].realmax
+
+ } else if (newmorelist[index].min >= newmorelist[index].zmin + newmorelist[index].number && e.detail.heighValue > newmorelist[index].zmax - newmorelist[index].number) {
+ newmorelist[index].between = ">" + newmorelist[index].realmin + newmorelist[index].unit,
+ newmorelist[index].chuanbetween = newmorelist[index].realmin + '-' + 0
+ }
+
+ that.setData({
+ morelist:newmorelist
+ })
+
+
+ let chuanobj = {};
+ let chuancontent = newmorelist[index].chuanbetween;
+
+ chuanobj.id = id;
+ chuanobj.basic_sort = basic_sort;
+ chuanobj.content = chuancontent;
+ let newmorecan = this.data.morecan;
+ newmorecan[index] = chuanobj;
+ that.setData({
+ morecan: newmorecan
+ })
+ console.log(that.data.morecan.length)
+ },
+
+ //获取更多参数的文字
+ selectmoreitem(e){
+ console.log(e)
+ let id=e.currentTarget.dataset.id;
+ let basic_sort = e.currentTarget.dataset.basic_sort;
+ let content=e.currentTarget.dataset.content;
+ let parentindex = e.currentTarget.dataset.parindex;
+ let childindex = e.currentTarget.dataset.childindex;
+
+ let conetentarr = this.data.conetentarr;
+ let newmorelist=this.data.morelist;
+ // let conetentarr = newmorelist[parentindex].contentarr;
+ console.log(conetentarr)
+ newmorelist[parentindex].value_list[childindex].twsel = !newmorelist[parentindex].value_list[childindex].twsel
+ this.setData({
+ morelist:newmorelist
+ })
+
+ if (newmorelist[parentindex].value_list[childindex].twsel==true){
+ conetentarr.push(content);
+ let newlsit = newmorelist[parentindex].value_list;
+
+ newmorelist[parentindex].contentarr.push(content);
+
+ // for (var i = 0; i < newlsit.length;i++){
+ // for (var j = 0; j < conetentarr.length;j++){
+ // if (newlsit[i].content != conetentarr[j]){
+ // conetentarr.splice(j,1)
+ // }
+ // }
+ // }
+ }else{
+ console.log(334)
+ let newconetentarr = this.data.conetentarr;
+ console.log(childindex)
+ for (var i = 0; i < newmorelist[parentindex].contentarr.length;i++){
+ if (newmorelist[parentindex].value_list[childindex].content == newmorelist[parentindex].contentarr[i]){
+ newmorelist[parentindex].contentarr.splice(i, 1)
+ }
+ }
+
+ // this.setData({
+ // conetentarr: newconetentarr
+ // })
+
+ // console.log(this.data.conetentarr)
+ }
+
+ let chuancontent = '';
+ if (newmorelist[parentindex].contentarr.length>0){
+
+ newmorelist[parentindex].sel=true,
+ chuancontent = newmorelist[parentindex].contentarr.join(",")
+
+ }else{
+ chuancontent=''
+ newmorelist[parentindex].sel = false;
+
+ }
+ this.setData({
+ morelist: newmorelist
+ })
+
+ console.log(this.data.morelist)
+ let chuanobj={};
+
+ chuanobj.id=id;
+ chuanobj.basic_sort = basic_sort;
+ chuanobj.content = chuancontent;
+ let newmorecan=this.data.morecan;
+ newmorecan[parentindex] = chuanobj;
+
+ if (chuancontent==''){
+ console.log(newmorecan)
+ for (var i = 0; i < newmorecan.length;i++){
+ console.log(newmorecan[i])
+ if (newmorecan[i]!=undefined){
+ if (newmorecan[i].id == id) {
+ newmorecan.splice(i, 1)
+ }
+ }
+
+ }
+ }
+
+ this.setData({
+ morecan: newmorecan
+ })
+ console.log(this.data.morecan);
+
+
+ },
+
+
+
+ //向左移动
+
+ lowValueChangeAction: function (e) {
+
+ let newselectinfo=this.data.selectinfo
+ newselectinfo.price[0].realmin = e.detail.lowValue
+ let that=this;
+ this.setData({
+ leftMin: e.detail.lowValue,
+ selectinfo: newselectinfo
+ })
+
+ if (e.detail.lowValue < that.data.min + that.data.number && that.data.rightMax <= that.data.max - that.data.number) {
+ that.setData({
+ priceyuan: '<' + that.data.rightMax + '元',
+ pricevalue: 0 + '-' + that.data.rightMax
+ })
+ } else if (e.detail.lowValue < that.data.min + that.data.number && that.data.rightMax > that.data.max - that.data.number) {
+ that.setData({
+ priceyuan: '不限',
+ pricevalue: 0 + '-' + 0
+ })
+ } else if (e.detail.lowValue >= that.data.min + that.data.number && that.data.rightMax <= that.data.max - that.data.number) {
+ that.setData({
+ priceyuan: that.data.leftMin + '元' + '-' + that.data.rightMax + '元',
+ pricevalue: that.data.leftMin + '-' + that.data.rightMax
+ })
+ } else if (e.detail.lowValue >= that.data.min + that.data.number && that.data.rightMax > that.data.max - that.data.number) {
+ that.setData({
+ priceyuan: ">" + that.data.leftMin + '元',
+ pricevalue: that.data.rightMax + '-' + 0
+ })
+ }
+
+
+ },
+//向右移动
+ heighValueChangeAction: function (e) {
+ let that=this;
+ let newselectinfo = this.data.selectinfo
+ newselectinfo.price[0].realmax = e.detail.heighValue
+ this.setData({
+ rightMax: e.detail.heighValue,
+ selectinfo:newselectinfo
+ })
+
+ console.log(e.detail.heighValue);
+ console.log(that.data.min + that.data.number);
+ console.log(that.data.max - that.data.number)
+ if (that.data.leftMin < that.data.min + that.data.number && e.detail.heighValue <= that.data.max-that.data.number) {
+ that.setData({
+ priceyuan: '<' + that.data.rightMax + '元',
+ pricevalue: 0 + '-' + that.data.rightMax
+ })
+ } else if (that.data.leftMin < that.data.min + that.data.number && e.detail.heighValue > that.data.max-that.data.number) {
+ that.setData({
+ priceyuan: '不限',
+ pricevalue: 0 + '-' + 0
+ })
+ } else if (that.data.leftMin >= that.data.min + that.data.number && e.detail.heighValue <= that.data.max-that.data.number) {
+ that.setData({
+ priceyuan: that.data.leftMin + '元' + '-' + that.data.rightMax + '元',
+ pricevalue: that.data.leftMin + '-' + that.data.rightMax
+ })
+ } else if (that.data.leftMin >= that.data.min + that.data.number && e.detail.heighValue > that.data.max-that.data.number) {
+ that.setData({
+ priceyuan: ">" + that.data.leftMin + '元',
+ pricevalue: that.data.leftMin + '-' + 0
+ })
+ }
+ },
+
+ //评分向左移动
+ fenlowValueChangeAction(e){
+ let that = this;
+ let newselectinfo = that.data.selectinfo
+ newselectinfo.score_list[0].realmin = e.detail.lowValue
+ that.setData({
+ fenleftMin: e.detail.lowValue,
+ selectinfo:newselectinfo
+ })
+
+
+ if (e.detail.lowValue < that.data.fenmin + that.data.fennumber && that.data.fenrightMax <= that.data.fenmax - that.data.fennumber) {
+ that.setData({
+ score: '<' + that.data.fenrightMax + '分',
+ chuanscore: 0 + '-' + that.data.fenrightMax
+ })
+ } else if (e.detail.lowValue < that.data.fenmin + that.data.fennumber && that.data.fenrightMax > that.data.fenmax - that.data.fennumber) {
+ that.setData({
+ score: '不限',
+ chuanscore: 0 + '-' + 0
+ })
+ } else if (e.detail.lowValue >= that.data.fenmin + that.data.fennumber && that.data.fenrightMax <= that.data.fenmax - that.data.fennumber) {
+ that.setData({
+ score: that.data.fenleftMin + '分' + '-' + that.data.fenrightMax + '分',
+ chuanscore: that.data.fenleftMin + '-' + that.data.fenrightMax
+ })
+ } else if (e.detail.lowValue >= that.data.fenmin + that.data.fennumber && that.data.fenrightMax > that.data.fenmax - that.data.fennumber) {
+ that.setData({
+ score: ">" + that.data.fenleftMin + '分',
+ chuanscore: that.data.fenrightMax + '-' + 0
+ })
+ }
+ },
+
+ //评分向右移动
+ fenheighValueChangeAction: function (e) {
+ let that = this;
+
+ let newselectinfo = that.data.selectinfo
+ newselectinfo.score_list[0].realmax = e.detail.heighValue
+ this.setData({
+ fenrightMax: e.detail.heighValue,
+ selectinfo:newselectinfo
+ })
+
+
+
+ if (that.data.fenleftMin < that.data.fenmin + that.data.fennumber && e.detail.fenheighValue <= that.data.fenmax - that.data.fennumber) {
+ that.setData({
+ score: '<' + that.data.fenrightMax + '分',
+ chuanscore: 0 + '-' + that.data.fenrightMax
+ })
+ } else if (that.data.fenleftMin < that.data.fenmin + that.data.fennumber && e.detail.heighValue > that.data.fenmax - that.data.fennumber) {
+
+ that.setData({
+ score: '不限',
+ chuanscore: 0 + '-' + 0
+ })
+ } else if (that.data.fenleftMin >= that.data.fenmin + that.data.fennumber && e.detail.heighValue <= that.data.fenmax - that.data.fennumber) {
+ that.setData({
+ score: that.data.fenleftMin + '分' + '-' + that.data.fenrightMax + '分',
+ chuanscore: that.data.fenleftMin + '-' + that.data.fenrightMax
+ })
+ } else if (that.data.fenleftMin >= that.data.fenmin + that.data.fennumber && e.detail.heighValue > that.data.fenmax - that.data.fennumber) {
+ that.setData({
+ score: ">" + that.data.fenleftMin + '分',
+ chuanscore: that.data.fenleftMin + '-' + 0
+ })
+ }
+ },
+
select(e) {
let that = this;
@@ -80,11 +685,16 @@ Page({
let type = e.currentTarget.dataset.type;
this.setData({
type: type,
+ // page:1,
+ // zhinenglist:[]
})
+ console.log(that.data.zhinenglist)
+
let newnavarr = this.data.navarr;
+
for (var i = 0; i < newnavarr.length; i++) {
if (i == index) {
newnavarr[i].sel = !newnavarr[i].sel;
@@ -95,25 +705,56 @@ Page({
this.setData({
citychose: true,
zhinengwrap: false,
- pricechose: false
+ pricechose: false,
+ morechose:false,
+ fenchose:false
})
} else {
this.setData({
citychose: false,
zhinengwrap: false,
- pricechose: false
+ pricechose: false,
+ morechose: false,
+ fenchose: false
})
}
}else if(type==2){
if (newnavarr[i].sel == true) {
+
+ this.setData({
+ citychose: false,
+ zhinengwrap: false,
+ pricechose:true,
+ morechose: false,
+ fenchose: false
+
+ })
+
+ } else {
+ this.setData({
+ citychose: false,
+ zhinengwrap: false,
+ pricechose:false,
+ morechose: false,
+ fenchose: false
+
+ })
+ }
+
+
+
+ }else if(type==6){
+ if (newnavarr[i].sel == true) {
console.log(999)
this.setData({
citychose: false,
zhinengwrap: false,
- pricechose:true
+ pricechose: false,
+ morechose: false,
+ fenchose: true
})
@@ -121,7 +762,9 @@ Page({
this.setData({
citychose: false,
zhinengwrap: false,
- pricechose:false
+ pricechose: false,
+ morechose: false,
+ fenchose: false
})
}
@@ -131,7 +774,9 @@ Page({
this.setData({
citychose: false,
zhinengwrap: true,
- pricechose: false
+ pricechose: false,
+ morechose: false,
+ fenchose: false
})
@@ -140,7 +785,9 @@ Page({
this.setData({
citychose: false,
zhinengwrap: false,
- pricechose: false
+ pricechose: false,
+ morechose: false,
+ fenchose: false
})
@@ -159,244 +806,242 @@ Page({
})
+ //筛选
- this.getshaicontent();
- this.getmorenconetent();
+ console.log(that.data.selectinfo)
+
- let newzhinengarr1 = that.data.zhinengarr;
- console.log(342347)
- console.log(that.data.type);
- console.log(newzhinengarr1)
- // for (var obj of newzhinengarr1) {
- // if (that.data.type == 1) {
- // console.log(this.data.use_id)
- // if (obj.id = this.data.use_id) {
- // obj.sel = true
- // }
- // this.setData({
- // zhinengarr: newzhinengarr1
- // })
- // } else if (that.data.type == 3) {
- // if (obj.id = this.data.package_id) {
- // obj.sel = true
- // }
- // this.setData({
- // zhinengarr: newzhinengarr1
- // })
- // } else if (that.data.type == 4) {
- // if (obj.city = this.data.city) {
- // obj.sel = true
- // }
- // this.setData({
- // zhinengarr: newzhinengarr1
- // })
- // } else if (that.data.type == 5) {
- // if (obj.id = this.data.odor_id) {
- // obj.sel = true
- // }
- // this.setData({
- // zhinengarr: newzhinengarr1
- // })
- // }
- // }
+ if (that.data.type == 1) {
+ that.setData({
+ zhinengarr:that.data.selectinfo.use
+ })
- },
- //隐藏智能筛选
- hidezhineng() {
- this.setData({
- zhinengwrap: false
- })
+ let newzhinengarr = that.data.zhinengarr;
+ for (var obj of newzhinengarr) {
+ obj.sel = false
+ }
- let newnavarr = this.data.navarr;
- for (var obj of newnavarr) {
- obj.sel = false
- }
+ that.setData({
+ zhinengarr: newzhinengarr
+ })
- this.setData({
- navarr: newnavarr
- })
+ let newzhinengarr1 = that.data.zhinengarr;
+ for (var obj of newzhinengarr1) {
+ if (obj.id == that.data.use_id) {
+ obj.sel = true
+ }
+ }
- },
- hide() {
- this.setData({
- citychose: false
- })
- let newnavarr = this.data.navarr;
- for (var obj of newnavarr) {
- obj.sel = false
- }
+ that.setData({
+ zhinengarr: newzhinengarr1
+ })
- this.setData({
- navarr: newnavarr
- })
- },
- //获取筛选内容
- getshaicontent() {
- let that = this;
- let url = 'index/Filter/filter',
- params = {
- }
- app.post(url, params).then((res) => {
- console.log(res);
+ } else if (that.data.type == 2) {
+ console.log(that.data.selectinfo)
-
- if (that.data.type == 1) {
- that.setData({
+ let middlevalue = '';
- zhinengarr: res.use
- })
- let newzhinengarr = that.data.zhinengarr;
- for (var obj of newzhinengarr) {
- obj.sel = false
- }
- that.setData({
- zhinengarr: newzhinengarr
- })
+ that.setData({
- let newzhinengarr1 = that.data.zhinengarr;
- for (var obj of newzhinengarr1) {
- if (obj.id == that.data.use_id) {
- obj.sel = true
- }
- }
+ leftMin: parseInt(that.data.selectinfo.price[0].realmin),
+ rightMax: parseInt(that.data.selectinfo.price[0].realmax),
+ min: parseInt(that.data.selectinfo.price[0].min) - parseInt(that.data.selectinfo.price[0].number),
+ max: parseInt(that.data.selectinfo.price[0].max) + parseInt(that.data.selectinfo.price[0].number),
+ priceyuan: that.data.selectinfo.price[0].realmin + '元' + '-' + that.data.selectinfo.price[0].realmax + '元',
+ pricevalue: that.data.selectinfo.price[0].realmin + '-' + that.data.selectinfo.price[0].realmax,
+ number: that.data.selectinfo.price[0].number
+ })
+ console.log(909080807070)
- that.setData({
- zhinengarr: newzhinengarr1
- })
+ console.log(that.data.leftMin);
+ console.log(that.data.rightMax);
+ console.log(that.data.min)
+ console.log(that.data.max)
-
- } else if (that.data.type == 2) {
- that.setData({
- zhinengarr: res.price
- })
-
- let newzhinengarr = that.data.zhinengarr;
- for (var obj of newzhinengarr) {
- obj.sel = false
- }
+ that.setData({
+ zhinengarr: that.data.selectinfo.price
+ })
- that.setData({
- zhinengarr: newzhinengarr
- })
+ let newzhinengarr = that.data.zhinengarr;
+ for (var obj of newzhinengarr) {
+ obj.sel = false
+ }
-
+ that.setData({
+ zhinengarr: newzhinengarr
+ })
+ } else if (that.data.type == 3) {
+ that.setData({
- } else if (that.data.type == 3) {
- that.setData({
-
- zhinengarr: res.packages
- })
+ zhinengarr: that.data.selectinfo.packages
+ })
- let newzhinengarr = that.data.zhinengarr;
- for (var obj of newzhinengarr) {
- obj.sel = false
- }
+ let newzhinengarr = that.data.zhinengarr;
+ for (var obj of newzhinengarr) {
+ obj.sel = false
+ }
- that.setData({
- zhinengarr: newzhinengarr
- })
+ that.setData({
+ zhinengarr: newzhinengarr
+ })
- let newzhinengarr1 = that.data.zhinengarr;
- for (var obj of newzhinengarr1) {
- if (obj.id == that.data.package_id) {
- obj.sel = true
- }
+ let newzhinengarr1 = that.data.zhinengarr;
+ for (var obj of newzhinengarr1) {
+ if (obj.id == that.data.package_id) {
+ obj.sel = true
}
+ }
- that.setData({
- zhinengarr: newzhinengarr1
- })
- } else if (that.data.type == 4) {
- that.setData({
- zhinengarr: res.city
- })
+ that.setData({
+ zhinengarr: newzhinengarr1
+ })
+ } else if (that.data.type == 4) {
+
+ that.setData({
+ zhinengarr: that.data.selectinfo.city
+ })
- let newzhinengarr = that.data.zhinengarr;
- for (var obj of newzhinengarr) {
- obj.sel = false
- }
+ let newzhinengarr = that.data.zhinengarr;
+ for (var obj of newzhinengarr) {
+ obj.sel = false
+ }
- that.setData({
- zhinengarr: newzhinengarr
- })
+ that.setData({
+ zhinengarr: newzhinengarr
+ })
- let newzhinengarr1 = that.data.zhinengarr;
- for (var obj of newzhinengarr1) {
- if (obj.city == that.data.city) {
- obj.sel = true
- }
+ let newzhinengarr1 = that.data.zhinengarr;
+ for (var obj of newzhinengarr1) {
+ if (obj.city == that.data.city) {
+ obj.sel = true
}
+ }
- that.setData({
- zhinengarr: newzhinengarr1
- })
+ that.setData({
+ zhinengarr: newzhinengarr1
+ })
- } else if (that.data.type == 5) {
- that.setData({
-
- zhinengarr: res.odor
- })
- let newzhinengarr = that.data.zhinengarr;
- for (var obj of newzhinengarr) {
- obj.sel = false
- }
- that.setData({
- zhinengarr: newzhinengarr
- })
+ } else if (that.data.type == 5) {
+ that.setData({
+
+ zhinengarr: that.data.selectinfo.odor
+ })
+ let newzhinengarr = that.data.zhinengarr;
+ for (var obj of newzhinengarr) {
+ obj.sel = false
+ }
- let newzhinengarr1 = that.data.zhinengarr;
- for (var obj of newzhinengarr1) {
- if (obj.id == that.data.odor_id) {
- obj.sel = true
- }
+ that.setData({
+ zhinengarr: newzhinengarr
+ })
+
+
+ let newzhinengarr1 = that.data.zhinengarr;
+ for (var obj of newzhinengarr1) {
+ if (obj.id == that.data.odor_id) {
+ obj.sel = true
}
+ }
- that.setData({
- zhinengarr: newzhinengarr1
- })
+ that.setData({
+ zhinengarr: newzhinengarr1
+ })
- } else if (that.data.type == 6) {
- that.setData({
-
- zhinengarr: res.score_list
- })
- }
+ } else if (that.data.type == 6) {
+ console.log(that.data.selectinfo)
-
+ that.setData({
+ zhinengarr: that.data.selectinfo.score_list
+ })
+ that.setData({
+ fenleftMin: parseInt(that.data.selectinfo.score_list[0].realmin),
+ fenrightMax: parseInt(that.data.selectinfo.score_list[0].realmax),
+ fenmin: parseInt(that.data.selectinfo.score_list[0].min) - parseInt(that.data.selectinfo.score_list[0].number),
+ fenmax: parseInt(that.data.selectinfo.score_list[0].max) + parseInt(that.data.selectinfo.score_list[0].number),
+ score: that.data.selectinfo.score_list[0].realmin + that.data.selectinfo.score_list[0].unit + '-' + that.data.selectinfo.score_list[0].realmax + that.data.selectinfo.score_list[0].unit,
+ chuanscore: that.data.selectinfo.score_list[0].realmin + '-' + that.data.selectinfo.score_list[0].realmax,
+ fennumber: that.data.selectinfo.score_list[0].number
+ })
+ console.log(that.data.fenmax)
+ console.log(that.data.fenleftMin);
+ console.log(that.data.fenrightMax)
+ }
- }).catch((err) => {
+ this._propertyLeftValueChange();
+ this._propertyRightValueChange()
+ // that.getshaicontent();
+
+
+ // this.getmorenconetent();
+
+ // let newzhinengarr1 = that.data.zhinengarr;
+ },
+ //隐藏智能筛选
+ hidezhineng() {
+ this.setData({
+ zhinengwrap: false
+ })
+
+ let newnavarr = this.data.navarr;
+ for (var obj of newnavarr) {
+ obj.sel = false
+ }
+
+ this.setData({
+ navarr: newnavarr
+ })
+
+ },
+ hide() {
+ this.setData({
+ citychose: false
+ })
+
+ let newnavarr = this.data.navarr;
+ for (var obj of newnavarr) {
+ obj.sel = false
+ }
+
+ this.setData({
+ navarr: newnavarr,
+ // page:1,
+ // zhinenglist:[]
})
},
+
//选择种类
shosekind(e) {
let id = e.currentTarget.dataset.id;
console.log(this.data.type)
-
+ this.setData({
+ zhinenglist:[],
+ page:1
+ })
let newzhinengarr = this.data.zhinengarr;
for (var obj of newzhinengarr) {
@@ -404,6 +1049,7 @@ Page({
if (this.data.type == 1) {
+ console.log(111)
obj.sel = !obj.sel;
if (obj.sel == true) {
this.setData({
@@ -419,10 +1065,17 @@ Page({
this.setData({
use_id: ''
})
+
+ let newnavarr = this.data.navarr;
+ newnavarr[0].name = '用途';
+ this.setData({
+ navarr: newnavarr
+ })
}
- this.getmorenconetent()
+
} else if (this.data.type == 3) {
+ console.log(333)
obj.sel = !obj.sel;
if (obj.sel == true) {
this.setData({
@@ -438,10 +1091,17 @@ Page({
this.setData({
package_id: ''
})
+
+ let newnavarr = this.data.navarr;
+ newnavarr[2].name = '包装';
+ this.setData({
+ navarr: newnavarr
+ })
}
- this.getmorenconetent()
+
} else if (this.data.type == 5) {
+ console.log(555)
obj.sel = !obj.sel;
if (obj.sel == true) {
this.setData({
@@ -457,48 +1117,62 @@ Page({
this.setData({
odor_id: ''
})
+ let newnavarr = this.data.navarr;
+ newnavarr[4].name = '香型';
+ this.setData({
+ navarr: newnavarr
+ })
}
- this.getmorenconetent()
- }
+
+ } else if (this.data.type == 4) {
+ console.log(444)
+ let cityname = e.currentTarget.dataset.name;
- } else {
- obj.sel = false
- }
- if (this.data.type == 4) {
- let cityname = e.currentTarget.dataset.name;
+ if (obj.city == cityname) {
+ obj.sel = !obj.sel
+ if (obj.sel == true) {
+ this.setData({
+ city: obj.city,
+ })
+ let newnavarr = this.data.navarr;
+ newnavarr[3].name = obj.city;
+ this.setData({
+ navarr: newnavarr
+ })
+ } else {
+ this.setData({
+ city: ''
+ })
- if (obj.city == cityname) {
- obj.sel = !obj.sel
- if (obj.sel == true) {
- this.setData({
- city: obj.city,
+ let newnavarr = this.data.navarr;
+ newnavarr[3].name = '产区';
+ this.setData({
+ navarr: newnavarr
+ })
- })
-
- let newnavarr = this.data.navarr;
- newnavarr[3].name = obj.city;
- this.setData({
- navarr: newnavarr
- })
+ }
} else {
- this.setData({
- city: ''
- })
-
+ obj.sel = false
}
- } else {
- obj.sel = false
- }
- this.getmorenconetent()
+
+ }
+
+
+ } else {
+ obj.sel = false
}
+
+
}
+ this.getmorenconetent()
+
this.setData({
zhinengarr: newzhinengarr
})
@@ -507,33 +1181,55 @@ Page({
},
//获取默认数据
getmorenconetent() {
+
let that = this;
- console.log(that.data.pricevalues)
+
+ let nemore='';
+ let canarr=[];
+ if(that.data.morecan.length==0){
+ console.log(99000)
+ nemore=''
+ }else{
+ console.log(98000)
+ let pp = that.data.morecan
+
+ // console.log(nemore.length)
+ for (var i = 0; i < pp.length;i++){
+ console.log(typeof (pp[i]))
+ if (typeof (pp[i]) == 'object'){
+ canarr.push(pp[i])
+ // nemore.splice(i,1)
+ }
+ }
+ nemore = canarr
+
+ }
+ console.log(nemore)
+
let url = 'index/Filter/index',
params = {
use_id: that.data.use_id,
odor_id: that.data.odor_id,
- price: that.data.pricevalues,
+ price: that.data.pricevalue,
package_id: that.data.package_id,
city: that.data.city,
- score: that.data.score,
- more: that.data.more,
+ score: that.data.chuanscore,
+ more: nemore,
page: that.data.page
}
app.post(url, params).then((res) => {
console.log(res);
that.setData({
- zhinenglist: res.list
+ zhinenglist: this.data.zhinenglist.concat(res.list)
})
-
-
-
+
}).catch((err) => {
})
},
+
//收藏
collect(e) {
let that = this;
@@ -543,7 +1239,6 @@ Page({
params = {
sort: 1,
id: id
-
}
app.post(url, params).then((res) => {
@@ -551,7 +1246,22 @@ Page({
title: res,
icon: 'none'
})
- that.getmorenconetent()
+
+ let newzhinenglist = that.data.zhinenglist;
+ for(var obj of newzhinenglist){
+ if(obj.id==id){
+ if (obj.is_favorite==0){
+ obj.is_favorite=1
+ }else{
+ obj.is_favorite = 0
+ }
+ }
+ }
+
+ that.setData({
+ zhinenglist:newzhinenglist
+ })
+ // that.getmorenconetent()
}).catch((err) => {
@@ -559,7 +1269,7 @@ Page({
})
},
changing(e){
- console.log(e);
+
this.setData({
priceyuan:e.detail.value+'元',
pricevalue:e.detail.value
@@ -568,7 +1278,9 @@ Page({
hideprice(){
this.setData({
- pricechose:false
+ pricechose:false,
+ page:1,
+ zhinenglist:[]
})
let newnavarr = this.data.navarr;
for (var obj of newnavarr) {
@@ -581,6 +1293,14 @@ Page({
this.getmorenconetent()
},
+
+ jumpbrand(e) {
+ let id = e.currentTarget.dataset.id
+ wx.navigateTo({
+ url: '/pages/homeblock/jiuzidian/jiuzidian?id=' + id,
+ })
+
+ },
/**
* 生命周期函数--监听页面初次渲染完成
*/
@@ -592,6 +1312,9 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow: function() {
+ this.getshaicontent()
+ this.getmorecan()
+ // this.getshaicontent();
},
@@ -620,7 +1343,12 @@ Page({
* 页面上拉触底事件的处理函数
*/
onReachBottom: function() {
-
+ let page=this.data.page;
+ page++;
+ this.setData({
+ page:page
+ })
+ this.getmorenconetent()
},
/**
diff --git a/pages/homeblock/zhinengselect/zhinengselect.json b/pages/homeblock/zhinengselect/zhinengselect.json
index 6f2fb49..2d2916a 100644
--- a/pages/homeblock/zhinengselect/zhinengselect.json
+++ b/pages/homeblock/zhinengselect/zhinengselect.json
@@ -1,3 +1,6 @@
{
- "navigationBarTitleText": "智能筛选"
+ "usingComponents": {
+ "zy-slider": "../../../component/zyslider"
+ },
+ "navigationBarTitleText": "智能选择"
}
\ No newline at end of file
diff --git a/pages/homeblock/zhinengselect/zhinengselect.wxml b/pages/homeblock/zhinengselect/zhinengselect.wxml
index 0c08490..59b6128 100644
--- a/pages/homeblock/zhinengselect/zhinengselect.wxml
+++ b/pages/homeblock/zhinengselect/zhinengselect.wxml
@@ -1,18 +1,18 @@
<!-- 筛选内容 -->
-<view class="register" wx:if="{{zhinengwrap}}" bindtap="hidezhineng">
+<view class="register" wx:if="{{zhinengwrap}}" bindtap="hidezhineng" catchtouchmove='true'>
<view class="registerwrap" catchtap="">
<view class="registeritem {{item.sel==true?'choseactive':''}}" wx:if="{{type==1}}" wx:for="{{zhinengarr}}" wx:key="" catchtap="shosekind" data-id="{{item.id}}">{{item.use_name}}</view>
- <view class="registeritem" wx:if="{{type==2}}" wx:for="{{zhinengarr}}" wx:key="">浓香型</view>
+
<view class="registeritem {{item.sel==true?'choseactive':''}}" wx:if="{{type==3}}" wx:for="{{zhinengarr}}" wx:key="" catchtap="shosekind" data-id="{{item.id}}">{{item.package_name}}</view>
<view class="registeritem {{item.sel==true?'choseactive':''}}" wx:if="{{type==5}}" wx:for="{{zhinengarr}}" wx:key="" catchtap="shosekind" data-id="{{item.id}}">{{item.odor_name}}</view>
- <view class="registeritem" wx:if="{{type==6}}" wx:for="{{zhinengarr}}" wx:key="">浓香型</view>
+
</view>
</view>
<!-- 城市筛选 -->
-<view class="register" wx:if="{{citychose}}" bindtap="hide">
+<view class="register" wx:if="{{citychose}}" bindtap="hide" catchtouchmove='true'>
<view class="registerwrap">
<view class="citylist" catchtap="shosekind" data-id="{{item.id}}" wx:for="{{zhinengarr}}" wx:key="" data-name="{{item.city}}">
<view class="cityitem">{{item.city}}</view>
@@ -24,21 +24,95 @@
</view>
</view>
<!-- 价格 -->
-<view class="register" wx:if="{{pricechose}}" bindtap="hideprice">
- <view class="registerwrap">
-
- <view class="section section_gap">
+<view class="register" wx:if="{{pricechose}}" bindtap="hideprice" catchtouchmove='true'>
+ <view class="pregisterwrap">
<view class="pyuan">{{priceyuan}}</view>
- <view class="body-view">
- <slider bindchange="slider2change" step="5" backgroundColor="#f5f5f5" activeColor="red" block-size="8" step="1" bindchanging="changing" value="{{pricevalue}}" max="{{zhinengarr[0].max}}" min="{{zhinengarr[0].min}}"/>
+ <view class="zy-slider" catchtap='pingbi'>
+ <zy-slider id="zy-slider1" minValue="{{leftMin}}" maxValue="{{rightMax}}" min="{{min}}" max="{{max}}" blockColor="#0099FF" backgroundColor="#B0C4DE" selectedColor="#FF1493" bind:lowValueChange="lowValueChangeAction" bind:heighValueChange="heighValueChangeAction"
+ />
+<!-- style="left:{{ppleft}}rpx; width:{{ppvalue-ppleft}}rpx" -->
+ <view class="pp" style="width:95%;background:red;height:10rpx;margin:50rpx auto 0">
+ <view class="ppitem"></view>
+ <view class="ppitem"></view>
+ <view class="ppitem"></view>
+ <view class="ppitem"></view>
</view>
+
+
+
+
+
+
+
+
</view>
+
+
+
</view>
</view>
+<!-- 评分 -->
+<view class="register" wx:if="{{fenchose}}" bindtap="hidefen" catchtouchmove='true'>
+ <view class="pregisterwrap">
+ <view class="pyuan">{{score}}</view>
+
+ <view class="zy-slider">
+ <zy-slider id="zy-slider1" minValue="{{fenleftMin}}" maxValue="{{fenrightMax}}" min="{{fenmin}}" max="{{fenmax}}" blockColor="#0099FF" backgroundColor="#B0C4DE" selectedColor="#FF1493" bind:lowValueChange="fenlowValueChangeAction" bind:heighValueChange="fenheighValueChangeAction"
+ />
+ </view>
+
+ </view>
+</view>
+
+<!-- 更多筛选 -->
+<view class="register" wx:if="{{morechose}}" bindtap="hidemorechose">
+ <view class="moreregisterwrap">
+
+
+ <view wx:for="{{morelist}}" wx:key="" wx:for-index="par">
+
+ <view class="selectbox" wx:if="{{item.basic_sort==1}}">
+ <view class="selecttop">
+ <view class="selectopname {{item.sel==true?'selactive':''}}">{{item.name}}</view>
+ <view class="selectrow">
+ <image src="{{url}}/aicon_16@2x.png" wx:if="{{item.sel==true}}"></image>
+ <image src="{{url}}/aicon_14x.png" wx:else></image>
+ </view>
+ </view>
+ <view class="valuebox">
+ <view class="registeritem {{itema.twsel==true?'actitem':''}}" wx:for="{{item.value_list}}" wx:for-item="itema" wx:key="" catchtap='selectmoreitem' data-childindex="{{child}}" wx:for-index="child" data-parindex="{{par}}" data-id="{{item.id}}" data-basic_sort="{{item.basic_sort}}"
+ data-content="{{itema.content}}">{{itema.content}}</view>
+ </view>
+
+ </view>
+
+ <view class='sliderHCon' wx:if="{{item.basic_sort==2}}">
+ <view class='tiaohead'>
+ <view class="tiaoleft">{{item.name}}</view>
+ <view class="tiaoright">{{item.between}}</view>
+ </view>
+ <!-- <view class='twoSlider'>
+ <slider min='{{leftMin}}' max='{{leftMax}}' value='{{leftValue}}' activeColor='#cecacb' backgroundColor='#E81825' block-size='8' step='1' style='width:{{leftWidth}}%;margin-right:0rpx;' bindchange="leftChange" />
+ <slider min='{{rightMin}}' max='{{rightMax}}' value='{{rightValue}}' activeColor='#E81825' backgroundColor='#cecacb' block-size='8' step='1' style='width:{{rightWidth}}%;margin-left:0rpx;' bindchange="rightChange" />
+ </view> -->
+
+ <view class="zy-slider">
+ <zy-slider id="zy-slider1" minValue="{{item.realmin}}" maxValue="{{item.realmax}}" min="{{item.zmin}}" max="{{item.zmax}}" blockColor="#0099FF" backgroundColor="#B0C4DE" selectedColor="#FF1493" bind:lowValueChange="lowValueChangeAction1" data-id="{{item.id}}"
+ data-basic_sort="{{item.basic_sort}}" bind:heighValueChange="heighValueChangeAction1" data-parindex="{{par}}" />
+ </view>
+ </view>
+
+ </view>
+
+
+
+
+ </view>
+</view>
<view class="shaisel">
<view class="kind">
<view class="shaikind" wx:for="{{navarr}}" wx:key='' bindtap="select" data-idx="{{index}}" data-type="{{item.type}}">
@@ -49,17 +123,20 @@
</view>
</view>
- <view class="more">
+ <view class="more" bindtap="mores">
<image src="{{url}}aicon_15x.png"></image>
</view>
</view>
<view class="zhinengbox">
+ <view class="nodataimg" wx:if="{{zhinenglist.length==0}}">
+ <image src="/img/wushuju.png"></image>
+ </view>
+
- <view class="nodata" wx:if="{{zhinenglist.length==0}}">暂无数据</view>
<block wx:else>
- <view class="searchitem" wx:for="{{zhinenglist}}" wx:key="">
+ <view class="searchitem" wx:for="{{zhinenglist}}" wx:key="" bindtap="jumpbrand" data-id="{{item.id}}">
<view class="searchitemleft">
<view class="itemleftimg">
<image src="{{item.logo}}"></image>
@@ -87,4 +164,6 @@
</view>
</block>
+
+
</view>
\ No newline at end of file
diff --git a/pages/homeblock/zhinengselect/zhinengselect.wxss b/pages/homeblock/zhinengselect/zhinengselect.wxss
index 1bb4a75..a3edbd3 100644
--- a/pages/homeblock/zhinengselect/zhinengselect.wxss
+++ b/pages/homeblock/zhinengselect/zhinengselect.wxss
@@ -86,6 +86,7 @@ page {
.registerwrap {
width: 750rpx;
+ overflow-y: scroll;
background: #fff;
position: fixed;
z-index: 6;
@@ -94,7 +95,32 @@ page {
left: 0;
display: flex;
flex-wrap: wrap;
- padding: 0 32rpx 20rpx 0;
+ padding: 0 32rpx 120rpx 0;
+ box-sizing: border-box;
+}
+.pregisterwrap{
+ width: 750rpx;
+ overflow-y: scroll;
+ background: #fff;
+ position: fixed;
+ z-index: 6;
+ top: 100rpx;
+ border-top: 1rpx solid #f5f5f5;
+ left: 0;
+}
+
+.moreregisterwrap {
+ width: 750rpx;
+ height: 100%;
+ overflow-y: scroll;
+ background: #fff;
+ position: fixed;
+ z-index: 6;
+ top: 100rpx;
+ border-top: 1rpx solid #f5f5f5;
+ left: 0;
+ padding: 0 32rpx 120rpx 0;
+ box-sizing: border-box;
}
.registeritem {
@@ -108,6 +134,11 @@ page {
margin-top: 20rpx;
}
+.valuebox {
+ display: flex;
+ flex-wrap: wrap;
+}
+
.selactive {
color: #e81825;
}
@@ -117,8 +148,13 @@ page {
color: #fff;
}
+.actitem {
+ background: #e81825;
+ color: #fff;
+}
+
.citylist {
- width:750rpx;
+ width: 750rpx;
display: flex;
align-items: center;
justify-content: space-between;
@@ -137,11 +173,157 @@ page {
height: 40rpx;
font-size: 0;
}
-.section{
- width:100%;
+
+.section {
+ width: 100%;
}
-.pyuan{
- color:#E81825;
+
+.pyuan {
+ color: #e81825;
font-size: 28rpx;
- margin:20rpx 0 0 20rpx;
+ margin: 20rpx 0 0 20rpx;
+}
+
+.sliderHCon {
+ margin: 0 40rpx 0 40rpx;
+ height: 188rpx;
+ width: 100%;
+ margin: auto;
+ /* display: flex;
+ justify-content: center;
+ align-items: center;
+ flex-direction: column; */
+}
+
+.MoneyValue {
+ font-size: 30rpx;
+ text-align: center;
+ color: #999;
+ margin-top: 15rpx;
+}
+
+.showMoney {
+ color: #e81825;
+ font-size: 30rpx;
+ width: 750rpx;
+ padding-left: 51rpx;
+ box-sizing: border-box;
+}
+
+.twoSlider {
+ width: 100%;
+ display: flex;
+ flex-direction: row;
+ justify-content: center;
+ align-items: center;
+ position: relative;
+}
+
+.fenge {
+ width: 100%;
+ height: 2rpx;
+ background: red;
+ margin-left: 20rpx;
+ position: absolute;
+ left: 0;
+ display: flex;
+ align-items: center;
+ justify-content: space-around;
+}
+
+.fengeitem {
+ width: 1rpx;
+ height: 20rpx;
+ background: blue;
+ margin-top: -19rpx;
+ /* margin-left:20rpx; */
+}
+
+.selecttop {
+ display: flex;
+ align-items: center;
+ padding: 33rpx 33rpx 0;
+ box-sizing: border-box;
+}
+
+.selectrow {
+ width: 12rpx;
+ height: 8rpx;
+ font-size: 0;
+ margin-left: 10rpx;
+}
+
+.selectrow image {
+ width: 100%;
+ height: 100%;
+}
+
+.selectopname {
+ color: #1a1a1a;
+ font-size: 28rpx;
+}
+
+.selactive {
+ color: #e81825;
+}
+
+.tiaohead {
+ width: 750rpx;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ padding: 0 33rpx;
+ box-sizing: border-box;
+ margin-top:20rpx;
+}
+
+.tiaoleft {
+ color: #1a1a1a;
+ font-size: 28rpx;
+}
+
+.tiaoright {
+ color: #e81825;
+ font-size: 32rpx;
+}
+
+.top {
+ text-align: center;
+}
+
+.des {
+ text-align: center;
+}
+
+.zy-slider {
+
+ position: relative;
+ padding: 30rpx ;
+ box-sizing: border-box
+}
+
+.button {
+ width: 200rpx;
+ margin-top: 20px;
+}
+.gezi{
+ position:absolute;
+ top:20rpx;
+ left:0;
+ width:1100%;
+ height:1rpx;
+ background: yellow
+}
+.pp{
+ display: flex;
+ justify-content: space-between;
+ align-items: center
+
+}
+.ppitem{
+ width:1px;
+ height:50rpx;
+ background: green;
+
+
}
\ No newline at end of file
diff --git a/pages/jiudan/jiudan.wxss b/pages/jiudan/jiudan.wxss
index 397406d..4d810b8 100644
--- a/pages/jiudan/jiudan.wxss
+++ b/pages/jiudan/jiudan.wxss
@@ -6,7 +6,7 @@ page{
display: flex;
display: -webkit-flex;
flex-wrap: wrap;
- overflow-x: hidden;
+ /* overflow-x: hidden; */
}
.list_item{
width: 366rpx;
@@ -59,7 +59,7 @@ page{
margin-top: 40rpx;
}
.single_action{
- padding: 0 10rpx;
+ padding: 0 20rpx;
display: flex;
align-items: center;
position: relative;
@@ -76,7 +76,7 @@ page{
height: 175rpx;
position: absolute;
background-color: #FFF;
- z-index: 10;
+ z-index: 99;
left: -140rpx;
top: 0;
font-size: 30rpx;
diff --git a/pages/login/login.js b/pages/login/login.js
index 98d3fc4..75a6ccf 100644
--- a/pages/login/login.js
+++ b/pages/login/login.js
@@ -14,7 +14,10 @@ Page({
mimaphone:'',
mima:'',
type:'',
- id:''
+ id:'',
+ passtype:true,
+ shuru:'',
+ passwordtype:'password'
},
/**
@@ -48,8 +51,21 @@ Page({
console.log(43823489)
this.setData({
phonenum:'',
- phone:''
+
+ })
+ },
+ yclearphone(){
+ this.setData({
+ phone: ''
+ })
+ },
+ showmia(){
+ this.setData({
+
+ passtype:false,
+ shuru:wx.getStorageSync("mima")
})
+
},
//验证码登录
@@ -93,17 +109,25 @@ Page({
this.setData({
mima: e.detail.value
})
+ wx.setStorageSync('mima', e.detail.value)
},
+ entershuru(e){
+ this.setData({
+ shuru: e.detail.value
+ })
+ },
//密码登录
mimalogin(){
let that = this;
+ console.log(that.data.mima)
//判断手机验证码
let reg = /^[1][3,4,5,6,7,8,9][0-9]{9}$/;
let phone = that.data.mimaphone;
- let mima=that.data.mima
+ let mima=that.data.mima;
+ console.log(mima)
if (phone == '') {
wx.showToast({
@@ -117,7 +141,7 @@ Page({
title: '请填写正确的手机号',
icon: 'none'
})
- } else if(mima=='') {
+ } else if (mima == '' && this.shuru=='') {
wx.showToast({
title: '请输入密码',
@@ -125,12 +149,23 @@ Page({
})
}else{
+ console.log(that.passtype)
var url ="/user/Profile/login_password"
- var params = {
- mobile: that.data.mimaphone,
- password:that.data.mima
- }
+ if(that.data.passtype==true){
+ var params = {
+ mobile: that.data.mimaphone,
+ password: that.data.mima
+ }
+
+ }else{
+ var params = {
+ mobile: that.data.mimaphone,
+ password: that.data.shuru
+ }
+
+ }
+
app.post(url, params).then((res) => {
console.log(res);
wx.setStorageSync('token', res.token)
@@ -138,6 +173,7 @@ Page({
wx.navigateTo({
url: '/pages/peopleinfo/peopleinfo',
})
+ wx.setStorageSync("mima", "")
}else{
//type=1 发现首页的分享
if(that.data.type==1){
@@ -151,6 +187,7 @@ Page({
url: url + '?id=' + that.data.id
})
}else{
+ wx.setStorageSync("mima", "")
wx.switchTab({
url: '/pages/homapage/homepage',
})
diff --git a/pages/login/login.wxml b/pages/login/login.wxml
index 18fbb9b..6e5f26e 100644
--- a/pages/login/login.wxml
+++ b/pages/login/login.wxml
@@ -21,7 +21,7 @@
<input placeholder='请输入手机号' placeholder-class='enterphone' bindinput="enterphone" value="{{phone}}" type="number"/>
</view>
- <view class="chaimg" bindtap="clearphone">
+ <view class="chaimg" bindtap="yclearphone">
<image src="{{url}}/aicon_07x.png"></image>
</view>
</view>
@@ -38,7 +38,7 @@
<view class="yanzheng ">
<view class="yanzhengleft">
- <view class="pho">+86</view>
+ <view class="pho">+86 </view>
<view class="rowimg">
<image src="{{url}}/aicon_53x.png"></image>
</view>
@@ -55,13 +55,16 @@
<view class="yanzheng mima">
<view class="yanzhengmiddle yanzhengma">
- <input placeholder='请输入密码' placeholder-class='enterphone' bindinput="shumima" type="password" value="{{mima}}"/>
+ <input placeholder='请输入密码' placeholder-class='enterphone' bindinput="shumima" type="password" value="{{mima}}" wx:if="{{passtype==true}}"/>
+ <input placeholder='{{mima}}' placeholder='请输入密码' placeholder-class='enterphone' bindinput="entershuru" type="text" value="{{shuru}}" wx:else/>
+
</view>
+
<view class="mimaimg" bindtap="clearmima">
<view class="chaimg">
<image src="{{url}}/aicon_07x.png"></image>
</view>
- <view class="eyeimg">
+ <view class="eyeimg" bindtap="showmia">
<image src="{{url}}/bicon_13x.png"></image>
</view>
</view>
diff --git a/pages/mine/mine.js b/pages/mine/mine.js
index 407bba1..5039811 100644
--- a/pages/mine/mine.js
+++ b/pages/mine/mine.js
@@ -13,9 +13,13 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
- this.setData({
- url: app.globalData.url
- })
+ let that=this;
+ setTimeout(function () {
+ that.setData({
+ url: app.globalData.url
+ })
+ }, 1000)
+
},
getInformation(){
let url = '/user/Center/user_index';
@@ -25,6 +29,12 @@ Page({
})
})
},
+ guanzhu(){
+ wx.navigateTo({
+ url: '/pages/myblock/guanzhu/guanzhu',
+ })
+ wx.setStorageSync("guantype", '')
+ },
/**
* 生命周期函数--监听页面初次渲染完成
*/
diff --git a/pages/mine/mine.wxml b/pages/mine/mine.wxml
index a212428..8b33902 100644
--- a/pages/mine/mine.wxml
+++ b/pages/mine/mine.wxml
@@ -1,38 +1,38 @@
<view class="headimg">
<image src="{{url}}aicon_87x.png"></image>
- <navigator class="peopleinfo" url='/pages/myblock/personpage/personpage'>
+ <navigator class="peopleinfo" url='/pages/myblock/personpage/personpage' hover-class='none'>
<view class="peoplecontent">
<view class="peopleleft">
<image src="{{userInfo.avatar||url+'aicon_77@2x.png'}}"></image>
</view>
<view class="peopletext">
<view class="peopletitle">{{userInfo.user_nickname||'酒字典'}}</view>
- <view class="level">M{{userInfo.level}}</view>
+ <view class="level">lv{{userInfo.level}}</view>
</view>
</view>
<view class="iconfont icon-jiantou"> </view>
</navigator>
- <navigator class="jifen">
+ <navigator class="jifen" url="/pages/myblock/jifenjilu/jifenjilu" hover-class="navigator-hover">
<view class="jifennum">{{userInfo.score}}</view>
<view class="myuse">可用积分</view>
<view class="iconfont icon-jiantou jirow"></view>
</navigator>
<view class="xinhead">
- <navigator class="xinitem" url='/pages/myblock/guanzhu/guanzhu'>
+ <view class="xinitem" bindtap="guanzhu" >
<view class="xinimg">
<image src="{{url}}aicon_79.png"></image>
</view>
<view class="xintitle">关注</view>
- </navigator>
- <navigator class="xinitem" url='/pages/myblock/pinglun/pinglun'>
+ </view>
+ <navigator class="xinitem" hover-class="none" url='/pages/myblock/pinglun/pinglun'>
<view class="ping">
<image src="{{url}}aicon_80x.png"></image>
</view>
<view class="xintitle">评论</view>
</navigator>
- <navigator class="xinitem" url='/pages/myblock/history/history'>
+ <navigator class="xinitem" hover-class="none" url='/pages/myblock/history/history'>
<view class="history">
<image src="{{url}}aicon_81x.png"></image>
</view>
@@ -44,17 +44,17 @@
<view class="collect">
<view class="mycollect">我的收藏</view>
<view class="collectnum">
- <navigator url='/pages/myblock/jiupin/jiupin' class="collectitem">
+ <navigator url='/pages/myblock/jiupin/jiupin' class="collectitem" hover-class="none">
<view class="collectitemnum">{{userInfo.wine_count}}</view>
<view class="collectitemtitle">酒品</view>
</navigator>
- <navigator url='/pages/myblock/pinpai/pinpai' class="collectitem">
+ <navigator url='/pages/myblock/pinpai/pinpai' class="collectitem" hover-class="none">
<view class="collectitemnum">{{userInfo.brand_count}}</view>
<view class="collectitemtitle">品牌</view>
</navigator>
- <navigator url='/pages/myblock/jiupin/jiupin' class="collectitem">
+ <navigator url='/pages/myblock/jiudan/jiudan' class="collectitem" hover-class="none">
<view class="collectitemnum">{{userInfo.wine_rec_count}}</view>
- <view class="collectitemtitle">酒企</view>
+ <view class="collectitemtitle">酒单</view>
</navigator>
</view>
</view>
@@ -69,7 +69,7 @@
</view>
<view class="iconfont icon-jiantou listrow"></view>
</navigator>
- <navigator class="mylistitem">
+ <navigator class="mylistitem" hover-class="none" url="/pages/myblock/yonghufankui/yonghufankui">
<view class="mylistleft">
<view class="mylistimage">
<image src="{{url}}aicon_83x.png"></image>
@@ -78,7 +78,7 @@
</view>
<view class="iconfont icon-jiantou listrow"></view>
</navigator>
- <navigator class="mylistitem" url='/pages/myblock/zhanghaoyuanquan/zhanghaoyuanquan'>
+ <navigator class="mylistitem" hover-class="none" url='/pages/myblock/zhanghaoyuanquan/zhanghaoyuanquan'>
<view class="mylistleft">
<view class="mylistimage">
<image src="{{url}}aicon_84x.png"></image>
@@ -87,7 +87,7 @@
</view>
<view class="iconfont icon-jiantou listrow"></view>
</navigator>
- <navigator class="mylistitem" url='/pages/myblock/rule/rule'>
+ <navigator class="mylistitem" hover-class="none" url='/pages/myblock/rule/rule'>
<view class="mylistleft">
<view class="mylistimage">
<image src="{{url}}aicon_85x.png"></image>
@@ -96,7 +96,7 @@
</view>
<view class="iconfont icon-jiantou listrow"></view>
</navigator>
- <navigator class="mylistitem" url='/pages/myblock/about/about'>
+ <navigator class="mylistitem" hover-class="none" url='/pages/myblock/about/about'>
<view class="mylistleft">
<view class="mylistimage">
<image src="{{url}}aicon_86x.png"></image>
diff --git a/pages/myblock/guanzhu/guanzhu.js b/pages/myblock/guanzhu/guanzhu.js
index 8a07148..4ebf031 100644
--- a/pages/myblock/guanzhu/guanzhu.js
+++ b/pages/myblock/guanzhu/guanzhu.js
@@ -47,7 +47,7 @@ Page({
this.setData({
url: app.globalData.url
})
- this.getWine();
+
},
navbarTap: function (e) {
let idx = e.currentTarget.dataset.idx;
@@ -55,9 +55,162 @@ Page({
currentTab: e.currentTarget.dataset.idx,
page:1
});
+
+ wx.setStorageSync("guantype", '')
+
idx==0?this.getWine():this.getTeach();
},
+ //关注和取消关注
+ atten(e){
+
+ let that = this;
+ let id = e.currentTarget.dataset.id;
+ console.log(id)
+ var url = 'index/Common/concern';
+ var params = {
+ sort: 1,
+ id:id
+
+ }
+ app.post(url, params).then((res) => {
+ console.log(res);
+ wx.showToast({
+ title: res,
+ icon:'none'
+ })
+ let newcompony = that.data.compony;
+ for (var obj of newcompony){
+ if(obj.id==id){
+ if (obj.is_concern==0){
+ obj.is_concern =1
+ }else{
+ obj.is_concern = 0
+ }
+ }
+ }
+
+ that.setData({
+ compony: newcompony
+ })
+
+
+ }).catch((err) => {
+
+ })
+ },
+
+ //酒企详情
+ jumpcompany(e) {
+ let id = e.currentTarget.dataset.id
+ wx.navigateTo({
+ url: '/pages/homeblock/companyintro/companyintro?id=' + id,
+ })
+ },
+//酿酒师关注
+ jiuatten(e){
+ let that = this;
+ let id = e.currentTarget.dataset.id;
+ console.log(id)
+ var url = 'index/Common/concern';
+ var params = {
+ sort: 2,
+ id: id
+
+ }
+ app.post(url, params).then((res) => {
+ console.log(res);
+ wx.showToast({
+ title: res,
+ icon: 'none'
+ })
+ let newcompony = that.data.compony;
+ for (var obj of newcompony) {
+ if (obj.id == id) {
+ if (obj.is_concern == 0) {
+ obj.is_concern = 1
+ } else {
+ obj.is_concern = 0
+ }
+ }
+ }
+
+ that.setData({
+ compony: newcompony
+ })
+
+
+ }).catch((err) => {
+
+ })
+ },
+
+ //点赞和取消点赞
+ zan(e) {
+ let that = this;
+ let id = e.currentTarget.dataset.id;
+ let url = 'index/Common/good', params = {
+ id: id,
+ sort: 3
+
+
+ }
+ app.post(url, params).then((res) => {
+ console.log(res);
+ wx.showToast({
+ title: res,
+ icon: 'none'
+ })
+
+ let newcompony = that.data.compony;
+ for (var obj of newcompony) {
+ if (obj.id == id) {
+ if (obj.is_good == 0) {
+ obj.is_good = 1;
+ obj.good_count = obj.good_count + 1
+ } else {
+ obj.is_good = 0;
+ if (obj.good_count == 0) {
+ obj.good_count = 0
+ } else {
+ obj.good_count = obj.good_count - 1
+ }
+ }
+ }
+ }
+
+ that.setData({
+ compony: newcompony
+ })
+
+
+
+
+ }).catch((err) => {
+
+ })
+ },
+ //评论
+ ping(e) {
+ let id = e.currentTarget.dataset.id;
+ wx.navigateTo({
+ url: '/pages/myblock/pingjia/pingjia?winemaker_id=' + id + '&type=' + 3,
+ })
+ },
+ //酿酒大师详情
+ niangjiuteacherdetail(e) {
+ let id = e.currentTarget.dataset.id;
+ wx.navigateTo({
+ url: '/pages/homeblock/niangjiuteacher/niangjiuteacher?id=' + id,
+ })
+ },
+ //酿酒大师详情
+ niangjiuteacherdetail(e) {
+ let id = e.currentTarget.dataset.id;
+ wx.navigateTo({
+ url: '/pages/homeblock/niangjiuteacher/niangjiuteacher?id=' + id,
+ })
+ },
/**
* 生命周期函数--监听页面初次渲染完成
*/
@@ -69,7 +222,20 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow: function () {
+ let guantype = wx.getStorageSync("guantype")
+ if(guantype==1){
+ this.setData({
+ currentTab: 1,
+ page: 1
+ });
+ this.getTeach()
+ }else{
+ this.getWine();
+ }
+
+
+
},
/**
@@ -83,7 +249,7 @@ Page({
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
-
+ wx.setStorageSync("guantype", '')
},
/**
@@ -112,7 +278,33 @@ Page({
/**
* 用户点击右上角分享
*/
- onShareAppMessage: function () {
+ onShareAppMessage: function (e) {
+ let that = this;
+ wx.setStorageSync("guantype", 1)
+
+ let id = e.target.dataset.id;
+
+
+ let url = '/pages/homeblock/niangjiuteacher/niangjiuteacher?id=' + id
+
+
+ return {
+ title: '发现', // 转发后 所显示的title
+ // path: '/pages/home/buildtextdetail/buildtextdetail?buildid='+buildid+'&gettoken='+newtoken, // 相对的路径
+
+ path: url,//建档攻略分享1
+ // path:'',
+ success: (res) => { // 成功后要做的事情
+ console.log(res)
+
+ },
+ fail: function (res) {
+ console.log(8989)
+ // 分享失败
+ console.log(res)
+ wx.setStorageSync("guantype",1)
+ }
+ }
}
})
\ No newline at end of file
diff --git a/pages/myblock/guanzhu/guanzhu.wxml b/pages/myblock/guanzhu/guanzhu.wxml
index bb9a330..35d948a 100644
--- a/pages/myblock/guanzhu/guanzhu.wxml
+++ b/pages/myblock/guanzhu/guanzhu.wxml
@@ -4,21 +4,22 @@
</view>
<!-- 酒企 -->
<view class="guanzhulist" wx:if="{{currentTab==0}}">
- <view class="guanzhuitem" wx:for='{{compony}}' wx:key=''>
+ <view class="guanzhuitem" wx:for='{{compony}}' wx:key='' bindtap="jumpcompany" data-id="{{item.id}}">
<view class="guanzhuitemleft">
<view class="guanzhuleftname">{{item.name}}</view>
<view class="gouimg">
<image src="{{url}}/aicon_20x.png"></image>
</view>
</view>
- <view class="guanzhuright" bindtap='Action' id='{{item.id}}'>已关注</view>
+ <view class="guanzhuright" catchtap='atten' id='{{item.id}}' wx:if="{{item.is_concern==1}}">已关注</view>
+ <view class="guanzhuright" catchtap='atten' id='{{item.id}}' wx:if="{{item.is_concern==0}}">关注</view>
</view>
</view>
<!-- 酿酒师 -->
<view class="guanzhulist" wx:if="{{currentTab==1}}">
- <view class="guanzhuitem" wx:for='{{compony}}' wx:key=''>
+ <!-- <view class="guanzhuitem" wx:for='{{compony}}' wx:key='' bindtap="niangjiuteacherdetail" data-id="{{item.id}}">
<view class="guanzhuitemleft">
<view class="teacherimg">
<image src="{{item.avatar}}"></image>
@@ -28,10 +29,55 @@
<image src="{{url}}/aicon_20x.png"></image>
</view>
</view>
- <view class="guanzhuright">关注</view>
+ <view class="guanzhuright" catchtap='jiuatten' data-id="{{item.id}}" wx:if="{{item.is_concern==0}}">关注</view>
+ <view class="guanzhuright" catchtap='jiuatten' data-id="{{item.id}}" wx:if="{{item.is_concern==1}}">已关注</view>
+ </view> -->
+
+ <view class="niangjiulist" >
+ <view class="niangjiuitem" wx:for="{{compony}}" wx:key="">
+
+ <view bindtap="niangjiuteacherdetail" data-id="{{item.id}}">
+ <view class="teachimg">
+ <image src="{{item.avatar}}"></image>
+ </view>
+ <view class="jiuname">{{item.name}}</view>
+
+ <view class="atten" wx:if="{{item.is_concern==0}}" catchtap="jiuatten" data-id="{{item.id}}">关注</view>
+ <view class="atten aten1" wx:else catchtap="jiuatten" data-id="{{item.id}}">取消关注</view>
+
+ </view>
+
+
+ <view class="jiubottom">
+ <view class="jiuleft">
+ <view class="jiuleftimg" catchtap="zan" data-id="{{item.id}}">
+ <image src="{{url}}/aicon_47x.png" wx:if="{{item.is_good==0}}"></image>
+ <image src="{{url}}/aicon_46x.png" wx:else></image>
+ </view>
+ <view class="jiuzan">{{item.good_count}}</view>
+ </view>
+
+ <view class="jiumiddle" catchtap="ping" data-id="{{item.id}}">
+ <view class="middleimg">
+ <image src="{{url}}/aicon_67x.png"></image>
+ </view>
+ <view class="tiao">{{item.comment_count}}</view>
+ </view>
+
+ <view class="jiuright">
+ <image src="{{url}}/aicon_68x.png"></image>
+ <button class="lj_share" open-type='share' data-id="{{item.winemaker_id}}"></button>
+ </view>
+ </view>
+ </view>
+
</view>
</view>
-<view class='noData' wx:if='{{!noData}}'>
+<!-- <view class='noData' wx:if='{{!noData}}'>
暂无相关数据
+</view> -->
+
+<view class="nodataimg" wx:if='{{!noData}}'>
+ <image src="/img/wushuju.png"></image>
</view>
\ No newline at end of file
diff --git a/pages/myblock/guanzhu/guanzhu.wxss b/pages/myblock/guanzhu/guanzhu.wxss
index 70d21eb..b0b262d 100644
--- a/pages/myblock/guanzhu/guanzhu.wxss
+++ b/pages/myblock/guanzhu/guanzhu.wxss
@@ -1,3 +1,4 @@
+@import '../../findblock/niangjiushi/niangjiushi.wxss';
.kindnav {
height: 80rpx;
display: flex;
@@ -81,7 +82,7 @@ image {
.guanzhuright {
width: 100rpx;
height: 50rpx;
- background: rgba(179, 179, 179, 1);
+ background: #E81825;
border-radius: 2rpx;
color:#fff;
font-size:26rpx;
diff --git a/pages/myblock/history/history.js b/pages/myblock/history/history.js
index 1e33f82..c041175 100644
--- a/pages/myblock/history/history.js
+++ b/pages/myblock/history/history.js
@@ -42,7 +42,10 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
- this.getList();
+ this.setData({
+ url: app.globalData.url
+ })
+
let that = this;
wx.getSystemInfo({
success: function (t) {
@@ -90,6 +93,7 @@ Page({
page: this.data.page
};
app.post(url, params).then(r => {
+ console.log(r)
var list = this.data.page == 1 ? r.list : this.data.list.concat(r.list);
this.setData({
list: list,
@@ -99,6 +103,473 @@ Page({
})
})
},
+ //品牌收藏和取消收藏
+ brandcang(e){
+ let id =e.currentTarget.dataset.id;
+ let that = this;
+ let url = 'index/Common/favorite', params = {
+ id:id,
+ sort:2
+
+ }
+ app.post(url, params).then((res) => {
+ console.log(res);
+ wx.showToast({
+ title: res,
+ icon:"none"
+ })
+
+ let newlist = that.data.list;
+ for (var obj of newlist) {
+ if (obj.id == id) {
+ if (obj.is_favorite==0){
+ obj.is_favorite=1
+ }else{
+ obj.is_favorite=0
+ }
+ }
+ }
+
+ that.setData({
+ list:newlist
+ })
+
+
+
+
+
+ }).catch((err) => {
+
+ })
+
+ },
+
+ //酒品收藏和取消收藏
+
+ pincang(e){
+ let that = this;
+ let id=e.currentTarget.dataset.id;
+
+
+ let url = 'index/Common/favorite', params = {
+ sort:1,
+ id:id
+
+ }
+ app.post(url, params).then((res) => {
+ console.log(res);
+ wx.showToast({
+ title: res,
+ icon:'none'
+ })
+
+ let newlist = that.data.list;
+ for (var obj of newlist) {
+ if (obj.id == id) {
+ if (obj.is_favorite == 0) {
+ obj.is_favorite = 1
+ } else {
+ obj.is_favorite = 0
+ }
+ }
+ }
+
+ that.setData({
+ list: newlist
+ })
+
+
+
+ }).catch((err) => {
+
+ })
+
+ },
+ //酒企关注和取消关注
+ qiguan(e){
+ let that = this;
+ let id = e.currentTarget.dataset.id;
+ let url = 'index/Common/concern', params = {
+ sort:1,
+ id:id
+
+ }
+ app.post(url, params).then((res) => {
+ console.log(res);
+ wx.showToast({
+ title: res,
+ icon:'none'
+ })
+
+ let newlist = that.data.list;
+ for (var obj of newlist) {
+ if (obj.id == id) {
+ if (obj.is_concern == 0) {
+ obj.is_concern = 1
+ } else {
+ obj.is_concern = 0
+ }
+ }
+ }
+
+ that.setData({
+ list: newlist
+ })
+
+ }).catch((err) => {
+
+ })
+
+ },
+ //酒单点赞和取消点赞
+ danzan(e){
+ let that = this;
+ let id=e.currentTarget.dataset.id;
+
+ let url = 'index/Common/good', params = {
+ sort:1,
+ id:id
+
+ }
+ app.post(url, params).then((res) => {
+ console.log(res);
+ wx.showToast({
+ title: res,
+ icon:'none'
+ })
+
+ let newlist = that.data.list;
+ for (var obj of newlist) {
+ if (obj.id == id) {
+ if (obj.is_good == 0) {
+ obj.is_good = 1;
+ obj.good_count = obj.good_count+1
+ } else {
+ if (obj.good_count==0){
+ obj.good_count=0
+ }else{
+ obj.good_count = obj.good_count - 1
+ }
+ obj.is_good = 0
+ }
+ }
+ }
+
+ that.setData({
+ list: newlist
+ })
+
+
+
+ }).catch((err) => {
+
+ })
+ },
+ //酒单评论
+
+ danpinglun(e) {
+ let id = e.currentTarget.dataset.id;
+ wx.navigateTo({
+ url: '/pages/myblock/pingjia/pingjia?id=' + id + '&type=' + 1,
+ })
+ },
+ //酒单收藏
+ dancollect(e) {
+ let id = e.currentTarget.dataset.id;
+
+ let that = this;
+ let url = 'index/Common/favorite', params = {
+ sort: 3,
+ id: id
+
+ }
+ app.post(url, params).then((res) => {
+ console.log(res);
+ wx.showToast({
+ title: res,
+ icon: 'none'
+ })
+ let newlist = that.data.list;
+ for (var obj of newlist) {
+ if (obj.user_id == id) {
+ if (obj.is_favorite == 0) {
+ obj.is_favorite = 1
+ } else {
+ obj.is_favorite = 0
+ }
+ }
+ }
+
+ that.setData({
+ list: newlist
+ })
+
+
+
+ }).catch((err) => {
+
+ })
+ },
+
+ //专家品酒点赞和取消点赞
+ jiadianzan(e){
+ let id = e.currentTarget.dataset.id;
+ let that = this;
+ let url = 'index/Common/good', params = {
+ id: id,
+ sort: 2
+
+
+ }
+ app.post(url, params).then((res) => {
+ console.log(res);
+ wx.showToast({
+ title: res,
+ icon: 'none'
+ })
+
+ let newlist = that.data.list;
+ for (var obj of newlist) {
+ if (obj.id == id) {
+ if (obj.is_good == 0) {
+ obj.is_good = 1;
+ obj.good_count++
+ } else {
+ obj.is_good = 0
+ if (obj.good_count == 0) {
+ obj.good_count = 0
+ } else {
+ obj.good_count = obj.good_count - 1
+ }
+
+
+ }
+ }
+ }
+
+ that.setData({
+ list: newlist
+ })
+
+
+
+ }).catch((err) => {
+
+ })
+ },
+
+ //专家品酒进入评论页面
+ jiaping(e) {
+ let id = e.currentTarget.dataset.id;
+ let type = 2
+ // let winemaker_id = e.currentTarget.dataset.winemaker_id
+ wx.navigateTo({
+ url: '/pages/myblock/pingjia/pingjia?type=' + type + '&id=' + id
+ })
+ },
+ //酿酒大师点赞和取消点赞
+ jiuzan(e){
+ let that = this;
+ let id = e.currentTarget.dataset.id;
+ let url = 'index/Common/good', params = {
+ id: id,
+ sort: 3
+
+
+ }
+ app.post(url, params).then((res) => {
+ console.log(res);
+ wx.showToast({
+ title: res,
+ icon: 'none'
+ })
+
+ let newlist = that.data.list;
+ for (var obj of newlist) {
+ if (obj.id == id) {
+ if (obj.is_good == 0) {
+ obj.is_good = 1;
+ obj.good_count = obj.good_count + 1
+ } else {
+ obj.is_good = 0;
+ if (obj.good_count == 0) {
+ obj.good_count = 0
+ } else {
+ obj.good_count = obj.good_count - 1
+ }
+ }
+ }
+ }
+
+ that.setData({
+ list: newlist
+ })
+
+
+
+
+ }).catch((err) => {
+
+ })
+ },
+ //酿酒大师关注和取消关注
+
+ jiuatten(e) {
+ let id = e.currentTarget.dataset.id;
+
+ let that = this;
+ let url = 'index/Common/concern', params = {
+ sort: 2,
+ id: id
+
+
+ }
+ app.post(url, params).then((res) => {
+ console.log(res);
+
+ wx.showToast({
+ title: res,
+ icon: 'none'
+ })
+
+ let newlist = that.data.list;
+ for (var obj of newlist) {
+ if (obj.id == id) {
+ if (obj.is_concern == 0) {
+ obj.is_concern = 1
+ } else {
+ obj.is_concern = 0
+ }
+ }
+ }
+
+ that.setData({
+ list: newlist
+ })
+
+
+ }).catch((err) => {
+
+ })
+ },
+ //酿酒大师评论
+ //评论
+ jiuping(e) {
+ let id = e.currentTarget.dataset.id;
+ wx.navigateTo({
+ url: '/pages/myblock/pingjia/pingjia?winemaker_id=' + id + '&type=' + 3,
+ })
+ },
+ //普通文章点赞和取消点赞
+
+ zhangdianzan(e) {
+ let that = this;
+ let id = e.currentTarget.dataset.id;
+
+ let url = 'index/Common/good', params = {
+ sort: 4,
+ id: id
+ }
+ app.post(url, params).then((res) => {
+ console.log(res);
+ wx.showToast({
+ title: res,
+ icon: 'none'
+ })
+
+ let newlist = that.data.list;
+ for (var obj of newlist) {
+ if(obj.id==id){
+ if (obj.is_good == 0) {
+ obj.is_good = 1;
+ obj.good_count = obj.good_count + 1
+ } else {
+ obj.is_good = 0;
+ if (obj.good_count == 0) {
+ obj.obj.good_count = 0
+ } else {
+ obj.good_count = obj.good_count - 1
+ }
+ }
+ }
+
+ }
+
+ that.setData({
+ list: newlist
+ })
+
+
+
+
+ }).catch((err) => {
+
+ })
+ },
+
+ //普通文章进入评论
+
+ zhangping(e) {
+ let id = e.currentTarget.dataset.id;
+ wx.navigateTo({
+ url: '/pages/myblock/pingjia/pingjia?id=' + id + '&type=' + 4,
+ })
+ },
+ //品牌详情
+ pinpaijump(e) {
+ let id = e.currentTarget.dataset.id;
+ console.log(id)
+ wx.navigateTo({
+ url: '/pages/homeblock/brandlist/brandlist?id=' + id,
+ })
+ },
+ //酒品详情页
+ pinjumpbrand(e){
+ let id=e.currentTarget.dataset.id;
+ wx.navigateTo({
+ url: '/pages/homeblock/jiuzidian/jiuzidian?id=' + id,
+ })
+ },
+
+ //酒单详情页
+ jiudandetail(e) {
+ let id = e.currentTarget.dataset.id;
+ wx.navigateTo({
+ url: '/pages/findblock/jiudandetail/jiudandetail?id=' + id,
+ })
+ },
+ //酒企详情
+
+ jumpcompany(e) {
+ let id = e.currentTarget.dataset.id
+ wx.navigateTo({
+ url: '/pages/homeblock/companyintro/companyintro?id=' + id,
+ })
+ },
+ //专家酒品详情页
+ jiudetail(e) {
+ let id = e.currentTarget.dataset.id;
+ wx.navigateTo({
+ url: '/pages/findblock/zhuanjiapinjiudetail/zhuanjiapinjiudetail?id=' + id,
+ })
+ },
+ //酿酒大师详情
+
+ niangjiuteacherdetail(e) {
+ let id = e.currentTarget.dataset.id;
+ wx.navigateTo({
+ url: '/pages/homeblock/niangjiuteacher/niangjiuteacher?id=' + id,
+ })
+ },
+ //其他文章详情页
+
+ wendetail(e) {
+ let id = e.currentTarget.dataset.id;
+ wx.navigateTo({
+ url: '/pages/findblock/wenzhangdetail/wenzhangdetail?id=' + id,
+ })
+ },
+
/**
* 生命周期函数--监听页面初次渲染完成
*/
@@ -110,7 +581,7 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow: function () {
-
+ this.getList();
},
/**
@@ -144,7 +615,45 @@ Page({
/**
* 用户点击右上角分享
*/
- onShareAppMessage: function () {
+ onShareAppMessage: function (e) {
+ console.log(e)
+ let that = this;
+ //1 酒单 2 酒品 3 酿酒大师 4 普通文章
+
+ let id = e.target.dataset.id;
+ let type = e.target.dataset.type;
+ let url=''
+ if(type==1){
+ url = '/pages/findblock/jiudandetail/jiudandetail?id=' + id
+
+ }else if(type==2){
+ url = '/pages/findblock/zhuanjiapinjiudetail/zhuanjiapinjiudetail?id=' + id
+ }else if(type==3){
+ url = '/pages/homeblock/niangjiuteacher/niangjiuteacher?id=' + id
+ }else if(type==4){
+ url = '/pages/findblock/wenzhangdetail/wenzhangdetail?id=' + id
+ }
+
+
+
+
+
+ return {
+ title: '发现', // 转发后 所显示的title
+ // path: '/pages/home/buildtextdetail/buildtextdetail?buildid='+buildid+'&gettoken='+newtoken, // 相对的路径
+
+ path: url,//建档攻略分享1
+ // path:'',
+ success: (res) => { // 成功后要做的事情
+ console.log(res)
+
+ },
+ fail: function (res) {
+ // 分享失败
+ console.log(res)
+ }
+ }
}
+
})
\ No newline at end of file
diff --git a/pages/myblock/history/history.wxml b/pages/myblock/history/history.wxml
index 0caf2b2..910bc15 100644
--- a/pages/myblock/history/history.wxml
+++ b/pages/myblock/history/history.wxml
@@ -39,7 +39,7 @@
</view>
</view> -->
<view class="zhinengbox" wx:if='{{selectindex==0}}'>
- <view class="searchitem" wx:for='{{list}}' wx:key=''>
+ <view class="searchitem" wx:for='{{list}}' wx:key='' bindtap="pinpaijump" data-id="{{item.id}}">
<view class="searchitemleft">
<view class="itemleftimg">
<image src="{{item.logo}}" mode='widthFix'></image>
@@ -55,7 +55,7 @@
</view>
</view>
- <view class="starimg">
+ <view class="starimg" catchtap='brandcang' data-id="{{item.id}}">
<!-- aicon_010x.png -->
<image src="{{item.is_favorite==0?'/img/aicon_09.png':'/img/aicon_10.png'}}"></image>
</view>
@@ -63,7 +63,7 @@
</view>
</view>
<view class="zhinengbox winebrand" wx:if='{{selectindex==1}}'>
- <view class="searchitem" wx:for='{{list}}' wx:key=''>
+ <view class="searchitem" wx:for='{{list}}' wx:key='' bindtap="pinjumpbrand" data-id="{{item.id}}">
<view class="searchitemleft">
<view class="itemleftimg">
<image src="{{item.logo}}"></image>
@@ -78,7 +78,7 @@
</view>
</view>
</view>
- <view class="starimg">
+ <view class="starimg" catchtap='pincang' data-id="{{item.id}}">
<!-- aicon_010x.png -->
<image src="{{item.is_favorite==0?'/img/aicon_09.png':'/img/aicon_10.png'}}"></image>
</view>
@@ -86,7 +86,7 @@
</view>
<!-- 酒企 -->
<view class="zhinengbox winebrand" wx:if='{{selectindex==2}}'>
- <view class="searchitem" wx:for='{{list}}' wx:key=''>
+ <view class="searchitem" wx:for='{{list}}' wx:key='' bindtap="jumpcompany" data-id="{{item.id}}">
<view class="searchitemleft">
<view class="itemleftimg">
<image src="{{item.logo}}"></image>
@@ -104,29 +104,39 @@
<!-- <view class="starimg"> -->
<!-- aicon_010x.png -->
<!-- <image src="{{item.is_favorite==0?'/img/aicon_09.png':'/img/aicon_10.png'}}"></image> -->
- <view class='focus_btn {{item.is_concern==0?"":"active"}}'>
- 已关注
+ <view class='focus_btn active' wx:if="{{item.is_concern==0}}" catchtap='qiguan' data-id="{{item.id}}">
+ 关注
+ </view>
+ <view class='focus_btn active' wx:else catchtap='qiguan' data-id="{{item.id}}">
+ 取消关注
</view>
<!-- </view> -->
</view>
</view>
+ <!-- 酒单 -->
<view class='wine_list' wx:if='{{selectindex==3}}' bindtap='closeShareAction'>
- <view class='list_item' wx:for='{{list}}' wx:key=''>
- <view class='img_box'>
+ <view class='list_item' wx:for='{{list}}' wx:key='' >
+
+ <view class="dandetail" bindtap="jiudandetail" data-id="{{item.id}}">
+ <view class='img_box'>
<image src='{{item.avatar}}' mode='widthFix'></image>
</view>
<view class='wine_title'>{{item.title}}</view>
<view class='wine_name'>{{item.user_nickname}}</view>
<view class='wine_leavel'>lv{{item.level}}</view>
+ </view>
+
+
+
<view class='action_box'>
<view class='single_action'>
- <view class='zan_icon'>
+ <view class='zan_icon' catchtap='danzan' data-id="{{item.id}}">
<image src='{{!item.is_good?"/img/aicon_47.png":"/img/aicon_46.png"}}' mode='widthFix'></image>
</view>
{{item.good_count}}
</view>
- <view class='single_action'>
+ <view class='single_action' bindtap="danpinglun" data-id="{{item.id}}">
<view class='zan_icon'>
<image src='/img/aicon_67.png' mode='widthFix'></image>
</view>
@@ -134,10 +144,14 @@
</view>
<view class='single_action {{item.show?"active":""}}' catchtap='shareAction' id='{{index}}'>
<image src='/img/gengduo.png' mode='widthFix' class='moreIcon'></image>
+
+
+
<view class='min_action_box'>
- <view class='action_btn {{item.is_favorite?"active":""}}'>{{!item.is_favorite?"收藏":"已收藏"}}</view>
+ <view class='action_btn {{item.is_favorite?"active":""}}' catchtap="dancollect" data-id="{{item.user_id}}">{{!item.is_favorite?"收藏":"已收藏"}}</view>
<view class='action_btn'>分享
- <button open-type='share'></button>
+ <button class="lj_share" catchtap="buildshare" open-type='share' data-id="{{item.id}}" data-type="1"></button>
+ <!-- <button open-type='share'></button> -->
</view>
</view>
</view>
@@ -146,7 +160,7 @@
</view>
<!-- 专家品酒 -->
<view class='wine_list' wx:if='{{selectindex==4}}'>
- <view class="wineblock" wx:for='{{list}}' wx:key=''>
+ <view class="wineblock" wx:for='{{list}}' wx:key='' bindtap="jiudetail" data-id="{{item.id}}">
<view class="winetitle">{{item.title}}</view>
<view class="wineimg">
<image src="{{item.video_image}}"></image>
@@ -161,12 +175,12 @@
</view>
<view class="winebottonright">
<view class="winerighttou">
- <view class="winerighttouimg">
+ <view class="winerighttouimg" catchtap="jiadianzan" data-id="{{item.id}}">
<image src='{{!item.is_good?"/img/aicon_47.png":"/img/aicon_46.png"}}' mode='widthFix'></image>
</view>
<view class="winezan">{{item.good_count}}</view>
</view>
- <view class="winerighttou">
+ <view class="winerighttou" catchtap="jiaping" data-id="{{item.id}}">
<view class="winerighttouimg">
<image src='/img/aicon_67.png' mode='widthFix'></image>
</view>
@@ -175,43 +189,103 @@
<view class="winerighttou">
<view class="winerighttouimg">
<image src="/img/aicon_74.png"></image>
+
+ <button class="lj_share" catchtap="buildshare" open-type='share' data-id="{{item.id}}" data-type="2"></button>
</view>
</view>
</view>
</view>
</view>
</view>
- <view class="niangjiulist" wx:if='{{selectindex==5}}'>
- <view class="niangjiuitem" wx:for='{{list}}' wx:key=''>
+
+ <!-- 酿酒大师 -->
+ <view class="niangjiulist" wx:if='{{selectindex==5}}'>
+ <view class="niangjiuitem" wx:for='{{list}}' wx:key='' bindtap="niangjiuteacherdetail" data-id="{{item.id}}">
<view class="teachimg">
<image src="{{item.avatar}}"></image>
</view>
<view class="jiuname">{{item.name}}</view>
- <view class="atten">{{item.is_concern==0?'关注':'已关注'}}</view>
+ <view class="atten" catchtap="jiuatten" data-id="{{item.id}}">{{item.is_concern==0?'关注':'已关注'}}</view>
<view class="jiubottom">
<view class="jiuleft">
- <view class="jiuleftimg">
- <image src='{{!item.is_good?"/img/aicon_47.png":"/img/aicon_46.png"}}' mode='widthFix'></image>
+ <view class="jiuleftimg" catchtap="jiuzan" data-id="{{item.id}}">
+ <image src='{{!item.is_good?"/img/aicon_47.png":"/img/aicon_46.png"}}' mode='widthFix'></image>
</view>
<view class="jiuzan">{{item.good_count}}</view>
</view>
<view class="jiumiddle">
- <view class="middleimg">
+ <view class="middleimg" catchtap="jiuping" data-id="{{item.id}}">
<image src='/img/aicon_67.png' mode='widthFix'></image>
</view>
<view class="tiao">{{item.comment_count}}</view>
</view>
<view class="jiuright">
<image src="/img/aicon_68.png"></image>
+ <button class="lj_share" bindtap="buildshare" open-type='share' data-id="{{item.id}}" data-type="3"></button>
+ </view>
+ </view>
+ </view>
+ </view>
+
+ <!-- 其他文章 -->
+
+ <view class="otherarticle" wx:if='{{selectindex==6}}'>
+ <view class="wineblock" wx:for="{{list}}" wx:key='' bindtap="wendetail" data-id="{{item.id}}">
+
+ <view class="winetitle">{{item.title}}</view>
+
+ <view class="wineimg">
+ <image src="{{item.thumb}}"></image>
+ </view>
+
+ <view class="winebottom" style="padding:0 33rpx;box-sizing:border-box;">
+ <view class="winebottomleft">
+ <view class="winebottomleftimg">
+ <image src="{{item.avatar}}"></image>
+ </view>
+ <view class="wineeng">{{item.name}}</view>
+ </view>
+ <view class="winebottonright">
+
+ <view class="winerighttou">
+ <view class="winerighttouimg" catchtap="zhangdianzan" data-id="{{item.id}}">
+ <image src="{{url}}aicon_47x.png" wx:if="{{item.is_good==0}}"></image>
+ <image src="{{url}}aicon_46x.png" wx:else></image>
+ </view>
+ <view class="winezan">{{item.good_count}}</view>
+ </view>
+ <view class="winerighttou" catchtap='zhangping' data-id="{{item.id}}">
+ <view class="winerighttouimg">
+ <image src="{{url}}aicon_67x.png"></image>
+ </view>
+ <view class="winezan">{{item.comment_count}}</view>
+ </view>
+
+ <view class="winerighttou">
+ <view class="winerighttouimg">
+ <image src="{{url}}aicon_68x.png"></image>
+ <button class="lj_share" catchtap="buildshare" open-type='share' data-id="{{item.id}}" data-type="4"></button>
+ </view>
+
+ </view>
</view>
+
</view>
+
</view>
</view>
- <view class='showall' wx:if='{{noMore&&noData}}'>已显示全部内容</view>
+
+
+ <!-- <view class='showall' wx:if='{{noMore&&noData}}'>已显示全部内容</view> -->
</view>
</view>
<view class='showall' wx:if='{{noMore&&noData}}'>已显示全部内容</view>
-<view class='noData' wx:if='{{!noData}}'>
+
+
+<view class="nodataimg" wx:if='{{!noData}}'>
+ <image src="/img/wushuju.png"></image>
+</view>
+<!-- <view class='noData' wx:if='{{!noData}}'>
暂无相关数据
-</view>
\ No newline at end of file
+</view> -->
\ No newline at end of file
diff --git a/pages/myblock/history/history.wxss b/pages/myblock/history/history.wxss
index b7b394c..dc84575 100644
--- a/pages/myblock/history/history.wxss
+++ b/pages/myblock/history/history.wxss
@@ -2,10 +2,13 @@
@import '../../jiudan/jiudan.wxss';
@import '../../findblock/zhuanjiapinjiu/zhuanjiapinjiu.wxss';
@import '../../findblock/niangjiushi/niangjiushi.wxss';
+@import '../../findblock/putongwenzhang/putongwenzhang.wxss';
page{
width: 100%;
height: 100%;
+ background: #F2F2F2;
+ overflow-x: hidden
}
.pinglunitem {
margin: 41rpx 30rpx;
@@ -169,10 +172,11 @@ page{
flex-flow: column;
height: 100%;
width: 100%;
+ overflow-x: hidden
}
.comment_list{
flex: 1;
- overflow-y: auto;
+ /* overflow-y: auto; */
padding-bottom: 32rpx;
}
.comment_list.del{
@@ -229,8 +233,11 @@ page{
}
.focus_btn{
display: inline-block;
+ height:50x;
+ line-height:50rpx;
+
font-size: 26rpx;
- padding: 8rpx;
+ padding:0 20rpx;
color: #999;
background-color: #ebebeb;
}
@@ -241,4 +248,21 @@ page{
.shareAction .more{
margin-right: 0!important;
-}
\ No newline at end of file
+}
+.winetitle{
+ padding: 0
+}
+.winebottom{
+ padding:0
+}
+.dandetail{
+ width:366rpx;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center
+}
+/* .otherarticle{
+ padding: 0 33rpx;
+ box-sizing: border-box
+} */
\ No newline at end of file
diff --git a/pages/myblock/huanbangshouji/huanbangshouji.js b/pages/myblock/huanbangshouji/huanbangshouji.js
index 3d12593..1f2d3a4 100644
--- a/pages/myblock/huanbangshouji/huanbangshouji.js
+++ b/pages/myblock/huanbangshouji/huanbangshouji.js
@@ -20,17 +20,20 @@ Page({
},
getCode(){
- let phone = this.data.params.mobile, url ='/user/Profile/getNewCode',that = this;
+ console.log(this.data.params.mobile)
+ let phone = this.data.params.mobile, url ='user/Profile/getNewCode',that = this;
if (!(/^1[3456789]\d{9}$/.test(phone))){
wx.showToast({
title: '请输入正确的手机号',
icon:'none'
})
}else{
+ console.log(url)
let params = {
mobile: this.data.params.mobile
},code=60;
app.post(url,params).then(r=>{
+ console.log(r)
that.setData({
getting: false
})
@@ -47,8 +50,11 @@ Page({
clearInterval(interval);
}
},1000)
+ }).catch((err) => {
+ console.log(err)
})
}
+
},
inputCode(e){
let type = e.currentTarget.dataset.type;
@@ -56,7 +62,10 @@ Page({
this.setData({
params:this.data.params
})
+
+ console.log(this.data.params)
},
+
subBand(){
let phone = this.data.params.mobile, url ='/user/Profile/bind_new_mobile';
if (!(/^1[3456789]\d{9}$/.test(phone))) {
diff --git a/pages/myblock/huanbangshouji/huanbangshouji.wxml b/pages/myblock/huanbangshouji/huanbangshouji.wxml
index 6526178..bc6c8b8 100644
--- a/pages/myblock/huanbangshouji/huanbangshouji.wxml
+++ b/pages/myblock/huanbangshouji/huanbangshouji.wxml
@@ -1,6 +1,6 @@
<view class="bangshouji">
<view class="huanbangleft">
- <input type="number" placeholder='请输入手机号' placeholder-class='enterphone' maxlength='11' bindinput='inputCode' data-type='mobile' />
+ <input type="number" placeholder='请输入手机号' placeholder-class='enterphone' maxlength='11' bindinput='inputCode' data-type='mobile' type="number"/>
</view>
<view class="huanbangright" bindtap='getCode' wx:if='{{getting}}' >获取验证码</view>
<view class="huanbangright" wx:else>{{code}}S</view>
diff --git a/pages/myblock/jifenjilu/jifenjilu.js b/pages/myblock/jifenjilu/jifenjilu.js
index ce5faa0..c8a36a2 100644
--- a/pages/myblock/jifenjilu/jifenjilu.js
+++ b/pages/myblock/jifenjilu/jifenjilu.js
@@ -1,20 +1,64 @@
// pages/myblock/jifenjilu/jifenjilu.js
+const app=getApp()
Page({
/**
* 页面的初始数据
*/
data: {
-
+ page:1,
+ list:[]
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
+ this.getjifen()
+ },
+ //获取积分记录
+ getjifen(){
+
+ let that = this;
+ let url = 'user/Center/user_score', params = {
+ page:that.data.page
+
+ }
+ app.post(url, params).then((res) => {
+ console.log(res);
+ for (var obj of res.list) {
+ console.log(obj.create_time)
+ var date = new Date(obj.create_time * 1000)
+ var Y = date.getFullYear();
+ var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1);
+ var D = (date.getDate() + 1 < 10 ? '0' + (date.getDate()) : date.getDate())
+ var h = date.getHours() + ':';
+ var m = date.getMinutes() + ':';
+ var s = date.getSeconds();
+ // 拼接
+ obj.create_time = Y + "-" + M + "-" + D
+ }
+
+ that.setData({
+ list:that.data.list.concat(res.list)
+ })
+
+ // let newlist = that.data.list;
+ // console.log(newlist)
+
+ // that.setData({
+ // list:newlist
+ // })
+
+
+
+ }).catch((err) => {
+
+ })
},
+
/**
* 生命周期函数--监听页面初次渲染完成
*/
@@ -54,7 +98,13 @@ Page({
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
+ let page=this.data.page;
+ page++;
+ this.setData({
+ page:page
+ })
+ this.getjifen()
},
/**
diff --git a/pages/myblock/jifenjilu/jifenjilu.wxml b/pages/myblock/jifenjilu/jifenjilu.wxml
index f9bf385..8c3a8d0 100644
--- a/pages/myblock/jifenjilu/jifenjilu.wxml
+++ b/pages/myblock/jifenjilu/jifenjilu.wxml
@@ -1,17 +1,17 @@
<view class="jilubox">
- <view class="jiluitem">
+ <view class="jiluitem" wx:for="{{list}}" wx:key="">
<view class="jiluleft">
- <view class="jilutext">评论</view>
- <view class="jiludate">2019-02-28 11:23</view>
+ <view class="jilutext">{{item.type_name}}</view>
+ <view class="jiludate">{{item.create_time}}</view>
</view>
<view class="jiluright">
- <view class="righttop">+100.00</view>
+ <view class="righttop">+{{item.score}}</view>
- <view class="righttext">已成功</view>
+ <view class="righttext">{{item.action}}</view>
</view>
</view>
- <view class="jiluitem">
+ <!-- <view class="jiluitem">
<view class="jiluleft">
<view class="jilutext">评论</view>
<view class="jiludate">2019-02-28 11:23</view>
@@ -82,5 +82,5 @@
<view class="righttext">已成功</view>
</view>
- </view>
+ </view> -->
</view>
diff --git a/pages/myblock/jifenjilu/jifenjilu.wxss b/pages/myblock/jifenjilu/jifenjilu.wxss
index b470682..3a131d5 100644
--- a/pages/myblock/jifenjilu/jifenjilu.wxss
+++ b/pages/myblock/jifenjilu/jifenjilu.wxss
@@ -18,14 +18,22 @@
margin-top:22rpx;
}
.righttop{
+ width:300rpx;
color:#FF5344;
font-size: 32rpx;
+ text-align: right;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap
}
.righttext{
color:#666666;
font-size: 26rpx;
margin-top:22rpx;
- text-align: center
+ text-align: right;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap
}
.jiluitem{
diff --git a/pages/myblock/jiupin/jiupin.js b/pages/myblock/jiupin/jiupin.js
index aef6e9d..570bdcd 100644
--- a/pages/myblock/jiupin/jiupin.js
+++ b/pages/myblock/jiupin/jiupin.js
@@ -16,7 +16,7 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
- this.getList();
+
},
getList() {
let url = 'user/Center/favorite_wine' , params = {
@@ -33,6 +33,54 @@ Page({
})
},
+ //酒品收藏和取消收藏
+
+ pincang(e) {
+ let that = this;
+ let id = e.currentTarget.dataset.id;
+
+
+ let url = 'index/Common/favorite', params = {
+ sort: 1,
+ id: id
+
+ }
+ app.post(url, params).then((res) => {
+ console.log(res);
+ wx.showToast({
+ title: res,
+ icon: 'none'
+ })
+
+ let newlist = that.data.list;
+ for (var obj of newlist) {
+ if (obj.id == id) {
+ if (obj.is_favorite == 0) {
+ obj.is_favorite = 1
+ } else {
+ obj.is_favorite = 0
+ }
+ }
+ }
+
+ that.setData({
+ list: newlist
+ })
+
+
+
+ }).catch((err) => {
+
+ })
+
+ },
+ //酒品详情页
+ pinjumpbrand(e) {
+ let id = e.currentTarget.dataset.id;
+ wx.navigateTo({
+ url: '/pages/homeblock/jiuzidian/jiuzidian?id=' + id,
+ })
+ },
/**
* 生命周期函数--监听页面初次渲染完成
*/
@@ -44,7 +92,7 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow: function () {
-
+ this.getList();
},
/**
diff --git a/pages/myblock/jiupin/jiupin.wxml b/pages/myblock/jiupin/jiupin.wxml
index 602e689..e9373e3 100644
--- a/pages/myblock/jiupin/jiupin.wxml
+++ b/pages/myblock/jiupin/jiupin.wxml
@@ -1,5 +1,5 @@
<view class='list_box'>
- <view class="searchitem" wx:for='{{list}}' wx:key=''>
+ <view class="searchitem" wx:for='{{list}}' wx:key='' bindtap="pinjumpbrand" data-id="{{item.id}}">
<view class="searchitemleft">
<view class="itemleftimg">
<image src="{{item.logo}}"></image>
@@ -14,7 +14,7 @@
</view>
</view>
</view>
- <view class="starimg">
+ <view class="starimg" catchtap='pincang' data-id="{{item.id}}">
<!-- aicon_010x.png -->
<image src="{{item.is_favorite==0?'/img/aicon_09.png':'/img/aicon_10.png'}}"></image>
</view>
@@ -23,6 +23,6 @@
<view class='showall' wx:if='{{noMore&&noData}}'>已显示全部内容</view>
-<view class='noData' wx:if='{{!noData}}'>
- 暂无相关数据
+<view class="nodataimg" wx:if='{{!noData}}'>
+ <image src="/img/wushuju.png"></image>
</view>
\ No newline at end of file
diff --git a/pages/myblock/message/message.js b/pages/myblock/message/message.js
index 2375e5c..96455fa 100644
--- a/pages/myblock/message/message.js
+++ b/pages/myblock/message/message.js
@@ -24,7 +24,16 @@ Page({
};
app.post(url, params).then(r => {
for(var obj of r.list){
- obj.create_time = formMate.formatTime(new Date(obj.create_time))
+ // obj.create_time = formMate.formatTime(new Date(obj.create_time))
+ var date = new Date(obj.create_time * 1000)
+ var Y = date.getFullYear();
+ var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1);
+ var D = (date.getDate() + 1 < 10 ? '0' + (date.getDate()) : date.getDate())
+ var h = date.getHours() + ':';
+ var m = date.getMinutes() + ':';
+ var s = date.getSeconds();
+ // 拼接
+ obj.create_time = Y + "-" + M + "-" + D
}
var list = this.data.page == 1 ? r.list : this.data.list.concat(r.list);
this.setData({
diff --git a/pages/myblock/personpage/personpage.js b/pages/myblock/personpage/personpage.js
index 9a0289f..97c455e 100644
--- a/pages/myblock/personpage/personpage.js
+++ b/pages/myblock/personpage/personpage.js
@@ -29,11 +29,13 @@ Page({
},
uploadImg(e){
let that = this;
+
wx.chooseImage({
count: 1,
sizeType: [],
sourceType: [],
success: function(res) {
+ console.log(9999999999)
wx.uploadFile({
url: app.globalData.baseUrl +'/user/upload/one',
filePath: res.tempFilePaths[0],
@@ -64,6 +66,7 @@ Page({
getUserInfo(){
let url = '/user/Center/get_userinfo';
app.post(url,{}).then(r=>{
+
this.setData({
userInfo: r,
sexindex: r.sex == 1 ?0:2,
@@ -97,6 +100,10 @@ Page({
this.setData({
birthday: e.detail.value
})
+ let type=e.currentTarget.dataset.type
+ this.data.userInfo[type] = e.detail.value
+
+ this.saveUserInfo();
},
//省市区选择
diff --git a/pages/myblock/personpage/personpage.wxml b/pages/myblock/personpage/personpage.wxml
index 85dfb31..cf53224 100644
--- a/pages/myblock/personpage/personpage.wxml
+++ b/pages/myblock/personpage/personpage.wxml
@@ -34,7 +34,7 @@
</view>
<view class="headtopitem">
<view class="headtopleft">生日</view>
- <picker mode="date" value="{{userInfo.birthday}}" bindchange="bindDateChange">
+ <picker mode="date" value="{{userInfo.birthday}}" bindchange="bindDateChange" data-type='birthday'>
<view class="selectoption">
<view class="sexname">
{{birthday}}
@@ -70,19 +70,19 @@
<view class="headtopitem">
<view class="headtopleft">星座</view>
<view class="entername">
- <input placeholder='请输入星座' placeholder-class='enterming' value='{{userInfo.constellation}}' bindinput='getUserInfo' data-type='constellation' />
+ <input placeholder='请输入星座' placeholder-class='enterming' value='{{userInfo.constellation}}' bindinput='inputUserInfo' data-type='constellation' />
</view>
</view>
<view class="headtopitem">
<view class="headtopleft">身高</view>
<view class="entername">
- <input placeholder='请输入身高' placeholder-class='enterming' value='{{userInfo.height}}' bindinput='inputUserInfo' data-type='height'/>
+ <input placeholder='请输入身高' placeholder-class='enterming' value='{{userInfo.height}}' bindinput='inputUserInfo' data-type='height' type="number"/>
</view>
</view>
<view class="headtopitem">
<view class="headtopleft">体重</view>
<view class="entername">
- <input placeholder='请输入体重' placeholder-class='enterming' value='{{userInfo.weight}}' bindinput='inputUserInfo' data-type='weight'/>
+ <input placeholder='请输入体重' placeholder-class='enterming' value='{{userInfo.weight}}' bindinput='inputUserInfo' data-type='weight' type="number"/>
</view>
</view>
</view>
diff --git a/pages/myblock/pingjia/pingjia.js b/pages/myblock/pingjia/pingjia.js
index 742e7cb..38df673 100644
--- a/pages/myblock/pingjia/pingjia.js
+++ b/pages/myblock/pingjia/pingjia.js
@@ -49,12 +49,21 @@ Page({
}
app.post(url, params).then((res) => {
console.log(res);
+ for(var obj of res.list){
+ var date = new Date(obj.create_time * 1000)
+ var Y = date.getFullYear();
+ var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1);
+ var D = (date.getDate() + 1 < 10 ? '0' + (date.getDate()) : date.getDate())
+ var h = date.getHours() + ':';
+ var m = date.getMinutes() + ':';
+ var s = date.getSeconds();
+ // 拼接
+ obj.create_time = Y + "-" + M + "-" + D
+ }
+
that.setData({
pinglist:that.data.pinglist.concat(res.list)
})
-
-
-
}).catch((err) => {
})
@@ -133,7 +142,7 @@ Page({
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
-
+ wx.setStorageSync("guantype", 1)
},
/**
diff --git a/pages/myblock/pingjia/pingjia.wxml b/pages/myblock/pingjia/pingjia.wxml
index 8d78425..1c72fc2 100644
--- a/pages/myblock/pingjia/pingjia.wxml
+++ b/pages/myblock/pingjia/pingjia.wxml
@@ -1,4 +1,10 @@
<view class="commentlist">
+
+ <view class="nodataimg" wx:if="{{pinglist.length==0}}">
+ <image src="/img/wushuju.png"></image>
+ </view>
+ <block wx:else>
+
<view class="commentitem" wx:for="{{pinglist}}" wx:key=''>
<view class="commentleft">
<image src="{{item.avatar}}"></image>
@@ -6,18 +12,18 @@
<view class="commentright">
<view class="rightname">{{item.user_nickname}}</view>
- <view class="rightdate">2019年11月5日</view>
+ <view class="rightdate">{{item.create_time}}</view>
<view class="righttext">{{item.content}}</view>
</view>
</view>
-
+</block>
</view>
<view class="pingjiabottom">
<view class="pbleft">
- <input placeholder='输入评论的内容' placeholder-class='enterping' bindinput="entertext"/>
+ <input placeholder='输入评论的内容' placeholder-class='enterping' bindinput="entertext" />
</view>
<view class="pbright" bindtap="publishcomment">发送</view>
diff --git a/pages/myblock/pingjia/pingjia.wxss b/pages/myblock/pingjia/pingjia.wxss
index 0aa790b..a13e1db 100644
--- a/pages/myblock/pingjia/pingjia.wxss
+++ b/pages/myblock/pingjia/pingjia.wxss
@@ -18,7 +18,7 @@
border-radius:50%;
}
-image{
+.commentleft image{
width:100%;
height:100%;
border-radius: 50%;
diff --git a/pages/myblock/pinglun/pinglun.js b/pages/myblock/pinglun/pinglun.js
index cb83455..76da469 100644
--- a/pages/myblock/pinglun/pinglun.js
+++ b/pages/myblock/pinglun/pinglun.js
@@ -41,6 +41,18 @@ Page({
page: this.data.page
};
app.post(url, params).then(r => {
+ for (var obj of r.list) {
+
+ var date = new Date(obj.create_time * 1000)
+ var Y = date.getFullYear();
+ var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1);
+ var D = (date.getDate() + 1 < 10 ? '0' + (date.getDate()) : date.getDate())
+ var h = date.getHours() + ':';
+ var m = date.getMinutes() + ':';
+ var s = date.getSeconds();
+ // 拼接
+ obj.create_time = Y + "-" + M + "-" + D
+ }
var list = this.data.page == 1 ? r.list : this.data.list.concat(r.list);
this.setData({
list: list,
@@ -68,17 +80,28 @@ Page({
},
delChoose(){
let that = this;
- wx.showModal({
- title: '提示',
- content: '确认删除这些选择项',
- success: function (res) {
- if (res.confirm) {
- that.delComent(that.data.delId)
+
+ if (that.data.delId.length == 0) {
+ wx.showToast({
+ title: '请选择要删除的内容',
+ icon: "none"
+ })
+ }else{
+ wx.showModal({
+ title: '提示',
+ content: '确认删除这些选择项',
+ success: function (res) {
+ if (res.confirm) {
+ that.delComent(that.data.delId)
+ }
}
- }
- })
+ })
+ }
+
},
+
delComent(obj){
+
let t = this, url = 'index/Common/comment_delete ',params={
ids:obj
};
@@ -135,7 +158,14 @@ Page({
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
-
+ console.log(3434838)
+ let page=this.data.page;
+ console.log(page)
+ page++;
+ this.setData({
+ page:page
+ })
+ this.getList()
},
/**
diff --git a/pages/myblock/pinglun/pinglun.wxml b/pages/myblock/pinglun/pinglun.wxml
index 92e4ce0..97acbcb 100644
--- a/pages/myblock/pinglun/pinglun.wxml
+++ b/pages/myblock/pinglun/pinglun.wxml
@@ -22,7 +22,8 @@
</view>
<view class="pinglunbottom">
<view class="pingbottomleft">
- <image src="{{item.article.thumb}}"></image>
+ <image src="{{item.article.video_image}}" wx:if="{{item.type==2}}"></image>
+ <image src="{{item.article.thumb}}" wx:else></image>
</view>
<view class='pingbottomright'>
<view class='xinxi'>{{item.article.title}}</view>
@@ -35,13 +36,17 @@
</view>
</view>
</view>
- <view class='showall' wx:if='{{noMore&&noData}}'>已显示全部内容</view>
+ <!-- <view class='showall' wx:if='{{noMore&&noData}}'>已显示全部内容</view> -->
</view>
</view>
<view class="btnbottom" wx:if='{{edit}}'>
<view class="btnleft" bindtap='clearComment'>一键清空</view>
<view class="btnright" bindtap='delChoose'>删除（{{delId.length||'0'}}）</view>
</view>
-<view class='noData' wx:if='{{!noData}}'>
+
+<view class="nodataimg" wx:if='{{!noData}}'>
+<image src="/img/wushuju.png"></image>
+</view>
+<!-- <view class='noData' wx:if='{{!noData}}'>
暂无相关数据
-</view>
\ No newline at end of file
+</view> -->
\ No newline at end of file
diff --git a/pages/myblock/pinpai/pinpai.js b/pages/myblock/pinpai/pinpai.js
index 15a4905..fcfbf10 100644
--- a/pages/myblock/pinpai/pinpai.js
+++ b/pages/myblock/pinpai/pinpai.js
@@ -16,7 +16,7 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
- this.getList();
+
},
collect(e) {
let id = e.currentTarget.id, url = '/index/Common/favorite', index = e.currentTarget.dataset.index, params = {
@@ -49,6 +49,57 @@ Page({
})
})
},
+
+ //品牌详情
+ pinpaijump(e) {
+ let id = e.currentTarget.dataset.id;
+ console.log(id)
+ wx.navigateTo({
+ url: '/pages/homeblock/brandlist/brandlist?id=' + id,
+ })
+ },
+
+ //品牌收藏和取消收藏
+ brandcang(e) {
+ let id = e.currentTarget.dataset.id;
+ let that = this;
+ let url = 'index/Common/favorite', params = {
+ id: id,
+ sort: 2
+
+ }
+ app.post(url, params).then((res) => {
+ console.log(res);
+ wx.showToast({
+ title: res,
+ icon: "none"
+ })
+
+ let newlist = that.data.list;
+ for (var obj of newlist) {
+ if (obj.id == id) {
+ if (obj.is_favorite == 0) {
+ obj.is_favorite = 1
+ } else {
+ obj.is_favorite = 0
+ }
+ }
+ }
+
+ that.setData({
+ list: newlist
+ })
+
+
+
+
+
+ }).catch((err) => {
+
+ })
+
+ },
+
/**
* 生命周期函数--监听页面初次渲染完成
*/
@@ -59,7 +110,7 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow: function () {
-
+ this.getList();
},
/**
* 生命周期函数--监听页面隐藏
diff --git a/pages/myblock/pinpai/pinpai.wxml b/pages/myblock/pinpai/pinpai.wxml
index 9ead2ca..fef3ab8 100644
--- a/pages/myblock/pinpai/pinpai.wxml
+++ b/pages/myblock/pinpai/pinpai.wxml
@@ -1,5 +1,5 @@
<view class='list_box'>
- <view class="searchitem" wx:for='{{list}}' wx:key=''>
+ <view class="searchitem" wx:for='{{list}}' wx:key='' bindtap="pinpaijump" data-id="{{item.id}}">
<view class="searchitemleft">
<view class="itemleftimg">
<image src="{{item.logo}}" mode='widthFix'></image>
@@ -14,7 +14,7 @@
</view>
</view>
</view>
- <view class="starimg" id='{{item.id}}' data-index='{{index}}' bindtap='collect'>
+ <view class="starimg" id='{{item.id}}' data-index='{{index}}' catchtap='brandcang' data-id="{{item.id}}">
<!-- aicon_010x.png -->
<image src="{{item.is_favorite==0?'/img/aicon_09.png':'/img/aicon_10.png'}}"></image>
</view>
@@ -23,6 +23,6 @@
<view class='showall' wx:if='{{noMore&&noData}}'>已显示全部内容</view>
-<view class='noData' wx:if='{{!noData}}'>
- 暂无相关数据
+<view class="nodataimg" wx:if='{{!noData}}'>
+ <image src="/img/wushuju.png"></image>
</view>
\ No newline at end of file
diff --git a/pages/myblock/shezhimima/shezhimima.js b/pages/myblock/shezhimima/shezhimima.js
index 70a80b0..a14e244 100644
--- a/pages/myblock/shezhimima/shezhimima.js
+++ b/pages/myblock/shezhimima/shezhimima.js
@@ -6,7 +6,8 @@ Page({
* 页面的初始数据
*/
data: {
- url:''
+ url:'',
+ password:''
},
/**
@@ -24,24 +25,36 @@ Page({
})
},
confirmPassWord(){
- let params = {
- password: this.data.password
- }, url ='/user/Profile/set_password';
- if(params.password.length<6){
+ let that=this;
+ console.log(that.data.password)
+ if (that.data.password==''){
wx.showToast({
- title: '请输入6位数以上的密码',
+ title: '请输入密码',
+ icon:'none'
})
}else{
- app.post(url,params).then(r=>{
+ let params = {
+ password: this.data.password
+ }, url = '/user/Profile/set_password';
+ if (params.password.length < 6) {
wx.showToast({
- title: '设置成功',
- duration: 1300
+ title: '请输入6位数以上的密码',
})
- setTimeout(()=>{
- wx.navigateBack({
+ } else {
+ app.post(url, params).then(r => {
+ wx.showToast({
+ title: '设置成功',
+ duration: 1300
})
- },1200)
- })
+ setTimeout(() => {
+ wx.navigateBack({
+ })
+ }, 1200)
+ }).catch((err) => {
+ console.log(err)
+ })
+ }
+
}
},
/**
diff --git a/pages/myblock/zhanghaobangding/zhanghaobangding.js b/pages/myblock/zhanghaobangding/zhanghaobangding.js
index f6b1391..719cd17 100644
--- a/pages/myblock/zhanghaobangding/zhanghaobangding.js
+++ b/pages/myblock/zhanghaobangding/zhanghaobangding.js
@@ -12,7 +12,7 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
- this.getBindInfo();
+
},
getBindInfo(){
let url = '/user/Center/user_bind';
@@ -42,7 +42,7 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow: function () {
-
+ this.getBindInfo();
},
/**
diff --git a/pages/myblock/zhanghaoyuanquan/zhanghaoyuanquan.js b/pages/myblock/zhanghaoyuanquan/zhanghaoyuanquan.js
index 8bd34e1..52fe8b2 100644
--- a/pages/myblock/zhanghaoyuanquan/zhanghaoyuanquan.js
+++ b/pages/myblock/zhanghaoyuanquan/zhanghaoyuanquan.js
@@ -1,4 +1,5 @@
// pages/myblock/zhanghaoyuanquan/zhanghaoyuanquan.js
+const app=getApp()
Page({
/**
@@ -14,6 +15,32 @@ Page({
onLoad: function (options) {
},
+ //设置密码
+ shezhimima(){
+ let that = this;
+ let url = 'user/Center/user_pwd_status', params = {
+
+
+ }
+ app.post(url, params).then((res) => {
+ console.log(res);
+ if (res.is_password==1){
+ wx.navigateTo({
+ url: '/pages/myblock/xiugaimima/xiugaimima',
+ })
+ }else{
+ wx.navigateTo({
+ url: '/pages/myblock/shezhimima/shezhimima',
+ })
+ }
+
+
+
+ }).catch((err) => {
+
+ })
+
+ },
/**
* 生命周期函数--监听页面初次渲染完成
diff --git a/pages/myblock/zhanghaoyuanquan/zhanghaoyuanquan.wxml b/pages/myblock/zhanghaoyuanquan/zhanghaoyuanquan.wxml
index 30bd963..ad3a27c 100644
--- a/pages/myblock/zhanghaoyuanquan/zhanghaoyuanquan.wxml
+++ b/pages/myblock/zhanghaoyuanquan/zhanghaoyuanquan.wxml
@@ -1,17 +1,17 @@
<view class="zhanghao">
- <navigator class="zhanghaoitem" url='/pages/myblock/zhanghaobangding/zhanghaobangding'>
+ <navigator class="zhanghaoitem" url='/pages/myblock/zhanghaobangding/zhanghaobangding' hover-class="none">
<view class="zhanghaoleft">账号绑定</view>
<view class="rowimg">
<image src="/img/aicon_61.png"></image>
</view>
</navigator>
- <navigator class="zhanghaoitem" url='/pages/myblock/shezhimima/shezhimima'>
+ <view class="zhanghaoitem" bindtap="shezhimima">
<view class="zhanghaoleft">设置密码</view>
<view class="rowimg">
<image src="/img/aicon_61.png"></image>
</view>
- </navigator>
+ </view>
</view>
-<view class="question">常见问题</view>
\ No newline at end of file
+<!-- <view class="question">常见问题</view> -->
\ No newline at end of file
diff --git a/project.config.json b/project.config.json
index d27ad47..6e03833 100644
--- a/project.config.json
+++ b/project.config.json
@@ -4,15 +4,15 @@
"ignore": []
},
"setting": {
- "urlCheck": false,
+ "urlCheck": true,
"es6": true,
"postcss": true,
"minified": true,
"newFeature": true,
- "coverView": true,
"autoAudits": false,
"uglifyFileName": true,
"checkInvalidKey": true,
+ "coverView": true,
"checkSiteMap": true,
"uploadWithSourceMap": true,
"babelSetting": {
@@ -49,7 +49,7 @@
"list": []
},
"miniprogram": {
- "current": 43,
+ "current": 46,
"list": [
{
"id": -1,
@@ -315,7 +315,6 @@
"name": "个人中心收藏品牌",
"pathName": "pages/myblock/pinpai/pinpai",
"query": "",
- "query": "",
"scene": null
},
{
@@ -359,6 +358,26 @@
"pathName": "pages/myblock/rule/rule",
"query": "",
"scene": null
+ },
+ {
+ "id": -1,
+ "name": "用户反馈",
+ "pathName": "pages/myblock/yonghufankui/yonghufankui",
+ "query": "",
+ "scene": null
+ },
+ {
+ "id": -1,
+ "name": "修改密码",
+ "pathName": "pages/myblock/xiugaimima/xiugaimima",
+ "query": "",
+ "scene": null
+ },
+ {
+ "id": -1,
+ "name": "账号与安全",
+ "pathName": "pages/myblock/zhanghaoyuanquan/zhanghaoyuanquan",
+ "scene": null
}
]
}
diff --git a/utils/util.js b/utils/util.js
index dbadbb8..fcfb8c8 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -14,6 +14,28 @@ const formatNumber = n => {
return n[1] ? n : '0' + n
}
-module.exports = {
- formatTime: formatTime
+/**
+ * 将小程序的API封装成支持Promise的API
+ * @params fn {Function} 小程序原始API，如wx.login
+ */
+const wxPromisify = fn => {
+ return function (obj = {}) {
+ return new Promise((resolve, reject) => {
+ obj.success = function (res) {
+ resolve(res)
+ }
+
+ obj.fail = function (res) {
+ reject(res)
+ }
+
+ fn(obj)
+ })
+ }
}
+
+
+module.exports = {
+ formatTime: formatTime,
+ wxPromisify: wxPromisify
+}
\ No newline at end of file
--
libgit2 0.24.0