九月线上版本1.2.0

This commit is contained in:
xk_guohonglei
2020-09-09 17:07:57 +08:00
parent 856f0c8167
commit 0bcbc4b3e1
12 changed files with 125 additions and 102 deletions

View File

@@ -4,7 +4,7 @@
<view class="padding-xs flex align-center">
<view class="flex-sub text-center padding-top-lg">
<view class="txet-xxs">
<text class="">交易金额()</text>
<text class="">交易金额</text>
</view>
<view class=" text-sl padding padding-top-xs"><text class="">
{{basicData.totalAmout|numberFilter}}
@@ -13,24 +13,24 @@
</view>
</view>
</view>
<view class="bg-white to-top">
<view class="bg-white to-top">
<view class=" flex ">
<view class="padding text-center flex-sub">
<text>交易笔数</text>
<view class="padding-sm">
<text class="oil-main-color">{{basicData.totalCount}}</text>
<text class="text-lg oil-main-color padding-top-xs">{{basicData.totalCount}}</text>
</view>
</view>
<view class="padding text-center flex-sub">
<text>客单均价</text>
<view class="padding-sm">
<text class="oil-main-color">{{basicData.totalAmout/basicData.totalAccount|numberFilter}}</text>
<text class="text-lg oil-main-color">{{basicData.totalAmout/basicData.totalAccount|numberFilter}}</text>
</view>
</view>
<view class="padding text-center flex-sub">
<text>顾客数</text>
<view class="padding-sm">
<text class="oil-main-color">{{basicData.totalAccount}}</text>
<text class="text-lg oil-main-color padding-top-xs">{{basicData.totalAccount}}</text>
</view>
</view>
</view>
@@ -58,13 +58,13 @@
}
},
watch: {
basicData: {
handler(newVal, oldVal) {
console.log('深度监听', newVal, oldVal)
this.basicData = newVal
},
deep: true
}
basicData: {
handler(newVal, oldVal) {
console.log('深度监听', newVal, oldVal)
this.basicData = newVal
},
deep: true
}
},
filters: {
numberFilter(value) {

View File

@@ -141,7 +141,7 @@ export default {
gridColor: '#CCCCCC',
dashLength: 8,
splitNumber: 5,
format: (val) => { return val > 0 ? val.toFixed(0) : 0 + '单' }
format: (val) => { return val + '单' }
},
width: _self.cWidth * _self.pixelRatio,
height: _self.cHeight * _self.pixelRatio,

View File

@@ -136,7 +136,7 @@ export default {
gridColor: '#CCCCCC',
dashLength: 8,
splitNumber: 5,
format: (val) => { return val>0?val.toFixed(0):0 + '单' }
format: (val) => { return val + '单' }
},
width: _self.cWidth * _self.pixelRatio,
height: _self.cHeight * _self.pixelRatio,

View File

@@ -3,11 +3,15 @@
<view class="cu-avatar round lg" :style="'background-image: url('+mainURL+'default-avator.png)'">
<!-- {{staff.cUserName.substring(-1)}} -->
</view>
<!-- <view class="cu-avatar round lg" >
<!-- <view class="cu-avatar round lg" >
{{staff.cUserName.slice(0,1)}}
</view> -->
<view class="content">
<view class="text-black">{{staff.cUserName}}</view>
<view class="text-black">{{staff.cUserName}}
<text v-show="loginUser.id===staff.cUserId" class="padding-left-sm text-orange text-sm">
(当前登录账号)
</text>
</view>
<view class="text-gray flex" @tap="callStaff(staff.phone)">
<view class="text-cut text-df">
<text class="cuIcon-phone oil-main-color margin-right-xs"></text>
@@ -34,7 +38,8 @@
},
data() {
return {
mainURL: this.global.mainURL
mainURL: this.global.mainURL,
loginUser: uni.getStorageSync('loginUser'),
};
},
methods: {