Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
施宇
/
icsalesProgram
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
97c0a8cf
authored
Aug 07, 2019
by
施宇
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
1
parent
305b78df
Show whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
89 additions
and
27 deletions
app.wxss
pages/list/qd/index.js
pages/list/qd/index.wxml
pages/list/xj/index.js
pages/list/xj/index.wxml
pages/search/result/index.js
pages/search/result/index.wxml
pages/tab/good/good.js
pages/tab/good/good.wxml
pages/tab/good/good.wxss
pages/tab/price/price.js
pages/tab/price/price.wxml
utils/chat.js
app.wxss
View file @
97c0a8cf
...
@@ -277,6 +277,21 @@ image {
...
@@ -277,6 +277,21 @@ image {
.btn-com-disable{
.btn-com-disable{
background-color: #DAE1E7;
background-color: #DAE1E7;
}
}
.data-bottom{
padding:24rpx 60rpx;
}
.data-bottom .line{
height:1px;
border-top:1px solid #F0F4F7;
flex:0 0 200rpx;
}
.data-bottom .text{
font-size: 26rpx;
color:#8A9299;
flex:1;
text-align: center;
}
/**询报价列表**/
/**询报价列表**/
/**字体**/
/**字体**/
...
...
pages/list/qd/index.js
View file @
97c0a8cf
...
@@ -11,7 +11,8 @@ Page({
...
@@ -11,7 +11,8 @@ Page({
priceList
:
null
,
//商品数据
priceList
:
null
,
//商品数据
limit
:
10
,
//每页的条数
limit
:
10
,
//每页的条数
p
:
1
,
//当前页面
p
:
1
,
//当前页面
total
:
1
total
:
1
,
isShowBottom
:
false
,
},
},
/**
/**
...
@@ -100,10 +101,8 @@ Page({
...
@@ -100,10 +101,8 @@ Page({
let
allPage
=
Math
.
ceil
(
this
.
data
.
total
/
this
.
data
.
limit
);
let
allPage
=
Math
.
ceil
(
this
.
data
.
total
/
this
.
data
.
limit
);
let
p
=
this
.
data
.
p
;
let
p
=
this
.
data
.
p
;
if
(
p
==
allPage
)
{
if
(
p
==
allPage
)
{
wx
.
showToast
({
this
.
setData
({
title
:
'数据到底啦'
,
isShowBottom
:
true
icon
:
'none'
,
duration
:
2000
});
});
return
return
}
else
{
}
else
{
...
@@ -131,6 +130,7 @@ Page({
...
@@ -131,6 +130,7 @@ Page({
p
:
1
,
p
:
1
,
total
:
1
,
total
:
1
,
tabIndex
:
i
,
tabIndex
:
i
,
isShowBottom
:
false
,
});
});
this
.
getData
();
this
.
getData
();
}
}
...
...
pages/list/qd/index.wxml
View file @
97c0a8cf
...
@@ -24,5 +24,10 @@
...
@@ -24,5 +24,10 @@
</view>
</view>
</view>
</view>
<priceItem price-list="{{priceList}}" wx:if="{{priceList&&priceList.length!==0}}" price-type="3" xb="1" ></priceItem>
<priceItem price-list="{{priceList}}" wx:if="{{priceList&&priceList.length!==0}}" price-type="3" xb="1" ></priceItem>
<view class="data-bottom row verCenter rowCenter" wx:if="{{isShowBottom}}">
<text class="line"></text>
<text class="text">我是有底线的</text>
<text class="line"></text>
</view>
</view>
</view>
</view>
</view>
pages/list/xj/index.js
View file @
97c0a8cf
...
@@ -12,7 +12,8 @@ Page({
...
@@ -12,7 +12,8 @@ Page({
limit
:
10
,
//每页的条数
limit
:
10
,
//每页的条数
p
:
1
,
//当前页面
p
:
1
,
//当前页面
total
:
0
,
total
:
0
,
id
:
""
id
:
""
,
isShowBottom
:
false
,
},
},
/**
/**
...
@@ -105,10 +106,8 @@ Page({
...
@@ -105,10 +106,8 @@ Page({
let
allPage
=
Math
.
ceil
(
this
.
data
.
total
/
this
.
data
.
limit
);
let
allPage
=
Math
.
ceil
(
this
.
data
.
total
/
this
.
data
.
limit
);
let
p
=
this
.
data
.
p
;
let
p
=
this
.
data
.
p
;
if
(
p
==
allPage
)
{
if
(
p
==
allPage
)
{
wx
.
showToast
({
this
.
setData
({
title
:
'数据到底啦'
,
isShowBottom
:
true
icon
:
'none'
,
duration
:
2000
});
});
return
return
}
else
{
}
else
{
...
...
pages/list/xj/index.wxml
View file @
97c0a8cf
...
@@ -61,6 +61,11 @@
...
@@ -61,6 +61,11 @@
<view class="h3 bold">暂无报价信息</view>
<view class="h3 bold">暂无报价信息</view>
</view>
</view>
<priceItem price-list="{{priceList}}" wx:if="{{priceList&&priceList.length!==0}}" price-type="3" xb="2"></priceItem>
<priceItem price-list="{{priceList}}" wx:if="{{priceList&&priceList.length!==0}}" price-type="3" xb="2"></priceItem>
<view class="data-bottom row verCenter rowCenter" wx:if="{{isShowBottom}}">
<text class="line"></text>
<text class="text">我是有底线的</text>
<text class="line"></text>
</view>
</view>
</view>
</view>
</view>
</view>
</view>
\ No newline at end of file
pages/search/result/index.js
View file @
97c0a8cf
...
@@ -15,6 +15,8 @@ Page({
...
@@ -15,6 +15,8 @@ Page({
total
:
1
,
total
:
1
,
key
:
""
,
key
:
""
,
confirmKey
:
""
,
confirmKey
:
""
,
isShowBottom
:
false
,
},
},
/**
/**
...
@@ -72,7 +74,8 @@ Page({
...
@@ -72,7 +74,8 @@ Page({
priceList
:
null
,
priceList
:
null
,
p
:
1
,
p
:
1
,
total
:
1
,
total
:
1
,
confirmKey
:
val
confirmKey
:
val
,
isShowBottom
:
false
,
});
});
this
.
storageKey
(
val
)
this
.
storageKey
(
val
)
this
.
getData
()
this
.
getData
()
...
@@ -162,10 +165,8 @@ Page({
...
@@ -162,10 +165,8 @@ Page({
let
allPage
=
Math
.
ceil
(
this
.
data
.
total
/
this
.
data
.
limit
);
let
allPage
=
Math
.
ceil
(
this
.
data
.
total
/
this
.
data
.
limit
);
let
p
=
this
.
data
.
p
;
let
p
=
this
.
data
.
p
;
if
(
p
==
allPage
)
{
if
(
p
==
allPage
)
{
wx
.
showToast
({
this
.
setData
({
title
:
'数据到底啦'
,
isShowBottom
:
true
icon
:
'none'
,
duration
:
2000
});
});
return
return
}
else
{
}
else
{
...
@@ -193,6 +194,7 @@ Page({
...
@@ -193,6 +194,7 @@ Page({
p
:
1
,
p
:
1
,
total
:
1
,
total
:
1
,
tabIndex
:
i
,
tabIndex
:
i
,
isShowBottom
:
false
,
})
})
if
(
i
==
1
)
{
if
(
i
==
1
)
{
this
.
setData
({
this
.
setData
({
...
...
pages/search/result/index.wxml
View file @
97c0a8cf
...
@@ -31,6 +31,11 @@
...
@@ -31,6 +31,11 @@
</view>
</view>
</view>
</view>
<priceItem price-list="{{priceList}}" wx:if="{{priceList&&priceList.length!==0}}" price-type="{{type}}" xb="1"></priceItem>
<priceItem price-list="{{priceList}}" wx:if="{{priceList&&priceList.length!==0}}" price-type="{{type}}" xb="1"></priceItem>
<view class="data-bottom row verCenter rowCenter" wx:if="{{isShowBottom}}">
<text class="line"></text>
<text class="text">我是有底线的</text>
<text class="line"></text>
</view>
</view>
</view>
<view class="fast_fb_view" wx:if="{{priceList&&priceList.length!==0&&tabIndex == 2}}">
<view class="fast_fb_view" wx:if="{{priceList&&priceList.length!==0&&tabIndex == 2}}">
<view class="fast_fb btn-com btn-com-b" bindtap="toXj">
<view class="fast_fb btn-com btn-com-b" bindtap="toXj">
...
...
pages/tab/good/good.js
View file @
97c0a8cf
...
@@ -13,7 +13,8 @@ Page({
...
@@ -13,7 +13,8 @@ Page({
total
:
0
,
total
:
0
,
time
:
""
,
time
:
""
,
key
:
""
,
key
:
""
,
confirmKey
:
""
confirmKey
:
""
,
isShowBottom
:
false
,
},
},
/**
/**
...
@@ -37,6 +38,7 @@ Page({
...
@@ -37,6 +38,7 @@ Page({
p
:
1
,
p
:
1
,
total
:
0
,
total
:
0
,
time
:
""
,
time
:
""
,
isShowBottom
:
false
});
});
this
.
getData
();
this
.
getData
();
...
@@ -117,10 +119,8 @@ Page({
...
@@ -117,10 +119,8 @@ Page({
let
allPage
=
Math
.
ceil
(
this
.
data
.
total
/
this
.
data
.
limit
);
let
allPage
=
Math
.
ceil
(
this
.
data
.
total
/
this
.
data
.
limit
);
let
p
=
this
.
data
.
p
;
let
p
=
this
.
data
.
p
;
if
(
p
==
allPage
)
{
if
(
p
==
allPage
)
{
wx
.
showToast
({
this
.
setData
({
title
:
'数据到底啦'
,
isShowBottom
:
true
icon
:
'none'
,
duration
:
2000
});
});
return
return
}
else
{
}
else
{
...
...
pages/tab/good/good.wxml
View file @
97c0a8cf
...
@@ -26,6 +26,11 @@
...
@@ -26,6 +26,11 @@
</view>
</view>
</view>
</view>
<priceItem price-list="{{priceList}}" wx:if="{{priceList&&priceList.length!==0}}" price-type="5"></priceItem>
<priceItem price-list="{{priceList}}" wx:if="{{priceList&&priceList.length!==0}}" price-type="5"></priceItem>
<view class="data-bottom row verCenter rowCenter" wx:if="{{isShowBottom}}">
<text class="line"></text>
<text class="text">我是有底线的</text>
<text class="line"></text>
</view>
</view>
</view>
<view class="good-btn-div" wx:if="{{priceList&&priceList.length!==0}}">
<view class="good-btn-div" wx:if="{{priceList&&priceList.length!==0}}">
...
@@ -34,5 +39,8 @@
...
@@ -34,5 +39,8 @@
<text>新增商品</text>
<text>新增商品</text>
</view>
</view>
</view>
</view>
<view class="cl-good">
<view>擦亮</view>
<view>商品</view>
</view>
</view>
</view>
\ No newline at end of file
pages/tab/good/good.wxss
View file @
97c0a8cf
...
@@ -66,3 +66,19 @@
...
@@ -66,3 +66,19 @@
.nodata .add-good-btn {
.nodata .add-good-btn {
margin-top: 40rpx;
margin-top: 40rpx;
}
}
.cl-good{
position: fixed;
height:88rpx;
width:88rpx;
border-radius: 50%;
opacity: .8;
background-color: #EAAD37;
z-index: 99;
font-size: 24rpx;
color:#fff;
right:24rpx;
bottom:150rpx;
text-align: center;
padding-top:12rpx;
box-sizing:border-box;
}
pages/tab/price/price.js
View file @
97c0a8cf
...
@@ -12,7 +12,8 @@ Page({
...
@@ -12,7 +12,8 @@ Page({
priceList
:
null
,
//商品数据
priceList
:
null
,
//商品数据
limit
:
10
,
//每页的条数
limit
:
10
,
//每页的条数
p
:
1
,
//当前页面
p
:
1
,
//当前页面
total
:
1
total
:
1
,
isShowBottom
:
false
},
},
/**
/**
...
@@ -100,10 +101,8 @@ Page({
...
@@ -100,10 +101,8 @@ Page({
let
allPage
=
Math
.
ceil
(
this
.
data
.
total
/
this
.
data
.
limit
);
let
allPage
=
Math
.
ceil
(
this
.
data
.
total
/
this
.
data
.
limit
);
let
p
=
this
.
data
.
p
;
let
p
=
this
.
data
.
p
;
if
(
p
==
allPage
){
if
(
p
==
allPage
){
wx
.
showToast
({
this
.
setData
({
title
:
'数据到底啦'
,
isShowBottom
:
true
icon
:
'none'
,
duration
:
2000
});
});
return
return
}
else
{
}
else
{
...
@@ -131,6 +130,7 @@ Page({
...
@@ -131,6 +130,7 @@ Page({
p
:
1
,
p
:
1
,
total
:
1
,
total
:
1
,
tabIndex
:
i
,
tabIndex
:
i
,
isShowBottom
:
false
})
})
if
(
i
==
1
)
{
if
(
i
==
1
)
{
this
.
setData
({
this
.
setData
({
...
...
pages/tab/price/price.wxml
View file @
97c0a8cf
...
@@ -20,5 +20,10 @@
...
@@ -20,5 +20,10 @@
</view>
</view>
</view>
</view>
<priceItem price-list="{{priceList}}" wx:if="{{priceList&&priceList.length!==0}}" price-type="1" xb="{{xb}}" ></priceItem>
<priceItem price-list="{{priceList}}" wx:if="{{priceList&&priceList.length!==0}}" price-type="1" xb="{{xb}}" ></priceItem>
<view class="data-bottom row verCenter rowCenter" wx:if="{{isShowBottom}}">
<text class="line"></text>
<text class="text">我是有底线的</text>
<text class="line"></text>
</view>
</view>
</view>
</view>
</view>
\ No newline at end of file
utils/chat.js
View file @
97c0a8cf
...
@@ -43,7 +43,6 @@ const onMessageError = (err) => {
...
@@ -43,7 +43,6 @@ const onMessageError = (err) => {
return
true
;
return
true
;
}
}
const
getImUser
=
()
=>
{
const
getImUser
=
()
=>
{
let
me
=
this
;
let
token
=
wx
.
getStorageSync
(
'access_token'
)
||
''
let
token
=
wx
.
getStorageSync
(
'access_token'
)
||
''
getData
(
apis
.
authme
,
'get'
,
{
getData
(
apis
.
authme
,
'get'
,
{
"token"
:
token
,
"token"
:
token
,
...
...
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