Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
J
jz_Travel
Project
Project
Details
Activity
Releases
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
zhengke
jz_Travel
Commits
23f98d17
Commit
23f98d17
authored
Oct 15, 2021
by
Mac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
样式修改
parent
852f7ed3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
72 additions
and
70 deletions
+72
-70
cash-detail.vue
pages/cash-detail/cash-detail.vue
+1
-1
details.vue
pages/coupon/details/details.vue
+11
-11
index.vue
pages/index/index.vue
+4
-4
share-team.vue
pages/share-team/share-team.vue
+1
-1
index.vue
pages/share/index/index.vue
+1
-1
salesvolume.vue
pages/share/salesvolume.vue
+51
-51
u-charts.min.js
pages/share/u-charts/u-charts.min.js
+1
-0
user-center.vue
pages/user-center/user-center.vue
+2
-1
No files found.
pages/cash-detail/cash-detail.vue
View file @
23f98d17
<
template
>
<view
class=
"cdetailStyle"
:style=
"
{'height':contentHeight}">
<view
style=
"width: 100%;height: 100%;"
>
<u-tabs
:list=
"list"
:is-scroll=
"false"
:current=
"msg.AuditStatus"
@
change=
"change"
:active-color=
'mainColor'
bg-color=
'#f3f4f6'
></u-tabs>
<u-tabs
height=
"100"
:list=
"list"
:is-scroll=
"false"
:current=
"msg.AuditStatus"
@
change=
"change"
:active-color=
'mainColor'
bg-color=
'#f3f4f6'
></u-tabs>
<u-empty
v-if=
"g.length==0"
text=
"暂无数据"
mode=
"data"
></u-empty>
<template
v-if=
"g.length > 0"
>
<view
...
...
pages/coupon/details/details.vue
View file @
23f98d17
...
...
@@ -113,17 +113,17 @@ export default {
);
},
gouseUrl
(
g
){
let
data
=
[]
if
(
g
.
UseType
==
1
||
g
.
UseType
==
2
){
g
.
ProductList
.
forEach
(
x
=>
{
data
.
push
(
x
.
ProductId
)
})
let
id
=
data
.
toString
()
uni
.
redirectTo
({
url
:
'/pages/goods/list?coupon_id='
+
id
+
'&UseType='
+
g
.
UseType
});
}
else
{
uni
.
redirectTo
({
url
:
'/pages/goods/list'
});
}
//
let data = []
//
if(g.UseType==1 || g.UseType==2){
//
g.ProductList.forEach(x=>{
//
data.push(x.ProductId)
//
})
//
let id = data.toString()
//
uni.redirectTo({ url: '/pages/goods/list?coupon_id='+ id+'&UseType='+g.UseType });
//
}else{
//
uni.redirectTo({ url: '/pages/goods/list'});
//
}
uni
.
redirectTo
({
url
:
'/pages/index/index'
});
}
},
...
...
pages/index/index.vue
View file @
23f98d17
...
...
@@ -132,11 +132,11 @@
:navs=
"d.data"
:key=
"di"
></quicknav>
<pingtuan
<!--
<pingtuan
v-if=
"d.id == 'pintuan'"
:goods=
"d.data"
:key=
"di"
></pingtuan>
></pingtuan>
-->
<shopinfo
v-if=
"d.id == 'shop-info'"
:ad=
"d.data"
...
...
@@ -267,7 +267,7 @@ import checkform from "@/components/checkform/index";
import
addialog
from
"@/components/addialog/index"
;
import
quicknav
from
"@/components/quicknav/index"
;
import
coupon
from
"@/components/coupons/coupons"
;
import
pingtuan
from
"@/components/pingtuan/index"
;
//
import pingtuan from "@/components/pingtuan/index";
import
shopinfo
from
"@/components/shopinfo/shopinfo"
;
import
auth
from
"@/components/auth/index.vue"
;
import
guide
from
"@/components/guidecar/index.vue"
;
...
...
@@ -350,7 +350,7 @@ export default {
addialog
,
quicknav
,
coupon
,
pingtuan
,
//
pingtuan,
shopinfo
,
auth
,
guide
,
...
...
pages/share-team/share-team.vue
View file @
23f98d17
<
template
>
<view
class=
"cteamStyle"
:style=
"
{'height':contentHeight}">
<view
style=
"width: 100%;height: 100%;"
>
<u-tabs
:list=
"list"
name=
"GradeName"
:is-scroll=
"false"
:current=
"current"
@
change=
"change"
:active-color=
'mainColor'
></u-tabs>
<u-tabs
height=
"100"
:list=
"list"
name=
"GradeName"
:is-scroll=
"false"
:current=
"current"
@
change=
"change"
:active-color=
'mainColor'
></u-tabs>
<view
style=
"width:100%;background:#fff;padding:20px 20px 0 20px;"
>
<view
style=
"display:flex;align-items: center;"
>
<u-search
:show-action=
"true"
style=
"width:80%"
v-model=
"msg2.Name"
placeholder=
"请输入用户昵称"
action-text=
"搜索"
@
custom=
"msg2.pageIndex = 1,init2(1)"
...
...
pages/share/index/index.vue
View file @
23f98d17
...
...
@@ -93,7 +93,7 @@
<view
style=
"width: 2px;height: 25px;background: #FFFFFF;justify-content: space-between;"
></view>
<view
class=
"center_item"
style=
"font-size: 24rpx;color: #FFFFFF;"
@
click=
"gosales()"
>
<Text>
销售额
</Text>
<Text>
{{
sharedata
.
UserInfo
.
MySellMoney
?
sharedata
.
UserInfo
.
MySellMoney
.
toFixed
(
0
)
:
0
}}
元
</Text>
<Text>
{{
sharedata
.
UserInfo
&&
sharedata
.
UserInfo
.
MySellMoney
?
sharedata
.
UserInfo
.
MySellMoney
.
toFixed
(
0
)
:
0
}}
元
</Text>
</view>
</view>
<!-- 会员购买 -->
...
...
pages/share/salesvolume.vue
View file @
23f98d17
...
...
@@ -136,7 +136,7 @@
</
template
>
<
script
>
//import uCharts from '../school/components
/u-charts/u-charts.min.js';
import
uCharts
from
'.
/u-charts/u-charts.min.js'
;
// import calendar from './cp/fl-calendar.vue'
var
canvaColumn
=
null
;
...
...
@@ -288,56 +288,56 @@
},
showColumn
(
canvasId
,
chartData
){
//
canvaColumn=new uCharts({
//
$this:_self,
//
canvasId: canvasId,
//
type: 'column',
//
fontSize:11,
//
padding:[5,15,15,15],
//
legend:{
//
show:true,
//
position:'top',
//
float:'center',
//
itemGap:30,
//
padding:5,
//
margin:5,
//
//backgroundColor:'rgba(41,198,90,0.2)',
//
//borderColor :'rgba(41,198,90,0.5)',
//
borderWidth :1
//
},
//
dataLabel:true,
//
dataPointShape:true,
//
background:'#FFFFFF',
//
pixelRatio:_self.pixelRatio,
//
categories: chartData.categories,
//
series: chartData.series,
//
animation: true,
//
enableScroll: true,
//
xAxis: {
//
disableGrid:false,
//
type:'grid',
//
gridType:'dash',
//
itemCount:4,
//
scrollShow:true,
//
scrollAlign:'right',
//
},
//
yAxis: {
//
//disabled:true
//
gridType:'dash',
//
splitNumber:4,
//
min:10,
//
max:180,
//
format:(val)=>{return val.toFixed(0)+'元'}//如不写此方法,Y轴刻度默认保留两位小数
//
},
//
width: _self.cWidth*_self.pixelRatio,
//
height: _self.cHeight*_self.pixelRatio,
//
extra: {
//
column: {
//
type:'group',
//
width: _self.cWidth*_self.pixelRatio*0.45/chartData.categories.length
//
}
//
},
//
});
canvaColumn
=
new
uCharts
({
$this
:
_self
,
canvasId
:
canvasId
,
type
:
'column'
,
fontSize
:
11
,
padding
:[
5
,
15
,
15
,
15
],
legend
:{
show
:
true
,
position
:
'top'
,
float
:
'center'
,
itemGap
:
30
,
padding
:
5
,
margin
:
5
,
//backgroundColor:'rgba(41,198,90,0.2)',
//borderColor :'rgba(41,198,90,0.5)',
borderWidth
:
1
},
dataLabel
:
true
,
dataPointShape
:
true
,
background
:
'#FFFFFF'
,
pixelRatio
:
_self
.
pixelRatio
,
categories
:
chartData
.
categories
,
series
:
chartData
.
series
,
animation
:
true
,
enableScroll
:
true
,
xAxis
:
{
disableGrid
:
false
,
type
:
'grid'
,
gridType
:
'dash'
,
itemCount
:
4
,
scrollShow
:
true
,
scrollAlign
:
'right'
,
},
yAxis
:
{
//disabled:true
gridType
:
'dash'
,
splitNumber
:
4
,
min
:
10
,
max
:
180
,
format
:(
val
)
=>
{
return
val
.
toFixed
(
0
)
+
'元'
}
//如不写此方法,Y轴刻度默认保留两位小数
},
width
:
_self
.
cWidth
*
_self
.
pixelRatio
,
height
:
_self
.
cHeight
*
_self
.
pixelRatio
,
extra
:
{
column
:
{
type
:
'group'
,
width
:
_self
.
cWidth
*
_self
.
pixelRatio
*
0.45
/
chartData
.
categories
.
length
}
},
});
},
touchColumn
(
e
){
...
...
pages/share/u-charts/u-charts.min.js
0 → 100755
View file @
23f98d17
This diff is collapsed.
Click to expand it.
pages/user-center/user-center.vue
View file @
23f98d17
...
...
@@ -744,7 +744,7 @@ export default {
:
0
;
switch
(
item
.
link_url
)
{
case
"/pages/share/index/index"
:
if
(
this
.
user_info
.
isShowDistributionCenter
==
1
)
{
if
(
this
.
user_info
.
isShowDistributionCenter
==
1
&&
this
.
user_info
&&
this
.
user_info
.
identity
&&
this
.
user_info
.
identity
.
fx_grade_id
!=
5
)
{
flag
=
true
;
}
else
{
flag
=
false
;
...
...
@@ -805,6 +805,7 @@ export default {
flag
=
false
;
}
break
;
}
return
flag
;
},
...
...
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