Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
7
7-Eleven
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
高淑倩
7-Eleven
Commits
8e4acd86
Commit
8e4acd86
authored
May 14, 2020
by
谢中龙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增加群功能
parent
ac504522
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
51 additions
and
11 deletions
+51
-11
app.json
src/app.json
+3
-3
app.wxss
src/app.wxss
+20
-0
category.wxml
src/pages/category/category.wxml
+8
-5
userCenter.js
src/pages/userCenter/userCenter.js
+10
-0
userCenter.json
src/pages/userCenter/userCenter.json
+3
-1
userCenter.wxml
src/pages/userCenter/userCenter.wxml
+4
-2
userCenter.wxss
src/pages/userCenter/userCenter.wxss
+2
-0
wxService.js
src/utils/wxService.js
+1
-0
No files found.
src/app.json
View file @
8e4acd86
...
@@ -148,9 +148,9 @@
...
@@ -148,9 +148,9 @@
"version"
:
"1.3.0"
,
"version"
:
"1.3.0"
,
"provider"
:
"wx104a1a20c3f81ec2"
"provider"
:
"wx104a1a20c3f81ec2"
},
},
"
live-player-p
lugin"
:
{
"
chatGroupP
lugin"
:
{
"version"
:
"1.0.
9
"
,
"version"
:
"1.0.
2
"
,
"provider"
:
"wx
2b03c6e691cd7370
"
"provider"
:
"wx
aae6519cee98d824
"
}
}
},
},
"permission"
:
{
"permission"
:
{
...
...
src/app.wxss
View file @
8e4acd86
...
@@ -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;
}
}
...
...
src/pages/category/category.wxml
View file @
8e4acd86
...
@@ -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">
...
...
src/pages/userCenter/userCenter.js
View file @
8e4acd86
...
@@ -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
=>
{
...
...
src/pages/userCenter/userCenter.json
View file @
8e4acd86
...
@@ -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
src/pages/userCenter/userCenter.wxml
View file @
8e4acd86
...
@@ -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}}"/>
...
...
src/pages/userCenter/userCenter.wxss
View file @
8e4acd86
...
@@ -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;
...
...
src/utils/wxService.js
View file @
8e4acd86
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment