From 282ae8b61eed9a9eb81ac85a9c7f6899eb3652fd Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 29 七月 2024 19:26:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
wechat_jiaxuan/pages/userinfo/index.wxml | 19
wechat_staff/pages/index/index.wxss | 27 -
wechat_staff/pages/store/staff.less | 39 ++
wechat_jiaxuan/components/disProduct/index.less | 3
wechat_staff/pages/kefu/fond.wxss | 27 -
wechat_jiaxuan/pages/detailDis/product.wxml | 14
wechat_jiaxuan/pages/store/staff.wxss | 4
wechat_jiaxuan/pages/homeId/index.js | 2
wechat_jiaxuan/pages/store/staff.less | 4
wechat_staff/components/disCase/index.wxml | 4
wechat_staff/components/disRealpic/index.json | 4
wechat_jiaxuan/components/disRealpic/index.json | 4
wechat_staff/pages/promotion/index.wxss | 1
wechat_staff/components/videoPlay/index.wxss | 12
wechat_staff/pages/sets/protocol.wxml | 2
wechat_staff/components/disRealpic/index.less | 14
wechat_staff/pages/store/staff.wxml | 3
wechat_jiaxuan/pages/sets/protocol.json | 4
wechat_jiaxuan/components/idCard/index.less | 2
wechat_jiaxuan/pages/userinfo/index.less | 13
wechat_staff/components/disProduct/index.js | 5
wechat_jiaxuan/components/idCard/index.wxss | 2
wechat_jiaxuan/project.private.config.json | 4
wechat_staff/pages/work/index.wxml | 2
wechat_jiaxuan/components/disRealpic/index.wxml | 10
wechat_jiaxuan/pages/store/info.wxml | 5
wechat_staff/pages/detailDis/product.less | 17
wechat_jiaxuan/components/videoPlay/index.wxss | 12
wechat_jiaxuan/utils/request.js | 9
wechat_staff/pages/kefu/fond.less | 23
wechat_jiaxuan/components/disProduct/index.wxml | 2
wechat_staff/components/disRealpic/index.wxss | 10
wechat_jiaxuan/pages/userinfo/index.wxss | 13
wechat_staff/components/disRealpic/index.js | 68 ++-
wechat_jiaxuan/components/disProduct/index.js | 2
wechat_jiaxuan/pages/store/info.less | 3
wechat_staff/pages/promotion/index.less | 2
wechat_jiaxuan/components/disRealpic/index.less | 13
wechat_staff/pages/kefu/fond.js | 4
wechat_staff/pages/userinfo/index.less | 1
wechat_staff/utils/request.js | 21
wechat_jiaxuan/app.wxss | 3
wechat_jiaxuan/pages/store/store.less | 2
wechat_staff/pages/work/index.less | 1
wechat_jiaxuan/app.json | 3
wechat_jiaxuan/pages/detailDis/product.wxss | 28 +
wechat_staff/components/detailFooter/index.wxss | 23
wechat_staff/pages/detailDis/product.js | 4
wechat_staff/components/disProduct/index.less | 3
wechat_jiaxuan/pages/store/store.wxss | 2
wechat_staff/pages/userinfo/index.wxss | 3
wechat_jiaxuan/pages/detailDis/product.js | 4
wechat_staff/pages/index/index.less | 14
wechat_jiaxuan/pages/userinfo/index.js | 34 ++
wechat_staff/utils/config.js | 4
wechat_jiaxuan/components/disCase/index.js | 71 +++-
wechat_jiaxuan/components/disCase/index.wxml | 4
wechat_staff/pages/homeId/index.wxml | 4
wechat_jiaxuan/pages/sets/protocol.wxml | 4
wechat_jiaxuan/utils/config.js | 4
wechat_staff/components/disCase/index.js | 64 ++-
wechat_staff/pages/detailDis/product.wxml | 18
wechat_staff/components/detailFooter/index.less | 23
/dev/null | 19 -
wechat_jiaxuan/pages/detailDis/product.less | 17
wechat_jiaxuan/components/disRealpic/index.js | 37 +-
wechat_staff/components/disProduct/index.wxml | 2
wechat_staff/pages/store/staff.wxss | 41 ++
wechat_jiaxuan/components/disRealpic/index.wxss | 14
wechat_jiaxuan/components/disProduct/index.wxss | 3
wechat_staff/pages/work/index.wxss | 1
wechat_staff/components/disRealpic/index.wxml | 11
wechat_jiaxuan/pages/store/info.wxss | 3
73 files changed, 573 insertions(+), 325 deletions(-)
diff --git a/wechat_jiaxuan/app.json b/wechat_jiaxuan/app.json
index 1fa43dc..d2f1198 100644
--- a/wechat_jiaxuan/app.json
+++ b/wechat_jiaxuan/app.json
@@ -79,6 +79,9 @@
"permission": {
"scope.userLocation": {
"desc": "浣犵殑浣嶇疆淇℃伅灏嗙敤浜庡皬绋嬪簭浣嶇疆鎺ュ彛鐨勬晥鏋滃睍绀�"
+ },
+ "scope.userInfo": {
+ "desc": "浣犵殑寰俊鍛㈢О灏嗙敤浜庡皬绋嬪簭鍛㈢О鐨勬晥鏋滃睍绀�"
}
},
"componentFramework": "glass-easel",
diff --git a/wechat_jiaxuan/app.wxss b/wechat_jiaxuan/app.wxss
index 42eeaf6..6f32364 100644
--- a/wechat_jiaxuan/app.wxss
+++ b/wechat_jiaxuan/app.wxss
@@ -2,6 +2,9 @@
view,text,scroll-view,image{
box-sizing: border-box;
}
+.swiper{
+ box-sizing: border-box;
+}
page{
background-color: #fff;
--themeColor:#B08771;
diff --git a/wechat_jiaxuan/components/disCase/index.js b/wechat_jiaxuan/components/disCase/index.js
index 0c52299..695fc91 100644
--- a/wechat_jiaxuan/components/disCase/index.js
+++ b/wechat_jiaxuan/components/disCase/index.js
@@ -11,7 +11,7 @@
activeParam: [],
selParam: '',
tagCodes: [],
-
+ isLoading :false,
cateList: [],
dataList: [],
@@ -42,6 +42,10 @@
})
},
getList() {
+ if(this.data.isLoading){
+ return
+ }
+ this.setData({isLoading:true})
const { sortType, query, tagCodes, pageNum, pageSize, catalogCode } = this.data
getZhongTaiWholecasePage({
catalogCode, pageNum, pageSize, tagCodes, sortType, query
@@ -52,6 +56,8 @@
dataList: [...this.data.dataList, ...res.data.records],
})
}
+ }).finally(()=>{
+ this.setData({isLoading:false})
})
},
scrolltolower() {
@@ -90,48 +96,65 @@
})
},
tagClick(e) {
+ if(this.data.isLoading){
+ return
+ }
const code = e.currentTarget.dataset.code
const paramIndex = e.currentTarget.dataset.index
const { cateList, tagCodes, activeParam, activeIndex } = this.data
const index = tagCodes.indexOf(code)
- if (index === -1) {
- // 鍚宲aram閲宑ode閲嶅
- if (activeParam && activeParam.length > 0) {
- activeParam.forEach(item => {
- const indexTemp = tagCodes.indexOf(item.labelValueCode)
- if (indexTemp > -1) {
- tagCodes.splice(indexTemp, 1)
- }
- })
- }
- tagCodes.push(code)
- cateList[activeIndex].paramIndex = paramIndex
- cateList[activeIndex].paramName = activeParam[paramIndex].labelValueName
+ if (cateList[activeIndex].tempParamIndex==null || cateList[activeIndex].tempParamIndex != paramIndex) {
+ // // 鍚宲aram閲宑ode閲嶅
+ // if (activeParam && activeParam.length > 0) {
+ // activeParam.forEach(item => {
+ // const indexTemp = tagCodes.indexOf(item.labelValueCode)
+ // if (indexTemp > -1) {
+ // tagCodes.splice(indexTemp, 1)
+ // }
+ // })
+ // }
+ // tagCodes.push(code)
+ cateList[activeIndex].tempParamIndex = paramIndex
+ cateList[activeIndex].tempParamName = activeParam[paramIndex].labelValueName
+ cateList[activeIndex].tempParamCode = code
} else {
- tagCodes.splice(index, 1)
- cateList[activeIndex].paramIndex = -1
- cateList[activeIndex].paramName = ''
+ // tagCodes.splice(index, 1)
+ cateList[activeIndex].tempParamIndex = -1
+ cateList[activeIndex].tempParamName = null
+ cateList[activeIndex].tempParamCode = null
}
- this.setData({ pageNum: 1, dataList: [], total: 0 })
- this.setData({ tagCodes, cateList })
+ // this.setData({ pageNum: 1, dataList: [], total: 0 })
+ this.setData({cateList })
console.log('tagCodes', tagCodes)
},
cancelParam() {
+
const { cateList } = this.data
cateList.forEach(item => {
- item.paramIndex = -1
- item.paramName = item.paramName || ''
+ item.tempParamIndex =item.paramIndex
+ item.tempParamName =item.paramName
+ item.tempParamCode =item.paramCode
})
- this.setData({ tagCodes: [], activeParam: [], cateList, activeIndex: -1 })
+ this.setData({ activeParam: [],cateList , activeIndex: -1 })
},
bindblur() {
this.setData({ pageNum: 1, dataList: [], total: 0 })
this.getList()
},
- subParam() {
+ subParam() {
this.setData({ activeParam: [] })
- this.setData({ pageNum: 1, activeIndex: -1, dataList: [], total: 0 })
+ const { cateList } = this.data
+ var codes = []
+ cateList.forEach(item => {
+ item.paramIndex =item.tempParamIndex
+ item.paramName =item.tempParamName
+ item.paramCode =item.tempParamCode
+ if(item.paramIndex >-1 && item.paramCode){
+ codes.push(item.paramCode)
+ }
+ })
+ this.setData({tagCodes:codes, pageNum: 1, activeIndex: -1, dataList: [], total: 0 })
this.getList()
},
changeShowParams(e) {
diff --git a/wechat_jiaxuan/components/disCase/index.wxml b/wechat_jiaxuan/components/disCase/index.wxml
index 8a18d4a..1d3bcb5 100644
--- a/wechat_jiaxuan/components/disCase/index.wxml
+++ b/wechat_jiaxuan/components/disCase/index.wxml
@@ -11,7 +11,7 @@
<scroll-view class="query_wrap_scroll" scroll-x>
<view class="query_wrap">
<view data-index="{{ index }}" wx:for="{{ cateList }}" class="item" bindtap="changeShowParams">
- <view class="name">{{ item.paramName || item.labelName }}</view>
+ <view class="name">{{ item.tempParamName || item.labelName }}</view>
<van-icon name="{{ activeIndex === index ? 'arrow-up' : 'arrow-down' }}" />
</view>
</view>
@@ -19,7 +19,7 @@
<!-- param -->
<view wx:if="{{ activeParam && activeParam.length > 0 }}" class="query_param">
<view class="list">
- <view data-index="{{index}}" data-code="{{ item.labelValueCode }}" bindtap="tagClick" wx:for="{{ activeParam }}" class="item {{ cateList[activeIndex].paramIndex === index ? 'active' : '' }}">{{ item.labelValueName }}</view>
+ <view data-index="{{index}}" data-tempindex="{{item.tempParamIndex}}" data-code="{{ item.labelValueCode }}" bindtap="tagClick" wx:for="{{ activeParam }}" class="item {{ cateList[activeIndex].tempParamIndex === index ? 'active' : '' }}">{{ item.labelValueName }}</view>
</view>
<view class="btns">
<view class="btn" bindtap="cancelParam">鍙栨秷</view>
diff --git a/wechat_jiaxuan/components/disProduct/index.js b/wechat_jiaxuan/components/disProduct/index.js
index a93ce61..0ca5b83 100644
--- a/wechat_jiaxuan/components/disProduct/index.js
+++ b/wechat_jiaxuan/components/disProduct/index.js
@@ -131,7 +131,7 @@
console.log('code', code)
console.log('tagCodes', tagCodes)
console.log(secondCateList)
- if (index === -1) {
+ if ( secondCateList[activeIndex].tempParamIndex==null || secondCateList[activeIndex].tempParamIndex != paramIndex) {
// 鍚宲aram閲宑ode閲嶅
// if (activeParam && activeParam.length > 0) {
// activeParam.forEach(item => {
diff --git a/wechat_jiaxuan/components/disProduct/index.less b/wechat_jiaxuan/components/disProduct/index.less
index e7bd521..ad224c1 100644
--- a/wechat_jiaxuan/components/disProduct/index.less
+++ b/wechat_jiaxuan/components/disProduct/index.less
@@ -178,6 +178,9 @@
width: 242rpx;
flex-shrink: 0;
margin-bottom: 32rpx;
+ &:nth-last-child(1){
+ margin-right: auto;
+ }
.img_wrap {
width: 242rpx;
border-radius: 8rpx;
diff --git a/wechat_jiaxuan/components/disProduct/index.wxml b/wechat_jiaxuan/components/disProduct/index.wxml
index 9c34af4..4c5358a 100644
--- a/wechat_jiaxuan/components/disProduct/index.wxml
+++ b/wechat_jiaxuan/components/disProduct/index.wxml
@@ -21,7 +21,7 @@
</view>
<view wx:if="{{ activeParam.length > 0 }}" class="query_form">
<view class="list">
- <view data-index="{{index}}" data-code="{{ item.labelValueCode }}" bindtap="tagClick" wx:for="{{ activeParam }}" class="item {{ secondCateList[activeIndex].tempParamIndex === index ? 'active' : '' }}">{{ item.labelValueName }}</view>
+ <view data-index="{{index}}" data-tempindex="{{item.tempParamIndex}}" data-code="{{ item.labelValueCode }}" bindtap="tagClick" wx:for="{{ activeParam }}" class="item {{ secondCateList[activeIndex].tempParamIndex === index ? 'active' : '' }}">{{ item.labelValueName }}</view>
</view>
<view class="btns">
<view class="btn" bindtap="cancelParam">鍙栨秷</view>
diff --git a/wechat_jiaxuan/components/disProduct/index.wxss b/wechat_jiaxuan/components/disProduct/index.wxss
index c937e3c..f962c68 100644
--- a/wechat_jiaxuan/components/disProduct/index.wxss
+++ b/wechat_jiaxuan/components/disProduct/index.wxss
@@ -164,6 +164,9 @@
flex-shrink: 0;
margin-bottom: 32rpx;
}
+.main_content .main_right .goods_list .item:nth-last-child(1) {
+ margin-right: auto;
+}
.main_content .main_right .goods_list .item .img_wrap {
width: 242rpx;
border-radius: 8rpx;
diff --git a/wechat_jiaxuan/components/disRealpic/index.js b/wechat_jiaxuan/components/disRealpic/index.js
index 24d02de..c96868b 100644
--- a/wechat_jiaxuan/components/disRealpic/index.js
+++ b/wechat_jiaxuan/components/disRealpic/index.js
@@ -76,9 +76,15 @@
},
videoClick(e) {
const { videourl } = e.currentTarget.dataset
- wx.previewMedia({
- sources: [{ url: videourl, type: 'video' }]
- })
+
+ let videoPlay = this.selectComponent('.videoPlay');
+ if(videoPlay){
+ videoPlay.startPlayVideo(videourl,this );
+ }
+ console.log(videourl+"-------------------------------------")
+ // wx.previewMedia({
+ // sources: [{ url: videourl, type: 'video' }]
+ // })
},
priviewFull(e){
const item = e.currentTarget.dataset.item
@@ -111,9 +117,14 @@
const item = e.currentTarget.dataset.item
console.log('item', item);
if(item.openType == 'video'){
- wx.previewMedia({
- sources: [{ url: item.openContent, type: 'video' }]
- })
+
+ let videoPlay = this.selectComponent('.videoPlay');
+ if(videoPlay){
+ videoPlay.startPlayVideo(item.openContent,this );
+ }
+ // wx.previewMedia({
+ // sources: [{ url: item.openContent, type: 'video' }]
+ // })
}
if(item.openType == 'link'){
wx.navigateTo({
@@ -137,18 +148,8 @@
const code = e.currentTarget.dataset.code
const paramIndex = e.currentTarget.dataset.index
const { cateList, tagCodes, activeParam, activeIndex } = this.data
- const index = tagCodes.indexOf(code)
-
- if(index === -1){
- // if(activeParam && activeParam.length > 0){
- // activeParam.forEach(item => {
- // const indexTemp = tagCodes.indexOf(item.labelValueCode)
- // if(indexTemp > -1){
- // tagCodes.splice(indexTemp, 1)
- // }
- // })
- // }
- // tagCodes.push(code)
+ const index = tagCodes.indexOf(code)
+ if( cateList[activeIndex].tempParamIndex==null || cateList[activeIndex].tempParamIndex != paramIndex){
cateList[activeIndex].tempParamIndex = paramIndex
cateList[activeIndex].tempParamName = activeParam[paramIndex].labelValueName
cateList[activeIndex].tempParamCode = code
diff --git a/wechat_jiaxuan/components/disRealpic/index.json b/wechat_jiaxuan/components/disRealpic/index.json
index e8cfaaf..b2baa38 100644
--- a/wechat_jiaxuan/components/disRealpic/index.json
+++ b/wechat_jiaxuan/components/disRealpic/index.json
@@ -1,4 +1,6 @@
{
"component": true,
- "usingComponents": {}
+ "usingComponents": {
+ "videoPlay": "/components/videoPlay/index"
+ }
}
\ No newline at end of file
diff --git a/wechat_jiaxuan/components/disRealpic/index.less b/wechat_jiaxuan/components/disRealpic/index.less
index d73de13..7343f39 100644
--- a/wechat_jiaxuan/components/disRealpic/index.less
+++ b/wechat_jiaxuan/components/disRealpic/index.less
@@ -150,6 +150,9 @@
.item {
width: 324rpx;
margin-bottom: 32rpx;
+ &:nth-last-child(1){
+ margin-right: auto;
+ }
.img_wrap {
width: 100%;
height: 182rpx;
@@ -168,14 +171,14 @@
.full {
position: absolute;
- top: 32rpx;
- right: 32rpx;
+ top: 16rpx;
+ left: 16rpx;
font-size: 20rpx;
color: rgba(255, 255, 255, 0.8);
- width: 112rpx;
- height: 42rpx;
+ width:52rpx;
+ height: 46rpx;
background: rgba(0, 0, 0, 0.54);
- border-radius: 30rpx;
+ border-radius: 8rpx;
display: flex;
align-items: center;
justify-content: center;
diff --git a/wechat_jiaxuan/components/disRealpic/index.wxml b/wechat_jiaxuan/components/disRealpic/index.wxml
index 4842835..a42d9be 100644
--- a/wechat_jiaxuan/components/disRealpic/index.wxml
+++ b/wechat_jiaxuan/components/disRealpic/index.wxml
@@ -12,7 +12,7 @@
<scroll-view class="query_wrap_scroll" scroll-x>
<view class="query_wrap">
<view data-index="{{ index }}" wx:for="{{ cateList }}" class="item" bindtap="changeShowParams">
- <view class="name">{{ item.paramName || item.labelName }}</view>
+ <view class="name">{{ item.tempParamName || item.labelName }}</view>
<van-icon name="{{ activeIndex === index ? 'arrow-up' : 'arrow-down' }}" />
</view>
</view>
@@ -20,7 +20,7 @@
<!-- param -->
<view wx:if="{{ activeParam && activeParam.length > 0 }}" class="query_param">
<view class="list">
- <view data-index="{{index}}" data-code="{{ item.labelValueCode }}" bindtap="tagClick" wx:for="{{ activeParam }}" class="item {{ cateList[activeIndex].paramIndex === index ? 'active' : '' }}">{{ item.labelValueName }}</view>
+ <view data-index="{{index}}" data-tempindex="{{item.tempParamIndex}}" data-code="{{ item.labelValueCode }}" bindtap="tagClick" wx:for="{{ activeParam }}" class="item {{ cateList[activeIndex].tempParamIndex === index ? 'active' : '' }}">{{ item.labelValueName }}</view>
</view>
<view class="btns">
<view class="btn" bindtap="cancelParam">鍙栨秷</view>
@@ -40,9 +40,8 @@
<view wx:for="{{ dataList }}" data-item="{{item}}" class="item" bindtap="handleDetail">
<view class="img_wrap">
<image src="{{ item.coverImage }}" class="img"></image>
- <view wx:if="{{ item.openType == 'link' }}" data-item="{{item}}" bindtap="priviewFull" class="full">
- <image class="icon" src="../../static/icon/ic_720.png" mode="widthFix"></image>
- <text>鍏ㄦ櫙</text>
+ <view wx:if="{{ item.openType == 'link' }}" data-item="{{item}}" bindtap="priviewFull" class="full">
+ <text>VR</text>
</view>
<image wx:if="{{ item.openType == 'video' }}" bindtap="videoClick" data-videourl="{{ item.openContent }}" class="play" src="../../static/icon/ic_play.png" mode="widthFix"></image>
<image wx:if="{{ false }}" class="new" src="../../static/icon/chanpin_ic_new@2x.png" mode="widthFix"></image>
@@ -66,4 +65,5 @@
</view>
+ <videoPlay class="videoPlay"/>
</view>
\ No newline at end of file
diff --git a/wechat_jiaxuan/components/disRealpic/index.wxss b/wechat_jiaxuan/components/disRealpic/index.wxss
index 911a199..1e48bc7 100644
--- a/wechat_jiaxuan/components/disRealpic/index.wxss
+++ b/wechat_jiaxuan/components/disRealpic/index.wxss
@@ -132,10 +132,12 @@
flex-wrap: wrap;
justify-content: space-around;
}
-
.main_content .goods_list .item {
width: 324rpx;
margin-bottom: 32rpx;
+}
+.main_content .goods_list .item:nth-last-child(1) {
+ margin-right: auto;
}
.main_content .goods_list .item .img_wrap {
width: 100%;
@@ -154,14 +156,14 @@
}
.main_content .goods_list .item .img_wrap .full {
position: absolute;
- top: 32rpx;
- right: 32rpx;
+ top: 16rpx;
+ left: 16rpx;
font-size: 20rpx;
color: rgba(255, 255, 255, 0.8);
- width: 112rpx;
- height: 42rpx;
+ width:52rpx;
+ height: 46rpx;
background: rgba(0, 0, 0, 0.54);
- border-radius: 30rpx;
+ border-radius: 8rpx;
display: flex;
align-items: center;
justify-content: center;
diff --git a/wechat_jiaxuan/components/idCard/index.less b/wechat_jiaxuan/components/idCard/index.less
index e89bf2d..6bb6291 100644
--- a/wechat_jiaxuan/components/idCard/index.less
+++ b/wechat_jiaxuan/components/idCard/index.less
@@ -39,7 +39,7 @@
font-size: 20rpx;
color: #333333;
.icon{
- margin-bottom: 4rpx;
+ margin-bottom: 6rpx;
width: 44rpx;
height: 44rpx;
}
diff --git a/wechat_jiaxuan/components/idCard/index.wxss b/wechat_jiaxuan/components/idCard/index.wxss
index 7372383..672e603 100644
--- a/wechat_jiaxuan/components/idCard/index.wxss
+++ b/wechat_jiaxuan/components/idCard/index.wxss
@@ -38,7 +38,7 @@
color: #333333;
}
.user .btns .item .icon {
- margin-bottom: 4rpx;
+ margin-bottom: 6rpx;
width: 44rpx;
height: 44rpx;
}
diff --git a/wechat_jiaxuan/components/videoPlay/index.less b/wechat_jiaxuan/components/videoPlay/index.less
deleted file mode 100644
index 8c845bd..0000000
--- a/wechat_jiaxuan/components/videoPlay/index.less
+++ /dev/null
@@ -1,19 +0,0 @@
-
-.video_content{
- position: fixed;
- top: 10rpx;
- left: 0;
- width: 100%;
- height: 100%;
- background-color: rgba(0, 0, 0, 0.2);
- z-index: 9999;
- .video{
- position: fixed;
- border-radius: 8rpx;
- top: 50%;
- left: 75rpx;
- transform: translate(0, -50%);
- width: 600rpx;
- z-index: 10000;
- }
-}
\ No newline at end of file
diff --git a/wechat_jiaxuan/components/videoPlay/index.wxss b/wechat_jiaxuan/components/videoPlay/index.wxss
index 205694c..0330f3e 100644
--- a/wechat_jiaxuan/components/videoPlay/index.wxss
+++ b/wechat_jiaxuan/components/videoPlay/index.wxss
@@ -5,15 +5,17 @@
left: 0;
width: 100%;
height: 100%;
- background-color: rgba(0, 0, 0, 0.2);
+ background-color: rgba(0, 0, 0, 0.5);
z-index: 9999;
}
.video_content .video{
position: fixed;
border-radius: 8rpx;
- top: 50%;
- left: 75rpx;
- transform: translate(0, -50%);
- width: 600rpx;
+ top: 40%;
+ left: 0;
+ width: 750rpx;
z-index: 10000;
+}
+video{
+ width: 750rpx;
}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/detailDis/product.js b/wechat_jiaxuan/pages/detailDis/product.js
index 5226359..ba7ac8f 100644
--- a/wechat_jiaxuan/pages/detailDis/product.js
+++ b/wechat_jiaxuan/pages/detailDis/product.js
@@ -11,10 +11,14 @@
current: 0,
id: '',
origin: '',
+ isFold: false,
info: {},
member: {},
showShare: false
},
+ changeFold() {
+ this.setData({ isFold: !this.data.isFold })
+ },
onLoadLogin(options) {
this.getDetail(options.id, options.userId || '')
actionDo({
diff --git a/wechat_jiaxuan/pages/detailDis/product.less b/wechat_jiaxuan/pages/detailDis/product.less
index a0f2291..383004d 100644
--- a/wechat_jiaxuan/pages/detailDis/product.less
+++ b/wechat_jiaxuan/pages/detailDis/product.less
@@ -92,13 +92,14 @@
border-radius: 16rpx 16rpx 0rpx 0rpx;
background-color: #fff;
margin-bottom: 20rpx;
+ overflow: hidden;
.title {
font-weight: 500;
font-size: 36rpx;
margin-bottom: 16rpx;
}
.desc {
-
+ line-height: 40rpx;
font-size: 26rpx;
color: #555555;
margin-bottom: 26rpx;
@@ -211,7 +212,16 @@
.detail {
padding: 52rpx 40rpx 40rpx;
background-color: #fff;
-
+ .fold{
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 84rpx;
+ margin-top: 20rpx;
+ .icon{
+ margin-left: 12rpx;
+ }
+ }
.title {
font-weight: 600;
font-size: 36rpx;
@@ -220,7 +230,8 @@
.line {
display: flex;
- margin-bottom: 20rpx;
+ padding: 24rpx 0 26rpx;
+ border-bottom: 1rpx dashed #E5E5E5;
.label {
width: 120rpx;
font-size: 24rpx;
diff --git a/wechat_jiaxuan/pages/detailDis/product.wxml b/wechat_jiaxuan/pages/detailDis/product.wxml
index becec78..c72efc3 100644
--- a/wechat_jiaxuan/pages/detailDis/product.wxml
+++ b/wechat_jiaxuan/pages/detailDis/product.wxml
@@ -10,7 +10,7 @@
</swiper-item>
</block>
</swiper>
- <view class="indicator">{{current}}/{{info.bannerImgList.length}}</view>
+ <view class="indicator">{{current + 1}}/{{info.bannerImgList.length}}</view>
</view>
<view class="main_content">
<view class="title">{{ info.title }}</view>
@@ -31,9 +31,15 @@
</view>
<view class="detail">
<view class="title">浜у搧璇︽儏</view>
- <view class="line" wx:for="{{ info.productParamList }}">
- <view class="label">{{ item.paramName }}锛�</view>
- <view class="val">{{ item.paramValue }}</view>
+ <block wx:for="{{ info.productParamList }}">
+ <view wx:if="{{ index < 5 || isFold }}" class="line" >
+ <view class="label">{{ item.paramName }}锛�</view>
+ <view class="val">{{ item.paramValue }}</view>
+ </view>
+ </block>
+ <view wx:if="{{ info.productParamList.length > 5 }}" class="fold" bindtap="changeFold">
+ <text>{{ isFold ? '鏀惰捣' : '灞曞紑' }}</text>
+ <van-icon class="icon" name="{{ isFold ? 'arrow-up' : 'arrow-down' }}" />
</view>
</view>
<!-- 瀵屾枃鏈� -->
diff --git a/wechat_jiaxuan/pages/detailDis/product.wxss b/wechat_jiaxuan/pages/detailDis/product.wxss
index b323e2b..dee868f 100644
--- a/wechat_jiaxuan/pages/detailDis/product.wxss
+++ b/wechat_jiaxuan/pages/detailDis/product.wxss
@@ -85,6 +85,7 @@
border-radius: 16rpx 16rpx 0rpx 0rpx;
background-color: #fff;
margin-bottom: 20rpx;
+ overflow: hidden;
}
.main_content .title {
font-weight: 500;
@@ -92,6 +93,7 @@
margin-bottom: 16rpx;
}
.main_content .desc {
+ line-height: 40rpx;
font-size: 26rpx;
color: #555555;
margin-bottom: 26rpx;
@@ -161,6 +163,7 @@
}
.video .img_wrap .img {
width: 100%;
+ height: 376rpx;
}
.video .img_wrap .play {
position: absolute;
@@ -175,10 +178,28 @@
border-radius: 30rpx;
font-size: 26rpx;
color: rgba(255, 255, 255, 0.8);
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+.video .img_wrap .play .icon {
+ width: 14rpx;
+ height: 16rpx;
+ margin-left: 14rpx;
}
.detail {
padding: 52rpx 40rpx 40rpx;
background-color: #fff;
+}
+.detail .fold {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 84rpx;
+ margin-top: 20rpx;
+}
+.detail .fold .icon {
+ margin-left: 12rpx;
}
.detail .title {
font-weight: 600;
@@ -187,13 +208,14 @@
}
.detail .line {
display: flex;
- height: 32rpx;
- margin-bottom: 24rpx;
+ padding: 24rpx 0 26rpx;
+ border-bottom: 1rpx dashed #E5E5E5;
}
.detail .line .label {
- width: auto;
+ width: 120rpx;
font-size: 24rpx;
color: #666666;
+ flex-shrink: 0;
}
.detail .line .val {
flex: 1;
diff --git a/wechat_jiaxuan/pages/homeId/index.js b/wechat_jiaxuan/pages/homeId/index.js
index 792b2b2..5827e4d 100644
--- a/wechat_jiaxuan/pages/homeId/index.js
+++ b/wechat_jiaxuan/pages/homeId/index.js
@@ -53,6 +53,8 @@
total: res.data.total,
dataList: [ ...this.data.dataList, ...res.data.records ]
})
+ }).finally(()=>{
+ wx.stopPullDownRefresh()
})
},
itemClick(e) {
diff --git a/wechat_jiaxuan/pages/sets/protocol.json b/wechat_jiaxuan/pages/sets/protocol.json
index d8bbc60..0ec25df 100644
--- a/wechat_jiaxuan/pages/sets/protocol.json
+++ b/wechat_jiaxuan/pages/sets/protocol.json
@@ -1,4 +1,6 @@
{
- "usingComponents": {},
+ "usingComponents": {
+ "mp-html": "mp-html"
+ },
"navigationBarTitleText": ""
}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/sets/protocol.wxml b/wechat_jiaxuan/pages/sets/protocol.wxml
index f288e0d..79fbe74 100644
--- a/wechat_jiaxuan/pages/sets/protocol.wxml
+++ b/wechat_jiaxuan/pages/sets/protocol.wxml
@@ -1,3 +1,3 @@
-<view class="container">
- <rich-text nodes="{{ activeHtml }}"></rich-text>
+<view style="width: 100%;height: auto;padding: 0px 40rpx;">
+<mp-html content="{{activeHtml}}"> </mp-html>
</view>
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/store/info.less b/wechat_jiaxuan/pages/store/info.less
index de1cba3..5378b2b 100644
--- a/wechat_jiaxuan/pages/store/info.less
+++ b/wechat_jiaxuan/pages/store/info.less
@@ -103,6 +103,9 @@
}
}
}
+.empty_wrap{
+ padding-top: 100rpx;
+}
.container{
overflow: hidden;
height: 100%;
diff --git a/wechat_jiaxuan/pages/store/info.wxml b/wechat_jiaxuan/pages/store/info.wxml
index 28f3b57..177b8c9 100644
--- a/wechat_jiaxuan/pages/store/info.wxml
+++ b/wechat_jiaxuan/pages/store/info.wxml
@@ -12,7 +12,7 @@
</view>
<view class="main_content">
<view class="title">闂ㄥ簵瀵艰喘</view>
- <scroll-view scroll-y class="list">
+ <scroll-view scroll-y class="list">
<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">
@@ -21,6 +21,9 @@
</view>
<view data-phone="{{ item.phone }}" bindtap="callPhone" class="btn">鑱旂郴TA</view>
</view>
+ <view wx:if="{{ info.usersList.length == 0 }}" class="empty_wrap">
+ <image class="default_empty" src="../../static/images/default_empty.png"></image>
+ </view>
</scroll-view>
</view>
</view>
diff --git a/wechat_jiaxuan/pages/store/info.wxss b/wechat_jiaxuan/pages/store/info.wxss
index cd9eb99..da3c36a 100644
--- a/wechat_jiaxuan/pages/store/info.wxss
+++ b/wechat_jiaxuan/pages/store/info.wxss
@@ -95,6 +95,9 @@
color: var(--themeColor);
border: 1rpx solid var(--themeColor);
}
+.empty_wrap {
+ padding-top: 100rpx;
+}
.container {
overflow: hidden;
height: 100%;
diff --git a/wechat_jiaxuan/pages/store/staff.less b/wechat_jiaxuan/pages/store/staff.less
index 0c0943f..8d23bb3 100644
--- a/wechat_jiaxuan/pages/store/staff.less
+++ b/wechat_jiaxuan/pages/store/staff.less
@@ -109,7 +109,9 @@
margin-top: 8rpx;
font-weight: 600;
font-size: 40rpx;
- display: flex;
+ display: flex;
+ align-items: flex-end; /* 杩欎細浣垮瓙鍏冪礌搴曢儴瀵归綈 */
+ justify-content: center; /* 杩欎細浣垮瓙鍏冪礌姘村钩灞呬腑 */
}
}
}
diff --git a/wechat_jiaxuan/pages/store/staff.wxss b/wechat_jiaxuan/pages/store/staff.wxss
index 8858e2b..3118704 100644
--- a/wechat_jiaxuan/pages/store/staff.wxss
+++ b/wechat_jiaxuan/pages/store/staff.wxss
@@ -101,7 +101,9 @@
margin-top: 8rpx;
font-weight: 600;
font-size: 40rpx;
- display: flex;
+ display: flex;
+ align-items: flex-end; /* 杩欎細浣垮瓙鍏冪礌搴曢儴瀵归綈 */
+ justify-content: center; /* 杩欎細浣垮瓙鍏冪礌姘村钩灞呬腑 */
}
.guide .title {
font-weight: 500;
diff --git a/wechat_jiaxuan/pages/store/store.less b/wechat_jiaxuan/pages/store/store.less
index 03a782a..57899f3 100644
--- a/wechat_jiaxuan/pages/store/store.less
+++ b/wechat_jiaxuan/pages/store/store.less
@@ -65,7 +65,7 @@
margin-bottom: 16rpx;
}
.address{
- width: 520rpx;
+ width: 440rpx;
display: flex;
align-items: center;
font-size: 26rpx;
diff --git a/wechat_jiaxuan/pages/store/store.wxss b/wechat_jiaxuan/pages/store/store.wxss
index 0d7fd2c..d154814 100644
--- a/wechat_jiaxuan/pages/store/store.wxss
+++ b/wechat_jiaxuan/pages/store/store.wxss
@@ -63,7 +63,7 @@
margin-bottom: 16rpx;
}
.main_content .shops .shop .header .left .address {
- width: 520rpx;
+ width: 440rpx;
display: flex;
align-items: center;
font-size: 26rpx;
diff --git a/wechat_jiaxuan/pages/userinfo/index.js b/wechat_jiaxuan/pages/userinfo/index.js
index 7aa68b1..b153030 100644
--- a/wechat_jiaxuan/pages/userinfo/index.js
+++ b/wechat_jiaxuan/pages/userinfo/index.js
@@ -2,7 +2,8 @@
uploadUrl,
editMember,
getMemberInfo,
- getArea
+ getArea,
+ getWxMiniPhone
} from '../../api/index'
Page({
@@ -33,7 +34,19 @@
val5: '',
}
},
- onShow() {
+ onLoad() {
+ wx.getUserInfo({
+ success: function(res) {
+ console.log('res', res);
+ var userInfo = res.userInfo
+ var nickName = userInfo.nickName
+ var avatarUrl = userInfo.avatarUrl
+ var gender = userInfo.gender //鎬у埆 0锛氭湭鐭ャ��1锛氱敺銆�2锛氬コ
+ var province = userInfo.province
+ var city = userInfo.city
+ var country = userInfo.country
+ }
+ })
this.initData()
},
onSubmit() {
@@ -72,6 +85,9 @@
title: '淇濆瓨鎴愬姛',
icon: 'none'
})
+ setTimeout(() => {
+ wx.navigateBack()
+ }, 500)
})
},
initData() {
@@ -154,6 +170,18 @@
})
}
},
+ getPhoneNumber (e) {
+ const data = { ...e.detail }
+ getWxMiniPhone({
+ encryptedData: data.encryptedData,
+ iv: data.iv,
+ sessionKey: wx.getStorageSync('sessionKey') || data.iv,
+ }).then(res => {
+ this.setData({
+ phone: res.data
+ })
+ })
+ },
getNickName(e) {
this.setData({ nikname: e.detail.value })
},
@@ -162,11 +190,13 @@
wx.chooseLocation({
type: 'wgs84',
success: (res) => {
+ console.log('res', res);
this.setData({
longitude: res.longitude,
latitude: res.latitude,
address: res.address,
})
+ console.log('address', this.data.address);
}
})
},
diff --git a/wechat_jiaxuan/pages/userinfo/index.less b/wechat_jiaxuan/pages/userinfo/index.less
index 6c13af8..ab0032c 100644
--- a/wechat_jiaxuan/pages/userinfo/index.less
+++ b/wechat_jiaxuan/pages/userinfo/index.less
@@ -40,7 +40,20 @@
font-size: 30rpx;
color: #777777;
}
+ .wechat_phone{
+ width: 100%;
+ flex: 1;
+ color: #111111;
+ border-bottom: 1rpx solid #e5e5e5;
+ display: flex;
+ justify-content: space-between;
+ .btn{
+ font-size: 30rpx;
+ color: #B08771;
+ }
+ }
.input{
+ width: 100%;
flex: 1;
color: #111111;
border-bottom: 1rpx solid #e5e5e5;
diff --git a/wechat_jiaxuan/pages/userinfo/index.wxml b/wechat_jiaxuan/pages/userinfo/index.wxml
index 37ebd4d..0d35875 100644
--- a/wechat_jiaxuan/pages/userinfo/index.wxml
+++ b/wechat_jiaxuan/pages/userinfo/index.wxml
@@ -5,7 +5,7 @@
<view class="line">
<view class="label">鏄电О</view>
<view class="val">
- <input bindchange="getNickName" value="{{ nickname }}" maxlength="{{ 18 }}" type="nickname"/>
+ <input bindchange="getNickName" value="{{ nickname }}" maxlength="{{ 10 }}" type="nickname"/>
</view>
</view>
<view class="line">
@@ -14,7 +14,10 @@
</view>
<view class="line">
<view class="label">鐢佃瘽</view>
- <van-field type="number" border="{{ false }}" class="input" model:value="{{ phone }}" maxlength="{{ 11 }}" clearable />
+ <view class="wechat_phone">
+ <van-field type="number" border="{{ false }}" model:value="{{ phone }}" maxlength="{{ 11 }}" clearable />
+ <button open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber" class="btn">寰俊鎺堟潈</button>
+ </view>
</view>
<view class="line">
<view class="label">鍩庡競</view>
@@ -45,7 +48,7 @@
</view>
<view class="line">
<view class="label">闈㈢Н</view>
- <van-field type="number" border="{{ false }}" class="input" model:value="{{ housearea }}" maxlength="{{ 30 }}" clearable />
+ <van-field custom-style="width: 100%" type="digit" border="{{ false }}" class="input" model:value="{{ housearea }}" maxlength="{{ 30 }}" clearable />
<text>m虏</text>
</view>
<view class="line">
@@ -69,23 +72,23 @@
<view class="label">鎴垮眿鎴峰瀷</view>
<view class="val">
<view class="item">
- <van-field data-str="val1" bind:blur="houseBlur" type="number" class="input" maxlength="{{ 3 }}" />
+ <van-field value="{{ houseType.val1 }}" data-str="val1" bind:blur="houseBlur" type="number" class="input" maxlength="{{ 3 }}" />
<view class="unit">瀹�</view>
</view>
<view class="item">
- <van-field data-str="val2" bind:blur="houseBlur" type="number" class="input" maxlength="{{ 3 }}" />
+ <van-field value="{{ houseType.val2 }}" data-str="val2" bind:blur="houseBlur" type="number" class="input" maxlength="{{ 3 }}" />
<view class="unit">鍘�</view>
</view>
<view class="item">
- <van-field data-str="val3" bind:blur="houseBlur" type="number" class="input" maxlength="{{ 3 }}" />
+ <van-field value="{{ houseType.val3 }}" data-str="val3" bind:blur="houseBlur" type="number" class="input" maxlength="{{ 3 }}" />
<view class="unit">鍘�</view>
</view>
<view class="item">
- <van-field data-str="val4" bind:blur="houseBlur" type="number" class="input" maxlength="{{ 3 }}" />
+ <van-field value="{{ houseType.val4 }}" data-str="val4" bind:blur="houseBlur" type="number" class="input" maxlength="{{ 3 }}" />
<view class="unit">鍗�</view>
</view>
<view class="item">
- <van-field data-str="val5" bind:blur="houseBlur" type="number" class="input" maxlength="{{ 3 }}" />
+ <van-field value="{{ houseType.val5 }}" data-str="val5" bind:blur="houseBlur" type="number" class="input" maxlength="{{ 3 }}" />
<view class="unit">闃�</view>
</view>
</view>
diff --git a/wechat_jiaxuan/pages/userinfo/index.wxss b/wechat_jiaxuan/pages/userinfo/index.wxss
index 9434ad9..51bb340 100644
--- a/wechat_jiaxuan/pages/userinfo/index.wxss
+++ b/wechat_jiaxuan/pages/userinfo/index.wxss
@@ -42,7 +42,20 @@
font-size: 30rpx;
color: #777777;
}
+.list .line .wechat_phone {
+ width: 100%;
+ flex: 1;
+ color: #111111;
+ border-bottom: 1rpx solid #e5e5e5;
+ display: flex;
+ justify-content: space-between;
+}
+.list .line .wechat_phone .btn {
+ font-size: 30rpx;
+ color: #B08771;
+}
.list .line .input {
+ width: 100%;
flex: 1;
color: #111111;
border-bottom: 1rpx solid #e5e5e5;
diff --git a/wechat_jiaxuan/project.private.config.json b/wechat_jiaxuan/project.private.config.json
index 5a7c8d4..0503390 100644
--- a/wechat_jiaxuan/project.private.config.json
+++ b/wechat_jiaxuan/project.private.config.json
@@ -60,8 +60,8 @@
},
{
"name": "",
- "pathName": "pages/consult/detail",
- "query": "id=1813577799402684418",
+ "pathName": "pages/userinfo/index",
+ "query": "",
"launchMode": "default",
"scene": null
}
diff --git a/wechat_jiaxuan/utils/config.js b/wechat_jiaxuan/utils/config.js
index 1448239..23fa1e2 100644
--- a/wechat_jiaxuan/utils/config.js
+++ b/wechat_jiaxuan/utils/config.js
@@ -1,8 +1,8 @@
-// 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 imageUrl = 'https://osswebcdn.zbom.com/jiaxuan/images/'
diff --git a/wechat_jiaxuan/utils/request.js b/wechat_jiaxuan/utils/request.js
index 7d2a0ea..d111b6c 100644
--- a/wechat_jiaxuan/utils/request.js
+++ b/wechat_jiaxuan/utils/request.js
@@ -1,10 +1,10 @@
import { baseUrl } from "./config"
-import { wxLoginCustomer } from '../api/index'
-
+let number = 0
export function request(options){
let loading = options.loading || '1' // 榛樿鍊�1鏄剧ず锛屽惁鍒欎笉鏄剧ず
if(loading == '1'){
wx.showLoading()
+ number ++
}
return new Promise(resolve => {
wx.request({
@@ -40,7 +40,10 @@
},
complete() {
if(loading == '1'){
- wx.hideLoading()
+ number --
+ if(number == 0){
+ wx.hideLoading()
+ }
}
}
})
diff --git a/wechat_staff/components/detailFooter/index.less b/wechat_staff/components/detailFooter/index.less
index a058cab..2f543cf 100644
--- a/wechat_staff/components/detailFooter/index.less
+++ b/wechat_staff/components/detailFooter/index.less
@@ -103,44 +103,43 @@
position: fixed;
border-radius: 8rpx;
top: 50%;
- left: 75rpx;
+ left: 95rpx;
transform: translate(0, -50%);
- width: 600rpx;
+ width: 560rpx;
background-color: rgba(0, 0, 0, .2);
z-index: 99999;
.img1{
image{
- width: 600rpx;
+ width: 560rpx;
border-radius: 8rpx ;
}
}
.content{
- width: 600rpx;
- height: 308rpx;
- padding: 26rpx 0 40rpx;
+ width: 560rpx;
+ padding: 24rpx 0 16rpx;
background: rgba(255,255,255,0.8);
border-radius: 16rpx;
margin-top: 24rpx;
text-align: center;
.title{
font-weight: 500;
- font-size: 30rpx;
- margin-bottom: 20rpx;
+ font-size: 28rpx;
+ margin-bottom: 12rpx;
}
.line{
- font-size: 26rpx;
+ font-size: 24rpx;
color: #333333;
- line-height: 36rpx;
+ line-height: 28rpx;
}
}
.btns{
- margin-top: 30rpx;
+ margin-top: 24rpx;
display: flex;
justify-content: space-between;
width: 100%;
.btn{
width: 160rpx;
- height: 88rpx;
+ height: 72rpx;
border-radius: 8rpx;
border: 2rpx solid #FFFFFF;
display: flex;
diff --git a/wechat_staff/components/detailFooter/index.wxss b/wechat_staff/components/detailFooter/index.wxss
index d156385..08d0458 100644
--- a/wechat_staff/components/detailFooter/index.wxss
+++ b/wechat_staff/components/detailFooter/index.wxss
@@ -99,20 +99,19 @@
position: fixed;
border-radius: 8rpx;
top: 50%;
- left: 75rpx;
+ left: 95rpx;
transform: translate(0, -50%);
- width: 600rpx;
+ width: 560rpx;
background-color: rgba(0, 0, 0, 0.2);
z-index: 99999;
}
.card_wrap .img1 image {
- width: 600rpx;
+ width: 560rpx;
border-radius: 8rpx ;
}
.card_wrap .content {
- width: 600rpx;
- height: 308rpx;
- padding: 26rpx 0 40rpx;
+ width: 560rpx;
+ padding: 24rpx 0 16rpx;
background: rgba(255, 255, 255, 0.8);
border-radius: 16rpx;
margin-top: 24rpx;
@@ -120,23 +119,23 @@
}
.card_wrap .content .title {
font-weight: 500;
- font-size: 30rpx;
- margin-bottom: 20rpx;
+ font-size: 28rpx;
+ margin-bottom: 12rpx;
}
.card_wrap .content .line {
- font-size: 26rpx;
+ font-size: 24rpx;
color: #333333;
- line-height: 36rpx;
+ line-height: 28rpx;
}
.card_wrap .btns {
- margin-top: 30rpx;
+ margin-top: 24rpx;
display: flex;
justify-content: space-between;
width: 100%;
}
.card_wrap .btns .btn {
width: 160rpx;
- height: 88rpx;
+ height: 72rpx;
border-radius: 8rpx;
border: 2rpx solid #FFFFFF;
display: flex;
diff --git a/wechat_staff/components/disCase/index.js b/wechat_staff/components/disCase/index.js
index 441e32a..04a3324 100644
--- a/wechat_staff/components/disCase/index.js
+++ b/wechat_staff/components/disCase/index.js
@@ -12,7 +12,7 @@
selParam: '',
tagCodes: [],
-
+ isLoading:false,
cateList: [],
dataList: [],
total: 0,
@@ -42,6 +42,11 @@
})
},
getList() {
+ if(this.data.isLoading){
+ return
+ }
+
+ this.setData({isLoading:true})
const { sortType, query, tagCodes, pageNum, pageSize,catalogCode } = this.data
getZhongTaiWholecasePage({
catalogCode,pageNum,pageSize,tagCodes, sortType,query
@@ -52,6 +57,8 @@
dataList: [...this.data.dataList, ...res.data.records],
})
}
+ }).finally(()=>{
+ this.setData({isLoading:false})
})
},
scrolltolower() {
@@ -90,40 +97,33 @@
})
},
tagClick(e) {
+ if(this.data.isLoading){
+ return
+ }
const code = e.currentTarget.dataset.code
- const paramIndex = e.currentTarget.dataset.index
+ const paramIndex = e.currentTarget.dataset.index
const { cateList, tagCodes, activeParam, activeIndex } = this.data
- const index = tagCodes.indexOf(code)
-
- if(index === -1){
- // 鍚宲aram閲宑ode閲嶅
- if(activeParam && activeParam.length > 0){
- activeParam.forEach(item => {
- const indexTemp = tagCodes.indexOf(item.labelValueCode)
- if(indexTemp > -1){
- tagCodes.splice(indexTemp, 1)
- }
- })
- }
- tagCodes.push(code)
- cateList[activeIndex].paramIndex = paramIndex
- cateList[activeIndex].paramName = activeParam[paramIndex].labelValueName
- }else{
- tagCodes.splice(index, 1)
- cateList[activeIndex].paramIndex = -1
- cateList[activeIndex].paramName = ''
+ const index = tagCodes.indexOf(code)
+ if( cateList[activeIndex].tempParamIndex==null || cateList[activeIndex].tempParamIndex != paramIndex){
+ cateList[activeIndex].tempParamIndex = paramIndex
+ cateList[activeIndex].tempParamName = activeParam[paramIndex].labelValueName
+ cateList[activeIndex].tempParamCode = code
+ } else {
+ cateList[activeIndex].tempParamIndex = -1
+ cateList[activeIndex].tempParamName = null
+ cateList[activeIndex].tempParamCode = null
}
- this.setData({ tagCodes, cateList })
+ this.setData({cateList })
console.log('tagCodes', tagCodes);
},
cancelParam() {
const { cateList } = this.data
- console.log('cateList', cateList);
cateList.forEach(item => {
- item.paramIndex = -1
- item.paramName = item.paramName || ''
+ item.tempParamIndex =item.paramIndex
+ item.tempParamName =item.paramName
+ item.tempParamCode =item.paramCode
})
- this.setData({ tagCodes: [],activeParam: [],cateList,activeIndex: -1 })
+ this.setData({ activeParam: [],cateList , activeIndex: -1 })
},
bindblur() {
this.setData({ pageNum: 1,dataList: [],total: 0})
@@ -131,7 +131,17 @@
},
subParam() {
this.setData({ activeParam: [] })
- this.setData({ pageNum: 1,activeIndex: -1,dataList: [],total: 0})
+ const { cateList } = this.data
+ var codes = []
+ cateList.forEach(item => {
+ item.paramIndex =item.tempParamIndex
+ item.paramName =item.tempParamName
+ item.paramCode =item.tempParamCode
+ if(item.paramIndex >-1 && item.paramCode){
+ codes.push(item.paramCode)
+ }
+ })
+ this.setData({tagCodes:codes, pageNum: 1, activeIndex: -1, dataList: [], total: 0 })
this.getList()
},
changeShowParams(e){
diff --git a/wechat_staff/components/disCase/index.wxml b/wechat_staff/components/disCase/index.wxml
index 6877ba0..5bbf5ff 100644
--- a/wechat_staff/components/disCase/index.wxml
+++ b/wechat_staff/components/disCase/index.wxml
@@ -11,7 +11,7 @@
<scroll-view class="query_wrap_scroll" scroll-x>
<view class="query_wrap">
<view data-index="{{ index }}" wx:for="{{ cateList }}" class="item" bindtap="changeShowParams">
- <view class="name">{{ item.paramName || item.labelName }}</view>
+ <view class="name">{{ item.tempParamName || item.labelName }}</view>
<van-icon name="{{ activeIndex === index ? 'arrow-up' : 'arrow-down' }}" />
</view>
</view>
@@ -19,7 +19,7 @@
<!-- param -->
<view wx:if="{{ activeParam && activeParam.length > 0 }}" class="query_param">
<view class="list">
- <view data-index="{{index}}" data-code="{{ item.labelValueCode }}" bindtap="tagClick" wx:for="{{ activeParam }}" class="item {{ cateList[activeIndex].paramIndex === index ? 'active' : '' }}">{{ item.labelValueName }}</view>
+ <view data-index="{{index}}" data-code="{{ item.labelValueCode }}" bindtap="tagClick" wx:for="{{ activeParam }}" class="item {{ cateList[activeIndex].tempParamIndex === index ? 'active' : '' }}">{{ item.labelValueName }}</view>
</view>
<view class="btns">
<view class="btn" bindtap="cancelParam">鍙栨秷</view>
diff --git a/wechat_staff/components/disProduct/index.js b/wechat_staff/components/disProduct/index.js
index 2e23c6d..d92ef71 100644
--- a/wechat_staff/components/disProduct/index.js
+++ b/wechat_staff/components/disProduct/index.js
@@ -120,9 +120,8 @@
tagClick(e) {
const code = e.currentTarget.dataset.code
const paramIndex = e.currentTarget.dataset.index
- const { secondCateList, tagCodes, activeParam, activeIndex } = this.data
- const index = tagCodes.indexOf(code)
- if(index === -1){
+ const { secondCateList, tagCodes, activeParam, activeIndex } = this.data
+ if( secondCateList[activeIndex].tempParamIndex==null || secondCateList[activeIndex].tempParamIndex != paramIndex){
// 鍚宲aram閲宑ode閲嶅
// if (activeParam && activeParam.length > 0) {
// activeParam.forEach(item => {
diff --git a/wechat_staff/components/disProduct/index.less b/wechat_staff/components/disProduct/index.less
index 3bcef18..053bfce 100644
--- a/wechat_staff/components/disProduct/index.less
+++ b/wechat_staff/components/disProduct/index.less
@@ -177,6 +177,9 @@
width: 242rpx;
flex-shrink: 0;
margin-bottom: 32rpx;
+ &:nth-last-child(1){
+ margin-right: auto;
+ }
.img_wrap {
width: 242rpx;
border-radius: 8rpx;
diff --git a/wechat_staff/components/disProduct/index.wxml b/wechat_staff/components/disProduct/index.wxml
index 8c1084f..0d2634d 100644
--- a/wechat_staff/components/disProduct/index.wxml
+++ b/wechat_staff/components/disProduct/index.wxml
@@ -21,7 +21,7 @@
</view>
<view wx:if="{{ activeParam.length > 0 }}" class="query_form">
<view class="list">
- <view data-index="{{index}}" data-code="{{ item.labelValueCode }}" bindtap="tagClick" wx:for="{{ activeParam }}" class="item {{ secondCateList[activeIndex].tempParamIndex === index ? 'active' : '' }}">{{ item.labelValueName }}</view>
+ <view data-index="{{index}}" data-code="{{ item.labelValueCode }}" bindtap="tagClick" wx:for="{{ activeParam }}" class="item {{ secondCateList[activeIndex].tempParamIndex === index ? 'active' : '' }}">{{ item.labelValueName }}</view>
</view>
<view class="btns">
<view class="btn" bindtap="cancelParam">鍙栨秷</view>
diff --git a/wechat_staff/components/disRealpic/index.js b/wechat_staff/components/disRealpic/index.js
index 000c3d7..aa2ca72 100644
--- a/wechat_staff/components/disRealpic/index.js
+++ b/wechat_staff/components/disRealpic/index.js
@@ -11,7 +11,7 @@
activeParam: [],
selParam: '',
tagCodes: [],
-
+ isLoading:false,
cateList: [],
dataList: [],
@@ -41,6 +41,11 @@
})
},
getList() {
+ if(this.data.isLoading){
+ return
+ }
+
+ this.setData({isLoading:true})
const { sortType, query, tagCodes, pageNum, pageSize,catalogCode } = this.data
getZhongTaiRealcasePage({
catalogCode,tagCodes,pageNum,pageSize, sortType,query
@@ -49,6 +54,8 @@
dataList: [...this.data.dataList, ...res.data.records],
total: res.data.total,
})
+ }).finally(()=>{
+ this.setData({isLoading:false})
})
},
scrolltolower() {
@@ -66,9 +73,10 @@
},
videoClick(e) {
const { videourl } = e.currentTarget.dataset
- wx.previewMedia({
- sources: [{ url: videourl, type: 'video' }]
- })
+ let videoPlay = this.selectComponent('.videoPlay');
+ if(videoPlay){
+ videoPlay.startPlayVideo(videourl,this );
+ }
},
priviewFull(e){
const item = e.currentTarget.dataset.item
@@ -121,44 +129,50 @@
}
},
tagClick(e) {
+ if(this.data.isLoading){
+ return
+ }
const code = e.currentTarget.dataset.code
const paramIndex = e.currentTarget.dataset.index
- const { cateList, tagCodes, activeParam, activeIndex } = this.data
- const index = tagCodes.indexOf(code)
-
- if(index === -1){
- if(activeParam && activeParam.length > 0){
- activeParam.forEach(item => {
- const indexTemp = tagCodes.indexOf(item.labelValueCode)
- if(indexTemp > -1){
- tagCodes.splice(indexTemp, 1)
- }
- })
- }
- tagCodes.push(code)
- cateList[activeIndex].paramIndex = paramIndex
- cateList[activeIndex].paramName = activeParam[paramIndex].labelValueName
+ const { cateList, tagCodes, activeParam, activeIndex } = this.data
+ if( cateList[activeIndex].tempParamIndex==null || cateList[activeIndex].tempParamIndex != paramIndex){
+ cateList[activeIndex].tempParamIndex = paramIndex
+ cateList[activeIndex].tempParamName = activeParam[paramIndex].labelValueName
+ cateList[activeIndex].tempParamCode = code
+ console.log(code)
}else{
- tagCodes.splice(index, 1)
- cateList[activeIndex].paramIndex = -1
- cateList[activeIndex].paramName = ''
+ cateList[activeIndex].tempParamIndex = -1
+ cateList[activeIndex].tempParamName = null
+ cateList[activeIndex].tempParamCode = null
+ console.log(1)
}
- this.setData({ tagCodes, cateList })
+ this.setData({ cateList })
},
cancelParam() {
const { cateList } = this.data
cateList.forEach(item => {
- item.paramIndex = -1
- item.paramName = item.paramName || ''
+ item.tempParamIndex = item.paramIndex
+ item.tempParamName = item.paramName
+ item.tempParamCode = item.paramCode
})
- this.setData({ tagCodes: [],activeParam: [],cateList,activeIndex: -1 })
+ this.setData({ activeParam: [],cateList,activeIndex: -1 })
},
bindblur() {
this.setData({ pageNum: 1,dataList: [],total: 0})
this.getList()
},
subParam() {
- this.setData({ activeParam: [] })
+ const { cateList } = this.data
+ var codes =[]
+ cateList.forEach(item => {
+ item.paramIndex = item.tempParamIndex
+ item.paramName = item.tempParamName
+ item.paramCode = item.tempParamCode
+ if(item.tempParamIndex >-1 && item.tempParamCode){
+ codes.push(item.tempParamCode)
+ }
+ })
+ this.setData({ activeParam: [],tagCodes:codes })
this.setData({ pageNum: 1,activeIndex: -1,dataList: [],total: 0})
this.getList()
},
diff --git a/wechat_staff/components/disRealpic/index.json b/wechat_staff/components/disRealpic/index.json
index e8cfaaf..b2baa38 100644
--- a/wechat_staff/components/disRealpic/index.json
+++ b/wechat_staff/components/disRealpic/index.json
@@ -1,4 +1,6 @@
{
"component": true,
- "usingComponents": {}
+ "usingComponents": {
+ "videoPlay": "/components/videoPlay/index"
+ }
}
\ No newline at end of file
diff --git a/wechat_staff/components/disRealpic/index.less b/wechat_staff/components/disRealpic/index.less
index e1320db..f50c0d6 100644
--- a/wechat_staff/components/disRealpic/index.less
+++ b/wechat_staff/components/disRealpic/index.less
@@ -149,7 +149,9 @@
.item {
width: 324rpx;
margin-bottom: 32rpx;
-
+ &:nth-last-child(1){
+ margin-right: auto;
+ }
.img_wrap {
width: 100%;
height: 182rpx;
@@ -168,14 +170,14 @@
.full {
position: absolute;
- top: 32rpx;
- right: 32rpx;
+ top: 16rpx;
+ left: 16rpx;
font-size: 20rpx;
color: rgba(255, 255, 255, 0.8);
- width: 112rpx;
- height: 42rpx;
+ width:52rpx;
+ height: 46rpx;
background: rgba(0, 0, 0, 0.54);
- border-radius: 30rpx;
+ border-radius: 8rpx;
display: flex;
align-items: center;
justify-content: center;
diff --git a/wechat_staff/components/disRealpic/index.wxml b/wechat_staff/components/disRealpic/index.wxml
index f8a9367..1a43096 100644
--- a/wechat_staff/components/disRealpic/index.wxml
+++ b/wechat_staff/components/disRealpic/index.wxml
@@ -12,7 +12,7 @@
<scroll-view class="query_wrap_scroll" scroll-x>
<view class="query_wrap">
<view data-index="{{ index }}" wx:for="{{ cateList }}" class="item" bindtap="changeShowParams">
- <view class="name">{{ item.paramName || item.labelName }}</view>
+ <view class="name">{{ item.tempParamName || item.labelName }}</view>
<van-icon name="{{ activeIndex === index ? 'arrow-up' : 'arrow-down' }}" />
</view>
</view>
@@ -20,7 +20,7 @@
<!-- param -->
<view wx:if="{{ activeParam && activeParam.length > 0 }}" class="query_param">
<view class="list">
- <view data-index="{{index}}" data-code="{{ item.labelValueCode }}" bindtap="tagClick" wx:for="{{ activeParam }}" class="item {{ cateList[activeIndex].paramIndex === index ? 'active' : '' }}">{{ item.labelValueName }}</view>
+ <view data-index="{{index}}" data-code="{{ item.labelValueCode }}" bindtap="tagClick" wx:for="{{ activeParam }}" class="item {{ cateList[activeIndex].tempParamIndex === index ? 'active' : '' }}">{{ item.labelValueName }}</view>
</view>
<view class="btns">
<view class="btn" bindtap="cancelParam">鍙栨秷</view>
@@ -40,9 +40,8 @@
<view wx:for="{{ dataList }}" data-index="index" data-item="{{item}}" class="item {{(index%2 == 0 && index == dataList.length-1)?'lastitem':''}}" bindtap="handleDetail">
<view class="img_wrap">
<image src="{{ item.coverImage }}" class="img"></image>
- <view wx:if="{{ item.openType == 'link' }}" data-item="{{item}}" bindtap="priviewFull" class="full">
- <image class="icon" src="../../static/icon/ic_720.png" mode="widthFix"></image>
- <text>鍏ㄦ櫙</text>
+ <view wx:if="{{ item.openType == 'link' }}" data-item="{{item}}" bindtap="priviewFull" class="full">
+ <text>VR</text>
</view>
<image wx:if="{{ item.openType == 'video' }}" bindtap="videoClick" data-videourl="{{ item.openContent }}" class="play" src="../../static/icon/ic_play.png" mode="widthFix"></image>
<image wx:if="{{ false }}" class="new" src="../../static/icon/chanpin_ic_new@2x.png" mode="widthFix"></image>
@@ -65,5 +64,5 @@
</view>
</view>
-
+ <videoPlay class="videoPlay"/>
</view>
\ No newline at end of file
diff --git a/wechat_staff/components/disRealpic/index.wxss b/wechat_staff/components/disRealpic/index.wxss
index ce00af9..81aea67 100644
--- a/wechat_staff/components/disRealpic/index.wxss
+++ b/wechat_staff/components/disRealpic/index.wxss
@@ -153,14 +153,14 @@
}
.main_content .goods_list .item .img_wrap .full {
position: absolute;
- top: 32rpx;
- right: 32rpx;
+ top: 16rpx;
+ left: 16rpx;
font-size: 20rpx;
color: rgba(255, 255, 255, 0.8);
- width: 112rpx;
- height: 42rpx;
+ width:52rpx;
+ height: 46rpx;
background: rgba(0, 0, 0, 0.54);
- border-radius: 30rpx;
+ border-radius: 8rpx;
display: flex;
align-items: center;
justify-content: center;
diff --git a/wechat_staff/components/videoPlay/index.less b/wechat_staff/components/videoPlay/index.less
deleted file mode 100644
index 8c845bd..0000000
--- a/wechat_staff/components/videoPlay/index.less
+++ /dev/null
@@ -1,19 +0,0 @@
-
-.video_content{
- position: fixed;
- top: 10rpx;
- left: 0;
- width: 100%;
- height: 100%;
- background-color: rgba(0, 0, 0, 0.2);
- z-index: 9999;
- .video{
- position: fixed;
- border-radius: 8rpx;
- top: 50%;
- left: 75rpx;
- transform: translate(0, -50%);
- width: 600rpx;
- z-index: 10000;
- }
-}
\ No newline at end of file
diff --git a/wechat_staff/components/videoPlay/index.wxss b/wechat_staff/components/videoPlay/index.wxss
index 205694c..0330f3e 100644
--- a/wechat_staff/components/videoPlay/index.wxss
+++ b/wechat_staff/components/videoPlay/index.wxss
@@ -5,15 +5,17 @@
left: 0;
width: 100%;
height: 100%;
- background-color: rgba(0, 0, 0, 0.2);
+ background-color: rgba(0, 0, 0, 0.5);
z-index: 9999;
}
.video_content .video{
position: fixed;
border-radius: 8rpx;
- top: 50%;
- left: 75rpx;
- transform: translate(0, -50%);
- width: 600rpx;
+ top: 40%;
+ left: 0;
+ width: 750rpx;
z-index: 10000;
+}
+video{
+ width: 750rpx;
}
\ No newline at end of file
diff --git a/wechat_staff/pages/detailDis/product.js b/wechat_staff/pages/detailDis/product.js
index 302616e..1d3a8c5 100644
--- a/wechat_staff/pages/detailDis/product.js
+++ b/wechat_staff/pages/detailDis/product.js
@@ -16,6 +16,7 @@
info: {},
member: {},
showShare: false,
+ isFold: false,
enjoyList: []
},
onShow(){
@@ -167,6 +168,9 @@
// this.setData({showShare: false})
// })
},
+ changeFold() {
+ this.setData({ isFold: !this.data.isFold })
+ },
// onShareAppMessage: function () {
// // let { productDetail, userInfo } = this.data
// return {
diff --git a/wechat_staff/pages/detailDis/product.less b/wechat_staff/pages/detailDis/product.less
index e9accae..6051637 100644
--- a/wechat_staff/pages/detailDis/product.less
+++ b/wechat_staff/pages/detailDis/product.less
@@ -81,6 +81,7 @@
margin-bottom: 16rpx;
}
.desc {
+ line-height: 40rpx;
font-size: 26rpx;
color: #555555;
margin-bottom: 26rpx;
@@ -193,7 +194,16 @@
.detail {
padding: 52rpx 40rpx 40rpx;
background-color: #fff;
-
+ .fold{
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 84rpx;
+ margin-top: 20rpx;
+ .icon{
+ margin-left: 12rpx;
+ }
+ }
.title {
font-weight: 600;
font-size: 36rpx;
@@ -202,9 +212,10 @@
.line {
display: flex;
- margin-bottom: 20rpx;
+ padding: 24rpx 0 26rpx;
+ border-bottom: 1rpx dashed #E5E5E5;
.label {
- width: auto;
+ width: 120rpx;
font-size: 24rpx;
color: #666666;
flex-shrink: 0;
diff --git a/wechat_staff/pages/detailDis/product.wxml b/wechat_staff/pages/detailDis/product.wxml
index 23a49bb..edf23cc 100644
--- a/wechat_staff/pages/detailDis/product.wxml
+++ b/wechat_staff/pages/detailDis/product.wxml
@@ -10,7 +10,7 @@
</swiper-item>
</block>
</swiper>
- <view class="indicator">{{current}}/{{info.bannerImgList.length}}</view>
+ <view class="indicator">{{current + 1}}/{{info.bannerImgList.length}}</view>
</view>
<view class="main_content">
<view class="title">{{ info.title }}</view>
@@ -28,11 +28,17 @@
</view>
</view>
</view>
- <view class="detail">
- <view class="title" bind:tap="goTestPage">浜у搧璇︽儏</view>
- <view class="line" wx:for="{{ info.productParamList }}">
- <view class="label">{{ item.paramName }}锛�</view>
- <view class="val">{{ item.paramValue }}</view>
+ <view class="detail">
+ <view class="title">浜у搧璇︽儏</view>
+ <block wx:for="{{ info.productParamList }}">
+ <view wx:if="{{ index < 5 || isFold }}" class="line" >
+ <view class="label">{{ item.paramName }}锛�</view>
+ <view class="val">{{ item.paramValue }}</view>
+ </view>
+ </block>
+ <view wx:if="{{ info.productParamList.length > 5 }}" class="fold" bindtap="changeFold">
+ <text>{{ isFold ? '鏀惰捣' : '灞曞紑' }}</text>
+ <van-icon class="icon" name="{{ isFold ? 'arrow-up' : 'arrow-down' }}" />
</view>
</view>
<!-- 瀵屾枃鏈� -->
diff --git a/wechat_staff/pages/homeId/index.wxml b/wechat_staff/pages/homeId/index.wxml
index 4f1849e..9199dc3 100644
--- a/wechat_staff/pages/homeId/index.wxml
+++ b/wechat_staff/pages/homeId/index.wxml
@@ -1,8 +1,8 @@
<view class="container">
<!-- 鍒嗙被 -->
-<view class="home_tabs">
- <scroll-view scroll-x="true" style="weight: 710rpx;margin-bottom: 30rpx;">
+<view class="home_tabs" style="width: 100%;">
+ <scroll-view scroll-x="true" style="width: 710rpx;margin-bottom: 30rpx;">
<view class="scroll_cate">
<view bindtap="cateClick" data-code="{{item.labelValueCode}}" wx:for="{{ tagList }}" class="item {{ tagCodes == item.labelValueCode ? 'active': '' }}">{{ item.labelValueName }}</view>
</view>
diff --git a/wechat_staff/pages/index/index.less b/wechat_staff/pages/index/index.less
index 62b48cd..30acee9 100644
--- a/wechat_staff/pages/index/index.less
+++ b/wechat_staff/pages/index/index.less
@@ -1,3 +1,10 @@
+.search_fix{
+ position: fixed;
+ z-index: 10000;
+ width: 100%;
+ height: 206rpx;
+ background-color: white;
+}
.search_wrap {
display: flex;
align-items: center;
@@ -7,22 +14,19 @@
border: 2rpx solid #B08771;
padding: 0 30rpx;
margin-left: 40rpx;
-
.icon {
width: 28rpx;
margin-right: 18rpx;
}
-}
-
+}
.everyday {
width: 670rpx;
height: 466rpx;
- margin: 40rpx;
+ margin: 206rpx 40rpx;
background: linear-gradient(180deg, #F2E7E1 0%, #FEFEFD 30%, #FFFFFF 100%), #FFFFFF;
box-shadow: 0rpx 4rpx 20rpx 0rpx rgba(176, 135, 113, 0.2);
border-radius: 8rpx;
padding: 30rpx;
-
.header {
display: flex;
justify-content: space-between;
diff --git a/wechat_staff/pages/index/index.wxss b/wechat_staff/pages/index/index.wxss
index 746ee1f..d96c1e8 100644
--- a/wechat_staff/pages/index/index.wxss
+++ b/wechat_staff/pages/index/index.wxss
@@ -1,3 +1,10 @@
+.search_fix{
+ position: fixed;
+ z-index: 10000;
+ width: 100%;
+ height: 206rpx;
+ background-color: white;
+}
.search_wrap {
display: flex;
align-items: center;
@@ -15,7 +22,7 @@
.everyday {
width: 670rpx;
height: 466rpx;
- margin: 40rpx;
+ margin: 206rpx 40rpx;
background: linear-gradient(180deg, #F2E7E1 0%, #FEFEFD 30%, #FFFFFF 100%), #FFFFFF;
box-shadow: 0rpx 4rpx 20rpx 0rpx rgba(176, 135, 113, 0.2);
border-radius: 8rpx;
@@ -81,7 +88,7 @@
.func_lsit {
display: flex;
justify-content: space-between;
- padding: 20rpx 60rpx;
+ padding: 60rpx;
}
.func_lsit .item {
width: 120rpx;
@@ -230,20 +237,4 @@
}
.home_ar {
width: 44rpx;
-}
-.wx-swiper-dots.wx-swiper-dots-horizontal {
- position: absolute;
- right: 0;
- bottom: 0rpx;
-}
-/* 鎸囩ず鐐圭殑鏍峰紡 */
-.wx-swiper-dots .wx-swiper-dot {
- width: 60rpx;
- height: 4rpx;
- background: #f4f4f4;
- margin-left: -15rpx;
- border-radius: 5rpx;
-}
-.wx-swiper-dot.wx-swiper-dot-active {
- background: #666666;
}
diff --git a/wechat_staff/pages/kefu/fond.js b/wechat_staff/pages/kefu/fond.js
index b65bae5..c8f7322 100644
--- a/wechat_staff/pages/kefu/fond.js
+++ b/wechat_staff/pages/kefu/fond.js
@@ -8,7 +8,9 @@
data: {
bottomLift: 0,
checkAll: false,
- enjoyList: []
+ enjoyList: [],
+ leftIcon: '<<',
+ rightIcon: '>>',
},
/**
diff --git a/wechat_staff/pages/kefu/fond.less b/wechat_staff/pages/kefu/fond.less
index 66841f3..45dc26f 100644
--- a/wechat_staff/pages/kefu/fond.less
+++ b/wechat_staff/pages/kefu/fond.less
@@ -154,44 +154,43 @@
position: fixed;
border-radius: 8rpx;
top: 50%;
- left: 75rpx;
+ left: 95rpx;
transform: translate(0, -50%);
- width: 600rpx;
+ width: 560rpx;
background-color: rgba(0, 0, 0, .2);
z-index: 99999;
.img1{
image{
- width: 600rpx;
+ width: 560rpx;
border-radius: 8rpx ;
}
}
.content{
- width: 600rpx;
- height: 308rpx;
- padding: 26rpx 0 40rpx;
+ width: 560rpx;
+ padding: 24rpx 0 16rpx;
background: rgba(255,255,255,0.8);
border-radius: 16rpx;
margin-top: 24rpx;
text-align: center;
.title{
font-weight: 500;
- font-size: 30rpx;
- margin-bottom: 20rpx;
+ font-size: 28rpx;
+ margin-bottom: 12rpx;
}
.line{
- font-size: 26rpx;
+ font-size: 24rpx;
color: #333333;
- line-height: 36rpx;
+ line-height: 28rpx;
}
}
.btns{
- margin-top: 30rpx;
+ margin-top: 24rpx;
display: flex;
justify-content: space-between;
width: 100%;
.btn{
width: 160rpx;
- height: 88rpx;
+ height: 72rpx;
border-radius: 8rpx;
border: 2rpx solid #FFFFFF;
display: flex;
diff --git a/wechat_staff/pages/kefu/fond.wxss b/wechat_staff/pages/kefu/fond.wxss
index 8e14f9c..3409a37 100644
--- a/wechat_staff/pages/kefu/fond.wxss
+++ b/wechat_staff/pages/kefu/fond.wxss
@@ -41,10 +41,8 @@
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
- -webkit-line-clamp: 2;
- white-space: break-spaces;
+ -webkit-line-clamp: 2;
-webkit-box-orient: vertical;
- word-break: break-word;
}
.date_item .line .content .time {
font-size: 24rpx;
@@ -155,20 +153,19 @@
position: fixed;
border-radius: 8rpx;
top: 50%;
- left: 75rpx;
+ left: 95rpx;
transform: translate(0, -50%);
- width: 600rpx;
+ width: 560rpx;
background-color: rgba(0, 0, 0, 0.2);
z-index: 99999;
}
.card_wrap .img1 image {
- width: 600rpx;
+ width: 560rpx;
border-radius: 8rpx ;
}
.card_wrap .content {
- width: 600rpx;
- height: 308rpx;
- padding: 26rpx 0 40rpx;
+ width: 560rpx;
+ padding: 24rpx 0 16rpx;
background: rgba(255, 255, 255, 0.8);
border-radius: 16rpx;
margin-top: 24rpx;
@@ -176,23 +173,23 @@
}
.card_wrap .content .title {
font-weight: 500;
- font-size: 30rpx;
- margin-bottom: 20rpx;
+ font-size: 28rpx;
+ margin-bottom: 12rpx;
}
.card_wrap .content .line {
- font-size: 26rpx;
+ font-size: 24rpx;
color: #333333;
- line-height: 36rpx;
+ line-height: 28rpx;
}
.card_wrap .btns {
- margin-top: 30rpx;
+ margin-top: 24rpx;
display: flex;
justify-content: space-between;
width: 100%;
}
.card_wrap .btns .btn {
width: 160rpx;
- height: 88rpx;
+ height: 72rpx;
border-radius: 8rpx;
border: 2rpx solid #FFFFFF;
display: flex;
diff --git a/wechat_staff/pages/promotion/index.less b/wechat_staff/pages/promotion/index.less
index eb092e4..f2470b9 100644
--- a/wechat_staff/pages/promotion/index.less
+++ b/wechat_staff/pages/promotion/index.less
@@ -15,7 +15,7 @@
background: #F7F7F7;
border-radius: 8rpx;
padding: 34rpx 40rpx 40rpx;
-
+ margin-bottom: 40rpx;
.time {
font-weight: 500;
font-size: 30rpx;
diff --git a/wechat_staff/pages/promotion/index.wxss b/wechat_staff/pages/promotion/index.wxss
index 43ca9b7..40ab03e 100644
--- a/wechat_staff/pages/promotion/index.wxss
+++ b/wechat_staff/pages/promotion/index.wxss
@@ -13,6 +13,7 @@
background: #F7F7F7;
border-radius: 8rpx;
padding: 34rpx 40rpx 40rpx;
+ margin-bottom: 40rpx;
}
.content .time {
font-weight: 500;
diff --git a/wechat_staff/pages/sets/protocol.wxml b/wechat_staff/pages/sets/protocol.wxml
index e816cce..e36adf3 100644
--- a/wechat_staff/pages/sets/protocol.wxml
+++ b/wechat_staff/pages/sets/protocol.wxml
@@ -1,2 +1,4 @@
<!--pages/sets/protocol.wxml-->
+<view style="width: 100%;height: auto;padding: 0px 40rpx;">
<mp-html content="{{content}}"> </mp-html>
+</view>
diff --git a/wechat_staff/pages/store/staff.less b/wechat_staff/pages/store/staff.less
index 0888924..4922b43 100644
--- a/wechat_staff/pages/store/staff.less
+++ b/wechat_staff/pages/store/staff.less
@@ -111,6 +111,9 @@
font-weight: 600;
font-size: 40rpx;
display: flex;
+ align-items: flex-end; /* 杩欎細浣垮瓙鍏冪礌搴曢儴瀵归綈 */
+ justify-content: center; /* 杩欎細浣垮瓙鍏冪礌姘村钩灞呬腑 */
+
}
}
}
@@ -204,25 +207,43 @@
position: fixed;
border-radius: 8rpx;
top: 50%;
- left: 75rpx;
+ left: 95rpx;
transform: translate(0, -50%);
- width: 600rpx;
+ width: 560rpx;
background-color: rgba(0, 0, 0, .2);
- z-index: 999;
+ z-index: 99999;
.img1{
image{
- width: 600rpx;
+ width: 560rpx;
border-radius: 8rpx ;
}
}
+ .content{
+ width: 560rpx;
+ padding: 24rpx 0 16rpx;
+ background: rgba(255,255,255,0.8);
+ border-radius: 16rpx;
+ margin-top: 24rpx;
+ text-align: center;
+ .title{
+ font-weight: 500;
+ font-size: 28rpx;
+ margin-bottom: 12rpx;
+ }
+ .line{
+ font-size: 24rpx;
+ color: #333333;
+ line-height: 28rpx;
+ }
+ }
.btns{
- margin-top: 30rpx;
+ margin-top: 24rpx;
display: flex;
justify-content: space-between;
width: 100%;
.btn{
- width: 290rpx;
- height: 88rpx;
+ width: 160rpx;
+ height: 72rpx;
border-radius: 8rpx;
border: 2rpx solid #FFFFFF;
display: flex;
@@ -231,8 +252,10 @@
color: #fff;
}
.save{
+ width: 420rpx;
+ margin-left: 20rpx;
border: none;
background: linear-gradient( 180deg, #E0B49C 0%, #B68B74 100%);
}
}
-}
+}
\ No newline at end of file
diff --git a/wechat_staff/pages/store/staff.wxml b/wechat_staff/pages/store/staff.wxml
index 13f881d..4fb840c 100644
--- a/wechat_staff/pages/store/staff.wxml
+++ b/wechat_staff/pages/store/staff.wxml
@@ -25,7 +25,8 @@
<view class="card">
<image src="../../static/images/mingpian_bg_kehu.png" class="bg"></image>
<view>鏈嶅姟瀹㈡埛</view>
- <view class="num" wx:if="{{ userInfo.costomerNum || userInfo.costomerNum == 0 }}">{{ userInfo.costomerNum || '--' }}+</view>
+ <view class="num" wx:if="{{ userInfo.costomerNum || userInfo.costomerNum == 0 }}">{{ userInfo.costomerNum || '--' }}+
+ </view>
<view wx:else class="num">--</view>
</view>
</view>
diff --git a/wechat_staff/pages/store/staff.wxss b/wechat_staff/pages/store/staff.wxss
index dffb74d..157d955 100644
--- a/wechat_staff/pages/store/staff.wxss
+++ b/wechat_staff/pages/store/staff.wxss
@@ -105,7 +105,6 @@
font-size: 40rpx;
display: flex;
}
-
.guide .title {
font-weight: 500;
font-size: 32rpx;
@@ -187,31 +186,51 @@
font-size: 26rpx;
color: #999999;
text-align: center;
+ align-items: flex-end; /* 杩欎細浣垮瓙鍏冪礌搴曢儴瀵归綈 */
+ justify-content: center; /* 杩欎細浣垮瓙鍏冪礌姘村钩灞呬腑 */
+
}
-
.card_wrap {
position: fixed;
border-radius: 8rpx;
top: 50%;
- left: 75rpx;
+ left: 95rpx;
transform: translate(0, -50%);
- width: 600rpx;
+ width: 560rpx;
background-color: rgba(0, 0, 0, 0.2);
- z-index: 999;
+ z-index: 99999;
}
.card_wrap .img1 image {
- width: 600rpx;
+ width: 560rpx;
border-radius: 8rpx ;
}
+.card_wrap .content {
+ width: 560rpx;
+ padding: 24rpx 0 16rpx;
+ background: rgba(255, 255, 255, 0.8);
+ border-radius: 16rpx;
+ margin-top: 24rpx;
+ text-align: center;
+}
+.card_wrap .content .title {
+ font-weight: 500;
+ font-size: 28rpx;
+ margin-bottom: 12rpx;
+}
+.card_wrap .content .line {
+ font-size: 24rpx;
+ color: #333333;
+ line-height: 28rpx;
+}
.card_wrap .btns {
- margin-top: 30rpx;
+ margin-top: 24rpx;
display: flex;
justify-content: space-between;
width: 100%;
}
.card_wrap .btns .btn {
- width: 290rpx;
- height: 88rpx;
+ width: 160rpx;
+ height: 72rpx;
border-radius: 8rpx;
border: 2rpx solid #FFFFFF;
display: flex;
@@ -220,6 +239,8 @@
color: #fff;
}
.card_wrap .btns .save {
+ width: 420rpx;
+ margin-left: 20rpx;
border: none;
background: linear-gradient(180deg, #E0B49C 0%, #B68B74 100%);
-}
\ No newline at end of file
+}
diff --git a/wechat_staff/pages/userinfo/index.less b/wechat_staff/pages/userinfo/index.less
index 6de6e21..c55939e 100644
--- a/wechat_staff/pages/userinfo/index.less
+++ b/wechat_staff/pages/userinfo/index.less
@@ -73,5 +73,6 @@
font-weight: 500;
font-size: 32rpx;
margin-top: 20rpx;
+ margin-bottom: 10rpx;
}
}
\ No newline at end of file
diff --git a/wechat_staff/pages/userinfo/index.wxss b/wechat_staff/pages/userinfo/index.wxss
index 048cde9..57706ba 100644
--- a/wechat_staff/pages/userinfo/index.wxss
+++ b/wechat_staff/pages/userinfo/index.wxss
@@ -73,5 +73,6 @@
border-radius: 8rpx;
font-weight: 500;
font-size: 32rpx;
- margin-top: 20rpx;
+ margin-top: 20rpx;
+ margin-bottom: 10rpx;
}
diff --git a/wechat_staff/pages/work/index.less b/wechat_staff/pages/work/index.less
index fc3030b..4ee6943 100644
--- a/wechat_staff/pages/work/index.less
+++ b/wechat_staff/pages/work/index.less
@@ -45,6 +45,7 @@
}
}
.main_content{
+ margin-top: -16rpx;
background-color: #fff;
border-radius: 16rpx 16rpx 0rpx 0rpx;
padding: 40rpx;
diff --git a/wechat_staff/pages/work/index.wxml b/wechat_staff/pages/work/index.wxml
index 686f9c1..f2e8756 100644
--- a/wechat_staff/pages/work/index.wxml
+++ b/wechat_staff/pages/work/index.wxml
@@ -23,7 +23,7 @@
<view class="name">鎴戠殑鏀惰棌</view>
<image class="icon" src="../../static/icon/mine_ic_ar.png" mode="widthFix"></image>
</view>
- <view class="line" data-index="3" bindtap="changePath">
+ <view class="line" wx:if="{{userInfo.manageShop}}" data-index="3" bindtap="changePath">
<view class="name">闂ㄥ簵绠＄悊</view>
<image class="icon" src="../../static/icon/mine_ic_ar.png" mode="widthFix"></image>
</view>
diff --git a/wechat_staff/pages/work/index.wxss b/wechat_staff/pages/work/index.wxss
index 7d21c6a..71a87b2 100644
--- a/wechat_staff/pages/work/index.wxss
+++ b/wechat_staff/pages/work/index.wxss
@@ -41,6 +41,7 @@
margin-right: 30rpx;
}
.container .main_content {
+ margin-top: -16rpx;
background-color: #fff;
border-radius: 16rpx 16rpx 0rpx 0rpx;
padding: 40rpx;
diff --git a/wechat_staff/utils/config.js b/wechat_staff/utils/config.js
index e672602..a150c8d 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/'
diff --git a/wechat_staff/utils/request.js b/wechat_staff/utils/request.js
index 2eda17e..87ecfb4 100644
--- a/wechat_staff/utils/request.js
+++ b/wechat_staff/utils/request.js
@@ -1,8 +1,10 @@
-import { baseUrl } from "./config"
-export function request(options){
+import { baseUrl } from "./config"
+let number = 0
+export function request(options) {
let loading = options.loading || '1' // 榛樿鍊�1鏄剧ず锛屽惁鍒欎笉鏄剧ず
- if(loading == '1'){
+ if (loading == '1') {
wx.showLoading()
+ number++
}
return new Promise(resolve => {
wx.request({
@@ -18,7 +20,7 @@
if (res.data.code === 200) {
resolve(res.data || true)
} else {
- if(res.data.code && (res.data.code == 5112 || res.data.code == 5111)){
+ if (res.data.code && (res.data.code == 5112 || res.data.code == 5111)) {
wx.navigateTo({
url: '/pages/login/index',
})
@@ -30,18 +32,21 @@
}
},
fail(err) {
- console.log('err', err);
+ console.log('err', err)
err.message && wx.showToast({
title: err.message || '鍙戠敓閿欒',
icon: 'none'
})
},
complete() {
- if(loading == '1'){
- wx.hideLoading()
+ if (loading == '1') {
+ number--
+ if (number == 0) {
+ wx.hideLoading()
+ }
}
}
})
- } )
+ })
}
--
Gitblit v1.9.3