From 4d064bfdbce064688ddb7252ff6c52b041a279dd Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 25 七月 2024 13:50:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
wechat_jiaxuan/static/icon/ic_mingpian.png | 0
wechat_jiaxuan/pages/detailDis/case.json | 1
wechat_jiaxuan/pages/detailDis/realpic.js | 6 +-
wechat_jiaxuan/pages/consult/detail.js | 6 +-
wechat_jiaxuan/pages/detailDis/realpic.json | 3 +
wechat_jiaxuan/pages/detailDis/case.wxml | 2 +
wechat_jiaxuan/utils/config.js | 6 +-
wechat_jiaxuan/components/idCard/index.js | 11 +++++
wechat_jiaxuan/components/idCard/index.less | 3 +
wechat_jiaxuan/pages/detailDis/realpic.wxml | 2 +
wechat_jiaxuan/pages/store/staff.wxss | 4 +
wechat_jiaxuan/pages/store/staff.less | 4 +
wechat_jiaxuan/components/idCard/index.wxss | 3 +
wechat_jiaxuan/pages/detailDis/case.js | 6 +-
wechat_jiaxuan/project.private.config.json | 2
wechat_jiaxuan/components/idCard/index.wxml | 10 ++--
wechat_jiaxuan/pages/consult/consult.json | 3 +
wechat_jiaxuan/pages/store/staff.wxml | 2
wechat_jiaxuan/static/icon/ic_dianhua.png | 0
wechat_jiaxuan/pages/consult/detail.wxml | 3 +
20 files changed, 53 insertions(+), 24 deletions(-)
diff --git a/wechat_jiaxuan/components/idCard/index.js b/wechat_jiaxuan/components/idCard/index.js
index b31b57e..f5bcdc9 100644
--- a/wechat_jiaxuan/components/idCard/index.js
+++ b/wechat_jiaxuan/components/idCard/index.js
@@ -18,6 +18,15 @@
* 缁勪欢鐨勬柟娉曞垪琛�
*/
methods: {
-
+ callPhone() {
+ wx.makePhoneCall({
+ phoneNumber: this.data.users.phone
+ })
+ },
+ jumpCard() {
+ wx.navigateTo({
+ url: '/pages/store/staff?id=' + this.data.users.iamId,
+ })
+ },
}
})
diff --git a/wechat_jiaxuan/components/idCard/index.less b/wechat_jiaxuan/components/idCard/index.less
index 4bf5502..e89bf2d 100644
--- a/wechat_jiaxuan/components/idCard/index.less
+++ b/wechat_jiaxuan/components/idCard/index.less
@@ -36,7 +36,10 @@
align-items: center;
justify-content: center;
margin-left: 70rpx;
+ font-size: 20rpx;
+ color: #333333;
.icon{
+ margin-bottom: 4rpx;
width: 44rpx;
height: 44rpx;
}
diff --git a/wechat_jiaxuan/components/idCard/index.wxml b/wechat_jiaxuan/components/idCard/index.wxml
index 5f52233..772d86a 100644
--- a/wechat_jiaxuan/components/idCard/index.wxml
+++ b/wechat_jiaxuan/components/idCard/index.wxml
@@ -5,13 +5,13 @@
<view class="desc">瀵艰喘锝渰{ users.jobDate || 1 }}骞寸粡楠�</view>
</view>
<view class="btns">
- <view class="item">
- <image class="icon" src="../../static/icon/mingpian_bg_nianxian@2x.png"></image>
+ <view bindtap="jumpCard" class="item">
+ <image class="icon" src="../../static/icon/ic_mingpian.png"></image>
<text>鍚嶇墖</text>
</view>
- <view class="item">
- <image class="icon" src="../../static/icon/mingpian_bg_nianxian@2x.png"></image>
- <text>鍚嶇墖</text>
+ <view bindtap="callPhone" class="item">
+ <image class="icon" src="../../static/icon/ic_dianhua.png"></image>
+ <text>鎵撶數璇�</text>
</view>
</view>
</view>
\ No newline at end of file
diff --git a/wechat_jiaxuan/components/idCard/index.wxss b/wechat_jiaxuan/components/idCard/index.wxss
index f30b208..7372383 100644
--- a/wechat_jiaxuan/components/idCard/index.wxss
+++ b/wechat_jiaxuan/components/idCard/index.wxss
@@ -34,8 +34,11 @@
align-items: center;
justify-content: center;
margin-left: 70rpx;
+ font-size: 20rpx;
+ color: #333333;
}
.user .btns .item .icon {
+ margin-bottom: 4rpx;
width: 44rpx;
height: 44rpx;
}
diff --git a/wechat_jiaxuan/pages/consult/consult.json b/wechat_jiaxuan/pages/consult/consult.json
index 541da3d..1fc1ce6 100644
--- a/wechat_jiaxuan/pages/consult/consult.json
+++ b/wechat_jiaxuan/pages/consult/consult.json
@@ -1,3 +1,6 @@
{
+ "usingComponents": {
+ "idCard": "../../components/idCard/index"
+ },
"navigationBarTitleText": "璧勮"
}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/consult/detail.js b/wechat_jiaxuan/pages/consult/detail.js
index 0419117..4d390e0 100644
--- a/wechat_jiaxuan/pages/consult/detail.js
+++ b/wechat_jiaxuan/pages/consult/detail.js
@@ -20,15 +20,15 @@
this.setData({
bottomLift: app.bottomLift
})
- this.getDetail(options.id)
+ this.getDetail(options.id, options.userId || '')
},
handleDesign() {
wx.navigateTo({
url: '/pages/design/design',
})
},
- getDetail(id) {
- getProductNewsInfo({ id }).then(res => {
+ getDetail(id, userId) {
+ getProductNewsInfo({ id, salesId: userId || null }).then(res => {
this.setData({ info: res.data })
wx.setNavigationBarTitle({
title: res.data.title
diff --git a/wechat_jiaxuan/pages/consult/detail.wxml b/wechat_jiaxuan/pages/consult/detail.wxml
index 9768b3e..3622904 100644
--- a/wechat_jiaxuan/pages/consult/detail.wxml
+++ b/wechat_jiaxuan/pages/consult/detail.wxml
@@ -1,5 +1,6 @@
<view>
- <!-- <navBar title="{{ navTitle }}"></navBar> -->
+ <!-- 鍚嶇墖 -->
+ <idCard users="{{ info.users }}" wx:if="{{ 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/detailDis/case.js b/wechat_jiaxuan/pages/detailDis/case.js
index 09050e9..b07edbd 100644
--- a/wechat_jiaxuan/pages/detailDis/case.js
+++ b/wechat_jiaxuan/pages/detailDis/case.js
@@ -17,7 +17,7 @@
this.setData({
bottomLift: app.bottomLift
})
- this.getDetail(options.id)
+ this.getDetail(options.id, options.userId || '')
actionDo({
actionType: 'view',
id: options.id
@@ -63,8 +63,8 @@
})
})
},
- getDetail(id) {
- getWholecaseInfo({id}).then(res => {
+ getDetail(id, userId) {
+ getWholecaseInfo({id, salesId: userId || null}).then(res => {
this.setData({ info: res.data })
wx.setNavigationBarTitle({
title: res.data.title
diff --git a/wechat_jiaxuan/pages/detailDis/case.json b/wechat_jiaxuan/pages/detailDis/case.json
index 1405880..e1ade56 100644
--- a/wechat_jiaxuan/pages/detailDis/case.json
+++ b/wechat_jiaxuan/pages/detailDis/case.json
@@ -1,6 +1,7 @@
{
"usingComponents": {
"van-popup": "@vant/weapp/popup/index",
+ "idCard": "../../components/idCard/index",
"mp-html": "mp-html"
},
"navigationBarTitleText": ""
diff --git a/wechat_jiaxuan/pages/detailDis/case.wxml b/wechat_jiaxuan/pages/detailDis/case.wxml
index 7aa7378..58c1914 100644
--- a/wechat_jiaxuan/pages/detailDis/case.wxml
+++ b/wechat_jiaxuan/pages/detailDis/case.wxml
@@ -1,4 +1,6 @@
<view class="container">
+ <!-- 鍚嶇墖 -->
+ <idCard users="{{ info.users }}" wx:if="{{ info.users && info.users.id }}" />
<view class="main_title">{{ info.title }}</view>
<view class="time">鍙戝竷鏃堕棿锛歿{ info.publishDt }}</view>
<view class="fullview_wrap">
diff --git a/wechat_jiaxuan/pages/detailDis/realpic.js b/wechat_jiaxuan/pages/detailDis/realpic.js
index 9d56aa5..c62d0be 100644
--- a/wechat_jiaxuan/pages/detailDis/realpic.js
+++ b/wechat_jiaxuan/pages/detailDis/realpic.js
@@ -20,7 +20,7 @@
this.setData({
bottomLift: app.bottomLift
})
- this.getDetail(options.id)
+ this.getDetail(options.id, options.userId || '')
actionDo({
actionType: 'view',
id: options.id
@@ -42,8 +42,8 @@
this.setData({info})
})
},
- getDetail(id) {
- getRealcaseInfo({id}).then(res => {
+ getDetail(id, userId) {
+ getRealcaseInfo({id, salesId: userId || null}).then(res => {
this.setData({ info: res.data })
wx.setNavigationBarTitle({
title: res.data.title
diff --git a/wechat_jiaxuan/pages/detailDis/realpic.json b/wechat_jiaxuan/pages/detailDis/realpic.json
index 45a3118..9e0b826 100644
--- a/wechat_jiaxuan/pages/detailDis/realpic.json
+++ b/wechat_jiaxuan/pages/detailDis/realpic.json
@@ -1,6 +1,7 @@
{
"usingComponents": {
- "van-popup": "@vant/weapp/popup/index"
+ "van-popup": "@vant/weapp/popup/index",
+ "idCard": "../../components/idCard/index"
},
"navigationBarTitleText": ""
}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/detailDis/realpic.wxml b/wechat_jiaxuan/pages/detailDis/realpic.wxml
index 277ecb0..a1e0b86 100644
--- a/wechat_jiaxuan/pages/detailDis/realpic.wxml
+++ b/wechat_jiaxuan/pages/detailDis/realpic.wxml
@@ -1,4 +1,6 @@
<view class="container">
+ <!-- 鍚嶇墖 -->
+ <idCard users="{{ info.users }}" wx:if="{{ info.users && info.users.id }}" />
<view class="main_title">{{ info.title }}</view>
<view class="time">鍙戝竷鏃堕棿锛歿{ info.publishDt }}</view>
<image class="info_item" wx:for="{{ info.contentImgList }}" src="{{ item }}" mode="widthFix"></image>
diff --git a/wechat_jiaxuan/pages/store/staff.less b/wechat_jiaxuan/pages/store/staff.less
index 37e60ba..aee25cf 100644
--- a/wechat_jiaxuan/pages/store/staff.less
+++ b/wechat_jiaxuan/pages/store/staff.less
@@ -114,7 +114,6 @@
.line {
display: flex;
- align-items: center;
font-size: 30rpx;
margin-bottom: 42rpx;
.icon {
@@ -125,6 +124,9 @@
margin-left: 24rpx;
margin-right: 44rpx;
}
+ .val{
+ flex: 1;
+ }
}
}
.footer{
diff --git a/wechat_jiaxuan/pages/store/staff.wxml b/wechat_jiaxuan/pages/store/staff.wxml
index fb49595..7bb3c1b 100644
--- a/wechat_jiaxuan/pages/store/staff.wxml
+++ b/wechat_jiaxuan/pages/store/staff.wxml
@@ -20,7 +20,7 @@
<view class="card">
<image src="../../static/images/mingpian_bg_nianxian.png" class="bg"></image>
<view>浠庝笟骞撮檺</view>
- <view class="num">{{ info.jobDate || '-' }}</view>
+ <view class="num">{{ info.jobDate || '1' }}</view>
</view>
<view class="card">
<image src="../../static/images/mingpian_bg_kehu.png" class="bg"></image>
diff --git a/wechat_jiaxuan/pages/store/staff.wxss b/wechat_jiaxuan/pages/store/staff.wxss
index 8b4f773..91693be 100644
--- a/wechat_jiaxuan/pages/store/staff.wxss
+++ b/wechat_jiaxuan/pages/store/staff.wxss
@@ -102,7 +102,6 @@
}
.guide .line {
display: flex;
- align-items: center;
font-size: 30rpx;
margin-bottom: 42rpx;
}
@@ -114,6 +113,9 @@
margin-left: 24rpx;
margin-right: 44rpx;
}
+.guide .line .val {
+ flex: 1;
+}
.footer {
display: flex;
align-items: center;
diff --git a/wechat_jiaxuan/project.private.config.json b/wechat_jiaxuan/project.private.config.json
index 3a25112..0b321ac 100644
--- a/wechat_jiaxuan/project.private.config.json
+++ b/wechat_jiaxuan/project.private.config.json
@@ -53,7 +53,7 @@
},
{
"name": "",
- "pathName": "pages/kefu/index",
+ "pathName": "pages/store/staff",
"query": "",
"launchMode": "default",
"scene": null
diff --git a/wechat_jiaxuan/static/icon/ic_dianhua.png b/wechat_jiaxuan/static/icon/ic_dianhua.png
new file mode 100644
index 0000000..96dcb5f
--- /dev/null
+++ 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
new file mode 100644
index 0000000..aeb5127
--- /dev/null
+++ b/wechat_jiaxuan/static/icon/ic_mingpian.png
Binary files differ
diff --git a/wechat_jiaxuan/utils/config.js b/wechat_jiaxuan/utils/config.js
index 9e3fb71..1448239 100644
--- a/wechat_jiaxuan/utils/config.js
+++ b/wechat_jiaxuan/utils/config.js
@@ -1,8 +1,8 @@
-// export const baseUrl = 'https://jiaxuan.zbom.com/jx/wechat/' //姝ｅ紡鏈嶅姟鍣�
-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/'
--
Gitblit v1.9.3