From af648707fa2b2f86eff95629be0c092013790c76 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 25 七月 2024 18:23:08 +0800
Subject: [PATCH] ''
---
wechat_jiaxuan/pages/store/staffList.wxml | 2
wechat_jiaxuan/pages/userinfo/index.wxml | 6 +
wechat_jiaxuan/pages/consult/consult.wxml | 2
wechat_jiaxuan/components/disProduct/index.js | 3
wechat_jiaxuan/pages/store/info.js | 5 +
wechat_jiaxuan/pages/store/info.less | 1
wechat_jiaxuan/components/disProduct/index.less | 7 +
wechat_jiaxuan/components/disRealpic/index.less | 3
wechat_jiaxuan/pages/homeId/index.js | 5 +
wechat_staff/components/disCase/index.wxml | 2
wechat_staff/components/disProduct/index.less | 1
wechat_jiaxuan/pages/consult/consult.js | 4 +
wechat_jiaxuan/pages/store/staff.wxml | 6 +-
wechat_jiaxuan/pages/store/store.wxml | 4
wechat_jiaxuan/pages/userinfo/index.js | 35 ++++++++---
wechat_staff/utils/config.js | 4
wechat_jiaxuan/components/disCase/index.js | 2
wechat_jiaxuan/components/disCase/index.wxml | 8 +-
wechat_jiaxuan/components/disCase/index.wxss | 3
wechat_staff/components/disProduct/index.js | 1
wechat_jiaxuan/components/disRealpic/index.js | 2
wechat_jiaxuan/project.private.config.json | 4
wechat_jiaxuan/components/idCard/index.wxml | 2
wechat_staff/components/disProduct/index.wxml | 2
wechat_jiaxuan/components/disCase/index.less | 3
wechat_jiaxuan/components/disRealpic/index.wxml | 8 +-
wechat_jiaxuan/pages/store/info.wxml | 14 ++--
wechat_jiaxuan/components/disRealpic/index.wxss | 3
wechat_jiaxuan/pages/index/index.wxss | 8 +-
wechat_jiaxuan/components/disProduct/index.wxss | 9 ++
wechat_staff/components/disRealpic/index.wxml | 2
wechat_jiaxuan/components/disProduct/index.wxml | 8 +-
wechat_jiaxuan/pages/store/info.wxss | 1
33 files changed, 101 insertions(+), 69 deletions(-)
diff --git a/wechat_jiaxuan/components/disCase/index.js b/wechat_jiaxuan/components/disCase/index.js
index 96fca1a..3e13e89 100644
--- a/wechat_jiaxuan/components/disCase/index.js
+++ b/wechat_jiaxuan/components/disCase/index.js
@@ -19,7 +19,7 @@
pageNum: 1,
pageSize: 10,
query: '',
- sortType: 'NORMAL',
+ sortType: '',
catalogCode: 'whole_case'
},
attached() {
diff --git a/wechat_jiaxuan/components/disCase/index.less b/wechat_jiaxuan/components/disCase/index.less
index 52e9388..cc252e7 100644
--- a/wechat_jiaxuan/components/disCase/index.less
+++ b/wechat_jiaxuan/components/disCase/index.less
@@ -10,6 +10,7 @@
background-color: #F7F7F7;
image{
width: 28rpx;
+ height: 28rpx;
margin-right: 16rpx;
}
}
@@ -58,7 +59,7 @@
width: 100%;
display: flex;
flex-wrap: wrap;
- max-height: 400rpx;
+ max-height: 520rpx;
overflow: auto;
padding: 30rpx 40rpx;
.item {
diff --git a/wechat_jiaxuan/components/disCase/index.wxml b/wechat_jiaxuan/components/disCase/index.wxml
index 1d0bda2..9177b3a 100644
--- a/wechat_jiaxuan/components/disCase/index.wxml
+++ b/wechat_jiaxuan/components/disCase/index.wxml
@@ -2,7 +2,7 @@
<view class="home_top" style="top:{{ menuButtonInfo.top + menuButtonInfo.height + 6 }}px">
<view class="search_wrap">
<image src="../../static/icon/ic_search@2x.png" mode="widthFix"></image>
- <input bindconfirm="bindblur" bindblur="bindblur" model:value="{{ query }}" type="text" placeholder="鎼滅储妗堜緥鍚嶇О" />
+ <input bindconfirm="bindblur" model:value="{{ query }}" type="text" placeholder="鎼滅储妗堜緥鍚嶇О" />
</view>
</view>
<!-- -->
@@ -28,11 +28,11 @@
</view>
<view wx:if="{{ activeParam.length > 0 }}" class="shade"></view>
<view class="status">
- <view class="item {{ sortType == 'NORMAL' ? 'active' : '' }}" data-status="NORMAL" bindtap="statusChange">榛樿</view>
+ <view class="item {{ sortType == '' ? 'active' : '' }}" data-status="" bindtap="statusChange">榛樿</view>
<view class="separate"></view>
- <view class="item {{ sortType == 'HOT' ? 'active' : '' }}" data-status="HOT" bindtap="statusChange">鏈�鐑�</view>
+ <view class="item {{ sortType == 'greet' ? 'active' : '' }}" data-status="greet" bindtap="statusChange">鏈�鐑�</view>
<view class="separate"></view>
- <view class="item {{ sortType == 'LATEST' ? 'active' : '' }}" data-status="LATEST" bindtap="statusChange">鏈�鏂�</view>
+ <view class="item {{ sortType == 'time' ? 'active' : '' }}" data-status="time" bindtap="statusChange">鏈�鏂�</view>
</view>
<!-- goods_list -->
<scroll-view bindscrolltolower="scrolltolower" scroll-y enable-passive enable-flex class="goods_list">
diff --git a/wechat_jiaxuan/components/disCase/index.wxss b/wechat_jiaxuan/components/disCase/index.wxss
index ef73ac8..2d95d32 100644
--- a/wechat_jiaxuan/components/disCase/index.wxss
+++ b/wechat_jiaxuan/components/disCase/index.wxss
@@ -11,6 +11,7 @@
}
.search_wrap image {
width: 28rpx;
+ height: 28rpx;
margin-right: 16rpx;
}
.app {
@@ -59,7 +60,7 @@
width: 100%;
display: flex;
flex-wrap: wrap;
- max-height: 400rpx;
+ max-height: 520rpx;
overflow: auto;
padding: 30rpx 40rpx;
}
diff --git a/wechat_jiaxuan/components/disProduct/index.js b/wechat_jiaxuan/components/disProduct/index.js
index d1d3649..30e7d2b 100644
--- a/wechat_jiaxuan/components/disProduct/index.js
+++ b/wechat_jiaxuan/components/disProduct/index.js
@@ -22,7 +22,7 @@
pageSize: 10,
total: 0,
query: '',
- sortType: 'NORMAL',
+ sortType: '',
catalogCode: ""
},
attached() {
@@ -66,7 +66,6 @@
})
},
bindblur() {
- console.log('澶卞幓鐒︾偣');
this.setData({ pageNum: 1,datalist: [],total: 0})
this.getList()
},
diff --git a/wechat_jiaxuan/components/disProduct/index.less b/wechat_jiaxuan/components/disProduct/index.less
index ed393c2..e945273 100644
--- a/wechat_jiaxuan/components/disProduct/index.less
+++ b/wechat_jiaxuan/components/disProduct/index.less
@@ -13,6 +13,7 @@
image {
width: 28rpx;
+ height: 28rpx;
margin-right: 16rpx;
}
}
@@ -20,6 +21,7 @@
.app {
height: 100%;
width: 100%;
+ overflow-y:hidden;
.home_content{
height: 100%;
}
@@ -85,13 +87,14 @@
position: absolute;
z-index: 999;
background-color: #fff;
-
+ width: 590rpx;
+ overflow: hidden;
.list {
width: 100%;
display: flex;
flex-wrap: wrap;
padding: 30rpx 40rpx;
- max-height: 400rpx;
+ max-height: 520rpx;
overflow: auto;
.item {
width: 154rpx;
diff --git a/wechat_jiaxuan/components/disProduct/index.wxml b/wechat_jiaxuan/components/disProduct/index.wxml
index 3ee90c9..6cd5b57 100644
--- a/wechat_jiaxuan/components/disProduct/index.wxml
+++ b/wechat_jiaxuan/components/disProduct/index.wxml
@@ -2,7 +2,7 @@
<view class="home_top" style="top:{{ menuButtonInfo.top + menuButtonInfo.height + 6 }}px">
<view class="search_wrap">
<image src="../../static/icon/ic_search@2x.png" mode="widthFix"></image>
- <input bindconfirm="bindblur" bindblur="bindblur" model:value="{{ query }}" type="text" placeholder="鎼滅储浜у搧鍚嶇О" />
+ <input bindconfirm="bindblur" model:value="{{ query }}" type="text" placeholder="鎼滅储浜у搧鍚嶇О" />
</view>
</view>
<view class="home_content" style="padding-top:{{ menuButtonInfo.top + menuButtonInfo.height + 6 }}px;">
@@ -30,11 +30,11 @@
</view>
<view wx:if="{{ activeParam.length > 0 }}" class="shade"></view>
<view class="status">
- <view class="item {{ sortType == 'NORMAL' ? 'active' : '' }}" data-status="NORMAL" bindtap="statusChange">榛樿</view>
+ <view class="item {{ sortType == '' ? 'active' : '' }}" data-status="" bindtap="statusChange">榛樿</view>
<view class="separate"></view>
- <view class="item {{ sortType == 'HOT' ? 'active' : '' }}" data-status="HOT" bindtap="statusChange">鏈�鐑�</view>
+ <view class="item {{ sortType == 'greet' ? 'active' : '' }}" data-status="greet" bindtap="statusChange">鏈�鐑�</view>
<view class="separate"></view>
- <view class="item {{ sortType == 'LATEST' ? 'active' : '' }}" data-status="LATEST" bindtap="statusChange">鏈�鏂�</view>
+ <view class="item {{ sortType == 'time' ? 'active' : '' }}" data-status="time" bindtap="statusChange">鏈�鏂�</view>
</view>
<scroll-view bindscrolltolower="scrolltolower" scroll-y enable-passive enable-flex class="goods_list">
<view wx:for="{{ datalist }}" data-id="{{item.id}}" class="item" bindtap="handleDetail">
diff --git a/wechat_jiaxuan/components/disProduct/index.wxss b/wechat_jiaxuan/components/disProduct/index.wxss
index b7161a6..b5288b8 100644
--- a/wechat_jiaxuan/components/disProduct/index.wxss
+++ b/wechat_jiaxuan/components/disProduct/index.wxss
@@ -11,11 +11,13 @@
}
.search_wrap image {
width: 28rpx;
+ height: 28rpx;
margin-right: 16rpx;
}
.app {
height: 100%;
width: 100%;
+ overflow-y: hidden;
}
.app .home_content {
height: 100%;
@@ -77,13 +79,15 @@
position: absolute;
z-index: 999;
background-color: #fff;
+ width: 590rpx;
+ overflow: hidden;
}
.main_content .main_right .query_form .list {
width: 100%;
display: flex;
flex-wrap: wrap;
padding: 30rpx 40rpx;
- max-height: 400rpx;
+ max-height: 520rpx;
overflow: auto;
}
.main_content .main_right .query_form .list .item {
@@ -167,7 +171,8 @@
position: relative;
}
.main_content .main_right .goods_list .item .img_wrap .img {
- width: 100%;
+ width: 242rpx;
+ max-height: 216rpx;
}
.main_content .main_right .goods_list .item .img_wrap .new {
width: 72rpx;
diff --git a/wechat_jiaxuan/components/disRealpic/index.js b/wechat_jiaxuan/components/disRealpic/index.js
index 034a81c..80fa13c 100644
--- a/wechat_jiaxuan/components/disRealpic/index.js
+++ b/wechat_jiaxuan/components/disRealpic/index.js
@@ -18,7 +18,7 @@
pageNum: 1,
pageSize: 10,
query: '',
- sortType: 'NORMAL',
+ sortType: '',
catalogCode: 'real_case'
},
attached() {
diff --git a/wechat_jiaxuan/components/disRealpic/index.less b/wechat_jiaxuan/components/disRealpic/index.less
index 6ed5ae6..d4c71ea 100644
--- a/wechat_jiaxuan/components/disRealpic/index.less
+++ b/wechat_jiaxuan/components/disRealpic/index.less
@@ -11,6 +11,7 @@
image {
width: 28rpx;
+ height: 28rpx;
margin-right: 16rpx;
}
}
@@ -66,7 +67,7 @@
display: flex;
flex-wrap: wrap;
padding: 30rpx 40rpx;
- max-height: 400rpx;
+ max-height: 520rpx;
overflow: auto;
.item {
width: 202rpx;
diff --git a/wechat_jiaxuan/components/disRealpic/index.wxml b/wechat_jiaxuan/components/disRealpic/index.wxml
index 7d967f4..0e3776b 100644
--- a/wechat_jiaxuan/components/disRealpic/index.wxml
+++ b/wechat_jiaxuan/components/disRealpic/index.wxml
@@ -2,7 +2,7 @@
<view class="home_top" style="top:{{ menuButtonInfo.top + menuButtonInfo.height + 6 }}px">
<view class="search_wrap">
<image src="../../static/icon/ic_search@2x.png" mode="widthFix"></image>
- <input bindconfirm="bindblur" bindblur="bindblur" model:value="{{ query }}" type="text" placeholder="鎼滅储瀹炴櫙鍚嶇О" />
+ <input bindconfirm="bindblur" model:value="{{ query }}" type="text" placeholder="鎼滅储瀹炴櫙鍚嶇О" />
</view>
</view>
@@ -29,11 +29,11 @@
</view>
<view wx:if="{{ activeParam.length > 0 }}" class="shade"></view>
<view class="status">
- <view class="item {{ sortType == 'NORMAL' ? 'active' : '' }}" data-status="NORMAL" bindtap="statusChange">榛樿</view>
+ <view class="item {{ sortType == '' ? 'active' : '' }}" data-status="" bindtap="statusChange">榛樿</view>
<view class="separate"></view>
- <view class="item {{ sortType == 'HOT' ? 'active' : '' }}" data-status="HOT" bindtap="statusChange">鏈�鐑�</view>
+ <view class="item {{ sortType == 'greet' ? 'active' : '' }}" data-status="greet" bindtap="statusChange">鏈�鐑�</view>
<view class="separate"></view>
- <view class="item {{ sortType == 'LATEST' ? 'active' : '' }}" data-status="LATEST" bindtap="statusChange">鏈�鏂�</view>
+ <view class="item {{ sortType == 'time' ? 'active' : '' }}" data-status="time" bindtap="statusChange">鏈�鏂�</view>
</view>
<!-- goods_list -->
<scroll-view bindscrolltolower="scrolltolower" scroll-y enable-passive enable-flex class="goods_list">
diff --git a/wechat_jiaxuan/components/disRealpic/index.wxss b/wechat_jiaxuan/components/disRealpic/index.wxss
index 44f0e3c..298d780 100644
--- a/wechat_jiaxuan/components/disRealpic/index.wxss
+++ b/wechat_jiaxuan/components/disRealpic/index.wxss
@@ -11,6 +11,7 @@
}
.search_wrap image {
width: 28rpx;
+ height: 28rpx;
margin-right: 16rpx;
}
.app {
@@ -60,7 +61,7 @@
display: flex;
flex-wrap: wrap;
padding: 30rpx 40rpx;
- max-height: 400rpx;
+ max-height: 520rpx;
overflow: auto;
}
.main_content .query_param .list .item {
diff --git a/wechat_jiaxuan/components/idCard/index.wxml b/wechat_jiaxuan/components/idCard/index.wxml
index 772d86a..36f040b 100644
--- a/wechat_jiaxuan/components/idCard/index.wxml
+++ b/wechat_jiaxuan/components/idCard/index.wxml
@@ -2,7 +2,7 @@
<image class="avatar" src="{{ users.imgurlFull ? users.imgurlFull : '../../static/images/default_avatar.png' }}"></image>
<view class="content">
<view class="name">{{ users.name }}</view>
- <view class="desc">瀵艰喘锝渰{ users.jobDate || 1 }}骞寸粡楠�</view>
+ <view class="desc">瀵艰喘锝渰{ users.jobDate || 5 }}骞寸粡楠�</view>
</view>
<view class="btns">
<view bindtap="jumpCard" class="item">
diff --git a/wechat_jiaxuan/pages/consult/consult.js b/wechat_jiaxuan/pages/consult/consult.js
index 5e74e3b..16c7463 100644
--- a/wechat_jiaxuan/pages/consult/consult.js
+++ b/wechat_jiaxuan/pages/consult/consult.js
@@ -72,6 +72,10 @@
})
}
},
+ searchList() {
+ this.setData({ dataList: [], total: 0, pageNum: 1 })
+ this.getList()
+ },
getList() {
const { pageNum, pageSize, catalogCode, tagCode, query } = this.data
getZhongTaiProductNewsPage({
diff --git a/wechat_jiaxuan/pages/consult/consult.wxml b/wechat_jiaxuan/pages/consult/consult.wxml
index 06a8342..5bdb475 100644
--- a/wechat_jiaxuan/pages/consult/consult.wxml
+++ b/wechat_jiaxuan/pages/consult/consult.wxml
@@ -2,7 +2,7 @@
<view class="home_top">
<view class="search_wrap">
<image src="../../static/icon/ic_search@2x.png" mode="widthFix"></image>
- <input bindblur="getList" model:value="{{ query }}" type="text" placeholder="鎼滅储璧勮鏍囬" />
+ <input bindconfirm="searchList" model:value="{{ query }}" type="text" placeholder="鎼滅储璧勮鏍囬" />
</view>
</view>
<!-- 鍒嗙被 -->
diff --git a/wechat_jiaxuan/pages/homeId/index.js b/wechat_jiaxuan/pages/homeId/index.js
index 95ecff5..8a633b7 100644
--- a/wechat_jiaxuan/pages/homeId/index.js
+++ b/wechat_jiaxuan/pages/homeId/index.js
@@ -52,8 +52,9 @@
},
itemClick(e) {
const item = e.currentTarget.dataset.item
- console.log('item', item);
- actionDo({actionType: 'view',id: item.id})
+ if(item.contentType){
+ actionDo({actionType: 'view',id: item.id})
+ }
if(item.contentType == 'video'){
wx.previewMedia({
sources: [{ url: item.content, type: 'video' }]
diff --git a/wechat_jiaxuan/pages/index/index.wxss b/wechat_jiaxuan/pages/index/index.wxss
index 8962a9f..57cf50e 100644
--- a/wechat_jiaxuan/pages/index/index.wxss
+++ b/wechat_jiaxuan/pages/index/index.wxss
@@ -97,7 +97,7 @@
width: 100%;
}
.container .strategy {
- padding: 40rpx 40rpx;
+ padding: 80rpx 40rpx;
background: #F7F7F7;
}
.container .strategy .item {
@@ -122,14 +122,14 @@
}
.container .strategy .line .line_left {
width: 324rpx;
- height: 304rpx;
+ height: 340rpx;
}
.container .strategy .line .line_right .item {
width: 322rpx;
- height: 140rpx;
+ height: 160rpx;
}
.container .strategy .line .line_right .item:nth-last-child(1) {
- margin-top: 24rpx;
+ margin-top: 20rpx;
}
.container .strategy .home_id {
width: 670rpx;
diff --git a/wechat_jiaxuan/pages/store/info.js b/wechat_jiaxuan/pages/store/info.js
index 08cb80c..2b43e1a 100644
--- a/wechat_jiaxuan/pages/store/info.js
+++ b/wechat_jiaxuan/pages/store/info.js
@@ -33,6 +33,10 @@
const { linkPhone } = this.data.info
wx.makePhoneCall({ phoneNumber: linkPhone })
},
+ callPhone(e) {
+ const phone = e.currentTarget.dataset.phone
+ wx.makePhoneCall({ phoneNumber: phone })
+ },
handleDetail(e) {
const id = e.currentTarget.dataset.id
wx.navigateTo({
@@ -58,7 +62,6 @@
this.setData({ info: res.data })
})
},
-
onReady() {
},
diff --git a/wechat_jiaxuan/pages/store/info.less b/wechat_jiaxuan/pages/store/info.less
index 0073ca2..5c8ca7d 100644
--- a/wechat_jiaxuan/pages/store/info.less
+++ b/wechat_jiaxuan/pages/store/info.less
@@ -82,7 +82,6 @@
width: 88rpx;
height: 88rpx;
border-radius: 50%;
- border: 1rpx solid #cccccc;
margin-right: 24rpx;
}
diff --git a/wechat_jiaxuan/pages/store/info.wxml b/wechat_jiaxuan/pages/store/info.wxml
index d985f2e..145b001 100644
--- a/wechat_jiaxuan/pages/store/info.wxml
+++ b/wechat_jiaxuan/pages/store/info.wxml
@@ -8,24 +8,24 @@
<view class="header">
<view class="name">{{ info.name }}</view>
<!-- <view class="desc">鍏ㄥ眿瀹氬埗銆佹暣浣撳帹鎴裤�佹湪闂ㄥ鏉裤�佸崼闃冲畾鍒�</view> -->
- <view class="addr">2.4锝渰{ info.address || '--' }}</view>
+ <view class="addr">{{ info.distanceStr }}锝渰{ info.address || '--' }}</view>
</view>
<view class="main_content">
<view class="title">闂ㄥ簵瀵艰喘</view>
<view class="list">
- <view class="item" data-id="{{ item.iamId }}" bindtap="handleDetail" wx:for="{{ info.usersList }}">
- <image src="{{ item.imgurlFull ? item.imgurlFull : '../../static/images/default_avatar.png' }}" class="avatar"></image>
- <view class="content">
+ <view class="item" wx:for="{{ info.usersList }}">
+ <image data-id="{{ item.iamId }}" bindtap="handleDetail" src="{{ item.imgurlFull ? item.imgurlFull : '../../static/images/default_avatar.png' }}" class="avatar"></image>
+ <view data-id="{{ item.iamId }}" bindtap="handleDetail" class="content">
<view class="name">{{ item.name }}</view>
- <view class="desc">瀵艰喘锝渰{ info.jobDate || '-'}}骞寸粡楠�</view>
+ <view class="desc">瀵艰喘锝渰{ info.jobDate || 5}}骞寸粡楠�</view>
</view>
- <view class="btn">鑱旂郴TA</view>
+ <view data-phone="{{ item.phone }}" bindtap="callPhone" class="btn">鑱旂郴TA</view>
</view>
</view>
</view>
</view>
<!-- footer -->
- <view class="footer" style="bottom: {{bottomLift}}px;">
+ <view class="footer" style="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 0157781..66d2a9d 100644
--- a/wechat_jiaxuan/pages/store/info.wxss
+++ b/wechat_jiaxuan/pages/store/info.wxss
@@ -76,7 +76,6 @@
width: 88rpx;
height: 88rpx;
border-radius: 50%;
- border: 1rpx solid #cccccc;
margin-right: 24rpx;
}
.main_content .list .item .btn {
diff --git a/wechat_jiaxuan/pages/store/staff.wxml b/wechat_jiaxuan/pages/store/staff.wxml
index 7bb3c1b..e74eccf 100644
--- a/wechat_jiaxuan/pages/store/staff.wxml
+++ b/wechat_jiaxuan/pages/store/staff.wxml
@@ -20,12 +20,12 @@
<view class="card">
<image src="../../static/images/mingpian_bg_nianxian.png" class="bg"></image>
<view>浠庝笟骞撮檺</view>
- <view class="num">{{ info.jobDate || '1' }}</view>
+ <view class="num">{{ info.jobDate || '5' }}</view>
</view>
<view class="card">
<image src="../../static/images/mingpian_bg_kehu.png" class="bg"></image>
<view>鏈嶅姟瀹㈡埛</view>
- <view class="num" wx:if="{{ info.costomerNum || info.costomerNum == 0 }}">{{ info.costomerNum || '-' }}+</view>
+ <view class="num" wx:if="{{ info.costomerNum || info.costomerNum == 0 }}">{{ info.costomerNum || '--' }}+</view>
<view wx:else class="num">--</view>
</view>
</view>
@@ -62,7 +62,7 @@
<image class="avatar" src="{{ info.imgurlFull }}"></image>
<view class="content">
<view class="name">{{ info.name }}</view>
- <view class="desc">瀵艰喘 锝� {{ info.jobDate || '--' }}骞寸粡楠�</view>
+ <view class="desc">瀵艰喘 锝� {{ info.jobDate || 5 }}骞寸粡楠�</view>
</view>
</view>
<image class="qrcode" src="{{ info.qrcodeImgFull }}"></image>
diff --git a/wechat_jiaxuan/pages/store/staffList.wxml b/wechat_jiaxuan/pages/store/staffList.wxml
index 6fab76e..8b4326d 100644
--- a/wechat_jiaxuan/pages/store/staffList.wxml
+++ b/wechat_jiaxuan/pages/store/staffList.wxml
@@ -11,7 +11,7 @@
<image class="avatar" src="{{ item.imgurlFull ? imgurlFull : '../../static/images/default_avatar.png' }}"></image>
<view class="content">
<view class="name">{{ item.name || '' }}</view>
- <view class="desc">瀵艰喘锝渰{ item.jobDate || '--' }}骞寸粡楠�</view>
+ <view class="desc">瀵艰喘锝渰{ item.jobDate || 5 }}骞寸粡楠�</view>
</view>
<view data-iamId="{{ item.iamId }}" bindtap="handleDetail" class="btn">鑱旂郴TA</view>
</view>
diff --git a/wechat_jiaxuan/pages/store/store.wxml b/wechat_jiaxuan/pages/store/store.wxml
index 4717bd0..fc308df 100644
--- a/wechat_jiaxuan/pages/store/store.wxml
+++ b/wechat_jiaxuan/pages/store/store.wxml
@@ -29,10 +29,10 @@
<view class="user_list">
<view bindtap="userDetail" data-id="{{ item.iamId }}" class="item" wx:for="{{ item.usersList }}" wx:for-item="user">
<view class="info">
- <image class="avatar" src="{{ user.imgurlFull }}" mode="widthFix"></image>
+ <image class="avatar" src="{{ user.imgurlFull ? user.imgurlFull : '../../static/images/default_avatar.png' }}" mode="widthFix"></image>
<view class="text">
<view class="name">{{ user.name }}</view>
- <view class="ex" wx:if="{{user.jobDate}}">{{ user.jobDate }}骞寸粡楠�</view>
+ <view class="ex" wx:if="{{user.jobDate}}">{{ user.jobDate || 5 }}骞寸粡楠�</view>
</view>
</view>
<view class="btn">鑱旂郴TA</view>
diff --git a/wechat_jiaxuan/pages/userinfo/index.js b/wechat_jiaxuan/pages/userinfo/index.js
index a6c42a2..fbe9364 100644
--- a/wechat_jiaxuan/pages/userinfo/index.js
+++ b/wechat_jiaxuan/pages/userinfo/index.js
@@ -33,7 +33,7 @@
val5: '',
}
},
- onLoad(options) {
+ onShow() {
this.initData()
},
onSubmit() {
@@ -133,6 +133,29 @@
region: e.detail.value
})
},
+ getBindchooseavatar(e) {
+ var that = this
+ if (e.detail.avatarUrl) {
+ wx.uploadFile({
+ url: uploadUrl,
+ filePath: e.detail.avatarUrl,
+ formData: {
+ folder: "member"
+ },
+ name: 'file',
+ success (res) {
+ let data = JSON.parse(res.data)
+ that.setData({
+ imgurl: data.data.imgaddr,
+ imgurlFull: data.data.url,
+ })
+ }
+ })
+ }
+ },
+ getNickName(e) {
+ this.setData({ nikname: e.detail.value })
+ },
changeAddr() {
// console.log('鐐瑰嚮浜�');
wx.chooseLocation({
@@ -198,22 +221,12 @@
imgurl: data.data.imgaddr,
imgurlFull: data.data.url,
})
- setTimeout(() => {
- console.log('imgurlFull', this.data.imgurlFull);
- }, 1000)
}
})
}
})
},
onReady() {
-
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
- */
- onShow() {
},
diff --git a/wechat_jiaxuan/pages/userinfo/index.wxml b/wechat_jiaxuan/pages/userinfo/index.wxml
index f16d593..37ebd4d 100644
--- a/wechat_jiaxuan/pages/userinfo/index.wxml
+++ b/wechat_jiaxuan/pages/userinfo/index.wxml
@@ -1,10 +1,12 @@
<view class="container">
<image class="avatar" bindtap="selMedia" src="{{ imgurlFull ? imgurlFull : '../../static/images/default_avatar.png' }}"></image>
- <view bindtap="selMedia" class="avatar_btn">鏇存崲澶村儚</view>
+ <button open-type="chooseAvatar" bindchooseavatar="getBindchooseavatar" class="avatar_btn">鏇存崲澶村儚</button>
<view class="list">
<view class="line">
<view class="label">鏄电О</view>
- <van-field type="text" class="input" model:value="{{ nickname }}" maxlength="{{ 18 }}" clearable />
+ <view class="val">
+ <input bindchange="getNickName" value="{{ nickname }}" maxlength="{{ 18 }}" type="nickname"/>
+ </view>
</view>
<view class="line">
<view class="label">濮撳悕</view>
diff --git a/wechat_jiaxuan/project.private.config.json b/wechat_jiaxuan/project.private.config.json
index 0b321ac..fe80c7c 100644
--- a/wechat_jiaxuan/project.private.config.json
+++ b/wechat_jiaxuan/project.private.config.json
@@ -5,7 +5,7 @@
"urlCheck": false
},
"description": "椤圭洰绉佹湁閰嶇疆鏂囦欢銆傛鏂囦欢涓殑鍐呭灏嗚鐩� project.config.json 涓殑鐩稿悓瀛楁銆傞」鐩殑鏀瑰姩浼樺厛鍚屾鍒版鏂囦欢涓�傝瑙佹枃妗ｏ細https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
- "libVersion": "3.4.10",
+ "libVersion": "3.5.0",
"condition": {
"miniprogram": {
"list": [
@@ -53,7 +53,7 @@
},
{
"name": "",
- "pathName": "pages/store/staff",
+ "pathName": "pages/store/info",
"query": "",
"launchMode": "default",
"scene": null
diff --git a/wechat_staff/components/disCase/index.wxml b/wechat_staff/components/disCase/index.wxml
index 792ec77..43919ab 100644
--- a/wechat_staff/components/disCase/index.wxml
+++ b/wechat_staff/components/disCase/index.wxml
@@ -2,7 +2,7 @@
<view class="home_top" style="top:{{ menuButtonInfo.top + menuButtonInfo.height + 6 }}px">
<view class="search_wrap">
<image src="../../static/icon/ic_search@2x.png" mode="widthFix"></image>
- <input bindconfirm="bindblur" bindblur="bindblur" model:value="{{ query }}" type="text" placeholder="鎼滅储妗堜緥鍚嶇О" />
+ <input bindconfirm="bindblur" model:value="{{ query }}" type="text" placeholder="鎼滅储妗堜緥鍚嶇О" />
</view>
</view>
<!-- -->
diff --git a/wechat_staff/components/disProduct/index.js b/wechat_staff/components/disProduct/index.js
index f14e186..98967cf 100644
--- a/wechat_staff/components/disProduct/index.js
+++ b/wechat_staff/components/disProduct/index.js
@@ -157,7 +157,6 @@
item.paramName = ''
})
this.setData({ tagCodes: [],activeParam: [],secondCateList,activeIndex: -1 })
- this.getList()
},
subParam() {
this.setData({ activeParam: [] })
diff --git a/wechat_staff/components/disProduct/index.less b/wechat_staff/components/disProduct/index.less
index fcd751b..b75e32a 100644
--- a/wechat_staff/components/disProduct/index.less
+++ b/wechat_staff/components/disProduct/index.less
@@ -21,6 +21,7 @@
.app {
height: 100%;
width: 100%;
+ overflow-y:hidden;
.home_content{
height: 100%;
}
diff --git a/wechat_staff/components/disProduct/index.wxml b/wechat_staff/components/disProduct/index.wxml
index 3ee90c9..4766265 100644
--- a/wechat_staff/components/disProduct/index.wxml
+++ b/wechat_staff/components/disProduct/index.wxml
@@ -2,7 +2,7 @@
<view class="home_top" style="top:{{ menuButtonInfo.top + menuButtonInfo.height + 6 }}px">
<view class="search_wrap">
<image src="../../static/icon/ic_search@2x.png" mode="widthFix"></image>
- <input bindconfirm="bindblur" bindblur="bindblur" model:value="{{ query }}" type="text" placeholder="鎼滅储浜у搧鍚嶇О" />
+ <input bindconfirm="bindblur" model:value="{{ query }}" type="text" placeholder="鎼滅储浜у搧鍚嶇О" />
</view>
</view>
<view class="home_content" style="padding-top:{{ menuButtonInfo.top + menuButtonInfo.height + 6 }}px;">
diff --git a/wechat_staff/components/disRealpic/index.wxml b/wechat_staff/components/disRealpic/index.wxml
index 91172ab..cbe6dc2 100644
--- a/wechat_staff/components/disRealpic/index.wxml
+++ b/wechat_staff/components/disRealpic/index.wxml
@@ -2,7 +2,7 @@
<view class="home_top" style="top:{{ menuButtonInfo.top + menuButtonInfo.height + 6 }}px">
<view class="search_wrap">
<image src="../../static/icon/ic_search@2x.png" mode="widthFix"></image>
- <input bindconfirm="bindblur" bindblur="bindblur" model:value="{{ query }}" type="text" placeholder="鎼滅储瀹炴櫙鍚嶇О" />
+ <input bindconfirm="bindblur" model:value="{{ query }}" type="text" placeholder="鎼滅储瀹炴櫙鍚嶇О" />
</view>
</view>
diff --git a/wechat_staff/utils/config.js b/wechat_staff/utils/config.js
index a150c8d..e672602 100644
--- a/wechat_staff/utils/config.js
+++ b/wechat_staff/utils/config.js
@@ -1,5 +1,5 @@
-export const baseUrl = 'http://192.168.0.135:10027'
-// export const baseUrl = 'https://dmtest.ahapp.net/web_interface' // 鏈湴
+// export const baseUrl = 'http://192.168.0.135:10027'
+export const baseUrl = 'https://dmtest.ahapp.net/web_interface' // 鏈湴
// export const baseUrl = 'http://zbtest.ahapp.net/zbom_interface/jx/wechat/' //娴嬭瘯鏈嶅姟鍣�
// export const imageUrl = 'https://osswebcdn.zbom.com/jiaxuan/images/'
--
Gitblit v1.9.3