From c7d7aff39b6566d05d3c0a080839c46bb2b6a8aa Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 26 七月 2024 11:43:44 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
wechat_staff/pages/detailDis/case.wxml | 2
wechat_staff/pages/productVideo/index.wxml | 1
wechat_staff/pages/consult/consult.js | 11 +-
wechat_staff/components/disRealpic/index.js | 12 +
wechat_staff/pages/discover/discover.wxml | 2
wechat_staff/static/icon/ic_select_sel@2x.png | 0
wechat_staff/pages/kefu/fond.js | 4
wechat_staff/static/icon/ic_select_sel.png | 0
wechat_staff/pages/kefu/fond.wxss | 4
wechat_staff/pages/discover/discover.js | 7 +
wechat_staff/pages/homeId/index.js | 6 +
wechat_staff/pages/detailDis/product.js | 22 +++
wechat_staff/pages/userinfo/index.js | 64 +++++++++++-
wechat_staff/pages/userinfo/index.wxss | 2
wechat_staff/pages/kefu/select.js | 11 +
wechat_staff/pages/consult/detail.wxml | 2
wechat_staff/pages/consult/consult.wxml | 2
wechat_staff/utils/config.js | 4
wechat_staff/pages/detailDis/case.js | 20 ++-
wechat_staff/pages/userinfo/index.wxml | 23 ++-
wechat_staff/pages/detailDis/realpic.wxml | 2
wechat_staff/pages/detailDis/realpic.js | 13 ++
wechat_staff/pages/productVideo/index.js | 4
wechat_staff/pages/detailDis/product.wxml | 2
wechat_staff/components/buoyClient/index.js | 15 +-
wechat_staff/pages/productVideo/index.json | 5
wechat_staff/api/index.js | 16 +++
server/web/src/main/java/com/doumee/api/web/CustomerManageApi.java | 3
28 files changed, 193 insertions(+), 66 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 0e4ab81..754ea35 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
@@ -115,8 +115,6 @@
return ApiResponse.success(newsService.findPage(pageWrap));
}
-
-
@UserLoginRequired
@ApiOperation(value = "鑾峰彇瀹㈡埛绠＄悊鎺堟潈-鍒楄〃璺宠浆鍦板潃", notes = "鑾峰彇瀹㈡埛绠＄悊鎺堟潈璺宠浆鍦板潃")
@GetMapping("/getCrmAuthUrl")
@@ -159,5 +157,4 @@
e.printStackTrace();
}
}
-
}
diff --git a/wechat_staff/api/index.js b/wechat_staff/api/index.js
index ba78727..4157c97 100644
--- a/wechat_staff/api/index.js
+++ b/wechat_staff/api/index.js
@@ -324,3 +324,19 @@
data
})
}
+
+export const refreshEnjoy = (obj) =>{
+ let child = obj.selectComponent('.buoyClient');
+ // 璋冪敤瀛愮粍浠朵腑瀹氫箟鐨勬柟娉�
+ if(child){
+ child.freshData();
+ }
+ var {info} = obj.data ;
+ if(info){
+ const enjoyList = wx.getStorageSync('enjoyList') || [];
+ const index = enjoyList.findIndex( i => i.id === info.id );
+ info.isEnjoy = index > -1;
+ obj.setData({ info:info}) ;
+ }
+
+}
\ No newline at end of file
diff --git a/wechat_staff/components/buoyClient/index.js b/wechat_staff/components/buoyClient/index.js
index 738093c..2ab8bc9 100644
--- a/wechat_staff/components/buoyClient/index.js
+++ b/wechat_staff/components/buoyClient/index.js
@@ -8,10 +8,10 @@
type: String,
value: '0'
}
- },
- attached() {
- const enjoyList = wx.getStorageSync('enjoyList') || []
- this.setData({ enjoyList })
+ },
+ attached() {
+ const enjoyList = wx.getStorageSync('enjoyList') || []
+ this.setData({ enjoyList })
},
/**
* 缁勪欢鐨勫垵濮嬫暟鎹�
@@ -24,6 +24,10 @@
* 缁勪欢鐨勬柟娉曞垪琛�
*/
methods: {
+ freshData() {
+ const enjoyList = wx.getStorageSync('enjoyList') || []
+ this.setData({ enjoyList })
+ },
jumpPage(e) {
const urls = [ '/pages/kefu/fond', '/pages/store/staff' ]
const i = e.currentTarget.dataset.i
@@ -34,8 +38,7 @@
wx.navigateTo({
url: '/pages/webView/index',
success: function(res) {
- // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
- console.log(link)
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
res.eventChannel.emit('data',{link:link} );
}
})
diff --git a/wechat_staff/components/disRealpic/index.js b/wechat_staff/components/disRealpic/index.js
index d5fea88..52ce1e3 100644
--- a/wechat_staff/components/disRealpic/index.js
+++ b/wechat_staff/components/disRealpic/index.js
@@ -74,10 +74,10 @@
const item = e.currentTarget.dataset.item
console.log('item', item);
wx.navigateTo({
- url: '/pages/webView/index?link=' + item.openContent,
+ url: '/pages/webView/index',
success: function(res) {
- // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
- res.eventChannel.emit('acceptDataFromOpenerPage', { link: item.openContent, title: item.title })
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
+ res.eventChannel.emit('data',{link:item.openContent} );
}
})
},
@@ -107,7 +107,11 @@
}
if(item.openType == 'link'){
wx.navigateTo({
- url: '/pages/webView/index?link=' + item.openContent,
+ url: '/pages/webView/index',
+ success: function(res) {
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
+ res.eventChannel.emit('data',{link:item.openContent} );
+ }
})
}
if(item.openType == 'page'){
diff --git a/wechat_staff/pages/consult/consult.js b/wechat_staff/pages/consult/consult.js
index 5e74e3b..d4ed9bb 100644
--- a/wechat_staff/pages/consult/consult.js
+++ b/wechat_staff/pages/consult/consult.js
@@ -1,4 +1,4 @@
-import { getZhongTaiProductNewsPage, getCatalogList,actionDo } from '../../api/index'
+import { getZhongTaiProductNewsPage, getCatalogList,actionDo,refreshEnjoy } from '../../api/index'
Page({
/**
@@ -60,10 +60,11 @@
actionDo({actionType: 'view',id: item.id})
if(item.contentType == 'link'){
wx.navigateTo({
- url: '/pages/webView/index?link=' + item.content,
+ url: '/pages/webView/index',
success: function(res) {
- // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
- res.eventChannel.emit('acceptDataFromOpenerPage', { link: item.openContent, title: item.title })
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
+ console.log(item)
+ res.eventChannel.emit('data',{link:item.content,title:item.title} );
}
})
}else{
@@ -116,7 +117,7 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
*/
onShow() {
-
+ refreshEnjoy(this)
},
/**
diff --git a/wechat_staff/pages/consult/consult.wxml b/wechat_staff/pages/consult/consult.wxml
index a3df2f1..650f706 100644
--- a/wechat_staff/pages/consult/consult.wxml
+++ b/wechat_staff/pages/consult/consult.wxml
@@ -1,6 +1,6 @@
<view class="container">
<!-- 鎮诞 -->
- <buoyClient />
+ <buoyClient class="buoyClient"/>
<view class="home_top">
<view class="search_wrap">
diff --git a/wechat_staff/pages/consult/detail.wxml b/wechat_staff/pages/consult/detail.wxml
index b43a9a2..71a4c92 100644
--- a/wechat_staff/pages/consult/detail.wxml
+++ b/wechat_staff/pages/consult/detail.wxml
@@ -1,6 +1,6 @@
<view>
<!-- <navBar title="{{ navTitle }}"></navBar> -->
- <buoyClient showPurpose="1" />
+ <buoyClient showPurpose="1" class="buoyClient"/>
<view class="main_content">
<view class="main_title">{{ info.title }}</view>
<view class="datetime">鍙戝竷鏃堕棿锛歿{ info.publishDt }}</view>
diff --git a/wechat_staff/pages/detailDis/case.js b/wechat_staff/pages/detailDis/case.js
index 8c34f7c..92ab8dd 100644
--- a/wechat_staff/pages/detailDis/case.js
+++ b/wechat_staff/pages/detailDis/case.js
@@ -1,4 +1,4 @@
-import { actionDo, getWholecaseInfo } from '../../api/index'
+import { actionDo, getWholecaseInfo,refreshEnjoy } from '../../api/index'
Page({
/**
@@ -30,9 +30,10 @@
wx.navigateTo({
url: '/pages/webView/index',
success: function(res) {
- // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
- res.eventChannel.emit('acceptDataFromOpenerPage', { link, title })
- }
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
+ console.log(link+"--------------------")
+ res.eventChannel.emit('data',{link:link,title:title} );
+ }
})
},
openShare() {
@@ -50,11 +51,14 @@
// }
// },
handleEnjoy(e) {
+ const info = this.data.info
+ if(info.id == null ){
+ return
+ }
const enjoyList = wx.getStorageSync('enjoyList') || []
const { type, flag } = e.detail
console.log('type', type);
- console.log('flag', flag);
- const info = this.data.info
+ console.log('flag', flag);
if(type == 'enjoy'){
// 鐐瑰嚮浜嗗枩娆�
const index = enjoyList.findIndex( i => i.id === info.id )
@@ -72,6 +76,7 @@
enjoyList.splice(index, 1)
}
wx.setStorageSync('enjoyList', enjoyList)
+ refreshEnjoy(this)
}else{
actionDo({
id: info.id,
@@ -129,7 +134,8 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
*/
onShow() {
-
+ refreshEnjoy(this)
+
},
/**
diff --git a/wechat_staff/pages/detailDis/case.wxml b/wechat_staff/pages/detailDis/case.wxml
index 9a99283..a1d0271 100644
--- a/wechat_staff/pages/detailDis/case.wxml
+++ b/wechat_staff/pages/detailDis/case.wxml
@@ -1,5 +1,5 @@
<view class="container">
- <buoyClient showPurpose="1" />
+ <buoyClient showPurpose="1" class="buoyClient"/>
<detailFooter bindenjoy="handleEnjoy" path="1" info="{{info}}" />
<view class="main_title">{{ info.title }}</view>
<view class="time">鍙戝竷鏃堕棿锛歿{ info.publishDt }}</view>
diff --git a/wechat_staff/pages/detailDis/product.js b/wechat_staff/pages/detailDis/product.js
index 0fa8bec..46d697f 100644
--- a/wechat_staff/pages/detailDis/product.js
+++ b/wechat_staff/pages/detailDis/product.js
@@ -1,7 +1,8 @@
import {
shareContent,
getProductInfo,
- actionDo
+ actionDo,
+ refreshEnjoy
} from '../../api/index'
import moment from "moment";
Page({
@@ -13,7 +14,15 @@
id: '',
info: {},
member: {},
- showShare: false
+ showShare: false,
+ enjoyList: []
+ },
+ onShow(){
+ console.log('onShow')
+ refreshEnjoy(this)
+ },
+ onHide() {
+ console.log('onHide')
},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
@@ -34,13 +43,17 @@
member
})
},
+
// 缁勪欢浜嬩欢
handleEnjoy(e) {
+ const info = this.data.info
+ if(info.id == null ){
+ return
+ }
const enjoyList = wx.getStorageSync('enjoyList') || []
const { type, flag } = e.detail
console.log('type', type);
- console.log('flag', flag);
- const info = this.data.info
+ console.log('flag', flag);
if(type == 'enjoy'){
// 鐐瑰嚮浜嗗枩娆�
const index = enjoyList.findIndex( i => i.id === info.id )
@@ -58,6 +71,7 @@
enjoyList.splice(index, 1)
}
wx.setStorageSync('enjoyList', enjoyList)
+ refreshEnjoy(this)
}else{
actionDo({
id: info.id,
diff --git a/wechat_staff/pages/detailDis/product.wxml b/wechat_staff/pages/detailDis/product.wxml
index 15b08ec..0f5cd50 100644
--- a/wechat_staff/pages/detailDis/product.wxml
+++ b/wechat_staff/pages/detailDis/product.wxml
@@ -1,5 +1,5 @@
<view class="main_app">
- <buoyClient showPurpose="1" />
+ <buoyClient class="buoyClient" showPurpose="1" class="buoyClient"/>
<detailFooter bindenjoy="handleEnjoy" path="0" info="{{info}}" />
<!-- banner杞挱 -->
<swiper class="banner_swiper" circular indicator-dots autoplay style="height:{{bannerHeight}}rpx" duration>
diff --git a/wechat_staff/pages/detailDis/realpic.js b/wechat_staff/pages/detailDis/realpic.js
index dcd361a..ec8517e 100644
--- a/wechat_staff/pages/detailDis/realpic.js
+++ b/wechat_staff/pages/detailDis/realpic.js
@@ -1,4 +1,4 @@
-import { getRealcaseInfo, actionDo } from '../../api/index'
+import { getRealcaseInfo, actionDo ,refreshEnjoy} from '../../api/index'
Page({
/**
@@ -15,6 +15,9 @@
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
+ onShow(){
+ refreshEnjoy(this)
+ },
onLoad(options) {
var app = getApp().globalData
this.setData({
@@ -43,11 +46,14 @@
})
},
handleEnjoy(e) {
+ const info = this.data.info
+ if(info.id == null ){
+ return
+ }
const enjoyList = wx.getStorageSync('enjoyList') || []
const { type, flag } = e.detail
console.log('type', type);
- console.log('flag', flag);
- const info = this.data.info
+ console.log('flag', flag);
if(type == 'enjoy'){
// 鐐瑰嚮浜嗗枩娆�
const index = enjoyList.findIndex( i => i.id === info.id )
@@ -65,6 +71,7 @@
enjoyList.splice(index, 1)
}
wx.setStorageSync('enjoyList', enjoyList)
+ refreshEnjoy(this)
}else{
actionDo({
id: info.id,
diff --git a/wechat_staff/pages/detailDis/realpic.wxml b/wechat_staff/pages/detailDis/realpic.wxml
index 39539d7..f972e59 100644
--- a/wechat_staff/pages/detailDis/realpic.wxml
+++ b/wechat_staff/pages/detailDis/realpic.wxml
@@ -1,5 +1,5 @@
<view class="container">
- <buoyClient showPurpose="1" />
+ <buoyClient showPurpose="1" class="buoyClient"/>
<detailFooter bindenjoy="handleEnjoy" path="2" info="{{info}}" />
<!-- -->
<view class="main_title">{{ info.title }}</view>
diff --git a/wechat_staff/pages/discover/discover.js b/wechat_staff/pages/discover/discover.js
index 64a68ad..787305e 100644
--- a/wechat_staff/pages/discover/discover.js
+++ b/wechat_staff/pages/discover/discover.js
@@ -1,4 +1,4 @@
-import { getCataLogTagList, getCatalogList } from '../../api/index'
+import { getCataLogTagList, getCatalogList,refreshEnjoy } from '../../api/index'
const { HYEventBus } = require('hy-event-store')
const eventBus = new HYEventBus()
Page({
@@ -18,7 +18,10 @@
let menuButtonInfo = wx.getMenuButtonBoundingClientRect();
this.setData({menuButtonInfo})
},
- onShow() {
+
+ onShow(){
+ console.log('onShow')
+ refreshEnjoy(this)
let discoverKey = wx.getStorageSync('discoverKey') || ''
if(discoverKey){
this.setData({ catalogCode: discoverKey })
diff --git a/wechat_staff/pages/discover/discover.wxml b/wechat_staff/pages/discover/discover.wxml
index bab498f..df9848e 100644
--- a/wechat_staff/pages/discover/discover.wxml
+++ b/wechat_staff/pages/discover/discover.wxml
@@ -1,5 +1,5 @@
<view class="container">
- <buoyClient />
+ <buoyClient class="buoyClient"/>
<view class="home_tab">
<view style="height: {{ menuButtonInfo.top - 6 }}px;"></view>
<view class="main_tab" style="height: {{ menuButtonInfo.height + 12 }}px;">
diff --git a/wechat_staff/pages/homeId/index.js b/wechat_staff/pages/homeId/index.js
index 95ecff5..4f403de 100644
--- a/wechat_staff/pages/homeId/index.js
+++ b/wechat_staff/pages/homeId/index.js
@@ -61,7 +61,11 @@
}
if(item.contentType == 'link'){
wx.navigateTo({
- url: '/pages/webView/index?link=' + item.content,
+ url: '/pages/webView/index',
+ success: function(res) {
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
+ res.eventChannel.emit('data',{link:item.content} );
+ }
})
}
if(item.contentType == 'page'){
diff --git a/wechat_staff/pages/kefu/fond.js b/wechat_staff/pages/kefu/fond.js
index 789e2eb..814ef7e 100644
--- a/wechat_staff/pages/kefu/fond.js
+++ b/wechat_staff/pages/kefu/fond.js
@@ -24,6 +24,7 @@
item.checked = false
})
wx.setStorageSync('enjoyList', enjoyList)
+ console.log(this.data.enjoyList)
this.initData()
},
@@ -65,6 +66,7 @@
}
})
wx.setStorageSync('enjoyList', enjoyList)
+
this.initData()
},
itemClick(e) {
@@ -178,6 +180,7 @@
}
})
wx.setStorageSync('enjoyList', enjoyListTemp)
+
that.initData()
}
}
@@ -190,6 +193,7 @@
item.checked = !item.checked
})
wx.setStorageSync('enjoyList', enjoyList)
+
this.initData()
},
openShare() {
diff --git a/wechat_staff/pages/kefu/fond.wxss b/wechat_staff/pages/kefu/fond.wxss
index b7bbad2..8e14f9c 100644
--- a/wechat_staff/pages/kefu/fond.wxss
+++ b/wechat_staff/pages/kefu/fond.wxss
@@ -41,8 +41,10 @@
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
- -webkit-line-clamp: 2;
+ -webkit-line-clamp: 2;
+ white-space: break-spaces;
-webkit-box-orient: vertical;
+ word-break: break-word;
}
.date_item .line .content .time {
font-size: 24rpx;
diff --git a/wechat_staff/pages/kefu/select.js b/wechat_staff/pages/kefu/select.js
index a3d2b7b..5896bc1 100644
--- a/wechat_staff/pages/kefu/select.js
+++ b/wechat_staff/pages/kefu/select.js
@@ -83,11 +83,16 @@
})
},
jumpClient() {
- getCrmAuthUrl({type:1}).then(res => {
- console.log(res.data)
+ getCrmAuthUrl({type:1}).then(res => {
this.setData({ url: res.data })
+ const url =res.data
wx.navigateTo({
- url: '/pages/webView/index?link=' + res.data,
+ url: '/pages/webView/index',
+ success: function(res1) {
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
+ console.log(url)
+ res1.eventChannel.emit('data',{link:url} );
+ }
})
})
},
diff --git a/wechat_staff/pages/productVideo/index.js b/wechat_staff/pages/productVideo/index.js
index 6e9614a..49da278 100644
--- a/wechat_staff/pages/productVideo/index.js
+++ b/wechat_staff/pages/productVideo/index.js
@@ -1,4 +1,4 @@
-import { getZhongTaiVideoPage, getCataLogTagList } from '../../api/index'
+import { getZhongTaiVideoPage, getCataLogTagList ,refreshEnjoy} from '../../api/index'
Page({
/**
@@ -77,7 +77,7 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
*/
onShow() {
-
+ refreshEnjoy(this)
},
/**
diff --git a/wechat_staff/pages/productVideo/index.json b/wechat_staff/pages/productVideo/index.json
index 5322f4c..572cc92 100644
--- a/wechat_staff/pages/productVideo/index.json
+++ b/wechat_staff/pages/productVideo/index.json
@@ -1,3 +1,6 @@
{
- "navigationBarTitleText": "浜у搧瑙嗛"
+ "navigationBarTitleText": "浜у搧瑙嗛",
+ "usingComponents": {
+ "buoyClient": "../../components/buoyClient/index"
+ }
}
\ No newline at end of file
diff --git a/wechat_staff/pages/productVideo/index.wxml b/wechat_staff/pages/productVideo/index.wxml
index 6b07bb4..a36c0bb 100644
--- a/wechat_staff/pages/productVideo/index.wxml
+++ b/wechat_staff/pages/productVideo/index.wxml
@@ -1,4 +1,5 @@
<view class="container">
+ <buoyClient class="buoyClient"/>
<!-- 鍒嗙被 -->
<view>
<scroll-view scroll-x="true" style="weight: 710rpx;margin-bottom: 30rpx;">
diff --git a/wechat_staff/pages/userinfo/index.js b/wechat_staff/pages/userinfo/index.js
index 5156bf3..2083c1a 100644
--- a/wechat_staff/pages/userinfo/index.js
+++ b/wechat_staff/pages/userinfo/index.js
@@ -44,17 +44,18 @@
console.log('鐐逛簡');
const {
slogans,
- costomerNum,
+ jobDate,
+ costomerNum,
userInfo,
qrcodeImg,
companyQrcodeImg
} = this.data
- editMember({
- ...userInfo,
- slogans,
- costomerNum,
- qrcodeImg: qrcodeImg || userInfo.qrcodeImg ,
- companyQrcodeImg: companyQrcodeImg || userInfo.companyQrcodeImg
+ editMember({
+ jobDate:jobDate,
+ slogans:slogans,
+ costomerNum:costomerNum,
+ qrcodeImg: qrcodeImg ,
+ companyQrcodeImg: companyQrcodeImg
}).then(res => {
this.setData({
editFalg: false
@@ -69,6 +70,7 @@
this.setData({
userInfo: res.data,
slogans: res.data.slogans,
+ jobDate: res.data.jobDate,
costomerNum: res.data.costomerNum,
qrcodeImgFull: res.data.qrcodeImgFull,
qrcodeImg: res.data.qrcodeImg,
@@ -116,6 +118,54 @@
})
}
},
+ selMedia3() {
+ var that = this
+ const {
+ userInfo,
+ imgurlFull
+ } = this.data
+ wx.chooseMedia({
+ count: 1,
+ mediaType: ['image'],
+ sourceType: ['album', 'camera'],
+ maxDuration: 16,
+ camera: 'back',
+ success: (res) => {
+ // console.log(res.tempFiles[0].tempFilePath)
+ // console.log(res.tempFiles[0].size)
+ wx.uploadFile({
+ url: uploadUrl,
+ filePath: res.tempFiles[0].tempFilePath,
+ name: 'file',
+ formData: {
+ folder: "users"
+ },
+ header: {
+ token: wx.getStorageSync('token')
+ },
+ success: (ress) => {
+ console.log(JSON.parse(ress.data))
+ let data = JSON.parse(ress.data)
+ userInfo.imgurl = data.data.imgaddr
+ userInfo.imgurlFull = data.data.url
+ that.setData({userInfo})
+ console.log('userInfo', userInfo);
+ editMember({
+ ...userInfo
+ }).then(res => {
+ this.setData({
+ editFalg: false
+ })
+ wx.showToast({
+ title: '澶村儚鏇存敼鎴愬姛',
+ })
+ })
+ }
+ })
+ }
+ })
+
+ },
selMedia() {
const {
editFalg,
diff --git a/wechat_staff/pages/userinfo/index.wxml b/wechat_staff/pages/userinfo/index.wxml
index 8809959..590c34f 100644
--- a/wechat_staff/pages/userinfo/index.wxml
+++ b/wechat_staff/pages/userinfo/index.wxml
@@ -1,6 +1,7 @@
<view class="container">
<image class="avatar" src="{{ userInfo.imgurlFull ? userInfo.imgurlFull : '../../static/images/default_avatar.png' }}" mode="widthFix"></image>
- <button open-type="chooseAvatar" bindchooseavatar="getBindchooseavatar" class="avatar_btn">鏇存崲澶村儚</button>
+ <!-- <button open-type="chooseAvatar" bindchooseavatar="getBindchooseavatar" class="avatar_btn">鏇存崲澶村儚</button> -->
+ <button bind:tap="selMedia3" class="avatar_btn">鏇存崲澶村儚</button>
<view class="list">
<view class="line">
<view class="label">濮撳悕</view>
@@ -12,26 +13,28 @@
</view>
<view class="line">
<view class="label">绛惧悕</view>
- <van-field wx:if="{{ editFalg }}" type="text" border="{{false}}" class="input" model:value="{{ slogans }}" maxlength="{{ 18 }}" clearable />
+ <van-field wx:if="{{ editFalg }}" type="text" border="{{false}}" class="input" model:value="{{ slogans }}" maxlength="{{ 50 }}" clearable />
<view wx:else class="input">{{ slogans }}</view>
</view>
<view class="line">
<view class="label">浠庝笟骞撮檺</view>
<view class="val">
<view wx:if="{{ editFalg }}" class="input">
- <picker class="picker" mode="date" value="{{date}}" fields="year" start="1970-09-01" end="{{endDate}}" bindchange="bindDateChange">
+ <van-field wx:if="{{ editFalg }}" type="text" 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">
<view>{{ userInfo.jobDate }} <text wx:if="{{ userInfo.jobDate || userInfo.jobDate == 0 }}">骞�</text></view>
<image class="icon" src="../../static/icon/home_ar@2x.png" mode="widthFix"></image>
</view>
- </picker>
+ </picker> -->
</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 || '0' }}" maxlength="{{ 5 }}" clearable />
+ <van-field wx:if="{{ editFalg }}" type="text" border="{{false}}" class="input" model:value="{{ costomerNum }}" maxlength="{{ 5 }}" clearable />
<view wx:else class="input">{{ costomerNum }}</view>
</view>
<view class="line">
@@ -50,16 +53,18 @@
<view class="label">寰俊浜岀淮鐮�</view>
<view class="val" bindtap="selMedia">
<view class="input"></view>
- <image class="qrcode" mode="widthFix" src="../../static/icon/mingpian_erweima@2x.png"></image>
- <image class="icon" src="../../static/icon/home_ar@2x.png" mode="widthFix"></image>
+ <image wx:if="userInfo.qrcodeImgFull !=null &&userInfo.qrcodeImgFull !='' " class="qrcode" mode="widthFix" src="{{userInfo.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>
</view>
<view class="line">
<view class="label">浼佷笟寰俊浜岀淮鐮�</view>
<view class="val" bindtap="selMedia2">
<view class="input"></view>
- <image class="qrcode" mode="widthFix" src="../../static/icon/mingpian_erweima@2x.png"></image>
- <image class="icon" src="../../static/icon/home_ar@2x.png" mode="widthFix"></image>
+ <image wx:if="userInfo.companyQrcodeImgFull !=null &&userInfo.companyQrcodeImgFull !='' " class="qrcode" mode="widthFix" src="{{userInfo.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>
</view>
<view wx:if="{{ !editFalg }}" bindtap="startEdit" class="save">缂栬緫</view>
diff --git a/wechat_staff/pages/userinfo/index.wxss b/wechat_staff/pages/userinfo/index.wxss
index f43b07c..048cde9 100644
--- a/wechat_staff/pages/userinfo/index.wxss
+++ b/wechat_staff/pages/userinfo/index.wxss
@@ -38,6 +38,8 @@
flex: 1;
color: #111111;
text-align: right;
+ white-space: break-spaces;
+ word-break: break-word;
}
.list .line .input .van-cell {
padding: 0;
diff --git a/wechat_staff/static/icon/ic_select_sel.png b/wechat_staff/static/icon/ic_select_sel.png
index c182f15..7583472 100644
--- a/wechat_staff/static/icon/ic_select_sel.png
+++ b/wechat_staff/static/icon/ic_select_sel.png
Binary files differ
diff --git a/wechat_staff/static/icon/ic_select_sel@2x.png b/wechat_staff/static/icon/ic_select_sel@2x.png
index 479ae38..3e02670 100644
--- a/wechat_staff/static/icon/ic_select_sel@2x.png
+++ b/wechat_staff/static/icon/ic_select_sel@2x.png
Binary files differ
diff --git a/wechat_staff/utils/config.js b/wechat_staff/utils/config.js
index e672602..a150c8d 100644
--- a/wechat_staff/utils/config.js
+++ b/wechat_staff/utils/config.js
@@ -1,5 +1,5 @@
-// export const baseUrl = 'http://192.168.0.135:10027'
-export const baseUrl = 'https://dmtest.ahapp.net/web_interface' // 鏈湴
+export const baseUrl = 'http://192.168.0.135:10027'
+// export const baseUrl = 'https://dmtest.ahapp.net/web_interface' // 鏈湴
// export const baseUrl = 'http://zbtest.ahapp.net/zbom_interface/jx/wechat/' //娴嬭瘯鏈嶅姟鍣�
// export const imageUrl = 'https://osswebcdn.zbom.com/jiaxuan/images/'
--
Gitblit v1.9.3