Skip to content

施宇 / icsalesProgram

Go to a project
Commit 75c257d2 by 梁建民
Options

js

parent e2c21002
Inline Side-by-side
Showing with 65 additions and 89 deletions
components/chat/inputbar/inputbar.js
...@@ -11,6 +11,10 @@ Component({ ...@@ -11,6 +11,10 @@ Component({
type: String, type: String,
value: msgType.chatType.SINGLE_CHAT, value: msgType.chatType.SINGLE_CHAT,
}, },
noFace: {
type: String,
value: ""
},
isTopic:{ isTopic:{
type:String, type:String,
value:"" value:""
......
components/chat/inputbar/inputbar.wxml
<view class="room_bar"> <view class="room_bar">
<chat-suit-emoji id="chat-suit-emoji" bind:newEmojiStr="emojiAction"></chat-suit-emoji> <chat-suit-emoji id="chat-suit-emoji" bind:newEmojiStr="emojiAction"></chat-suit-emoji>
<chat-suit-main id="chat-suit-main" username="{{ username }}" chatType="{{ chatType }}" bind:inputFocused="cancelEmoji" is-topic="{{isTopic}}"> <chat-suit-main id="chat-suit-main" username="{{ username }}" chatType="{{ chatType }}" bind:inputFocused="cancelEmoji" is-topic="{{isTopic}}">
<view class="open_emoji" bind:tap="openEmoji"> <view class="open_emoji" bind:tap="openEmoji" wx:if="{{!noFace}}">
<image src="../../../images/Emoji.png" /> <image src="../../../images/Emoji.png" />
</view> </view>
<view class="send_image" bind:tap="sendImage" wx:if="{{!isTopic}}"> <view class="send_image" bind:tap="sendImage" wx:if="{{!isTopic}}">
......
pages/list/signin/index.js
...@@ -127,10 +127,6 @@ Page({ ...@@ -127,10 +127,6 @@ Page({
}); });
} }
} }
}, true, false, true) }, true, false, true)
...@@ -161,9 +157,17 @@ Page({ ...@@ -161,9 +157,17 @@ Page({
*/ */
sendSignin: function (e) { sendSignin: function (e) {
console.log(e) if (!e.detail.msg) {
this.data.inputbar.cancelEmoji();
wx.showToast({
title: '亲，不来点什么吗',
icon: 'none',
duration: 2000
});
return false;
}
// this.data.inputbar.cancelEmoji();
http.getData(apis.checkAdd, 'GET', { http.getData(apis.checkAdd, 'GET', {
topic_id: this.data.topic_id, topic_id: this.data.topic_id,
content: e.detail.msg, content: e.detail.msg,
...@@ -235,23 +239,19 @@ Page({ ...@@ -235,23 +239,19 @@ Page({
let praise = ''; let praise = '';
let index = e.currentTarget.dataset.index; let index = e.currentTarget.dataset.index;
console.log(index)
if (type == 1) { if (type == 1) {
praise = true; praise = true;
} else { } else {
praise = ''; praise = '';
} }
http.getData(apis.checkPraise, 'GET', { http.getData(apis.checkPraise, 'GET', {
topic_id: this.data.topic_id, topic_id: this.data.topic_id,
praise: praise, praise: praise,
id: e.currentTarget.dataset.id id: e.currentTarget.dataset.id
}, (res) => { }, (res) => {
if (res.errcode === 0) { if (res.errcode === 0) {
this.getData();
wx.showToast({ wx.showToast({
title: '点赞成功', title: '点赞成功',
icon: 'none', icon: 'none',
......
pages/list/signin/index.wxml
...@@ -87,5 +87,5 @@ ...@@ -87,5 +87,5 @@
<text class="line"></text> <text class="line"></text>
</view> </view>
</view> </view>
<chat-inputbar id="topic-inputbar" is-topic="1" bind:newTextMsg="sendSignin"></chat-inputbar> <chat-inputbar id="topic-inputbar" is-topic="1" bind:newTextMsg="sendSignin" no-face='1'></chat-inputbar>
</view> </view>
\ No newline at end of file
pages/person/exchange/index.less
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
} }
.btn { .btn {
position: absolute; position: fixed;
bottom: 68rpx; bottom: 68rpx;
left: 0; left: 0;
right: 0; right: 0;
......
pages/person/exchange/index.wxss
.exchange .content .list { .exchange .content .list{height:136rpx;padding:0 22rpx 0 27rpx}.exchange .content .list .t1{color:#515559;font-size:32rpx;font-weight:600;line-height:45rpx;margin-bottom:13rpx}.exchange .content .list .t2{color:#ADB6BF;font-size:22rpx;line-height:30rpx}.exchange .content .list .t2s{color:#EA1717;font-size:22rpx;line-height:30rpx}.exchange .content .list .t3{font-size:38rpx;font-weight:600;color:#515559}.exchange .content .list .t4{font-size:48rpx;color:#515559}.exchange .content .list .t5{font-size:38rpx;font-weight:600;color:#515559;line-height:53rpx}.exchange .content .list .t6{font-size:24rpx;color:#8A9299}.exchange .btn{position:fixed;bottom:68rpx;left:0;right:0;margin:0 55rpx;height:98rpx;line-height:98rpx;text-align:center;background:#0d84d1;box-shadow:0 6rpx 10rpx 0 rgba(97,160,242,0.3);border-radius:8rpx}.exchange .btn .iconiconxiantiaoshouji28{font-size:40rpx;color:#fff;margin-right:8rpx}.exchange .btn .t1{font-size:32rpx;font-weight:500;color:#fff}
height: 136rpx; \ No newline at end of file
padding: 0 22rpx 0 27rpx;
}
.exchange .content .list .t1 {
color: #515559;
font-size: 32rpx;
font-weight: 600;
line-height: 45rpx;
margin-bottom: 13rpx;
}
.exchange .content .list .t2 {
color: #ADB6BF;
font-size: 22rpx;
line-height: 30rpx;
}
.exchange .content .list .t2s {
color: #EA1717;
font-size: 22rpx;
line-height: 30rpx;
}
.exchange .content .list .t3 {
font-size: 38rpx;
font-weight: 600;
color: #515559;
}
.exchange .content .list .t4 {
font-size: 48rpx;
color: #515559;
}
.exchange .content .list .t5 {
font-size: 38rpx;
font-weight: 600;
color: #515559;
line-height: 53rpx;
}
.exchange .content .list .t6 {
font-size: 24rpx;
color: #8A9299;
}
.exchange .btn {
position: absolute;
bottom: 68rpx;
left: 0;
right: 0;
margin: 0 55rpx;
height: 98rpx;
line-height: 98rpx;
text-align: center;
background: #0d84d1;
box-shadow: 0px 6rpx 10rpx 0px rgba(97, 160, 242, 0.3);
border-radius: 8rpx;
}
.exchange .btn .iconiconxiantiaoshouji28 {
font-size: 40rpx;
color: #fff;
margin-right: 8rpx;
}
.exchange .btn .t1 {
font-size: 32rpx;
font-weight: 500;
color: #fff;
}
pages/person/welfare/index.js
...@@ -68,19 +68,23 @@ Page({ ...@@ -68,19 +68,23 @@ Page({
*/ */
onShareAppMessage: function (res) { onShareAppMessage: function (res) {
http.getData(apis.shareAdd, 'GET', {
user_id: wx.getStorageSync('user_id')
}, (res) => {
if (res.errcode === 0) {
}
}, true, false, true);
return { return {
title: '每日分享', title: '每日分享',
path: "/pages/person/invitation/index" imageUrl: '/res/images/imgs/re.png',
path: "/pages/person/invitation/index",
success: function (res) {
if (res.errMsg == 'shareAppMessage:ok') {
http.getData(apis.shareAdd, 'GET', {
user_id: wx.getStorageSync('user_id')
}, (res) => {
if (res.errcode === 0) {
}
}, true, false, true);
}
}
} }
}, },
/** /**
* 获取数据 * 获取数据
......
pages/person/withdrawal/index.wxml
...@@ -55,13 +55,13 @@ ...@@ -55,13 +55,13 @@
</view> </view>
</block> </block>
</view> </view>
<block wx:if="{{weixin_exchange_info.exchanging == 0 }}"> <block wx:if="{{weixin_exchange_info.exchanging == 1 || weixin_exchange_info.exchanging == -1}}">
<button class="btn {{can_exchange == -1 || can_exchange == 0 ? 'opacity':''}}" bind:tap="withdrawal"> <button class="btn {{can_exchange == -1 || can_exchange == 0 ? 'opacity':''}}" bind:tap="withdrawal">
申请提现 申请提现
</button> </button>
</block> </block>
<block wx:else> <block wx:else>
<button class="btns" open-type="share">分享给好友助力，可提现</button> <button class="btns" open-type="share">分享给好友助力，可提现</button>
</block> </block>
<text class="fr-txt">好友助力，已完成（{{weixin_exchange_info.assist_count}}/2）</text> <text class="fr-txt">好友助力，已完成（{{weixin_exchange_info.assist_count}}/2）</text>
</view> </view>
......
project.config.json
...@@ -177,6 +177,34 @@ ...@@ -177,6 +177,34 @@
"id": -1, "id": -1,
"name": "pages/tab/me/me", "name": "pages/tab/me/me",
"pathName": "pages/tab/me/me", "pathName": "pages/tab/me/me",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/person/welfare/index",
"pathName": "pages/person/welfare/index",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/person/exchange/index",
"pathName": "pages/person/exchange/index",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/person/withdrawal/index",
"pathName": "pages/person/withdrawal/index",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/list/signin/index",
"pathName": "pages/list/signin/index",
"scene": null "scene": null
} }
] ]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment