From a3d2fe9dff3b6cd9fa8fdd91e87aac843f694c0f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 29 七月 2024 16:23:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
wechat_jiaxuan/pages/detailDis/product.js | 29 +++------
wechat_staff/pages/detailDis/case.wxml | 4
wechat_jiaxuan/pages/detailDis/case.wxml | 6 +-
wechat_staff/pages/kefu/fond.js | 2
wechat_staff/pages/detailDis/product.wxss | 13 +++
wechat_staff/pages/consult/detail.js | 8 +-
wechat_staff/pages/detailDis/product.wxml | 7 +
wechat_jiaxuan/pages/detailDis/product.wxml | 7 +
wechat_jiaxuan/pages/detailDis/realpic.wxml | 2
wechat_jiaxuan/pages/design/design.js | 21 +++---
wechat_jiaxuan/pages/detailDis/product.less | 18 ++++-
wechat_staff/pages/detailDis/product.js | 4
wechat_staff/pages/detailDis/product.less | 14 +++-
wechat_jiaxuan/pages/consult/detail.wxml | 2
wechat_staff/components/detailFooter/index.js | 2
15 files changed, 81 insertions(+), 58 deletions(-)
diff --git a/wechat_jiaxuan/pages/consult/detail.wxml b/wechat_jiaxuan/pages/consult/detail.wxml
index 15d664b..e04198a 100644
--- a/wechat_jiaxuan/pages/consult/detail.wxml
+++ b/wechat_jiaxuan/pages/consult/detail.wxml
@@ -1,6 +1,6 @@
<view>
<!-- 鍚嶇墖 -->
- <idCard users="{{ info.users }}" wx:if="{{ info.users && info.users.id }}" />
+ <idCard users="{{ info.users }}" wx:if="{{ origin != 'b' && info.users && info.users.id }}" />
<view class="main_content">
<view class="main_title">{{ info.title }}</view>
<view class="datetime">鍙戝竷鏃堕棿锛歿{ info.publishDt }}</view>
diff --git a/wechat_jiaxuan/pages/design/design.js b/wechat_jiaxuan/pages/design/design.js
index 6c9fcf1..fa92172 100644
--- a/wechat_jiaxuan/pages/design/design.js
+++ b/wechat_jiaxuan/pages/design/design.js
@@ -36,14 +36,15 @@
success: (res) => {
console.log('res', res);
let addr = {
- // provinceCode: codes[0] + '00',
+ provinceCode: res.result.ad_info.adcode.slice(0,2) + '000000',
provinceName: res.result.ad_info.province,
- // cityCode: codes[1] + '00',
+ cityCode: res.result.ad_info.adcode.slice(0,4) + '0000',
cityName: res.result.ad_info.city,
- // areaCode: codes[2] + '00',
+ areaCode: res.result.ad_info.adcode + '00',
areaName: res.result.ad_info.district,
}
this.setData({ addr })
+
}
})
},
@@ -78,15 +79,12 @@
wx.showToast({
title: '鎶ュ悕鎴愬姛'
})
- wx.switchTab({
- url: '/pages/index/index',
- })
+ setTimeout(() => {
+ wx.switchTab({
+ url: '/pages/index/index',
+ })
+ }, 1000)
})
- },
- // 鏄剧ず鍩庡競寮圭獥
- chooseCity () {
- this.setData({ showAreaList: !this.data.showAreaList })
- console.log('chooseCity', this.data.showAreaList);
},
onFinish(e) {
const { selectedOptions, value } = e.detail;
@@ -103,6 +101,7 @@
},
positionChange (e) {
console.log(e.detail.value)
+ console.log(e.detail.code)
const names = e.detail.value
const codes = e.detail.code
let addr = {
diff --git a/wechat_jiaxuan/pages/detailDis/case.wxml b/wechat_jiaxuan/pages/detailDis/case.wxml
index d8f50a1..0c0840f 100644
--- a/wechat_jiaxuan/pages/detailDis/case.wxml
+++ b/wechat_jiaxuan/pages/detailDis/case.wxml
@@ -1,6 +1,6 @@
<view class="container">
<!-- 鍚嶇墖 -->
- <idCard users="{{ info.users }}" wx:if="{{ info.users && info.users.id }}" />
+ <idCard users="{{ info.users }}" wx:if="{{ origin != 'b' && info.users && info.users.id }}" />
<view class="main_title">{{ info.title }}</view>
<view class="time">鍙戝竷鏃堕棿锛歿{ info.publishDt }}</view>
<view class="fullview_wrap">
@@ -17,9 +17,9 @@
<view class="text">{{ info.caseInfo }}</view>
</view>
<view class="list">
- <view wx:for="{{ info.apiSpaceCaseVos }}" class="item">
+ <view wx:for="{{ info.apiSpaceCaseVos }}" wx:for-index="index" class="item">
<view class="h1">{{ item.spaceName }}</view>
- <image data-index="{{index}}" data-url="{{ img }}" bindtap="priviewSpace" class="img" wx:for="{{ item.imgList }}" wx:for-item="img" src="{{ img }}" mode="widthFix" />
+ <image data-index="{{index}}" data-url="{{ img }}" bindtap="priviewSpace" class="img" wx:for-index="indexb" wx:for="{{ item.imgList }}" wx:for-item="img" src="{{ img }}" mode="widthFix" />
<view class="content">{{ item.spaceDesc }}</view>
</view>
</view>
diff --git a/wechat_jiaxuan/pages/detailDis/product.js b/wechat_jiaxuan/pages/detailDis/product.js
index fd243ff..5226359 100644
--- a/wechat_jiaxuan/pages/detailDis/product.js
+++ b/wechat_jiaxuan/pages/detailDis/product.js
@@ -15,7 +15,7 @@
member: {},
showShare: false
},
- onLoadLogin(options){
+ onLoadLogin(options) {
this.getDetail(options.id, options.userId || '')
actionDo({
actionType: 'view',
@@ -27,7 +27,7 @@
this.setData({
bottomLift: app.bottomLift
})
- if(options.origin && options.origin == 'b'){
+ if (options.origin && options.origin == 'b') {
this.setData({ origin: 'b' })
}
const member = wx.getStorageSync('member')
@@ -45,7 +45,7 @@
info
} = this.data
wx.previewImage({
- urls: info.imageurlList,
+ urls: info.bannerImgList,
current: url
})
},
@@ -55,7 +55,7 @@
info
} = this.data
wx.previewImage({
- urls: info.imageurlList,
+ urls: info.spaceList.map(i => i.spaceImg),
current: url
})
},
@@ -125,7 +125,6 @@
})
},
handleShare() {
- console.log('鐐瑰嚮浜嗗垎浜�');
actionDo({
actionType: 'share',
id: this.data.info.id
@@ -134,13 +133,13 @@
// this.setData({showShare: false})
// })
},
- // onShareAppMessage: function () {
- // // let { productDetail, userInfo } = this.data
- // return {
- // title: productDetail.title,
- // path: '/pages/index/index?id=' + productDetail.id + '&shareuserid=' + userInfo.id + '&type=0'
- // }
- // },
+ onShareAppMessage: function () {
+ let { info } = this.data
+ console.log('鐐瑰嚮浜嗗垎浜�')
+ return {
+ path: '/pages/detailDis/product?id=' + info.id + '&userId=' + info.users.id
+ }
+ },
onClose() {
this.setData({
showShare: false
@@ -198,10 +197,4 @@
},
- /**
- * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
- */
- onShareAppMessage() {
-
- }
})
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/detailDis/product.less b/wechat_jiaxuan/pages/detailDis/product.less
index f053ec2..a0f2291 100644
--- a/wechat_jiaxuan/pages/detailDis/product.less
+++ b/wechat_jiaxuan/pages/detailDis/product.less
@@ -181,6 +181,7 @@
position: relative;
.img{
width: 100%;
+ height: 376rpx;
}
.play{
position: absolute;
@@ -195,6 +196,14 @@
border-radius: 30rpx;
font-size: 26rpx;
color: rgba(255,255,255,0.8);
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ .icon{
+ width: 14rpx;
+ height: 16rpx;
+ margin-left: 14rpx;
+ }
}
}
}
@@ -211,13 +220,12 @@
.line {
display: flex;
- height: 32rpx;
- margin-bottom: 24rpx;
-
- .label {
- width: auto;
+ margin-bottom: 20rpx;
+ .label {
+ width: 120rpx;
font-size: 24rpx;
color: #666666;
+ flex-shrink: 0;
}
.val {
diff --git a/wechat_jiaxuan/pages/detailDis/product.wxml b/wechat_jiaxuan/pages/detailDis/product.wxml
index 11a034b..becec78 100644
--- a/wechat_jiaxuan/pages/detailDis/product.wxml
+++ b/wechat_jiaxuan/pages/detailDis/product.wxml
@@ -1,6 +1,6 @@
<view class="container">
<!-- 鍚嶇墖 -->
- <idCard users="{{ info.users }}" wx:if="{{ info.users && info.users.id }}" />
+ <idCard users="{{ info.users }}" wx:if="{{ origin != 'b' && info.users && info.users.id }}" />
<!-- banner杞挱 -->
<view class="swiper_wrap">
<swiper bindchange="bindchange" class="banner_swiper" circular indicator-dots="{{false}}" autoplay style="height:{{bannerHeight}}rpx" duration>
@@ -23,7 +23,10 @@
<view class="title">浜у搧瑙嗛</view>
<view class="img_wrap">
<image class="img" src="{{ info.coverImage }}" mode="widthFix"></image>
- <view bindtap="playVideo" class="play">鎾斁</view>
+ <view class="play">
+ <view>鎾斁</view>
+ <image bindtap="playVideo" src="../../static/icon/ic_play.png" class="icon"></image>
+ </view>
</view>
</view>
<view class="detail">
diff --git a/wechat_jiaxuan/pages/detailDis/realpic.wxml b/wechat_jiaxuan/pages/detailDis/realpic.wxml
index 81f2b43..4739291 100644
--- a/wechat_jiaxuan/pages/detailDis/realpic.wxml
+++ b/wechat_jiaxuan/pages/detailDis/realpic.wxml
@@ -1,6 +1,6 @@
<view class="container">
<!-- 鍚嶇墖 -->
- <idCard users="{{ info.users }}" wx:if="{{ info.users && info.users.id }}" />
+ <idCard users="{{ info.users }}" wx:if="{{ origin != 'b' && info.users && info.users.id }}" />
<view class="main_title">{{ info.title }}</view>
<view class="time">鍙戝竷鏃堕棿锛歿{ info.publishDt }}</view>
<image data-url="{{ item }}" bindtap="priviewSpace" class="info_item" wx:for="{{ info.contentImgList }}" src="{{ item }}" mode="widthFix"></image>
diff --git a/wechat_staff/components/detailFooter/index.js b/wechat_staff/components/detailFooter/index.js
index 874ca56..b26816a 100644
--- a/wechat_staff/components/detailFooter/index.js
+++ b/wechat_staff/components/detailFooter/index.js
@@ -39,7 +39,7 @@
const { info, path} = this.data
wx.navigateToMiniProgram({
appId: 'wx208dd1edc0be24ee',
- path: `${map[path]}?origin=b&id=${info.id}`,
+ path: `${map[path]}?origin=b&id=${info.id}&userId=${wx.getStorageSync('member').id}`,
envVersion: 'trial'
})
},
diff --git a/wechat_staff/pages/consult/detail.js b/wechat_staff/pages/consult/detail.js
index fc16447..76b9b92 100644
--- a/wechat_staff/pages/consult/detail.js
+++ b/wechat_staff/pages/consult/detail.js
@@ -25,7 +25,7 @@
handleDesign() {
wx.navigateToMiniProgram({
appId: 'wx208dd1edc0be24ee',
- path: `/pages/consult/detail?id=${this.data.info.id}&origin=b`,
+ path: `/pages/consult/detail?id=${this.data.info.id}&origin=b&userId=${wx.getStorageSync('member').id}`,
envVersion: 'trial'
})
},
@@ -38,10 +38,10 @@
})
},
openShare() {
- this.setData({showShare: true})
+ this.setData({ showShare: true })
},
handleShare() {
- console.log('鐐瑰嚮浜嗗垎浜�');
+ console.log('鐐瑰嚮浜嗗垎浜�')
shareContent(this.data.info.id)
},
// onShareAppMessage: function () {
@@ -52,7 +52,7 @@
// }
// },
onClose() {
- this.setData({showShare: false})
+ this.setData({ showShare: false })
},
onHide() {
diff --git a/wechat_staff/pages/detailDis/case.wxml b/wechat_staff/pages/detailDis/case.wxml
index 499243d..3de6630 100644
--- a/wechat_staff/pages/detailDis/case.wxml
+++ b/wechat_staff/pages/detailDis/case.wxml
@@ -18,9 +18,9 @@
<view class="text">{{ info.caseInfo }}</view>
</view>
<view class="list">
- <view wx:for="{{ info.apiSpaceCaseVos }}" class="item">
+ <view wx:for="{{ info.apiSpaceCaseVos }}" wx:for-index="index" class="item">
<view class="h1">{{ item.spaceName }}</view>
- <image data-url="{{ img }}" bindtap="priviewSpace" class="img" wx:for="{{ item.imgList }}" wx:for-item="img" src="{{ img }}" mode="widthFix" />
+ <image data-index="{{index}}" data-url="{{ img }}" bindtap="priviewSpace" class="img" wx:for-index="indexb" wx:for="{{ item.imgList }}" wx:for-item="img" src="{{ img }}" mode="widthFix" />
<view class="content">{{ item.spaceDesc }}</view>
</view>
</view>
diff --git a/wechat_staff/pages/detailDis/product.js b/wechat_staff/pages/detailDis/product.js
index f22f525..302616e 100644
--- a/wechat_staff/pages/detailDis/product.js
+++ b/wechat_staff/pages/detailDis/product.js
@@ -92,7 +92,7 @@
info
} = this.data
wx.previewImage({
- urls: info.imageurlList,
+ urls: info.bannerImgList,
current: url
})
},
@@ -105,7 +105,7 @@
info
} = this.data
wx.previewImage({
- urls: info.imageurlList,
+ urls: info.spaceList.map(i => i.spaceImg),
current: url
})
},
diff --git a/wechat_staff/pages/detailDis/product.less b/wechat_staff/pages/detailDis/product.less
index 2678152..e9accae 100644
--- a/wechat_staff/pages/detailDis/product.less
+++ b/wechat_staff/pages/detailDis/product.less
@@ -163,6 +163,7 @@
position: relative;
.img{
width: 100%;
+ height: 376rpx;
}
.play{
position: absolute;
@@ -177,6 +178,14 @@
border-radius: 30rpx;
font-size: 26rpx;
color: rgba(255,255,255,0.8);
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ .icon{
+ width: 14rpx;
+ height: 16rpx;
+ margin-left: 14rpx;
+ }
}
}
}
@@ -193,13 +202,12 @@
.line {
display: flex;
- height: 32rpx;
- margin-bottom: 24rpx;
-
+ margin-bottom: 20rpx;
.label {
width: auto;
font-size: 24rpx;
color: #666666;
+ flex-shrink: 0;
}
.val {
diff --git a/wechat_staff/pages/detailDis/product.wxml b/wechat_staff/pages/detailDis/product.wxml
index 6b1601d..23a49bb 100644
--- a/wechat_staff/pages/detailDis/product.wxml
+++ b/wechat_staff/pages/detailDis/product.wxml
@@ -21,8 +21,11 @@
<view wx:if="{{ info.video }}" class="video">
<view class="title">浜у搧瑙嗛</view>
<view class="img_wrap">
- <image class="img" src="{{ info.coverImage }}" mode="widthFix"></image>
- <view bindtap="playVideo" class="play">鎾斁</view>
+ <image class="img" src="{{ info.coverImage }}" mode="aspectFill"></image>
+ <view class="play">
+ <view>鎾斁</view>
+ <image bindtap="playVideo" src="../../static/icon/ic_play.png" class="icon"></image>
+ </view>
</view>
</view>
<view class="detail">
diff --git a/wechat_staff/pages/detailDis/product.wxss b/wechat_staff/pages/detailDis/product.wxss
index a19e78d..43a9d47 100644
--- a/wechat_staff/pages/detailDis/product.wxss
+++ b/wechat_staff/pages/detailDis/product.wxss
@@ -143,6 +143,7 @@
}
.video .img_wrap .img {
width: 100%;
+ height: 376rpx;
}
.video .img_wrap .play {
position: absolute;
@@ -157,6 +158,14 @@
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;
@@ -169,13 +178,13 @@
}
.detail .line {
display: flex;
- height: 32rpx;
- margin-bottom: 24rpx;
+ margin-bottom: 20rpx;
}
.detail .line .label {
width: auto;
font-size: 24rpx;
color: #666666;
+ flex-shrink: 0;
}
.detail .line .val {
flex: 1;
diff --git a/wechat_staff/pages/kefu/fond.js b/wechat_staff/pages/kefu/fond.js
index b9ef121..b65bae5 100644
--- a/wechat_staff/pages/kefu/fond.js
+++ b/wechat_staff/pages/kefu/fond.js
@@ -131,7 +131,7 @@
console.log('obj', obj);
let that = this
getContentShareImg({
- articleId: obj.id + '&' + obj.joinType,
+ articleId: obj.id + '_' + obj.joinType,
type: '0',
// pageUrl: path,
imgurl: obj.coverImage,
--
Gitblit v1.9.3