From 73393bacf16a3ab018f0688b89ca58984ddbbd70 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 25 七月 2024 15:24:50 +0800
Subject: [PATCH] ''
---
wechat_staff/pages/work/index.json | 4
wechat_staff/components/disRealpic/index.js | 2
wechat_staff/pages/index/index.wxml | 2
wechat_staff/pages/index/index.wxss | 6
wechat_staff/pages/promotion/index.less | 6
wechat_jiaxuan/components/disProduct/index.less | 3
wechat_staff/pages/kefu/fond.js | 17 ++
wechat_staff/components/buoyClient/index.less | 14 ++
wechat_staff/pages/work/index.less | 34 +++++
wechat_staff/pages/kefu/fond.wxml | 4
wechat_staff/components/disCase/index.wxss | 1
wechat_staff/static/icon/ic_kehuxihuan.png | 0
wechat_staff/components/disProduct/index.less | 3
wechat_staff/pages/userinfo/index.js | 4
wechat_staff/pages/promotion/index.wxml | 2
wechat_staff/pages/store/staff.js | 2
wechat_staff/pages/promotion/index.wxss | 11 -
wechat_staff/pages/index/index.less | 7
wechat_staff/pages/work/index.js | 22 +--
wechat_staff/static/icon/ic_mingpian.png | 0
wechat_staff/static/icon/ic_yixiang.png | 0
wechat_staff/pages/detailDis/case.js | 6
wechat_staff/components/disRealpic/index.less | 1
wechat_jiaxuan/pages/index/index.less | 24 +--
wechat_staff/pages/detailDis/realpic.js | 6
wechat_staff/components/disProduct/index.js | 8 -
wechat_staff/components/disCase/index.js | 1
wechat_staff/components/disCase/index.less | 1
wechat_staff/components/buoyClient/index.js | 7
wechat_staff/pages/work/index.wxml | 36 ++++-
wechat_staff/pages/index/index.js | 7
wechat_staff/components/disProduct/index.wxss | 3
wechat_staff/pages/work/index.wxss | 39 +++++
wechat_staff/components/buoyClient/index.wxss | 14 ++
wechat_jiaxuan/components/disProduct/index.wxml | 2
wechat_staff/components/buoyClient/index.wxml | 1
wechat_staff/components/disRealpic/index.wxss | 1
37 files changed, 208 insertions(+), 93 deletions(-)
diff --git a/wechat_jiaxuan/components/disProduct/index.less b/wechat_jiaxuan/components/disProduct/index.less
index ddbda83..ed393c2 100644
--- a/wechat_jiaxuan/components/disProduct/index.less
+++ b/wechat_jiaxuan/components/disProduct/index.less
@@ -182,7 +182,8 @@
position: relative;
.img {
- width: 100%;
+ width: 242rpx;
+ max-height: 216rpx;
}
.new {
diff --git a/wechat_jiaxuan/components/disProduct/index.wxml b/wechat_jiaxuan/components/disProduct/index.wxml
index 578a03f..3ee90c9 100644
--- a/wechat_jiaxuan/components/disProduct/index.wxml
+++ b/wechat_jiaxuan/components/disProduct/index.wxml
@@ -39,7 +39,7 @@
<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">
<view class="img_wrap">
- <image src="{{ item.coverImage }}" class="img" mode="widthFix"></image>
+ <image src="{{ item.coverImage }}" class="img" mode="aspectFit"></image>
<image wx:if="{{ item.isNew }}" class="new" src="../../static/icon/chanpin_ic_new@2x.png" mode="widthFix"></image>
</view>
<view class="name">{{ item.title }}</view>
diff --git a/wechat_jiaxuan/pages/index/index.less b/wechat_jiaxuan/pages/index/index.less
index 6d34ac1..a3fd9bc 100644
--- a/wechat_jiaxuan/pages/index/index.less
+++ b/wechat_jiaxuan/pages/index/index.less
@@ -114,19 +114,16 @@
}
.strategy {
- padding: 40rpx 40rpx;
+ padding: 80rpx 40rpx;
background: #F7F7F7;
-
- .item {
+ .item{
position: relative;
-
image {
width: 100%;
height: 100%;
position: absolute;
}
-
- text {
+ text{
color: #fff;
position: absolute;
bottom: 40rpx;
@@ -135,28 +132,27 @@
font-weight: 500;
}
}
-
+
.line {
display: flex;
justify-content: space-between;
-
+
.line_left {
width: 324rpx;
- height: 304rpx;
+ height: 340rpx;
}
-
+
.line_right {
.item {
width: 322rpx;
- height: 140rpx;
-
+ height: 160rpx;
&:nth-last-child(1) {
- margin-top: 24rpx;
+ margin-top: 20rpx;
}
}
}
}
-
+
.home_id {
width: 670rpx;
height: 240rpx;
diff --git a/wechat_staff/components/buoyClient/index.js b/wechat_staff/components/buoyClient/index.js
index 4a2a98c..738093c 100644
--- a/wechat_staff/components/buoyClient/index.js
+++ b/wechat_staff/components/buoyClient/index.js
@@ -9,12 +9,15 @@
value: '0'
}
},
-
+ attached() {
+ const enjoyList = wx.getStorageSync('enjoyList') || []
+ this.setData({ enjoyList })
+ },
/**
* 缁勪欢鐨勫垵濮嬫暟鎹�
*/
data: {
-
+ enjoyList: []
},
/**
diff --git a/wechat_staff/components/buoyClient/index.less b/wechat_staff/components/buoyClient/index.less
index fd6a834..14b9a4e 100644
--- a/wechat_staff/components/buoyClient/index.less
+++ b/wechat_staff/components/buoyClient/index.less
@@ -14,6 +14,20 @@
font-size: 20rpx;
color: #666666;
margin-bottom: 20rpx;
+ position: relative;
+ .activeNum{
+ width: 28rpx;
+ height: 28rpx;
+ background: #F70303;
+ color: #fff;
+ font-size: 20rpx;
+ line-height: 26rpx;
+ text-align: center;
+ border-radius: 50%;
+ position: absolute;
+ top: -8rpx;
+ right: 8rpx;
+ }
&:nth-last-child(1){
margin-bottom: 0;
}
diff --git a/wechat_staff/components/buoyClient/index.wxml b/wechat_staff/components/buoyClient/index.wxml
index 2b4074c..956d4c1 100644
--- a/wechat_staff/components/buoyClient/index.wxml
+++ b/wechat_staff/components/buoyClient/index.wxml
@@ -3,6 +3,7 @@
<view class="item" data-i="0" bindtap="jumpPage">
<image src="../../static/icon/ic_kehuxihuan.png" mode="widthFix"></image>
<view>瀹㈡埛鍠滄</view>
+ <view class="activeNum">{{ enjoyList.length }}</view>
</view>
<view wx:if="{{ showPurpose && showPurpose == '1' }}" class="item" data-i="2" bindtap="jumpPage">
<image src="../../static/icon/ic_yixiang.png" mode="widthFix"></image>
diff --git a/wechat_staff/components/buoyClient/index.wxss b/wechat_staff/components/buoyClient/index.wxss
index 8c9009e..95f9728 100644
--- a/wechat_staff/components/buoyClient/index.wxss
+++ b/wechat_staff/components/buoyClient/index.wxss
@@ -14,6 +14,20 @@
font-size: 20rpx;
color: #666666;
margin-bottom: 20rpx;
+ position: relative;
+}
+.item .activeNum {
+ width: 28rpx;
+ height: 28rpx;
+ background: #F70303;
+ color: #fff;
+ font-size: 20rpx;
+ line-height: 26rpx;
+ text-align: center;
+ border-radius: 50%;
+ position: absolute;
+ top: -8rpx;
+ right: 8rpx;
}
.item:nth-last-child(1) {
margin-bottom: 0;
diff --git a/wechat_staff/components/disCase/index.js b/wechat_staff/components/disCase/index.js
index 96fca1a..60e2683 100644
--- a/wechat_staff/components/disCase/index.js
+++ b/wechat_staff/components/disCase/index.js
@@ -113,7 +113,6 @@
cateList[activeIndex].paramIndex = -1
cateList[activeIndex].paramName = ''
}
- this.setData({ pageNum: 1,dataList: [],total: 0})
this.setData({ tagCodes, cateList })
console.log('tagCodes', tagCodes);
},
diff --git a/wechat_staff/components/disCase/index.less b/wechat_staff/components/disCase/index.less
index 52e9388..f168ad9 100644
--- a/wechat_staff/components/disCase/index.less
+++ b/wechat_staff/components/disCase/index.less
@@ -10,6 +10,7 @@
background-color: #F7F7F7;
image{
width: 28rpx;
+ height: 28rpx;
margin-right: 16rpx;
}
}
diff --git a/wechat_staff/components/disCase/index.wxss b/wechat_staff/components/disCase/index.wxss
index ef73ac8..57546c4 100644
--- a/wechat_staff/components/disCase/index.wxss
+++ b/wechat_staff/components/disCase/index.wxss
@@ -11,6 +11,7 @@
}
.search_wrap image {
width: 28rpx;
+ height: 28rpx;
margin-right: 16rpx;
}
.app {
diff --git a/wechat_staff/components/disProduct/index.js b/wechat_staff/components/disProduct/index.js
index cc33cd8..f14e186 100644
--- a/wechat_staff/components/disProduct/index.js
+++ b/wechat_staff/components/disProduct/index.js
@@ -6,10 +6,6 @@
properties: {
menuButtonInfo: Object
},
-
- /**
- * 缁勪欢鐨勫垵濮嬫暟鎹�
- */
data: {
activeIndex: -1,
activeParam: [],
@@ -118,8 +114,6 @@
const paramIndex = e.currentTarget.dataset.index
const { secondCateList, tagCodes, activeParam, activeIndex } = this.data
const index = tagCodes.indexOf(code)
- console.log('code', code);
- console.log('tagCodes', tagCodes);
if(index === -1){
// 鍚宲aram閲宑ode閲嶅
if(activeParam && activeParam.length > 0){
@@ -138,7 +132,6 @@
secondCateList[activeIndex].paramIndex = -1
secondCateList[activeIndex].paramName = ''
}
- this.setData({ pageNum: 1,datalist: [],total: 0})
this.setData({ tagCodes, secondCateList })
},
changeShowParams(e){
@@ -164,6 +157,7 @@
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 ce63b2a..fcd751b 100644
--- a/wechat_staff/components/disProduct/index.less
+++ b/wechat_staff/components/disProduct/index.less
@@ -13,6 +13,7 @@
image {
width: 28rpx;
+ height: 28rpx;
margin-right: 16rpx;
}
}
@@ -183,7 +184,7 @@
.img {
width: 242rpx;
- height: 216rpx;
+ max-height: 216rpx;
}
.new {
diff --git a/wechat_staff/components/disProduct/index.wxss b/wechat_staff/components/disProduct/index.wxss
index e06d6ca..90b50c0 100644
--- a/wechat_staff/components/disProduct/index.wxss
+++ b/wechat_staff/components/disProduct/index.wxss
@@ -11,6 +11,7 @@
}
.search_wrap image {
width: 28rpx;
+ height: 28rpx;
margin-right: 16rpx;
}
.app {
@@ -168,7 +169,7 @@
}
.main_content .main_right .goods_list .item .img_wrap .img {
width: 242rpx;
- height: 216rpx;
+ max-height: 216rpx;
}
.main_content .main_right .goods_list .item .img_wrap .new {
width: 72rpx;
diff --git a/wechat_staff/components/disRealpic/index.js b/wechat_staff/components/disRealpic/index.js
index 034a81c..d5fea88 100644
--- a/wechat_staff/components/disRealpic/index.js
+++ b/wechat_staff/components/disRealpic/index.js
@@ -139,9 +139,7 @@
cateList[activeIndex].paramIndex = -1
cateList[activeIndex].paramName = ''
}
- this.setData({ pageNum: 1,dataList: [],total: 0})
this.setData({ tagCodes, cateList })
- console.log('tagCodes', tagCodes);
},
cancelParam() {
const { cateList } = this.data
diff --git a/wechat_staff/components/disRealpic/index.less b/wechat_staff/components/disRealpic/index.less
index 6ed5ae6..8064645 100644
--- a/wechat_staff/components/disRealpic/index.less
+++ b/wechat_staff/components/disRealpic/index.less
@@ -11,6 +11,7 @@
image {
width: 28rpx;
+ height: 28rpx;
margin-right: 16rpx;
}
}
diff --git a/wechat_staff/components/disRealpic/index.wxss b/wechat_staff/components/disRealpic/index.wxss
index 44f0e3c..a0a1dd5 100644
--- a/wechat_staff/components/disRealpic/index.wxss
+++ b/wechat_staff/components/disRealpic/index.wxss
@@ -11,6 +11,7 @@
}
.search_wrap image {
width: 28rpx;
+ height: 28rpx;
margin-right: 16rpx;
}
.app {
diff --git a/wechat_staff/pages/detailDis/case.js b/wechat_staff/pages/detailDis/case.js
index 8766e9a..8c34f7c 100644
--- a/wechat_staff/pages/detailDis/case.js
+++ b/wechat_staff/pages/detailDis/case.js
@@ -100,8 +100,12 @@
})
},
getDetail(id) {
+ const enjoyList = wx.getStorageSync('enjoyList') || []
getWholecaseInfo({id}).then(res => {
- this.setData({ info: res.data })
+ const index = enjoyList.findIndex( i => i.id === res.data.id )
+ this.setData({ info: {
+ ...res.data, isEnjoy: index > -1
+ }})
wx.setNavigationBarTitle({
title: res.data.title
})
diff --git a/wechat_staff/pages/detailDis/realpic.js b/wechat_staff/pages/detailDis/realpic.js
index 0e9fa5f..dcd361a 100644
--- a/wechat_staff/pages/detailDis/realpic.js
+++ b/wechat_staff/pages/detailDis/realpic.js
@@ -79,8 +79,12 @@
}
},
getDetail(id) {
+ const enjoyList = wx.getStorageSync('enjoyList') || []
getRealcaseInfo({id}).then(res => {
- this.setData({ info: res.data })
+ const index = enjoyList.findIndex( i => i.id === res.data.id )
+ this.setData({ info: {
+ ...res.data, isEnjoy: index > -1
+ }})
wx.setNavigationBarTitle({
title: res.data.title
})
diff --git a/wechat_staff/pages/index/index.js b/wechat_staff/pages/index/index.js
index c512978..a1118ce 100644
--- a/wechat_staff/pages/index/index.js
+++ b/wechat_staff/pages/index/index.js
@@ -30,12 +30,11 @@
onLoad() {
const res = wx.getMenuButtonBoundingClientRect()
this.setData({
- clientHeight: res.height
- })
- this.setData({
+ clientHeight: res.height,
clientTop: res.top
})
-
+ },
+ onShow() {
this.initData()
},
initData() {
diff --git a/wechat_staff/pages/index/index.less b/wechat_staff/pages/index/index.less
index f9391be..302784e 100644
--- a/wechat_staff/pages/index/index.less
+++ b/wechat_staff/pages/index/index.less
@@ -178,16 +178,15 @@
.line_left {
width: 324rpx;
- height: 304rpx;
+ height: 340rpx;
}
.line_right {
.item {
width: 322rpx;
- height: 140rpx;
-
+ height: 160rpx;
&:nth-last-child(1) {
- margin-top: 24rpx;
+ margin-top: 20rpx;
}
}
}
diff --git a/wechat_staff/pages/index/index.wxml b/wechat_staff/pages/index/index.wxml
index a533a03..b49b893 100644
--- a/wechat_staff/pages/index/index.wxml
+++ b/wechat_staff/pages/index/index.wxml
@@ -22,7 +22,7 @@
</view>
<view class="imgs">
<view wx:for="{{ DailyUpdates.newsList}}" class="img_wrap">
- <image class="img" src="{{ item.fileList[0].fileurlFull }}" mode="widthFix"></image>
+ <image class="img" src="{{ item.fileList[0].fileurlFull }}" mode="aspectFill"></image>
<image class="icon" src="{{everydayTop[index]}}" mode="widthFix"></image>
</view>
</view>
diff --git a/wechat_staff/pages/index/index.wxss b/wechat_staff/pages/index/index.wxss
index d064e7b..143cd79 100644
--- a/wechat_staff/pages/index/index.wxss
+++ b/wechat_staff/pages/index/index.wxss
@@ -162,14 +162,14 @@
}
.strategy .line .line_left {
width: 324rpx;
- height: 304rpx;
+ height: 340rpx;
}
.strategy .line .line_right .item {
width: 322rpx;
- height: 140rpx;
+ height: 160rpx;
}
.strategy .line .line_right .item:nth-last-child(1) {
- margin-top: 24rpx;
+ margin-top: 20rpx;
}
.strategy .home_id {
width: 670rpx;
diff --git a/wechat_staff/pages/kefu/fond.js b/wechat_staff/pages/kefu/fond.js
index bedb67d..789e2eb 100644
--- a/wechat_staff/pages/kefu/fond.js
+++ b/wechat_staff/pages/kefu/fond.js
@@ -67,7 +67,24 @@
wx.setStorageSync('enjoyList', enjoyList)
this.initData()
},
+ itemClick(e) {
+ let map = [
+ '/pages/detailDis/product',
+ '/pages/detailDis/case',
+ '/pages/detailDis/realpic',
+ '/pages/consult/detail',
+ ]
+ const { id, type } = e.currentTarget.dataset
+ wx.navigateTo({
+ url: map[type] + '?id=' + id,
+ })
+ },
bind() {
+ const enjoyList = wx.getStorageSync('enjoyList') || []
+ const temp = enjoyList.filter(i => i.checked)
+ if(temp.length == 0) return wx.showToast({
+ title: '璇峰厛閫夋嫨瑕佸叧鑱旂殑鍟嗗搧',icon:'none'
+ })
wx.navigateTo({
url: '/pages/kefu/select',
})
diff --git a/wechat_staff/pages/kefu/fond.wxml b/wechat_staff/pages/kefu/fond.wxml
index 80ec8ab..b3c1be9 100644
--- a/wechat_staff/pages/kefu/fond.wxml
+++ b/wechat_staff/pages/kefu/fond.wxml
@@ -5,8 +5,8 @@
<view class="line" wx:for="{{ day.list }}" wx:for-index="inde" wx:for-item="item">
<image data-id="{{item.id}}" bindtap="itemCheck" wx:if="{{ item.checked }}" class="icon" src="../../static/icon/ic_select_sel@2x.png"></image>
<image data-id="{{item.id}}" bindtap="itemCheck" wx:else class="icon" src="../../static/icon/ic_select@2x.png"></image>
- <image class="img" src="{{ item.coverImage }}" mode="aspectFill"></image>
- <view class="content">
+ <image data-type="{{item.joinType}}" data-id="{{item.id}}" bindtap="itemClick" class="img" src="{{ item.coverImage }}" mode="aspectFill"></image>
+ <view class="content" data-type="{{item.joinType}}" data-id="{{item.id}}" bindtap="itemClick">
<view class="name">{{ item.title }}</view>
<view class="time">{{ item.joinTime }}</view>
</view>
diff --git a/wechat_staff/pages/promotion/index.less b/wechat_staff/pages/promotion/index.less
index 2eb41c0..eb092e4 100644
--- a/wechat_staff/pages/promotion/index.less
+++ b/wechat_staff/pages/promotion/index.less
@@ -33,14 +33,14 @@
}
.imgs{
display: flex;
-
+ flex-wrap: wrap;
.img_wrap{
width: 184rpx;
height: 326rpx;
border-radius: 8rpx;
- border: 1px solid;
position: relative;
- margin-right: 20rpx;
+ margin-right: 19rpx;
+ margin-bottom: 20rpx;
&:nth-of-type(3n){
margin-right: 0;
}
diff --git a/wechat_staff/pages/promotion/index.wxml b/wechat_staff/pages/promotion/index.wxml
index 993cebc..340b0d5 100644
--- a/wechat_staff/pages/promotion/index.wxml
+++ b/wechat_staff/pages/promotion/index.wxml
@@ -7,7 +7,7 @@
<view class="imgs">
<video controls wx:if="{{item.fileType ==1 && item.fileList &&item.fileList.length}}" src="{{item.fileList[0].fileurlFull}}" class="video"></video>
<view wx:if="{{item.fileType !=1 && item.fileList}}" data-id="{{ item.id }}" wx:for-item="item1" wx:for="{{ item.fileList }}" class="img_wrap">
- <image class="img" mode="widthFix" src="{{item1.fileurlFull}}"></image>
+ <image class="img" mode="aspectFill" src="{{item1.fileurlFull}}"></image>
</view>
</view>
<view class="footer">
diff --git a/wechat_staff/pages/promotion/index.wxss b/wechat_staff/pages/promotion/index.wxss
index 06c5da7..43ca9b7 100644
--- a/wechat_staff/pages/promotion/index.wxss
+++ b/wechat_staff/pages/promotion/index.wxss
@@ -13,7 +13,6 @@
background: #F7F7F7;
border-radius: 8rpx;
padding: 34rpx 40rpx 40rpx;
- margin-bottom: 40rpx;
}
.content .time {
font-weight: 500;
@@ -31,16 +30,14 @@
}
.content .imgs {
display: flex;
- width: 100%;
flex-wrap: wrap;
}
.content .imgs .img_wrap {
width: 184rpx;
height: 326rpx;
border-radius: 8rpx;
- border: 1px solid;
position: relative;
- margin-right: 20rpx;
+ margin-right: 19rpx;
margin-bottom: 20rpx;
}
.content .imgs .img_wrap:nth-of-type(3n) {
@@ -48,11 +45,7 @@
}
.content .imgs .img_wrap .img {
width: 100%;
- max-height: 100%;
-}
-.content .imgs .video {
- width: 100%;
- max-height: 100%;
+ height: 100%;
}
.content .imgs .img_wrap .icon {
position: absolute;
diff --git a/wechat_staff/pages/store/staff.js b/wechat_staff/pages/store/staff.js
index fb154f9..ffd4ea7 100644
--- a/wechat_staff/pages/store/staff.js
+++ b/wechat_staff/pages/store/staff.js
@@ -9,7 +9,7 @@
*/
data: {
bottomLift: 0,
- isShow: true,
+ isShow: false,
userCard: '',
isShow2: false,
userInfo: {}
diff --git a/wechat_staff/pages/userinfo/index.js b/wechat_staff/pages/userinfo/index.js
index c67194e..a208323 100644
--- a/wechat_staff/pages/userinfo/index.js
+++ b/wechat_staff/pages/userinfo/index.js
@@ -135,7 +135,7 @@
filePath: res.tempFiles[0].tempFilePath,
name: 'file',
formData: {
- folder: "member"
+ folder: "users"
},
header: {
token: wx.getStorageSync('token')
@@ -177,7 +177,7 @@
filePath: res.tempFiles[0].tempFilePath,
name: 'file',
formData: {
- folder: "member"
+ folder: "users"
},
header: {
token: wx.getStorageSync('token')
diff --git a/wechat_staff/pages/work/index.js b/wechat_staff/pages/work/index.js
index cb7b991..ef2a209 100644
--- a/wechat_staff/pages/work/index.js
+++ b/wechat_staff/pages/work/index.js
@@ -8,19 +8,22 @@
topimg:'',
clientHeight: 0,
clientTop: 0,
+ showCard: false,
userInfo: {name:''}
},
-
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
- */
onLoad(options) {
const res = wx.getMenuButtonBoundingClientRect()
this.setData({clientHeight: res.height})
this.setData({clientTop: res.top})
-
+ },
+ onShow() {
this.initData()
+ },
+ showQrcode() {
+ this.setData({ showCard: true })
+ },
+ onClose() {
+ this.setData({ showCard: false })
},
changePath(e) {
const {userInfo} = this.data
@@ -52,13 +55,6 @@
})
},
onReady() {
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
- */
- onShow() {
-
},
/**
diff --git a/wechat_staff/pages/work/index.json b/wechat_staff/pages/work/index.json
index 965b8e8..3f6d92a 100644
--- a/wechat_staff/pages/work/index.json
+++ b/wechat_staff/pages/work/index.json
@@ -1,4 +1,6 @@
{
- "usingComponents": {},
+ "usingComponents": {
+ "van-popup": "@vant/weapp/popup/index"
+ },
"navigationStyle": "custom"
}
\ No newline at end of file
diff --git a/wechat_staff/pages/work/index.less b/wechat_staff/pages/work/index.less
index 19bb60b..fc3030b 100644
--- a/wechat_staff/pages/work/index.less
+++ b/wechat_staff/pages/work/index.less
@@ -12,7 +12,6 @@
padding: 72rpx 40rpx 48rpx;
color: #fff;
font-size: 26rpx;
- background-color: aquamarine;
.content {
flex: 1;
@@ -65,4 +64,37 @@
}
}
}
+ .modal{
+ width: 600rpx;
+ height: 720rpx;
+ padding: 48rpx 40rpx;
+ border-radius: 16rpx;
+ .header{
+ display: flex;
+ .avatar{
+ width: 88rpx;
+ height: 88rpx;
+ border-radius: 50%;
+ margin-right: 24rpx;
+ }
+ .content{
+ .name{font-size: 30rpx;}
+ .desc{
+ font-size: 24rpx;
+ color: #999999;
+ margin-top: 12rpx;
+ }
+ }
+ }
+ .qrcode{
+ width: 400rpx;
+ height: 400rpx;
+ margin: 60rpx auto 40rpx;
+ }
+ .text{
+ font-size: 26rpx;
+ color: #999999;
+ text-align: center;
+ }
+ }
}
\ No newline at end of file
diff --git a/wechat_staff/pages/work/index.wxml b/wechat_staff/pages/work/index.wxml
index 00d9b82..686f9c1 100644
--- a/wechat_staff/pages/work/index.wxml
+++ b/wechat_staff/pages/work/index.wxml
@@ -1,18 +1,18 @@
<view class="container">
-<view class="topbg" style="background-image:url('{{topimg}}');background-color: aquamarine;">
- <view class="navbar" style="padding-top: {{ clientTop }}px;height: {{clientHeight + clientTop}}px;">宸ヤ綔鍙�</view>
- <view class="userinfo" data-index="0" bindtap="changePath">
- <image class="avatar" src="{{userInfo.imgurlFull ? userInfo.imgurlFull : '../../static/images/default_avatar.png'}}"></image>
- <view class="content" >
- <view class="header">
- <view class="name">{{userInfo.name}}</view>
+ <view class="topbg" style="background-image:url('{{topimg}}');background-color: aquamarine;">
+ <view class="navbar" style="padding-top: {{ clientTop }}px;height: {{clientHeight + clientTop}}px;">宸ヤ綔鍙�</view>
+ <view class="userinfo">
+ <image data-index="0" bindtap="changePath" class="avatar" src="{{userInfo.imgurlFull ? userInfo.imgurlFull : '../../static/images/default_avatar.png'}}"></image>
+ <view data-index="0" bindtap="changePath" class="content">
+ <view class="header">
+ <view class="name">{{userInfo.name}}</view>
+ </view>
+ <view class="addr">{{userInfo.phone}}</view>
+ <view class="detail">{{userInfo.shopName}}</view>
</view>
- <view class="addr">{{userInfo.phone}}</view>
- <view class="detail">{{userInfo.shopName}}</view>
+ <image data-index="0" bindtap="showQrcode" class="edit" src="../../static/icon/gongzuotai_ic_erweima@2x.png" mode="widthFix"></image>
</view>
- <image data-index="0" bindtap="changePath" class="edit" src="../../static/icon/gongzuotai_ic_erweima@2x.png" mode="widthFix"></image>
</view>
-</view>
<view class="main_content">
<view class="func_list">
<view class="line" data-index="1" bindtap="changePath">
@@ -35,4 +35,18 @@
</view>
</view>
</view>
+ <!-- 璇︽儏 -->
+ <van-popup show="{{ showCard }}" closeable round bind:close="onClose">
+ <view class="modal">
+ <view class="header">
+ <image class="avatar" src="{{userInfo.imgurlFull ? userInfo.imgurlFull : '../../static/images/default_avatar.png'}}"></image>
+ <view class="content">
+ <view class="name">{{userInfo.name}}</view>
+ <view class="desc">瀵艰喘 锝� {{userInfo.jobDate ||'0'}}骞寸粡楠�</view>
+ </view>
+ </view>
+ <image class="qrcode" src="{{userInfo.qrcodeImgFull}}"></image>
+ <view class="text">闀挎寜鍥剧墖璇嗗埆浜岀淮鐮�</view>
+ </view>
+ </van-popup>
</view>
\ No newline at end of file
diff --git a/wechat_staff/pages/work/index.wxss b/wechat_staff/pages/work/index.wxss
index b5124e6..7d21c6a 100644
--- a/wechat_staff/pages/work/index.wxss
+++ b/wechat_staff/pages/work/index.wxss
@@ -11,11 +11,7 @@
display: flex;
padding: 72rpx 40rpx 48rpx;
color: #fff;
- font-size: 26rpx;
-}
-.container .topbg{
- background-size: 100% auto;
- background-repeat: no-repeat;
+ font-size: 26rpx;
}
.container .userinfo .content {
flex: 1;
@@ -64,3 +60,36 @@
.container .main_content .func_list .line .icon {
width: 40rpx;
}
+.container .modal {
+ width: 600rpx;
+ height: 720rpx;
+ padding: 48rpx 40rpx;
+ border-radius: 16rpx;
+}
+.container .modal .header {
+ display: flex;
+}
+.container .modal .header .avatar {
+ width: 88rpx;
+ height: 88rpx;
+ border-radius: 50%;
+ margin-right: 24rpx;
+}
+.container .modal .header .content .name {
+ font-size: 30rpx;
+}
+.container .modal .header .content .desc {
+ font-size: 24rpx;
+ color: #999999;
+ margin-top: 12rpx;
+}
+.container .modal .qrcode {
+ width: 400rpx;
+ height: 400rpx;
+ margin: 60rpx auto 40rpx;
+}
+.container .modal .text {
+ font-size: 26rpx;
+ color: #999999;
+ text-align: center;
+}
diff --git a/wechat_staff/static/icon/ic_kehuxihuan.png b/wechat_staff/static/icon/ic_kehuxihuan.png
index acbe934..ef427b2 100644
--- a/wechat_staff/static/icon/ic_kehuxihuan.png
+++ b/wechat_staff/static/icon/ic_kehuxihuan.png
Binary files differ
diff --git a/wechat_staff/static/icon/ic_mingpian.png b/wechat_staff/static/icon/ic_mingpian.png
index 171e032..7bf11a2 100644
--- a/wechat_staff/static/icon/ic_mingpian.png
+++ b/wechat_staff/static/icon/ic_mingpian.png
Binary files differ
diff --git a/wechat_staff/static/icon/ic_yixiang.png b/wechat_staff/static/icon/ic_yixiang.png
index 113a5cd..60fe581 100644
--- a/wechat_staff/static/icon/ic_yixiang.png
+++ b/wechat_staff/static/icon/ic_yixiang.png
Binary files differ
--
Gitblit v1.9.3