Commit 8e4acd86 by 谢中龙

新增加群功能

parent ac504522
...@@ -148,9 +148,9 @@ ...@@ -148,9 +148,9 @@
"version": "1.3.0", "version": "1.3.0",
"provider": "wx104a1a20c3f81ec2" "provider": "wx104a1a20c3f81ec2"
}, },
"live-player-plugin": { "chatGroupPlugin": {
"version": "1.0.9", "version": "1.0.2",
"provider": "wx2b03c6e691cd7370" "provider": "wxaae6519cee98d824"
} }
}, },
"permission": { "permission": {
......
...@@ -21,6 +21,26 @@ ...@@ -21,6 +21,26 @@
border-left: 4rpx solid #cb3c3c; border-left: 4rpx solid #cb3c3c;
} }
.chat-group{
position: fixed;
right: 25rpx;
top: 68%;
z-index: 2;
}
.wxaae6519cee98d824-components-cell-cell--chatGroup_bubble{
width: 48px !important;
height: 48px !important;
}
.wxaae6519cee98d824-components-cell-cell--chatGroup_without_border{
width: 48px !important;
height: 48px !important;
position: relative;
top: 2px;
left: 2px;
}
.theme-text-color { .theme-text-color {
color: #cb3c3c; color: #cb3c3c;
} }
......
...@@ -25,8 +25,9 @@ ...@@ -25,8 +25,9 @@
</view> </view>
<view class="menu-list"> <view class="menu-list">
<view wx:for="{{secondCategory}}" wx:key="*this" wx:for-index="k" wx:for-item="second" class="menu-third"> <view wx:for="{{secondCategory}}" wx:key="*this" wx:for-index="k" wx:for-item="second" class="menu-third">
<view data-id="{{second.id}}" data-name="{{second.label}}" <view data-name="{{second.label}}"
data-id="{{second.id}}" data-id="{{second.id}}"
data-item="{{second}}"
data-label="{{second.label}}" data-label="{{second.label}}"
bindtap="onTapToGoodsList"> bindtap="onTapToGoodsList">
<image src="{{second.image ? second.image : defaultCategoryImg}}" class="thr-menu-image" mode="aspectFill"/> <image src="{{second.image ? second.image : defaultCategoryImg}}" class="thr-menu-image" mode="aspectFill"/>
...@@ -39,14 +40,16 @@ ...@@ -39,14 +40,16 @@
<view class="second-category" wx:if="{{currentFirstCategory.hasThirdChildren}}"> <view class="second-category" wx:if="{{currentFirstCategory.hasThirdChildren}}">
<view class="category-item" wx:for="{{secondCategory}}" wx:key="*this" wx:for-item="item"> <view class="category-item" wx:for="{{secondCategory}}" wx:key="*this" wx:for-item="item">
<view class="img-con"> <view class="img-con">
<image data-id="{{secondCategory.id}}" <image
data-label="{{secondCategory.label}}" data-id="{{item.id}}"
data-item="{{item}}"
data-label="{{item.label}}"
bindtap="onTapToGoodsList" bindtap="onTapToGoodsList"
src="{{item.image ? item.image : defaultWidthCategoryImg}}" mode="widthFix"></image> src="{{item.image ? item.image : defaultWidthCategoryImg}}" mode="widthFix"></image>
</view> </view>
<view class="more" <view class="more"
data-id="{{secondCategory.id}}" data-id="{{item.id}}"
data-label="{{secondCategory.label}}" data-label="{{item.label}}"
bindtap="onTapToGoodsList"> bindtap="onTapToGoodsList">
<label>{{item.label}}</label> <label>{{item.label}}</label>
<view class="right-more"> <view class="right-more">
......
...@@ -131,6 +131,16 @@ wxService.page({ ...@@ -131,6 +131,16 @@ wxService.page({
}); });
} }
}, },
//加群里插件
chatStartMessage(e){
console.log('chatStartMessage',e)
},
chatCompletemessage(e){
console.log('chatCompletemessage',e)
},
// 获取邀请奖励图片 // 获取邀请奖励图片
getShareImg() { getShareImg() {
wxService.get(`/member/share/inviteFriends/buyer/getValid`).then(res => { wxService.get(`/member/share/inviteFriends/buyer/getValid`).then(res => {
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
"go-guid": "/component/goGuid/goGuid", "go-guid": "/component/goGuid/goGuid",
"share-benefit-modal": "/component/shareBenefitModal/shareBenefitModal", "share-benefit-modal": "/component/shareBenefitModal/shareBenefitModal",
"ad-dialog": "/component/adDialog/adDialog", "ad-dialog": "/component/adDialog/adDialog",
"cell": "plugin://contactPlugin/cell" "cell": "plugin://contactPlugin/cell",
"chat-cell": "plugin://chatGroupPlugin/cell"
} }
} }
\ No newline at end of file
...@@ -65,8 +65,10 @@ ...@@ -65,8 +65,10 @@
bubbleColor="cb3c3c" bubbleColor="cb3c3c"
bind:completemessage="completemessage" bind:completemessage="completemessage"
plugid='{{contactUsPluginId}}' /> plugid='{{contactUsPluginId}}' />
<!-- 766c50920993bf9c41c6c3d2761a2df5 --> </view>
<!-- 泰华 a6ea55b56eb09ced8f9aeeaa14383b52 --> <!-- 加入群聊 -->
<view class="chat-group" wx:if="{{!isQiye && contactUsIsOpen}}" >
<chat-cell bind:startmessage='chatStartMessage' bind:completemessage="chatCompletemessage" plugid='89412d66cf1d2fd26a9d175ba2902a18'/>
</view> </view>
<!-- 联系我点击成功之后的回调 --> <!-- 联系我点击成功之后的回调 -->
<contact-us-modal contactShow="{{contactUsModal}}"/> <contact-us-modal contactShow="{{contactUsModal}}"/>
......
...@@ -10,6 +10,8 @@ page{ ...@@ -10,6 +10,8 @@ page{
z-index: 2; z-index: 2;
} }
.cell--bubble{ .cell--bubble{
width:82rpx !important; width:82rpx !important;
height:82rpx !important; height:82rpx !important;
......
...@@ -699,6 +699,7 @@ class WXService extends Http { ...@@ -699,6 +699,7 @@ class WXService extends Http {
this.onShow(this.options); this.onShow(this.options);
}, },
onShow: function (...args) { onShow: function (...args) {
const isExperiencer = wx.getStorageSync('isExperiencer') const isExperiencer = wx.getStorageSync('isExperiencer')
const page = this const page = this
......
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 to comment