From 5a1cc511d0a16970d5d56fad3cfeaab8f0d903d2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 26 七月 2024 15:19:40 +0800
Subject: [PATCH] 提交
---
wechat_staff/pages/promotion/index.js | 2 +-
wechat_staff/pages/userinfo/index.js | 2 ++
wechat_staff/pages/userinfo/index.wxml | 8 ++++----
wechat_staff/pages/download/index.js | 2 +-
wechat_staff/pages/kefu/fond.js | 2 +-
server/web/src/main/java/com/doumee/api/web/CustomerManageApi.java | 1 +
wechat_staff/components/detailFooter/index.js | 26 +++++++++++++++++++++-----
7 files changed, 31 insertions(+), 12 deletions(-)
diff --git a/server/web/src/main/java/com/doumee/api/web/CustomerManageApi.java b/server/web/src/main/java/com/doumee/api/web/CustomerManageApi.java
index 754ea35..f7a4f73 100644
--- a/server/web/src/main/java/com/doumee/api/web/CustomerManageApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/CustomerManageApi.java
@@ -147,6 +147,7 @@
String token = DigestUtils.md5Hex(timestamp+interfaceKey);
if(!token.equals(sign)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"token宸插け鏁�!");
+
}
try{
response.setHeader("Cache-Control", "no-store, no-cache");
diff --git a/wechat_staff/components/detailFooter/index.js b/wechat_staff/components/detailFooter/index.js
index f7dc550..108ad93 100644
--- a/wechat_staff/components/detailFooter/index.js
+++ b/wechat_staff/components/detailFooter/index.js
@@ -55,7 +55,7 @@
let that = this
getContentShareImg({
articleId: `${info.id}_${path}`,
- type: '1',
+ type: '0',
// pageUrl: path,
imgurl: info.coverImage,
}).then(res => {
@@ -81,11 +81,27 @@
that.setData({
isShowPoster: false
})
- wx.showToast({
- title: '淇濆瓨鎴愬姛',
- icon: 'success',
- duration: 2000
+ wx.setClipboardData({
+ data: ' >>绮惧搧妗堜緥<<\n'
+ +' 馃绮剧泭姹傜簿锛屽搧璐ㄧ敓娲火煡嘰n'
+ +'姹囬泦鍏ㄥ浗浼樼璁捐甯堣幏濂栨渚媆n'
+ +'馃憠鍚勭椋庢牸鐏垫劅妗堜緥涓婁竾濂楌煈圽n'
+ +' 鎬绘湁涓�濂楄兘鎵撳姩鎮紝閫傚悎鎮�',
+ success: function (res) {
+ wx.getClipboardData({
+ success: function (res) {
+ wx.showToast({
+ title: '鏂囨宸插鍒舵垚鍔燂紝鍘诲垎浜惂'
+ })
+ }
+ })
+ }
})
+ // wx.showToast({
+ // title: '淇濆瓨鎴愬姛',
+ // icon: 'success',
+ // duration: 2000
+ // })
}
})
diff --git a/wechat_staff/pages/download/index.js b/wechat_staff/pages/download/index.js
index a18659c..5bcb799 100644
--- a/wechat_staff/pages/download/index.js
+++ b/wechat_staff/pages/download/index.js
@@ -47,7 +47,7 @@
if (item.checked) {
getContentShareImg({
articleId: `${downloadConfig.id}_${downloadConfig.path}`,
- type: this.takeQrcode ? 1 : 0,
+ type: this.takeQrcode ? 0 : 1,
imgurl: item.url
}).then(res => {
wx.downloadFile({
diff --git a/wechat_staff/pages/kefu/fond.js b/wechat_staff/pages/kefu/fond.js
index 814ef7e..913f0c5 100644
--- a/wechat_staff/pages/kefu/fond.js
+++ b/wechat_staff/pages/kefu/fond.js
@@ -105,7 +105,7 @@
let that = this
getContentShareImg({
articleId: obj.id + '&' + obj.joinType,
- type: '1',
+ type: '0',
// pageUrl: path,
imgurl: obj.coverImage,
}).then(res => {
diff --git a/wechat_staff/pages/promotion/index.js b/wechat_staff/pages/promotion/index.js
index f03927a..abb2a7c 100644
--- a/wechat_staff/pages/promotion/index.js
+++ b/wechat_staff/pages/promotion/index.js
@@ -112,7 +112,7 @@
}
})
}
- })
+ })
}
}, fail(err) {
wx.showToast({
diff --git a/wechat_staff/pages/userinfo/index.js b/wechat_staff/pages/userinfo/index.js
index 2083c1a..c358260 100644
--- a/wechat_staff/pages/userinfo/index.js
+++ b/wechat_staff/pages/userinfo/index.js
@@ -41,6 +41,7 @@
})
},
onSubmit() {
+ var that = this
console.log('鐐逛簡');
const {
slogans,
@@ -60,6 +61,7 @@
this.setData({
editFalg: false
})
+ that.getUserInfo()
wx.showToast({
title: '淇℃伅淇濆瓨鎴愬姛',
})
diff --git a/wechat_staff/pages/userinfo/index.wxml b/wechat_staff/pages/userinfo/index.wxml
index 590c34f..5c83bc9 100644
--- a/wechat_staff/pages/userinfo/index.wxml
+++ b/wechat_staff/pages/userinfo/index.wxml
@@ -20,7 +20,7 @@
<view class="label">浠庝笟骞撮檺</view>
<view class="val">
<view wx:if="{{ editFalg }}" class="input">
- <van-field wx:if="{{ editFalg }}" type="text" border="{{false}}" class="input" model:value="{{ jobDate }}" maxlength="{{ 5 }}" clearable />
+ <van-field type="number" wx:if="{{ editFalg }}" border="{{false}}" class="input" model:value="{{ jobDate }}" maxlength="{{ 5 }}" clearable />
<view wx:else class="input">{{ jobDate || '0'}}骞�</view>
<!-- <picker class="picker" mode="date" value="{{date}}" fields="year" start="1970-09-01" end="{{endDate}}" bindchange="bindDateChange">
<view class="picker_wrap">
@@ -34,7 +34,7 @@
</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="number" border="{{false}}" class="input" model:value="{{ costomerNum }}" maxlength="{{ 5 }}" clearable />
<view wx:else class="input">{{ costomerNum }}</view>
</view>
<view class="line">
@@ -53,7 +53,7 @@
<view class="label">寰俊浜岀淮鐮�</view>
<view class="val" bindtap="selMedia">
<view class="input"></view>
- <image wx:if="userInfo.qrcodeImgFull !=null &&userInfo.qrcodeImgFull !='' " class="qrcode" mode="widthFix" src="{{userInfo.qrcodeImgFull}}"></image>
+ <image wx:if="qrcodeImgFull !=null &&qrcodeImgFull !='' " class="qrcode" mode="widthFix" src="{{qrcodeImgFull}}"></image>
<image wx:else="" class="qrcode" mode="widthFix" src="../../static/icon/mingpian_erweima@2x.png"></image>
<image wx:if="{{ editFalg }}" class="icon" src="../../static/icon/home_ar@2x.png" mode="widthFix"></image>
</view>
@@ -62,7 +62,7 @@
<view class="label">浼佷笟寰俊浜岀淮鐮�</view>
<view class="val" bindtap="selMedia2">
<view class="input"></view>
- <image wx:if="userInfo.companyQrcodeImgFull !=null &&userInfo.companyQrcodeImgFull !='' " class="qrcode" mode="widthFix" src="{{userInfo.companyQrcodeImgFull}}"></image>
+ <image wx:if="companyQrcodeImgFull !=null && companyQrcodeImgFull !='' " class="qrcode" mode="widthFix" src="{{companyQrcodeImgFull}}"></image>
<image wx:else="" class="qrcode" mode="widthFix" src="../../static/icon/mingpian_erweima@2x.png"></image>
<image wx:if="{{ editFalg }}" class="icon" src="../../static/icon/home_ar@2x.png" mode="widthFix"></image>
</view>
--
Gitblit v1.9.3