From 7b2847ac00849ffe33e4b1ca186fd9b6ad312dad Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 31 七月 2024 13:56:07 +0800
Subject: [PATCH] lll
---
wechat_jiaxuan/pages/store/staffList.wxml | 4
wechat_jiaxuan/pages/userinfo/index.wxss | 3
wechat_jiaxuan/pages/userinfo/mysub.js | 1
wechat_jiaxuan/pages/consult/consult.wxss | 1
wechat_jiaxuan/pages/detailDis/realpic.js | 11
wechat_jiaxuan/pages/userinfo/index.wxml | 18 +
wechat_jiaxuan/components/disProduct/index.js | 17 +
wechat_staff/pages/userinfo/collect.js | 7
wechat_jiaxuan/pages/store/info.less | 23 +
wechat_jiaxuan/utils/eventBus.js | 2
wechat_jiaxuan/app.wxss | 3
wechat_jiaxuan/app.json | 3
wechat_jiaxuan/pages/detailDis/product.wxml | 2
wechat_jiaxuan/pages/detailDis/realpic.wxml | 52 ++---
wechat_jiaxuan/pages/userinfo/collect.js | 90 +++++++--
wechat_staff/pages/homeId/index.js | 8
wechat_jiaxuan/pages/detailDis/product.wxss | 1
wechat_jiaxuan/components/authCard/authCard.less | 5
wechat_jiaxuan/pages/homeId/index.js | 1
wechat_jiaxuan/pages/detailDis/realpic.wxss | 2
wechat_jiaxuan/pages/store/staffList.js | 2
wechat_jiaxuan/pages/consult/detail.wxml | 2
wechat_jiaxuan/pages/index/index.js | 17 -
wechat_jiaxuan/pages/detailDis/product.js | 30 ++
wechat_jiaxuan/pages/consult/consult.less | 1
wechat_jiaxuan/components/disCase/index.js | 17 +
wechat_jiaxuan/pages/mine/mine.less | 6
wechat_jiaxuan/pages/detailDis/case.wxss | 2
wechat_staff/pages/homeId/index.json | 3
wechat_jiaxuan/pages/detailDis/case.wxml | 42 ++--
wechat_jiaxuan/pages/index/index.less | 11
wechat_jiaxuan/pages/userinfo/favorite.js | 1
wechat_jiaxuan/components/idCard/index.less | 8
wechat_jiaxuan/pages/userinfo/index.less | 3
wechat_jiaxuan/components/authCard/authCard.wxss | 5
wechat_jiaxuan/components/authCard/authCard.wxml | 32 +-
wechat_jiaxuan/pages/detailDis/product.less | 1
wechat_jiaxuan/pages/detailDis/realpic.less | 2
wechat_jiaxuan/components/disRealpic/index.js | 17 +
wechat_jiaxuan/components/idCard/index.wxss | 7
wechat_jiaxuan/pages/detailDis/case.js | 15
wechat_jiaxuan/pages/detailDis/case.less | 2
wechat_jiaxuan/pages/sets/index.js | 3
wechat_jiaxuan/pages/store/info.wxml | 2
wechat_staff/app.json | 7
wechat_jiaxuan/pages/index/index.wxss | 8
wechat_jiaxuan/pages/mine/mine.wxss | 6
wechat_jiaxuan/pages/store/info.wxss | 20 +
48 files changed, 343 insertions(+), 183 deletions(-)
diff --git a/wechat_jiaxuan/app.json b/wechat_jiaxuan/app.json
index 0538ed9..88f5ae0 100644
--- a/wechat_jiaxuan/app.json
+++ b/wechat_jiaxuan/app.json
@@ -33,7 +33,8 @@
"navigationBarTextStyle": "black",
"backgroundTextStyle": "dark",
"navigationBarBackgroundColor": "#fff",
- "navigationStyle": "default"
+ "navigationStyle": "default",
+ "backgroundColor": "#fff"
},
"tabBar": {
"color": "#999",
diff --git a/wechat_jiaxuan/app.wxss b/wechat_jiaxuan/app.wxss
index 6f32364..a4c6a09 100644
--- a/wechat_jiaxuan/app.wxss
+++ b/wechat_jiaxuan/app.wxss
@@ -108,9 +108,10 @@
/* 鎸囩ず鐐圭殑鏍峰紡 */
.wx-swiper-dots .wx-swiper-dot {
width: 40rpx;
- height: 4rpx;
+ height: 6rpx;
background: rgba(255,255,255,0.5);
border-radius: 5rpx;
+ margin-left: -10rpx;
}
.wx-swiper-dot.wx-swiper-dot-active {
diff --git a/wechat_jiaxuan/components/authCard/authCard.less b/wechat_jiaxuan/components/authCard/authCard.less
index be32644..1f28e2b 100644
--- a/wechat_jiaxuan/components/authCard/authCard.less
+++ b/wechat_jiaxuan/components/authCard/authCard.less
@@ -2,7 +2,7 @@
width: 670rpx;
margin: 0 auto;
background-color: #fff;
- padding: 10rpx 10rpx;
+ padding-bottom: 10rpx;
}
.wrap1{
display: flex;
@@ -91,11 +91,10 @@
.item{
flex-shrink: 0;
width: 305rpx;
- height: 184rpx;
background: rgba(176,135,113,0.05) #FFFFFF;
box-shadow: 0rpx 4rpx 12rpx 0rpx rgba(0,0,0,0.12);
border-radius: 8rpx;
- padding: 20rpx;
+ padding: 24rpx 20rpx;
margin-right: 20rpx;
.name{
display: flex;
diff --git a/wechat_jiaxuan/components/authCard/authCard.wxml b/wechat_jiaxuan/components/authCard/authCard.wxml
index 2754790..bff7593 100644
--- a/wechat_jiaxuan/components/authCard/authCard.wxml
+++ b/wechat_jiaxuan/components/authCard/authCard.wxml
@@ -1,19 +1,4 @@
<view class="container">
- <!-- 鏈巿鏉� -->
- <view wx:if="{{ type == '0' }}" class="wrap1">
- <view class="ai df_ct">
- <image src="../../static/icon/ai_auth.png"></image>
- </view>
- <view class="content">
- <view class="name">AI鎵捐璁�</view>
- <view class="desc">浣犺韩杈圭殑鍏ㄥ眿璁捐涓撳</view>
- </view>
- <view class="btn" bindtap="jumpAuth">
- <view>鍘�</view>
- <view>鐪�</view>
- <view>鐪�</view>
- </view>
- </view>
<!-- 宸叉巿鏉� -->
<view wx:if="{{ type == '1' }}" class="wrap2">
<view class="header" bindtap="jumpStore">
@@ -49,7 +34,7 @@
</view>
</view>
<!-- 宸叉巿鏉� 宸茬粦瀹� -->
- <view bindtap="jumpStaff" wx:if="{{ type == '2' }}" class="wrap1 wrap3">
+ <view bindtap="jumpStaff" wx:elif="{{ type == '2' }}" class="wrap1 wrap3">
<view class="ai df_ct">
<image src="../../static/icon/home_ic_guwen@2x.png" mode="widthFix"></image>
</view>
@@ -63,4 +48,19 @@
<view>鐪�</view>
</view>
</view>
+ <!-- 鏈巿鏉� -->
+ <view wx:else class="wrap1">
+ <view class="ai df_ct">
+ <image src="../../static/icon/ai_auth.png"></image>
+ </view>
+ <view class="content">
+ <view class="name">AI鎵捐璁�</view>
+ <view class="desc">浣犺韩杈圭殑鍏ㄥ眿璁捐涓撳</view>
+ </view>
+ <view class="btn" bindtap="jumpAuth">
+ <view>鍘�</view>
+ <view>鐪�</view>
+ <view>鐪�</view>
+ </view>
+ </view>
</view>
\ No newline at end of file
diff --git a/wechat_jiaxuan/components/authCard/authCard.wxss b/wechat_jiaxuan/components/authCard/authCard.wxss
index 10eae7f..67c7017 100644
--- a/wechat_jiaxuan/components/authCard/authCard.wxss
+++ b/wechat_jiaxuan/components/authCard/authCard.wxss
@@ -2,7 +2,7 @@
width: 670rpx;
margin: 0 auto;
background-color: #fff;
- padding: 10rpx 10rpx;
+ padding-bottom: 10rpx;
}
.wrap1 {
display: flex;
@@ -90,11 +90,10 @@
.wrap2 .list .item {
flex-shrink: 0;
width: 305rpx;
- height: 184rpx;
background: rgba(176, 135, 113, 0.05) #FFFFFF;
box-shadow: 0rpx 4rpx 12rpx 0rpx rgba(0, 0, 0, 0.12);
border-radius: 8rpx;
- padding: 20rpx;
+ padding: 24rpx 20rpx;
margin-right: 20rpx;
}
.wrap2 .list .item .name {
diff --git a/wechat_jiaxuan/components/disCase/index.js b/wechat_jiaxuan/components/disCase/index.js
index 9c5c9cb..01aa0be 100644
--- a/wechat_jiaxuan/components/disCase/index.js
+++ b/wechat_jiaxuan/components/disCase/index.js
@@ -1,4 +1,5 @@
import { getCataLogTagList, getZhongTaiWholecasePage, actionDo } from '../../api/index'
+import { eventBus } from '../../utils/eventBus'
Component({
/**
* 缁勪欢鐨勫睘鎬у垪琛�
@@ -22,6 +23,22 @@
sortType: '',
catalogCode: 'whole_case'
},
+ pageLifetimes: {
+ show: function() {
+ // 椤甸潰琚睍绀�
+ console.log('缁勪欢琚睍绀�');
+ eventBus.once('caseDeBack', (info) => {
+ const dataList = this.data.dataList
+ dataList.forEach(item => {
+ if(item.id === info.id){
+ item.isCollection = info.isCollection
+ item.viewCount ++
+ }
+ })
+ this.setData({ dataList })
+ })
+ },
+ },
attached() {
this.getCatelist()
this.getList()
diff --git a/wechat_jiaxuan/components/disProduct/index.js b/wechat_jiaxuan/components/disProduct/index.js
index 0ca5b83..85c328b 100644
--- a/wechat_jiaxuan/components/disProduct/index.js
+++ b/wechat_jiaxuan/components/disProduct/index.js
@@ -1,4 +1,5 @@
import { getCatalogList, getCataLogTagList, getZhongTaiProductPage } from '../../api/index'
+import { eventBus } from '../../utils/eventBus'
Component({
/**
* 缁勪欢鐨勫睘鎬у垪琛�
@@ -25,6 +26,22 @@
sortType: '',
catalogCode: ""
},
+ pageLifetimes: {
+ show: function() {
+ // 椤甸潰琚睍绀�
+ console.log('缁勪欢琚睍绀�');
+ eventBus.once('productDeBack', (info) => {
+ const datalist = this.data.datalist
+ datalist.forEach(item => {
+ if(item.id === info.id){
+ item.isCollection = info.isCollection
+ item.viewCount ++
+ }
+ })
+ this.setData({ datalist })
+ })
+ },
+ },
attached() {
this.getCatelist()
var app = getApp()
diff --git a/wechat_jiaxuan/components/disRealpic/index.js b/wechat_jiaxuan/components/disRealpic/index.js
index c96868b..ad7a5f3 100644
--- a/wechat_jiaxuan/components/disRealpic/index.js
+++ b/wechat_jiaxuan/components/disRealpic/index.js
@@ -1,4 +1,5 @@
import { getCataLogTagList, getZhongTaiRealcasePage, actionDo } from '../../api/index'
+import { eventBus } from '../../utils/eventBus'
Component({
/**
* 缁勪欢鐨勫睘鎬у垪琛�
@@ -21,6 +22,22 @@
sortType: '',
catalogCode: 'real_case'
},
+ pageLifetimes: {
+ show: function() {
+ // 椤甸潰琚睍绀�
+ console.log('缁勪欢琚睍绀�');
+ eventBus.once('realpicDeBack', (info) => {
+ const dataList = this.data.dataList
+ dataList.forEach(item => {
+ if(item.id === info.id){
+ item.isCollection = info.isCollection
+ item.viewCount ++
+ }
+ })
+ this.setData({ dataList })
+ })
+ },
+ },
attached() {
this.getCatelist()
},
diff --git a/wechat_jiaxuan/components/idCard/index.less b/wechat_jiaxuan/components/idCard/index.less
index 6bb6291..cd49674 100644
--- a/wechat_jiaxuan/components/idCard/index.less
+++ b/wechat_jiaxuan/components/idCard/index.less
@@ -1,9 +1,13 @@
.user {
+ position: fixed;
+ top: 0;
+ left: 0;
+ z-index: 999;
width: 750rpx;
padding: 0 40rpx;
height: 148rpx;
background: #FFFFFF;
- border-radius: 8rpx;
+ // border-radius: 0 0 8rpx 8rpx;
padding: 0 30rpx;
display: flex;
align-items: center;
@@ -12,7 +16,7 @@
.name {
font-size: 30rpx;
- margin-bottom: 12rpx;
+ margin-bottom: 10rpx;
}
.desc {
diff --git a/wechat_jiaxuan/components/idCard/index.wxss b/wechat_jiaxuan/components/idCard/index.wxss
index 672e603..673a322 100644
--- a/wechat_jiaxuan/components/idCard/index.wxss
+++ b/wechat_jiaxuan/components/idCard/index.wxss
@@ -1,9 +1,12 @@
.user {
+ position: fixed;
+ top: 0;
+ left: 0;
+ z-index: 999;
width: 750rpx;
padding: 0 40rpx;
height: 148rpx;
background: #FFFFFF;
- border-radius: 8rpx;
padding: 0 30rpx;
display: flex;
align-items: center;
@@ -13,7 +16,7 @@
}
.user .content .name {
font-size: 30rpx;
- margin-bottom: 12rpx;
+ margin-bottom: 10rpx;
}
.user .content .desc {
font-size: 24rpx;
diff --git a/wechat_jiaxuan/pages/consult/consult.less b/wechat_jiaxuan/pages/consult/consult.less
index 99aee9b..0a87a65 100644
--- a/wechat_jiaxuan/pages/consult/consult.less
+++ b/wechat_jiaxuan/pages/consult/consult.less
@@ -20,6 +20,7 @@
background-color: #F7F7F7;
image{
width: 28rpx;
+ height: 28rpx;
margin-right: 16rpx;
}
}
diff --git a/wechat_jiaxuan/pages/consult/consult.wxss b/wechat_jiaxuan/pages/consult/consult.wxss
index 346b4c4..52ac598 100644
--- a/wechat_jiaxuan/pages/consult/consult.wxss
+++ b/wechat_jiaxuan/pages/consult/consult.wxss
@@ -22,6 +22,7 @@
}
.home_top .search_wrap image {
width: 28rpx;
+ height: 28rpx;
margin-right: 16rpx;
}
.cate_wrap {
diff --git a/wechat_jiaxuan/pages/consult/detail.wxml b/wechat_jiaxuan/pages/consult/detail.wxml
index e04198a..b92ee1c 100644
--- a/wechat_jiaxuan/pages/consult/detail.wxml
+++ b/wechat_jiaxuan/pages/consult/detail.wxml
@@ -1,4 +1,4 @@
-<view>
+<view style="padding-top: {{ origin != 'b' && info.users && info.users.id ? '148' : '0' }}rpx;">
<!-- 鍚嶇墖 -->
<idCard users="{{ info.users }}" wx:if="{{ origin != 'b' && info.users && info.users.id }}" />
<view class="main_content">
diff --git a/wechat_jiaxuan/pages/detailDis/case.js b/wechat_jiaxuan/pages/detailDis/case.js
index b8facd2..4d8e372 100644
--- a/wechat_jiaxuan/pages/detailDis/case.js
+++ b/wechat_jiaxuan/pages/detailDis/case.js
@@ -1,4 +1,5 @@
import { actionDo, getWholecaseInfo } from '../../api/index'
+import { eventBus } from '../../utils/eventBus'
Page({
/**
@@ -15,6 +16,12 @@
actionType: 'view',
id: options.id
})
+ },
+ onUnload() {
+ console.log('璇︽儏杩涜浜嗛攢姣�');
+ setTimeout(() => {
+ eventBus.emit('caseDeBack', this.data.info)
+ }, 500)
},
onLoad(options) {
var app = getApp().globalData
@@ -69,6 +76,7 @@
this.setData({info})
wx.showToast({
title: actionType == 'collect' ? '鏀惰棌鎴愬姛' : '鍙栨秷鏀惰棌',
+ icon: "none"
})
})
},
@@ -119,13 +127,6 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
*/
onHide() {
-
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
- */
- onUnload() {
},
diff --git a/wechat_jiaxuan/pages/detailDis/case.less b/wechat_jiaxuan/pages/detailDis/case.less
index c7a62be..15bc6c8 100644
--- a/wechat_jiaxuan/pages/detailDis/case.less
+++ b/wechat_jiaxuan/pages/detailDis/case.less
@@ -1,5 +1,5 @@
.container {
- padding: 0 40rpx 220rpx;
+ padding: 148rpx 40rpx 220rpx;
.main_title {
font-weight: 500;
diff --git a/wechat_jiaxuan/pages/detailDis/case.wxml b/wechat_jiaxuan/pages/detailDis/case.wxml
index 0c0840f..69da20c 100644
--- a/wechat_jiaxuan/pages/detailDis/case.wxml
+++ b/wechat_jiaxuan/pages/detailDis/case.wxml
@@ -1,26 +1,28 @@
-<view class="container">
+<view>
<!-- 鍚嶇墖 -->
<idCard users="{{ info.users }}" wx:if="{{ origin != 'b' && info.users && info.users.id }}" />
- <view class="main_title">{{ info.title }}</view>
- <view class="time">鍙戝竷鏃堕棿锛歿{ info.publishDt }}</view>
- <view class="fullview_wrap">
- <view bindtap="priviewFull" wx:if="{{ info.panorama }}" class="full">
- <image class="icon" src="../../static/icon/ic_720.png" mode="widthFix"></image>
- <text>鍏ㄦ櫙</text>
+ <view class="container" style="padding-top: {{ origin != 'b' && info.users && info.users.id ? '148' : '0' }}rpx;">
+ <view class="main_title">{{ info.title }}</view>
+ <view class="time">鍙戝竷鏃堕棿锛歿{ info.publishDt }}</view>
+ <view class="fullview_wrap">
+ <view bindtap="priviewFull" wx:if="{{ info.panorama }}" class="full">
+ <image class="icon" src="../../static/icon/ic_720.png" mode="widthFix"></image>
+ <text>鍏ㄦ櫙</text>
+ </view>
+ <image class="banner" src="{{ info.coverImage }}" mode="widthFix"></image>
</view>
- <image class="banner" src="{{ info.coverImage }}" mode="widthFix"></image>
- </view>
- <view class="h1">甯冪疆鍥�</view>
- <image bindtap="priviewLayout" class="img" src="{{ info.layoutUlr }}" mode="widthFix"></image>
- <view class="analysis">
- <view class="h2">妗堜緥瑙ｆ瀽</view>
- <view class="text">{{ info.caseInfo }}</view>
- </view>
- <view class="list">
- <view wx:for="{{ info.apiSpaceCaseVos }}" wx:for-index="index" class="item">
- <view class="h1">{{ item.spaceName }}</view>
- <image data-index="{{index}}" data-url="{{ img }}" bindtap="priviewSpace" class="img" wx:for-index="indexb" wx:for="{{ item.imgList }}" wx:for-item="img" src="{{ img }}" mode="widthFix" />
- <view class="content">{{ item.spaceDesc }}</view>
+ <view class="h1">甯冪疆鍥�</view>
+ <image bindtap="priviewLayout" class="img" src="{{ info.layoutUlr }}" mode="widthFix"></image>
+ <view class="analysis">
+ <view class="h2">妗堜緥瑙ｆ瀽</view>
+ <view class="text">{{ info.caseInfo }}</view>
+ </view>
+ <view class="list">
+ <view wx:for="{{ info.apiSpaceCaseVos }}" wx:for-index="index" class="item">
+ <view class="h1">{{ item.spaceName }}</view>
+ <image data-index="{{index}}" data-url="{{ img }}" bindtap="priviewSpace" class="img" wx:for-index="indexb" wx:for="{{ item.imgList }}" wx:for-item="img" src="{{ img }}" mode="widthFix" />
+ <view class="content">{{ item.spaceDesc }}</view>
+ </view>
</view>
</view>
<!-- footer -->
diff --git a/wechat_jiaxuan/pages/detailDis/case.wxss b/wechat_jiaxuan/pages/detailDis/case.wxss
index a5ff355..80a4f85 100644
--- a/wechat_jiaxuan/pages/detailDis/case.wxss
+++ b/wechat_jiaxuan/pages/detailDis/case.wxss
@@ -1,5 +1,5 @@
.container {
- padding: 0 40rpx 220rpx;
+ padding: 148rpx 40rpx 220rpx;
}
.container .main_title {
font-weight: 500;
diff --git a/wechat_jiaxuan/pages/detailDis/product.js b/wechat_jiaxuan/pages/detailDis/product.js
index c65744e..beb90e7 100644
--- a/wechat_jiaxuan/pages/detailDis/product.js
+++ b/wechat_jiaxuan/pages/detailDis/product.js
@@ -3,6 +3,7 @@
actionDo,
getMemberInfo
} from '../../api/index'
+import { eventBus } from '../../utils/eventBus'
Page({
/**
* 椤甸潰鐨勫垵濮嬫暟鎹�
@@ -26,11 +27,28 @@
actionType: 'view',
id: options.id
})
- getMemberInfo().then(res => {
- this.setData({
- member: res.data
+ const member = wx.getStorageSync('member') || {}
+ if(!member.id){
+ getMemberInfo().then(res => {
+ this.setData({
+ member: res.data
+ })
})
- })
+ }
+ },
+ onShow() {
+ const member = wx.getStorageSync('member') || {}
+ if(member && member.id){
+ this.setData({
+ member
+ })
+ }
+ },
+ onUnload() {
+ console.log('璇︽儏杩涜浜嗛攢姣�');
+ setTimeout(() => {
+ eventBus.emit('productDeBack', this.data.info)
+ }, 500)
},
onLoad(options) {
var app = getApp().globalData
@@ -87,6 +105,7 @@
})
wx.showToast({
title: actionType == 'collect' ? '鏀惰棌鎴愬姛' : '鍙栨秷鏀惰棌',
+ icon: "none"
})
})
},
@@ -192,9 +211,6 @@
})
},
onHide() {
-
- },
- onUnload() {
},
onPullDownRefresh() {
diff --git a/wechat_jiaxuan/pages/detailDis/product.less b/wechat_jiaxuan/pages/detailDis/product.less
index 4dffe7c..d242428 100644
--- a/wechat_jiaxuan/pages/detailDis/product.less
+++ b/wechat_jiaxuan/pages/detailDis/product.less
@@ -42,6 +42,7 @@
}
.container{
padding-bottom: 200rpx;
+ padding-top: 148rpx;
}
page {
background-color: #f7f7f7;
diff --git a/wechat_jiaxuan/pages/detailDis/product.wxml b/wechat_jiaxuan/pages/detailDis/product.wxml
index c72efc3..bc895d5 100644
--- a/wechat_jiaxuan/pages/detailDis/product.wxml
+++ b/wechat_jiaxuan/pages/detailDis/product.wxml
@@ -1,4 +1,4 @@
-<view class="container">
+<view class="container" style="padding-top: {{ origin != 'b' && info.users && info.users.id ? '148' : '0' }}rpx;">
<!-- 鍚嶇墖 -->
<idCard users="{{ info.users }}" wx:if="{{ origin != 'b' && info.users && info.users.id }}" />
<!-- banner杞挱 -->
diff --git a/wechat_jiaxuan/pages/detailDis/product.wxss b/wechat_jiaxuan/pages/detailDis/product.wxss
index 6351ef8..8baf2fc 100644
--- a/wechat_jiaxuan/pages/detailDis/product.wxss
+++ b/wechat_jiaxuan/pages/detailDis/product.wxss
@@ -38,6 +38,7 @@
}
.container {
padding-bottom: 200rpx;
+ padding-top: 148rpx;
}
page {
background-color: #f7f7f7;
diff --git a/wechat_jiaxuan/pages/detailDis/realpic.js b/wechat_jiaxuan/pages/detailDis/realpic.js
index 5cdab38..adf82fa 100644
--- a/wechat_jiaxuan/pages/detailDis/realpic.js
+++ b/wechat_jiaxuan/pages/detailDis/realpic.js
@@ -1,4 +1,5 @@
import { getRealcaseInfo, actionDo } from '../../api/index'
+import { eventBus } from '../../utils/eventBus'
Page({
data: {
bottomLift: 0,
@@ -15,6 +16,12 @@
actionType: 'view',
id: options.id
})
+ },
+ onUnload() {
+ console.log('璇︽儏杩涜浜嗛攢姣�');
+ setTimeout(() => {
+ eventBus.emit('realpicDeBack', this.data.info)
+ }, 500)
},
onLoad(options) {
var app = getApp().globalData
@@ -43,6 +50,7 @@
info.isCollection = !info.isCollection
wx.showToast({
title: actionType == 'collect' ? '鏀惰棌鎴愬姛' : '鍙栨秷鏀惰棌',
+ icon: "none"
})
this.setData({info})
})
@@ -138,9 +146,6 @@
})
},
onHide() {
-
- },
- onUnload() {
},
onPullDownRefresh() {
diff --git a/wechat_jiaxuan/pages/detailDis/realpic.less b/wechat_jiaxuan/pages/detailDis/realpic.less
index 9addc52..777e409 100644
--- a/wechat_jiaxuan/pages/detailDis/realpic.less
+++ b/wechat_jiaxuan/pages/detailDis/realpic.less
@@ -1,5 +1,5 @@
.container {
- padding: 0 40rpx 220rpx;
+ padding: 148rpx 40rpx 220rpx;
.info_item{
width: 100%;
margin-bottom: 20rpx;
diff --git a/wechat_jiaxuan/pages/detailDis/realpic.wxml b/wechat_jiaxuan/pages/detailDis/realpic.wxml
index 4739291..ee3a652 100644
--- a/wechat_jiaxuan/pages/detailDis/realpic.wxml
+++ b/wechat_jiaxuan/pages/detailDis/realpic.wxml
@@ -1,36 +1,30 @@
-<view class="container">
+<view>
<!-- 鍚嶇墖 -->
<idCard users="{{ info.users }}" wx:if="{{ origin != 'b' && info.users && info.users.id }}" />
- <view class="main_title">{{ info.title }}</view>
- <view class="time">鍙戝竷鏃堕棿锛歿{ info.publishDt }}</view>
- <image data-url="{{ item }}" bindtap="priviewSpace" class="info_item" wx:for="{{ info.contentImgList }}" src="{{ item }}" mode="widthFix"></image>
- <view class="desc">{{ info.contentText || '' }}</view>
- <!-- <view class="list">
- <view class="item">
- <image src="" mode="widthFix" />
- <view class="content">鐪嬫儻浜嗘暣榻愬垝涓�鐨勭幓鐠冨悐鏌滐紝閲戣壊妗嗗瀷鐜婚棬鍚婃煖鍙堟槸涓嶄竴鏍风殑瀹＄編锛岃竟妗嗗井鏂滃垏鍏ワ紝宸﹀彸瀵圭О鍒嗗竷锛岀伅鍏夋槧琛笅锛岀編鍛崇粴涓藉濮�</view>
+ <view class="container" style="padding-top: {{ origin != 'b' && info.users && info.users.id ? '148' : '0' }}rpx;">
+ <view class="main_title">{{ info.title }}</view>
+ <view class="time">鍙戝竷鏃堕棿锛歿{ info.publishDt }}</view>
+ <image data-url="{{ item }}" bindtap="priviewSpace" class="info_item" wx:for="{{ info.contentImgList }}" src="{{ item }}" mode="widthFix"></image>
+ <view class="desc">{{ info.contentText || '' }}</view>
+ <view wx:if="{{ origin && origin == 'b' }}">
+ <button open-type="share" style="bottom: {{bottomLift + 6}}px;" class="share_btn">鍒嗕韩</button>
</view>
- </view> -->
- <!-- footer -->
- <view wx:if="{{ origin && origin == 'b' }}">
- <button open-type="share" style="bottom: {{bottomLift + 6}}px;" class="share_btn">鍒嗕韩</button>
- </view>
- <view wx:else class="footer" style="padding-bottom: {{bottomLift}}px;">
- <view class="btns">
- <button class="item btn">
- <image data-code="collect_cancel" bindtap="handleAction" wx:if="{{ info.isCollection }}" class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
- <image wx:else data-code="collect" bindtap="handleAction" class="icon" src="../../static/icon/detail_nav_collect.png" mode="widthFix"></image>
- <view class="name">鏀惰棌</view>
- </button>
- <button open-type="share" class="item btn" bindtap="handleShare">
- <image class="icon" src="../../static/icon/detail_nav_share.png" mode="widthFix"></image>
- <view class="name">鍒嗕韩</view>
- </button>
- <view class="sub_btn" bindtap="handleDesign">
- <image class="sheji" src="../../static/icon/ic_sheji.png" mode="widthFix"></image>
- <view>鍏嶈垂棰勭害涓撳睘璁捐</view>
+ <view wx:else class="footer" style="padding-bottom: {{bottomLift}}px;">
+ <view class="btns">
+ <button class="item btn">
+ <image data-code="collect_cancel" bindtap="handleAction" wx:if="{{ info.isCollection }}" class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
+ <image wx:else data-code="collect" bindtap="handleAction" class="icon" src="../../static/icon/detail_nav_collect.png" mode="widthFix"></image>
+ <view class="name">鏀惰棌</view>
+ </button>
+ <button open-type="share" class="item btn" bindtap="handleShare">
+ <image class="icon" src="../../static/icon/detail_nav_share.png" mode="widthFix"></image>
+ <view class="name">鍒嗕韩</view>
+ </button>
+ <view class="sub_btn" bindtap="handleDesign">
+ <image class="sheji" src="../../static/icon/ic_sheji.png" mode="widthFix"></image>
+ <view>鍏嶈垂棰勭害涓撳睘璁捐</view>
+ </view>
</view>
</view>
</view>
-
</view>
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/detailDis/realpic.wxss b/wechat_jiaxuan/pages/detailDis/realpic.wxss
index 0384b12..015b316 100644
--- a/wechat_jiaxuan/pages/detailDis/realpic.wxss
+++ b/wechat_jiaxuan/pages/detailDis/realpic.wxss
@@ -1,5 +1,5 @@
.container {
- padding: 0 40rpx 220rpx;
+ padding: 148rpx 40rpx 220rpx;
}
.container .info_item {
width: 100%;
diff --git a/wechat_jiaxuan/pages/homeId/index.js b/wechat_jiaxuan/pages/homeId/index.js
index 5827e4d..196a830 100644
--- a/wechat_jiaxuan/pages/homeId/index.js
+++ b/wechat_jiaxuan/pages/homeId/index.js
@@ -39,6 +39,7 @@
onPullDownRefresh: function () {
console.log('涓嬫媺鍒锋柊');
this.setData({ dataList: [], pageNum: 1, total: 0 })
+ wx.stopPullDownRefresh()
this.getList()
},
getList(){
diff --git a/wechat_jiaxuan/pages/index/index.js b/wechat_jiaxuan/pages/index/index.js
index 3c1ace0..0e303f8 100644
--- a/wechat_jiaxuan/pages/index/index.js
+++ b/wechat_jiaxuan/pages/index/index.js
@@ -8,10 +8,7 @@
getZhongTaiVideoPage,
getZhongTaiProductNewsPage
} from '../../api/index'
-const {
- HYEventBus
-} = require('hy-event-store')
-const eventBus = new HYEventBus()
+import { eventBus } from '../../utils/eventBus'
const app = getApp()
Page({
@@ -56,21 +53,17 @@
},
onShow() {
let that = this
- const member = wx.getStorageSync('member') || {}
- if (member && member.id) {
+ setTimeout(() => {
getMemberInfo().then(res => {
this.setData({
member: res.data
})
})
- } else {
- this.setData({
- member
- })
- }
- eventBus.on("reloadHome", () => {
+ }, 500)
+ eventBus.once("reloadHome", () => {
console.log('reloadHome');
this.onLoad()
+ this.initData()
})
},
onLoad(options) {
diff --git a/wechat_jiaxuan/pages/index/index.less b/wechat_jiaxuan/pages/index/index.less
index e2f6d33..df84746 100644
--- a/wechat_jiaxuan/pages/index/index.less
+++ b/wechat_jiaxuan/pages/index/index.less
@@ -40,7 +40,7 @@
width: 60rpx;
height: 4rpx;
background: #f4f4f4;
- margin-left: -15rpx;
+ margin-left: -16rpx;
border-radius: 5rpx;
}
@@ -82,7 +82,6 @@
justify-content: space-between;
background-color: #fff;
padding: 40rpx;
-
.item {
width: 214rpx;
height: 232rpx;
@@ -117,9 +116,8 @@
// 浜у搧瑙嗛
.product_video {
- padding: 40rpx 40rpx;
+ padding: 34rpx 40rpx 44rpx;
background-color: #fff;
-
.video_wrap {
width: 670rpx;
position: relative;
@@ -143,7 +141,7 @@
}
.strategy {
- padding: 80rpx 40rpx;
+ padding: 44rpx 40rpx;
background: #F7F7F7;
.item{
position: relative;
@@ -191,7 +189,7 @@
// 鍜ㄨ
.consult {
- padding: 40rpx 40rpx 60rpx;
+ padding: 44rpx 40rpx;
background: #fff;
}
@@ -206,7 +204,6 @@
align-items: center;
width: 670rpx;
margin-bottom: 42rpx;
-
.left {
font-weight: 600;
font-size: 34rpx;
diff --git a/wechat_jiaxuan/pages/index/index.wxss b/wechat_jiaxuan/pages/index/index.wxss
index eee9c7f..8b6df09 100644
--- a/wechat_jiaxuan/pages/index/index.wxss
+++ b/wechat_jiaxuan/pages/index/index.wxss
@@ -39,7 +39,7 @@
width: 60rpx;
height: 4rpx;
background: #f4f4f4;
- margin-left: -15rpx;
+ margin-left: -16rpx;
border-radius: 5rpx;
}
.container .consult_swiper .wx-swiper-dot.wx-swiper-dot-active {
@@ -104,7 +104,7 @@
color: #666666;
}
.container .product_video {
- padding: 40rpx 40rpx;
+ padding: 34rpx 40rpx 44rpx;
background-color: #fff;
}
.container .product_video .video_wrap {
@@ -125,7 +125,7 @@
height: 376rpx;
}
.container .strategy {
- padding: 80rpx 40rpx;
+ padding: 44rpx 40rpx;
background: #F7F7F7;
}
.container .strategy .item {
@@ -165,7 +165,7 @@
margin-top: 24rpx;
}
.container .consult {
- padding: 40rpx 40rpx 60rpx;
+ padding: 44rpx 40rpx;
background: #fff;
}
.container .service {
diff --git a/wechat_jiaxuan/pages/mine/mine.less b/wechat_jiaxuan/pages/mine/mine.less
index ccb962b..6722f9a 100644
--- a/wechat_jiaxuan/pages/mine/mine.less
+++ b/wechat_jiaxuan/pages/mine/mine.less
@@ -67,12 +67,16 @@
background: #F7F7F7;
border-radius: 8rpx;
margin-bottom: 40rpx;
+ padding: 0 40rpx;
.line{
display: flex;
align-items: center;
justify-content: space-between;
- padding: 0 40rpx;
height: 108rpx;
+ border-bottom: 1rpx solid #E5E5E5;;
+ &:nth-last-of-type(1){
+ border: none;
+ }
.icon{
width: 40rpx;
}
diff --git a/wechat_jiaxuan/pages/mine/mine.wxss b/wechat_jiaxuan/pages/mine/mine.wxss
index 7fc96f8..d9835af 100644
--- a/wechat_jiaxuan/pages/mine/mine.wxss
+++ b/wechat_jiaxuan/pages/mine/mine.wxss
@@ -60,13 +60,17 @@
background: #F7F7F7;
border-radius: 8rpx;
margin-bottom: 40rpx;
+ padding: 0 40rpx;
}
.container .main_content .func_list .line {
display: flex;
align-items: center;
justify-content: space-between;
- padding: 0 40rpx;
height: 108rpx;
+ border-bottom: 1rpx solid #E5E5E5;
+}
+.container .main_content .func_list .line:nth-last-of-type(1) {
+ border: none;
}
.container .main_content .func_list .line .icon {
width: 40rpx;
diff --git a/wechat_jiaxuan/pages/sets/index.js b/wechat_jiaxuan/pages/sets/index.js
index f809b93..2aacd81 100644
--- a/wechat_jiaxuan/pages/sets/index.js
+++ b/wechat_jiaxuan/pages/sets/index.js
@@ -2,8 +2,7 @@
wxLogOff,
wxLoginCustomer
} from '../../api/index'
-const { HYEventBus } = require('hy-event-store')
-const eventBus = new HYEventBus()
+import { eventBus } from '../../utils/eventBus'
Page({
/**
diff --git a/wechat_jiaxuan/pages/store/info.less b/wechat_jiaxuan/pages/store/info.less
index c5208fa..f1eae58 100644
--- a/wechat_jiaxuan/pages/store/info.less
+++ b/wechat_jiaxuan/pages/store/info.less
@@ -18,11 +18,18 @@
font-size: 26rpx;
color: #666666;
margin-bottom: 24rpx;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 2;
+ overflow: hidden;
}
.addr {
font-size: 26rpx;
color: #888888;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
}
.navback{
@@ -43,7 +50,7 @@
.main_content {
position: relative;
bottom: 80rpx;
- padding: 0 40rpx 40rpx;
+ padding: 0 40rpx 240rpx;
height: 100%;
overflow: hidden;
background-color: #fff;
@@ -55,18 +62,23 @@
}
.list {
height: calc( 100% - 420rpx );
- padding-bottom: 160rpx;
+ padding: 20rpx;
+ margin: 0 -40rpx;
+ padding-bottom: 12rpx;
+ width: 750rpx;
.item {
width: 670rpx;
+ margin: 10rpx auto 30rpx;
height: 148rpx;
background: rgba(176, 135, 113, 0.05) #FFFFFF;
- box-shadow: 0rpx 4rpx 12rpx 0rpx rgba(0, 0, 0, 0.12);
+ box-shadow: 0rpx 4rpx 12rpx 0rpx rgba(0,0,0,0.12);
border-radius: 8rpx;
padding: 0 30rpx;
display: flex;
align-items: center;
- margin-bottom: 30rpx;
-
+ &:nth-last-of-type(1){
+ margin-bottom: 100rpx;
+ }
.content {
flex: 1;
@@ -117,7 +129,6 @@
.footer{
display: flex;
align-items: center;
- height: 100rpx;
position: fixed;
background-color: #fff;
z-index: 999;
diff --git a/wechat_jiaxuan/pages/store/info.wxml b/wechat_jiaxuan/pages/store/info.wxml
index 5b5c16e..6c7863f 100644
--- a/wechat_jiaxuan/pages/store/info.wxml
+++ b/wechat_jiaxuan/pages/store/info.wxml
@@ -33,7 +33,7 @@
</view>
</view>
<!-- footer -->
- <view class="footer" style="bottom: {{bottomLift + 6}}px;">
+ <view class="footer" style="padding-bottom: {{bottomLift + 6}}px;">
<view bindtap="handleNavigation" class="btn">
<image src="../../static/icon/mendian_ic_daohang@2x.png" mode="widthFix"></image>
<view>瀵艰埅</view>
diff --git a/wechat_jiaxuan/pages/store/info.wxss b/wechat_jiaxuan/pages/store/info.wxss
index f354fb5..afe8e85 100644
--- a/wechat_jiaxuan/pages/store/info.wxss
+++ b/wechat_jiaxuan/pages/store/info.wxss
@@ -17,10 +17,17 @@
font-size: 26rpx;
color: #666666;
margin-bottom: 24rpx;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 2;
+ overflow: hidden;
}
.header .addr {
font-size: 26rpx;
color: #888888;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
.navback {
padding-left: 30rpx;
@@ -40,7 +47,7 @@
.main_content {
position: relative;
bottom: 80rpx;
- padding: 0 40rpx 40rpx;
+ padding: 0 40rpx 240rpx;
height: 100%;
overflow: hidden;
background-color: #fff;
@@ -53,10 +60,14 @@
}
.main_content .list {
height: calc(100% - 420rpx);
- padding-bottom: 160rpx;
+ padding: 20rpx;
+ margin: 0 -40rpx;
+ padding-bottom: 12rpx;
+ width: 750rpx;
}
.main_content .list .item {
width: 670rpx;
+ margin: 10rpx auto 30rpx;
height: 148rpx;
background: rgba(176, 135, 113, 0.05) #FFFFFF;
box-shadow: 0rpx 4rpx 12rpx 0rpx rgba(0, 0, 0, 0.12);
@@ -64,7 +75,9 @@
padding: 0 30rpx;
display: flex;
align-items: center;
- margin-bottom: 30rpx;
+}
+.main_content .list .item:nth-last-of-type(1) {
+ margin-bottom: 100rpx;
}
.main_content .list .item .content {
flex: 1;
@@ -109,7 +122,6 @@
.footer {
display: flex;
align-items: center;
- height: 100rpx;
position: fixed;
background-color: #fff;
z-index: 999;
diff --git a/wechat_jiaxuan/pages/store/staffList.js b/wechat_jiaxuan/pages/store/staffList.js
index ff533d9..9bf1822 100644
--- a/wechat_jiaxuan/pages/store/staffList.js
+++ b/wechat_jiaxuan/pages/store/staffList.js
@@ -17,7 +17,7 @@
this.getList()
},
handleDetail(e) {
- const id = e.currentTarget.dataset.iamId
+ const id = e.currentTarget.dataset.id
wx.navigateTo({
url: '/pages/store/staff?id=' + id,
})
diff --git a/wechat_jiaxuan/pages/store/staffList.wxml b/wechat_jiaxuan/pages/store/staffList.wxml
index 8b4326d..815eb9e 100644
--- a/wechat_jiaxuan/pages/store/staffList.wxml
+++ b/wechat_jiaxuan/pages/store/staffList.wxml
@@ -8,12 +8,12 @@
</view>
<view class="list">
<view wx:for="{{ dataList }}" class="item">
- <image class="avatar" src="{{ item.imgurlFull ? imgurlFull : '../../static/images/default_avatar.png' }}"></image>
+ <image class="avatar" src="{{ item.imgurlFull ? item.imgurlFull : '../../static/images/default_avatar.png' }}"></image>
<view class="content">
<view class="name">{{ item.name || '' }}</view>
<view class="desc">瀵艰喘锝渰{ item.jobDate || 5 }}骞寸粡楠�</view>
</view>
- <view data-iamId="{{ item.iamId }}" bindtap="handleDetail" class="btn">鑱旂郴TA</view>
+ <view data-id="{{ item.iamId }}" bindtap="handleDetail" class="btn">鑱旂郴TA</view>
</view>
</view>
</view>
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/userinfo/collect.js b/wechat_jiaxuan/pages/userinfo/collect.js
index 2e40648..6e68b13 100644
--- a/wechat_jiaxuan/pages/userinfo/collect.js
+++ b/wechat_jiaxuan/pages/userinfo/collect.js
@@ -1,34 +1,77 @@
import {
collectLikePage
} from '../../api/index'
+import {
+ eventBus
+} from '../../utils/eventBus'
Page({
-
- /**
- * 椤甸潰鐨勫垵濮嬫暟鎹�
- */
data: {
activeTabs: 'product_intro',
dataList: [],
total: 0,
- pageNum: 1,
+ pageNum: 1,
pageSize: 10,
},
onLoad(options) {
this.getList()
},
+ onShow() {
+ const dataList = this.data.dataList
+ eventBus.once('caseDeBack', (info) => {
+ const temp = dataList.filter(item => {
+ if (item.id === info.id) {
+ item.isCollection = info.isCollection
+ item.viewCount++
+ }
+ if(item.isCollection) return item
+ })
+ this.setData({ dataList: temp})
+ })
+ eventBus.once('productDeBack', (info) => {
+ const temp = dataList.filter(item => {
+ if (item.id === info.id) {
+ item.isCollection = info.isCollection
+ item.viewCount++
+ }
+ if(item.isCollection) return item
+ })
+ this.setData({ dataList: temp})
+ })
+ eventBus.once('realpicDeBack', (info) => {
+ const temp = dataList.filter(item => {
+ if (item.id === info.id) {
+ item.isCollection = info.isCollection
+ item.viewCount++
+ }
+ if(item.isCollection) return item
+ })
+ this.setData({ dataList: temp})
+ })
+ },
onPullDownRefresh: function () {
console.log('涓嬫媺鍒锋柊');
- this.setData({ dataList: [], pageNum: 1, total: 0 })
+ this.setData({
+ dataList: [],
+ pageNum: 1,
+ total: 0
+ })
+ wx.stopPullDownRefresh()
this.getList()
},
onReachBottom() {
console.log('瑙﹀簳浜嬩欢');
- const { total, dataList, pageNum } = this.data
- if(total > dataList.length){
- this.setData({ pageNum: pageNum + 1 })
+ const {
+ total,
+ dataList,
+ pageNum
+ } = this.data
+ if (total > dataList.length) {
+ this.setData({
+ pageNum: pageNum + 1
+ })
this.getList()
- }else{
+ } else {
wx.showToast({
title: '鏆傛棤鏇村鏁版嵁',
icon: 'none'
@@ -39,20 +82,24 @@
const activeTabs = e.currentTarget.dataset.val
this.setData({
activeTabs,
- dataList: [],total: 0,pageNum: 1
+ dataList: [],
+ total: 0,
+ pageNum: 1
})
this.getList()
},
handleDetail(e) {
const id = e.currentTarget.dataset.id
- const { activeTabs } = this.data
+ const {
+ activeTabs
+ } = this.data
let url = ''
- if(activeTabs == 'product_intro'){
- url = '/pages/detailDis/product'
- }else if(activeTabs == 'whole_case'){
- url = '/pages/detailDis/case'
- }else{
- url = '/pages/detailDis/realpic'
+ if (activeTabs == 'product_intro') {
+ url = '/pages/detailDis/product'
+ } else if (activeTabs == 'whole_case') {
+ url = '/pages/detailDis/case'
+ } else {
+ url = '/pages/detailDis/realpic'
}
wx.navigateTo({
url: `${url}?id=${id}`,
@@ -83,13 +130,6 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
*/
onReady() {
-
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
- */
- onShow() {
},
diff --git a/wechat_jiaxuan/pages/userinfo/favorite.js b/wechat_jiaxuan/pages/userinfo/favorite.js
index dbe7813..c191d9f 100644
--- a/wechat_jiaxuan/pages/userinfo/favorite.js
+++ b/wechat_jiaxuan/pages/userinfo/favorite.js
@@ -20,6 +20,7 @@
onPullDownRefresh: function () {
console.log('涓嬫媺鍒锋柊');
this.setData({ dataList: [], pageNum: 1, total: 0 })
+ wx.stopPullDownRefresh()
this.getList()
},
onReachBottom() {
diff --git a/wechat_jiaxuan/pages/userinfo/index.less b/wechat_jiaxuan/pages/userinfo/index.less
index 55d7a17..ebc3d24 100644
--- a/wechat_jiaxuan/pages/userinfo/index.less
+++ b/wechat_jiaxuan/pages/userinfo/index.less
@@ -6,6 +6,9 @@
box-shadow: 0rpx 2rpx 12rpx 0rpx rgba(0,0,0,0.08);
border: 4rpx solid #FFFFFF;
}
+.placeholder9{
+ color: #c8c9cc;
+}
.avatar_btn{
width: 168rpx;
height: 60rpx;
diff --git a/wechat_jiaxuan/pages/userinfo/index.wxml b/wechat_jiaxuan/pages/userinfo/index.wxml
index 131b53f..dcd2459 100644
--- a/wechat_jiaxuan/pages/userinfo/index.wxml
+++ b/wechat_jiaxuan/pages/userinfo/index.wxml
@@ -5,17 +5,17 @@
<view class="line">
<view class="label">鏄电О</view>
<view class="val">
- <input bindchange="getNickName" value="{{ nickname }}" maxlength="{{ 10 }}" type="nickname"/>
+ <input placeholder="璇疯緭鍏ユ樀绉�" placeholder-class="placeholder9" bindchange="getNickName" value="{{ nickname }}" maxlength="{{ 10 }}" type="nickname"/>
</view>
</view>
<view class="line">
<view class="label">濮撳悕</view>
- <van-field type="text" border="{{ false }}" class="input" model:value="{{ name }}" maxlength="{{ 10 }}" clearable />
+ <van-field placeholder="璇疯緭鍏ュ鍚�" type="text" border="{{ false }}" class="input" model:value="{{ name }}" maxlength="{{ 10 }}" clearable />
</view>
<view class="line">
<view class="label">鐢佃瘽</view>
<view class="wechat_phone">
- <van-field class="field" type="number" border="{{ false }}" model:value="{{ phone }}" maxlength="{{ 11 }}" clearable />
+ <van-field placeholder="璇疯緭鍏ョ數璇�" class="field" type="number" border="{{ false }}" model:value="{{ phone }}" maxlength="{{ 11 }}" clearable />
<button open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber" class="btn">寰俊鎺堟潈</button>
</view>
</view>
@@ -25,7 +25,7 @@
<view class="df_ac" style="width: 100%">
<picker class="picker" mode="region" value="{{ addr }}" bindchange="positionChange">
<view class="picker_wrap">
- <view class="text placeholder9" hidden="{{ addr.cityName }}">璇烽�夋嫨鍦板潃</view>
+ <view class="text placeholder9" hidden="{{ addr.cityName }}">璇烽�夋嫨鍩庡競</view>
<view class="text" hidden="{{ !addr.cityName }}">
{{ addr.provinceName }}{{ addr.cityName }}{{ addr.areaName }}
</view>
@@ -38,29 +38,31 @@
<view class="line">
<view class="label">鍦板潃</view>
<view class="val" bindtap="changeAddr">
- <view class="df_ac">{{ address }}</view>
+ <view class="df_ac" wx:if="{{address}}">{{ address }}</view>
+ <view class="df_ac placeholder9">璇烽�夋嫨鍦板潃</view>
<image class="icon" src="../../static/icon/home_ar@2x.png" mode="widthFix"></image>
</view>
</view>
<view class="line">
<view class="label">灏忓尯</view>
- <van-field type="text" border="{{ false }}" class="input" model:value="{{ district }}" maxlength="{{ 15 }}" clearable />
+ <van-field placeholder="璇疯緭鍏ュ皬鍖�" type="text" border="{{ false }}" class="input" model:value="{{ district }}" maxlength="{{ 15 }}" clearable />
</view>
<view class="line">
<view class="label">闈㈢Н</view>
- <van-field custom-style="width: 100%" type="digit" border="{{ false }}" class="input" model:value="{{ housearea }}" maxlength="{{ 30 }}" clearable />
+ <van-field placeholder="璇疯緭鍏ラ潰绉�" custom-style="width: 100%" type="digit" border="{{ false }}" class="input" model:value="{{ housearea }}" maxlength="{{ 30 }}" clearable />
<text>m虏</text>
</view>
<view class="line">
<view class="label">鎴峰瀷</view>
<view class="val" bindtap="openHouse">
- <view class="df_ac">
+ <view wx:if="{{ houseType.val1 || houseType.val2 }}" class="df_ac">
<text class="item" wx:if="{{ houseType.val1 }}">{{ houseType.val1 }}瀹�</text>
<text class="item" wx:if="{{ houseType.val2 }}">{{ houseType.val2 }}鍘�</text>
<text class="item" wx:if="{{ houseType.val3 }}">{{ houseType.val3 }}鍘�</text>
<text class="item" wx:if="{{ houseType.val4 }}">{{ houseType.val4 }}鍗�</text>
<text class="item" wx:if="{{ houseType.val5 }}">{{ houseType.val5 }}闃�</text>
</view>
+ <view wx:else class="df_ac placeholder9">璇烽�夋嫨鎴峰瀷</view>
<image class="icon" src="../../static/icon/home_ar@2x.png" mode="widthFix"></image>
</view>
</view>
diff --git a/wechat_jiaxuan/pages/userinfo/index.wxss b/wechat_jiaxuan/pages/userinfo/index.wxss
index 276fb28..936b5aa 100644
--- a/wechat_jiaxuan/pages/userinfo/index.wxss
+++ b/wechat_jiaxuan/pages/userinfo/index.wxss
@@ -6,6 +6,9 @@
box-shadow: 0rpx 2rpx 12rpx 0rpx rgba(0, 0, 0, 0.08);
border: 4rpx solid #FFFFFF;
}
+.placeholder9 {
+ color: #c8c9cc;
+}
.avatar_btn {
width: 168rpx;
height: 60rpx;
diff --git a/wechat_jiaxuan/pages/userinfo/mysub.js b/wechat_jiaxuan/pages/userinfo/mysub.js
index f790c8c..706bf84 100644
--- a/wechat_jiaxuan/pages/userinfo/mysub.js
+++ b/wechat_jiaxuan/pages/userinfo/mysub.js
@@ -18,6 +18,7 @@
onPullDownRefresh: function () {
console.log('涓嬫媺鍒锋柊');
this.setData({ dataList: [], page: 1, total: 0 })
+ wx.stopPullDownRefresh()
this.getList()
},
onReachBottom() {
diff --git a/wechat_jiaxuan/utils/eventBus.js b/wechat_jiaxuan/utils/eventBus.js
new file mode 100644
index 0000000..acfe713
--- /dev/null
+++ b/wechat_jiaxuan/utils/eventBus.js
@@ -0,0 +1,2 @@
+const { HYEventBus } = require('hy-event-store')
+export const eventBus = new HYEventBus()
diff --git a/wechat_staff/app.json b/wechat_staff/app.json
index 5e82744..22aa58f 100644
--- a/wechat_staff/app.json
+++ b/wechat_staff/app.json
@@ -60,7 +60,10 @@
"window": {
"navigationBarTitleText": "ZB浼樺",
"navigationBarTextStyle": "black",
- "navigationBarBackgroundColor": "#fff"
+ "backgroundTextStyle": "dark",
+ "navigationBarBackgroundColor": "#fff",
+ "navigationStyle": "default",
+ "backgroundColor": "#fff"
},
"requiredPrivateInfos": [
"getLocation",
@@ -76,7 +79,7 @@
"scope.userLocation": {
"desc": "浣犵殑浣嶇疆淇℃伅灏嗙敤浜庡皬绋嬪簭浣嶇疆鎺ュ彛鐨勬晥鏋滃睍绀�"
},
- "scope.writePhotosAlbum":{
+ "scope.writePhotosAlbum": {
"desc": "鎺堟潈鐩稿唽鏉冮檺鍚庯紝鎮ㄦ墠鑳芥甯镐繚瀛樺浘鐗�"
}
},
diff --git a/wechat_staff/pages/homeId/index.js b/wechat_staff/pages/homeId/index.js
index 0a7dded..e36f408 100644
--- a/wechat_staff/pages/homeId/index.js
+++ b/wechat_staff/pages/homeId/index.js
@@ -23,6 +23,11 @@
this.getTabList()
this.getList()
},
+ onPullDownRefresh() {
+ this.setData({ dataList: [], pageNum: 1, total: 0 })
+ wx.stopPullDownRefresh()
+ this.getList()
+ },
onReachBottom() {
console.log('瑙﹀簳浜嬩欢');
const { total, dataList, pageNum } = this.data
@@ -126,9 +131,6 @@
/**
* 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
*/
- onPullDownRefresh() {
-
- },
/**
* 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
diff --git a/wechat_staff/pages/homeId/index.json b/wechat_staff/pages/homeId/index.json
index 2303215..0a97a2d 100644
--- a/wechat_staff/pages/homeId/index.json
+++ b/wechat_staff/pages/homeId/index.json
@@ -1,3 +1,4 @@
{
- "navigationBarTitleText": ""
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": true
}
\ No newline at end of file
diff --git a/wechat_staff/pages/userinfo/collect.js b/wechat_staff/pages/userinfo/collect.js
index cde2e78..7ba7ee3 100644
--- a/wechat_staff/pages/userinfo/collect.js
+++ b/wechat_staff/pages/userinfo/collect.js
@@ -14,18 +14,19 @@
pageNum: 1,
pageSize: 10,
},
- onLoad(options) {},
+ onLoad(options) { },
onPullDownRefresh: function () {
- console.log('涓嬫媺鍒锋柊');
+ console.log('涓嬫媺鍒锋柊')
this.setData({
dataList: [],
pageNum: 1,
total: 0
})
+ wx.stopPullDownRefresh()
this.getList()
},
onReachBottom() {
- console.log('瑙﹀簳浜嬩欢');
+ console.log('瑙﹀簳浜嬩欢')
const {
total,
dataList,
--
Gitblit v1.9.3