From 719244fc7a427e87915054ffad05f161c082402c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 26 七月 2024 19:32:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
wechat_staff/pages/index/index.wxss | 3
wechat_jiaxuan/pages/detailDis/product.wxml | 5
wechat_jiaxuan/pages/detailDis/realpic.wxml | 5
wechat_staff/static/icon/ic_select_sel 2.png | 0
wechat_jiaxuan/components/authCard/authCard.js | 2
wechat_jiaxuan/pages/design/design.less | 1
wechat_jiaxuan/pages/design/design.wxss | 1
wechat_jiaxuan/pages/store/store.wxml | 2
wechat_jiaxuan/static/icon/ic_dianhua.png | 0
wechat_jiaxuan/pages/consult/detail.wxml | 5
wechat_jiaxuan/static/icon/ic_mingpian.png | 0
wechat_jiaxuan/pages/consult/detail.js | 4
wechat_jiaxuan/pages/store/store.js | 1
wechat_jiaxuan/pages/detailDis/case.wxml | 5
wechat_jiaxuan/pages/index/index.less | 13 +-
wechat_jiaxuan/pages/detailDis/realpic.less | 18 +++
wechat_jiaxuan/pages/detailDis/case.js | 4
wechat_jiaxuan/project.private.config.json | 7 +
wechat_staff/static/icon/detail_nav_like@2x.png | 0
wechat_jiaxuan/pages/store/info.wxml | 2
wechat_jiaxuan/pages/index/index.wxss | 9 +
wechat_staff/pages/consult/consult.js | 5 +
wechat_staff/pages/consult/consult.json | 3
wechat_jiaxuan/pages/detailDis/realpic.js | 4
wechat_staff/pages/index/index.wxml | 2
wechat_staff/pages/userinfo/collect.js | 5 +
wechat_staff/static/icon/detail_nav_collect.png | 0
wechat_staff/static/icon/zixun_ic_liulan.png | 0
wechat_jiaxuan/pages/store/store.less | 6
wechat_staff/pages/consult/detail.js | 8 -
wechat_jiaxuan/pages/detailDis/product.wxss | 17 +++
wechat_jiaxuan/static/icon/zixun_ic_liulan.png | 0
wechat_jiaxuan/pages/auth/auth.wxml | 1
wechat_jiaxuan/pages/design/design.wxml | 6 -
wechat_jiaxuan/pages/detailDis/realpic.wxss | 17 +++
wechat_jiaxuan/pages/store/store.wxss | 6
wechat_jiaxuan/pages/consult/detail.wxss | 17 +++
wechat_staff/components/detailFooter/index.js | 8 -
wechat_jiaxuan/pages/detailDis/product.js | 8 +
wechat_staff/pages/index/index.less | 3
wechat_staff/static/icon/detail_nav_download@2x.png | 0
wechat_jiaxuan/pages/userinfo/index.js | 1
wechat_jiaxuan/pages/consult/detail.less | 19 +++
wechat_jiaxuan/pages/design/design.json | 1
wechat_jiaxuan/pages/detailDis/case.wxss | 17 +++
/dev/null | 0
wechat_jiaxuan/pages/detailDis/product.less | 19 +++
wechat_jiaxuan/pages/detailDis/case.less | 18 +++
wechat_staff/pages/userinfo/collect.json | 3
wechat_jiaxuan/pages/index/index.wxml | 6
50 files changed, 235 insertions(+), 52 deletions(-)
diff --git a/wechat_jiaxuan/components/authCard/authCard.js b/wechat_jiaxuan/components/authCard/authCard.js
index 97e2db3..5183248 100644
--- a/wechat_jiaxuan/components/authCard/authCard.js
+++ b/wechat_jiaxuan/components/authCard/authCard.js
@@ -34,7 +34,7 @@
model: {
longitude,
latitude
- }
+ },capacity: 3,page:1
}).then(res => {
this.setData({
shopList: res.data.records
diff --git a/wechat_jiaxuan/pages/auth/auth.wxml b/wechat_jiaxuan/pages/auth/auth.wxml
index 433c859..2e7e623 100644
--- a/wechat_jiaxuan/pages/auth/auth.wxml
+++ b/wechat_jiaxuan/pages/auth/auth.wxml
@@ -5,7 +5,6 @@
</view>
<view class="title">娆㈣繋鏉ュ埌蹇楅偊瀹跺眳閫夊織閭︼紝瀹炵幇鎮ㄥ瀹剁殑缇庡ソ鎯宠薄</view>
<view class="placeholder9">鎮ㄥ枩娆㈢殑鏍峰瓙锛屾垜閮芥湁锝�</view>
- <view>{{ test }}</view>
<view class="main_footer">
<view class="line">
<van-checkbox value="{{ agreementFalg }}" checked-color="{{primary}}" shape="round" bind:change="agreementChange"></van-checkbox>
diff --git a/wechat_jiaxuan/pages/consult/detail.js b/wechat_jiaxuan/pages/consult/detail.js
index 4d390e0..fa9bcc2 100644
--- a/wechat_jiaxuan/pages/consult/detail.js
+++ b/wechat_jiaxuan/pages/consult/detail.js
@@ -9,6 +9,7 @@
info: {},
detail: {},
+ origin: '',
showShare: false
},
@@ -20,6 +21,9 @@
this.setData({
bottomLift: app.bottomLift
})
+ if(options.origin && options.origin == 'b'){
+ this.setData({ origin: 'b' })
+ }
this.getDetail(options.id, options.userId || '')
},
handleDesign() {
diff --git a/wechat_jiaxuan/pages/consult/detail.less b/wechat_jiaxuan/pages/consult/detail.less
index c56eb09..648d682 100644
--- a/wechat_jiaxuan/pages/consult/detail.less
+++ b/wechat_jiaxuan/pages/consult/detail.less
@@ -14,7 +14,24 @@
color: #999999;
}
}
-
+.share_btn{
+ position: fixed;
+ bottom: 16rpx;
+ left: 40rpx;
+ width: 670rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 72rpx;
+ flex: 1;
+ background-color: var(--themeColor);
+ font-weight: 500;
+ color: #FFFFFF;
+ font-style: 28rpx;
+ box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(176,135,113,0.3), inset 0rpx 2rpx 2rpx 0rpx rgba(255,255,255,0.33);
+ border-radius: 8rpx;
+
+}
.footer {
position: fixed;
bottom: 0;
diff --git a/wechat_jiaxuan/pages/consult/detail.wxml b/wechat_jiaxuan/pages/consult/detail.wxml
index 3622904..15d664b 100644
--- a/wechat_jiaxuan/pages/consult/detail.wxml
+++ b/wechat_jiaxuan/pages/consult/detail.wxml
@@ -9,7 +9,10 @@
<!-- footer -->
- <view class="footer" style="padding-bottom: {{bottomLift}}px;">
+ <view wx:if="{{ origin && origin == 'b' }}">
+ <button open-type="share" style="bottom: {{bottomLift + 6}}px;" class="share_btn">鍒嗕韩</button>
+ </view>
+ <view wx:else class="footer" style="padding-bottom: {{bottomLift}}px;">
<view class="btns">
<!-- <view class="item">
<image class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
diff --git a/wechat_jiaxuan/pages/consult/detail.wxss b/wechat_jiaxuan/pages/consult/detail.wxss
index 463d76f..3a1d393 100644
--- a/wechat_jiaxuan/pages/consult/detail.wxss
+++ b/wechat_jiaxuan/pages/consult/detail.wxss
@@ -12,6 +12,23 @@
font-size: 26rpx;
color: #999999;
}
+.share_btn {
+ position: fixed;
+ bottom: 16rpx;
+ left: 40rpx;
+ width: 670rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 72rpx;
+ flex: 1;
+ background-color: var(--themeColor);
+ font-weight: 500;
+ color: #FFFFFF;
+ font-style: 28rpx;
+ box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(176, 135, 113, 0.3), inset 0rpx 2rpx 2rpx 0rpx rgba(255, 255, 255, 0.33);
+ border-radius: 8rpx;
+}
.footer {
position: fixed;
bottom: 0;
diff --git a/wechat_jiaxuan/pages/design/design.json b/wechat_jiaxuan/pages/design/design.json
index 4b74636..6807dec 100644
--- a/wechat_jiaxuan/pages/design/design.json
+++ b/wechat_jiaxuan/pages/design/design.json
@@ -1,7 +1,6 @@
{
"usingComponents": {
"van-field": "@vant/weapp/field/index",
- "van-cascader": "@vant/weapp/cascader/index",
"van-popup": "@vant/weapp/popup/index"
},
"navigationBarTitleText": "0鍏冨厤璐硅璁�"
diff --git a/wechat_jiaxuan/pages/design/design.less b/wechat_jiaxuan/pages/design/design.less
index 575613d..b1c6899 100644
--- a/wechat_jiaxuan/pages/design/design.less
+++ b/wechat_jiaxuan/pages/design/design.less
@@ -1,7 +1,6 @@
.banner {
width: 100%;
position: relative;
- top: -100rpx;
}
.main_content {
diff --git a/wechat_jiaxuan/pages/design/design.wxml b/wechat_jiaxuan/pages/design/design.wxml
index 6efe16a..0b6bf0b 100644
--- a/wechat_jiaxuan/pages/design/design.wxml
+++ b/wechat_jiaxuan/pages/design/design.wxml
@@ -12,7 +12,7 @@
</view>
<view class="line">
<image class="icon" src="../../static/icon/design_ic_city.png" mode="widthFix"></image>
- <picker class="city_picler" mode="region" value="{{ addr }}" bindchange="bindRegionChange" bindchange="positionChange">
+ <picker class="city_picler" mode="region" value="{{ addr }}" bindchange="positionChange">
<view class="placeholder9" hidden="{{ addr.cityName }}">璇烽�夋嫨鍦板潃</view>
<view class="picker" hidden="{{ !addr.cityName }}">
{{ addr.provinceName }}{{ addr.cityName }}{{ addr.areaName }}
@@ -24,8 +24,4 @@
</view>
<image class="banner" src="{{ WechatIMG558 }}" mode="widthFix"></image>
<!-- -->
- <van-popup show="{{ showAreaList }}" bind:close="onClose" round position="bottom">
- <van-cascader field-names="{{ fieldNames }}" value="{{ cascaderValue }}" title="璇烽�夋嫨鎵�鍦ㄥ湴鍖�" options="{{ areaList }}" bind:close="onClose" bind:finish="onFinish" />
- </van-popup>
-
</view>
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/design/design.wxss b/wechat_jiaxuan/pages/design/design.wxss
index 00aeed7..081c805 100644
--- a/wechat_jiaxuan/pages/design/design.wxss
+++ b/wechat_jiaxuan/pages/design/design.wxss
@@ -1,7 +1,6 @@
.banner {
width: 100%;
position: relative;
- top: -100rpx;
}
.main_content {
width: 670rpx;
diff --git a/wechat_jiaxuan/pages/detailDis/case.js b/wechat_jiaxuan/pages/detailDis/case.js
index b3c66d1..a5b7207 100644
--- a/wechat_jiaxuan/pages/detailDis/case.js
+++ b/wechat_jiaxuan/pages/detailDis/case.js
@@ -6,6 +6,7 @@
*/
data: {
bottomLift: 0,
+ origin: '',
showShare: false
},
@@ -17,6 +18,9 @@
this.setData({
bottomLift: app.bottomLift
})
+ if(options.origin && options.origin == 'b'){
+ this.setData({ origin: 'b' })
+ }
this.getDetail(options.id, options.userId || '')
actionDo({
actionType: 'view',
diff --git a/wechat_jiaxuan/pages/detailDis/case.less b/wechat_jiaxuan/pages/detailDis/case.less
index f9e84c7..e557cfb 100644
--- a/wechat_jiaxuan/pages/detailDis/case.less
+++ b/wechat_jiaxuan/pages/detailDis/case.less
@@ -138,6 +138,24 @@
}
}
}
+.share_btn{
+ position: fixed;
+ bottom: 16rpx;
+ left: 40rpx;
+ width: 670rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 72rpx;
+ flex: 1;
+ background-color: var(--themeColor);
+ font-weight: 500;
+ color: #FFFFFF;
+ font-style: 28rpx;
+ box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(176,135,113,0.3), inset 0rpx 2rpx 2rpx 0rpx rgba(255,255,255,0.33);
+ border-radius: 8rpx;
+
+}
.share_modal{
.btns{
display: flex;
diff --git a/wechat_jiaxuan/pages/detailDis/case.wxml b/wechat_jiaxuan/pages/detailDis/case.wxml
index 929e470..d8f50a1 100644
--- a/wechat_jiaxuan/pages/detailDis/case.wxml
+++ b/wechat_jiaxuan/pages/detailDis/case.wxml
@@ -24,7 +24,10 @@
</view>
</view>
<!-- footer -->
- <view class="footer" style="padding-bottom: {{bottomLift}}px;">
+ <view wx:if="{{ origin && origin == 'b' }}">
+ <button open-type="share" style="bottom: {{bottomLift + 6}}px;" class="share_btn">鍒嗕韩</button>
+ </view>
+ <view wx:else class="footer" style="padding-bottom: {{bottomLift}}px;">
<view class="btns">
<button class="item btn">
<image data-code="collect_cancel" bindtap="handleAction" wx:if="{{ info.isCollection }}" class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
diff --git a/wechat_jiaxuan/pages/detailDis/case.wxss b/wechat_jiaxuan/pages/detailDis/case.wxss
index dfeb97b..2a30896 100644
--- a/wechat_jiaxuan/pages/detailDis/case.wxss
+++ b/wechat_jiaxuan/pages/detailDis/case.wxss
@@ -125,6 +125,23 @@
.footer .item .icon {
width: 44rpx;
}
+.share_btn {
+ position: fixed;
+ bottom: 16rpx;
+ left: 40rpx;
+ width: 670rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 72rpx;
+ flex: 1;
+ background-color: var(--themeColor);
+ font-weight: 500;
+ color: #FFFFFF;
+ font-style: 28rpx;
+ box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(176, 135, 113, 0.3), inset 0rpx 2rpx 2rpx 0rpx rgba(255, 255, 255, 0.33);
+ border-radius: 8rpx;
+}
.share_modal .btns {
min-height: 320rpx;
display: flex;
diff --git a/wechat_jiaxuan/pages/detailDis/product.js b/wechat_jiaxuan/pages/detailDis/product.js
index acd6c6d..dabc25d 100644
--- a/wechat_jiaxuan/pages/detailDis/product.js
+++ b/wechat_jiaxuan/pages/detailDis/product.js
@@ -11,6 +11,7 @@
data: {
bottomLift: 0,
id: '',
+ origin: '',
info: {},
member: {},
showShare: false
@@ -23,6 +24,9 @@
this.setData({
bottomLift: app.bottomLift
})
+ if(options.origin && options.origin == 'b'){
+ this.setData({ origin: 'b' })
+ }
this.getDetail(options.id, options.userId || '')
actionDo({
actionType: 'view',
@@ -40,7 +44,7 @@
info
} = this.data
wx.previewImage({
- urls: info.bannerImgList,
+ urls: info.imageurlList,
current: url
})
},
@@ -50,7 +54,7 @@
info
} = this.data
wx.previewImage({
- urls: info.spaceList,
+ urls: info.imageurlList,
current: url
})
},
diff --git a/wechat_jiaxuan/pages/detailDis/product.less b/wechat_jiaxuan/pages/detailDis/product.less
index 041700f..aabab93 100644
--- a/wechat_jiaxuan/pages/detailDis/product.less
+++ b/wechat_jiaxuan/pages/detailDis/product.less
@@ -51,7 +51,24 @@
width: 100%;
}
}
-
+.share_btn{
+ position: fixed;
+ bottom: 16rpx;
+ left: 40rpx;
+ width: 670rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 72rpx;
+ flex: 1;
+ background-color: var(--themeColor);
+ font-weight: 500;
+ color: #FFFFFF;
+ font-style: 28rpx;
+ box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(176,135,113,0.3), inset 0rpx 2rpx 2rpx 0rpx rgba(255,255,255,0.33);
+ border-radius: 8rpx;
+
+}
.main_content {
padding: 52rpx 40rpx 40rpx;
border-radius: 16rpx 16rpx 0rpx 0rpx;
diff --git a/wechat_jiaxuan/pages/detailDis/product.wxml b/wechat_jiaxuan/pages/detailDis/product.wxml
index 719ec03..d595f35 100644
--- a/wechat_jiaxuan/pages/detailDis/product.wxml
+++ b/wechat_jiaxuan/pages/detailDis/product.wxml
@@ -42,7 +42,10 @@
</view>
</view>
<!-- footer -->
- <view class="footer" style="padding-bottom: {{bottomLift}}px;">
+ <view wx:if="{{ origin && origin == 'b' }}">
+ <button open-type="share" style="bottom: {{bottomLift + 6}}px;" class="share_btn">鍒嗕韩</button>
+ </view>
+ <view wx:else class="footer" style="padding-bottom: {{bottomLift}}px;">
<view class="btns">
<button class="item btn">
<image data-code="collect_cancel" bindtap="handleAction" wx:if="{{ info.isCollection }}" class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
diff --git a/wechat_jiaxuan/pages/detailDis/product.wxss b/wechat_jiaxuan/pages/detailDis/product.wxss
index e9483c7..44325d0 100644
--- a/wechat_jiaxuan/pages/detailDis/product.wxss
+++ b/wechat_jiaxuan/pages/detailDis/product.wxss
@@ -45,6 +45,23 @@
.banner_swiper image {
width: 100%;
}
+.share_btn {
+ position: fixed;
+ bottom: 16rpx;
+ left: 40rpx;
+ width: 670rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 72rpx;
+ flex: 1;
+ background-color: var(--themeColor);
+ font-weight: 500;
+ color: #FFFFFF;
+ font-style: 28rpx;
+ box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(176, 135, 113, 0.3), inset 0rpx 2rpx 2rpx 0rpx rgba(255, 255, 255, 0.33);
+ border-radius: 8rpx;
+}
.main_content {
padding: 52rpx 40rpx 40rpx;
border-radius: 16rpx 16rpx 0rpx 0rpx;
diff --git a/wechat_jiaxuan/pages/detailDis/realpic.js b/wechat_jiaxuan/pages/detailDis/realpic.js
index fe22e58..aa0d883 100644
--- a/wechat_jiaxuan/pages/detailDis/realpic.js
+++ b/wechat_jiaxuan/pages/detailDis/realpic.js
@@ -7,6 +7,7 @@
data: {
bottomLift: 0,
id: '',
+ origin: '',
info: {},
member: {},
showShare: false
@@ -20,6 +21,9 @@
this.setData({
bottomLift: app.bottomLift
})
+ if(options.origin && options.origin == 'b'){
+ this.setData({ origin: 'b' })
+ }
this.getDetail(options.id, options.userId || '')
actionDo({
actionType: 'view',
diff --git a/wechat_jiaxuan/pages/detailDis/realpic.less b/wechat_jiaxuan/pages/detailDis/realpic.less
index 4a93520..892765f 100644
--- a/wechat_jiaxuan/pages/detailDis/realpic.less
+++ b/wechat_jiaxuan/pages/detailDis/realpic.less
@@ -76,6 +76,24 @@
}
}
}
+.share_btn{
+ position: fixed;
+ bottom: 16rpx;
+ left: 40rpx;
+ width: 670rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 72rpx;
+ flex: 1;
+ background-color: var(--themeColor);
+ font-weight: 500;
+ color: #FFFFFF;
+ font-style: 28rpx;
+ box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(176,135,113,0.3), inset 0rpx 2rpx 2rpx 0rpx rgba(255,255,255,0.33);
+ border-radius: 8rpx;
+
+}
.share_modal{
.btns{
display: flex;
diff --git a/wechat_jiaxuan/pages/detailDis/realpic.wxml b/wechat_jiaxuan/pages/detailDis/realpic.wxml
index 42e48c0..81f2b43 100644
--- a/wechat_jiaxuan/pages/detailDis/realpic.wxml
+++ b/wechat_jiaxuan/pages/detailDis/realpic.wxml
@@ -12,7 +12,10 @@
</view>
</view> -->
<!-- footer -->
- <view class="footer" style="padding-bottom: {{bottomLift}}px;">
+ <view wx:if="{{ origin && origin == 'b' }}">
+ <button open-type="share" style="bottom: {{bottomLift + 6}}px;" class="share_btn">鍒嗕韩</button>
+ </view>
+ <view wx:else class="footer" style="padding-bottom: {{bottomLift}}px;">
<view class="btns">
<button class="item btn">
<image data-code="collect_cancel" bindtap="handleAction" wx:if="{{ info.isCollection }}" class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
diff --git a/wechat_jiaxuan/pages/detailDis/realpic.wxss b/wechat_jiaxuan/pages/detailDis/realpic.wxss
index 02d76c5..0f17618 100644
--- a/wechat_jiaxuan/pages/detailDis/realpic.wxss
+++ b/wechat_jiaxuan/pages/detailDis/realpic.wxss
@@ -71,6 +71,23 @@
.footer .item .icon {
width: 44rpx;
}
+.share_btn {
+ position: fixed;
+ bottom: 16rpx;
+ left: 40rpx;
+ width: 670rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 72rpx;
+ flex: 1;
+ background-color: var(--themeColor);
+ font-weight: 500;
+ color: #FFFFFF;
+ font-style: 28rpx;
+ box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(176, 135, 113, 0.3), inset 0rpx 2rpx 2rpx 0rpx rgba(255, 255, 255, 0.33);
+ border-radius: 8rpx;
+}
.share_modal .btns {
min-height: 320rpx;
display: flex;
diff --git a/wechat_jiaxuan/pages/index/index.less b/wechat_jiaxuan/pages/index/index.less
index 93582b8..fb08923 100644
--- a/wechat_jiaxuan/pages/index/index.less
+++ b/wechat_jiaxuan/pages/index/index.less
@@ -18,15 +18,16 @@
.consult_swiper {
width: 100%;
image {
- width: 100%;
+ width: 670rpx;
+ height: 376rpx;
}
.scroll_text{
height: 100rpx;
width: 670rpx;
white-space: nowrap;
- overflow: hidden;//鏂囨湰瓒呭嚭闅愯棌
- text-overflow: ellipsis;
- padding-top: 20rpx;
+ overflow: hidden;//鏂囨湰瓒呭嚭闅愯棌
+ text-overflow: ellipsis;
+ padding-top: 22rpx;
font-size: 32rpx;
}
}
@@ -100,6 +101,7 @@
.play {
width: 60rpx;
+ height: 60rpx;
position: absolute;
top: 50%;
left: 50%;
@@ -108,7 +110,8 @@
}
.img {
- width: 100%;
+ width: 670rpx;
+ height: 376rpx;
}
}
diff --git a/wechat_jiaxuan/pages/index/index.wxml b/wechat_jiaxuan/pages/index/index.wxml
index 6d1d5fb..96acd22 100644
--- a/wechat_jiaxuan/pages/index/index.wxml
+++ b/wechat_jiaxuan/pages/index/index.wxml
@@ -57,8 +57,8 @@
<image class="ar_right" src="../../static/icon/home_ar@2x.png"></image>
</view>
<view class="video_wrap">
- <image class="img" src="{{ productVideo[0].coverImage }}" mode="widthFix"></image>
- <image bindtap="videoClick" data-videourl="{{ productVideo[0].videoUrl }}" class="play" src="../../static/icon/ic_play.png" mode="widthFix"></image>
+ <image class="img" src="{{ productVideo[0].coverImage }}" mode="aspectFill"></image>
+ <image bindtap="videoClick" data-videourl="{{ productVideo[0].videoUrl }}" class="play" src="../../static/icon/ic_play.png"></image>
</view>
</view>
<!-- 鏀荤暐 -->
@@ -108,7 +108,7 @@
<swiper class="consult_swiper" circular indicator-dots="{{ bannerSwiperOption.indicatorDots }}" autoplay="{{ bannerSwiperOption.autoplay }}" interval="{{ bannerSwiperOption.interval }}" style="height:{{consultImgHeight + 100}}rpx" duration="{{ bannerSwiperOption.duration }}">
<block wx:for="{{ consultList }}" wx:key="index">
<swiper-item data-id="{{ item.id }}" bindtap="consultClick">
- <image bindload="consultbindload" mode="widthFix" src="{{ item.coverImage }}"></image>
+ <image bindload="consultbindload" mode="aspectFill" src="{{ item.coverImage }}"></image>
<view class="scroll_text">{{ item.title }}</view>
</swiper-item>
</block>
diff --git a/wechat_jiaxuan/pages/index/index.wxss b/wechat_jiaxuan/pages/index/index.wxss
index dc5a7f3..a250a57 100644
--- a/wechat_jiaxuan/pages/index/index.wxss
+++ b/wechat_jiaxuan/pages/index/index.wxss
@@ -17,7 +17,8 @@
width: 100%;
}
.container .consult_swiper image {
- width: 100%;
+ width: 670rpx;
+ height: 376rpx;
}
.container .consult_swiper .scroll_text {
height: 100rpx;
@@ -25,7 +26,7 @@
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
- padding-top: 20rpx;
+ padding-top: 22rpx;
font-size: 32rpx;
}
.container .logo_wrap {
@@ -88,6 +89,7 @@
}
.container .product_video .video_wrap .play {
width: 60rpx;
+ height: 60rpx;
position: absolute;
top: 50%;
left: 50%;
@@ -95,7 +97,8 @@
z-index: 1;
}
.container .product_video .video_wrap .img {
- width: 100%;
+ width: 670rpx;
+ height: 376rpx;
}
.container .strategy {
padding: 80rpx 40rpx;
diff --git a/wechat_jiaxuan/pages/store/info.wxml b/wechat_jiaxuan/pages/store/info.wxml
index 8ee95eb..28f3b57 100644
--- a/wechat_jiaxuan/pages/store/info.wxml
+++ b/wechat_jiaxuan/pages/store/info.wxml
@@ -17,7 +17,7 @@
<image data-id="{{ item.iamId }}" bindtap="handleDetail" src="{{ item.imgurlFull ? item.imgurlFull : '../../static/images/default_avatar.png' }}" class="avatar"></image>
<view data-id="{{ item.iamId }}" bindtap="handleDetail" class="content">
<view class="name">{{ item.name }}</view>
- <view class="desc">瀵艰喘锝渰{ info.jobDate || 5}}骞寸粡楠�</view>
+ <view class="desc">瀵艰喘锝渰{ item.jobDate || 5}}骞寸粡楠�</view>
</view>
<view data-phone="{{ item.phone }}" bindtap="callPhone" class="btn">鑱旂郴TA</view>
</view>
diff --git a/wechat_jiaxuan/pages/store/store.js b/wechat_jiaxuan/pages/store/store.js
index 23577e3..b926a52 100644
--- a/wechat_jiaxuan/pages/store/store.js
+++ b/wechat_jiaxuan/pages/store/store.js
@@ -25,6 +25,7 @@
latitude: res.latitude,
longitude: res.longitude,
})
+ this.getShops(res.latitude, res.longitude)
}
})
},
diff --git a/wechat_jiaxuan/pages/store/store.less b/wechat_jiaxuan/pages/store/store.less
index 9771d26..03a782a 100644
--- a/wechat_jiaxuan/pages/store/store.less
+++ b/wechat_jiaxuan/pages/store/store.less
@@ -76,7 +76,8 @@
text-overflow: ellipsis;
}
image{
- width: 13rpx;
+ width: 14rpx;
+ height: 26rpx;
margin-left: 8rpx;
}
}
@@ -117,6 +118,7 @@
margin-right: 16rpx;
}
.name{
+ font-size: 28rpx;
width: 120rpx;
overflow: hidden;
text-overflow: ellipsis; //鏂囨湰婧㈠嚭鏄剧ず鐪佺暐鍙�
@@ -130,7 +132,7 @@
}
.btn{
text-align: center;
- line-height: 62rpx;
+ line-height: 66rpx;
height: 66rpx;
font-weight: 500;
font-size: 26rpx;
diff --git a/wechat_jiaxuan/pages/store/store.wxml b/wechat_jiaxuan/pages/store/store.wxml
index 13be104..7afd73a 100644
--- a/wechat_jiaxuan/pages/store/store.wxml
+++ b/wechat_jiaxuan/pages/store/store.wxml
@@ -17,7 +17,7 @@
<view class="address" data-id="{{ item.id }}" bindtap="handleDetail">
<text class="text" wx:if="{{ item.distanceStr }}">{{ item.distanceStr }} | {{ item.address || '' }}</text>
<text wx:else>--</text>
- <image src="../../static/icon/arrow_right.png" mode="widthFix"></image>
+ <image wx:if="{{ item.address }}" src="../../static/icon/arrow_right.png" ></image>
</view>
</view>
<view wx:if="{{ item.linkPhone }}" class="right">
diff --git a/wechat_jiaxuan/pages/store/store.wxss b/wechat_jiaxuan/pages/store/store.wxss
index 7dd2d16..0d7fd2c 100644
--- a/wechat_jiaxuan/pages/store/store.wxss
+++ b/wechat_jiaxuan/pages/store/store.wxss
@@ -75,7 +75,8 @@
text-overflow: ellipsis;
}
.main_content .shops .shop .header .left .address image {
- width: 13rpx;
+ width: 14rpx;
+ height: 26rpx;
margin-left: 8rpx;
}
.main_content .shops .shop .header .right {
@@ -116,6 +117,7 @@
margin-right: 16rpx;
}
.main_content .shops .shop .user_list .item .info .name {
+ font-size: 28rpx;
width: 120rpx;
overflow: hidden;
text-overflow: ellipsis;
@@ -128,7 +130,7 @@
}
.main_content .shops .shop .user_list .item .btn {
text-align: center;
- line-height: 62rpx;
+ line-height: 66rpx;
height: 66rpx;
font-weight: 500;
font-size: 26rpx;
diff --git a/wechat_jiaxuan/pages/userinfo/index.js b/wechat_jiaxuan/pages/userinfo/index.js
index fbe9364..7aa68b1 100644
--- a/wechat_jiaxuan/pages/userinfo/index.js
+++ b/wechat_jiaxuan/pages/userinfo/index.js
@@ -67,6 +67,7 @@
housearea: housearea || '',
housetype: houseType.val1 + '-' + houseType.val2 + '-' + houseType.val3 + '-' + houseType.val4 + '-' + houseType.val5
}).then(res => {
+ wx.setStorageSync('member', res.data)
wx.showToast({
title: '淇濆瓨鎴愬姛',
icon: 'none'
diff --git a/wechat_jiaxuan/project.private.config.json b/wechat_jiaxuan/project.private.config.json
index 9e41f95..5a7c8d4 100644
--- a/wechat_jiaxuan/project.private.config.json
+++ b/wechat_jiaxuan/project.private.config.json
@@ -57,6 +57,13 @@
"query": "",
"launchMode": "default",
"scene": null
+ },
+ {
+ "name": "",
+ "pathName": "pages/consult/detail",
+ "query": "id=1813577799402684418",
+ "launchMode": "default",
+ "scene": null
}
]
}
diff --git a/wechat_jiaxuan/static/icon/ic_dianhua.png b/wechat_jiaxuan/static/icon/ic_dianhua.png
index 96dcb5f..795165f 100644
--- a/wechat_jiaxuan/static/icon/ic_dianhua.png
+++ b/wechat_jiaxuan/static/icon/ic_dianhua.png
Binary files differ
diff --git a/wechat_jiaxuan/static/icon/ic_mingpian.png b/wechat_jiaxuan/static/icon/ic_mingpian.png
index aeb5127..bc1333d 100644
--- a/wechat_jiaxuan/static/icon/ic_mingpian.png
+++ b/wechat_jiaxuan/static/icon/ic_mingpian.png
Binary files differ
diff --git a/wechat_jiaxuan/static/icon/zixun_ic_liulan.png b/wechat_jiaxuan/static/icon/zixun_ic_liulan.png
index 19cad83..1ca757c 100644
--- a/wechat_jiaxuan/static/icon/zixun_ic_liulan.png
+++ b/wechat_jiaxuan/static/icon/zixun_ic_liulan.png
Binary files differ
diff --git a/wechat_staff/components/detailFooter/index.js b/wechat_staff/components/detailFooter/index.js
index 3cb0a22..874ca56 100644
--- a/wechat_staff/components/detailFooter/index.js
+++ b/wechat_staff/components/detailFooter/index.js
@@ -39,12 +39,8 @@
const { info, path} = this.data
wx.navigateToMiniProgram({
appId: 'wx208dd1edc0be24ee',
- path: map[path],
- envVersion: 'trial',
- extraData: {
- id: info.id,
- origin: 'b'
- }
+ path: `${map[path]}?origin=b&id=${info.id}`,
+ envVersion: 'trial'
})
},
handleEnjoy() {
diff --git a/wechat_staff/pages/consult/consult.js b/wechat_staff/pages/consult/consult.js
index d4ed9bb..af3189c 100644
--- a/wechat_staff/pages/consult/consult.js
+++ b/wechat_staff/pages/consult/consult.js
@@ -22,6 +22,11 @@
onLoad(options) {
this.getCate()
},
+ onPullDownRefresh: function () {
+ console.log('涓嬫媺鍒锋柊');
+ this.setData({ dataList: [], pageNum: 1, total: 0 })
+ this.getList()
+ },
onReachBottom() {
console.log('瑙﹀簳浜嬩欢');
const { total, dataList, pageNum } = this.data
diff --git a/wechat_staff/pages/consult/consult.json b/wechat_staff/pages/consult/consult.json
index 0fb9dcb..beb0e95 100644
--- a/wechat_staff/pages/consult/consult.json
+++ b/wechat_staff/pages/consult/consult.json
@@ -2,5 +2,6 @@
"usingComponents": {
"buoyClient": "../../components/buoyClient/index"
},
- "navigationBarTitleText": "璧勮"
+ "navigationBarTitleText": "璧勮",
+ "enablePullDownRefresh": true
}
\ No newline at end of file
diff --git a/wechat_staff/pages/consult/detail.js b/wechat_staff/pages/consult/detail.js
index f6af18d..fc16447 100644
--- a/wechat_staff/pages/consult/detail.js
+++ b/wechat_staff/pages/consult/detail.js
@@ -25,12 +25,8 @@
handleDesign() {
wx.navigateToMiniProgram({
appId: 'wx208dd1edc0be24ee',
- path: '/pages/consult/detail',
- envVersion: 'trial',
- extraData: {
- id: this.data.info.id,
- origin: 'b'
- }
+ path: `/pages/consult/detail?id=${this.data.info.id}&origin=b`,
+ envVersion: 'trial'
})
},
getDetail(id) {
diff --git a/wechat_staff/pages/index/index.less b/wechat_staff/pages/index/index.less
index 302784e..e0bdf5f 100644
--- a/wechat_staff/pages/index/index.less
+++ b/wechat_staff/pages/index/index.less
@@ -127,7 +127,8 @@
}
.img {
- width: 100%;
+ width: 670rpx;
+ height: 376rpx;
}
}
diff --git a/wechat_staff/pages/index/index.wxml b/wechat_staff/pages/index/index.wxml
index 5391ba8..ffd31f8 100644
--- a/wechat_staff/pages/index/index.wxml
+++ b/wechat_staff/pages/index/index.wxml
@@ -63,7 +63,7 @@
<image class="ar_right" src="../../static/icon/home_ar@2x.png"></image>
</view>
<view class="video_wrap">
- <image class="img" src="{{ productVideo[0].coverImage }}" mode="widthFix"></image>
+ <image class="img" src="{{ productVideo[0].coverImage }}" mode="aspectFill"></image>
<image bindtap="videoClick" data-videourl="{{ productVideo[0].videoUrl }}" class="play" src="../../static/icon/ic_play.png" mode="widthFix"></image>
</view>
</view>
diff --git a/wechat_staff/pages/index/index.wxss b/wechat_staff/pages/index/index.wxss
index 867da8c..d96c1e8 100644
--- a/wechat_staff/pages/index/index.wxss
+++ b/wechat_staff/pages/index/index.wxss
@@ -122,7 +122,8 @@
z-index: 1;
}
.product_video .video_wrap .img {
- width: 100%;
+ width: 670rpx;
+ height: 376rpx;
}
.consult_swiper {
width: 100%;
diff --git a/wechat_staff/pages/userinfo/collect.js b/wechat_staff/pages/userinfo/collect.js
index 55c2bcd..76e8ca9 100644
--- a/wechat_staff/pages/userinfo/collect.js
+++ b/wechat_staff/pages/userinfo/collect.js
@@ -16,6 +16,11 @@
},
onLoad(options) {
},
+ onPullDownRefresh: function () {
+ console.log('涓嬫媺鍒锋柊');
+ this.setData({ dataList: [], pageNum: 1, total: 0 })
+ this.getList()
+ },
onReachBottom() {
console.log('瑙﹀簳浜嬩欢');
const { total, dataList, pageNum } = this.data
diff --git a/wechat_staff/pages/userinfo/collect.json b/wechat_staff/pages/userinfo/collect.json
index 8fd3e9f..aef1638 100644
--- a/wechat_staff/pages/userinfo/collect.json
+++ b/wechat_staff/pages/userinfo/collect.json
@@ -1,4 +1,5 @@
{
"usingComponents": {},
- "navigationBarTitleText": "鎴戞敹钘忕殑"
+ "navigationBarTitleText": "鎴戞敹钘忕殑",
+ "enablePullDownRefresh": true
}
\ No newline at end of file
diff --git a/wechat_staff/static/icon/detail_nav_collect.png b/wechat_staff/static/icon/detail_nav_collect.png
index 1628ae9..2c207ce 100644
--- a/wechat_staff/static/icon/detail_nav_collect.png
+++ b/wechat_staff/static/icon/detail_nav_collect.png
Binary files differ
diff --git a/wechat_staff/static/icon/detail_nav_download@2x.png b/wechat_staff/static/icon/detail_nav_download@2x.png
index fc099be..20a0df5 100644
--- a/wechat_staff/static/icon/detail_nav_download@2x.png
+++ b/wechat_staff/static/icon/detail_nav_download@2x.png
Binary files differ
diff --git a/wechat_staff/static/icon/detail_nav_like@2x.png b/wechat_staff/static/icon/detail_nav_like@2x.png
index c222e93..fb7c1c2 100644
--- a/wechat_staff/static/icon/detail_nav_like@2x.png
+++ b/wechat_staff/static/icon/detail_nav_like@2x.png
Binary files differ
diff --git a/wechat_staff/static/icon/ic_select_sel 2.png b/wechat_staff/static/icon/ic_select_sel 2.png
new file mode 100644
index 0000000..b1979c6
--- /dev/null
+++ b/wechat_staff/static/icon/ic_select_sel 2.png
Binary files differ
diff --git a/wechat_staff/static/icon/ic_select_sel@2x.png b/wechat_staff/static/icon/ic_select_sel@2x.png
deleted file mode 100644
index 3e02670..0000000
--- a/wechat_staff/static/icon/ic_select_sel@2x.png
+++ /dev/null
Binary files differ
diff --git a/wechat_staff/static/icon/zixun_ic_liulan.png b/wechat_staff/static/icon/zixun_ic_liulan.png
index 19cad83..1ca757c 100644
--- a/wechat_staff/static/icon/zixun_ic_liulan.png
+++ b/wechat_staff/static/icon/zixun_ic_liulan.png
Binary files differ
--
Gitblit v1.9.3