Commit ae9de001 by 蒋秀川

'jxc'

2 parents 145c3bfe 7bfbc33e
Showing 53 changed files with 232 additions and 121 deletions
No preview for this file type
...@@ -74,6 +74,7 @@ onMounted(() => { ...@@ -74,6 +74,7 @@ onMounted(() => {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
padding:20px 2vw 0; padding:20px 2vw 0;
--van-button-border-radius:12px;
:deep(.van-button){ :deep(.van-button){
margin-bottom: 20px; margin-bottom: 20px;
width:47vw; width:47vw;
......
...@@ -3,7 +3,13 @@ ...@@ -3,7 +3,13 @@
view { view {
box-sizing: border-box; box-sizing: border-box;
} }
page{background-color: #efeff4;} page{
background-color: #efeff4;
--tabs-bottom-bar-color:#1972F5;
}
.van-picker__confirm{
color: #000!important;
}
.root_gap { .root_gap {
padding-left: 20rpx; padding-left: 20rpx;
padding-right: 20rpx; padding-right: 20rpx;
...@@ -23,6 +29,7 @@ page{background-color: #efeff4;} ...@@ -23,6 +29,7 @@ page{background-color: #efeff4;}
bottom: 0; bottom: 0;
left: 0; left: 0;
right: 0; */ right: 0; */
position: relative;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
...@@ -30,6 +37,7 @@ page{background-color: #efeff4;} ...@@ -30,6 +37,7 @@ page{background-color: #efeff4;}
box-sizing: border-box; box-sizing: border-box;
background-color: #F5F5FA; background-color: #F5F5FA;
padding-bottom: 0rpx; padding-bottom: 0rpx;
--tab-font-size:16px;
} }
.acea-row { .acea-row {
...@@ -109,14 +117,34 @@ page-container{ ...@@ -109,14 +117,34 @@ page-container{
z-index: 20; z-index: 20;
} }
/*********************************/ /*********************************/
.score_view{
position: relative;
border: 1px solid #d8d8d8;
margin-top: 20rpx;
font-size:20rpx;
}
.score_view .tit{
background-color: #dce8f9;
color:#5b5f66;
padding:10rpx 0;
font-size: 30rpx;
}
.score_view .num{
padding:10rpx 0;
font-size: 30rpx;
}
.tcol{ .tcol{
border-right: 1px solid rgba(0,0,0,0.1);
font-size: 14px; font-size: 14px;
text-align: center; text-align: center;
border-right: 1px solid #d8d8d8;
} }
.tcol.none{ .tcol.no{
border-right: none; border-right: none;
} }
.tcol.count{
color:#2674E9
}
.tcol.yes{ .tcol.yes{
color:#07c160 color:#07c160
} }
...@@ -124,5 +152,7 @@ page-container{ ...@@ -124,5 +152,7 @@ page-container{
color:#ee0a24 color:#ee0a24
} }
.tcol.none{ .tcol.none{
color:#1989fa color:#f69658
} }
.bluebg{display:block;position: absolute;background-color:#001C90;left:0;top:-200rpx;width: 100%;height: 400rpx;}
.vrank{position: absolute;width: 36rpx;top:0;left:0;height: 36rpx;background-color: #2674E9;border-radius:0 0 36rpx 0;color: #fff;font-size:20rpx;text-align: center;padding-right: 6rpx;}
\ No newline at end of file \ No newline at end of file
...@@ -24,6 +24,7 @@ Component({ ...@@ -24,6 +24,7 @@ Component({
}, },
lifetimes: { lifetimes: {
attached: function () { attached: function () {
console.info(this.data.navbarColor,66666)
this.setData({ this.setData({
navH: App.globalData.navHeight, navH: App.globalData.navHeight,
windowWidth: App.globalData.windowWidth, windowWidth: App.globalData.windowWidth,
......

1.47 KB | W: | H:

954 Bytes | W: | H:

miniProject/images/cong-b.png
miniProject/images/cong-b.png
miniProject/images/cong-b.png
miniProject/images/cong-b.png
  • 2-up
  • Swipe
  • Onion skin

1.67 KB | W: | H:

549 Bytes | W: | H:

miniProject/images/cong.png
miniProject/images/cong.png
miniProject/images/cong.png
miniProject/images/cong.png
  • 2-up
  • Swipe
  • Onion skin

1.62 KB | W: | H:

1.63 KB | W: | H:

miniProject/images/home-b.png
miniProject/images/home-b.png
miniProject/images/home-b.png
miniProject/images/home-b.png
  • 2-up
  • Swipe
  • Onion skin

1.7 KB | W: | H:

1.1 KB | W: | H:

miniProject/images/home.png
miniProject/images/home.png
miniProject/images/home.png
miniProject/images/home.png
  • 2-up
  • Swipe
  • Onion skin

916 Bytes | W: | H:

1.87 KB | W: | H:

miniProject/images/me-b.png
miniProject/images/me-b.png
miniProject/images/me-b.png
miniProject/images/me-b.png
  • 2-up
  • Swipe
  • Onion skin

1011 Bytes | W: | H:

1.36 KB | W: | H:

miniProject/images/me.png
miniProject/images/me.png
miniProject/images/me.png
miniProject/images/me.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -16,55 +16,55 @@ Page({ ...@@ -16,55 +16,55 @@ Page({
menuItems: [{ menuItems: [{
name: '基础客流', name: '基础客流',
icon: 'icon11', icon: '1',
path: '/pages/zong/basic/index' path: '/pages/zong/basic/index'
}, },
{ {
name: '进出客流', name: '进出客流',
icon: 'icon2', icon: '2',
path: '/pages/zong/contrast/index' path: '/pages/zong/contrast/index'
}, },
{ {
name: '排行榜', name: '排行榜',
icon: 'icon13', icon: '3',
path: '/pages/zong/ranking/index' path: '/pages/zong/ranking/index'
}, },
{ {
name: '同环比', name: '同环比',
icon: 'icon12', icon: '4',
path: '/pages/zong/sequential/index' path: '/pages/zong/sequential/index'
}, },
{ {
name: '时段客流', name: '时段客流',
icon: 'icon10', icon: '5',
path: '/pages/zong/timeTravel/index' path: '/pages/zong/timeTravel/index'
}, },
{ {
name: '节假日客流', name: '节假日客流',
icon: 'icon1', icon: '6',
path: '/pages/zong/holiday-comparison/index' path: '/pages/zong/holiday-comparison/index'
}, },
], ],
tourItems:[{ tourItems:[{
name: '实时监控', name: '实时监控',
icon: 'icon3', icon: '8',
path: '/pages/tour/gate/index?type=view' path: '/pages/tour/gate/index?type=view'
},{ },{
name: '远程巡店', name: '远程巡店',
icon: 'icon9', icon: '9',
path: '/pages/tour/gate/index?type=tour' path: '/pages/tour/gate/index?type=tour'
},{ },{
name: '点检巡店', name: '点检巡店',
icon: 'icon8', icon: '10',
path: '/pages/tour/point/index' path: '/pages/tour/point/index'
},{ },{
name: '我发起的', name: '我发起的',
icon: 'icon6', icon: '11',
path: '/pages/tour/list/index?type=create' path: '/pages/tour/list/index?type=create'
},{ },{
name: '待我处理', name: '待我处理',
icon: 'icon6', icon: '12',
path: '/pages/tour/list/index?type=handle' path: '/pages/tour/list/index?type=handle'
}] }]
}, },
...@@ -78,7 +78,7 @@ Page({ ...@@ -78,7 +78,7 @@ Page({
if (deploymentType === 'store') { if (deploymentType === 'store') {
menuItems.push({ menuItems.push({
name: '进店率', name: '进店率',
icon: 'icon5', icon: '7',
path: '/pages/zong/entry-rate/index' path: '/pages/zong/entry-rate/index'
}) })
this.setData({ menuItems }) this.setData({ menuItems })
......
<view class="container" style="padding-top: {{navHeight}}px;width:{{windowWidth}}px"> <view class="container" style="padding-top: {{navHeight}}px;width:{{windowWidth}}px">
<view class="^bluebg"></view>
<view class="top"> <view class="top">
<image class="~bgimg" mode="scaleToFill" src="{{picUrl}}/banner.png"></image> <image class="~bgimg" mode="scaleToFill" src="{{picUrl}}/banner.png"></image>
<view class="mallselect" bindtap="mallBtn">{{accountName}} <van-icon name="play" custom-class="drop"/></view> <view class="mallselect" bindtap="mallBtn">{{accountName}} <van-icon name="play" custom-class="drop"/></view>
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
"zone-picker": "/components/zone-picker/index", "zone-picker": "/components/zone-picker/index",
"navbar": "/components/navbar/index" "navbar": "/components/navbar/index"
}, },
"enablePullDownRefresh":false,
"navigationBarTitleText": "", "navigationBarTitleText": "",
"navigationBarBackgroundColor": "#0268FF", "navigationBarBackgroundColor": "#0268FF",
"navigationBarTextStyle": "white" "navigationBarTextStyle": "white"
......
<view class="container" style="padding-top: {{navHeight}}px;width:{{windowWidth}}px"> <view class="container" style="padding-top: {{navHeight}}px;width:{{windowWidth}}px">
<view class="^bluebg"></view>
<view class="top"> <view class="top">
<image class="~bgimg" src="{{picUrl}}/banner.png"></image> <image class="~bgimg" src="{{picUrl}}/banner.png"></image>
<view class="mallselect" bindtap="mallBtn">{{orgName}} <van-icon name="play" custom-class="drop {{isMall?'hide':''}}"/></view> <view class="mallselect" bindtap="mallBtn">{{orgName}} <van-icon name="play" custom-class="drop {{isMall?'hide':''}}"/></view>
......
...@@ -87,7 +87,7 @@ Page({ ...@@ -87,7 +87,7 @@ Page({
const deploymentType = wx.getStorageSync('deploymentType') const deploymentType = wx.getStorageSync('deploymentType')
wx.setStorage({ data: name, key: 'name' }) wx.setStorage({ data: name, key: 'name' })
wx.setStorage({ data: password, key: 'password' }) wx.setStorage({ data: password, key: 'password' })
console.info('atoken',res.data.atoken) wx.setStorage({ data: res.data.user.type, key: 'userrole_type' })
await wx.setStorage({ data: res.data.atoken, key: 'atoken' }) await wx.setStorage({ data: res.data.atoken, key: 'atoken' })
wx.setStorage({ data: res.data.user.accountId||2, key: 'accountId' }) wx.setStorage({ data: res.data.user.accountId||2, key: 'accountId' })
getApps({ getApps({
......
<!--pages/tour/component/upload/index.wxml--> <!--pages/tour/component/upload/index.wxml-->
<view class="uwrap"> <view class="uwrap">
<van-row custom-class="aview"> <van-row custom-class="score_view aview">
<van-col span="6" custom-class="tcol count"> <van-col span="6" custom-class="tcol count">
<view class="num">{{tourObj.score}}/{{tourObj.all}}</view> <view class="tit">得分/总分</view>
<view class="tit">得分/总分</view> <view class="num">{{tourObj.score}}/{{tourObj.all}}</view>
</van-col> </van-col>
<van-col span="5" custom-class="tcol all"> <van-col span="5" custom-class="tcol all">
<view class="num">{{tourObj.mount}}条</view> <view class="tit">总巡检项</view>
<view class="tit">总巡检项</view> <view class="num">{{tourObj.mount}}条</view>
</van-col> </van-col>
<van-col span="4" custom-class="tcol yes"> <van-col span="4" custom-class="tcol yes">
<view class="num">{{tourObj.yes}}条</view>
<view class="tit">合格</view> <view class="tit">合格</view>
<view class="num">{{tourObj.yes}}条</view>
</van-col> </van-col>
<van-col span="5" custom-class="tcol none"> <van-col span="5" custom-class="tcol none">
<view class="tit">不适用</view>
<view class="num">{{tourObj.none}}条</view> <view class="num">{{tourObj.none}}条</view>
<view class="tit">不适用</view>
</van-col> </van-col>
<van-col span="4" custom-class="tcol no"> <van-col span="4" custom-class="tcol no">
<view class="num">{{tourObj.no}}条</view>
<view class="tit">不合格</view> <view class="tit">不合格</view>
<view class="num">{{tourObj.no}}条</view>
</van-col> </van-col>
</van-row> </van-row>
<van-collapse value="{{ activeSop }}" custom-class="sopView"> <van-collapse value="{{ activeSop }}" custom-class="sopView">
<van-collapse-item custom-class="item" wx:for="{{sopList}}" wx:key="index" title="{{item.pName}}:{{item.name}}" name="{{item.id}}" is-link="{{false}}"> <van-collapse-item custom-class="item" wx:for="{{sopList}}" wx:key="index" name="{{item.id}}" is-link="{{false}}">
<view class="intro">描述:{{item.intro}}</view> <view class="dark" slot="title"><text>{{item.pName}}:</text>{{item.name}}</view>
<view class="intro"><text>描述:</text>{{item.intro}}</view>
<view class="act ~acea-row"> <view class="act ~acea-row">
<view> <view>
分值:{{item.score}} <text>分值:</text><text class="blue">{{item.score}}</text>
</view> </view>
<view> <view class="act_btns">
<van-button data-status="{{1}}" data-id="{{item.id}}" bindtap="setSopBtn" color="{{item.status==1?'#07c160':'#a7a7a7'}}" custom-class="btn yes" square size="small" icon="success"/> <van-button data-status="{{-1}}" data-id="{{item.id}}" bindtap="setSopBtn" color="{{item.status==-1?'#f69658':'#a7a7a7'}}" custom-class="btn none" round size="small" icon="minus"/>
<van-button data-status="{{-1}}" data-id="{{item.id}}" bindtap="setSopBtn" color="{{item.status==-1?'#1989fa':'#a7a7a7'}}" custom-class="btn none" square size="small" icon="minus"/> <van-button data-status="{{0}}" data-id="{{item.id}}" bindtap="setSopBtn" color="{{item.status==0?'#ee0a24':'#a7a7a7'}}" custom-class="btn no" round size="small" icon="cross"/>
<van-button data-status="{{0}}" data-id="{{item.id}}" bindtap="setSopBtn" color="{{item.status==0?'#ee0a24':'#a7a7a7'}}" custom-class="btn no" square size="small" icon="cross"/> <van-button data-status="{{1}}" data-id="{{item.id}}" bindtap="setSopBtn" color="{{item.status==1?'#07c160':'#a7a7a7'}}" custom-class="btn yes" round size="small" icon="success"/>
</view> </view>
</view> </view>
<view class="~vrank">{{index+1}}</view>
</van-collapse-item> </van-collapse-item>
</van-collapse> </van-collapse>
<view class="mView"> <view class="mView">
...@@ -82,27 +87,28 @@ ...@@ -82,27 +87,28 @@
<view class="titem"><text>巡店人:</text>{{resultObj.createByName||userName}}</view> <view class="titem"><text>巡店人:</text>{{resultObj.createByName||userName}}</view>
<view class="titem"><text>处理人:</text>{{resultObj.handlerName}}</view> <view class="titem"><text>处理人:</text>{{resultObj.handlerName}}</view>
</view> </view>
<van-divider /> <van-row custom-class="score_view aview saview">
<van-row custom-class="aview saview">
<van-col span="6" custom-class="tcol count"> <van-col span="6" custom-class="tcol count">
<view class="num">{{tourObj.score}}/{{tourObj.all}}</view> <view class="tit">得分/总分</view>
<view class="tit">得分/总分</view> <view class="num">{{tourObj.score}}/{{tourObj.all}}</view>
</van-col> </van-col>
<van-col span="5" custom-class="tcol all"> <van-col span="5" custom-class="tcol all">
<view class="num">{{tourObj.mount}}条</view>
<view class="tit">总巡检项</view> <view class="tit">总巡检项</view>
<view class="num">{{tourObj.mount}}条</view>
</van-col> </van-col>
<van-col span="4" custom-class="tcol yes"> <van-col span="4" custom-class="tcol yes">
<view class="num">{{tourObj.yes}}条</view>
<view class="tit">合格</view> <view class="tit">合格</view>
<view class="num">{{tourObj.yes}}条</view>
</van-col> </van-col>
<van-col span="4" custom-class="tcol no"> <van-col span="4" custom-class="tcol no">
<view class="num">{{tourObj.no}}条</view>
<view class="tit">不合格</view> <view class="tit">不合格</view>
<view class="num">{{tourObj.no}}条</view>
</van-col> </van-col>
<van-col span="5" custom-class="tcol none"> <van-col span="5" custom-class="tcol none">
<view class="num">{{tourObj.none}}条</view> <view class="tit">不适用</view>
<view class="tit">不适用</view> <view class="num">{{tourObj.none}}条</view>
</van-col> </van-col>
</van-row> </van-row>
</view> </view>
......
...@@ -3,7 +3,7 @@ page{--font-weight-bold:600;} ...@@ -3,7 +3,7 @@ page{--font-weight-bold:600;}
.uwrap{ .uwrap{
position: relative; position: relative;
width: 750rpx; width: 750rpx;
--cell-font-size:16px; --cell-font-size:28rpx;
padding-bottom: 20rpx; padding-bottom: 20rpx;
} }
.aview{ .aview{
...@@ -21,16 +21,31 @@ page{--font-weight-bold:600;} ...@@ -21,16 +21,31 @@ page{--font-weight-bold:600;}
border-radius: 30rpx; border-radius: 30rpx;
margin: 20rpx auto 0; margin: 20rpx auto 0;
--button-small-font-size:18px; --button-small-font-size:18px;
--collapse-item-content-padding:10px 15px; --collapse-item-content-font-size:28rpx;
--button-small-min-width:30px --collapse-item-content-padding:5px 8px;
--button-small-min-width:30px;
--cell-vertical-padding:5px;
--cell-horizontal-padding:10px;
} }
.sopView .item .dark{
color:#646566;
padding-top: 15rpx;
}
.sopView .item text{
color:#000;
font-size: 28rpx;
}
.sopView .item text.blue{
color:#1267E0;
font-weight: 600;
}
.sopView .item .act{ .sopView .item .act{
margin: 10rpx 0 0; margin: 10rpx 0 0;
color:#000; color:#000;
font-size: 14px; font-size: 14px;
} }
.sopView .item .btn{ .sopView .item .btn{
margin-left:10rpx; margin-left:20rpx;
} }
.mView{ .mView{
width: 710rpx; width: 710rpx;
...@@ -46,7 +61,7 @@ page{--font-weight-bold:600;} ...@@ -46,7 +61,7 @@ page{--font-weight-bold:600;}
color:#646566; color:#646566;
position: relative; position: relative;
left:-5px; left:-5px;
font-size: 16px; font-size: 28rpx;
} }
.mView .upview .label text{ .mView .upview .label text{
color:#f00 color:#f00
...@@ -71,13 +86,38 @@ van-popup button{border-bottom: 1px dashed rgba(0,0,0,0.1);} ...@@ -71,13 +86,38 @@ van-popup button{border-bottom: 1px dashed rgba(0,0,0,0.1);}
.tbtns button{ width: 300rpx;border-radius: 20rpx;} .tbtns button{ width: 300rpx;border-radius: 20rpx;}
.tlist{padding:10rpx 20rpx} .tlist{padding:10rpx 20rpx}
.tlist .titem{margin:0 0 10rpx;} .tlist .titem{margin:0 0 10rpx;}
.act_btns{
--button-small-height:30px;
--padding-xs:3px;
}
.score_view{
position: relative;
border: 1px solid #d8d8d8;
margin-top: -10px;
}
.score_view .tit{
background-color: #dce8f9;
color:#5b5f66;
padding:10rpx 0;
font-size: 28rpx;
}
.score_view .num{
padding:10rpx 0;
font-size: 28rpx;
}
.tcol{ .tcol{
border-right: 1px solid rgba(0,0,0,0.1);
font-size: 14px; font-size: 14px;
text-align: center;
border-right: 1px solid #d8d8d8;
} }
.tcol.none{ .tcol.no{
border-right: none; border-right: none;
} }
.tcol.count{
color:#2674E9
}
.tcol.yes{ .tcol.yes{
color:#07c160 color:#07c160
} }
...@@ -85,5 +125,5 @@ van-popup button{border-bottom: 1px dashed rgba(0,0,0,0.1);} ...@@ -85,5 +125,5 @@ van-popup button{border-bottom: 1px dashed rgba(0,0,0,0.1);}
color:#ee0a24 color:#ee0a24
} }
.tcol.none{ .tcol.none{
color:#1989fa color:#f69658
} }
\ No newline at end of file \ No newline at end of file
...@@ -131,7 +131,7 @@ Page({ ...@@ -131,7 +131,7 @@ Page({
let mallId = wx.getStorageSync('mallId'); let mallId = wx.getStorageSync('mallId');
let mallList = wx.getStorageSync('mallList'); let mallList = wx.getStorageSync('mallList');
let params = { let params = {
mallId:this.data.mallId, mallId:this.data.mallId||'',
pageSize:999, pageSize:999,
patrolType:1, patrolType:1,
...this.data.date ...this.data.date
......
{ {
"navigationBarTextStyle":"white",
"usingComponents": { "usingComponents": {
"van-tab": "@vant/weapp/tab/index", "van-tab": "@vant/weapp/tab/index",
"van-tabs": "@vant/weapp/tabs/index", "van-tabs": "@vant/weapp/tabs/index",
......
...@@ -13,27 +13,26 @@ ...@@ -13,27 +13,26 @@
<view class="titem"><text>巡店人:</text>{{item.createByName}}</view> <view class="titem"><text>巡店人:</text>{{item.createByName}}</view>
<view class="titem"><text>处理人:</text>{{item.handlerName}}</view> <view class="titem"><text>处理人:</text>{{item.handlerName}}</view>
</view> </view>
<van-divider /> <van-row custom-class="score_view aview">
<van-row custom-class="aview">
<van-col span="6" custom-class="tcol count"> <van-col span="6" custom-class="tcol count">
<view class="num">{{item.hadScore}}/{{item.totalScore}}</view>
<view class="tit">得分/总分</view> <view class="tit">得分/总分</view>
<view class="num">{{item.hadScore}}/{{item.totalScore}}</view>
</van-col> </van-col>
<van-col span="5" custom-class="tcol all"> <van-col span="5" custom-class="tcol all">
<view class="num">{{item.total}}条</view>
<view class="tit">总巡检项</view> <view class="tit">总巡检项</view>
<view class="num">{{item.total}}条</view>
</van-col> </van-col>
<van-col span="4" custom-class="tcol yes"> <van-col span="4" custom-class="tcol yes">
<view class="num">{{item.qualified}}条</view>
<view class="tit">合格</view> <view class="tit">合格</view>
</van-col> <view class="num">{{item.qualified}}条</view>
<van-col span="4" custom-class="tcol no">
<view class="num">{{item.noQualified}}条</view>
<view class="tit">不合格</view>
</van-col> </van-col>
<van-col span="5" custom-class="tcol none"> <van-col span="5" custom-class="tcol none">
<view class="num">{{item.noSuit}}条</view>
<view class="tit">不适用</view> <view class="tit">不适用</view>
<view class="num">{{item.noSuit}}条</view>
</van-col>
<van-col span="4" custom-class="tcol no">
<view class="tit">不合格</view>
<view class="num">{{item.noQualified}}条</view>
</van-col> </van-col>
</van-row> </van-row>
</view> </view>
...@@ -43,19 +42,22 @@ ...@@ -43,19 +42,22 @@
</template> </template>
<!--pages/tour/list/index.wxml--> <!--pages/tour/list/index.wxml-->
<view class="container" style="padding-top: {{navHeight}}px"> <view class="container" style="padding-top: {{navHeight}}px">
<navbar2 bg-color="#fff" navbar-color="#000"> <navbar2 bg-color="#001C90" navbar-color="#000">
<view class="navtitle"> <view class="navtitle">
<van-icon bindtap="onGoBack" size="24" name="arrow-left" custom-class="back" /> <van-icon bindtap="onGoBack" size="24" name="arrow-left" custom-class="back" />
<view class="title">巡店记录</view> <view class="title">{{type=='create'?'我发起的':'待我处理'}}</view>
</view> </view>
</navbar2> </navbar2>
<view class="tlist"> <view style="width: 750rpx;margin-top:4rpx;">
<van-tabs type="card" color="#1267E0" bindchange="tabsChange"> <van-tabs type="line" color="#1267E0" bindchange="tabsChange">
<van-tab title="全部" name="list"></van-tab> <van-tab title="全部" name="list"></van-tab>
<van-tab title="待处理" name="unfull" dot="{{unfull}}"></van-tab> <van-tab title="待处理" name="unfull"></van-tab>
<van-tab title="待复查" name="check" dot="{{check}}"></van-tab> <van-tab title="待复查" name="check"></van-tab>
<van-tab title="已完成" name="full" dot="{{full}}"></van-tab> <van-tab title="已完成" name="full"></van-tab>
</van-tabs> </van-tabs>
</view>
<view class="tlist">
<view class="fview acea-row"> <view class="fview acea-row">
<view class="mallselect" bindtap="mallBtn">{{mallName}} <view class="mallselect" bindtap="mallBtn">{{mallName}}
<van-icon name="arrow-down" custom-class="drop" /> <van-icon name="arrow-down" custom-class="drop" />
......
.navtitle{color:#000;} .navtitle{color:#fff;}
.title{width:600rpx;text-align: center;} .title{width:600rpx;text-align: center;}
.container{overflow: hidden;height: 100vh;} .container{overflow: hidden;height: 100vh;}
.tlist{position: relative;width:710rpx;margin:10px auto 0;--padding-md:0} .tlist{position: relative;width:710rpx;margin:0px auto 0;--padding-md:0}
.tlist scroll-view{width: 710rpx;margin:0 auto 0;} .tlist scroll-view{width: 710rpx;margin:0 auto 0;}
.tour{ .tour{
--cell-vertical-padding:5px; --cell-vertical-padding:5px;
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
margin:0px auto 20px; margin:0px auto 20px;
} }
.tlist{color:#999;font-size:14px;} .tlist{color:#999;font-size:14px;}
.tcol{color:#000}
.fview{padding:20rpx 0;color:#000;font-size: 30rpx;align-items: center;} .fview{padding:20rpx 0;color:#000;font-size: 30rpx;align-items: center;}
.fview .drop{margin-left:-5rpx;} .fview .drop{margin-left:-5rpx;}
.fview .tview{ .fview .tview{
......
{ {
"navigationBarTextStyle":"white",
"usingComponents": { "usingComponents": {
"van-tab": "@vant/weapp/tab/index", "van-tab": "@vant/weapp/tab/index",
"van-tabs": "@vant/weapp/tabs/index", "van-tabs": "@vant/weapp/tabs/index",
......
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
<view class="tour acea-row" wx:for="{{list}}" data-id="{{item.id}}" bindtap="jumpBtn"> <view class="tour acea-row" wx:for="{{list}}" data-id="{{item.id}}" bindtap="jumpBtn">
<image class="pimg" mode="aspectFill" src="{{item.image}}"></image> <image class="pimg" mode="aspectFill" src="{{item.image}}"></image>
<view class="pinfo"> <view class="pinfo">
<view class="tit">{{item.gateName}}</view> <van-cell custom-class="tit" title="{{item.gateName}}" is-link/>
<view class="belong">门店:{{item.mallName}}</view> <view class="belong"><text>门店:</text>{{item.mallName}}</view>
<view class="time">抓拍时间:{{item.createTime}}</view> <view class="time"><text>抓拍时间:</text>{{item.createTime}}</view>
<view class="status">状态:<text style="color:{{item.color}}">{{item.text}}</text></view> <view class="status"><text>状态:</text><text style="color:{{item.color}}">{{item.text}}</text></view>
</view> </view>
</view> </view>
<van-empty wx:if="{{list.length==0}}" image="search" description="暂无点检记录" /> <van-empty wx:if="{{list.length==0}}" image="search" description="暂无点检记录" />
...@@ -15,18 +15,20 @@ ...@@ -15,18 +15,20 @@
</template> </template>
<!--pages/tour/list/index.wxml--> <!--pages/tour/list/index.wxml-->
<view class="container" style="padding-top: {{navHeight}}px"> <view class="container" style="padding-top: {{navHeight}}px">
<navbar2 bg-color="#fff" navbar-color="#000"> <navbar2 bg-color="#001C90">
<view class="navtitle"> <view class="navtitle">
<van-icon bindtap="onGoBack" size="24" name="arrow-left" custom-class="back" /> <van-icon bindtap="onGoBack" size="24" name="arrow-left" custom-class="back" />
<view class="title">点检巡店</view> <view class="title">点检巡店记录</view>
</view> </view>
</navbar2> </navbar2>
<view class="tlist"> <view style="width: 100%;margin-top: 4rpx;">
<van-tabs type="card" color="#1267E0" bindchange="tabsChange"> <van-tabs type="line" color="#1267E0" bindchange="tabsChange">
<van-tab title="全部" name="list"></van-tab> <van-tab title="全部" name="list"></van-tab>
<van-tab title="未点检" name="unckeck" dot="{{uncheck}}"></van-tab> <van-tab title="未点检" name="unckeck"></van-tab>
<van-tab title="已点检" name="check" dot="{{check}}"></van-tab> <van-tab title="已点检" name="check"></van-tab>
</van-tabs> </van-tabs>
</view>
<view class="tlist">
<view class="fview acea-row"> <view class="fview acea-row">
<view class="mallselect" bindtap="mallBtn">{{mallName}} <view class="mallselect" bindtap="mallBtn">{{mallName}}
<van-icon name="arrow-down" custom-class="drop" /> <van-icon name="arrow-down" custom-class="drop" />
......
page{--font-weight-bold:600;} page{--font-weight-bold:600;}
.navtitle{color:#000;} .navtitle{color:#fff;}
.title{width:600rpx;text-align: center;} .title{width:600rpx;text-align: center;}
.container{overflow: hidden;height: 100vh;} .container{overflow: hidden;height: 100vh;}
.tlist{position: relative;width:710rpx;margin:10px auto 0;--padding-md:0} .tlist{position: relative;width:710rpx;margin:0px auto 0;--padding-md:0}
.tlist scroll-view{width: 710rpx;margin:0 auto 0;} .tlist scroll-view{width: 710rpx;margin:0 auto 0;}
.tour{ .tour{
--cell-vertical-padding:5px; --cell-vertical-padding:5px;
...@@ -16,7 +16,8 @@ page{--font-weight-bold:600;} ...@@ -16,7 +16,8 @@ page{--font-weight-bold:600;}
} }
.tour .pimg{width:285rpx;height: 160rpx;} .tour .pimg{width:285rpx;height: 160rpx;}
.tour .pinfo{width:415rpx;padding-left:10rpx;} .tour .pinfo{width:415rpx;padding-left:10rpx;}
.tour .pinfo .tit{color:#000} .tour .pinfo .tit{color:#000;font-size: 26rpx;--cell-vertical-padding:0}
.tour .pinfo view{overflow: hidden;text-overflow: ellipsis;white-space: nowrap;} .tour .pinfo view{overflow: hidden;text-overflow: ellipsis;white-space: nowrap;}
.tlist{color:#999;font-size:14px;} .tlist{color:#999;font-size:14px;}
.tcol{color:#000} .tcol{color:#000}
......
...@@ -23,39 +23,44 @@ ...@@ -23,39 +23,44 @@
<view class="titem"><text>处理人:</text>{{tourObj.handlerName}}</view> <view class="titem"><text>处理人:</text>{{tourObj.handlerName}}</view>
<text class="txt" style="color:{{tourObj.color}}">{{tourObj.text}}</text> <text class="txt" style="color:{{tourObj.color}}">{{tourObj.text}}</text>
</view> </view>
<van-row custom-class="aview"> <van-row custom-class="score_view aview">
<van-col span="6" custom-class="tcol count"> <van-col span="6" custom-class="tcol count">
<view class="num">{{tourObj.hadScore}}/{{tourObj.totalScore}}</view>
<view class="tit">得分/总分</view> <view class="tit">得分/总分</view>
<view class="num">{{tourObj.hadScore}}/{{tourObj.totalScore}}</view>
</van-col> </van-col>
<van-col span="5" custom-class="tcol all"> <van-col span="5" custom-class="tcol all">
<view class="num">{{tourObj.total}}条</view>
<view class="tit">总巡检项</view> <view class="tit">总巡检项</view>
<view class="num">{{tourObj.total}}条</view>
</van-col> </van-col>
<van-col span="4" custom-class="tcol yes"> <van-col span="4" custom-class="tcol yes">
<view class="num">{{tourObj.qualified}}条</view>
<view class="tit">合格</view> <view class="tit">合格</view>
<view class="num">{{tourObj.qualified}}条</view>
</van-col> </van-col>
<van-col span="4" custom-class="tcol no"> <van-col span="4" custom-class="tcol no">
<view class="num">{{tourObj.noQualified}}条</view>
<view class="tit">不合格</view> <view class="tit">不合格</view>
<view class="num">{{tourObj.noQualified}}条</view>
</van-col> </van-col>
<van-col span="5" custom-class="tcol none"> <van-col span="5" custom-class="tcol none">
<view class="num">{{tourObj.noSuit}}条</view>
<view class="tit">不适用</view> <view class="tit">不适用</view>
<view class="num">{{tourObj.noSuit}}条</view>
</van-col> </van-col>
</van-row> </van-row>
<view class="torlist"> <view class="torlist">
<view class="toritem" wx:for="{{tourObj.sops}}"> <view class="toritem" wx:for="{{tourObj.sops}}">
<view>项目:{{item.name}}</view> <view><text>{{item.sopTypeName}}:</text>{{item.name}}</view>
<view>描述:{{item.intro}}</view> <view><text>描述:</text>{{item.intro}}</view>
<view>分值:{{item.score}}分</view> <view><text>分值:</text><text class="blue">{{item.score}}</text></view>
<text style="color:{{item.color}}">{{item.text}}</text> <text class="state" style="color:{{item.color}}">{{item.text}}</text>
<view class="vrank">{{index+1}}</view>
</view> </view>
</view> </view>
<view class="tbei" wx:if="{{tourObj.remark}}"> <view class="tbei" wx:if="{{tourObj.remark}}">
备注:{{tourObj.remark}} <text>备注:</text>{{tourObj.remark}}
</view> </view>
</view> </view>
...@@ -95,8 +100,8 @@ ...@@ -95,8 +100,8 @@
<van-collapse accordion value="{{recordVal}}" bind:change="changeRecord"> <van-collapse accordion value="{{recordVal}}" bind:change="changeRecord">
<van-collapse-item wx:for="{{tourObj.handleRecords}}" title="{{item.result==1?'处理人':'巡检人'}}:{{item.handlerName}}" value="{{item.createTime}}" name="{{item.id}}"> <van-collapse-item wx:for="{{tourObj.handleRecords}}" title="{{item.result==1?'处理人':'巡检人'}}:{{item.handlerName}}" value="{{item.createTime}}" name="{{item.id}}">
<view class="actinfo"> <view class="actinfo">
<view>状态:<text style="color:{{item.color}}">{{item.text}}</text></view> <view><text>状态:</text><text style="color:{{item.color}}">{{item.text}}</text></view>
<view wx:if="{{item.remark}}">备注:{{item.remark}}</view> <view wx:if="{{item.remark}}"><text>备注:</text>{{item.remark}}</view>
<image mode="widthFix" wx:for="{{item.pics}}" src="{{picUrl+item}}" /> <image mode="widthFix" wx:for="{{item.pics}}" src="{{picUrl+item}}" />
</view> </view>
</van-collapse-item> </van-collapse-item>
......
...@@ -29,11 +29,13 @@ ...@@ -29,11 +29,13 @@
.tlist { .tlist {
position: relative; position: relative;
color: #000; color: #6b6b6c;
font-size: 14px; font-size: 14px;
line-height: 1.8; line-height: 1.8;
} }
.tlist text{
color:#000;
}
.tlist .txt { .tlist .txt {
position: absolute; position: absolute;
right: 10px; right: 10px;
...@@ -56,16 +58,24 @@ ...@@ -56,16 +58,24 @@
.torlist .toritem { .torlist .toritem {
position: relative; position: relative;
color: #000; color: #6b6b6c;
padding: 10px 10px; padding: 10px 10px;
padding-left:25rpx;
border-bottom: 1px solid #999; border-bottom: 1px solid #999;
} }
.torlist .toritem text{
color: #000;
}
.torlist .toritem text.blue{
color:#2674E9;
font-weight: 600;
}
.torlist .toritem view { .torlist .toritem view {
max-width: 600rpx; max-width: 585rpx;
} }
.torlist .toritem text { .torlist .toritem .state {
position: absolute; position: absolute;
right: 10px; right: 10px;
top: 30%; top: 30%;
...@@ -89,11 +99,13 @@ ...@@ -89,11 +99,13 @@
} }
.tbei { .tbei {
color: #000; color: #6b6b6c;
font-size: 28rpx; font-size: 28rpx;
margin: 10rpx auto 0; margin: 10rpx auto 0;
} }
.tbei text{
color: #000;
}
.actlist { .actlist {
width: 750rpx; width: 750rpx;
padding: 0rpx 20rpx; padding: 0rpx 20rpx;
...@@ -102,10 +114,12 @@ ...@@ -102,10 +114,12 @@
} }
.actinfo { .actinfo {
color: #000; color: #6b6b6c;
font-size: 28rpx; font-size: 28rpx;
} }
.actinfo text{
color: #000;
}
.actinfo view { .actinfo view {
margin-bottom: 10rpx; margin-bottom: 10rpx;
} }
...@@ -121,7 +135,9 @@ ...@@ -121,7 +135,9 @@
} }
.upview .label { .upview .label {
margin-bottom: 10rpx; color:#000;
font-size: 16px;
} }
.check-btns { .check-btns {
......
{ {
"description": "项目配置文件", "description": "项目配置文件",
"packOptions": { "packOptions": {
"ignore": [] "ignore": [],
"include": []
}, },
"setting": { "setting": {
"urlCheck": true, "urlCheck": true,
...@@ -22,9 +23,9 @@ ...@@ -22,9 +23,9 @@
"uploadWithSourceMap": true, "uploadWithSourceMap": true,
"compileHotReLoad": false, "compileHotReLoad": false,
"lazyloadPlaceholderEnable": false, "lazyloadPlaceholderEnable": false,
"useMultiFrameRuntime": false, "useMultiFrameRuntime": true,
"useApiHook": false, "useApiHook": true,
"useApiHostProcess": false, "useApiHostProcess": true,
"babelSetting": { "babelSetting": {
"ignore": [], "ignore": [],
"disablePlugins": [], "disablePlugins": [],
...@@ -45,27 +46,21 @@ ...@@ -45,27 +46,21 @@
"libVersion": "2.14.4", "libVersion": "2.14.4",
"appid": "wx220b5d2dbb82ce64", "appid": "wx220b5d2dbb82ce64",
"projectname": "miniProject", "projectname": "miniProject",
"cloudfunctionTemplateRoot": "cloudfunctionTemplate",
"watchOptions": {
"ignore": []
},
"debugOptions": { "debugOptions": {
"hidedInDevtools": [] "hidedInDevtools": []
}, },
"scripts": {}, "scripts": {},
"isGameTourist": false,
"simulatorType": "wechat",
"simulatorPluginLibVersion": {},
"cloudfunctionTemplateRoot": "cloudfunctionTemplate",
"condition": { "condition": {
"search": { "plugin": {
"list": []
},
"conversation": {
"list": [] "list": []
}, },
"game": { "game": {
"list": [] "list": []
}, },
"plugin": {
"list": []
},
"gamePlugin": { "gamePlugin": {
"list": [] "list": []
}, },
......
{
"projectname": "miniProject",
"setting": {
"compileHotReLoad": true
},
"description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html"
}
\ No newline at end of file \ No newline at end of file
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!