Browse Source

同步代码~

release/210823_需求对对碰
王饶冀 3 years ago
parent
commit
da99471dee

+ 1
- 1
app.js View File

//准备更新 //准备更新
updateManager.onUpdateReady(function () { updateManager.onUpdateReady(function () {
wx.showModal({ wx.showModal({
title: '业务交流通更新啦~',
title: '需求对对碰更新啦~',
content: '新版本已经准备好,请重启应用', content: '新版本已经准备好,请重启应用',
showCancel: false, showCancel: false,
success: function (res) { success: function (res) {

+ 1
- 1
app.json View File

"window": { "window": {
"backgroundTextStyle": "light", "backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#fff", "navigationBarBackgroundColor": "#fff",
"navigationBarTitleText": "业务交流通",
"navigationBarTitleText": "需求对对碰",
"navigationBarTextStyle": "black" "navigationBarTextStyle": "black"
}, },
"sitemapLocation": "sitemap.json", "sitemapLocation": "sitemap.json",

+ 1
- 1
package.json View File

{ {
"name": "channel_business", "name": "channel_business",
"version": "1.0.0", "version": "1.0.0",
"description": "业务交流通",
"description": "需求对对碰",
"main": "app.js", "main": "app.js",
"scripts": { "scripts": {
"test": "echo \"Error: no test specified\" && exit 1" "test": "echo \"Error: no test specified\" && exit 1"

+ 1
- 1
pages/login/login.js View File

iv: iv, iv: iv,
encryptedData: encryptedData, encryptedData: encryptedData,
sessionKey: app.globalData.sessionKey, sessionKey: app.globalData.sessionKey,
loginState: "业务交流通",
loginState: "需求对对碰",
avatarUrl, avatarUrl,
gender, gender,
nickName, nickName,

+ 20
- 8
pages/msgModule/wechat2/wechat2.js View File

var utils = require("../../../utils/util.js") var utils = require("../../../utils/util.js")
const app = getApp() const app = getApp()
const $request = require('../../../utils/request.js'); const $request = require('../../../utils/request.js');
const $faces = require('../../../utils/faces.js');
Page({ Page({


/** /**
historyList: [], historyList: [],
input: null, input: null,
openid: null, openid: null,
// 😄😊😃😉😍😘😚😳😌😁😜😝😒😏😓😔😞😖😥😰😨😣😢😭😂😲😱😠😡😪😷👿👽💛💙💗💚❤💔💓💘✨🌟💢❕❔💤💨💦🎶🎵🔥🔥💩👍👎👌👊✊✌👋✋👐👆👇👉👈🙌🙏☝👏💪🚶🏃👫💃👯🙆🙅💁🙇💏💑💆💇💅👦👧👩👨👶👵👴👱👲👳👷👮👼👸💂💀👣💋
connectemoji: ["😘", "😡", "😔", "😄", "❤", "😍", "👼", ""],
// 表情
connectemoji:[],
emoji_list: ['emoji1i1', 'emoji2i2', 'emoji3i3', 'emoji4i4', 'emoji5i5'], emoji_list: ['emoji1i1', 'emoji2i2', 'emoji3i3', 'emoji4i4', 'emoji5i5'],
emotionVisible: false, emotionVisible: false,
inputShowed: false, inputShowed: false,
businessCommunicationDemandId: null, businessCommunicationDemandId: null,
// 当前产品详情 // 当前产品详情
productInfo: null, productInfo: null,
// 发送框是否获取焦点
inputShowed:false,
}, },


/** /**
let sendAvatar = app.globalData.businessCommunicationCustomer.chatHeads; let sendAvatar = app.globalData.businessCommunicationCustomer.chatHeads;
this.setData({ this.setData({
receiveMemberId: customerId, receiveMemberId: customerId,
sendAvatar
sendAvatar,
connectemoji:$faces.getfaces(),
}) })
console.log(this.data.sendAvatar, 'hahha')
// 获取内存中的数据 // 获取内存中的数据
this.getStorageBaseInfo() this.getStorageBaseInfo()
// 设置滚动区域的高度 // 设置滚动区域的高度
// 初始化websocket // 初始化websocket
this.initWebSocket() this.initWebSocket()
// setTimeout(() => { // setTimeout(() => {
// }, 100); // }, 100);
}, },
/** /**
* 生命周期函数--监听页面初次渲染完成 * 生命周期函数--监听页面初次渲染完成
*/ */
onReady: function () { onReady: function () {
}, },


// websocket初始化 // websocket初始化


console.log(input, '输入框额值') console.log(input, '输入框额值')
this.setData({ this.setData({
input
input,
emotionVisible:false,
inputShowed:true,
})
},
closeEmotionVisible(){
this.setData({
emotionVisible:false,
}) })
}, },
// 公共聚焦方法,方法比较笨,但是过度效果平滑流畅 // 公共聚焦方法,方法比较笨,但是过度效果平滑流畅
// duration: 0 // duration: 0
}) })
}, },
})
})



+ 5
- 5
pages/msgModule/wechat2/wechat2.wxml View File

<!-- pages/wechat2/wechat2.wxml --> <!-- pages/wechat2/wechat2.wxml -->
<view class='news'>
<view class='news' bindtap="closeEmotionVisible">
<view class="historycon"> <view class="historycon">
<scroll-view scroll-y="{{ true }}" scroll-into-view="{{scrollid}}" scroll-with-animation="{{true}}" style="height:{{scrollHeight}}" class="history"> <scroll-view scroll-y="{{ true }}" scroll-into-view="{{scrollid}}" scroll-with-animation="{{true}}" style="height:{{scrollHeight}}" class="history">
<!-- 历史记录部分start --> <!-- 历史记录部分start -->
</view> </view>
<view class="sendmessage"> <view class="sendmessage">
<view class="send-message"> <view class="send-message">
<input class="chat-input" type="text" bindinput="bindChange" confirm-type="send" value='{{input}}' cursor-spacing="16px" hold-keyboard="{{true}}" placeholder="" bindconfirm="send" />
<input class="chat-input" type="text" bindinput="bindChange" confirm-type="send" value='{{input}}' cursor-spacing="16px" hold-keyboard="{{true}}" placeholder="" bindconfirm="send" focus="{{inputShowed}}" />
<image class="expression-msg-img" src="/images/home/expression-msg-icon.png" bind:tap="emotionChange" /> <image class="expression-msg-img" src="/images/home/expression-msg-icon.png" bind:tap="emotionChange" />
<image class="img-msg-img" src="/images/home/img-msg-icon.png" />
<image class="img-msg-img" src="/images/home/img-msg-icon.png" bindtap="upImg"/>
</view> </view>
<view class="faces-view" wx:if="{{emotionVisible}}">
<view class="emotions-item" wx:for="{{connectemoji}}" wx:key="index" bindtap="addemotion" data-index="{{index}}">
<view class="faces-view-dialog clearfix" wx:if="{{emotionVisible}}">
<view class="emotions-item fl" wx:for="{{connectemoji}}" wx:key="index" bindtap="addemotion" data-index="{{index}}">
{{item}} {{item}}
</view> </view>
</view> </view>

+ 17
- 6
pages/msgModule/wechat2/wechat2.wxss View File

margin: 6px; margin: 6px;
} }


.emotions-item {
width: 24px;
height: 24px;
margin: 0 8px;
}


.historyText { .historyText {
color: #ccc; color: #ccc;
font-size: 24rpx; font-size: 24rpx;
color: #b3bfcb; color: #b3bfcb;
text-align: left; text-align: left;
}
}

.faces-view-dialog {
width: 100%;
position: fixed;
box-sizing: border-box;
padding: 20rpx;
bottom: 76px;
background: #fff;
}

.emotions-item {
width: 24px;
height: 24px;
width: 6.6%;
text-align: center;
}

+ 112
- 0
utils/faces.js View File


const getfaces = n => {
return [
"😊",
"😃",
"😉",
"😍",
"😘",
"😚",
"😳",
"😌",
"😁",
"😜",
"😝",
"😒",
"😏",
"😓",
"😔",
"😞",
"😖",
"😥",
"😰",
"😨",
"😣",
"😢",
"😭",
"😂",
"😲",
"😱",
"😠",
"😡",
"😪",
"😷",
"👿",
"👽",
"💛",
"💙",
"💗",
"💚",
"❤",
"💔",
"💓",
"💘",
"✨",
"🌟",
"💢",
"❕",
"❔",
"💤",
"💨",
"💦",
"🎶",
"🎵",
"🔥",
"🔥",
"💩",
"👍",
"👎",
"👌",
"👊",
"✊",
"✌",
"👋",
"✋",
"👐",
"👆",
"👇",
"👉",
"👈",
"🙌",
"🙏",
"☝",
"👏",
"💪",
"🚶",
"🏃",
"👫",
"💃",
"👯",
"🙆",
"🙅",
"💁",
"🙇",
"💏",
"💑",
"💆",
"💇",
"💅",
"👦",
"👧",
"👩",
"👨",
"👶",
"👵",
"👴",
"👱",
"👲",
"👳",
"👷",
"👮",
"👼",
"👸",
"💂",
"💀",
"👣",
"💋"
]
}

module.exports = {
getfaces
}

Loading…
Cancel
Save