From 28c725308aaf418e9032964ffcf5ca3b0d8a1208 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 25 七月 2024 17:13:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
wechat_staff/pages/work/index.json | 4
wechat_staff/pages/promotion/index.js | 8
wechat_staff/pages/index/index.wxss | 6
wechat_staff/static/icon/ic_select.png | 0
wechat_jiaxuan/components/disProduct/index.less | 3
wechat_jiaxuan/pages/detailDis/product.wxml | 12
wechat_jiaxuan/pages/detailDis/realpic.wxml | 2
wechat_jiaxuan/pages/store/staff.less | 4
wechat_staff/static/icon/ic_kehuxihuan.png | 0
wechat_jiaxuan/components/idCard/index.json | 4
wechat_staff/utils/downloadSaveFile.js | 141 ++++
wechat_staff/pages/consult/detail.wxml | 57 +
wechat_staff/pages/promotion/index.wxss | 11
wechat_jiaxuan/static/icon/ic_mingpian.png | 0
wechat_staff/pages/webView/index.js | 31
wechat_jiaxuan/pages/consult/detail.js | 6
wechat_jiaxuan/pages/detailDis/case.wxml | 2
wechat_staff/pages/kefu/select.less | 1
wechat_staff/pages/webView/index.wxml | 6
wechat_jiaxuan/components/idCard/index.wxss | 55 +
wechat_staff/pages/consult/consult.less | 29
wechat_staff/pages/download/index.wxml | 40 +
wechat_staff/pages/kefu/fond.less | 5
wechat_staff/components/buoyClient/index.wxml | 1
wechat_staff/components/disRealpic/index.wxss | 1
wechat_staff/pages/promotion/index.json | 1
wechat_staff/pages/consult/consult.json | 5
wechat_staff/components/disRealpic/index.js | 2
wechat_jiaxuan/pages/detailDis/realpic.json | 3
wechat_staff/pages/promotion/index.less | 6
wechat_staff/pages/kefu/fond.js | 127 +++
wechat_staff/static/icon/ic_select_sel.png | 0
wechat_jiaxuan/components/idCard/index.js | 32 +
wechat_staff/pages/work/index.less | 34 +
wechat_staff/pages/consult/detail.wxss | 35
wechat_staff/components/disProduct/index.less | 3
wechat_jiaxuan/pages/store/staff.wxml | 2
wechat_staff/pages/store/staff.js | 2
wechat_staff/pages/kefu/select.js | 37
wechat_staff/pages/download/index.json | 4
wechat_staff/pages/consult/consult.wxss | 31
wechat_jiaxuan/pages/detailDis/product.js | 6
wechat_staff/pages/index/index.less | 7
wechat_staff/utils/config.js | 2
wechat_staff/pages/work/index.js | 22
wechat_staff/static/icon/ic_mingpian.png | 0
wechat_staff/pages/detailDis/case.js | 8
wechat_jiaxuan/utils/config.js | 2
wechat_staff/pages/detailDis/realpic.js | 8
wechat_staff/components/disCase/index.js | 1
wechat_staff/pages/detailDis/product.wxml | 4
wechat_staff/components/buoyClient/index.js | 18
wechat_jiaxuan/pages/detailDis/product.less | 6
wechat_staff/pages/download/index.js | 166 ++++
wechat_staff/pages/download/index.wxss | 49 +
wechat_staff/components/buoyClient/index.wxss | 14
wechat_staff/components/buoyClient/index.less | 14
wechat_staff/pages/download/index.less | 49 +
wechat_jiaxuan/app.js | 10
wechat_staff/pages/kefu/fond.wxss | 7
wechat_jiaxuan/pages/store/staff.wxss | 4
wechat_staff/project.private.config.json | 2
wechat_staff/pages/kefu/select.wxml | 4
server/service/src/main/java/com/doumee/core/utils/Constants.java | 2
wechat_jiaxuan/static/icon/ic_dianhua.png | 0
wechat_jiaxuan/pages/consult/detail.wxml | 3
wechat_staff/pages/consult/consult.wxml | 49
wechat_staff/pages/userinfo/index.wxml | 10
wechat_staff/components/disRealpic/index.less | 1
wechat_jiaxuan/pages/index/index.less | 24
wechat_staff/pages/kefu/select.wxss | 1
wechat_jiaxuan/components/idCard/index.less | 59 +
wechat_staff/components/disProduct/index.js | 8
wechat_staff/components/disCase/index.less | 1
wechat_jiaxuan/pages/detailDis/case.js | 6
wechat_jiaxuan/project.private.config.json | 2
wechat_staff/pages/work/index.wxml | 36
wechat_staff/components/disProduct/index.wxss | 3
wechat_jiaxuan/pages/consult/consult.json | 3
wechat_staff/api/index.js | 15
wechat_staff/pages/consult/detail.json | 7
wechat_jiaxuan/components/disProduct/index.wxml | 2
wechat_staff/pages/consult/consult.js | 133 +++-
wechat_jiaxuan/pages/detailDis/product.json | 1
wechat_jiaxuan/pages/detailDis/case.json | 1
wechat_jiaxuan/pages/detailDis/realpic.js | 6
wechat_staff/pages/index/index.wxml | 11
wechat_staff/pages/consult/detail.js | 54 +
wechat_staff/pages/kefu/fond.wxml | 19
wechat_staff/pages/discover/discover.js | 20
wechat_jiaxuan/pages/detailDis/product.wxss | 4
wechat_staff/components/disCase/index.wxss | 1
wechat_staff/pages/detailDis/product.js | 11
wechat_staff/pages/userinfo/index.js | 4
wechat_staff/pages/promotion/index.wxml | 2
wechat_staff/components/detailFooter/index.js | 14
wechat_staff/static/icon/ic_yixiang.png | 0
wechat_staff/package-lock.json | 38
wechat_jiaxuan/components/idCard/index.wxml | 17
wechat_staff/pages/consult/detail.less | 38 +
wechat_staff/pages/index/index.js | 23
wechat_staff/pages/work/index.wxss | 39 +
102 files changed, 1,410 insertions(+), 414 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/core/utils/Constants.java b/server/service/src/main/java/com/doumee/core/utils/Constants.java
index 7620899..53dd693 100644
--- a/server/service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/service/src/main/java/com/doumee/core/utils/Constants.java
@@ -585,7 +585,7 @@
}
public static void main(String[] args) {
- getImgsFromHtmlText("content: \"<p><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240429/1973fb5c-58ea-4d51-b05f-87c7cd098d9e.jpg\"/></p><p><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240429/04c46631-c42c-4b2f-9c92-df9ddb216f73.jpg\"/></p><p><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240429/6dc9d538-d260-4970-8580-c248924e3d3f.jpg\"/></p><p><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240429/a2ca4806-8d69-40c5-9a89-36381780369d.jpg\"/></p><p><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240429/e9bf2963-5b52-411a-8348-c1259a3bd6d3.jpg\"/></p><p><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240429/1872ed8b-35f7-4850-8aed-b3bf63573da6.jpg\"/></p><p><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240429/afc39c7d-8c46-4f71-9212-6c8bc797c92c.jpg\"/></p><p><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240429/78b11cda-fb5b-4983-aa6c-ed371bcd5dcc.jpg\"/></p><p><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240429/f09b5a64-7d8a-423c-b423-f45d0e08e010.jpg\"/></p><p><br/></p>\"\n");
+ getImgsFromHtmlText("<p><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240423/40627809-6058-428c-b02a-6715d7b1735a.jpg\" title=\"\" alt=\"\"/><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240423/8d9d1737-43c0-4628-a982-ed0832b65464.jpg\" title=\"\" alt=\"\"/><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240423/8aacf1bb-5bf0-46dc-bd25-a4f335078711.jpg\" title=\"\" alt=\"\"/><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240423/5d5e5af4-fd4e-402f-81d1-e0cc498d55d4.jpg\" title=\"\" alt=\"\"/><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240423/4632b61b-0de2-4f73-8b54-f4d6aa3de2db.jpg\" title=\"\" alt=\"\"/><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240423/a9eb1a9c-23c7-48aa-9103-cd697158db75.jpg\" title=\"\" alt=\"\"/><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240423/a0004771-d606-46fe-b872-07640ee1695a.jpg\" title=\"\" alt=\"\"/><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240423/d437bacb-ec87-404e-baa4-a6c040c35216.jpg\" title=\"\" alt=\"\"/><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240423/b2c61dc9-fdce-42b1-97d1-12cb993ae8cf.jpg\" title=\"\" alt=\"\"/><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240423/e8e27d17-61b0-4035-b229-9ba1c73869eb.jpg\" title=\"\" alt=\"\"/><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240423/7f43615d-079e-4133-9e5f-3a1fd19090b8.jpg\" title=\"\" alt=\"\"/><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240423/75274ffb-100f-4016-8352-20da9003f192.jpg\" title=\"\" alt=\"\"/><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240423/6810dd81-a6bc-4140-bfd7-d9c3e51c2439.jpg\" title=\"\" alt=\"\"/><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240423/0dfab735-0a05-47ef-aaa9-728510ad1d2f.jpg\" title=\"\" alt=\"\"/><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240423/ca3b095f-17f2-439b-9cd3-10fe60257dd9.jpg\" title=\"\" alt=\"\"/></p>");
}
diff --git a/wechat_jiaxuan/app.js b/wechat_jiaxuan/app.js
index 2920c51..1cc3c46 100644
--- a/wechat_jiaxuan/app.js
+++ b/wechat_jiaxuan/app.js
@@ -7,7 +7,7 @@
bottomLift: ''
},
onLaunch: function (op) {
- console.log('options', op.query.scene);
+ console.log('options', op.query.scene)
let pathMap = [
'/pages/detailDis/product',
'/pages/detailDis/case',
@@ -18,7 +18,7 @@
//鑾峰彇褰撳墠璁惧淇℃伅
const WindowInfo = wx.getWindowInfo()
if (WindowInfo.safeArea.top > 20) {
- this.globalData.bottomLift = WindowInfo.screenHeight - WindowInfo.safeArea.bottom;
+ this.globalData.bottomLift = WindowInfo.screenHeight - WindowInfo.safeArea.bottom
}
// 鎺堟潈鐧诲綍
wx.login({
@@ -35,10 +35,10 @@
wx.setStorageSync('openid', res.data.member.openid)
wx.setStorageSync('sessionKey', res.data.sessionKey)
wx.setStorageSync('token', res.data.token)
- if(op.query.scene){
- let temp = op.query.scene.split('&')
+ if (op.query.scene) {
+ let temp = op.query.scene.split('_')
wx.navigateTo({
- url: `${pathMap[temp[1]]}?id=${temp[0]}`,
+ url: `${pathMap[temp[1]]}?id=${temp[0]}&userId=${temp[2]}`,
})
}
} else {
diff --git a/wechat_jiaxuan/components/disProduct/index.less b/wechat_jiaxuan/components/disProduct/index.less
index ddbda83..ed393c2 100644
--- a/wechat_jiaxuan/components/disProduct/index.less
+++ b/wechat_jiaxuan/components/disProduct/index.less
@@ -182,7 +182,8 @@
position: relative;
.img {
- width: 100%;
+ width: 242rpx;
+ max-height: 216rpx;
}
.new {
diff --git a/wechat_jiaxuan/components/disProduct/index.wxml b/wechat_jiaxuan/components/disProduct/index.wxml
index 578a03f..3ee90c9 100644
--- a/wechat_jiaxuan/components/disProduct/index.wxml
+++ b/wechat_jiaxuan/components/disProduct/index.wxml
@@ -39,7 +39,7 @@
<scroll-view bindscrolltolower="scrolltolower" scroll-y enable-passive enable-flex class="goods_list">
<view wx:for="{{ datalist }}" data-id="{{item.id}}" class="item" bindtap="handleDetail">
<view class="img_wrap">
- <image src="{{ item.coverImage }}" class="img" mode="widthFix"></image>
+ <image src="{{ item.coverImage }}" class="img" mode="aspectFit"></image>
<image wx:if="{{ item.isNew }}" class="new" src="../../static/icon/chanpin_ic_new@2x.png" mode="widthFix"></image>
</view>
<view class="name">{{ item.title }}</view>
diff --git a/wechat_jiaxuan/components/idCard/index.js b/wechat_jiaxuan/components/idCard/index.js
new file mode 100644
index 0000000..f5bcdc9
--- /dev/null
+++ b/wechat_jiaxuan/components/idCard/index.js
@@ -0,0 +1,32 @@
+// components/idCard/index.js
+Component({
+ /**
+ * 缁勪欢鐨勫睘鎬у垪琛�
+ */
+ properties: {
+ users: Object
+ },
+
+ /**
+ * 缁勪欢鐨勫垵濮嬫暟鎹�
+ */
+ data: {
+
+ },
+
+ /**
+ * 缁勪欢鐨勬柟娉曞垪琛�
+ */
+ 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.json b/wechat_jiaxuan/components/idCard/index.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/wechat_jiaxuan/components/idCard/index.json
@@ -0,0 +1,4 @@
+{
+ "component": true,
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/wechat_jiaxuan/components/idCard/index.less b/wechat_jiaxuan/components/idCard/index.less
new file mode 100644
index 0000000..e89bf2d
--- /dev/null
+++ b/wechat_jiaxuan/components/idCard/index.less
@@ -0,0 +1,59 @@
+.user {
+ width: 750rpx;
+ padding: 0 40rpx;
+ height: 148rpx;
+ background: #FFFFFF;
+ border-radius: 8rpx;
+ padding: 0 30rpx;
+ display: flex;
+ align-items: center;
+ .content {
+ flex: 1;
+
+ .name {
+ font-size: 30rpx;
+ margin-bottom: 12rpx;
+ }
+
+ .desc {
+ font-size: 24rpx;
+ color: #999999;
+ }
+ }
+
+ .avatar {
+ width: 80rpx;
+ height: 80rpx;
+ border-radius: 50%;
+ margin-right: 24rpx;
+ }
+
+ .btns{
+ display: flex;
+ .item{
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ margin-left: 70rpx;
+ font-size: 20rpx;
+ color: #333333;
+ .icon{
+ margin-bottom: 4rpx;
+ width: 44rpx;
+ height: 44rpx;
+ }
+ }
+ }
+ .btn {
+ width: 118rpx;
+ height: 56rpx;
+ line-height: 52rpx;
+ text-align: center;
+ background: var(--themeColor);
+ border-radius: 8rpx;
+ font-weight: 500;
+ font-size: 26rpx;
+ color: #fff;
+ }
+}
\ No newline at end of file
diff --git a/wechat_jiaxuan/components/idCard/index.wxml b/wechat_jiaxuan/components/idCard/index.wxml
new file mode 100644
index 0000000..772d86a
--- /dev/null
+++ b/wechat_jiaxuan/components/idCard/index.wxml
@@ -0,0 +1,17 @@
+<view class="user">
+ <image class="avatar" src="{{ users.imgurlFull ? users.imgurlFull : '../../static/images/default_avatar.png' }}"></image>
+ <view class="content">
+ <view class="name">{{ users.name }}</view>
+ <view class="desc">瀵艰喘锝渰{ users.jobDate || 1 }}骞寸粡楠�</view>
+ </view>
+ <view class="btns">
+ <view bindtap="jumpCard" class="item">
+ <image class="icon" src="../../static/icon/ic_mingpian.png"></image>
+ <text>鍚嶇墖</text>
+ </view>
+ <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
new file mode 100644
index 0000000..7372383
--- /dev/null
+++ b/wechat_jiaxuan/components/idCard/index.wxss
@@ -0,0 +1,55 @@
+.user {
+ width: 750rpx;
+ padding: 0 40rpx;
+ height: 148rpx;
+ background: #FFFFFF;
+ border-radius: 8rpx;
+ padding: 0 30rpx;
+ display: flex;
+ align-items: center;
+}
+.user .content {
+ flex: 1;
+}
+.user .content .name {
+ font-size: 30rpx;
+ margin-bottom: 12rpx;
+}
+.user .content .desc {
+ font-size: 24rpx;
+ color: #999999;
+}
+.user .avatar {
+ width: 80rpx;
+ height: 80rpx;
+ border-radius: 50%;
+ margin-right: 24rpx;
+}
+.user .btns {
+ display: flex;
+}
+.user .btns .item {
+ display: flex;
+ flex-direction: column;
+ 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;
+}
+.user .btn {
+ width: 118rpx;
+ height: 56rpx;
+ line-height: 52rpx;
+ text-align: center;
+ background: var(--themeColor);
+ border-radius: 8rpx;
+ font-weight: 500;
+ font-size: 26rpx;
+ color: #fff;
+}
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/product.js b/wechat_jiaxuan/pages/detailDis/product.js
index a9c7492..2827a2e 100644
--- a/wechat_jiaxuan/pages/detailDis/product.js
+++ b/wechat_jiaxuan/pages/detailDis/product.js
@@ -23,7 +23,7 @@
this.setData({
bottomLift: app.bottomLift
})
- this.getDetail(options.id)
+ this.getDetail(options.id, options.userId || '')
actionDo({
actionType: 'view',
id: options.id
@@ -52,9 +52,9 @@
})
})
},
- getDetail(id) {
+ getDetail(id, userId) {
getProductInfo({
- id
+ id, salesId: userId || null
}).then(res => {
this.setData({
info: res.data
diff --git a/wechat_jiaxuan/pages/detailDis/product.json b/wechat_jiaxuan/pages/detailDis/product.json
index afd9776..7d1fb55 100644
--- a/wechat_jiaxuan/pages/detailDis/product.json
+++ b/wechat_jiaxuan/pages/detailDis/product.json
@@ -2,6 +2,7 @@
"usingComponents": {
"van-popup": "@vant/weapp/popup/index",
"authCard": "/components/authCard/authCard",
+ "idCard": "../../components/idCard/index",
"mp-html": "mp-html"
},
"navigationBarTitleText": ""
diff --git a/wechat_jiaxuan/pages/detailDis/product.less b/wechat_jiaxuan/pages/detailDis/product.less
index fc3fb1c..041700f 100644
--- a/wechat_jiaxuan/pages/detailDis/product.less
+++ b/wechat_jiaxuan/pages/detailDis/product.less
@@ -7,7 +7,6 @@
padding: 0 30rpx;
display: flex;
align-items: center;
-
.content {
flex: 1;
@@ -24,6 +23,7 @@
.avatar {
width: 80rpx;
+ height: 80rpx;
border-radius: 50%;
margin-right: 24rpx;
}
@@ -40,7 +40,9 @@
color: #fff;
}
}
-
+.container{
+ padding-bottom: 200rpx;
+}
page {
background-color: #f7f7f7;
}
diff --git a/wechat_jiaxuan/pages/detailDis/product.wxml b/wechat_jiaxuan/pages/detailDis/product.wxml
index fffb970..d4294e6 100644
--- a/wechat_jiaxuan/pages/detailDis/product.wxml
+++ b/wechat_jiaxuan/pages/detailDis/product.wxml
@@ -1,12 +1,6 @@
-<view>
- <view class="user" wx:if="{{ false }}">
- <view class="avatar"></view>
- <view class="content">
- <view class="name">涓佹鏋�</view>
- <view class="desc">瀵艰喘锝�5骞寸粡楠�</view>
- </view>
- <view class="btn">鑱旂郴TA</view>
- </view>
+<view class="container">
+ <!-- 鍚嶇墖 -->
+ <idCard users="{{ info.users }}" wx:if="{{ info.users && info.users.id }}" />
<!-- banner杞挱 -->
<swiper class="banner_swiper" circular indicator-dots autoplay style="height:{{bannerHeight}}rpx" duration>
<block wx:for="{{ info.bannerImgList }}">
diff --git a/wechat_jiaxuan/pages/detailDis/product.wxss b/wechat_jiaxuan/pages/detailDis/product.wxss
index e956d25..e9483c7 100644
--- a/wechat_jiaxuan/pages/detailDis/product.wxss
+++ b/wechat_jiaxuan/pages/detailDis/product.wxss
@@ -21,6 +21,7 @@
}
.user .avatar {
width: 80rpx;
+ height: 80rpx;
border-radius: 50%;
margin-right: 24rpx;
}
@@ -35,6 +36,9 @@
font-size: 26rpx;
color: #fff;
}
+.container {
+ padding-bottom: 200rpx;
+}
page {
background-color: #f7f7f7;
}
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/index/index.less b/wechat_jiaxuan/pages/index/index.less
index 6d34ac1..a3fd9bc 100644
--- a/wechat_jiaxuan/pages/index/index.less
+++ b/wechat_jiaxuan/pages/index/index.less
@@ -114,19 +114,16 @@
}
.strategy {
- padding: 40rpx 40rpx;
+ padding: 80rpx 40rpx;
background: #F7F7F7;
-
- .item {
+ .item{
position: relative;
-
image {
width: 100%;
height: 100%;
position: absolute;
}
-
- text {
+ text{
color: #fff;
position: absolute;
bottom: 40rpx;
@@ -135,28 +132,27 @@
font-weight: 500;
}
}
-
+
.line {
display: flex;
justify-content: space-between;
-
+
.line_left {
width: 324rpx;
- height: 304rpx;
+ height: 340rpx;
}
-
+
.line_right {
.item {
width: 322rpx;
- height: 140rpx;
-
+ height: 160rpx;
&:nth-last-child(1) {
- margin-top: 24rpx;
+ margin-top: 20rpx;
}
}
}
}
-
+
.home_id {
width: 670rpx;
height: 240rpx;
diff --git a/wechat_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 718dce6..1448239 100644
--- a/wechat_jiaxuan/utils/config.js
+++ b/wechat_jiaxuan/utils/config.js
@@ -1,6 +1,6 @@
-// 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' //娴嬭瘯鏈嶅姟鍣�
diff --git a/wechat_staff/api/index.js b/wechat_staff/api/index.js
index 924f405..ba78727 100644
--- a/wechat_staff/api/index.js
+++ b/wechat_staff/api/index.js
@@ -23,6 +23,14 @@
data
})
}
+
+export const getUserCard = (data) => {
+ return request({
+ url: '/web/personnel/getUserCard',
+ method: "POST",
+ data
+ })
+}
// 鑾峰彇鎵嬫満鍙�
export const getWxMiniPhone = (data) => {
return request({
@@ -31,6 +39,7 @@
data
})
}
+
// 缁戝畾Openid
export const bindingOpenid = (data) => {
return request({
@@ -142,9 +151,10 @@
data
})
}
-export const getUserCard = (data) => {
+// 鎵归噺娣诲姞鍠滄缁欏鎴�
+export const batchAddLike = (data) => {
return request({
- url: '/web/personnel/getUserCard',
+ url: '/web/personnel/batchAddLike',
method: "POST",
data
})
@@ -308,7 +318,6 @@
data
})
}
-// 灏忕▼搴忔敞閿�
export const getCrmAuthUrl = (data) => {
return request({
url: '/web/customer/getCrmAuthUrl',
diff --git a/wechat_staff/components/buoyClient/index.js b/wechat_staff/components/buoyClient/index.js
index 72c265e..738093c 100644
--- a/wechat_staff/components/buoyClient/index.js
+++ b/wechat_staff/components/buoyClient/index.js
@@ -9,12 +9,15 @@
value: '0'
}
},
-
+ attached() {
+ const enjoyList = wx.getStorageSync('enjoyList') || []
+ this.setData({ enjoyList })
+ },
/**
* 缁勪欢鐨勫垵濮嬫暟鎹�
*/
data: {
-
+ enjoyList: []
},
/**
@@ -26,10 +29,15 @@
const i = e.currentTarget.dataset.i
if(i == 2){
getCrmAuthUrl({type:1}).then(res => {
- console.log(res.data)
- this.setData({ url: res.data })
+ this.setData({ url: res.data })
+ let link = res.data
wx.navigateTo({
- url: '/pages/webView/index?link=' + res.data,
+ url: '/pages/webView/index',
+ success: function(res) {
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
+ console.log(link)
+ res.eventChannel.emit('data',{link:link} );
+ }
})
})
}
diff --git a/wechat_staff/components/buoyClient/index.less b/wechat_staff/components/buoyClient/index.less
index fd6a834..14b9a4e 100644
--- a/wechat_staff/components/buoyClient/index.less
+++ b/wechat_staff/components/buoyClient/index.less
@@ -14,6 +14,20 @@
font-size: 20rpx;
color: #666666;
margin-bottom: 20rpx;
+ position: relative;
+ .activeNum{
+ width: 28rpx;
+ height: 28rpx;
+ background: #F70303;
+ color: #fff;
+ font-size: 20rpx;
+ line-height: 26rpx;
+ text-align: center;
+ border-radius: 50%;
+ position: absolute;
+ top: -8rpx;
+ right: 8rpx;
+ }
&:nth-last-child(1){
margin-bottom: 0;
}
diff --git a/wechat_staff/components/buoyClient/index.wxml b/wechat_staff/components/buoyClient/index.wxml
index 2b4074c..956d4c1 100644
--- a/wechat_staff/components/buoyClient/index.wxml
+++ b/wechat_staff/components/buoyClient/index.wxml
@@ -3,6 +3,7 @@
<view class="item" data-i="0" bindtap="jumpPage">
<image src="../../static/icon/ic_kehuxihuan.png" mode="widthFix"></image>
<view>瀹㈡埛鍠滄</view>
+ <view class="activeNum">{{ enjoyList.length }}</view>
</view>
<view wx:if="{{ showPurpose && showPurpose == '1' }}" class="item" data-i="2" bindtap="jumpPage">
<image src="../../static/icon/ic_yixiang.png" mode="widthFix"></image>
diff --git a/wechat_staff/components/buoyClient/index.wxss b/wechat_staff/components/buoyClient/index.wxss
index 8c9009e..95f9728 100644
--- a/wechat_staff/components/buoyClient/index.wxss
+++ b/wechat_staff/components/buoyClient/index.wxss
@@ -14,6 +14,20 @@
font-size: 20rpx;
color: #666666;
margin-bottom: 20rpx;
+ position: relative;
+}
+.item .activeNum {
+ width: 28rpx;
+ height: 28rpx;
+ background: #F70303;
+ color: #fff;
+ font-size: 20rpx;
+ line-height: 26rpx;
+ text-align: center;
+ border-radius: 50%;
+ position: absolute;
+ top: -8rpx;
+ right: 8rpx;
}
.item:nth-last-child(1) {
margin-bottom: 0;
diff --git a/wechat_staff/components/detailFooter/index.js b/wechat_staff/components/detailFooter/index.js
index f2ffc03..f7dc550 100644
--- a/wechat_staff/components/detailFooter/index.js
+++ b/wechat_staff/components/detailFooter/index.js
@@ -1,8 +1,6 @@
import {
getContentShareImg
} from '../../api/index'
-const { HYEventBus } = require('hy-event-store')
-const eventBus = new HYEventBus()
Component({
/**
* 缁勪欢鐨勫睘鎬у垪琛�
@@ -56,7 +54,7 @@
} = this.data
let that = this
getContentShareImg({
- articleId: path + '&' + info.id,
+ articleId: `${info.id}_${path}`,
type: '1',
// pageUrl: path,
imgurl: info.coverImage,
@@ -95,12 +93,14 @@
})
},
batchDown() {
- setTimeout(() => {
- eventBus.emit('batchDown', [1,2,3])
- }, 1000)
+ const downloadList = this.data.info.imageurlList || []
+ wx.setStorageSync('downloadList', downloadList)
+ wx.setStorageSync('downloadConfig', {
+ path: this.data.path,id: this.data.info.id
+ })
wx.navigateTo({
url: '/pages/download/index',
- })
+ }, 1000)
},
closeCard() {
this.setData({ isShowPoster: false })
diff --git a/wechat_staff/components/disCase/index.js b/wechat_staff/components/disCase/index.js
index 96fca1a..60e2683 100644
--- a/wechat_staff/components/disCase/index.js
+++ b/wechat_staff/components/disCase/index.js
@@ -113,7 +113,6 @@
cateList[activeIndex].paramIndex = -1
cateList[activeIndex].paramName = ''
}
- this.setData({ pageNum: 1,dataList: [],total: 0})
this.setData({ tagCodes, cateList })
console.log('tagCodes', tagCodes);
},
diff --git a/wechat_staff/components/disCase/index.less b/wechat_staff/components/disCase/index.less
index 52e9388..f168ad9 100644
--- a/wechat_staff/components/disCase/index.less
+++ b/wechat_staff/components/disCase/index.less
@@ -10,6 +10,7 @@
background-color: #F7F7F7;
image{
width: 28rpx;
+ height: 28rpx;
margin-right: 16rpx;
}
}
diff --git a/wechat_staff/components/disCase/index.wxss b/wechat_staff/components/disCase/index.wxss
index ef73ac8..57546c4 100644
--- a/wechat_staff/components/disCase/index.wxss
+++ b/wechat_staff/components/disCase/index.wxss
@@ -11,6 +11,7 @@
}
.search_wrap image {
width: 28rpx;
+ height: 28rpx;
margin-right: 16rpx;
}
.app {
diff --git a/wechat_staff/components/disProduct/index.js b/wechat_staff/components/disProduct/index.js
index cc33cd8..f14e186 100644
--- a/wechat_staff/components/disProduct/index.js
+++ b/wechat_staff/components/disProduct/index.js
@@ -6,10 +6,6 @@
properties: {
menuButtonInfo: Object
},
-
- /**
- * 缁勪欢鐨勫垵濮嬫暟鎹�
- */
data: {
activeIndex: -1,
activeParam: [],
@@ -118,8 +114,6 @@
const paramIndex = e.currentTarget.dataset.index
const { secondCateList, tagCodes, activeParam, activeIndex } = this.data
const index = tagCodes.indexOf(code)
- console.log('code', code);
- console.log('tagCodes', tagCodes);
if(index === -1){
// 鍚宲aram閲宑ode閲嶅
if(activeParam && activeParam.length > 0){
@@ -138,7 +132,6 @@
secondCateList[activeIndex].paramIndex = -1
secondCateList[activeIndex].paramName = ''
}
- this.setData({ pageNum: 1,datalist: [],total: 0})
this.setData({ tagCodes, secondCateList })
},
changeShowParams(e){
@@ -164,6 +157,7 @@
item.paramName = ''
})
this.setData({ tagCodes: [],activeParam: [],secondCateList,activeIndex: -1 })
+ this.getList()
},
subParam() {
this.setData({ activeParam: [] })
diff --git a/wechat_staff/components/disProduct/index.less b/wechat_staff/components/disProduct/index.less
index ce63b2a..fcd751b 100644
--- a/wechat_staff/components/disProduct/index.less
+++ b/wechat_staff/components/disProduct/index.less
@@ -13,6 +13,7 @@
image {
width: 28rpx;
+ height: 28rpx;
margin-right: 16rpx;
}
}
@@ -183,7 +184,7 @@
.img {
width: 242rpx;
- height: 216rpx;
+ max-height: 216rpx;
}
.new {
diff --git a/wechat_staff/components/disProduct/index.wxss b/wechat_staff/components/disProduct/index.wxss
index e06d6ca..90b50c0 100644
--- a/wechat_staff/components/disProduct/index.wxss
+++ b/wechat_staff/components/disProduct/index.wxss
@@ -11,6 +11,7 @@
}
.search_wrap image {
width: 28rpx;
+ height: 28rpx;
margin-right: 16rpx;
}
.app {
@@ -168,7 +169,7 @@
}
.main_content .main_right .goods_list .item .img_wrap .img {
width: 242rpx;
- height: 216rpx;
+ max-height: 216rpx;
}
.main_content .main_right .goods_list .item .img_wrap .new {
width: 72rpx;
diff --git a/wechat_staff/components/disRealpic/index.js b/wechat_staff/components/disRealpic/index.js
index 034a81c..d5fea88 100644
--- a/wechat_staff/components/disRealpic/index.js
+++ b/wechat_staff/components/disRealpic/index.js
@@ -139,9 +139,7 @@
cateList[activeIndex].paramIndex = -1
cateList[activeIndex].paramName = ''
}
- this.setData({ pageNum: 1,dataList: [],total: 0})
this.setData({ tagCodes, cateList })
- console.log('tagCodes', tagCodes);
},
cancelParam() {
const { cateList } = this.data
diff --git a/wechat_staff/components/disRealpic/index.less b/wechat_staff/components/disRealpic/index.less
index 6ed5ae6..8064645 100644
--- a/wechat_staff/components/disRealpic/index.less
+++ b/wechat_staff/components/disRealpic/index.less
@@ -11,6 +11,7 @@
image {
width: 28rpx;
+ height: 28rpx;
margin-right: 16rpx;
}
}
diff --git a/wechat_staff/components/disRealpic/index.wxss b/wechat_staff/components/disRealpic/index.wxss
index 44f0e3c..a0a1dd5 100644
--- a/wechat_staff/components/disRealpic/index.wxss
+++ b/wechat_staff/components/disRealpic/index.wxss
@@ -11,6 +11,7 @@
}
.search_wrap image {
width: 28rpx;
+ height: 28rpx;
margin-right: 16rpx;
}
.app {
diff --git a/wechat_staff/package-lock.json b/wechat_staff/package-lock.json
index 1a3fc03..6816386 100644
--- a/wechat_staff/package-lock.json
+++ b/wechat_staff/package-lock.json
@@ -1,54 +1,38 @@
{
"name": "wechat_staff",
"version": "1.0.0",
- "lockfileVersion": 3,
+ "lockfileVersion": 1,
"requires": true,
- "packages": {
- "": {
- "name": "wechat_staff",
- "version": "1.0.0",
- "license": "ISC",
- "dependencies": {
- "@vant/weapp": "^1.11.6",
- "hy-event-store": "^1.3.1",
- "miniprogram-sm-crypto": "^0.3.13",
- "moment": "^2.30.1",
- "mp-html": "^2.5.0"
- },
- "devDependencies": {}
- },
- "node_modules/@vant/weapp": {
+ "dependencies": {
+ "@vant/weapp": {
"version": "1.11.6",
"resolved": "https://registry.npmmirror.com/@vant/weapp/-/weapp-1.11.6.tgz",
"integrity": "sha512-a3heReWYT2gNdsyj6x1hBwsM8V8NrjcPAmle86NH2CD2V/i/h0le75piW6KntSfOPCwekVWMBKhysNrBpJeKdw=="
},
- "node_modules/hy-event-store": {
+ "hy-event-store": {
"version": "1.3.1",
- "resolved": "https://registry.npmjs.org/hy-event-store/-/hy-event-store-1.3.1.tgz",
+ "resolved": "https://registry.npmmirror.com/hy-event-store/-/hy-event-store-1.3.1.tgz",
"integrity": "sha512-uD+14mz4ONiAs9cX/csjUJ2pHTPFciE3JvIbZ+lsbaXopZWbnETEjwJ0a4l5GqNGcltcW3gJjlnUXCJPBoABfg=="
},
- "node_modules/jsbn": {
+ "jsbn": {
"version": "1.1.0",
"resolved": "https://registry.npmmirror.com/jsbn/-/jsbn-1.1.0.tgz",
"integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A=="
},
- "node_modules/miniprogram-sm-crypto": {
+ "miniprogram-sm-crypto": {
"version": "0.3.13",
"resolved": "https://registry.npmmirror.com/miniprogram-sm-crypto/-/miniprogram-sm-crypto-0.3.13.tgz",
"integrity": "sha512-H7qwbCEmIXZzekCSgEWeHh1mb4cnz0E42YH3U5xqpOaJBB2Sj9ySq0hTGv0f+Jwo5SknABR6fw+EtjnMyJ/O/Q==",
- "dependencies": {
+ "requires": {
"jsbn": "^1.1.0"
}
},
- "node_modules/moment": {
+ "moment": {
"version": "2.30.1",
"resolved": "https://registry.npmmirror.com/moment/-/moment-2.30.1.tgz",
- "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
- "engines": {
- "node": "*"
- }
+ "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how=="
},
- "node_modules/mp-html": {
+ "mp-html": {
"version": "2.5.0",
"resolved": "https://registry.npmmirror.com/mp-html/-/mp-html-2.5.0.tgz",
"integrity": "sha512-uvBH5tIaDIlj8qaxsvNXU3RKX0jvXOo3J6FAi/notUv/ds6j79UUTE82aDkxxUk0eLUU0CiCqMrR7WWnytk30Q=="
diff --git a/wechat_staff/pages/consult/consult.js b/wechat_staff/pages/consult/consult.js
index 22a8ed7..5e74e3b 100644
--- a/wechat_staff/pages/consult/consult.js
+++ b/wechat_staff/pages/consult/consult.js
@@ -1,39 +1,113 @@
-// pages/consult/consult.js
+import { getZhongTaiProductNewsPage, getCatalogList,actionDo } from '../../api/index'
Page({
/**
* 椤甸潰鐨勫垵濮嬫暟鎹�
*/
data: {
- category: ['鏂板搧涓婂競', '涓撳埄璇佷功', '澶х墝鎺堟潈','鏂板搧涓婂競', '涓撳埄璇佷功', '澶х墝鎺堟潈'],
- secondCategory: ['绾у垎绫�','绾у垎绫�','绾у垎绫�','绾у垎绫�','绾у垎绫�','绾у垎绫�'],
- activeCate: '',
- seActiveCate: '',
- dataList: []
- },
+ category: [],
+ secondCategory: [],
+ catalogCode: '',
+ tagCode: '',
+ query: '',
+ dataList: [],
+ total: 0,
+ pageNum: 1,
+ pageSize: 10,
+
+ // height: 0,
+ // top: 0,
+ },
+ onLoad(options) {
+ this.getCate()
+ },
+ onReachBottom() {
+ console.log('瑙﹀簳浜嬩欢');
+ const { total, dataList, pageNum } = this.data
+ if(total > dataList.length){
+ this.setData({ pageNum: pageNum + 1 })
+ this.getList()
+ }else{
+ wx.showToast({
+ title: '鏆傛棤鏇村鏁版嵁',
+ icon: 'none'
+ })
+ }
+ },
+ getCate() {
+ getCatalogList({catalogCode: 'product_info'}).then(res => {
+ this.setData({ category: res.data })
+ if(res.data && res.data.length > 0){
+ this.setData({catalogCode: res.data[0].code})
+ this.gettag()
+ this.getList()
+ }
+ })
+ },
+ gettag() {
+ const { catalogCode } = this.data
+ getCatalogList({
+ catalogCode
+ }).then(res => {
+ if(res.data && res.data.length > 0){
+ this.setData({ secondCategory: res.data })
+ }
+ })
+ },
itemClick(e) {
- const { id } = e.target.dataset
- console.log(e.target.dataset);
- wx.navigateTo({
- url: '/pages/consult/detail',
+ const item = e.currentTarget.dataset.item
+ actionDo({actionType: 'view',id: item.id})
+ if(item.contentType == 'link'){
+ wx.navigateTo({
+ url: '/pages/webView/index?link=' + item.content,
+ success: function(res) {
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
+ res.eventChannel.emit('acceptDataFromOpenerPage', { link: item.openContent, title: item.title })
+ }
+ })
+ }else{
+ wx.navigateTo({
+ url: '/pages/consult/detail?id='+item.id,
+ })
+ }
+ },
+ getList() {
+ const { pageNum, pageSize, catalogCode, tagCode, query } = this.data
+ getZhongTaiProductNewsPage({
+ pageNum, pageSize, query, catalogCode: tagCode || catalogCode
+ }).then(res => {
+ if(res.data){
+ this.setData({
+ dataList: [ ...this.data.dataList, ...res.data.records ],
+ total: res.data.total
+ })
+ }
+
})
},
cateClick(e) {
- const { index } = e.target.dataset
- console.log(index);
+ const { code } = e.currentTarget.dataset
+ this.setData({ catalogCode: code,secondCategory: [], tagCode: '' })
+ this.gettag()
+ this.getList()
+ this.setData({ dataList: [], pageNum: 1 })
},
seCateClick(e) {
- const { index } = e.target.dataset
- console.log(index);
+ const { code } = e.currentTarget.dataset
+ if(this.data.tagCode == code){
+ this.setData({ tagCode: '' })
+ }else{
+ this.setData({ tagCode: code })
+ }
+ this.setData({ dataList: [], pageNum: 1 })
+ this.getList()
},
- onLoad(options) {
-
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
- */
+ priviewFull(e){
+ const item = e.currentTarget.dataset.item
+ console.log('item', item);
+
+ },
onReady() {
},
@@ -58,21 +132,6 @@
onUnload() {
},
-
- /**
- * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
- */
- onPullDownRefresh() {
-
- },
-
- /**
- * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
- */
- onReachBottom() {
-
- },
-
/**
* 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
*/
diff --git a/wechat_staff/pages/consult/consult.json b/wechat_staff/pages/consult/consult.json
index b756496..0fb9dcb 100644
--- a/wechat_staff/pages/consult/consult.json
+++ b/wechat_staff/pages/consult/consult.json
@@ -1,3 +1,6 @@
{
- "navigationBarTitleText": "鍜ㄨ"
+ "usingComponents": {
+ "buoyClient": "../../components/buoyClient/index"
+ },
+ "navigationBarTitleText": "璧勮"
}
\ No newline at end of file
diff --git a/wechat_staff/pages/consult/consult.less b/wechat_staff/pages/consult/consult.less
index aff0800..14e1a4b 100644
--- a/wechat_staff/pages/consult/consult.less
+++ b/wechat_staff/pages/consult/consult.less
@@ -1,11 +1,33 @@
.container {
background-color: #fff;
}
+.home_top{
+ position: fixed;
+ width: 100%;
+ z-index: 99;
+ top: 0;
+ background-color: #fff;
+}
+.cate_wrap{
+ background-color: #fff;
+ .cate_one{
+ position: fixed;
+ top: 96rpx;
+ background-color: #fff;
+ width: 100%;
+ }
+ .cate_two{
+ position: fixed;
+ top: 156rpx;
+ background-color: #fff;
+ padding-top: 30rpx;
+ width: 100%;
+ }
+}
.search_wrap{
width: 670rpx;
height: 72rpx;
- margin: 24rpx auto;
- background: #F7F7F7;
+ margin: 0rpx auto 24rpx;
border-radius: 8rpx;
padding: 0 40rpx;
display: flex;
@@ -54,8 +76,9 @@
}
}
.content{
- padding: 0 40rpx 40rpx;
+ padding: 260rpx 40rpx 40rpx;
.item{
+ margin-bottom: 60rpx;
.img{
width: 100%;
}
diff --git a/wechat_staff/pages/consult/consult.wxml b/wechat_staff/pages/consult/consult.wxml
index 48cffa5..a3df2f1 100644
--- a/wechat_staff/pages/consult/consult.wxml
+++ b/wechat_staff/pages/consult/consult.wxml
@@ -1,31 +1,40 @@
<view class="container">
- <view class="search_wrap">
- <image src="../../static/icon/ic_search@2x.png" mode="widthFix"></image>
- <input type="text" placeholder="鎼滅储鍜ㄨ鏍囬" />
+ <!-- 鎮诞 -->
+ <buoyClient />
+
+ <view class="home_top">
+ <view class="search_wrap">
+ <image src="../../static/icon/ic_search@2x.png" mode="widthFix"></image>
+ <input bindblur="getList" model:value="{{ query }}" type="text" placeholder="鎼滅储璧勮鏍囬" />
+ </view>
</view>
<!-- 鍒嗙被 -->
- <view>
- <scroll-view scroll-x="true" style="weight: 710rpx;margin-bottom: 30rpx;">
- <view class="scroll_cate">
- <view bindtap="cateClick" data-index="{{index}}" wx:for="{{ category }}" class="item {{ index == 0 ? 'active': '' }}">{{ item }}</view>
- </view>
- </scroll-view>
- <scroll-view scroll-x="true" style="weight: 710rpx;margin-bottom: 28rpx;">
- <view class="scroll_cate second_list">
- <view bindtap="seCateClick" data-index="{{index}}" wx:for="{{ secondCategory }}" class="item {{ index == 0 ? 'active': '' }}">{{ index }}{{ item }}</view>
- </view>
- </scroll-view>
+ <view class="cate_wrap">
+ <view class="cate_one">
+ <scroll-view scroll-x="true" style="weight: 710rpx;margin-bottom: 30rpx;">
+ <view class="scroll_cate">
+ <view bindtap="cateClick" data-code="{{item.code}}" wx:for="{{ category }}" class="item {{ catalogCode == item.code ? 'active': '' }}">{{ item.name }}</view>
+ </view>
+ </scroll-view>
+ </view>
+ <view class="cate_two">
+ <scroll-view scroll-x="true" style="weight: 710rpx;margin-bottom: 24rpx;">
+ <view class="scroll_cate second_list">
+ <view bindtap="seCateClick" data-code="{{item.code}}" wx:for="{{ secondCategory }}" class="item {{ tagCode == item.code ? 'active': '' }}">{{ item.name }}</view>
+ </view>
+ </scroll-view>
+ </view>
</view>
<!-- content -->
- <view class="content">
- <view class="item" bindtap="itemClick" data-abg="qwe">
- <image class="img" src="../../static/icon/test.png" mode="widthFix"></image>
- <view class="title">鍚婄伅瀹炵敤鐗硅緫 | 涓�姝ュ浼氱悊鎯冲厜褰卞竷灞�</view>
+ <view class="content" style="padding-top: {{ secondCategory.length > 0 ? 276 : 186 }}rpx;">
+ <view wx:for="{{ dataList }}" class="item" bindtap="itemClick" data-item="{{item}}">
+ <image class="img" src="{{ item.coverImage }}" mode="widthFix"></image>
+ <view class="title">{{ item.title }}</view>
<view class="df_sb static">
- <view>{{ '2021-08-21 12:00:00' }}</view>
+ <view>{{ item.publishDt || '' }}</view>
<view class="df_sb">
<image class="liulan" src="../../static/icon/zixun_ic_liulan.png" mode="widthFix"></image>
- <text>1000</text>
+ <text>{{ item.viewCount }}</text>
</view>
</view>
</view>
diff --git a/wechat_staff/pages/consult/consult.wxss b/wechat_staff/pages/consult/consult.wxss
index 5d130e2..f8dba92 100644
--- a/wechat_staff/pages/consult/consult.wxss
+++ b/wechat_staff/pages/consult/consult.wxss
@@ -1,11 +1,33 @@
.container {
background-color: #fff;
}
+.home_top {
+ position: fixed;
+ width: 100%;
+ z-index: 99;
+ top: 0;
+ background-color: #fff;
+}
+.cate_wrap {
+ background-color: #fff;
+}
+.cate_wrap .cate_one {
+ position: fixed;
+ top: 96rpx;
+ background-color: #fff;
+ width: 100%;
+}
+.cate_wrap .cate_two {
+ position: fixed;
+ top: 156rpx;
+ background-color: #fff;
+ padding-top: 30rpx;
+ width: 100%;
+}
.search_wrap {
width: 670rpx;
height: 72rpx;
- margin: 24rpx auto;
- background: #F7F7F7;
+ margin: 0rpx auto 24rpx;
border-radius: 8rpx;
padding: 0 40rpx;
display: flex;
@@ -50,7 +72,10 @@
font-weight: 400;
}
.content {
- padding: 0 40rpx 40rpx;
+ padding: 260rpx 40rpx 40rpx;
+}
+.content .item {
+ margin-bottom: 60rpx;
}
.content .item .img {
width: 100%;
diff --git a/wechat_staff/pages/consult/detail.js b/wechat_staff/pages/consult/detail.js
index 0042f46..0419117 100644
--- a/wechat_staff/pages/consult/detail.js
+++ b/wechat_staff/pages/consult/detail.js
@@ -1,12 +1,15 @@
-// pages/consult/detail.js
+import { shareContent, getProductNewsInfo } from '../../api/index'
Page({
/**
* 椤甸潰鐨勫垵濮嬫暟鎹�
*/
data: {
- navTitle: '璇︽儏',
- bottomLift: 0
+ bottomLift: 0,
+ info: {},
+ detail: {},
+
+ showShare: false
},
/**
@@ -17,25 +20,38 @@
this.setData({
bottomLift: app.bottomLift
})
+ this.getDetail(options.id)
},
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
- */
- onReady() {
-
+ handleDesign() {
+ wx.navigateTo({
+ url: '/pages/design/design',
+ })
},
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
- */
- onShow() {
-
+ getDetail(id) {
+ getProductNewsInfo({ id }).then(res => {
+ this.setData({ info: res.data })
+ wx.setNavigationBarTitle({
+ title: res.data.title
+ })
+ })
},
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
- */
+ openShare() {
+ this.setData({showShare: true})
+ },
+ handleShare() {
+ console.log('鐐瑰嚮浜嗗垎浜�');
+ shareContent(this.data.info.id)
+ },
+ // onShareAppMessage: function () {
+ // // let { productDetail, userInfo } = this.data
+ // return {
+ // title: productDetail.title,
+ // path: '/pages/index/index?id=' + productDetail.id + '&shareuserid=' + userInfo.id + '&type=0'
+ // }
+ // },
+ onClose() {
+ this.setData({showShare: false})
+ },
onHide() {
},
diff --git a/wechat_staff/pages/consult/detail.json b/wechat_staff/pages/consult/detail.json
index 8835af0..9a09920 100644
--- a/wechat_staff/pages/consult/detail.json
+++ b/wechat_staff/pages/consult/detail.json
@@ -1,3 +1,8 @@
{
- "usingComponents": {}
+ "usingComponents": {
+ "van-popup": "@vant/weapp/popup/index",
+ "mp-html": "mp-html",
+ "buoyClient": "../../components/buoyClient/index"
+ },
+ "navigationBarTitleText": ""
}
\ No newline at end of file
diff --git a/wechat_staff/pages/consult/detail.less b/wechat_staff/pages/consult/detail.less
index 7a288af..c56eb09 100644
--- a/wechat_staff/pages/consult/detail.less
+++ b/wechat_staff/pages/consult/detail.less
@@ -27,18 +27,13 @@
align-items: center;
height: 100rpx;
padding: 12rpx 40rpx;
- .list{
- flex: 1;
- display: flex;
- align-items: center;
- }
}
.sub_btn {
display: flex;
justify-content: center;
align-items: center;
height: 72rpx;
- width: 152rpx;
+ flex: 1;
background-color: var(--themeColor);
font-weight: 500;
color: #FFFFFF;
@@ -51,6 +46,7 @@
}
}
.item {
+ margin-top: 18rpx;
display: flex;
flex-direction: column;
justify-content: center;
@@ -63,4 +59,34 @@
width: 44rpx;
}
}
+}
+.share_modal{
+ .btns{
+ display: flex;
+ min-height: 320rpx;
+ display: flex;
+ align-items: center;
+ .item{
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ flex: 1;
+ font-size: 26rpx;
+ background-color: #fff;
+ image{
+ width: 80rpx;
+ height: 80rpx;
+ margin-bottom: 10rpx;
+ }
+ }
+ }
+ .cancel{
+ height: 80rpx;
+ width: 100%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ border: 1rpx solid #e5e5e5;
+ }
}
\ No newline at end of file
diff --git a/wechat_staff/pages/consult/detail.wxml b/wechat_staff/pages/consult/detail.wxml
index 383873a..b43a9a2 100644
--- a/wechat_staff/pages/consult/detail.wxml
+++ b/wechat_staff/pages/consult/detail.wxml
@@ -1,33 +1,44 @@
<view>
- <navBar title="{{ navTitle }}"></navBar>
+ <!-- <navBar title="{{ navTitle }}"></navBar> -->
+ <buoyClient showPurpose="1" />
<view class="main_content">
- <view class="main_title">涓夌缇庡ソ鐜勫叧锛岃繘灞嬬灛闂村嵏杞界柌鎯�</view>
- <view class="datetime">鍙戝竷鏃堕棿锛�2021-08-21 10:0</view>
- <view class="content">
- 瀹㈠巺銆侀鍘呫�佸崸瀹ゃ�佸帹鎴裤�侀槼鍙扳�︹�﹀涓┖闂寸殑绉拌皳锛屽ぇ澶氭湸瀹炴棤鍗庯紝鍞嫭鈥滅巹鍏斥�濅竴璇嶆牸澶栧崕涓芥娊璞°��
- 杩欎釜涓嶅お璧风溂鐨勫皬绌洪棿锛屽彇璇嶆潵鑷亾鏁欙細鈥滅巹鍏斥�濇寚淇偧鍐呬腹杩囩▼涓紝浣撳唴鐨勬皵缁曞贰鍏ㄨ韩鏃讹紝鏈�鍏堥�氳繃鐨勫湴鏂癸紝涔熸湁鈥滃か鐜勫叧鑰咃紝鑷崇巹鑷冲涔嬫満鍏充篃鈥濈殑璇存硶銆�
- </view>
+ <view class="main_title">{{ info.title }}</view>
+ <view class="datetime">鍙戝竷鏃堕棿锛歿{ info.publishDt }}</view>
+ <mp-html content="{{info.content}}"></mp-html>
</view>
+
+
<!-- footer -->
<view class="footer" style="padding-bottom: {{bottomLift}}px;">
<view class="btns">
- <view class="list">
- <view class="item">
- <image class="icon" src="../../static/icon/detail_nav_like@2x.png" mode="widthFix"></image>
- <view class="name">鍠滄</view>
- </view>
- <view class="item">
- <image class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
- <view class="name">鏀惰棌</view>
- </view>
- <view class="item">
- <image class="icon" src="../../static/icon/detail_nav_download@2x.png" mode="widthFix"></image>
- <view class="name">涓嬭浇</view>
- </view>
- </view>
- <view class="sub_btn">
- <view>鍒嗕韩</view>
+ <!-- <view class="item">
+ <image class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
+ <view class="name">鏀惰棌</view>
+ </view> -->
+ <button open-type="share" class="item" bindtap="handleShare">
+ <image class="icon" src="../../static/icon/detail_nav_share.png" mode="widthFix"></image>
+ <view class="name">鍒嗕韩</view>
+ </button>
+ <view class="sub_btn" bindtap="handleDesign">
+ <image class="sheji" src="../../static/icon/ic_sheji.png" mode="widthFix"></image>
+ <view>鍏嶈垂棰勭害涓撳睘璁捐</view>
</view>
</view>
</view>
+ <!-- -->
+ <van-popup position="bottom" show="{{ showShare }}" bind:close="onClose">
+ <view class="share_modal">
+ <view class="btns">
+ <button open-type="share" class="item" bindtap="handleShare">
+ <image src="../../static/icon/wechat.png"></image>
+ <view>鍙戦�佸ソ鍙�</view>
+ </button>
+ <button class="item">
+ <image src="../../static/icon/download.png"></image>
+ <view>涓嬭浇娴锋姤</view>
+ </button>
+ </view>
+ <view bindtap="onClose" class="cancel">鍙栨秷</view>
+ </view>
+ </van-popup>
</view>
\ No newline at end of file
diff --git a/wechat_staff/pages/consult/detail.wxss b/wechat_staff/pages/consult/detail.wxss
index 1e2a92c..463d76f 100644
--- a/wechat_staff/pages/consult/detail.wxss
+++ b/wechat_staff/pages/consult/detail.wxss
@@ -26,17 +26,12 @@
height: 100rpx;
padding: 12rpx 40rpx;
}
-.footer .btns .list {
- flex: 1;
- display: flex;
- align-items: center;
-}
.footer .sub_btn {
display: flex;
justify-content: center;
align-items: center;
height: 72rpx;
- width: 152rpx;
+ flex: 1;
background-color: var(--themeColor);
font-weight: 500;
color: #FFFFFF;
@@ -49,6 +44,7 @@
margin-right: 8rpx;
}
.footer .item {
+ margin-top: 18rpx;
display: flex;
flex-direction: column;
justify-content: center;
@@ -60,3 +56,30 @@
.footer .item .icon {
width: 44rpx;
}
+.share_modal .btns {
+ min-height: 320rpx;
+ display: flex;
+ align-items: center;
+}
+.share_modal .btns .item {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ flex: 1;
+ font-size: 26rpx;
+ background-color: #fff;
+}
+.share_modal .btns .item image {
+ width: 80rpx;
+ height: 80rpx;
+ margin-bottom: 10rpx;
+}
+.share_modal .cancel {
+ height: 80rpx;
+ width: 100%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ border: 1rpx solid #e5e5e5;
+}
diff --git a/wechat_staff/pages/detailDis/case.js b/wechat_staff/pages/detailDis/case.js
index 9f82fd2..8c34f7c 100644
--- a/wechat_staff/pages/detailDis/case.js
+++ b/wechat_staff/pages/detailDis/case.js
@@ -63,7 +63,7 @@
this.setData({ info })
enjoyList.push({
...info,
- joinType: 'product',
+ joinType: '1',
timestamp: new Date().getTime()
})
}else{
@@ -100,8 +100,12 @@
})
},
getDetail(id) {
+ const enjoyList = wx.getStorageSync('enjoyList') || []
getWholecaseInfo({id}).then(res => {
- this.setData({ info: res.data })
+ const index = enjoyList.findIndex( i => i.id === res.data.id )
+ this.setData({ info: {
+ ...res.data, isEnjoy: index > -1
+ }})
wx.setNavigationBarTitle({
title: res.data.title
})
diff --git a/wechat_staff/pages/detailDis/product.js b/wechat_staff/pages/detailDis/product.js
index 7458b00..0fa8bec 100644
--- a/wechat_staff/pages/detailDis/product.js
+++ b/wechat_staff/pages/detailDis/product.js
@@ -49,7 +49,7 @@
this.setData({ info })
enjoyList.push({
...info,
- joinType: 'product',
+ joinType: '0',
timestamp: new Date().getTime()
})
}else{
@@ -183,6 +183,15 @@
onHide() {
},
+ goTestPage(){
+ wx.navigateTo({
+ url: '/pages/webView/index',
+ success: function(res) {
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
+ res.eventChannel.emit('data',{link:'http://crmtest.zhibang.com:8000/core/oauth/authorize/jump?timestamp=-465385833&agent_phone_number=18055151023&bindKey=mpAddIntention&sign=cdfe13abfe2727b40eee160085c80d11'} );
+ }
+ })
+ },
onUnload() {
},
diff --git a/wechat_staff/pages/detailDis/product.wxml b/wechat_staff/pages/detailDis/product.wxml
index 57266a5..15b08ec 100644
--- a/wechat_staff/pages/detailDis/product.wxml
+++ b/wechat_staff/pages/detailDis/product.wxml
@@ -16,14 +16,14 @@
</view>
<!-- video -->
<view wx:if="{{ info.video }}" class="video">
- <view class="title">浜у搧瑙嗛</view>
+ <view class="title" >浜у搧瑙嗛</view>
<view class="img_wrap">
<image class="img" src="{{ info.coverImage }}" mode="widthFix"></image>
<view bindtap="playVideo" class="play">鎾斁</view>
</view>
</view>
<view class="detail">
- <view class="title">浜у搧璇︽儏</view>
+ <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>
diff --git a/wechat_staff/pages/detailDis/realpic.js b/wechat_staff/pages/detailDis/realpic.js
index 6795a0e..dcd361a 100644
--- a/wechat_staff/pages/detailDis/realpic.js
+++ b/wechat_staff/pages/detailDis/realpic.js
@@ -56,7 +56,7 @@
this.setData({ info })
enjoyList.push({
...info,
- joinType: 'product',
+ joinType: '2',
timestamp: new Date().getTime()
})
}else{
@@ -79,8 +79,12 @@
}
},
getDetail(id) {
+ const enjoyList = wx.getStorageSync('enjoyList') || []
getRealcaseInfo({id}).then(res => {
- this.setData({ info: res.data })
+ const index = enjoyList.findIndex( i => i.id === res.data.id )
+ this.setData({ info: {
+ ...res.data, isEnjoy: index > -1
+ }})
wx.setNavigationBarTitle({
title: res.data.title
})
diff --git a/wechat_staff/pages/discover/discover.js b/wechat_staff/pages/discover/discover.js
index 81d364b..64a68ad 100644
--- a/wechat_staff/pages/discover/discover.js
+++ b/wechat_staff/pages/discover/discover.js
@@ -1,4 +1,6 @@
import { getCataLogTagList, getCatalogList } from '../../api/index'
+const { HYEventBus } = require('hy-event-store')
+const eventBus = new HYEventBus()
Page({
/**
@@ -15,7 +17,16 @@
onLoad(options) {
let menuButtonInfo = wx.getMenuButtonBoundingClientRect();
this.setData({menuButtonInfo})
- },
+ },
+ onShow() {
+ let discoverKey = wx.getStorageSync('discoverKey') || ''
+ if(discoverKey){
+ this.setData({ catalogCode: discoverKey })
+ setTimeout(() => {
+ wx.setStorageSync('discoverKey', '')
+ }, 500)
+ }
+ },
tabsClick(e) {
const catalogCode = e.currentTarget.dataset.code
this.setData({catalogCode})
@@ -24,13 +35,6 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
*/
onReady() {
-
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
- */
- onShow() {
},
diff --git a/wechat_staff/pages/download/index.js b/wechat_staff/pages/download/index.js
index e1c090c..a18659c 100644
--- a/wechat_staff/pages/download/index.js
+++ b/wechat_staff/pages/download/index.js
@@ -1,13 +1,22 @@
-// pages/download/index.js
-const { HYEventBus } = require('hy-event-store')
-const eventBus = new HYEventBus()
+import {
+ getContentShareImg
+} from '../../api/index'
+import {
+ checkAuth,
+ downloadSaveFile
+} from '../../utils/downloadSaveFile'
Page({
/**
* 椤甸潰鐨勫垵濮嬫暟鎹�
*/
data: {
- bottomLift: ''
+ bottomLift: '',
+ downloadList: [],
+ downloadConfig: {},
+ checkedAll: false,
+ showParam: false,
+ takeQrcode: true
},
/**
@@ -19,25 +28,140 @@
bottomLift: app.bottomLift
})
},
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
- */
- onReady() {
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
- */
- onShow() {
- eventBus.on('batchDown', val => {
- console.log('val', val);
+ subDownload() {
+ let that = this
+ const downloadList = this.data.downloadList
+ const downloadConfig = this.data.downloadConfig
+ checkAuth(() => {
+ wx.showLoading({
+ title: '姝ｅ湪涓嬭浇',
+ mask: true
+ })
+ downloadList.forEach(item => {
+ if (item.checked) {
+ item.paddingStatus = 2
+ }
+ })
+ this.setData({ downloadList })
+ downloadList.forEach(item => {
+ if (item.checked) {
+ getContentShareImg({
+ articleId: `${downloadConfig.id}_${downloadConfig.path}`,
+ type: this.takeQrcode ? 1 : 0,
+ imgurl: item.url
+ }).then(res => {
+ wx.downloadFile({
+ url: res.data,
+ success: res => {
+ if (res.statusCode === 200) {
+ wx.saveImageToPhotosAlbum({
+ filePath: res.tempFilePath,
+ success: res => {
+ item.paddingStatus = 3
+ item.checked = false
+ that.setData({ downloadList })
+ wx.showToast({
+ title: '淇濆瓨鎴愬姛',
+ icon: "none"
+ })
+ },
+ fail: res => {
+ item.paddingStatus = 4
+ item.checked = false
+ that.setData({ downloadList })
+ wx.showToast({
+ title: '淇濆瓨澶辫触',
+ icon: "none"
+ })
+ }
+ })
+
+ }
+ }
+ })
+ })
+ }
+ })
+ })
+ this.setData({
+ showParam: false
})
},
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
- */
+ onShow() {
+ const downloadList = wx.getStorageSync('downloadList') || []
+ const downloadConfig = wx.getStorageSync('downloadConfig') || {}
+ let temp = downloadList.map(i => {
+ // paddingStatus锛� 0鏈笅杞�1姝ｅ湪涓嬭浇2绛夊緟涓嬭浇3涓嬭浇瀹屾垚
+ return {
+ url: i,
+ paddingStatus: 0,
+ checked: false
+ }
+ })
+ this.setData({
+ downloadList: temp,
+ downloadConfig
+ })
+ setTimeout(() => {
+ wx.setStorageSync('downloadList', [])
+ wx.setStorageSync('downloadConfig', {})
+ }, 500)
+ },
+ openParam() {
+ const downloadList = this.data.downloadList.filter(i => i.checked)
+ if (downloadList.length === 0) return wx.showToast({
+ title: '璇峰厛閫夋嫨瑕佷笅杞界殑娴锋姤',
+ icon: 'none'
+ })
+ this.setData({
+ showParam: true
+ })
+ },
+ onClose() {
+ this.setData({
+ showParam: false
+ })
+ },
+ downCheck(e) {
+ const takeQrcode = e.currentTarget.dataset.flag
+ console.log('takeQrcode', takeQrcode);
+ this.setData({
+ takeQrcode
+ })
+ },
+ itemCheck(e) {
+ const i = e.currentTarget.dataset.i
+ const {
+ downloadList,
+ checkedAll
+ } = this.data
+ let count = 0
+ downloadList.forEach((item, index) => {
+ if (index === i) {
+ item.checked = !item.checked
+ }
+ if (item.checked) {
+ count++
+ }
+ })
+ this.setData({
+ checkedAll: count == downloadList.length,
+ downloadList
+ })
+ },
+ allCheck() {
+ const {
+ downloadList,
+ checkedAll
+ } = this.data
+ downloadList.forEach(item => {
+ item.checked = !checkedAll
+ })
+ this.setData({
+ checkedAll: !checkedAll,
+ downloadList
+ })
+ },
onHide() {
},
diff --git a/wechat_staff/pages/download/index.json b/wechat_staff/pages/download/index.json
index 05ecd33..7ce4130 100644
--- a/wechat_staff/pages/download/index.json
+++ b/wechat_staff/pages/download/index.json
@@ -1,4 +1,6 @@
{
- "usingComponents": {},
+ "usingComponents": {
+ "van-popup": "@vant/weapp/popup/index"
+ },
"navigationBarTitleText": "涓嬭浇"
}
\ No newline at end of file
diff --git a/wechat_staff/pages/download/index.less b/wechat_staff/pages/download/index.less
index 1818e35..35323f2 100644
--- a/wechat_staff/pages/download/index.less
+++ b/wechat_staff/pages/download/index.less
@@ -1,14 +1,18 @@
.list{
display: flex;
flex-wrap: wrap;
- padding: 40rpx;
+ padding: 40rpx 40rpx 200rpx;
.item{
width: 210rpx;
height: 210rpx;
border-radius: 8rpx;
overflow: hidden;
position: relative;
- border: 1px solid;
+ margin-right: 20rpx;
+ margin-bottom: 20rpx;
+ &:nth-of-type(3n){
+ margin-right: 0;
+ }
.img{
width: 100%;
height: 100%;
@@ -38,6 +42,7 @@
}
.footer {
position: fixed;
+ z-index: 99;
bottom: 0;
left: 0;
width: 750rpx;
@@ -69,4 +74,44 @@
border-radius: 8rpx;
color: #fff;
}
+}
+.param_modal{
+ padding: 30rpx 40rpx 12rpx;
+ .title{
+ text-align: center;
+ font-size: 30rpx;
+ }
+ .line{
+ height: 150rpx;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ border-bottom: 1rpx solid #E5E5E5;
+ .check{
+ width: 40rpx;
+ height: 40rpx;
+ }
+ .name{
+ font-size: 30rpx;
+ color: #111111;
+ }
+ .desc{
+ font-size: 26rpx;
+ color: #777777;
+ margin-top: 20rpx;
+ }
+ }
+ .submit{
+ margin-top: 100rpx;
+ width: 100%;
+ height: 88rpx;
+ background: #B08771;
+ border-radius: 8rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ font-weight: 500;
+ font-size: 32rpx;
+ color: #FFFFFF;
+ }
}
\ No newline at end of file
diff --git a/wechat_staff/pages/download/index.wxml b/wechat_staff/pages/download/index.wxml
index 3319225..57d1041 100644
--- a/wechat_staff/pages/download/index.wxml
+++ b/wechat_staff/pages/download/index.wxml
@@ -1,21 +1,45 @@
<view>
<view class="list">
- <view class="item">
- <image class="img" src=""></image>
- <view class="shade">绛夊緟涓嬭浇</view>
- <image wx:if="{{ true }}" class="check" src="../../static/icon/ic_select_sel@2x.png"></image>
- <image wx:else class="check" src="../../static/icon/ic_select@2x.png"></image>
+ <view wx:for="{{ downloadList }}" class="item">
+ <image class="img" src="{{ item.url }}" mode="scaleToFill"></image>
+ <view wx:if="{{ item.paddingStatus == 2 }}" class="shade">绛夊緟涓嬭浇</view>
+ <image data-i="{{index}}" bindtap="itemCheck" wx:if="{{ item.checked }}" class="check" src="../../static/icon/ic_select_sel@2x.png"></image>
+ <image wx:else data-i="{{index}}" bindtap="itemCheck" class="check" src="../../static/icon/ic_select.png"></image>
</view>
</view>
<!-- -->
<view class="footer" style="padding-bottom: {{bottomLift}}px;">
<view class="footer_wrap">
<view class="check_wrap">
- <image wx:if="{{ true }}" class="check" src="../../static/icon/ic_select_sel@2x.png"></image>
- <image wx:else class="check" src="../../static/icon/ic_select@2x.png"></image>
+ <image bindtap="allCheck" wx:if="{{ checkedAll }}" class="check" src="../../static/icon/ic_select_sel@2x.png"></image>
+ <image bindtap="allCheck" wx:else class="check" src="../../static/icon/ic_select@2x.png"></image>
<text>鍏ㄩ��</text>
</view>
- <view class="down_btn">鎵归噺涓嬭浇</view>
+ <view bindtap="openParam" class="down_btn">鎵归噺涓嬭浇</view>
</view>
</view>
+ <!-- -->
+ <van-popup show="{{ showParam }}" position="bottom" closeable round bind:close="onClose">
+ <view class="param_modal">
+ <view class="title">涓嬭浇鍥剧墖鏄惁鎼哄甫浜岀淮鐮�</view>
+ <view>
+ <view data-flag="{{true}}" bindtap="downCheck" class="line">
+ <view class="content">
+ <view class="name">甯︿簩缁寸爜</view>
+ <view class="desc">閫傜敤鏈嬪弸鍦堜紶鎾�</view>
+ </view>
+ <image wx:if="{{ takeQrcode }}" src="../../static/icon/ic_select_sel@2x.png" class="check"></image>
+ </view>
+ <view data-flag="{{false}}" bindtap="downCheck" class="line">
+ <view class="content">
+ <view class="name">涓嶅甫浜岀淮鐮�</view>
+ <view class="desc">閫傜敤鎶栭煶绛夊伐鍩熶紶鎾�</view>
+ </view>
+ <image wx:if="{{ !takeQrcode }}" src="../../static/icon/ic_select_sel@2x.png" class="check"></image>
+ </view>
+ </view>
+ <view bindtap="subDownload" class="submit">纭</view>
+ </view>
+ </van-popup>
+
</view>
\ No newline at end of file
diff --git a/wechat_staff/pages/download/index.wxss b/wechat_staff/pages/download/index.wxss
index b8bde22..27176fa 100644
--- a/wechat_staff/pages/download/index.wxss
+++ b/wechat_staff/pages/download/index.wxss
@@ -1,7 +1,7 @@
.list {
display: flex;
flex-wrap: wrap;
- padding: 40rpx;
+ padding: 40rpx 40rpx 200rpx;
}
.list .item {
width: 210rpx;
@@ -9,7 +9,11 @@
border-radius: 8rpx;
overflow: hidden;
position: relative;
- border: 1px solid;
+ margin-right: 20rpx;
+ margin-bottom: 20rpx;
+}
+.list .item:nth-of-type(3n) {
+ margin-right: 0;
}
.list .item .img {
width: 100%;
@@ -38,6 +42,7 @@
}
.footer {
position: fixed;
+ z-index: 99;
bottom: 0;
left: 0;
width: 750rpx;
@@ -70,3 +75,43 @@
border-radius: 8rpx;
color: #fff;
}
+.param_modal {
+ padding: 30rpx 40rpx 12rpx;
+}
+.param_modal .title {
+ text-align: center;
+ font-size: 30rpx;
+}
+.param_modal .line {
+ height: 150rpx;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ border-bottom: 1rpx solid #E5E5E5;
+}
+.param_modal .line .check {
+ width: 40rpx;
+ height: 40rpx;
+}
+.param_modal .line .name {
+ font-size: 30rpx;
+ color: #111111;
+}
+.param_modal .line .desc {
+ font-size: 26rpx;
+ color: #777777;
+ margin-top: 20rpx;
+}
+.param_modal .submit {
+ margin-top: 100rpx;
+ width: 100%;
+ height: 88rpx;
+ background: #B08771;
+ border-radius: 8rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ font-weight: 500;
+ font-size: 32rpx;
+ color: #FFFFFF;
+}
diff --git a/wechat_staff/pages/index/index.js b/wechat_staff/pages/index/index.js
index 3952d1c..a1118ce 100644
--- a/wechat_staff/pages/index/index.js
+++ b/wechat_staff/pages/index/index.js
@@ -6,6 +6,8 @@
getCustomizedNewsList,
newsPage
} from '../../api/index'
+const { HYEventBus } = require('hy-event-store')
+const eventBus = new HYEventBus()
Page({
data: {
searchValue: '',
@@ -28,12 +30,11 @@
onLoad() {
const res = wx.getMenuButtonBoundingClientRect()
this.setData({
- clientHeight: res.height
- })
- this.setData({
+ clientHeight: res.height,
clientTop: res.top
})
-
+ },
+ onShow() {
this.initData()
},
initData() {
@@ -106,6 +107,20 @@
url: '/pages/promotion/index',
})
},
+ funClick(e){
+ const i = e.currentTarget.dataset.i
+ let map = ['product_intro', 'whole_case', 'real_case']
+ if(i == 3){
+ wx.navigateTo({
+ url: '/pages/consult/consult',
+ })
+ }else{
+ wx.setStorageSync('discoverKey', map[i])
+ wx.switchTab({
+ url: '/pages/discover/discover',
+ })
+ }
+ },
jumpProVideo() {
wx.navigateTo({
url: '/pages/productVideo/index',
diff --git a/wechat_staff/pages/index/index.less b/wechat_staff/pages/index/index.less
index f9391be..302784e 100644
--- a/wechat_staff/pages/index/index.less
+++ b/wechat_staff/pages/index/index.less
@@ -178,16 +178,15 @@
.line_left {
width: 324rpx;
- height: 304rpx;
+ height: 340rpx;
}
.line_right {
.item {
width: 322rpx;
- height: 140rpx;
-
+ height: 160rpx;
&:nth-last-child(1) {
- margin-top: 24rpx;
+ margin-top: 20rpx;
}
}
}
diff --git a/wechat_staff/pages/index/index.wxml b/wechat_staff/pages/index/index.wxml
index 18d419c..b49b893 100644
--- a/wechat_staff/pages/index/index.wxml
+++ b/wechat_staff/pages/index/index.wxml
@@ -1,6 +1,5 @@
<view class="container">
<view style="height: {{clientTop - 2}}px;"></view>
- <buoyClient />
<view class="search_wrap">
<image class="icon" src="../../static/home_ic_search@2x.png" mode="widthFix"></image>
<input model:value="{{ searchValue }}" placeholder="鎼滅储" type="text" />
@@ -23,26 +22,26 @@
</view>
<view class="imgs">
<view wx:for="{{ DailyUpdates.newsList}}" class="img_wrap">
- <image class="img" src="{{ item.fileList[0].fileurlFull }}" mode="widthFix"></image>
+ <image class="img" src="{{ item.fileList[0].fileurlFull }}" mode="aspectFill"></image>
<image class="icon" src="{{everydayTop[index]}}" mode="widthFix"></image>
</view>
</view>
</view>
<!-- -->
<view class="func_lsit">
- <view class="item">
+ <view data-i="0" bindtap="funClick" class="item">
<image src="../../static/icon/home_ic_chanpin@2x 2.png"></image>
<view class="text">浜у搧</view>
</view>
- <view class="item">
+ <view data-i="1" bindtap="funClick" class="item">
<image src="../../static/icon/home_ic_anli@2x 2.png"></image>
<view class="text">妗堜緥</view>
</view>
- <view class="item">
+ <view data-i="2" bindtap="funClick" class="item">
<image src="../../static/icon/home_ic_shijing@2x 2.png"></image>
<view class="text">瀹炴櫙</view>
</view>
- <view class="item">
+ <view data-i="3" bindtap="funClick" class="item">
<image src="../../static/icon/home_ic_zixun.png"></image>
<view class="text">璧勮</view>
</view>
diff --git a/wechat_staff/pages/index/index.wxss b/wechat_staff/pages/index/index.wxss
index d064e7b..143cd79 100644
--- a/wechat_staff/pages/index/index.wxss
+++ b/wechat_staff/pages/index/index.wxss
@@ -162,14 +162,14 @@
}
.strategy .line .line_left {
width: 324rpx;
- height: 304rpx;
+ height: 340rpx;
}
.strategy .line .line_right .item {
width: 322rpx;
- height: 140rpx;
+ height: 160rpx;
}
.strategy .line .line_right .item:nth-last-child(1) {
- margin-top: 24rpx;
+ margin-top: 20rpx;
}
.strategy .home_id {
width: 670rpx;
diff --git a/wechat_staff/pages/kefu/fond.js b/wechat_staff/pages/kefu/fond.js
index cb63da1..789e2eb 100644
--- a/wechat_staff/pages/kefu/fond.js
+++ b/wechat_staff/pages/kefu/fond.js
@@ -1,4 +1,5 @@
import moment from "moment";
+import { getContentShareImg } from '../../api/index'
Page({
/**
@@ -6,6 +7,7 @@
*/
data: {
bottomLift: 0,
+ checkAll: false,
enjoyList: []
},
@@ -17,6 +19,11 @@
this.setData({
bottomLift: app.bottomLift
})
+ let enjoyList = wx.getStorageSync('enjoyList') || []
+ enjoyList.forEach(item => {
+ item.checked = false
+ })
+ wx.setStorageSync('enjoyList', enjoyList)
this.initData()
},
@@ -26,10 +33,13 @@
enjoyList = enjoyList.sort((a,b)=>{
return b.timestamp - a.timestamp
})
+ let count = 0
enjoyList.forEach(item => {
+ if(item.checked){
+ count++
+ }
item.joinDate = moment(item.timestamp).format('YYYY骞碝M鏈圖D鏃�')
item.joinTime = moment(item.timestamp).format('HH:mm')
- item.checked = false
const index = temp.findIndex( i => i.joinDate === item.joinDate )
if(index === -1){
temp.push({
@@ -39,37 +49,69 @@
}else{
temp[index].list.push(item)
}
- });
+ })
+ this.setData({ checkAll: count === enjoyList.length })
this.setData({ enjoyList: temp })
-
-
console.log('enjoyList', temp);
},
itemCheck(e){
- const { enjoyList } = this.data
- const { index, inde } = e.currentTarget.dataset
- enjoyList[index].list[inde].check = !enjoyList[index].list[inde].check
- this.setData({ enjoyList })
+ const enjoyList = wx.getStorageSync('enjoyList') || []
+ const { id } = e.currentTarget.dataset
+ console.log(id);
+ enjoyList.forEach(item => {
+ if(item.id === id){
+ item.checked = !item.checked
+ }
+ })
+ wx.setStorageSync('enjoyList', enjoyList)
+ this.initData()
+ },
+ itemClick(e) {
+ let map = [
+ '/pages/detailDis/product',
+ '/pages/detailDis/case',
+ '/pages/detailDis/realpic',
+ '/pages/consult/detail',
+ ]
+ const { id, type } = e.currentTarget.dataset
+ wx.navigateTo({
+ url: map[type] + '?id=' + id,
+ })
+ },
+ bind() {
+ const enjoyList = wx.getStorageSync('enjoyList') || []
+ const temp = enjoyList.filter(i => i.checked)
+ if(temp.length == 0) return wx.showToast({
+ title: '璇峰厛閫夋嫨瑕佸叧鑱旂殑鍟嗗搧',icon:'none'
+ })
+ wx.navigateTo({
+ url: '/pages/kefu/select',
+ })
},
handleDown() {
- const {
- info,
- path
- } = this.data
+ const { enjoyList } = this.data
+ let obj = {}
+ enjoyList.forEach(item => {
+ item.list.forEach(ite => {
+ if(ite.checked){
+ obj = ite
+ }
+ })
+ })
+ console.log('obj', obj);
let that = this
getContentShareImg({
- articleId: path + '&' + info.id,
+ articleId: obj.id + '&' + obj.joinType,
type: '1',
// pageUrl: path,
- imgurl: info.coverImage,
+ imgurl: obj.coverImage,
}).then(res => {
this.setData({
isShowPoster: true,
showShare: false,
posterUrl: res.data
})
-
})
},
saveCard() {
@@ -108,8 +150,61 @@
closeCard() {
this.setData({ isShowPoster: false })
},
+ itemDel() {
+ let that = this
+ let ids = []
+ let { enjoyList } = this.data
+ enjoyList.forEach(item => {
+ item.list.forEach(ite => {
+ if(ite.checked){
+ ids.push(ite.id)
+ }
+ })
+ })
+ if(ids.length === 0) return wx.showToast({
+ title: '璇峰厛閫夋嫨瑕佸垹闄ょ殑浜у搧',icon: 'none'
+ })
+ wx.showModal({
+ title: '鎻愮ず',
+ content: '浣犵‘璁よ鍒犻櫎璇ヤ骇鍝佸悧',
+ success (res) {
+ if (res.confirm) {
+ let enjoyListTemp = wx.getStorageSync('enjoyList') || []
+ ids.forEach(item => {
+ const index = enjoyListTemp.findIndex(i => i.id == item)
+ console.log('index', index);
+ if(index > -1){
+ enjoyListTemp.splice(index, 1)
+ }
+ })
+ wx.setStorageSync('enjoyList', enjoyListTemp)
+ that.initData()
+ }
+ }
+ })
+
+ },
+ checkAll() {
+ let enjoyList = wx.getStorageSync('enjoyList') || []
+ enjoyList.forEach(item => {
+ item.checked = !item.checked
+ })
+ wx.setStorageSync('enjoyList', enjoyList)
+ this.initData()
+ },
openShare() {
- console.log('鐐瑰嚮鎵撳紑');
+ let count = 0
+ const { enjoyList } = this.data
+ enjoyList.forEach(item => {
+ item.list.forEach(ite => {
+ if(ite.checked){
+ count ++
+ }
+ })
+ })
+ if(count != 1) return wx.showToast({
+ title: '鏈変笖鍙兘閫夋嫨涓�涓骇鍝�',icon: 'none'
+ })
this.setData({
showShare: true
})
diff --git a/wechat_staff/pages/kefu/fond.less b/wechat_staff/pages/kefu/fond.less
index 233a079..66841f3 100644
--- a/wechat_staff/pages/kefu/fond.less
+++ b/wechat_staff/pages/kefu/fond.less
@@ -3,6 +3,7 @@
padding-bottom: 220rpx;
}
.date_item{
+ position: relative;
.date{
display: flex;
font-weight: 500;
@@ -71,6 +72,7 @@
width: 160rpx;
.icon{
width: 40rpx;
+ height: 40rpx;
margin-right: 18rpx;
}
}
@@ -107,7 +109,7 @@
position: fixed;
bottom: 0;
width: 100%;
- z-index: 9999;
+ z-index: 99999;
background-color: #fff;
border-radius: 24rpx 24rpx 0rpx 0rpx;
.btns{
@@ -145,6 +147,7 @@
width: 100%;
height: 100%;
z-index: 1000;
+ z-index: 99;
background-color: rgba(0,0,0,.5);
}
.card_wrap{
diff --git a/wechat_staff/pages/kefu/fond.wxml b/wechat_staff/pages/kefu/fond.wxml
index 5cc3600..b3c1be9 100644
--- a/wechat_staff/pages/kefu/fond.wxml
+++ b/wechat_staff/pages/kefu/fond.wxml
@@ -3,10 +3,10 @@
<view class="date">{{ day.joinDate }}</view>
<view class="list">
<view class="line" wx:for="{{ day.list }}" wx:for-index="inde" wx:for-item="item">
- <image data-index="{{index}}" data-inde="{{inde}}" bindtap="itemCheck" wx:if="{{ item.check }}" class="icon" src="../../static/icon/ic_select_sel@2x.png"></image>
- <image data-index="{{index}}" data-inde="{{inde}}" bindtap="itemCheck" wx:else class="icon" src="../../static/icon/ic_select@2x.png"></image>
- <image class="img" src="{{ item.coverImage }}" mode="aspectFill"></image>
- <view class="content">
+ <image data-id="{{item.id}}" bindtap="itemCheck" wx:if="{{ item.checked }}" class="icon" src="../../static/icon/ic_select_sel@2x.png"></image>
+ <image data-id="{{item.id}}" bindtap="itemCheck" wx:else class="icon" src="../../static/icon/ic_select@2x.png"></image>
+ <image data-type="{{item.joinType}}" data-id="{{item.id}}" bindtap="itemClick" class="img" src="{{ item.coverImage }}" mode="aspectFill"></image>
+ <view class="content" data-type="{{item.joinType}}" data-id="{{item.id}}" bindtap="itemClick">
<view class="name">{{ item.title }}</view>
<view class="time">{{ item.joinTime }}</view>
</view>
@@ -16,13 +16,14 @@
<!-- footer -->
<view class="footer" style="padding-bottom: {{bottomLift}}px;">
<view class="btns">
- <view class="all_sel">
- <image class="icon" src="../../static/icon/ic_select_sel@2x.png" mode="widthFix"></image>
+ <view bindtap="checkAll" class="all_sel">
+ <image wx:if="{{ checkAll }}" class="icon" src="../../static/icon/ic_select_sel@2x.png" mode="widthFix"></image>
+ <image wx:else class="icon" src="../../static/icon/ic_select@2x.png" mode="widthFix"></image>
<text>鍏ㄩ��</text>
</view>
<view class="list">
- <view class="item">鍒犻櫎</view>
- <view class="item paina">鍏宠仈</view>
+ <view bindtap="itemDel" class="item">鍒犻櫎</view>
+ <view bindtap="bind" class="item paina">鍏宠仈</view>
<view bindtap="openShare" class="item primary">鍒嗕韩</view>
</view>
</view>
@@ -42,7 +43,7 @@
</view>
<view bindtap="onClose" class="cancel">鍙栨秷</view>
</view>
- <view wx:if="{{ showShare }}" class="shade" bindtap="onClose"></view>
+ <van-overlay z-index="99998" show="{{ showShare }}" bind:click="onClose" />
<!-- -->
<view wx:if="{{ isShowPoster }}" class="card_wrap">
diff --git a/wechat_staff/pages/kefu/fond.wxss b/wechat_staff/pages/kefu/fond.wxss
index 72b5026..b7bbad2 100644
--- a/wechat_staff/pages/kefu/fond.wxss
+++ b/wechat_staff/pages/kefu/fond.wxss
@@ -2,6 +2,9 @@
background-color: #f7f7f7;
padding-bottom: 220rpx;
}
+.date_item {
+ position: relative;
+}
.date_item .date {
display: flex;
font-weight: 500;
@@ -72,6 +75,7 @@
}
.footer .btns .all_sel .icon {
width: 40rpx;
+ height: 40rpx;
margin-right: 18rpx;
}
.footer .btns .list {
@@ -105,7 +109,7 @@
position: fixed;
bottom: 0;
width: 100%;
- z-index: 9999;
+ z-index: 99999;
background-color: #fff;
border-radius: 24rpx 24rpx 0rpx 0rpx;
}
@@ -142,6 +146,7 @@
width: 100%;
height: 100%;
z-index: 1000;
+ z-index: 99;
background-color: rgba(0, 0, 0, 0.5);
}
.card_wrap {
diff --git a/wechat_staff/pages/kefu/select.js b/wechat_staff/pages/kefu/select.js
index 8c8cfdf..a3d2b7b 100644
--- a/wechat_staff/pages/kefu/select.js
+++ b/wechat_staff/pages/kefu/select.js
@@ -1,4 +1,4 @@
-import { getCustomerList, getCrmAuthUrl } from '../../api/index'
+import { getCustomerList, getCrmAuthUrl, batchAddLike } from '../../api/index'
const { HYEventBus } = require('hy-event-store')
const eventBus = new HYEventBus()
Page({
@@ -11,6 +11,7 @@
keyWords: '',
dataList: [],
+ customer: {},
total: 0,
flag: 0,
page: 1,
@@ -27,12 +28,29 @@
bottomLift: app.bottomLift
})
this.getList()
- },
+
+ },
+ handleSub() {
+ const { customer } = this.data
+ const enjoyList = wx.getStorageSync('enjoyList') || []
+ if(!customer.userId) return wx.showToast({
+ title: '璇峰厛閫夋嫨瑕佸叧鑱旂殑瀹㈡埛', icon: 'none'
+ })
+ batchAddLike({
+ articleIds: enjoyList.filter(i => i.checked).map(i => i.id).join(','),
+ customerId: customer.userId
+ })
+ },
tabsClick(e) {
const flag = e.currentTarget.dataset.tab
this.setData({flag})
this.setData({total: 0,dataList: [], page: 1})
this.getList()
+ },
+ itemCheck(e) {
+ const item = e.currentTarget.dataset.item
+ console.log('item', item);
+ this.setData({ customer: item })
},
reloadList() {
this.setData({total: 0,dataList: [], page: 1})
@@ -72,21 +90,6 @@
url: '/pages/webView/index?link=' + res.data,
})
})
- },
- handleSub() {
- console.log('鐐瑰嚮楗夸簡');
- wx.canvasToTempFilePath({
- x: 100,
- y: 200,
- width: 50,
- height: 50,
- destWidth: 100,
- destHeight: 100,
- canvasId: 'myCanvas',
- success(res) {
- console.log(res.tempFilePath)
- }
- })
},
onReady() {
diff --git a/wechat_staff/pages/kefu/select.less b/wechat_staff/pages/kefu/select.less
index b183920..6f4c75e 100644
--- a/wechat_staff/pages/kefu/select.less
+++ b/wechat_staff/pages/kefu/select.less
@@ -98,6 +98,7 @@
}
.icon{
width: 40rpx;
+ height: 40rpx;
margin-right: 30rpx;
}
.avatar{
diff --git a/wechat_staff/pages/kefu/select.wxml b/wechat_staff/pages/kefu/select.wxml
index 917065d..77ed7e9 100644
--- a/wechat_staff/pages/kefu/select.wxml
+++ b/wechat_staff/pages/kefu/select.wxml
@@ -23,8 +23,8 @@
<view wx:if="{{ flag == 0 }}" class="item">
<view class="item_content">
<view class="checked_wrap">
- <image wx:if="{{ item.checked }}" class="icon" src="../../static/icon/ic_video@2x.png" mode="widthFix"></image>
- <image wx:else class="icon" src="../../static/icon/ic_select@2x.png" mode="widthFix"></image>
+ <image data-item="{{ item }}" bindtap="itemCheck" wx:if="{{ customer.userId == item.userId }}" class="icon" src="../../static/icon/ic_video@2x.png" mode="widthFix"></image>
+ <image wx:else data-item="{{ item }}" bindtap="itemCheck" class="icon" src="../../static/icon/ic_select@2x.png" mode="widthFix"></image>
<image class="avatar" src="../../static/images/default_avatar.png"></image>
</view>
<!-- -->
diff --git a/wechat_staff/pages/kefu/select.wxss b/wechat_staff/pages/kefu/select.wxss
index f520b5e..673eff5 100644
--- a/wechat_staff/pages/kefu/select.wxss
+++ b/wechat_staff/pages/kefu/select.wxss
@@ -99,6 +99,7 @@
}
.list .item .icon {
width: 40rpx;
+ height: 40rpx;
margin-right: 30rpx;
}
.list .item .avatar {
diff --git a/wechat_staff/pages/promotion/index.js b/wechat_staff/pages/promotion/index.js
index 42ce6bd..f03927a 100644
--- a/wechat_staff/pages/promotion/index.js
+++ b/wechat_staff/pages/promotion/index.js
@@ -23,6 +23,10 @@
page:this.data.page,
model:{type:0}})
.then(res =>{
+ wx.stopPullDownRefresh()
+ if(this.data.page ==1){
+ this.setData({list:[]})
+ }
if(this.data.page == res.data.page){
res.data.records.forEach(element => {
element.createDate = moment(element.createDate).format("yyyy/MM/DD")
@@ -182,7 +186,9 @@
* 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
*/
onPullDownRefresh() {
-
+ console.log('涓嬫媺鍒锋柊')
+ this.setData({ page: 1 })
+ this.getList()
},
/**
diff --git a/wechat_staff/pages/promotion/index.json b/wechat_staff/pages/promotion/index.json
index 1d39d80..3bf5616 100644
--- a/wechat_staff/pages/promotion/index.json
+++ b/wechat_staff/pages/promotion/index.json
@@ -1,4 +1,5 @@
{
"usingComponents": {},
+ "enablePullDownRefresh": true,
"navigationBarTitleText": "鏈�鏂版帹骞胯祫璁�"
}
\ No newline at end of file
diff --git a/wechat_staff/pages/promotion/index.less b/wechat_staff/pages/promotion/index.less
index 2eb41c0..eb092e4 100644
--- a/wechat_staff/pages/promotion/index.less
+++ b/wechat_staff/pages/promotion/index.less
@@ -33,14 +33,14 @@
}
.imgs{
display: flex;
-
+ flex-wrap: wrap;
.img_wrap{
width: 184rpx;
height: 326rpx;
border-radius: 8rpx;
- border: 1px solid;
position: relative;
- margin-right: 20rpx;
+ margin-right: 19rpx;
+ margin-bottom: 20rpx;
&:nth-of-type(3n){
margin-right: 0;
}
diff --git a/wechat_staff/pages/promotion/index.wxml b/wechat_staff/pages/promotion/index.wxml
index 993cebc..340b0d5 100644
--- a/wechat_staff/pages/promotion/index.wxml
+++ b/wechat_staff/pages/promotion/index.wxml
@@ -7,7 +7,7 @@
<view class="imgs">
<video controls wx:if="{{item.fileType ==1 && item.fileList &&item.fileList.length}}" src="{{item.fileList[0].fileurlFull}}" class="video"></video>
<view wx:if="{{item.fileType !=1 && item.fileList}}" data-id="{{ item.id }}" wx:for-item="item1" wx:for="{{ item.fileList }}" class="img_wrap">
- <image class="img" mode="widthFix" src="{{item1.fileurlFull}}"></image>
+ <image class="img" mode="aspectFill" src="{{item1.fileurlFull}}"></image>
</view>
</view>
<view class="footer">
diff --git a/wechat_staff/pages/promotion/index.wxss b/wechat_staff/pages/promotion/index.wxss
index 06c5da7..43ca9b7 100644
--- a/wechat_staff/pages/promotion/index.wxss
+++ b/wechat_staff/pages/promotion/index.wxss
@@ -13,7 +13,6 @@
background: #F7F7F7;
border-radius: 8rpx;
padding: 34rpx 40rpx 40rpx;
- margin-bottom: 40rpx;
}
.content .time {
font-weight: 500;
@@ -31,16 +30,14 @@
}
.content .imgs {
display: flex;
- width: 100%;
flex-wrap: wrap;
}
.content .imgs .img_wrap {
width: 184rpx;
height: 326rpx;
border-radius: 8rpx;
- border: 1px solid;
position: relative;
- margin-right: 20rpx;
+ margin-right: 19rpx;
margin-bottom: 20rpx;
}
.content .imgs .img_wrap:nth-of-type(3n) {
@@ -48,11 +45,7 @@
}
.content .imgs .img_wrap .img {
width: 100%;
- max-height: 100%;
-}
-.content .imgs .video {
- width: 100%;
- max-height: 100%;
+ height: 100%;
}
.content .imgs .img_wrap .icon {
position: absolute;
diff --git a/wechat_staff/pages/store/staff.js b/wechat_staff/pages/store/staff.js
index fb154f9..ffd4ea7 100644
--- a/wechat_staff/pages/store/staff.js
+++ b/wechat_staff/pages/store/staff.js
@@ -9,7 +9,7 @@
*/
data: {
bottomLift: 0,
- isShow: true,
+ isShow: false,
userCard: '',
isShow2: false,
userInfo: {}
diff --git a/wechat_staff/pages/userinfo/index.js b/wechat_staff/pages/userinfo/index.js
index c67194e..a208323 100644
--- a/wechat_staff/pages/userinfo/index.js
+++ b/wechat_staff/pages/userinfo/index.js
@@ -135,7 +135,7 @@
filePath: res.tempFiles[0].tempFilePath,
name: 'file',
formData: {
- folder: "member"
+ folder: "users"
},
header: {
token: wx.getStorageSync('token')
@@ -177,7 +177,7 @@
filePath: res.tempFiles[0].tempFilePath,
name: 'file',
formData: {
- folder: "member"
+ folder: "users"
},
header: {
token: wx.getStorageSync('token')
diff --git a/wechat_staff/pages/userinfo/index.wxml b/wechat_staff/pages/userinfo/index.wxml
index 6cf78b7..8809959 100644
--- a/wechat_staff/pages/userinfo/index.wxml
+++ b/wechat_staff/pages/userinfo/index.wxml
@@ -26,25 +26,25 @@
</view>
</picker>
</view>
- <view wx:else class="input"><text>{{ userInfo.jobDate }} 骞�</text></view>
+ <view wx:else class="input"><text>{{ userInfo.jobDate || '0' }} 骞�</text></view>
</view>
</view>
<view class="line">
<view class="label">鏈嶅姟瀹㈡埛</view>
- <van-field wx:if="{{ editFalg }}" type="text" border="{{false}}" class="input" model:value="{{ costomerNum }}" maxlength="{{ 5 }}" clearable />
+ <van-field wx:if="{{ editFalg }}" type="text" border="{{false}}" class="input" model:value="{{ costomerNum || '0' }}" maxlength="{{ 5 }}" clearable />
<view wx:else class="input">{{ costomerNum }}</view>
</view>
<view class="line">
<view class="label">闂ㄥ簵鍚嶇О</view>
- <view class="input">{{ userInfo.shopName }}</view>
+ <view class="input">{{ userInfo.shopName || '' }}</view>
</view>
<view class="line">
<view class="label">闂ㄥ簵鍩庡競</view>
- <view class="input">{{ userInfo.shopCity }}</view>
+ <view class="input">{{ userInfo.shopCity || '' }}</view>
</view>
<view class="line">
<view class="label">闂ㄥ簵鍦板潃</view>
- <view class="input">{{ userInfo.shopAddress }}</view>
+ <view class="input">{{ userInfo.shopAddress || '' }}</view>
</view>
<view class="line">
<view class="label">寰俊浜岀淮鐮�</view>
diff --git a/wechat_staff/pages/webView/index.js b/wechat_staff/pages/webView/index.js
index 5f082d8..8c8b895 100644
--- a/wechat_staff/pages/webView/index.js
+++ b/wechat_staff/pages/webView/index.js
@@ -1,5 +1,6 @@
// pages/webView/index.js
-
+import {
+} from '../../api/index'
Page({
/**
@@ -9,23 +10,21 @@
hasUserInfo: true,
userInfo: {},
id: '',
- link: ''
+ linkUrl: ''
},
+
onLoad: function (options) {
- let that = this
- const eventChannel = this.getOpenerEventChannel()
-
- if (options.link) {
- that.setData({ link: options.link, id: options.id || '' })
- } else {
- // 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
- eventChannel.on('acceptDataFromOpenerPage', function(data) {
- console.log('鍙傛暟', data)
- if (data.title) wx.setNavigationBarTitle({ title: data.title })
- that.setData({ link: data.link, id: data.id })
- // saveBannerLookNum({ id: data.id })
- })
- }
+ var that = this
+ const eventChannel = this.getOpenerEventChannel()
+ if(eventChannel){
+ eventChannel.on('data', function (res) {
+ console.log(res)//浼犻�掑弬鏁�
+ if(res){
+ that.setData({ linkUrl: res.link})
+ console.log(that.data.linkUrl)
+ }
+ });
+ }
},
/**
diff --git a/wechat_staff/pages/webView/index.wxml b/wechat_staff/pages/webView/index.wxml
index 3525f65..dd50428 100644
--- a/wechat_staff/pages/webView/index.wxml
+++ b/wechat_staff/pages/webView/index.wxml
@@ -1,5 +1 @@
-
-<web-view src="http://crmtest.zhibang.com:8000/core/oauth/authorize/jump?timestamp=-470965492&agent_phone_number=18055151023&bindKey=mpAddIntention&sign=f2dcf1e3946df40fa9392011da99772d">
-</web-view>
-
-
+ <web-view wx:if="{{linkUrl !=null && linkUrl !=''}}" src="{{linkUrl}}"> </web-view>
diff --git a/wechat_staff/pages/work/index.js b/wechat_staff/pages/work/index.js
index cb7b991..ef2a209 100644
--- a/wechat_staff/pages/work/index.js
+++ b/wechat_staff/pages/work/index.js
@@ -8,19 +8,22 @@
topimg:'',
clientHeight: 0,
clientTop: 0,
+ showCard: false,
userInfo: {name:''}
},
-
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
- */
onLoad(options) {
const res = wx.getMenuButtonBoundingClientRect()
this.setData({clientHeight: res.height})
this.setData({clientTop: res.top})
-
+ },
+ onShow() {
this.initData()
+ },
+ showQrcode() {
+ this.setData({ showCard: true })
+ },
+ onClose() {
+ this.setData({ showCard: false })
},
changePath(e) {
const {userInfo} = this.data
@@ -52,13 +55,6 @@
})
},
onReady() {
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
- */
- onShow() {
-
},
/**
diff --git a/wechat_staff/pages/work/index.json b/wechat_staff/pages/work/index.json
index 965b8e8..3f6d92a 100644
--- a/wechat_staff/pages/work/index.json
+++ b/wechat_staff/pages/work/index.json
@@ -1,4 +1,6 @@
{
- "usingComponents": {},
+ "usingComponents": {
+ "van-popup": "@vant/weapp/popup/index"
+ },
"navigationStyle": "custom"
}
\ No newline at end of file
diff --git a/wechat_staff/pages/work/index.less b/wechat_staff/pages/work/index.less
index 19bb60b..fc3030b 100644
--- a/wechat_staff/pages/work/index.less
+++ b/wechat_staff/pages/work/index.less
@@ -12,7 +12,6 @@
padding: 72rpx 40rpx 48rpx;
color: #fff;
font-size: 26rpx;
- background-color: aquamarine;
.content {
flex: 1;
@@ -65,4 +64,37 @@
}
}
}
+ .modal{
+ width: 600rpx;
+ height: 720rpx;
+ padding: 48rpx 40rpx;
+ border-radius: 16rpx;
+ .header{
+ display: flex;
+ .avatar{
+ width: 88rpx;
+ height: 88rpx;
+ border-radius: 50%;
+ margin-right: 24rpx;
+ }
+ .content{
+ .name{font-size: 30rpx;}
+ .desc{
+ font-size: 24rpx;
+ color: #999999;
+ margin-top: 12rpx;
+ }
+ }
+ }
+ .qrcode{
+ width: 400rpx;
+ height: 400rpx;
+ margin: 60rpx auto 40rpx;
+ }
+ .text{
+ font-size: 26rpx;
+ color: #999999;
+ text-align: center;
+ }
+ }
}
\ No newline at end of file
diff --git a/wechat_staff/pages/work/index.wxml b/wechat_staff/pages/work/index.wxml
index 00d9b82..686f9c1 100644
--- a/wechat_staff/pages/work/index.wxml
+++ b/wechat_staff/pages/work/index.wxml
@@ -1,18 +1,18 @@
<view class="container">
-<view class="topbg" style="background-image:url('{{topimg}}');background-color: aquamarine;">
- <view class="navbar" style="padding-top: {{ clientTop }}px;height: {{clientHeight + clientTop}}px;">宸ヤ綔鍙�</view>
- <view class="userinfo" data-index="0" bindtap="changePath">
- <image class="avatar" src="{{userInfo.imgurlFull ? userInfo.imgurlFull : '../../static/images/default_avatar.png'}}"></image>
- <view class="content" >
- <view class="header">
- <view class="name">{{userInfo.name}}</view>
+ <view class="topbg" style="background-image:url('{{topimg}}');background-color: aquamarine;">
+ <view class="navbar" style="padding-top: {{ clientTop }}px;height: {{clientHeight + clientTop}}px;">宸ヤ綔鍙�</view>
+ <view class="userinfo">
+ <image data-index="0" bindtap="changePath" class="avatar" src="{{userInfo.imgurlFull ? userInfo.imgurlFull : '../../static/images/default_avatar.png'}}"></image>
+ <view data-index="0" bindtap="changePath" class="content">
+ <view class="header">
+ <view class="name">{{userInfo.name}}</view>
+ </view>
+ <view class="addr">{{userInfo.phone}}</view>
+ <view class="detail">{{userInfo.shopName}}</view>
</view>
- <view class="addr">{{userInfo.phone}}</view>
- <view class="detail">{{userInfo.shopName}}</view>
+ <image data-index="0" bindtap="showQrcode" class="edit" src="../../static/icon/gongzuotai_ic_erweima@2x.png" mode="widthFix"></image>
</view>
- <image data-index="0" bindtap="changePath" class="edit" src="../../static/icon/gongzuotai_ic_erweima@2x.png" mode="widthFix"></image>
</view>
-</view>
<view class="main_content">
<view class="func_list">
<view class="line" data-index="1" bindtap="changePath">
@@ -35,4 +35,18 @@
</view>
</view>
</view>
+ <!-- 璇︽儏 -->
+ <van-popup show="{{ showCard }}" closeable round bind:close="onClose">
+ <view class="modal">
+ <view class="header">
+ <image class="avatar" src="{{userInfo.imgurlFull ? userInfo.imgurlFull : '../../static/images/default_avatar.png'}}"></image>
+ <view class="content">
+ <view class="name">{{userInfo.name}}</view>
+ <view class="desc">瀵艰喘 锝� {{userInfo.jobDate ||'0'}}骞寸粡楠�</view>
+ </view>
+ </view>
+ <image class="qrcode" src="{{userInfo.qrcodeImgFull}}"></image>
+ <view class="text">闀挎寜鍥剧墖璇嗗埆浜岀淮鐮�</view>
+ </view>
+ </van-popup>
</view>
\ No newline at end of file
diff --git a/wechat_staff/pages/work/index.wxss b/wechat_staff/pages/work/index.wxss
index b5124e6..7d21c6a 100644
--- a/wechat_staff/pages/work/index.wxss
+++ b/wechat_staff/pages/work/index.wxss
@@ -11,11 +11,7 @@
display: flex;
padding: 72rpx 40rpx 48rpx;
color: #fff;
- font-size: 26rpx;
-}
-.container .topbg{
- background-size: 100% auto;
- background-repeat: no-repeat;
+ font-size: 26rpx;
}
.container .userinfo .content {
flex: 1;
@@ -64,3 +60,36 @@
.container .main_content .func_list .line .icon {
width: 40rpx;
}
+.container .modal {
+ width: 600rpx;
+ height: 720rpx;
+ padding: 48rpx 40rpx;
+ border-radius: 16rpx;
+}
+.container .modal .header {
+ display: flex;
+}
+.container .modal .header .avatar {
+ width: 88rpx;
+ height: 88rpx;
+ border-radius: 50%;
+ margin-right: 24rpx;
+}
+.container .modal .header .content .name {
+ font-size: 30rpx;
+}
+.container .modal .header .content .desc {
+ font-size: 24rpx;
+ color: #999999;
+ margin-top: 12rpx;
+}
+.container .modal .qrcode {
+ width: 400rpx;
+ height: 400rpx;
+ margin: 60rpx auto 40rpx;
+}
+.container .modal .text {
+ font-size: 26rpx;
+ color: #999999;
+ text-align: center;
+}
diff --git a/wechat_staff/project.private.config.json b/wechat_staff/project.private.config.json
index c1097ec..79e21ef 100644
--- a/wechat_staff/project.private.config.json
+++ b/wechat_staff/project.private.config.json
@@ -38,7 +38,7 @@
},
{
"name": "",
- "pathName": "pages/kefu/select",
+ "pathName": "pages/webView/index",
"query": "",
"launchMode": "default",
"scene": null
diff --git a/wechat_staff/static/icon/ic_kehuxihuan.png b/wechat_staff/static/icon/ic_kehuxihuan.png
index acbe934..ef427b2 100644
--- a/wechat_staff/static/icon/ic_kehuxihuan.png
+++ b/wechat_staff/static/icon/ic_kehuxihuan.png
Binary files differ
diff --git a/wechat_staff/static/icon/ic_mingpian.png b/wechat_staff/static/icon/ic_mingpian.png
index 171e032..7bf11a2 100644
--- a/wechat_staff/static/icon/ic_mingpian.png
+++ b/wechat_staff/static/icon/ic_mingpian.png
Binary files differ
diff --git a/wechat_staff/static/icon/ic_select.png b/wechat_staff/static/icon/ic_select.png
new file mode 100644
index 0000000..3a03619
--- /dev/null
+++ b/wechat_staff/static/icon/ic_select.png
Binary files differ
diff --git a/wechat_staff/static/icon/ic_select_sel.png b/wechat_staff/static/icon/ic_select_sel.png
new file mode 100644
index 0000000..c182f15
--- /dev/null
+++ b/wechat_staff/static/icon/ic_select_sel.png
Binary files differ
diff --git a/wechat_staff/static/icon/ic_yixiang.png b/wechat_staff/static/icon/ic_yixiang.png
index 113a5cd..60fe581 100644
--- a/wechat_staff/static/icon/ic_yixiang.png
+++ b/wechat_staff/static/icon/ic_yixiang.png
Binary files differ
diff --git a/wechat_staff/utils/config.js b/wechat_staff/utils/config.js
index 2d00a25..a150c8d 100644
--- a/wechat_staff/utils/config.js
+++ b/wechat_staff/utils/config.js
@@ -1,5 +1,3 @@
-
-
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/' //娴嬭瘯鏈嶅姟鍣�
diff --git a/wechat_staff/utils/downloadSaveFile.js b/wechat_staff/utils/downloadSaveFile.js
new file mode 100644
index 0000000..6c11afe
--- /dev/null
+++ b/wechat_staff/utils/downloadSaveFile.js
@@ -0,0 +1,141 @@
+// 灏佽涓�涓柟娉� 鍦╱tils涓� 鍚嶄负 downloadSaveFile.js
+// 浣跨敤鏃� 寮曞叆锛堟寜鐓ц嚜宸辩殑璺姴鍐欙級 import { downloadFiles} from '../../utils/downloadSaveFile'
+
+
+function downloadFiles(type, urls) {
+ checkAuth(() => {
+ wx.showLoading({
+ title: '姝ｅ湪涓嬭浇',
+ mask: true
+ })
+ for (let i = 0; i < urls.length; i++) {
+ downloadSaveFile(
+ urls[i],
+ );
+ }
+ })
+}
+
+//涓嬭浇鏂囦欢
+function downloadSaveFile(url, successc) {
+ let isimg = 'bmp,jpg,png,tif,gif,pcx,tga,exif,fpx,svg,psd,cdr,pcd,dxf,ufo,eps,ai,raw,wmf, jpeg'.includes(url.split('.').slice(-1))
+ if (isimg) {
+ // 濡傛灉鏄浘鐗囩被鍨�
+ wx.downloadFile({
+ url: url,
+ success: res => {
+ if (res.statusCode === 200) {
+ wx.saveImageToPhotosAlbum({
+ filePath: res.tempFilePath,
+ success: res => {
+ wx.showToast({
+ title: '淇濆瓨鎴愬姛',
+ icon: "none"
+ })
+ },
+ fail: res => {
+ wx.showToast({
+ title: '淇濆瓨澶辫触',
+ icon: "none"
+ })
+ }
+ })
+
+ }
+ }
+ })
+
+ } else {
+ // 濡傛灉鏄棰戠被鍨�
+ wx.downloadFile({
+ url: url,
+ success: res => {
+ if (res.statusCode === 200) {
+ wx.saveVideoToPhotosAlbum({
+ filePath: res.tempFilePath,
+ success: res => {
+ // successc && successc();
+ wx.showToast({
+ title: '淇濆瓨鎴愬姛',
+ icon: "none"
+ })
+ },
+ fail: res => {
+ wx.showToast({
+ title: '淇濆瓨澶辫触',
+ icon: "none"
+ })
+ }
+ })
+ }
+ }
+ })
+ }
+}
+
+//妫�鏌ユ潈闄�
+function checkAuth(gotc) {
+ //鏌ヨ鏉冮檺
+ wx.showLoading({
+ title: '妫�鏌ユ巿鏉冩儏鍐�',
+ mask: true
+ })
+ wx.getSetting({
+ success(res) {
+ wx.hideLoading();
+ if (!res.authSetting['scope.writePhotosAlbum']) {
+ //璇锋眰鎺堟潈
+ wx.authorize({
+ scope: 'scope.writePhotosAlbum',
+ success() {
+ //鑾峰緱鎺堟潈锛屽紑濮嬩笅杞�
+ gotc && gotc();
+ },
+ fail() {
+ wx.showModal({
+ title: '',
+ content: '淇濆瓨鍒扮郴缁熺浉鍐岄渶瑕佹巿鏉�',
+ confirmText: '鎺堟潈',
+ success(res) {
+ if (res.confirm) {
+ wx.openSetting({
+ success(res) {
+ if (res.authSetting['scope.writePhotosAlbum'] === true) {
+ gotc && gotc();
+ }
+ }
+ })
+ }
+ },
+ fail() {
+ wx.showToast({
+ title: '鎵撳紑璁剧疆椤靛け璐�',
+ icon: 'none',
+ })
+ }
+ })
+ }
+ })
+ } else {
+ //宸叉湁鎺堟潈
+ gotc && gotc();
+ }
+ },
+ fail() {
+ wx.hideLoading();
+ wx.showToast({
+ title: '鑾峰彇鎺堟潈澶辫触',
+ icon: 'none',
+ })
+ }
+ })
+}
+
+module.exports = {
+ downloadFiles,
+ checkAuth,
+ downloadSaveFile
+};
+
+
+
--
Gitblit v1.9.3