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
1d42b485
Commit
1d42b485
authored
Sep 21, 2019
by
赵雅纹
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
地址报错
parent
087f33bb
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
47 additions
and
8 deletions
+47
-8
waterFlowLayout.js
src/component/waterFlowLayout/waterFlowLayout.js
+22
-3
waterFlowLayout.wxml
src/component/waterFlowLayout/waterFlowLayout.wxml
+8
-4
waterFlowLayout.wxss
src/component/waterFlowLayout/waterFlowLayout.wxss
+15
-0
addAddress.js
src/pages/addAddress/addAddress.js
+1
-0
orderBenefit.wxml
src/subPackage/page/pages/orderBenefit/orderBenefit.wxml
+1
-1
No files found.
src/component/waterFlowLayout/waterFlowLayout.js
View file @
1d42b485
// component/waterFlowLayout/waterFlowLayout.js
// component/waterFlowLayout/waterFlowLayout.js
const
wxService
=
require
(
'../../utils/wxService'
)
const
wxService
=
require
(
'../../utils/wxService'
)
const
utils
=
require
(
'../../utils/util'
)
Component
({
Component
({
/**
/**
...
@@ -25,7 +26,7 @@ Component({
...
@@ -25,7 +26,7 @@ Component({
* 组件的初始数据
* 组件的初始数据
*/
*/
data
:
{
data
:
{
// imageheight: 0
},
},
/**
/**
...
@@ -33,6 +34,7 @@ Component({
...
@@ -33,6 +34,7 @@ Component({
*/
*/
methods
:
{
methods
:
{
onTapLike
(
e
)
{
onTapLike
(
e
)
{
if
(
e
.
currentTarget
.
dataset
.
currentType
!=
2
)
return
;
const
{
memberId
}
=
wx
.
getStorageSync
(
'_baseUserInfo'
)
const
{
memberId
}
=
wx
.
getStorageSync
(
'_baseUserInfo'
)
let
params
=
{
let
params
=
{
contentId
:
e
.
currentTarget
.
dataset
.
id
,
contentId
:
e
.
currentTarget
.
dataset
.
id
,
...
@@ -42,6 +44,7 @@ Component({
...
@@ -42,6 +44,7 @@ Component({
this
.
triggerEvent
(
'updataLike'
,
params
)
this
.
triggerEvent
(
'updataLike'
,
params
)
},
},
onTapShare
(
e
)
{
onTapShare
(
e
)
{
if
(
e
.
currentTarget
.
dataset
.
currentType
!=
2
)
return
;
console
.
log
(
e
)
console
.
log
(
e
)
let
params
=
{
let
params
=
{
url
:
e
.
currentTarget
.
dataset
.
url
,
url
:
e
.
currentTarget
.
dataset
.
url
,
...
@@ -61,8 +64,24 @@ Component({
...
@@ -61,8 +64,24 @@ Component({
if
(
this
.
data
.
type
==
1
)
{
if
(
this
.
data
.
type
==
1
)
{
wxService
.
router
(
`/pages/wantToBuyDetail/wantToBuyDetail?id=
${
e
.
currentTarget
.
dataset
.
id
}
`
)
wxService
.
router
(
`/pages/wantToBuyDetail/wantToBuyDetail?id=
${
e
.
currentTarget
.
dataset
.
id
}
`
)
}
else
if
(
this
.
data
.
type
==
2
)
{
}
else
if
(
this
.
data
.
type
==
2
)
{
wxService
.
router
(
`/subPackage/page/pages/myReleaseDetail/myReleaseDetail?id=
${
e
.
currentTarget
.
dataset
.
id
}
`
)
if
(
e
.
currentTarget
.
dataset
.
currentType
==
2
){
wxService
.
router
(
`/subPackage/page/pages/myReleaseDetail/myReleaseDetail?id=
${
e
.
currentTarget
.
dataset
.
id
}
`
)
}
}
}
}
},
//获取图片高度
// imageLoad(e) {
// console.log('height', utils.imageUtil(e))
// let imageSize = utils.imageUtil(e)
// this.data.imageData.forEach((item)=>{
// item.imageheight = imageSize.imageHeight
// })
// // this.setData({
// // // imagewidth: imageSize.imageWidth,
// // imageheight: imageSize.imageHeight
// // })
// console.log('imageData',this.data.imageData)
// }
}
}
})
})
src/component/waterFlowLayout/waterFlowLayout.wxml
View file @
1d42b485
...
@@ -13,16 +13,20 @@
...
@@ -13,16 +13,20 @@
</view>
</view>
</view>
</view>
<template name="water-list">
<template name="water-list">
<view class="item" bindtap="gotoDetail" data-id="{{id}}">
<view class="item" bindtap="gotoDetail" data-id="{{id}}" data-currentType="{{currentType}}">
<image class="item-img" src="{{url}}" mode="widthFix"></image>
<view class="no-audited" wx:if="{{currentType != 2}}">
待审核
</view>
<image class="item-img" src="{{url}}" mode="widthFix" bindload="imageLoad"></image>
<view class="item-title-box">
<view class="item-title-box">
<view class="item-title">{{headline}}</view>
<view class="item-title">{{headline}}</view>
</view>
</view>
<view class="share-wrap">
<view class="share-wrap">
<view class="share-oprate" catchtap="onTapLike" data-id="{{id}}" data-type="{{type}}">
<view class="share-oprate" catchtap="onTapLike" data-id="{{id}}" data-type="{{type}}"
data-currentType="{{currentType}}"
>
<image class="share-img" src="{{type ? '/assets/imgs/heart-primary.png' : '/assets/imgs/heart-default.png'}}"></image>
<image class="share-img" src="{{type ? '/assets/imgs/heart-primary.png' : '/assets/imgs/heart-default.png'}}"></image>
<text class="share-number">{{enjoySum || 0}}</text>
<text class="share-number">{{enjoySum || 0}}</text>
</view> <view class="share-oprate" catchtap="onTapShare" data-title="{{headline}}" data-url="{{url}}" data-headline="{{headline}}" data-describe="{{describe}}" data-id="{{id}}">
</view> <view class="share-oprate" catchtap="onTapShare" data-title="{{headline}}" data-url="{{url}}" data-headline="{{headline}}" data-describe="{{describe}}" data-id="{{id}}"
data-currentType="{{currentType}}"
>
<image class="share-img" src="/assets/imgs/share.png"></image>
<image class="share-img" src="/assets/imgs/share.png"></image>
<text class="share-number">{{transmitSum || 0}}</text>
<text class="share-number">{{transmitSum || 0}}</text>
</view>
</view>
...
...
src/component/waterFlowLayout/waterFlowLayout.wxss
View file @
1d42b485
...
@@ -11,6 +11,7 @@
...
@@ -11,6 +11,7 @@
border-radius: 10rpx;
border-radius: 10rpx;
box-shadow: 0px 2px 5px 0px rgba(199, 199, 199, 0.5);
box-shadow: 0px 2px 5px 0px rgba(199, 199, 199, 0.5);
background-color: #ffffff;
background-color: #ffffff;
position: relative;
}
}
.item-ava{
.item-ava{
...
@@ -76,4 +77,17 @@
...
@@ -76,4 +77,17 @@
}
}
.right{
.right{
float: right;
float: right;
}
.no-audited{
width: 100rpx;
height: 40rpx;
position: absolute;
top: 0;
right: 0;
background: rgba(0, 0, 0, 0.5);
color: #ffffff;
font-size: 24rpx;
text-align: center;
line-height: 40rpx;
border-radius: 20rpx;
}
}
\ No newline at end of file
src/pages/addAddress/addAddress.js
View file @
1d42b485
...
@@ -177,6 +177,7 @@ wxService.page({
...
@@ -177,6 +177,7 @@ wxService.page({
//提交
//提交
formSubmit
(
e
){
formSubmit
(
e
){
const
{
memberId
}
=
wx
.
getStorageSync
(
'_baseUserInfo'
)
if
(
!
e
.
detail
.
value
.
name
){
if
(
!
e
.
detail
.
value
.
name
){
wx
.
showToast
({
wx
.
showToast
({
title
:
`请输入姓名`
,
title
:
`请输入姓名`
,
...
...
src/subPackage/page/pages/orderBenefit/orderBenefit.wxml
View file @
1d42b485
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
</view>
</view>
<view class="bottom-info">
<view class="bottom-info">
<
view class="benefit-order">订单号:{{item.id}}</view
>
<
!-- <view class="benefit-order">订单号:{{item.id}}</view> --
>
<view class="benefit-time">{{item.createTime}}</view>
<view class="benefit-time">{{item.createTime}}</view>
</view>
</view>
</view>
</view>
...
...
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