Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_jishi
This commit is contained in:
commit
191e61109f
|
|
@ -6,6 +6,7 @@ const PROT = "http://"
|
|||
// const ROOTHOST = "47.75.182.93:8090";
|
||||
// const ROOTHOST = "1.92.152.160";
|
||||
const ROOTHOST = "1.92.152.160";
|
||||
const ROOTHOST1 = "sausers.blxinchuang.com";
|
||||
// const ROOTHOST = "192.168.2.15:8187";
|
||||
// const ROOTHOST = "120.46.52.165";
|
||||
// const ROOTHOST = "192.168.0.115:8187";
|
||||
|
|
@ -33,7 +34,7 @@ const checkdomain = (ROOTHOST) => {
|
|||
const ROOTPATH = (checkdomain(ROOTHOST) ? "https://" : "http://") + ROOTHOST + "/sqx_fast";
|
||||
const ROOTPATH1 = (checkdomain(ROOTHOST) ? "https://" : "http://") + ROOTHOST + "/sqx_fast";
|
||||
const ROOTPATH2 = "wss://" + ROOTHOST + "/wss/websocket/"; //联系客服
|
||||
const ROOTPATH3 = "wss://" + ROOTHOST + "/wss/chatSocket/"; //聊天
|
||||
const ROOTPATH3 = "wss://" + ROOTHOST1 + "/wss/chatSocket/"; //聊天
|
||||
const WEBSOCKETADDRESS = "ws://" + ROOTHOST + "/sqx_fast/ws/"; //退出软件后台后将用户状态置为离线
|
||||
const UPLOAD_PATH = ROOTPATH1 + '/alioss/upload';
|
||||
|
||||
|
|
@ -60,11 +61,12 @@ const WS_UPLOAD_RECORDER_PATH = WS_BASE_PATH + 'monitorWebSocket/';
|
|||
module.exports = {
|
||||
PROT,
|
||||
ROOTHOST,
|
||||
ROOTHOST1,
|
||||
APIHOST: ROOTPATH,
|
||||
APIHOST1: ROOTPATH1,
|
||||
WSHOST: ROOTPATH2,
|
||||
UPLOAD_PATH,
|
||||
// WSHOST1: ROOTPATH3
|
||||
WSHOST1: ROOTPATH3,
|
||||
TX_MAP_KEY,
|
||||
WS_BASE_PATH,
|
||||
WS_UPLOAD_MAP_PATH,
|
||||
|
|
|
|||
|
|
@ -9,10 +9,10 @@
|
|||
</view>
|
||||
</view>
|
||||
<view scroll-y class="calendar_time">
|
||||
<view class="time_x" :class="host_index == item.timeStamp ? 'time_x_sty' : '' "
|
||||
<view class="time_x" :class="{ time_x_sty: host_index.includes(item.timeStamp) }"
|
||||
v-for="(item, index) in hostArr[day_index]" :key="index"
|
||||
@click.stop="(nowTimes < item.timeStamp) || (msformatArr.indexOf(item.hours) == -1) ? hosts(item) : ''"
|
||||
:style="[{'color':((nowTimes > item.timeStamp) || (msformatArr.indexOf(item.hours) !== -1 ) ? '#999999' : '')},{'fontSize':((nowTimes < item.timeStamp) && (msformatArr.indexOf(item.hours) !== -1 )) || (msformatArr.indexOf(item.hours) !== -1 ) ? '32rpx' : '30rpx'},
|
||||
:style="[{'color':((nowTimes > item.timeStamp) || (msformatArr.indexOf(item.hours) !== -1 ) ? '#999999' : '')},{'background':((nowTimes > item.timeStamp) || (msformatArr.indexOf(item.hours) !== -1 ) ? '#fff' : '')},{'fontSize':((nowTimes < item.timeStamp) && (msformatArr.indexOf(item.hours) !== -1 )) || (msformatArr.indexOf(item.hours) !== -1 ) ? '32rpx' : '30rpx'},
|
||||
{'letter-spacing':((nowTimes < item.timeStamp) && (msformatArr.indexOf(item.hours) !== -1 )) || (msformatArr.indexOf(item.hours) !== -1 ) ? '4rpx' : '0rpx'}]">
|
||||
{{ ((nowTimes < item.timeStamp) && (msformatArr.indexOf(item.hours) !== -1)) || (msformatArr.indexOf(item.hours) !== -1) ? '约满' : item.hours }}
|
||||
</view>
|
||||
|
|
@ -46,7 +46,7 @@
|
|||
dayArr: [],
|
||||
hostArr: [],
|
||||
day_index: 0,
|
||||
host_index: '',
|
||||
host_index: [],
|
||||
host_All: [],
|
||||
nowTimes: '',
|
||||
isShow: true,
|
||||
|
|
@ -161,21 +161,28 @@
|
|||
},
|
||||
// 点击时间
|
||||
hosts(e) {
|
||||
if ( (this.nowTimes < e.timeStamp) && (this.msformatArr.indexOf(e.hours) == -1)) {
|
||||
this.host_All = e
|
||||
this.host_index = e.timeStamp
|
||||
var aa=[];
|
||||
if ( (this.nowTimes < e.timeStamp) && ( this.msformatArr.indexOf(e.hours)=== -1)) {
|
||||
// this.host_All.push(e);
|
||||
// this.host_index.push(e.timeStamp);
|
||||
var index=this.host_index.indexOf(e.timeStamp)
|
||||
if (index === -1) {
|
||||
this.host_All.push(e);
|
||||
this.host_index.push(e.timeStamp);
|
||||
} else {
|
||||
this.host_All.splice(index, 1);
|
||||
this.host_index.splice(index, 1);
|
||||
}
|
||||
}
|
||||
|
||||
},
|
||||
// 点击立即预约
|
||||
sub() {
|
||||
|
||||
console.log(this.host_All);
|
||||
delete this.host_All.timeStamp;
|
||||
|
||||
|
||||
|
||||
if (this.host_index == '') {
|
||||
if (this.host_index == []) {
|
||||
this.$queue.showToast('请选择时间')
|
||||
} else {
|
||||
let day = this.dayArr[this.day_index]
|
||||
|
|
@ -183,10 +190,11 @@
|
|||
let comTime = {
|
||||
days: day.days,
|
||||
weeks: day.weeks,
|
||||
hours: this.host_All.hours,
|
||||
timeStamp: this.host_All.timeStamp,
|
||||
hours: this.host_All,
|
||||
timeStamp: this.host_All,
|
||||
time: time
|
||||
}
|
||||
console.log("点击立即预约",comTime);
|
||||
this.$emit('getTime', comTime);
|
||||
}
|
||||
},
|
||||
|
|
@ -281,11 +289,12 @@
|
|||
margin: 10rpx 0;
|
||||
font-size: 30rpx;
|
||||
color: #333333;
|
||||
// background-color: #E8FAE1;
|
||||
}
|
||||
|
||||
.time_x_sty {
|
||||
background-color: #E8FAE1;
|
||||
color: #096f4b !important;
|
||||
color: #096f4b;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,8 @@
|
|||
"Maps" : {},
|
||||
"Camera" : {},
|
||||
"Record" : {},
|
||||
"Push" : {}
|
||||
"Push" : {},
|
||||
"VideoPlayer" : {}
|
||||
},
|
||||
/* 应用发布信息 */
|
||||
"distribute" : {
|
||||
|
|
@ -140,7 +141,17 @@
|
|||
}
|
||||
},
|
||||
"splashscreen" : {
|
||||
"useOriginalMsgbox" : false
|
||||
"useOriginalMsgbox" : false,
|
||||
"androidStyle" : "default",
|
||||
"android" : {
|
||||
"hdpi" : "static/480-762.png",
|
||||
"xhdpi" : "static/720-1242.png",
|
||||
"xxhdpi" : "static/1080-1882.png"
|
||||
},
|
||||
"iosStyle" : "common",
|
||||
"ios" : {
|
||||
"storyboard" : "C:/Users/pc/Desktop/CustomStoryboard.zip"
|
||||
}
|
||||
}
|
||||
},
|
||||
"nativePlugins" : {
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
#IntegralStatisticsTop {
|
||||
display: flex;
|
||||
height: 220px;
|
||||
height:200px;
|
||||
border-radius: 10px;
|
||||
padding-top: 14px;
|
||||
flex-wrap: wrap;
|
||||
|
|
@ -17,7 +17,6 @@
|
|||
|
||||
#IntegralStatisticsBottom {
|
||||
position: relative;
|
||||
top: 50px;
|
||||
margin: auto;
|
||||
}
|
||||
|
||||
|
|
@ -38,7 +37,7 @@
|
|||
|
||||
.innerTopRight {
|
||||
height: fit-content;
|
||||
font-size: 30rpx;
|
||||
font-size: 24rpx;
|
||||
display: flex;
|
||||
justify-content: right;
|
||||
color: #FFFFFF;
|
||||
|
|
@ -55,6 +54,7 @@
|
|||
height: fit-content;
|
||||
display: flex;
|
||||
justify-content: flex-start;
|
||||
margin-bottom: 10rpx;
|
||||
}
|
||||
|
||||
.innerBottomOfTop {
|
||||
|
|
@ -64,11 +64,12 @@
|
|||
}
|
||||
|
||||
.innerBottom {
|
||||
height: 200px;
|
||||
margin: 0rpx 24rpx;
|
||||
background-color: #FFFFFF;
|
||||
width: 100%;
|
||||
height: 210px;
|
||||
margin: 12rpx 24rpx;
|
||||
background:#fffbf8 url('../../static/purse2.png');
|
||||
background-size: 100% 120%;
|
||||
border-radius: 10px;
|
||||
padding: 10rpx 16rpx;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -78,14 +79,12 @@
|
|||
grid-template-rows: auto;
|
||||
grid-template-columns: 95px 95px;
|
||||
grid-gap: 0px;
|
||||
margin-left: 50rpx;
|
||||
}
|
||||
|
||||
.IntegralClassify {
|
||||
height: 80px;
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
|
|
@ -94,7 +93,8 @@
|
|||
}
|
||||
|
||||
.IntegralClassifyInnerBottom {
|
||||
margin-top: 10px;
|
||||
font-size: 24rpx;
|
||||
margin-top: 4rpx;
|
||||
}
|
||||
|
||||
.IntegralImport {
|
||||
|
|
@ -104,7 +104,6 @@
|
|||
flex-direction: column;
|
||||
justify-content: space-around;
|
||||
align-items: center;
|
||||
margin-top: 10px;
|
||||
font-size: 16px;
|
||||
position: relative;
|
||||
top: calc((100% - 100px) /2);
|
||||
|
|
@ -127,9 +126,8 @@
|
|||
flex-wrap: wrap;
|
||||
flex-direction: column;
|
||||
overflow: auto;
|
||||
background-color: #FFFFFF;
|
||||
border-radius: 10px;
|
||||
margin: 0rpx 30rpx;
|
||||
margin: 0rpx 24rpx;
|
||||
}
|
||||
|
||||
.optionsDetailImport {
|
||||
|
|
@ -158,10 +156,12 @@
|
|||
display: none;
|
||||
}
|
||||
.innerTimer{
|
||||
font-size: 13px;
|
||||
margin-top: 5px;
|
||||
color: #999;
|
||||
font-size: 14px;
|
||||
color: #ffffff;
|
||||
margin-right: 10px;
|
||||
padding: 10rpx 20rpx;
|
||||
background: linear-gradient(90deg, #ffdf96, #feca76);
|
||||
border-radius: 20rpx 0 30rpx 0;
|
||||
}
|
||||
.activeTab {
|
||||
color: #0aa86a;
|
||||
|
|
@ -245,6 +245,8 @@
|
|||
}
|
||||
|
||||
.middleTop {
|
||||
margin: 0 auto;
|
||||
width: 90%;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: center;
|
||||
|
|
@ -269,4 +271,35 @@
|
|||
padding: 8rpx 20rpx;
|
||||
border-radius: 15rpx;
|
||||
background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);
|
||||
}
|
||||
}
|
||||
.middele-icon-back{
|
||||
margin-top:10rpx;
|
||||
}
|
||||
.middele-img{
|
||||
width: 80rpx;
|
||||
height: 80rpx;
|
||||
padding: 40rpx;
|
||||
background:#ffefca url('../../static/purse.png')19rpx 19rpx;
|
||||
background-size: 60% 60%;
|
||||
border-radius: 30rpx;
|
||||
background-repeat: no-repeat;
|
||||
}
|
||||
.middele-title{
|
||||
margin-left: 15rpx;
|
||||
}
|
||||
.IntegralClassifyta{
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
.middele-color{
|
||||
color: #ff873a;
|
||||
font-size: 40rpx;
|
||||
font-weight: bold;
|
||||
}
|
||||
.middele-wold{
|
||||
font-size: 40rpx;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -21,21 +21,21 @@
|
|||
</view>
|
||||
</view>
|
||||
<view class="middleTop">
|
||||
|
||||
<view class="IntegralImport">
|
||||
<view class="IntegralClassify">
|
||||
<view class="" style="margin-top: -12px;font-weight: 700; color: #fb672b;">
|
||||
{{this.homePageDataNum.totalRevenue ? this.homePageDataNum.totalRevenue : 0 }}
|
||||
</view>
|
||||
<view class="IntegralClassifyInnerBottom">
|
||||
本期收益(元)
|
||||
<view class="IntegralClassifyta">
|
||||
<view class="middele-icon-back"><image class="middele-img"src="../../static/purse.png" mode=""></image></view>
|
||||
<view class="middele-title">
|
||||
<view class="middele-color">{{this.homePageDataNum.totalRevenue ? this.homePageDataNum.totalRevenue : 0 }}</view>
|
||||
<view class="IntegralClassifyInnerBottom" style="color: #FF6000;">
|
||||
本期收益(元)
|
||||
</view>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
</view>
|
||||
<view class="line"></view>
|
||||
<view class="innerBottomOfBottom">
|
||||
<view class="IntegralClassify">
|
||||
<view class="">
|
||||
<view class="middele-wold">
|
||||
{{this.homePageDataNum.projectBenefits ? this.homePageDataNum.projectBenefits : 0 }}
|
||||
</view>
|
||||
<view class="IntegralClassifyInnerBottom">
|
||||
|
|
@ -43,7 +43,7 @@
|
|||
</view>
|
||||
</view>
|
||||
<view class="IntegralClassify">
|
||||
<view class="">
|
||||
<view class="middele-wold">
|
||||
{{this.homePageDataNum.vehicleFareAmount ? this.homePageDataNum.vehicleFareAmount : 0 }}
|
||||
</view>
|
||||
<view class="IntegralClassifyInnerBottom">
|
||||
|
|
@ -119,7 +119,7 @@
|
|||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<uniLoadMore color="#007AFF" :iconType="iconType" :status="loadingStatus" :marginBottom="20"
|
||||
<uniLoadMore color="#999" :iconType="iconType" :status="loadingStatus" :marginBottom="20"
|
||||
:marginTop="20" v-if="isShowLoadMore" />
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -488,7 +488,7 @@
|
|||
margin-bottom: 5px;
|
||||
}
|
||||
.mian-foot-list{
|
||||
width: 73%;
|
||||
width: 72%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
|
@ -508,7 +508,6 @@
|
|||
width: 100%;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
}
|
||||
.shouyi-text{
|
||||
|
|
@ -534,8 +533,7 @@
|
|||
font-size: 25rpx;
|
||||
text-align: center;
|
||||
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
|
||||
border-top-left-radius: 21rpx;
|
||||
border-bottom-right-radius: 21rpx;
|
||||
border-radius: 8rpx 20rpx 20rpx 8rpx ;
|
||||
}
|
||||
.mian-head{
|
||||
width: 100%;
|
||||
|
|
@ -548,14 +546,13 @@
|
|||
margin-bottom: 10px;
|
||||
}
|
||||
.mian-view{
|
||||
width: 95%;
|
||||
width: 100%;
|
||||
background-color: #fff;
|
||||
padding: 12px;
|
||||
padding:22rpx 26rpx;
|
||||
border-radius: 24rpx;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
margin: 26rpx auto;
|
||||
|
||||
margin: 12rpx auto;
|
||||
}
|
||||
</style>
|
||||
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@
|
|||
|
||||
<view class="storedIntegralBottom">备注: {{item.title}}</view>
|
||||
</view>
|
||||
<uniLoadMore color="#007AFF" :iconType="iconType" :status="loadingStatus" :marginBottom="20"
|
||||
<uniLoadMore color="#0cb598" :iconType="iconType" :status="loadingStatus" :marginBottom="20"
|
||||
:marginTop="20" v-if="isShowLoadMore" />
|
||||
</view>
|
||||
</view>
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -59,9 +59,9 @@
|
|||
{
|
||||
"path": "pages/video/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "视频",
|
||||
"navigationBarTitleText": "视频圈",
|
||||
"app-plus": {
|
||||
"titleNView": false
|
||||
"titleNView": true
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -2,21 +2,24 @@
|
|||
<view class="content clock-padding">
|
||||
<view class="header">
|
||||
<view class="header-top">
|
||||
<view class="flex">
|
||||
<image style="width:100rpx; height:100rpx; margin-right: 10rpx;" src="../../static/purse5.png"></image>
|
||||
<view class="header-bottom">
|
||||
<view class="header-text">{{titleData}}</view>
|
||||
<view class="header-bottom-money">{{earnings}}</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="header-top-left">
|
||||
<view>
|
||||
<span class="header-text"></image>当前周期</span>
|
||||
</view>
|
||||
<view>
|
||||
<span class="header-text1">{{startTime}}</span><span style="color: #fff; margin-right: 5rpx;">~</span><span class="header-text1">{{endTime}}</span>
|
||||
<span class="header-text1">{{startTime}}</span><span style="color: #029d88; margin-right: 5rpx;">~</span><span class="header-text1">{{endTime}}</span>
|
||||
</view>
|
||||
</view>
|
||||
<view class="header-top-btn" @click="wangqi">往期{{orderType=='2'?'加钟率':'充值率'}}</view>
|
||||
</view>
|
||||
<view class="header-bottom" style="margin-bottom: 40rpx;">
|
||||
<view class="header-bottom-money">
|
||||
{{earnings}}
|
||||
</view>
|
||||
<view class="header-text">{{titleData}}</view>
|
||||
<view class="flex justify-end">
|
||||
<view class="header-top-btn" @click="wangqi">往期{{orderType=='2'?'加钟率':'充值率'}}</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="tapNav-list">
|
||||
|
|
@ -298,8 +301,8 @@
|
|||
margin-bottom: 10px;
|
||||
}
|
||||
.tapNav-list{
|
||||
width: 94%;
|
||||
margin: 8rpx auto;
|
||||
background: #fff;
|
||||
width:100%;
|
||||
display: flex;
|
||||
flex-direction:row;
|
||||
align-items: center;
|
||||
|
|
@ -486,70 +489,65 @@
|
|||
flex-direction: column;
|
||||
}
|
||||
.header-bottom-money{
|
||||
font-weight: bold;
|
||||
font-size: 49rpx;
|
||||
color: #FFFFFF;
|
||||
font-weight: bold;
|
||||
font-size: 49rpx;
|
||||
color: #00b198;
|
||||
margin-bottom: 3px;
|
||||
}
|
||||
.header-bottom{
|
||||
align-items: end;
|
||||
}
|
||||
.header-top-btn{
|
||||
width: 174rpx;
|
||||
height: 49rpx;
|
||||
line-height: 49rpx;
|
||||
line-height: 46rpx;
|
||||
text-align: center;
|
||||
font-size: 26rpx;
|
||||
color: #333333;
|
||||
background: #FFFFFF;
|
||||
background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);
|
||||
border-radius: 24rpx;
|
||||
color: #fff;
|
||||
}
|
||||
.header-text{
|
||||
font-weight: 400;
|
||||
font-size: 26rpx;
|
||||
color: #FFFFFF;
|
||||
color: #00b198;
|
||||
margin-right: 8rpx;
|
||||
}
|
||||
.header-text1{
|
||||
font-weight: 400;
|
||||
font-size: 24rpx;
|
||||
color: #019c88;
|
||||
color: #00b198;
|
||||
margin-right: 8rpx;
|
||||
border-radius: 30rpx;
|
||||
background: #fff;
|
||||
padding: 1rpx 10rpx;
|
||||
}
|
||||
.header-top-left image{
|
||||
width: 24.31rpx;
|
||||
height:22.92rpx;
|
||||
margin-right: 2px;
|
||||
margin-top: 3px;
|
||||
}
|
||||
.header-top-left{
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-between;
|
||||
margin-top:10rpx;
|
||||
text-align: right;
|
||||
}
|
||||
.header-top{
|
||||
width: 100%;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-between;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
.header{
|
||||
width: 100%;
|
||||
height: 300rpx;
|
||||
height: 280rpx;
|
||||
padding: 15px;
|
||||
background:#f5f5f5 url('../../static/index/fun_banner4.png');
|
||||
background:#f7f7f7 url('../../static/index/technician15.png');
|
||||
background-repeat: no-repeat;
|
||||
background-size: 100% 100%;
|
||||
background-size: 100%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-around;
|
||||
}
|
||||
/*border-radius: 24rpx;*/
|
||||
}
|
||||
.content{
|
||||
width: 100%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
height: 100vh;
|
||||
/*height: 100vh;*/
|
||||
background-color: #f7f7f7;
|
||||
overflow: scroll;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,21 +2,25 @@
|
|||
<view class="content">
|
||||
<view class="header">
|
||||
<view class="header-top">
|
||||
<view class="header-bottom" style="margin-bottom: 40rpx;">
|
||||
<view class="header-text" style=" margin-top: -5px;">当前收益</view>
|
||||
<view class="header-bottom-money">{{shouyiMoeny}}</view>
|
||||
<view class="header-bottom" >
|
||||
<image style="width:100rpx; height:100rpx; margin-right: 10rpx;" src="../../static/purse4.png"></image>
|
||||
<view>
|
||||
<view class="header-text">当前收益</view>
|
||||
<view class="header-bottom-money">{{shouyiMoeny}}</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="header-top-left">
|
||||
<view style="margin-bottom: 10rpx;">
|
||||
<view>
|
||||
<span class="header-text"></image>当前周期</span>
|
||||
</view>
|
||||
<view>
|
||||
<span class="header-text1">{{startTime}}</span><span style="color: #fff; margin-right: 5rpx;">~</span><span class="header-text1">{{endTime}}</span>
|
||||
<span class="header-text1">{{startTime}}</span><span style="color: #029d88; margin-right: 5rpx;">~</span><span class="header-text1">{{endTime}}</span>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
<view class="header-top-btn" @click="wangqi" style="font-size: 14px; margin-top: -8px;">往期收益</view>
|
||||
<view class="flex justify-end">
|
||||
<view class="header-top-btn" @click="wangqi" style="font-size: 14px; margin-top: -8px;">往期收益</view>
|
||||
</view>
|
||||
<!--<view class="header-bottom" style="margin-bottom: 40rpx;">
|
||||
<view class="header-text" style=" margin-top: -5px;">当前收益</view>
|
||||
<view class="header-bottom-money">{{shouyiMoeny}}</view>
|
||||
|
|
@ -318,37 +322,42 @@
|
|||
flex-direction: column;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.header-bottom-money{
|
||||
font-weight: bold;
|
||||
font-size: 49rpx;
|
||||
color: #FFFFFF;
|
||||
color: #00b198;
|
||||
margin-bottom: 3px;
|
||||
}
|
||||
.header-bottom{
|
||||
display: flex;
|
||||
align-items: end;
|
||||
}
|
||||
.header-top-btn{
|
||||
width: 174rpx;
|
||||
height: 49rpx;
|
||||
line-height: 49rpx;
|
||||
line-height: 46rpx;
|
||||
text-align: center;
|
||||
font-size: 26rpx;
|
||||
color: #333333;
|
||||
background: #FFFFFF;
|
||||
background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);
|
||||
border-radius: 24rpx;
|
||||
color: #fff;
|
||||
}
|
||||
.header-text{
|
||||
font-weight: 400;
|
||||
font-size: 26rpx;
|
||||
color: #FFFFFF;
|
||||
color: #00b198;
|
||||
margin-right: 8rpx;
|
||||
}
|
||||
.header-text1{
|
||||
font-weight: 400;
|
||||
font-size: 24rpx;
|
||||
color: #fff;
|
||||
color: #00b198;
|
||||
margin-right: 8rpx;
|
||||
border-radius: 30rpx;
|
||||
}
|
||||
.header-top-left{
|
||||
margin-top: -10rpx;
|
||||
margin-top:20rpx;
|
||||
text-align: right;
|
||||
}
|
||||
.header-top{
|
||||
|
|
@ -358,16 +367,16 @@
|
|||
justify-content: space-between;
|
||||
}
|
||||
.header{
|
||||
width: 100%;
|
||||
height: 280rpx;
|
||||
padding: 15px;
|
||||
background:#f7f7f7 url('../../static/index/technician15.png');
|
||||
background-repeat: no-repeat;
|
||||
background-size: 100% ;
|
||||
background-size: 100%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-around;
|
||||
margin:0 26rpx;
|
||||
border-radius: 24rpx;
|
||||
/*border-radius: 24rpx;*/
|
||||
}
|
||||
.content{
|
||||
width: 100%;
|
||||
|
|
|
|||
|
|
@ -2,19 +2,28 @@
|
|||
<view class="content">
|
||||
<view class="header">
|
||||
<view class="header-top">
|
||||
<view class="header-top-left">
|
||||
<view class="header-bottom">
|
||||
<image style="width:100rpx; height:100rpx; margin-right: 10rpx;" src="../../static/purse3.png"></image>
|
||||
<view>
|
||||
<span class="header-text"></image>当前周期</span>
|
||||
</view>
|
||||
<view>
|
||||
<span class="header-text1">{{startTime}}</span><span style="color: #fff; margin-right: 5rpx;">~</span><span class="header-text1">{{endTime}}</span>
|
||||
<view class="header-text">当前积分</view>
|
||||
<view class="header-bottom-money">{{sumJf}}<text style="font-size: 23rpx;font-weight: 400;">分</text></view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="header-top-btn" @click="wangqi">往期积分</view>
|
||||
<view class="header-top-left">
|
||||
<view class="header-text" style="text-align: right;">
|
||||
当前周期
|
||||
</view>
|
||||
<view class="header-text1">
|
||||
<span>{{startTime}}</span>
|
||||
<span style="color: #029d88; margin-right: 5rpx;">~</span>
|
||||
<span>{{endTime}}</span>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
<view class="header-bottom" style="margin-bottom: 56rpx;">
|
||||
<view class="header-bottom-money">{{sumJf}}<text style="font-size: 23rpx;font-weight: 400;">分</text> </view>
|
||||
<view class="header-text">当前积分</view>
|
||||
|
||||
<view class="flex justify-end">
|
||||
<view class="header-top-btn" @click="wangqi">往期积分</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="tapNav-list">
|
||||
|
|
@ -323,15 +332,13 @@
|
|||
margin-bottom: 10px;
|
||||
}
|
||||
.tapNav-list{
|
||||
width: 96%;
|
||||
width:100%;
|
||||
margin: 0 auto;
|
||||
display: flex;
|
||||
flex-direction:row;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
background-color: #fff;
|
||||
border-radius: 15rpx;
|
||||
margin-top: -30px;
|
||||
padding: 10rpx 0;
|
||||
}
|
||||
.tapNav-view{
|
||||
|
|
@ -609,35 +616,38 @@
|
|||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
.header-bottom{
|
||||
display: flex;
|
||||
align-items: end;
|
||||
}
|
||||
.header-bottom-money{
|
||||
font-weight: bold;
|
||||
font-size: 49rpx;
|
||||
color: #FFFFFF;
|
||||
color: #00b198;
|
||||
margin-bottom: 3px;
|
||||
}
|
||||
.header-top-btn{
|
||||
width: 174rpx;
|
||||
height: 49rpx;
|
||||
line-height: 49rpx;
|
||||
line-height: 46rpx;
|
||||
text-align: center;
|
||||
font-size: 26rpx;
|
||||
color: #333333;
|
||||
background: #FFFFFF;
|
||||
background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);
|
||||
border-radius: 24rpx;
|
||||
color: #fff;
|
||||
}
|
||||
.header-text{
|
||||
font-weight: 400;
|
||||
font-size: 26rpx;
|
||||
color: #FFFFFF;
|
||||
color: #00b198;
|
||||
margin-right: 8rpx;
|
||||
}
|
||||
.header-text1{
|
||||
font-weight: 400;
|
||||
font-size: 24rpx;
|
||||
color: #019c88;
|
||||
color: #00b198;
|
||||
margin-right: 8rpx;
|
||||
border-radius: 30rpx;
|
||||
background: #fff;
|
||||
padding: 1rpx 10rpx;
|
||||
}
|
||||
.header-top-left image{
|
||||
width: 24.31rpx;
|
||||
|
|
@ -645,10 +655,9 @@
|
|||
margin-right: 2px;
|
||||
margin-top: 3px;
|
||||
}
|
||||
.header-top-left{
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
..header-top-left{
|
||||
margin-top:40rpx;
|
||||
text-align: right;
|
||||
}
|
||||
.header-top{
|
||||
width: 100%;
|
||||
|
|
@ -659,14 +668,15 @@
|
|||
}
|
||||
.header{
|
||||
width: 100%;
|
||||
height: 300rpx;
|
||||
padding: 5px 20px;
|
||||
background:#f7f7f7 url('../../static/index/fun_banner4.png');
|
||||
height: 280rpx;
|
||||
padding: 15px;
|
||||
background:#f7f7f7 url('../../static/index/technician15.png');
|
||||
background-repeat: no-repeat;
|
||||
background-size: 100% 100%;
|
||||
background-size: 100%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-around;
|
||||
/*border-radius: 24rpx;*/
|
||||
}
|
||||
.content{
|
||||
width: 100%;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<template>
|
||||
<view class="content">
|
||||
<view class="header">
|
||||
<!--<view class="header">
|
||||
<view class="header-top">
|
||||
<view class="header-top-left">
|
||||
<view>
|
||||
|
|
@ -17,8 +17,42 @@
|
|||
<view class="header-text" style="font-size: 14px; margin-top: -5px;">当前业绩</view>
|
||||
</view>
|
||||
<!-- 性别选择 -->
|
||||
<!--<u-action-sheet :list="wqlistData" v-model="wqsyshow" @click="wqlistCallback"></u-action-sheet>
|
||||
</view>-->
|
||||
|
||||
<view class="header">
|
||||
<view class="header-top">
|
||||
<view class="header-bottom" >
|
||||
<image style="width:100rpx; height:100rpx; margin-right: 10rpx;" src="../../static/purse3.png"></image>
|
||||
<view>
|
||||
<view class="header-text" style=" margin-top: -5px;">当前业绩</view>
|
||||
<view class="header-bottom-money">{{shouyiMoeny}}</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="header-top-left">
|
||||
<view style="margin-bottom: 10rpx;">
|
||||
<span class="header-text"></image>当前周期</span>
|
||||
</view>
|
||||
<view>
|
||||
<span class="header-text1">{{startTime}}</span>
|
||||
<span style="color: #029d88; margin-right: 5rpx;">~</span>
|
||||
<span class="header-text1">{{endTime}}</span>
|
||||
</view>
|
||||
</view>
|
||||
<!-- 性别选择 -->
|
||||
<u-action-sheet :list="wqlistData" v-model="wqsyshow" @click="wqlistCallback"></u-action-sheet>
|
||||
</view>
|
||||
<view class="flex justify-end">
|
||||
<view class="header-top-btn" @click="wangqi" style="font-size: 14px; margin-top: -8px;">往期业绩</view>
|
||||
</view>
|
||||
<!--<view class="header-bottom" style="margin-bottom: 40rpx;">
|
||||
<view class="header-text" style=" margin-top: -5px;">当前收益</view>
|
||||
<view class="header-bottom-money">{{shouyiMoeny}}</view>
|
||||
</view>
|
||||
性别选择 -->
|
||||
<u-action-sheet :list="wqlistData" v-model="wqsyshow" @click="wqlistCallback"></u-action-sheet>
|
||||
</view>
|
||||
|
||||
<t-refresh class="mian" ref="refresh" v-if="listData.length>0" @refresh="refresh" @loadMore="loadMore" :loadingType="loadingType" :tPadding="0" >
|
||||
<template slot="content" >
|
||||
<view class="mian-view" v-for="(item,index) in listData" :key="index" @click="goOder(item)">
|
||||
|
|
@ -318,36 +352,38 @@
|
|||
flex-direction: column;
|
||||
align-items: center;
|
||||
}
|
||||
.header-bottom{
|
||||
display: flex;
|
||||
align-items: end;
|
||||
}
|
||||
.header-bottom-money{
|
||||
font-weight: bold;
|
||||
font-size: 49rpx;
|
||||
color: #FFFFFF;
|
||||
color: #00b198;
|
||||
margin-bottom: 3px;
|
||||
}
|
||||
.header-top-btn{
|
||||
width: 174rpx;
|
||||
height: 49rpx;
|
||||
line-height: 49rpx;
|
||||
line-height: 46rpx;
|
||||
text-align: center;
|
||||
font-size: 26rpx;
|
||||
color: #333333;
|
||||
background: #FFFFFF;
|
||||
background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);
|
||||
border-radius: 24rpx;
|
||||
color: #fff;
|
||||
}
|
||||
.header-text{
|
||||
font-weight: 400;
|
||||
font-size: 26rpx;
|
||||
color: #FFFFFF;
|
||||
color: #00b198;
|
||||
margin-right: 8rpx;
|
||||
}
|
||||
.header-text1{
|
||||
font-weight: 400;
|
||||
font-size: 24rpx;
|
||||
color: #019c88;
|
||||
color: #00b198;
|
||||
margin-right: 8rpx;
|
||||
border-radius: 30rpx;
|
||||
background: #fff;
|
||||
padding: 1rpx 10rpx;
|
||||
}
|
||||
.header-top-left image{
|
||||
width: 24.31rpx;
|
||||
|
|
@ -356,10 +392,8 @@
|
|||
margin-top: 3px;
|
||||
}
|
||||
.header-top-left{
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-between;
|
||||
margin-top: -10rpx;
|
||||
margin-top:20rpx;
|
||||
text-align: right;
|
||||
}
|
||||
.header-top{
|
||||
width: 100%;
|
||||
|
|
@ -369,14 +403,15 @@
|
|||
}
|
||||
.header{
|
||||
width: 100%;
|
||||
height: 300rpx;
|
||||
height: 280rpx;
|
||||
padding: 15px;
|
||||
background:#f5f5f5 url('../../static/index/fun_banner4.png');
|
||||
background:#f7f7f7 url('../../static/index/technician15.png');
|
||||
background-repeat: no-repeat;
|
||||
background-size: 100% 100%;
|
||||
background-size: 100%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-around;
|
||||
/*border-radius: 24rpx;*/
|
||||
}
|
||||
|
||||
.od-number{
|
||||
|
|
|
|||
|
|
@ -2,20 +2,24 @@
|
|||
<!-- 技师实际收益公式：实付金额=（项目金额*会员比例-优惠卷）*分成比例*余额支付比例+车费 -->
|
||||
<view style="padding-bottom: 17px;">
|
||||
<view class="jishi-index">
|
||||
<view class=" u-flex padding-lr justify-between" style="padding-top: 30px;">
|
||||
<view class="u-m-r-10 back-img"
|
||||
<view class="u-flex justify-between avatar-section">
|
||||
<!--<view class="back-img"
|
||||
:style="{'background-image':
|
||||
technicianType=='3'?'url(../../static/grade1.png)':
|
||||
technicianType=='3'?'url(../../static/grade1.gif)':
|
||||
technicianType=='4'?'url(../../static/grade2.png)':
|
||||
technicianType=='5'?'url(../../static/grade3.png)':''
|
||||
}">
|
||||
<image :src="avatar" class="head-port"
|
||||
@click="goNav('/pages/my/userinfo')"></image>
|
||||
</view>-->
|
||||
<view class="back-img">
|
||||
<image :src="avatar" class="head-port" @click="goNav('/pages/my/userinfo')"></image>
|
||||
<image class="popop-kuang" v-if="technicianType" :src="technicianType=='3'?'../../static/grade1.gif':technicianType=='4'?'../../static/grade2.gif':'../../static/grade3.gif'"></image>
|
||||
</view>
|
||||
<view style="position: relative;" class="u-flex-1 margin-left-sm text-white" v-if="isLogin && userName">
|
||||
<view style="position: relative;" class="u-flex-1 margin-left-sm" v-if="isLogin && userName">
|
||||
<view class="flex align-center justify-between">
|
||||
<view class="">
|
||||
<view class="u-font-18 text-white" @click="goNav('/pages/my/user')">
|
||||
<view class="u-font-18 avatar-section-text" @click="goNav('/pages/my/user')">
|
||||
欢迎，{{ userName }}
|
||||
</view>
|
||||
<view class="labe margin-top-xs" @tap="stateSave" v-if="XCXIsSelect != '否'">
|
||||
|
|
@ -85,69 +89,70 @@
|
|||
<view>访客人数</view>
|
||||
</view>
|
||||
</view> -->
|
||||
</view>
|
||||
<view style="margin-top: -156px;padding: 30rpx;">
|
||||
<view class="dengjibox">
|
||||
<view class="djtit">当前等级</view>
|
||||
<view class="djimg" @click="level">{{ currentGrade ? currentGrade : "A0" }}</view>
|
||||
<view class="" style="margin-top: 20px;">
|
||||
<!-- <text style="font-size: 30px;font-weight: bold;">当前业绩：{{ currentWholeIncome ? currentWholeIncome : 0 }}</text> -->
|
||||
<!-- <text style="font-size: 16px;">/{{ totalIncomeRange ? totalIncomeRange : 4000 }}</text> -->
|
||||
</view>
|
||||
|
||||
<!-- <u-line-progress active-color="#46a396" :show-percent="false" :height="38" inactive-color="#098f7a"
|
||||
:percent="lineProgressData" :striped-active="true"></u-line-progress>
|
||||
|
||||
<view v-if="!maxStatus && longUpgradeDescriptionSet.differenceOutstandingAchievement" class="dengji-text">
|
||||
还差{{ longUpgradeDescriptionSet.differenceOutstandingAchievement }}业绩;{{ longUpgradeDescriptionSet.differenceIntegral }}积分;可以升级{{ longUpgradeDescriptionSet.differenceGrade }}<u-icon
|
||||
style="padding-left: 2px;" size="30" color="#ffffff" name="question-circle-fill"
|
||||
@click="clickIcon" index="0"></u-icon>
|
||||
</view>
|
||||
<view v-if="maxStatus" class=" dengji-text">
|
||||
您已达到最高等级
|
||||
</view>
|
||||
<view>
|
||||
<u-popup v-model="showIconPopup" mode="center" border-radius="14" width="90%" height="240rpx"
|
||||
closeable>
|
||||
<view class="import" style="padding: 0px 10px;">
|
||||
<view class="innerPopup">
|
||||
<view class="" style="font-size: 18px;font-weight: bold;">
|
||||
当前{{ currentGrade }}等级，距离{{ longUpgradeDescriptionSet.differenceGrade }}等级还需:
|
||||
</view>
|
||||
<view class="innerOfPopup">
|
||||
<view class="firstInnerOfPopup">
|
||||
{{ longUpgradeDescriptionSet.differenceOutstandingAchievement }}业绩 {{ longUpgradeDescriptionSet.differenceIntegral }}积分 {{ longUpgradeDescriptionSet.differenceClockRate }}加钟率
|
||||
<view >
|
||||
<view class="dengjibox">
|
||||
<view class="djtit">当前等级</view>
|
||||
<view class="djimg" @click="level">{{ currentGrade ? currentGrade : "A0" }}</view>
|
||||
<view class="" style="margin-top: 20px;">
|
||||
<!-- <text style="font-size: 30px;font-weight: bold;">当前业绩：{{ currentWholeIncome ? currentWholeIncome : 0 }}</text> -->
|
||||
<!-- <text style="font-size: 16px;">/{{ totalIncomeRange ? totalIncomeRange : 4000 }}</text> -->
|
||||
</view>
|
||||
|
||||
<!-- <u-line-progress active-color="#46a396" :show-percent="false" :height="38" inactive-color="#098f7a"
|
||||
:percent="lineProgressData" :striped-active="true"></u-line-progress>
|
||||
|
||||
<view v-if="!maxStatus && longUpgradeDescriptionSet.differenceOutstandingAchievement" class="dengji-text">
|
||||
还差{{ longUpgradeDescriptionSet.differenceOutstandingAchievement }}业绩;{{ longUpgradeDescriptionSet.differenceIntegral }}积分;可以升级{{ longUpgradeDescriptionSet.differenceGrade }}<u-icon
|
||||
style="padding-left: 2px;" size="30" color="#ffffff" name="question-circle-fill"
|
||||
@click="clickIcon" index="0"></u-icon>
|
||||
</view>
|
||||
<view v-if="maxStatus" class=" dengji-text">
|
||||
您已达到最高等级
|
||||
</view>
|
||||
<view>
|
||||
<u-popup v-model="showIconPopup" mode="center" border-radius="14" width="90%" height="240rpx"
|
||||
closeable>
|
||||
<view class="import" style="padding: 0px 10px;">
|
||||
<view class="innerPopup">
|
||||
<view class="" style="font-size: 18px;font-weight: bold;">
|
||||
当前{{ currentGrade }}等级，距离{{ longUpgradeDescriptionSet.differenceGrade }}等级还需:
|
||||
</view>
|
||||
<view class="firstInnerOfPopup">
|
||||
{{ longUpgradeDescriptionSet.differenceDurationOnline }}小时在线时长
|
||||
<view class="innerOfPopup">
|
||||
<view class="firstInnerOfPopup">
|
||||
{{ longUpgradeDescriptionSet.differenceOutstandingAchievement }}业绩 {{ longUpgradeDescriptionSet.differenceIntegral }}积分 {{ longUpgradeDescriptionSet.differenceClockRate }}加钟率
|
||||
</view>
|
||||
<view class="firstInnerOfPopup">
|
||||
{{ longUpgradeDescriptionSet.differenceDurationOnline }}小时在线时长
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</u-popup>
|
||||
</view> -->
|
||||
<view class="flex align-center"
|
||||
style="justify-content: space-evenly;text-align: center;">
|
||||
<view class="" @click="handleYeji">
|
||||
<view class="money_text1">{{ currentWholeIncome ? currentWholeIncome : 0 }}</view>
|
||||
<text class="money_text2">当前业绩</text>
|
||||
<!-- <text style="font-size: 16px;">/{{ totalIncomeRange ? totalIncomeRange : 4000 }}</text> -->
|
||||
</view>
|
||||
</u-popup>
|
||||
</view> -->
|
||||
<view class="flex align-center"
|
||||
style="justify-content: space-evenly;text-align: center;">
|
||||
<view class="" @click="handleYeji">
|
||||
<view style="font-size: 24px;font-weight: bold;">{{ currentWholeIncome ? currentWholeIncome : 0 }}</view>
|
||||
<text style="font-size: 14px; ">当前业绩</text>
|
||||
<!-- <text style="font-size: 16px;">/{{ totalIncomeRange ? totalIncomeRange : 4000 }}</text> -->
|
||||
</view>
|
||||
<view class="shuxian"></view>
|
||||
<view class="" @click="dangqian">
|
||||
<view class="" style="font-size: 24px;font-weight: bold;">
|
||||
{{ currentRealIncome ? currentRealIncome : 0 }}
|
||||
<view class="shuxian"></view>
|
||||
<view class="" @click="dangqian">
|
||||
<view class="money_text1">
|
||||
{{ currentRealIncome ? currentRealIncome : 0 }}
|
||||
</view>
|
||||
<view class="money_text2">当期项目收益(元)</view>
|
||||
</view>
|
||||
<view class="" style="font-size: 14px;">当期项目收益(元)</view>
|
||||
</view>
|
||||
<view class="shuxian"></view>
|
||||
<view class="" @tap="goNav('/pages/index/currentPoints')">
|
||||
<view class="" style="font-size: 24px;font-weight: bold;">{{ currentIntegral ? currentIntegral : 0 }}
|
||||
<view class="shuxian"></view>
|
||||
<view class="" @tap="goNav('/pages/index/currentPoints')">
|
||||
<view class="money_text1">{{ currentIntegral ? currentIntegral : 0 }}
|
||||
</view>
|
||||
<view class="money_text2" >当期积分</view>
|
||||
</view>
|
||||
<view class="" style="font-size: 14px;" >当期积分</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="csda">
|
||||
<view class="flex align-center" style="font-size: 16px;font-weight: bold;color: #fff;margin-top: 8px; margin-left: 15rpx;">
|
||||
物料记录
|
||||
|
|
@ -455,47 +460,44 @@
|
|||
font-size="30" separator-size="30"></u-count-down>
|
||||
</view>
|
||||
|
||||
<view class="flex justify-between padding-sm ">
|
||||
<view class="progress-text">预约时间：{{ item.serveTime }}</view>
|
||||
<view class="progress-status" v-if="item.status == 1">待付款</view>
|
||||
<view class="progress-status" v-if="item.status == 2">待服务</view>
|
||||
<view class="progress-status" v-if="item.status == 5">已完成</view>
|
||||
<view class="progress-status" v-if="item.status == 6">进行中</view>
|
||||
<view class="progress-status" v-if="item.status == 7">已出发</view>
|
||||
<view class="progress-status" v-if="item.status == 8">已到达</view>
|
||||
<view class="flex justify-between padding-sm-title ">
|
||||
<view class="progress-text">
|
||||
<text class="title-font text-bold">预约时间：</text>
|
||||
<text class="title-font">{{ item.serveTime }}</text>
|
||||
</view>
|
||||
<view class="progress-status-fk" v-if="item.status == 1">待付款</view>
|
||||
<view class="progress-status-fw" v-if="item.status == 2">待服务</view>
|
||||
<view class="progress-status-wa" v-if="item.status == 5">已完成</view>
|
||||
<view class="progress-status-jx" v-if="item.status == 6">进行中</view>
|
||||
<view class="progress-status-cf" v-if="item.status == 7">已出发</view>
|
||||
<view class="progress-status-dd" v-if="item.status == 8">已到达</view>
|
||||
<view class="progress-status" v-if="item.status == 3">待评价</view>
|
||||
<view class="progress-status" v-if="item.status == 4" style="color: #666666;">已取消</view>
|
||||
<view class="progress-status" v-if="item.status == 9&&!item.refusalContent">待确认</view>
|
||||
<view class="progress-status" v-if="item.status == 9&&item.refusalContent">拒单审核中</view>
|
||||
<view class="progress-status" v-if="item.status == 10" >待补单</view>
|
||||
<view class="progress-status-qx" v-if="item.status == 4">已取消</view>
|
||||
<view class="progress-status-qr" v-if="item.status == 9&&!item.refusalContent">待确认</view>
|
||||
<view class="progress-status-jd" v-if="item.status == 9&&item.refusalContent">拒单审核中</view>
|
||||
<view class="progress-status-daibu" v-if="item.status == 10" >待补单</view>
|
||||
<view v-if="item.overTimeOrders == 1" class="progress-status-chaoshi">[超时]</view>
|
||||
<!-- <view class="text-green" v-if="item.state ==1 ||item.state ==2">待完成</view>
|
||||
<view class="text-green" v-if="item.state ==3||item.state ==4">已完成</view> -->
|
||||
</view>
|
||||
<view class=" u-flex u-p-t-30 padding-sm">
|
||||
<view class=" u-flex u-p-t-10 padding-sm">
|
||||
<view class="u-m-r-10">
|
||||
<u-avatar :src="item.massageImg ? item.massageImg : '../../static/logo.png'" mode="square"
|
||||
size="80">
|
||||
size="150">
|
||||
</u-avatar>
|
||||
</view>
|
||||
<view class="u-flex-1 margin-left-xs">
|
||||
<view class="u-font-18 text-bold u-line-1" style="width: 560rpx;">
|
||||
<view class="margin-right-xs text-df margin-left-xs"
|
||||
style="margin-top: 0rpx;display: inline-block;width: 400rpx; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
|
||||
{{ item.title }}
|
||||
<view class="u-font-18 text-bold u-line-1">
|
||||
<view class="value-font">
|
||||
{{item.title}}
|
||||
</view>
|
||||
</view>
|
||||
<view class="margin-left-xs text-cut" style="width:550upx">{{ item.address }}</view>
|
||||
|
||||
<view class="title-font" style="margin-top: 8px;">{{ item.address }}</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex u-p-t-20 justify-between align-center padding-sm">
|
||||
<view class=" flex-sub ">
|
||||
实收：<text class="text-df">￥</text><text
|
||||
class="text-xl text-bold">{{ item.artificerMoneyTotal }}</text>
|
||||
</view>
|
||||
<view class="flex text-right">
|
||||
【{{ item.ordersNo }}】
|
||||
<view class="flex justify-between align-center padding-sm">
|
||||
<view class="flex title-font2">
|
||||
{{ item.ordersNo }}
|
||||
<!-- <u-button v-if="item.status == 1" :custom-style="customStyle" shape="circle" :plain="true"
|
||||
@click="cancelOrder(item)">取消订单</u-button> -->
|
||||
<u-button v-if="item.status == 1" :custom-style="customStyle1" shape="circle" :plain="true"
|
||||
|
|
@ -505,6 +507,10 @@
|
|||
<!-- <u-button v-if="item.status == 6" :custom-style="customStyle" shape="circle" :plain="true"
|
||||
@click="cancel(item)">订单完成</u-button> -->
|
||||
</view>
|
||||
<view class="flex-sub">
|
||||
<text class="title-font">实收：</text>
|
||||
<text class="value-font text-bold" style="color: #F95900;">￥{{ item.artificerMoneyTotal }}</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</mescroll-body>
|
||||
|
|
@ -1563,30 +1569,41 @@ export default {
|
|||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.popop-kuang{
|
||||
width: 150rpx;
|
||||
height: 150rpx;
|
||||
position: absolute;
|
||||
}
|
||||
.back-img{
|
||||
background-repeat: no-repeat;
|
||||
background-size: 100%;
|
||||
width: 84px;
|
||||
height: 84px;
|
||||
padding: 15rpx;
|
||||
border-radius: 50%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
position: relative;
|
||||
}
|
||||
@import url('https://fonts.googleapis.com/css2?family=Open+Sans:wght@300&display=swap');
|
||||
.qiandao{
|
||||
width: 61px;
|
||||
width:70px;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
border: 1px solid #fff;
|
||||
color: #fff;
|
||||
font-size: 12px;
|
||||
text-align: center;
|
||||
background-image: linear-gradient(-48deg, #ffcb51,#ffc24a,#fe7416);
|
||||
border: 1px solid #ffbf49;
|
||||
color: #ffffb2;
|
||||
font-size: 28rpx;
|
||||
text-align:center;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
right: 0;
|
||||
border-radius: 40px;
|
||||
}
|
||||
.qiandaoimg{
|
||||
position: absolute;
|
||||
top:0;
|
||||
right:74rpx;
|
||||
width: 50rpx;
|
||||
height: 50rpx;
|
||||
}
|
||||
body {
|
||||
font-family: Helvetica Neue, Helvetica, sans-serif;
|
||||
}
|
||||
|
|
@ -1642,22 +1659,103 @@ page {
|
|||
background-color: #f7f7f7;
|
||||
}
|
||||
.progress-text{
|
||||
font-size: 30rpx;
|
||||
color: #666;
|
||||
padding-top: 8rpx;
|
||||
}
|
||||
.progress-status{
|
||||
color: #fff;
|
||||
border-radius:20rpx 8rpx 20rpx 8rpx ;
|
||||
padding: 4rpx 10rpx;
|
||||
border-radius:30rpx 30rpx 30rpx 8rpx ;
|
||||
padding: 0 14rpx;
|
||||
background-image: linear-gradient(to bottom, #fe9130, #ff9868);
|
||||
font-size: 28rpx;
|
||||
font-size: 26rpx;
|
||||
line-height: 46rpx;
|
||||
}
|
||||
.progress-status-wa{
|
||||
color: #fff;
|
||||
border-radius:30rpx 30rpx 30rpx 8rpx ;
|
||||
padding: 0 14rpx;
|
||||
background-image: linear-gradient(-45deg, #7997ec, #597ad8);
|
||||
font-size: 26rpx;
|
||||
line-height: 46rpx;
|
||||
}
|
||||
.progress-status-fw{
|
||||
color: #fff;
|
||||
border-radius:30rpx 30rpx 30rpx 8rpx ;
|
||||
padding: 0 14rpx;
|
||||
background-image: linear-gradient(-45deg, #16bf5b, #099d46);
|
||||
font-size: 26rpx;
|
||||
line-height: 46rpx;
|
||||
}
|
||||
.progress-status-fk{
|
||||
color: #fff;
|
||||
border-radius:30rpx 30rpx 30rpx 8rpx ;
|
||||
padding: 0 14rpx;
|
||||
background-image: linear-gradient(-45deg, #019cdc, #40bbf3);
|
||||
font-size: 26rpx;
|
||||
line-height: 46rpx;
|
||||
}
|
||||
.progress-status-qx{
|
||||
color: #fff;
|
||||
border-radius:30rpx 30rpx 30rpx 8rpx ;
|
||||
padding: 0 14rpx;
|
||||
background-image: linear-gradient(-45deg, #adadad, #959595);
|
||||
font-size: 26rpx;
|
||||
line-height: 46rpx;
|
||||
}
|
||||
.progress-status-jx{
|
||||
color: #fff;
|
||||
border-radius:30rpx 30rpx 30rpx 8rpx ;
|
||||
padding: 0 14rpx;
|
||||
background-image: linear-gradient(-45deg, #17bd6e, #019c88);
|
||||
font-size: 26rpx;
|
||||
line-height: 46rpx;
|
||||
}
|
||||
.progress-status-cf{
|
||||
color: #fff;
|
||||
border-radius:30rpx 30rpx 30rpx 8rpx ;
|
||||
padding: 0 14rpx;
|
||||
background-image: linear-gradient(-45deg, #78d289, #62c878);
|
||||
font-size: 26rpx;
|
||||
line-height: 46rpx;
|
||||
}
|
||||
.progress-status-dd{
|
||||
color: #fff;
|
||||
border-radius:30rpx 30rpx 30rpx 8rpx ;
|
||||
padding: 0 14rpx;
|
||||
background-image: linear-gradient(-45deg, #28b1da, #3bdaa5);
|
||||
font-size: 26rpx;
|
||||
line-height: 46rpx;
|
||||
}
|
||||
.progress-status-qr{
|
||||
color: #fff;
|
||||
border-radius:30rpx 30rpx 30rpx 8rpx ;
|
||||
padding: 0 14rpx;
|
||||
background-image: linear-gradient(-45deg, #ff7673, #f15c63);
|
||||
font-size: 26rpx;
|
||||
line-height: 46rpx;
|
||||
}
|
||||
.progress-status-jd{
|
||||
color: #fff;
|
||||
border-radius:30rpx 30rpx 30rpx 8rpx ;
|
||||
padding: 0 14rpx;
|
||||
background-image: linear-gradient(-45deg, #ff8c01, #ff5600);
|
||||
font-size: 26rpx;
|
||||
line-height: 46rpx;
|
||||
}
|
||||
.progress-status-daibu{
|
||||
color: #fff;
|
||||
border-radius:30rpx 30rpx 30rpx 8rpx ;
|
||||
padding: 0 14rpx;
|
||||
background-image: linear-gradient(-45deg, #2e87dc, #40a1ff);
|
||||
font-size: 26rpx;
|
||||
line-height: 46rpx;
|
||||
}
|
||||
.progress-status-chaoshi{
|
||||
color: #ff0000;
|
||||
border-radius:20rpx 8rpx 20rpx 8rpx ;
|
||||
padding: 4rpx 10rpx;
|
||||
font-size: 28rpx;
|
||||
color: #fff;
|
||||
border-radius:30rpx 30rpx 30rpx 8rpx ;
|
||||
padding: 0 14rpx;
|
||||
background-image: linear-gradient(-45deg, #ffb342, #ec8700);
|
||||
font-size: 26rpx;
|
||||
line-height: 46rpx;
|
||||
}
|
||||
|
||||
// .bg {
|
||||
|
|
@ -1670,15 +1768,16 @@ page {
|
|||
|
||||
.gxbox {
|
||||
display: flex;
|
||||
font-size: 20rpx;
|
||||
width: 100%;
|
||||
background-color: #019c88;
|
||||
font-size: 24rpx;
|
||||
width: 96%;
|
||||
margin: 0 auto;
|
||||
color: #fff;
|
||||
border-radius: 15px 15px 0 0;
|
||||
padding: 0 30rpx;
|
||||
height: 60rpx;
|
||||
margin-top: 2rpx;
|
||||
justify-content: space-between;
|
||||
background: linear-gradient(-48deg,rgba(104, 206, 190, 0.35),rgba(50, 191, 173, 0.7));
|
||||
}
|
||||
|
||||
.wztext {
|
||||
|
|
@ -1687,15 +1786,13 @@ page {
|
|||
//text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
|
||||
.dengjibox {
|
||||
position: relative;
|
||||
width: 100%;
|
||||
height: 276rpx;
|
||||
background: linear-gradient(-45deg, #88d7c9, #1BB9A5, #88d7c9);
|
||||
//box-shadow: 0rpx 0rpx 16rpx 0rpx rgba(26,25,26,0.3);
|
||||
border-radius: 20rpx 20rpx 0 0;
|
||||
border-radius: 20rpx;
|
||||
padding: 30rpx;
|
||||
color: #ffffff;
|
||||
display: flex;
|
||||
|
|
@ -1723,11 +1820,11 @@ page {
|
|||
top: 0;
|
||||
background: url(../../static/images/index/vip.png) no-repeat center;
|
||||
background-size: cover;
|
||||
width: 220rpx;
|
||||
height: 77px;
|
||||
width: 200rpx;
|
||||
height:140rpx;
|
||||
font-size: 22px;
|
||||
text-align: center;
|
||||
line-height: 90px;
|
||||
line-height:165rpx;
|
||||
}
|
||||
|
||||
.xianb {
|
||||
|
|
@ -1771,10 +1868,9 @@ page {
|
|||
border: 2px #ededed solid;
|
||||
border-radius: 10px;
|
||||
padding: 30rpx;
|
||||
background: #fff;
|
||||
text-align:center;
|
||||
background: #fff;
|
||||
}
|
||||
|
||||
.tapDsalk {
|
||||
width: 31%;
|
||||
border: 2px #ededed solid;
|
||||
|
|
@ -1783,7 +1879,6 @@ page {
|
|||
border: 2px solid rgb(207, 237, 225);
|
||||
background-color: rgb(246, 252, 250);
|
||||
}
|
||||
|
||||
.sda {
|
||||
height: 36px;
|
||||
line-height: 30px;
|
||||
|
|
@ -1800,8 +1895,8 @@ page {
|
|||
}
|
||||
|
||||
.online-tag {
|
||||
color: #ffffff;
|
||||
font-size: 29rpx;
|
||||
color: #019c88;
|
||||
font-size: 26rpx;
|
||||
}
|
||||
|
||||
.img-avatar {
|
||||
|
|
@ -1937,7 +2032,8 @@ uni-switch::before {
|
|||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
background: linear-gradient(180deg, #90dacd, #ebfffa, #ebfffa);
|
||||
background:#fff
|
||||
//background: linear-gradient(180deg, #90dacd, #ebfffa, #ebfffa);
|
||||
// box-shadow: inset 40px 20px 60px #107050,
|
||||
// inset -20px -40px 60px #00a55a;
|
||||
|
||||
|
|
@ -2014,7 +2110,7 @@ uni-switch::before {
|
|||
position: absolute;
|
||||
right: 15px;
|
||||
top: 25px;
|
||||
font-size: 22rpx;
|
||||
font-size:24rpx;
|
||||
color: #019c88;
|
||||
}
|
||||
|
||||
|
|
@ -2047,15 +2143,50 @@ uni-switch::before {
|
|||
align-items: center;
|
||||
// border: 1px solid;
|
||||
}
|
||||
|
||||
.importMaterialPackageInner view:nth-child(1) {
|
||||
.importMaterialPackageInner view:nth-child(1) {
|
||||
width: 75%;
|
||||
}
|
||||
.head-port{
|
||||
width: 55px;
|
||||
height: 55px;
|
||||
}
|
||||
.head-port{
|
||||
width:64px;
|
||||
height:64px;
|
||||
border-radius: 50%;
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
.flex-sub{
|
||||
display: flex;
|
||||
justify-content: right;
|
||||
}
|
||||
.title-font{
|
||||
font-size:28rpx;
|
||||
color: #666666;
|
||||
}
|
||||
.title-font2{
|
||||
font-size: 28rpx;
|
||||
color: #999;
|
||||
}
|
||||
.value-font{
|
||||
font-size: 32rpx;
|
||||
color: #333333;
|
||||
}
|
||||
.padding-sm{
|
||||
padding:6rpx 24rpx;
|
||||
}
|
||||
.padding-sm-title{
|
||||
padding:20rpx 20rpx 10rpx 20rpx;
|
||||
}
|
||||
.avatar-section{
|
||||
padding:30rpx 0 50rpx 0;
|
||||
position: relative;
|
||||
}
|
||||
.avatar-section-text{
|
||||
font-size: 32rpx;
|
||||
color: #019c88;
|
||||
font-weight: bold;
|
||||
}
|
||||
.money_text1{
|
||||
font-size:46rpx;
|
||||
font-weight: bold;
|
||||
}
|
||||
.money_text2{
|
||||
font-size:26rpx;
|
||||
}
|
||||
|
||||
</style>
|
||||
|
|
@ -2,24 +2,30 @@
|
|||
<view class="content">
|
||||
<view class="header">
|
||||
<view class="header-top">
|
||||
<view class="flex">
|
||||
<image style="width:100rpx; height:100rpx; margin-right: 10rpx;" src="../../static/purse5.png"></image>
|
||||
<view class="header-bottom">
|
||||
<view class="header-text">{{titleData}}</view>
|
||||
<view class="header-bottom-money">
|
||||
{{earnings}}
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="header-top-left">
|
||||
<view>
|
||||
<span class="header-text"></image>当前周期</span>
|
||||
</view>
|
||||
<view>
|
||||
<span class="header-text1">{{startTime}}</span><span style="color: #fff; margin-right: 5rpx;">~</span><span class="header-text1">{{endTime}}</span>
|
||||
<span class="header-text1">{{startTime}}</span><span style="color: #029d88; margin-right: 5rpx;">~</span><span class="header-text1">{{endTime}}</span>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
<view class="flex justify-end">
|
||||
<view class="header-top-btn" @click="wangqi">往期{{orderType=='2'?'加钟率':'充值率'}}</view>
|
||||
</view>
|
||||
<view class="header-bottom" style="margin-bottom: 40rpx;">
|
||||
<view class="header-bottom-money">
|
||||
{{earnings}}
|
||||
</view>
|
||||
<view class="header-text">{{titleData}}</view>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
|
||||
<!-- 往期时间选择 -->
|
||||
<u-action-sheet :list="wqlistData" v-model="wqsyshow" @click="wqlistCallback"></u-action-sheet>
|
||||
|
||||
|
|
@ -494,70 +500,66 @@
|
|||
flex-direction: column;
|
||||
}
|
||||
.header-bottom-money{
|
||||
font-weight: bold;
|
||||
font-size: 49rpx;
|
||||
color: #FFFFFF;
|
||||
font-weight: bold;
|
||||
font-size: 49rpx;
|
||||
color: #00b198;
|
||||
margin-bottom: 3px;
|
||||
}
|
||||
.header-bottom{
|
||||
align-items: end;
|
||||
}
|
||||
.header-top-btn{
|
||||
width: 174rpx;
|
||||
height: 49rpx;
|
||||
line-height: 49rpx;
|
||||
line-height: 46rpx;
|
||||
text-align: center;
|
||||
font-size: 26rpx;
|
||||
color: #333333;
|
||||
background: #FFFFFF;
|
||||
background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);
|
||||
border-radius: 24rpx;
|
||||
color: #fff;
|
||||
}
|
||||
.header-text{
|
||||
font-weight: 400;
|
||||
font-size: 26rpx;
|
||||
color: #FFFFFF;
|
||||
color: #00b198;
|
||||
margin-right: 8rpx;
|
||||
}
|
||||
.header-text1{
|
||||
font-weight: 400;
|
||||
font-size: 24rpx;
|
||||
color: #019c88;
|
||||
color: #00b198;
|
||||
margin-right: 8rpx;
|
||||
border-radius: 30rpx;
|
||||
background: #fff;
|
||||
padding: 1rpx 10rpx;
|
||||
}
|
||||
.header-top-left image{
|
||||
width: 24.31rpx;
|
||||
height:22.92rpx;
|
||||
margin-right: 2px;
|
||||
margin-top: 3px;
|
||||
}
|
||||
|
||||
.header-top-left{
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
margin-top:10rpx;
|
||||
text-align: right;
|
||||
}
|
||||
.header-top{
|
||||
width: 100%;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-between;
|
||||
margin-bottom: 10px;
|
||||
width: 100%;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-between;
|
||||
}
|
||||
.header{
|
||||
width: 100%;
|
||||
height: 300rpx;
|
||||
padding: 15px;
|
||||
background:#f5f5f5 url('../../static/index/fun_banner4.png');
|
||||
background-repeat: no-repeat;
|
||||
background-size: 100% 100%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-around;
|
||||
}
|
||||
width: 100%;
|
||||
height: 280rpx;
|
||||
padding: 15px;
|
||||
background:#f7f7f7 url('../../static/index/technician15.png');
|
||||
background-repeat: no-repeat;
|
||||
background-size: 100%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-around;
|
||||
/*border-radius: 24rpx;*/
|
||||
}
|
||||
.content{
|
||||
width: 100%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
height: 100vh;
|
||||
/*height: 100vh;*/
|
||||
background-color: #f7f7f7;
|
||||
overflow: scroll;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<template>
|
||||
<view class="content">
|
||||
<view class="header">
|
||||
<!--<view class="header">
|
||||
<view class="header-top">
|
||||
<view class="header-top-left">
|
||||
<view>
|
||||
|
|
@ -16,7 +16,40 @@
|
|||
<view class="header-bottom-money">{{shouyiMoeny}}</view>
|
||||
<view class="header-text">当前收益</view>
|
||||
</view>
|
||||
</view>-->
|
||||
<view class="header">
|
||||
<view class="header-top">
|
||||
<view class="header-bottom" >
|
||||
<image style="width:100rpx; height:100rpx; margin-right: 10rpx;" src="../../static/purse4.png"></image>
|
||||
<view>
|
||||
<view class="header-text" style=" margin-top: -5px;">当前收益</view>
|
||||
<view class="header-bottom-money">{{shouyiMoeny}}</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="header-top-left">
|
||||
<view style="margin-bottom: 10rpx;">
|
||||
<span class="header-text"></image>当前周期</span>
|
||||
</view>
|
||||
<view>
|
||||
<span class="header-text1">{{startTime}}</span>
|
||||
<span style="color: #029d88; margin-right: 5rpx;">~</span>
|
||||
<span class="header-text1">{{endTime}}</span>
|
||||
</view>
|
||||
</view>
|
||||
<!-- 性别选择 -->
|
||||
<u-action-sheet :list="wqlistData" v-model="wqsyshow" @click="wqlistCallback"></u-action-sheet>
|
||||
</view>
|
||||
<view class="flex justify-end">
|
||||
<view class="header-top-btn" @click="wangqi" style="font-size: 14px; margin-top: -8px;">往期收益</view>
|
||||
</view>
|
||||
<!--<view class="header-bottom" style="margin-bottom: 40rpx;">
|
||||
<view class="header-text" style=" margin-top: -5px;">当前收益</view>
|
||||
<view class="header-bottom-money">{{shouyiMoeny}}</view>
|
||||
</view>
|
||||
性别选择 -->
|
||||
<u-action-sheet :list="wqlistData" v-model="wqsyshow" @click="wqlistCallback"></u-action-sheet>
|
||||
</view>
|
||||
|
||||
<!-- 往期时间选择 -->
|
||||
<u-action-sheet :list="wqlistData" v-model="wqsyshow" @click="wqlistCallback"></u-action-sheet>
|
||||
<t-refresh class="mian" ref="refresh" v-if="listData.length>0" @refresh="refresh" @loadMore="loadMore" :loadingType="loadingType" :tPadding="0">
|
||||
|
|
@ -290,36 +323,38 @@
|
|||
flex-direction: column;
|
||||
align-items: center;
|
||||
}
|
||||
.header-bottom{
|
||||
display: flex;
|
||||
align-items: end;
|
||||
}
|
||||
.header-bottom-money{
|
||||
font-weight: bold;
|
||||
font-size: 49rpx;
|
||||
color: #FFFFFF;
|
||||
color: #00b198;
|
||||
margin-bottom: 3px;
|
||||
}
|
||||
.header-top-btn{
|
||||
width: 174rpx;
|
||||
height: 49rpx;
|
||||
line-height: 49rpx;
|
||||
line-height: 46rpx;
|
||||
text-align: center;
|
||||
font-size: 26rpx;
|
||||
color: #333333;
|
||||
background: #FFFFFF;
|
||||
background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);
|
||||
border-radius: 24rpx;
|
||||
color: #fff;
|
||||
}
|
||||
.header-text{
|
||||
font-weight: 400;
|
||||
font-size: 26rpx;
|
||||
color: #FFFFFF;
|
||||
color: #00b198;
|
||||
margin-right: 8rpx;
|
||||
}
|
||||
.header-text1{
|
||||
font-weight: 400;
|
||||
font-size: 24rpx;
|
||||
color: #019c88;
|
||||
color: #00b198;
|
||||
margin-right: 8rpx;
|
||||
border-radius: 30rpx;
|
||||
background: #fff;
|
||||
padding: 1rpx 10rpx;
|
||||
}
|
||||
.header-top-left image{
|
||||
width: 24.31rpx;
|
||||
|
|
@ -328,27 +363,26 @@
|
|||
margin-top: 3px;
|
||||
}
|
||||
.header-top-left{
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-between;
|
||||
margin-top:20rpx;
|
||||
text-align: right;
|
||||
}
|
||||
.header-top{
|
||||
width: 100%;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-between;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
.header{
|
||||
width: 100%;
|
||||
height: 300rpx;
|
||||
padding:0 15px;
|
||||
background:#ffffff url('../../static/index/fun_banner4.png');
|
||||
background-repeat: no-repeat;
|
||||
background-size: 100% 100%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-around;
|
||||
width: 100%;
|
||||
height: 280rpx;
|
||||
padding: 15px;
|
||||
background:#f7f7f7 url('../../static/index/technician15.png');
|
||||
background-repeat: no-repeat;
|
||||
background-size: 100%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-around;
|
||||
/*border-radius: 24rpx;*/
|
||||
}
|
||||
.content{
|
||||
width: 100%;
|
||||
|
|
|
|||
|
|
@ -2,6 +2,10 @@
|
|||
<view class="content">
|
||||
<view class="header">
|
||||
<view class="header-top">
|
||||
<view class="header-bottom" style="margin-bottom: 56rpx;">
|
||||
<view class="header-bottom-money">{{sumJf}}<text style="font-size: 23rpx;font-weight: 400;">分</text> </view>
|
||||
<view class="header-text">当前积分</view>
|
||||
</view>
|
||||
<view class="header-top-left">
|
||||
<view>
|
||||
<span class="header-text"></image>当前周期</span>
|
||||
|
|
@ -10,11 +14,9 @@
|
|||
<span class="header-text1">{{startTime}}</span><span style="color: #fff; margin-right: 5rpx;">~</span><span class="header-text1">{{endTime}}</span>
|
||||
</view>
|
||||
</view>
|
||||
<view class="header-top-btn" @click="wangqi">往期积分</view>
|
||||
</view>
|
||||
<view class="header-bottom" style="margin-bottom: 56rpx;">
|
||||
<view class="header-bottom-money">{{sumJf}}<text style="font-size: 23rpx;font-weight: 400;">分</text> </view>
|
||||
<view class="header-text">当前积分</view>
|
||||
<view class="flex justify-end">
|
||||
<view class="header-top-btn" @click="wangqi">往期积分</view>
|
||||
</view>
|
||||
</view>
|
||||
<!-- 往期时间选择 -->
|
||||
|
|
@ -710,7 +712,6 @@
|
|||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-between;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
.header{
|
||||
width: 100%;
|
||||
|
|
|
|||
512
pages/msg/im.vue
512
pages/msg/im.vue
|
|
@ -1,14 +1,14 @@
|
|||
<template>
|
||||
<view>
|
||||
<view style="width: 100%;padding-bottom: 140rpx;">
|
||||
<view style="width: 100%;padding-bottom: 140rpx;padding-top: 40rpx;" @click="guanbi">
|
||||
<view style="display: flex;flex-direction: column;" v-for="(item,index) in ListItem" :key='index' >
|
||||
<view style="margin-top: 15rpx;width: 100%;text-align: center;font-size: 26rpx;color: #999999;">
|
||||
{{item.createTime}}</view>
|
||||
|
||||
|
||||
<view v-if="item.userId === userId" style="width: 83%;margin-left: 15%;">
|
||||
<view class="chat-listitem" style="float: right;">
|
||||
<view v-if="item.content && item.messageType === 1" @longpress="copy(item.content)"
|
||||
class="chat-listitem-text" style="margin-right: 20rpx;">{{item.content}}</view>
|
||||
<rich-text @longpress="copy(item.content)" v-if="item.content && item.messageType === 3" :nodes="item.content"></rich-text>
|
||||
<view @longpress="copy(item.content)" v-if="item.content && item.messageType === 1" class="chat-listitem-text" style="margin-right: 20rpx;">{{item.content}}</view>
|
||||
<image @tap="viewImg(item.content)" v-if="item.content && item.messageType === 2" :src="item.content"
|
||||
style="height: 200rpx;width: 200rpx;margin-right: 20rpx;"></image>
|
||||
<view>
|
||||
|
|
@ -20,7 +20,7 @@
|
|||
<view v-if="item.userId != userId" style="width: 83%;margin-right: 15%;">
|
||||
<view class="chat-listitem" style="float: left;margin-left: 10rpx;">
|
||||
<view>
|
||||
<image :src="item.avatar" class="chat-listitem-image"></image>
|
||||
<image :src="item.avatar?item.avatar:'../../static/logo.png'" class="chat-listitem-image"></image>
|
||||
</view>
|
||||
<view v-if="item.content && item.messageType === 1" class="chat-listitem-text1"
|
||||
style="margin-left: 20rpx;">{{item.content}}</view>
|
||||
|
|
@ -30,24 +30,60 @@
|
|||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<!-- 底部聊天输入框 -->
|
||||
<view class="input-box ">
|
||||
<view class="justify-between padding-lr align-center" style="display: flex;width: 100%;background: #FFFFFF;">
|
||||
<image src="../../static/images/msg/add.png" @click="chooseImage(['album'])"
|
||||
style="width: 70rpx;height: 70rpx;margin-right: 12rpx;"></image>
|
||||
<input confirm-type="send" @confirm='setChatSave(1)' type="text" v-model="content"
|
||||
style="width: 72%;height: 70rpx;background: #F5F5F5;margin: 0 10rpx;border-radius: 5rpx;padding-left: 10rpx;" />
|
||||
<view class="save" @tap='setChatSave(1)'>发送</view>
|
||||
<!-- 抽屉栏 -->
|
||||
<view class="popup-layer" :class="popupLayerClass" @touchmove.stop.prevent="discard">
|
||||
<!-- 表情 -->
|
||||
<swiper class="emoji-swiper" :class="{hidden:hideEmoji}" indicator-dots="true" duration="150">
|
||||
<swiper-item v-for="(page,pid) in emojiList" :key="pid">
|
||||
<view v-for="(em,eid) in page" :key="eid" @tap="addEmoji(em)">
|
||||
<image mode="widthFix" :src="'/static/imgLt/emoji/'+em.url"></image>
|
||||
</view>
|
||||
</swiper-item>
|
||||
</swiper>
|
||||
<!-- 更多功能 相册-拍照-红包 -->
|
||||
<view class="more-layer" :class="{hidden:hideMore}">
|
||||
<view class="list">
|
||||
<view class="box" @tap="chooseImage"><view class="icon tupian2"></view></view>
|
||||
<!-- <view class="box" @tap="camera"><view class="icon paizhao"></view></view> -->
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<!-- 底部输入栏 -->
|
||||
<view class="input-box" :class="popupLayerClass" @touchmove.stop.prevent="discard">
|
||||
|
||||
<!-- #ifdef H5 -->
|
||||
<view class="more" @tap="showMore">
|
||||
<view class="icon add"></view>
|
||||
</view>
|
||||
<!-- #endif -->
|
||||
<view class="textbox">
|
||||
<view class="text-mode" :class="isVoice?'hidden':''">
|
||||
<view class="box">
|
||||
<textarea auto-height="true" @confirm='setChatSave(1)' v-model="content"/>
|
||||
</view>
|
||||
<view class="em" @tap="chooseEmoji">
|
||||
<view class="icon biaoqing"></view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<!-- #ifndef H5 -->
|
||||
<view class="more" @tap="showMore">
|
||||
<view class="icon add"></view>
|
||||
</view>
|
||||
<!-- #endif -->
|
||||
<view class="send" :class="isVoice?'hidden':''" @tap='setChatSave(1)'>
|
||||
<view class="btn">发送</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import * as websocketUtils from 'utils/websocketUtils.js';
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
videos: [],
|
||||
charShow:0,
|
||||
connected: false,
|
||||
connecting: false,
|
||||
msg: false,
|
||||
|
|
@ -81,9 +117,38 @@
|
|||
size: 1000,
|
||||
countDown: '',
|
||||
chatConversationId: '',
|
||||
byUserId: ''
|
||||
byUserId: '',
|
||||
//文字消息
|
||||
textMsg:'',
|
||||
//消息列表
|
||||
msgList:[],
|
||||
msgImgList:[],
|
||||
myuid:0,
|
||||
isVoice:false,
|
||||
// 抽屉参数
|
||||
popupLayerClass:'',
|
||||
// more参数
|
||||
hideMore:true,
|
||||
//表情定义
|
||||
hideEmoji:true,
|
||||
emojiList:[
|
||||
[{"url":"100.gif",alt:"[微笑]"},{"url":"101.gif",alt:"[伤心]"},{"url":"102.gif",alt:"[美女]"},{"url":"103.gif",alt:"[发呆]"},{"url":"104.gif",alt:"[墨镜]"},{"url":"105.gif",alt:"[哭]"},{"url":"106.gif",alt:"[羞]"},{"url":"107.gif",alt:"[哑]"},{"url":"108.gif",alt:"[睡]"},{"url":"109.gif",alt:"[哭]"},{"url":"110.gif",alt:"[囧]"},{"url":"111.gif",alt:"[怒]"},{"url":"112.gif",alt:"[调皮]"},{"url":"113.gif",alt:"[笑]"},{"url":"114.gif",alt:"[惊讶]"},{"url":"115.gif",alt:"[难过]"},{"url":"116.gif",alt:"[酷]"},{"url":"117.gif",alt:"[汗]"},{"url":"118.gif",alt:"[抓狂]"},{"url":"119.gif",alt:"[吐]"},{"url":"120.gif",alt:"[笑]"},{"url":"121.gif",alt:"[快乐]"},{"url":"122.gif",alt:"[奇]"},{"url":"123.gif",alt:"[傲]"}],
|
||||
[{"url":"124.gif",alt:"[饿]"},{"url":"125.gif",alt:"[累]"},{"url":"126.gif",alt:"[吓]"},{"url":"127.gif",alt:"[汗]"},{"url":"128.gif",alt:"[高兴]"},{"url":"129.gif",alt:"[闲]"},{"url":"130.gif",alt:"[努力]"},{"url":"131.gif",alt:"[骂]"},{"url":"132.gif",alt:"[疑问]"},{"url":"133.gif",alt:"[秘密]"},{"url":"134.gif",alt:"[乱]"},{"url":"135.gif",alt:"[疯]"},{"url":"136.gif",alt:"[哀]"},{"url":"137.gif",alt:"[鬼]"},{"url":"138.gif",alt:"[打击]"},{"url":"139.gif",alt:"[bye]"},{"url":"140.gif",alt:"[汗]"},{"url":"141.gif",alt:"[抠]"},{"url":"142.gif",alt:"[鼓掌]"},{"url":"143.gif",alt:"[糟糕]"},{"url":"144.gif",alt:"[恶搞]"},{"url":"145.gif",alt:"[什么]"},{"url":"146.gif",alt:"[什么]"},{"url":"147.gif",alt:"[累]"}],
|
||||
[{"url":"148.gif",alt:"[看]"},{"url":"149.gif",alt:"[难过]"},{"url":"150.gif",alt:"[难过]"},{"url":"151.gif",alt:"[坏]"},{"url":"152.gif",alt:"[亲]"},{"url":"153.gif",alt:"[吓]"},{"url":"154.gif",alt:"[可怜]"},{"url":"155.gif",alt:"[刀]"},{"url":"156.gif",alt:"[水果]"},{"url":"157.gif",alt:"[酒]"},{"url":"158.gif",alt:"[篮球]"},{"url":"159.gif",alt:"[乒乓]"},{"url":"160.gif",alt:"[咖啡]"},{"url":"161.gif",alt:"[美食]"},{"url":"162.gif",alt:"[动物]"},{"url":"163.gif",alt:"[鲜花]"},{"url":"164.gif",alt:"[枯]"},{"url":"165.gif",alt:"[唇]"},{"url":"166.gif",alt:"[爱]"},{"url":"167.gif",alt:"[分手]"},{"url":"168.gif",alt:"[生日]"},{"url":"169.gif",alt:"[电]"},{"url":"170.gif",alt:"[炸弹]"},{"url":"171.gif",alt:"[刀子]"}],
|
||||
[{"url":"172.gif",alt:"[足球]"},{"url":"173.gif",alt:"[瓢虫]"},{"url":"174.gif",alt:"[翔]"},{"url":"175.gif",alt:"[月亮]"},{"url":"176.gif",alt:"[太阳]"},{"url":"177.gif",alt:"[礼物]"},{"url":"178.gif",alt:"[抱抱]"},{"url":"179.gif",alt:"[拇指]"},{"url":"180.gif",alt:"[贬低]"},{"url":"181.gif",alt:"[握手]"},{"url":"182.gif",alt:"[剪刀手]"},{"url":"183.gif",alt:"[抱拳]"},{"url":"184.gif",alt:"[勾引]"},{"url":"185.gif",alt:"[拳头]"},{"url":"186.gif",alt:"[小拇指]"},{"url":"187.gif",alt:"[拇指八]"},{"url":"188.gif",alt:"[食指]"},{"url":"189.gif",alt:"[ok]"},{"url":"190.gif",alt:"[情侣]"},{"url":"191.gif",alt:"[爱心]"},{"url":"192.gif",alt:"[蹦哒]"},{"url":"193.gif",alt:"[颤抖]"},{"url":"194.gif",alt:"[怄气]"},{"url":"195.gif",alt:"[跳舞]"}],
|
||||
[{"url":"196.gif",alt:"[发呆]"},{"url":"197.gif",alt:"[背着]"},{"url":"198.gif",alt:"[伸手]"},{"url":"199.gif",alt:"[耍帅]"},{"url":"200.png",alt:"[微笑]"},{"url":"201.png",alt:"[生病]"},{"url":"202.png",alt:"[哭泣]"},{"url":"203.png",alt:"[吐舌]"},{"url":"204.png",alt:"[迷糊]"},{"url":"205.png",alt:"[瞪眼]"},{"url":"206.png",alt:"[恐怖]"},{"url":"207.png",alt:"[忧愁]"},{"url":"208.png",alt:"[眨眉]"},{"url":"209.png",alt:"[闭眼]"},{"url":"210.png",alt:"[鄙视]"},{"url":"211.png",alt:"[阴暗]"},{"url":"212.png",alt:"[小鬼]"},{"url":"213.png",alt:"[礼物]"},{"url":"214.png",alt:"[拜佛]"},{"url":"215.png",alt:"[力量]"},{"url":"216.png",alt:"[金钱]"},{"url":"217.png",alt:"[蛋糕]"},{"url":"218.png",alt:"[彩带]"},{"url":"219.png",alt:"[礼物]"},]
|
||||
],
|
||||
//表情图片图床名称 ，由于我上传的第三方图床名称会有改变，所以有此数据来做对应，您实际应用中应该不需要
|
||||
onlineEmoji:{"100.gif":"AbNQgA.gif","101.gif":"AbN3ut.gif","102.gif":"AbNM3d.gif","103.gif":"AbN8DP.gif","104.gif":"AbNljI.gif","105.gif":"AbNtUS.gif","106.gif":"AbNGHf.gif","107.gif":"AbNYE8.gif","108.gif":"AbNaCQ.gif","109.gif":"AbNN4g.gif","110.gif":"AbN0vn.gif","111.gif":"AbNd3j.gif","112.gif":"AbNsbV.gif","113.gif":"AbNwgs.gif","114.gif":"AbNrD0.gif","115.gif":"AbNDuq.gif","116.gif":"AbNg5F.gif","117.gif":"AbN6ET.gif","118.gif":"AbNcUU.gif","119.gif":"AbNRC4.gif","120.gif":"AbNhvR.gif","121.gif":"AbNf29.gif","122.gif":"AbNW8J.gif","123.gif":"AbNob6.gif","124.gif":"AbN5K1.gif","125.gif":"AbNHUO.gif","126.gif":"AbNIDx.gif","127.gif":"AbN7VK.gif","128.gif":"AbNb5D.gif","129.gif":"AbNX2d.gif","130.gif":"AbNLPe.gif","131.gif":"AbNjxA.gif","132.gif":"AbNO8H.gif","133.gif":"AbNxKI.gif","134.gif":"AbNzrt.gif","135.gif":"AbU9Vf.gif","136.gif":"AbUSqP.gif","137.gif":"AbUCa8.gif","138.gif":"AbUkGQ.gif","139.gif":"AbUFPg.gif","140.gif":"AbUPIS.gif","141.gif":"AbUZMn.gif","142.gif":"AbUExs.gif","143.gif":"AbUA2j.gif","144.gif":"AbUMIU.gif","145.gif":"AbUerq.gif","146.gif":"AbUKaT.gif","147.gif":"AbUmq0.gif","148.gif":"AbUuZV.gif","149.gif":"AbUliF.gif","150.gif":"AbU1G4.gif","151.gif":"AbU8z9.gif","152.gif":"AbU3RJ.gif","153.gif":"AbUYs1.gif","154.gif":"AbUJMR.gif","155.gif":"AbUadK.gif","156.gif":"AbUtqx.gif","157.gif":"AbUUZ6.gif","158.gif":"AbUBJe.gif","159.gif":"AbUdIO.gif","160.gif":"AbU0iD.gif","161.gif":"AbUrzd.gif","162.gif":"AbUDRH.gif","163.gif":"AbUyQA.gif","164.gif":"AbUWo8.gif","165.gif":"AbU6sI.gif","166.gif":"AbU2eP.gif","167.gif":"AbUcLt.gif","168.gif":"AbU4Jg.gif","169.gif":"AbURdf.gif","170.gif":"AbUhFS.gif","171.gif":"AbU5WQ.gif","172.gif":"AbULwV.gif","173.gif":"AbUIzj.gif","174.gif":"AbUTQs.gif","175.gif":"AbU7yn.gif","176.gif":"AbUqe0.gif","177.gif":"AbUHLq.gif","178.gif":"AbUOoT.gif","179.gif":"AbUvYF.gif","180.gif":"AbUjFU.gif","181.gif":"AbaSSJ.gif","182.gif":"AbUxW4.gif","183.gif":"AbaCO1.gif","184.gif":"Abapl9.gif","185.gif":"Aba9yR.gif","186.gif":"AbaFw6.gif","187.gif":"Abaiex.gif","188.gif":"AbakTK.gif","189.gif":"AbaZfe.png","190.gif":"AbaEFO.gif","191.gif":"AbaVYD.gif","192.gif":"AbamSH.gif","193.gif":"AbaKOI.gif","194.gif":"Abanld.gif","195.gif":"Abau6A.gif","196.gif":"AbaQmt.gif","197.gif":"Abal0P.gif","198.gif":"AbatpQ.gif","199.gif":"Aba1Tf.gif","200.png":"Aba8k8.png","201.png":"AbaGtS.png","202.png":"AbaJfg.png","203.png":"AbaNlj.png","204.png":"Abawmq.png","205.png":"AbaU6s.png","206.png":"AbaaXn.png","207.png":"Aba000.png","208.png":"AbarkT.png","209.png":"AbastU.png","210.png":"AbaB7V.png","211.png":"Abafn1.png","212.png":"Abacp4.png","213.png":"AbayhF.png","214.png":"Abag1J.png","215.png":"Aba2c9.png","216.png":"AbaRXR.png","217.png":"Aba476.png","218.png":"Abah0x.png","219.png":"Abdg58.png"},
|
||||
timer:null,
|
||||
};
|
||||
},
|
||||
onLoad(d) {
|
||||
this.userId = this.$queue.getData('userId');
|
||||
this.byUserId = d.byUserId
|
||||
this.chatConversationId = d.chatConversationId;
|
||||
this.connect();
|
||||
},
|
||||
computed: {
|
||||
showMsg() {
|
||||
if (this.connected) {
|
||||
|
|
@ -97,33 +162,29 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.timer = setInterval(() => {
|
||||
this.getTimeOrListItem1()
|
||||
}, 3000);
|
||||
},
|
||||
onUnload() {
|
||||
uni.closeSocket({
|
||||
success: () => {
|
||||
console.info("退出成功")
|
||||
},
|
||||
})
|
||||
// uni.closeSocket()
|
||||
uni.hideLoading()
|
||||
uni.hideLoading();
|
||||
clearInterval(this.timer);
|
||||
this.timer = null;
|
||||
},
|
||||
onLoad(d) {
|
||||
this.userId = this.$queue.getData('userId');
|
||||
this.byUserId = d.byUserId
|
||||
this.chatConversationId = d.chatConversationId;
|
||||
this.connect();
|
||||
|
||||
// if (d.teamName) {
|
||||
// uni.setNavigationBarTitle({
|
||||
// title: d.teamName
|
||||
// });
|
||||
// }
|
||||
},
|
||||
onShow() {
|
||||
if (this.connected || this.connecting) {
|
||||
|
||||
} else {
|
||||
this.connect();
|
||||
}
|
||||
},
|
||||
onHide() {
|
||||
uni.closeSocket()
|
||||
},
|
||||
methods: {
|
||||
methods:{
|
||||
guanbi(){
|
||||
this.hideDrawer();
|
||||
},
|
||||
showChar(index){
|
||||
this.charShow!=this.charShow
|
||||
},
|
||||
copy(content) {
|
||||
uni.showModal({
|
||||
title: '温馨提示',
|
||||
|
|
@ -154,15 +215,15 @@
|
|||
var day = hour * 24;
|
||||
var month = day * 30;
|
||||
var result = "2";
|
||||
|
||||
|
||||
var diffValue = timeNow - timePublish;
|
||||
var diffMonth = diffValue / month;
|
||||
var diffWeek = diffValue / (7 * day);
|
||||
var diffDay = diffValue / day;
|
||||
var diffHour = diffValue / hour;
|
||||
var diffMinute = diffValue / minute;
|
||||
|
||||
|
||||
|
||||
|
||||
if (diffMonth > 3) {
|
||||
result = timePublish.getFullYear() + "-";
|
||||
result += timePublish.getMonth() + "-";
|
||||
|
|
@ -182,7 +243,6 @@
|
|||
}
|
||||
return result;
|
||||
},
|
||||
|
||||
connect() {
|
||||
let that = this;
|
||||
let userId = that.$queue.getData('userId');
|
||||
|
|
@ -197,11 +257,7 @@
|
|||
uni.showLoading({
|
||||
title: '连接中...'
|
||||
})
|
||||
console.log(userId,'*******************')
|
||||
uni.connectSocket({
|
||||
// url: 'ws://192.168.1.17:8881/gameTeamChat/' + userId + '_' + this.teamId,
|
||||
// url: 'wss://game.shengqianxiong.com.cn/wss/gameTeamChat/' + userId + '_' + this.teamId,
|
||||
// url: 'ws://192.168.1.17:8180/sqx_fast/chatSocket/' + userId,
|
||||
url: websocketUtils.getWsBaseUrl() + userId,
|
||||
data() {
|
||||
return {
|
||||
|
|
@ -260,6 +316,8 @@
|
|||
close() {
|
||||
uni.closeSocket()
|
||||
},
|
||||
|
||||
// 加载初始页面消息
|
||||
getTimeOrListItem1() {
|
||||
this.$Request.get('/app/chat/selectChatContent?page=1&limit=1000&chatConversationId=' + this.chatConversationId).then(
|
||||
res => {
|
||||
|
|
@ -267,10 +325,11 @@
|
|||
if (res.data) {
|
||||
var time = '';
|
||||
res.data.list.forEach(d => {
|
||||
if (!d.avatar) {
|
||||
// d.chat.userHead = '../../static/logo.png';
|
||||
let avatar = this.$queue.getData('avatar');
|
||||
d.avatar = avatar
|
||||
var sf=this.checkBrackets(d.content)
|
||||
if(sf==true){
|
||||
var sss=this.replaceEmoji(d.content);
|
||||
d.content=sss;
|
||||
d.messageType=3;
|
||||
}
|
||||
this.ListItem.push(d);
|
||||
});
|
||||
|
|
@ -285,31 +344,12 @@
|
|||
uni.hideLoading();
|
||||
});
|
||||
},
|
||||
getChatSave() {
|
||||
let userId = this.$queue.getData('userId');
|
||||
let phone = this.$queue.getData('phone');
|
||||
let userName = this.$queue.getData('userName');
|
||||
if (!phone) {
|
||||
phone = this.$queue.getData('userName');
|
||||
}
|
||||
let avatar = this.$queue.getData('avatar');
|
||||
let data = {
|
||||
userId: userId,
|
||||
userHead: avatar,
|
||||
userName: userName,
|
||||
storeId: '0',
|
||||
storeHead: '盛安到家',
|
||||
storeName: ''
|
||||
}
|
||||
this.$Request.postJson('/chat/save', data).then(res => {
|
||||
if (res.status === 0) {
|
||||
this.chatId = res.data.chatId;
|
||||
uni.showLoading({
|
||||
title: '加载中...'
|
||||
});
|
||||
this.getTimeOrListItem1();
|
||||
}
|
||||
});
|
||||
checkBrackets(data) {
|
||||
// 正则表达式，用于匹配包含中括号的字符串
|
||||
const regex = /\[|\]/;
|
||||
|
||||
// 使用正则表达式的test方法检查数据
|
||||
return regex.test(data);
|
||||
},
|
||||
setChatSave(type) {
|
||||
//type:1文字 2图片
|
||||
|
|
@ -328,7 +368,18 @@
|
|||
if (!phone) {
|
||||
phone = this.$queue.getData('userName');
|
||||
}
|
||||
console.log(this.byUserId)
|
||||
console.log("this.byUserId",this.byUserId)
|
||||
// if(this.textMsg!=''){
|
||||
// const isRich = this.isRichText(this.textMsg); // 返回 true
|
||||
// if(isRich==true){
|
||||
// this.textMsg = this.replaceEmoji(this.textMsg);
|
||||
// }else{
|
||||
// this.content=this.textMsg
|
||||
// }
|
||||
// }
|
||||
|
||||
|
||||
// console.log('this.content=============>',isRich)
|
||||
let data = {
|
||||
content: this.content,
|
||||
messageType: type,
|
||||
|
|
@ -336,7 +387,12 @@
|
|||
chatConversationId: this.chatConversationId,
|
||||
|
||||
}
|
||||
if(data.messageType==2){
|
||||
data.width="100"
|
||||
}
|
||||
console.log("data",data)
|
||||
data = JSON.stringify(data);
|
||||
|
||||
let that = this;
|
||||
uni.sendSocketMessage({
|
||||
data: data,
|
||||
|
|
@ -357,6 +413,7 @@
|
|||
console.log(data,'data99999999999999999')
|
||||
// that.ListItem.push(data);
|
||||
setTimeout(() => {
|
||||
that.hideDrawer();
|
||||
that.getTimeOrListItem1();
|
||||
}, 50);
|
||||
console.log(that.content);
|
||||
|
|
@ -366,13 +423,89 @@
|
|||
}
|
||||
})
|
||||
this.content = '';
|
||||
this.textMsg = '';
|
||||
},
|
||||
//发送图片
|
||||
chooseImage(sourceType) {
|
||||
uni.chooseImage({
|
||||
|
||||
//查看大图
|
||||
viewImg(item) {
|
||||
let imgsArray = [];
|
||||
imgsArray[0] = item;
|
||||
uni.previewImage({
|
||||
current: 0,
|
||||
urls: imgsArray
|
||||
});
|
||||
},
|
||||
//处理图片尺寸，如果不处理宽高，新进入页面加载图片时候会闪
|
||||
setPicSize(content){
|
||||
// 让图片最长边等于设置的最大长度，短边等比例缩小，图片控件真实改变，区别于aspectFit方式。
|
||||
let maxW = uni.upx2px(350);//350是定义消息图片最大宽度
|
||||
let maxH = uni.upx2px(350);//350是定义消息图片最大高度
|
||||
if(content.w>maxW||content.h>maxH){
|
||||
let scale = content.w/content.h;
|
||||
content.w = scale>1?maxW:maxH*scale;
|
||||
content.h = scale>1?maxW/scale:maxH;
|
||||
}
|
||||
return content;
|
||||
},
|
||||
|
||||
//更多功能(点击+弹出)
|
||||
showMore(){
|
||||
this.isVoice = false;
|
||||
this.hideEmoji = true;
|
||||
if(this.hideMore){
|
||||
this.hideMore = false;
|
||||
this.openDrawer();
|
||||
}else{
|
||||
this.hideDrawer();
|
||||
}
|
||||
},
|
||||
// 打开抽屉
|
||||
openDrawer(){
|
||||
this.popupLayerClass = 'showLayer';
|
||||
},
|
||||
// 隐藏抽屉
|
||||
hideDrawer(){
|
||||
this.popupLayerClass = '';
|
||||
setTimeout(()=>{
|
||||
this.hideMore = true;
|
||||
this.hideEmoji = true;
|
||||
},150);
|
||||
},
|
||||
// 选择图片发送
|
||||
chooseImage(){
|
||||
this.getImage('album');
|
||||
},
|
||||
//拍照发送
|
||||
camera(){
|
||||
let that = this
|
||||
uni.chooseVideo({
|
||||
count: 1,
|
||||
sourceType: ['album', 'camera'],
|
||||
success: res => {
|
||||
that.videos.push(res.tempFilePath);
|
||||
for (let i = 0; i < that.videos.length; i++) {
|
||||
that.$queue.showLoading("上传中...");
|
||||
uni.uploadFile({ // 上传接口
|
||||
url: websocketUtils.uploadFileUrl(), //真实的接口地址
|
||||
filePath: that.videos[i],
|
||||
name: 'file',
|
||||
success: (uploadFileRes) => {
|
||||
this.content = JSON.parse(uploadFileRes.data).data;
|
||||
this.setChatSave(2);
|
||||
uni.hideLoading();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
//选照片 or 拍照
|
||||
getImage(type){
|
||||
this.hideDrawer();
|
||||
uni.chooseImage({
|
||||
sourceType:[type],
|
||||
sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
|
||||
success: (res)=>{
|
||||
for (let i = 0; i < res.tempFilePaths.length; i++) {
|
||||
this.$queue.showLoading("上传中...");
|
||||
uni.uploadFile({ // 上传接口
|
||||
|
|
@ -388,100 +521,135 @@
|
|||
});
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
//查看大图
|
||||
viewImg(item) {
|
||||
let imgsArray = [];
|
||||
imgsArray[0] = item;
|
||||
uni.previewImage({
|
||||
current: 0,
|
||||
urls: imgsArray
|
||||
});
|
||||
},
|
||||
},
|
||||
};
|
||||
// 选择表情
|
||||
chooseEmoji(){
|
||||
this.hideMore = true;
|
||||
if(this.hideEmoji){
|
||||
this.hideEmoji = false;
|
||||
this.openDrawer();
|
||||
}else{
|
||||
this.hideDrawer();
|
||||
}
|
||||
},
|
||||
//添加表情
|
||||
addEmoji(em){
|
||||
this.content+=em.alt;
|
||||
},
|
||||
//获取焦点，如果不是选表情ing,则关闭抽屉
|
||||
textareaFocus(){
|
||||
if(this.popupLayerClass=='showLayer' && this.hideMore == false){
|
||||
this.hideDrawer();
|
||||
}
|
||||
},
|
||||
|
||||
//替换表情符号为图片
|
||||
replaceEmoji(str){
|
||||
let replacedStr = str.replace(/\[([^(\]|\[)]*)\]/g,(item, index)=>{
|
||||
console.log("item: " + item);
|
||||
for(let i=0;i<this.emojiList.length;i++){
|
||||
let row = this.emojiList[i];
|
||||
for(let j=0;j<row.length;j++){
|
||||
let EM = row[j];
|
||||
if(EM.alt==item){
|
||||
//在线表情路径，图文混排必须使用网络路径，请上传一份表情到你的服务器后再替换此路径
|
||||
//比如你上传服务器后，你的100.gif路径为https://www.xxx.com/emoji/100.gif 则替换onlinePath填写为https://www.xxx.com/emoji/
|
||||
let onlinePath = 'https://s2.ax1x.com/2019/04/12/'
|
||||
let imgstr = '<img src="'+onlinePath+this.onlineEmoji[EM.url]+'">';
|
||||
return imgstr;
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
return '<div style="display: flex;align-items: center;word-wrap:break-word;">'+replacedStr+'</div>';
|
||||
},
|
||||
discard(){
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style>
|
||||
<style lang="scss" scoped>
|
||||
@import "@/static/HM-chat/css/style.scss";
|
||||
page {
|
||||
background-color: #F7F7F7;
|
||||
}
|
||||
background-color: #F7F7F7;
|
||||
}
|
||||
|
||||
.bg {
|
||||
background-color: #FFFFFF;
|
||||
}
|
||||
|
||||
.bg {
|
||||
background-color: #FFFFFF;
|
||||
}
|
||||
|
||||
.input-box {
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
height: 120rpx;
|
||||
width: 100%;
|
||||
display: flex;
|
||||
box-sizing: content-box;
|
||||
z-index: 999;
|
||||
/* background-color: #ececec; */
|
||||
/* padding: 0 5rpx; */
|
||||
}
|
||||
|
||||
.chat-listitem {
|
||||
display: flex;
|
||||
margin-top: 20rpx;
|
||||
padding: 10rpx;
|
||||
}
|
||||
|
||||
.chat-listitem-text {
|
||||
color: #FFFFFF;
|
||||
background: #005DFF;
|
||||
margin-top: 10rpx;
|
||||
width: fit-content;
|
||||
padding: 15rpx;
|
||||
font-size: 30rpx;
|
||||
height: max-content;
|
||||
word-wrap: break-word;
|
||||
word-break: break-all;
|
||||
border-radius: 10rpx;
|
||||
}
|
||||
.chat-listitem-text1 {
|
||||
/* color: #FFFFFF; */
|
||||
background: #FFFFFF;
|
||||
margin-top: 10rpx;
|
||||
width: fit-content;
|
||||
padding: 15rpx;
|
||||
font-size: 30rpx;
|
||||
height: max-content;
|
||||
word-wrap: break-word;
|
||||
word-break: break-all;
|
||||
border-radius: 10rpx;
|
||||
}
|
||||
.chat-listitem-image-type4 {
|
||||
/* color: #FFFFFF; */
|
||||
background: #FFFFFF;
|
||||
width: fit-content;
|
||||
font-size: 30rpx;
|
||||
height: max-content;
|
||||
word-wrap: break-word;
|
||||
word-break: break-all;
|
||||
border-top-left-radius: 20rpx;
|
||||
border-top-right-radius: 20rpx;
|
||||
}
|
||||
|
||||
.chat-listitem-image {
|
||||
margin-top: 5rpx;
|
||||
width: 75rpx;
|
||||
height: 75rpx;
|
||||
border-radius: 5rpx;
|
||||
}
|
||||
|
||||
.save {
|
||||
width: 130rpx;
|
||||
text-align: center;
|
||||
border-radius: 70rpx;
|
||||
height: 70rpx;
|
||||
color: #FFF;
|
||||
background:#005DFF;
|
||||
margin: 5rpx 10rpx 0;
|
||||
line-height: 70rpx;
|
||||
}
|
||||
</style>
|
||||
.input-box {
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
height: 120rpx;
|
||||
width: 100%;
|
||||
display: flex;
|
||||
box-sizing: content-box;
|
||||
z-index: 999;
|
||||
/* background-color: #ececec; */
|
||||
/* padding: 0 5rpx; */
|
||||
}
|
||||
|
||||
.chat-listitem {
|
||||
display: flex;
|
||||
margin-top: 20rpx;
|
||||
padding: 10rpx;
|
||||
}
|
||||
|
||||
.chat-listitem-text {
|
||||
color: #FFFFFF;
|
||||
background: #005DFF;
|
||||
margin-top: 10rpx;
|
||||
width: fit-content;
|
||||
padding: 15rpx;
|
||||
font-size: 30rpx;
|
||||
height: max-content;
|
||||
word-wrap: break-word;
|
||||
word-break: break-all;
|
||||
border-radius: 10rpx;
|
||||
}
|
||||
.chat-listitem-text1 {
|
||||
/* color: #FFFFFF; */
|
||||
background: #FFFFFF;
|
||||
margin-top: 10rpx;
|
||||
width: fit-content;
|
||||
padding: 15rpx;
|
||||
font-size: 30rpx;
|
||||
height: max-content;
|
||||
word-wrap: break-word;
|
||||
word-break: break-all;
|
||||
border-radius: 10rpx;
|
||||
}
|
||||
.chat-listitem-image-type4 {
|
||||
/* color: #FFFFFF; */
|
||||
background: #FFFFFF;
|
||||
width: fit-content;
|
||||
font-size: 30rpx;
|
||||
height: max-content;
|
||||
word-wrap: break-word;
|
||||
word-break: break-all;
|
||||
border-top-left-radius: 20rpx;
|
||||
border-top-right-radius: 20rpx;
|
||||
}
|
||||
|
||||
.chat-listitem-image {
|
||||
margin-top: 5rpx;
|
||||
width: 75rpx;
|
||||
height: 75rpx;
|
||||
border-radius: 5rpx;
|
||||
}
|
||||
|
||||
.save {
|
||||
width: 130rpx;
|
||||
text-align: center;
|
||||
border-radius: 70rpx;
|
||||
height: 70rpx;
|
||||
color: #FFF;
|
||||
background:#005DFF;
|
||||
margin: 5rpx 10rpx 0;
|
||||
line-height: 70rpx;
|
||||
}
|
||||
</style>
|
||||
|
|
@ -2,8 +2,8 @@
|
|||
<view class="" style="padding-bottom: 17px;">
|
||||
<view class="headtop">
|
||||
<view class="headbox">
|
||||
<view class=" u-flex padding-lr justify-between" style="padding-top: 30px;">
|
||||
<view class="u-m-r-10 back-img"
|
||||
<view class=" u-flex justify-between avatar-section">
|
||||
<!--<view class="back-img"
|
||||
:style="{'background-image':
|
||||
technicianType=='3'?'url(../../static/grade1.png)':
|
||||
technicianType=='4'?'url(../../static/grade2.png)':
|
||||
|
|
@ -11,11 +11,15 @@
|
|||
}">
|
||||
<image :src="avatar" class="head-port"
|
||||
@click="goNav('/pages/my/userinfo')"></image>
|
||||
</view>-->
|
||||
<view class="back-img">
|
||||
<image :src="avatar" class="head-port" @click="goNav('/pages/my/userinfo')"></image>
|
||||
<image class="popop-kuang" v-if="technicianType" :src="technicianType=='3'?'../../static/grade1.gif':technicianType=='4'?'../../static/grade2.gif':'../../static/grade3.gif'"></image>
|
||||
</view>
|
||||
<view class="u-flex-1" v-if="isLogin && userName" style="color: #ffffff;">
|
||||
<view class="u-font-18 ">
|
||||
<view class="flex align-center" style="margin-bottom: 5px;">
|
||||
<view class="margin-left-sm">{{ userName }}</view>
|
||||
<view class="u-flex-1" v-if="isLogin && userName">
|
||||
<view class="u-font-18">
|
||||
<view class="flex align-center">
|
||||
<view class="margin-left-sm avatar-section-text">{{ userName }}</view>
|
||||
<view class="flex align-center" style="font-size: 14px;">
|
||||
<image src="../../static/images/my/start.png"
|
||||
style="width: 13px;height: 12px;margin: 0 6rpx 0 20rpx;"></image>
|
||||
|
|
@ -26,16 +30,16 @@
|
|||
|
||||
<view class="flex margin-left-sm margin-top-xs" v-if="XCXIsSelect != '否'"
|
||||
style="font-size: 22rpx;">
|
||||
<view v-if="renzheng == 0" @click.stop="goNav('/my/renzheng/rzType')">
|
||||
<view class="online-tag" v-if="renzheng == 0" @click.stop="goNav('/my/renzheng/rzType')">
|
||||
暂未实名认证
|
||||
</view>
|
||||
<view v-if="renzheng == 1" @click.stop="goNav('/my/renzheng/index')">
|
||||
<view class="online-tag" v-if="renzheng == 1" @click.stop="goNav('/my/renzheng/index')">
|
||||
审核中
|
||||
</view>
|
||||
<view v-if="renzheng == 2" @click.stop="goNav('/my/renzheng/index')">
|
||||
<view class="online-tag" v-if="renzheng == 2" @click.stop="goNav('/my/renzheng/index')">
|
||||
已实名认证
|
||||
</view>
|
||||
<view v-if="renzheng == 3" @click.stop="goNav('/my/renzheng/index')">
|
||||
<view class="online-tag" v-if="renzheng == 3" @click.stop="goNav('/my/renzheng/index')">
|
||||
已拒绝
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -64,46 +68,46 @@
|
|||
</view>
|
||||
</view> -->
|
||||
<view class="moneybox" v-if="XCXIsSelect != '否'">
|
||||
<view class="">
|
||||
<view class="dengjibox">
|
||||
<view class="flex flex-wrap">
|
||||
<view class="flex align-center justify-between" style="width: 100%;">
|
||||
<view class="flex align-center justify-between money-bk" style="width: 100%;">
|
||||
<view class="">
|
||||
<view style="color: #ffffff;font-size: 12px; margin-left: 9px;">账户余额(元)</view>
|
||||
<view class="margin-top-xs" style="font-size: 32px;color: #ffffff; margin-left: 8px; margin-top: 1px;">
|
||||
<view class="djtit">账户余额(元)</view>
|
||||
<view class="margin-top-xs money-name">
|
||||
<text class="money_text">{{ money ? money : '0' }}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="btnyt" @click="goQian()">立即提现</view>
|
||||
</view>
|
||||
<view class="flex align-center justify-between" style="width: 100%;">
|
||||
<view class="flex align-center justify-between" style="width: 100%; margin-top:40rpx;">
|
||||
<view class="" style="text-align: center;width: 23%;"
|
||||
@click="goNav('/my/wallet/myshouyidetail?fundType=1')">
|
||||
<view class="margin-top-xs wode-view">
|
||||
<view class="margin-top-xs ">
|
||||
<text class="money_text1">{{ dailyEarnings ? dailyEarnings : '0' }}</text>
|
||||
</view>
|
||||
<view style="color: #fff;font-size: 26rpx;margin-top: 5px;">当日收益</view>
|
||||
<view class="money_text2">当日收益</view>
|
||||
</view>
|
||||
<view class="" style="text-align: center;width: 23%;"
|
||||
@click="goNav('/my/wallet/myshouyidetail?fundType=2')">
|
||||
<view class="margin-top-xs wode-view">
|
||||
<view class="margin-top-xs">
|
||||
<text class="money_text1">{{ earnings ? earnings : '0' }}</text>
|
||||
</view>
|
||||
<view style="color: #fff;font-size: 26rpx;margin-top: 5px;">当期收益</view>
|
||||
<view class="money_text2">当期收益</view>
|
||||
</view>
|
||||
<view class="" style="text-align: center;width: 23%;"
|
||||
@click="goNav('/my/wallet/myshouyidetail?fundType=3')">
|
||||
<view class="margin-top-xs wode-view">
|
||||
<view class="margin-top-xs">
|
||||
<text
|
||||
class="money_text1">{{ currentMonthsIncome ? currentMonthsIncome : '0' }}</text>
|
||||
</view>
|
||||
<view style="color: #fff;font-size: 26rpx;margin-top: 5px;">当月收益</view>
|
||||
<view class="money_text2">当月收益</view>
|
||||
</view>
|
||||
<view class="" style="text-align: center;width: 23%;">
|
||||
<view class="margin-top-xs wode-view">
|
||||
<text class="money_text1" style="font-size: 24rpx;">
|
||||
<view class="margin-top-xs">
|
||||
<text class="money_text3" style="font-size: 24rpx;">
|
||||
{{ currentEndDate ?currentEndDate : "暂无数据" }}</text>
|
||||
</view>
|
||||
<view style="color: #fff;font-size: 26rpx;margin-top: 5px;">当期结束日</view>
|
||||
<view class="money_text2">当期结束日</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -198,7 +202,8 @@
|
|||
<view class="wode-title" style="margin-bottom: 26rpx;">
|
||||
常用功能
|
||||
</view>
|
||||
<view class="flex justify-between margin-top" style="width: 100%;flex-wrap: wrap;">
|
||||
<view class="flex margin-top pages-main" >
|
||||
|
||||
<!-- <view class="box">
|
||||
<image src="../../static/images/my/yjian.png"></image>
|
||||
<view class="box_text">我的项目</view>
|
||||
|
|
@ -232,7 +237,7 @@
|
|||
</view>
|
||||
<view class="box" @click="goNav('/pages/video/index')">
|
||||
<image src="../../static/index/function4.png"></image>
|
||||
<view class="box_text">视频</view>
|
||||
<view class="box_text">视频圈</view>
|
||||
</view>
|
||||
<view class="box" v-if="renzheng == 2" @click="bindPhone()">
|
||||
<!-- //AxN必须实名 -->
|
||||
|
|
@ -325,8 +330,11 @@
|
|||
</view>
|
||||
</view>
|
||||
</view> -->
|
||||
<view class="kefu" @click="goMsg">
|
||||
<image src="../../static/kefu.png" mode=""></image>
|
||||
<!--<span>联系客服</span>-->
|
||||
</view>
|
||||
</view>
|
||||
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
|
@ -378,6 +386,7 @@
|
|||
this.getAmount()
|
||||
this.getIsVip()
|
||||
this.getArtificer()
|
||||
console.log(11111)
|
||||
} else {
|
||||
this.ordersScore = 0;
|
||||
this.creditScore = 0;
|
||||
|
|
@ -412,7 +421,23 @@
|
|||
}
|
||||
},
|
||||
methods: {
|
||||
|
||||
goMsg() {//客服聊天
|
||||
let data = {
|
||||
userId: uni.getStorageSync('userId'),
|
||||
focusedUserId: '0',
|
||||
// userName:this.order.userName
|
||||
}
|
||||
// app/chat/insertChatConversation
|
||||
this.$Request.postJson('/app/chat/insertChatConversation', data).then(res => {
|
||||
if (res.data) {
|
||||
let id = this.ordersId == res.data.userId ? res.data.focusedUserId : this.ordersId
|
||||
uni.navigateTo({
|
||||
url: '/pages/msg/im?chatConversationId=' + res.data.chatConversationId +
|
||||
'&byUserId=' + res.data.userId
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
shangjia(e){//获取商家信息
|
||||
var that=this;
|
||||
|
||||
|
|
@ -850,23 +875,47 @@
|
|||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.kefu span{
|
||||
font-size: 14px;
|
||||
color: #1296db;
|
||||
}
|
||||
.kefu image{
|
||||
width: 50px;
|
||||
height: 50px;
|
||||
}
|
||||
.kefu{
|
||||
width: 75px;
|
||||
height: 75px;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
position: fixed;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
margin-bottom:100rpx;
|
||||
margin-right: 20px;
|
||||
border-radius: 5px;
|
||||
}
|
||||
.logon{
|
||||
background:#fff;
|
||||
border-radius: 30rpx;
|
||||
color:#019c88;
|
||||
font-size: 26rpx;
|
||||
padding: 8rpx 20rpx;
|
||||
|
||||
}
|
||||
.back-img{
|
||||
background-repeat: no-repeat;
|
||||
background-size: 100%;
|
||||
width: 84px;
|
||||
height: 84px;
|
||||
border-radius: 50%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
padding: 15rpx;
|
||||
border-radius: 50%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
position: relative;
|
||||
}
|
||||
.popop-kuang{
|
||||
width: 150rpx;
|
||||
height: 150rpx;
|
||||
position: absolute;
|
||||
}
|
||||
.wode-title{
|
||||
font-size: 36rpx;
|
||||
|
|
@ -878,7 +927,6 @@
|
|||
.wode-view{
|
||||
width: 150rpx;
|
||||
height: 80rpx;
|
||||
background: #007B6A;
|
||||
border-radius: 20rpx;
|
||||
color: #fff;
|
||||
line-height: 80rpx;
|
||||
|
|
@ -902,10 +950,11 @@
|
|||
|
||||
.headbox {
|
||||
width: 100%;
|
||||
padding: 0 40rpx;
|
||||
height: 315px;
|
||||
height: 320px;
|
||||
padding: 0 20px;
|
||||
background-image: url('../../static/index/technician15.png');
|
||||
background-size: cover;
|
||||
background-repeat: no-repeat;
|
||||
background-size: 100%;
|
||||
}
|
||||
|
||||
.xyf {
|
||||
|
|
@ -936,27 +985,32 @@
|
|||
color: #fff;
|
||||
}
|
||||
|
||||
.money_text1 {
|
||||
.money_text1{
|
||||
font-size:46rpx;
|
||||
font-weight: bold;
|
||||
font-size: 32rpx;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.money_text2{
|
||||
font-size:24rpx;
|
||||
}
|
||||
.money_text3{
|
||||
font-size:30rpx;
|
||||
font-weight: bold;
|
||||
line-height: 56rpx;
|
||||
}
|
||||
.moneybox {
|
||||
width: 100%;
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
.btnyt {
|
||||
background-color: #ffffff;
|
||||
width: 240rpx;
|
||||
background-image: linear-gradient(-48deg, #d5fff8,#eefffc,#c7f9f0);
|
||||
border: 1px solid #c7f9f0;
|
||||
color: #ffffb2;
|
||||
width: 200rpx;
|
||||
height: 70rpx;
|
||||
line-height: 70rpx;
|
||||
text-align: center;
|
||||
color: #333333;
|
||||
color: #019c88;
|
||||
font-size: 28rpx;
|
||||
border-radius: 40rpx;
|
||||
color: #333333;
|
||||
}
|
||||
|
||||
.xflist {
|
||||
|
|
@ -1022,9 +1076,47 @@
|
|||
margin-left: 10rpx;
|
||||
}
|
||||
.head-port{
|
||||
width: 55px;
|
||||
height: 55px;
|
||||
width:64px;
|
||||
height:64px;
|
||||
border-radius: 50%;
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
.avatar-section{
|
||||
padding:30rpx 0 30rpx 0;
|
||||
position: relative;
|
||||
}
|
||||
.avatar-section-text{
|
||||
font-size: 32rpx;
|
||||
color: #019c88;
|
||||
font-weight: bold;
|
||||
}
|
||||
.online-tag {
|
||||
color: #019c88;
|
||||
font-size: 26rpx;
|
||||
}
|
||||
.dengjibox {
|
||||
position: relative;
|
||||
width: 100%;
|
||||
height: 300rpx;
|
||||
background: linear-gradient(-45deg, #0fb09b, #25bca8, #3acdb9);
|
||||
//box-shadow: 0rpx 0rpx 16rpx 0rpx rgba(26,25,26,0.3);
|
||||
border-radius: 20rpx;
|
||||
color: #ffffff;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
}
|
||||
.money-name{
|
||||
font-size: 40rpx;
|
||||
}
|
||||
.money-bk{
|
||||
background: linear-gradient(-45deg, #83e5d4, #4fd3c2, #3acdb9);
|
||||
border-radius: 20rpx 20rpx 0 0;
|
||||
padding: 16rpx 20rpx;
|
||||
}
|
||||
.pages-main{
|
||||
width: 100%;
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
justify-content: flex-start;
|
||||
}
|
||||
</style>
|
||||
|
|
@ -124,11 +124,14 @@
|
|||
this.startTime = year + '-' + e.days + ' ' + e.hours
|
||||
this.yearsDate = year + '-' + e.days
|
||||
console.log(this.yearsDate)
|
||||
|
||||
if (!this.msList.includes(e.hours)) {
|
||||
this.msList.push(e.hours);
|
||||
var hours=e.hours;
|
||||
for(var i=0;i<hours.length;i++){
|
||||
if (!this.msList.includes(hours[i].hours)) {
|
||||
this.msList.push(hours[i].hours);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
console.log('忙时list' + JSON.stringify(this.msList) );
|
||||
|
||||
// this.msList.push(e.hours);
|
||||
|
|
|
|||
|
|
@ -6,37 +6,41 @@
|
|||
|
||||
<!-- sticky吸顶悬浮的菜单, 父元素必须是 mescroll -->
|
||||
<view class="jishi-index">
|
||||
<view class=" u-flex padding-lr justify-between" style="padding-top: 30px;">
|
||||
<view class="u-m-r-10 back-img"
|
||||
<view class=" u-flex justify-between avatar-section">
|
||||
<!--<view class="back-img"
|
||||
:style="{'background-image':
|
||||
technicianType=='3'?'url(../../static/grade1.png)':
|
||||
technicianType=='4'?'url(../../static/grade2.png)':
|
||||
technicianType=='5'?'url(../../static/grade3.png)':''
|
||||
technicianType=='5'?'url(../../static/grade3.gif)':''
|
||||
}">
|
||||
<image :src="avatar" class="head-port"
|
||||
@click="goNav('/pages/my/userinfo')"></image>
|
||||
</view>-->
|
||||
|
||||
<view class="back-img">
|
||||
<image :src="avatar" class="head-port" @click="goNav('/pages/my/userinfo')"></image>
|
||||
<image class="popop-kuang" v-if="technicianType" :src="technicianType=='3'?'../../static/grade1.gif':technicianType=='4'?'../../static/grade2.gif':'../../static/grade3.gif'"></image>
|
||||
</view>
|
||||
<view class="u-flex-1 " v-if="isLogin && userName">
|
||||
<view class="u-flex-1" v-if="isLogin && userName">
|
||||
<view class="u-font-18">
|
||||
<view class="flex align-center" style="margin-top: 35rpx;">
|
||||
<view class="margin-left-sm u-font-18" style="color: #ffffff;">{{ userName }}</view>
|
||||
<view class="flex align-center">
|
||||
<view class="margin-left-sm avatar-section-text">{{ userName }}</view>
|
||||
<view class="labe zhuangtai" @tap="stateSave">
|
||||
<view v-if="isTrue">已上线</view>
|
||||
<view v-if="!isTrue">已离线</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex margin-left-sm margin-top-xs"
|
||||
style="font-size: 22rpx;font-weight: 500;color: #ffffff;">
|
||||
<view v-if="renzheng == 0" @click.stop="goNav('/my/renzheng/index?classify=' + 1)">
|
||||
<view class="flex margin-left-sm margin-top-xs">
|
||||
<view class="online-tag" v-if="renzheng == 0" @click.stop="goNav('/my/renzheng/index?classify=' + 1)">
|
||||
暂未实名认证
|
||||
</view>
|
||||
<view v-if="renzheng == 1" @click.stop="goNav('/my/renzheng/index?classify=' + 1)">
|
||||
<view class="online-tag" v-if="renzheng == 1" @click.stop="goNav('/my/renzheng/index?classify=' + 1)">
|
||||
实名审核中
|
||||
</view>
|
||||
<view v-if="renzheng == 2">
|
||||
<view class="online-tag" v-if="renzheng == 2">
|
||||
已实名认证
|
||||
</view>
|
||||
<view v-if="renzheng == 3" @click.stop="goNav('/my/renzheng/index?classify=' + 1)">
|
||||
<view class="online-tag" v-if="renzheng == 3" @click.stop="goNav('/my/renzheng/index?classify=' + 1)">
|
||||
实名已拒绝
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -83,49 +87,51 @@
|
|||
</view>
|
||||
|
||||
<view class="flex justify-between padding-sm">
|
||||
<view class="progress-text">预约时间：{{ item.serveTime }}</view>
|
||||
<view class="progress-text">
|
||||
<text class="title-font text-bold">预约时间：</text>
|
||||
<text class="title-font">{{ item.serveTime }}</text>
|
||||
</view>
|
||||
<!-- <view class="text-green" v-if="item.status == 1">待支付</view> -->
|
||||
<view class="progress-status" v-if="item.status == 2">待服务</view>
|
||||
<view class="progress-status-fk" v-if="item.status == 2">待服务</view>
|
||||
<view class="progress-status" v-if="item.status == 3">待评价</view>
|
||||
<view class="progress-status" v-if="item.status == 4" style="color: #666666;">已取消</view>
|
||||
<view class="progress-status" v-if="item.status == 5">已完成</view>
|
||||
<view class="progress-status" v-if="item.status == 6">服务中</view>
|
||||
<view class="progress-status" v-if="item.status == 7">技师出发</view>
|
||||
<view class="progress-status" v-if="item.status == 8">技师到达</view>
|
||||
<view class="progress-status" v-if="item.status ==9&&!item.refusalContent">待确认</view>
|
||||
<view class="progress-status" v-if="item.status == 9&&item.refusalContent" >拒单审核中</view>
|
||||
<view class="progress-status" v-if="item.status ==10">待补单</view>
|
||||
<view class="progress-status-qx" v-if="item.status == 4">已取消</view>
|
||||
<view class="progress-status-wa" v-if="item.status == 5">已完成</view>
|
||||
<view class="progress-status-jx" v-if="item.status == 6">服务中</view>
|
||||
<view class="progress-status-cf" v-if="item.status == 7">技师出发</view>
|
||||
<view class="progress-status-dd" v-if="item.status == 8">技师到达</view>
|
||||
<view class="progress-status-qr" v-if="item.status ==9&&!item.refusalContent">待确认</view>
|
||||
<view class="progress-status-jd" v-if="item.status == 9&&item.refusalContent" >拒单审核中</view>
|
||||
<view class="progress-status-daibu" v-if="item.status ==10">待补单</view>
|
||||
<view v-if="item.overTimeOrders == 1" class="progress-status-chaoshi">[超时]</view>
|
||||
<!-- <view class="text-green" v-if="item.state ==1 ||item.state ==2">待完成</view>
|
||||
<view class="text-green" v-if="item.state ==3||item.state ==4">已完成</view> -->
|
||||
</view>
|
||||
<!-- mescroll-downwarp -->
|
||||
<view class=" u-flex padding-sm">
|
||||
<view class=" u-flex u-p-t-30 padding-sm">
|
||||
<view class="u-m-r-10">
|
||||
<u-avatar :src="item.massageImg ? item.massageImg : '../../static/logo.png'" mode="square"
|
||||
size="100">
|
||||
size="160">
|
||||
</u-avatar>
|
||||
</view>
|
||||
<view class="u-flex-1 margin-left-xs">
|
||||
<view class="u-font-16 u-line-1 top-title">
|
||||
<view class="margin-right-xs">
|
||||
{{ item.title }}
|
||||
<view class="u-font-18 text-bold u-line-1">
|
||||
<view class="value-font">
|
||||
{{item.title}}
|
||||
</view>
|
||||
</view>
|
||||
<view class="text-cut">{{ item.address }}</view>
|
||||
<view class="title-font" style="margin-top: 8px;">{{ item.address }}</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class=" u-flex padding-sm2">
|
||||
<view class="flex align-center">
|
||||
<view class="flex-sub">
|
||||
实收：￥<text class="text-df">{{ item.artificerMoneyTotal}}</text>
|
||||
</view>
|
||||
<view class="flex text-right">
|
||||
<text>【{{ item.ordersNo}}】</text>
|
||||
</view>
|
||||
<view class="flex justify-between align-center padding-sm">
|
||||
<view class="flex title-font2">
|
||||
{{ item.ordersNo }}
|
||||
</view>
|
||||
<view class="flex-sub">
|
||||
<text class="title-font">实收：</text>
|
||||
<text class="value-font text-bold" style="color: #F95900;">￥{{ item.artificerMoneyTotal }}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex u-p-t-20 justify-between align-center padding-sm">
|
||||
<view class="flex u-p-t-20 u-p-b-20 justify-between align-center padding-sm">
|
||||
|
||||
<view class="flex text-right" style="width: 100%;flex-direction: column;">
|
||||
<!-- <u-button v-if="item.status == 1" :custom-style="customStyle" shape="circle" :plain="true"
|
||||
|
|
@ -149,7 +155,7 @@
|
|||
<u-button :custom-style="customStyle1" shape="circle" :plain="true"
|
||||
@click="goZhuan(item)" v-if="item.status == 8&&item.isCanSupplement=='1'">转待补单</u-button>
|
||||
|
||||
<u-button v-if="item.status == 6" :custom-style="customStyle1" shape="circle" :plain="true"
|
||||
<u-button v-if="item.status == 6&&(item.earlyFinishReason!=null||item.endOfServiceTimer<0)" :custom-style="customStyle1" shape="circle" :plain="true"
|
||||
@click="cancel(item)">服务完成</u-button>
|
||||
<u-button v-if="item.status == 9&& !item.refusalContent" :custom-style="customStyle1" shape="circle" :plain="true"
|
||||
@click="nineState(item.ordersId)">确认接单</u-button>
|
||||
|
|
@ -316,15 +322,15 @@
|
|||
border: "8rpx",
|
||||
width: '180rpx',
|
||||
height: '54rpx',
|
||||
margin: "0 0 0 20rpx"
|
||||
margin: "0 16rpx 0 0rpx"
|
||||
},
|
||||
customStyle1: {
|
||||
color: '#096f4b',
|
||||
border: '2rpx solid #096f4b',
|
||||
color: '#019c88',
|
||||
border: '2rpx solid #019c88',
|
||||
border: "8rpx",
|
||||
width: '180rpx',
|
||||
height: '54rpx',
|
||||
margin: "0 0 0 20rpx"
|
||||
margin: " 0 16rpx 0 0rpx"
|
||||
},
|
||||
latitude: '',
|
||||
longitude: '',
|
||||
|
|
@ -577,8 +583,8 @@
|
|||
}).then(res => {
|
||||
if (res.code == 0) {
|
||||
that.$queue.showToast(res.msg);
|
||||
this.$refs.popup.close(this.type);
|
||||
|
||||
this.$refs.popup.close(this.type);
|
||||
that.mescroll.resetUpScroll()
|
||||
} else {
|
||||
that.$queue.showToast(res.msg);
|
||||
}
|
||||
|
|
@ -588,8 +594,7 @@
|
|||
icon:"error",
|
||||
title:'请填写拒单原因'
|
||||
})
|
||||
}
|
||||
|
||||
}
|
||||
},
|
||||
nineState(ordersId){//确认接单
|
||||
var that=this;
|
||||
|
|
@ -709,6 +714,9 @@
|
|||
let currentTimeStamp = new Date().getTime() / 1000;
|
||||
let formatTimeStamp = Math.floor(afterTimeStamp - currentTimeStamp);
|
||||
ret.endOfServiceTimer = formatTimeStamp;
|
||||
console.log("dddd",ret.ordersNo);
|
||||
console.log("eeee",ret.endOfServiceTimer);
|
||||
console.log("ffff",ret.earlyFinishReason);
|
||||
}
|
||||
if (this.$refs.countDownEl) this.$refs.countDownEl.update();
|
||||
})
|
||||
|
|
@ -881,16 +889,7 @@
|
|||
font-size: 26rpx;
|
||||
padding: 8rpx 20rpx;
|
||||
}
|
||||
.back-img{
|
||||
background-repeat: no-repeat;
|
||||
background-size: 100%;
|
||||
width: 84px;
|
||||
height: 84px;
|
||||
border-radius: 50%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
/deep/.u-scroll-box{
|
||||
margin-top: 26rpx;
|
||||
}
|
||||
|
|
@ -905,7 +904,7 @@
|
|||
.showBtn-view{
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
justify-content: flex-start;
|
||||
}
|
||||
.order-status{
|
||||
display: flex;
|
||||
|
|
@ -941,10 +940,8 @@
|
|||
color: #fe9130;
|
||||
}
|
||||
.flex-sub{
|
||||
width: 95%;
|
||||
text-align: left;
|
||||
text-align: right;
|
||||
font-size: 28rpx;
|
||||
margin-top: 8rpx;
|
||||
}
|
||||
.top-title{
|
||||
width: 95%;
|
||||
|
|
@ -1018,7 +1015,6 @@
|
|||
.popup-img{
|
||||
width: 55rpx;
|
||||
height: 55rpx;
|
||||
position: absolute;
|
||||
right:22rpx;
|
||||
}
|
||||
.popup-head{
|
||||
|
|
@ -1030,7 +1026,7 @@
|
|||
align-items: center;
|
||||
justify-content: space-between;
|
||||
padding: 0 15px;
|
||||
position: relative;
|
||||
position:relative;
|
||||
}
|
||||
.popup-content{
|
||||
width: 100%;
|
||||
|
|
@ -1062,7 +1058,7 @@
|
|||
height: 220rpx;
|
||||
// background: #F7F7F7 !important;
|
||||
border-radius: 21rpx 21rpx 0 0;
|
||||
margin: -113px auto 8px auto;
|
||||
margin: -180px auto 8px auto;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
|
|
@ -1136,7 +1132,7 @@
|
|||
font-size: 20upx;
|
||||
display: flex;
|
||||
padding-right: 18upx;
|
||||
background: #5abfb2 ;
|
||||
background-image: linear-gradient(to right,#30c1ad, #1bb9a5);
|
||||
padding: 10rpx;
|
||||
border-radius: 10rpx;
|
||||
}
|
||||
|
|
@ -1174,10 +1170,9 @@
|
|||
}
|
||||
}
|
||||
.head-port{
|
||||
width: 55px;
|
||||
height: 55px;
|
||||
width:64px;
|
||||
height:64px;
|
||||
border-radius: 50%;
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
/deep/.radius {
|
||||
border-radius: 20rpx;
|
||||
|
|
@ -1188,28 +1183,101 @@
|
|||
padding-top: 8rpx;
|
||||
}
|
||||
.progress-status{
|
||||
// color: #019c88;
|
||||
// font-weight: bold;
|
||||
// font-size: 30rpx;
|
||||
// margin-top: -5rpx;
|
||||
color: #fff;
|
||||
border-radius:20rpx 8rpx 20rpx 8rpx ;
|
||||
padding: 4rpx 10rpx;
|
||||
border-radius:30rpx 30rpx 30rpx 8rpx ;
|
||||
padding: 0 14rpx;
|
||||
background-image: linear-gradient(to bottom, #fe9130, #ff9868);
|
||||
font-size: 28rpx;
|
||||
font-size: 26rpx;
|
||||
line-height: 46rpx;
|
||||
}
|
||||
.progress-status-wa{
|
||||
color: #fff;
|
||||
border-radius:30rpx 30rpx 30rpx 8rpx ;
|
||||
padding: 0 14rpx;
|
||||
background-image: linear-gradient(-45deg, #7997ec, #597ad8);
|
||||
font-size: 26rpx;
|
||||
line-height: 46rpx;
|
||||
}
|
||||
.progress-status-fw{
|
||||
color: #fff;
|
||||
border-radius:30rpx 30rpx 30rpx 8rpx ;
|
||||
padding: 0 14rpx;
|
||||
background-image: linear-gradient(-45deg, #16bf5b, #099d46);
|
||||
font-size: 26rpx;
|
||||
line-height: 46rpx;
|
||||
}
|
||||
.progress-status-fk{
|
||||
color: #fff;
|
||||
border-radius:30rpx 30rpx 30rpx 8rpx ;
|
||||
padding: 0 14rpx;
|
||||
background-image: linear-gradient(-45deg, #019cdc, #40bbf3);
|
||||
font-size: 26rpx;
|
||||
line-height: 46rpx;
|
||||
}
|
||||
.progress-status-qx{
|
||||
color: #fff;
|
||||
border-radius:30rpx 30rpx 30rpx 8rpx ;
|
||||
padding: 0 14rpx;
|
||||
background-image: linear-gradient(-45deg, #adadad, #959595);
|
||||
font-size: 26rpx;
|
||||
line-height: 46rpx;
|
||||
}
|
||||
.progress-status-jx{
|
||||
color: #fff;
|
||||
border-radius:30rpx 30rpx 30rpx 8rpx ;
|
||||
padding: 0 14rpx;
|
||||
background-image: linear-gradient(-45deg, #17bd6e, #019c88);
|
||||
font-size: 26rpx;
|
||||
line-height: 46rpx;
|
||||
}
|
||||
.progress-status-cf{
|
||||
color: #fff;
|
||||
border-radius:30rpx 30rpx 30rpx 8rpx ;
|
||||
padding: 0 14rpx;
|
||||
background-image: linear-gradient(-45deg, #78d289, #62c878);
|
||||
font-size: 26rpx;
|
||||
line-height: 46rpx;
|
||||
}
|
||||
.progress-status-dd{
|
||||
color: #fff;
|
||||
border-radius:30rpx 30rpx 30rpx 8rpx ;
|
||||
padding: 0 14rpx;
|
||||
background-image: linear-gradient(-45deg, #28b1da, #3bdaa5);
|
||||
font-size: 26rpx;
|
||||
line-height: 46rpx;
|
||||
}
|
||||
.progress-status-qr{
|
||||
color: #fff;
|
||||
border-radius:30rpx 30rpx 30rpx 8rpx ;
|
||||
padding: 0 14rpx;
|
||||
background-image: linear-gradient(-45deg, #ff7673, #f15c63);
|
||||
font-size: 26rpx;
|
||||
line-height: 46rpx;
|
||||
}
|
||||
.progress-status-jd{
|
||||
color: #fff;
|
||||
border-radius:30rpx 30rpx 30rpx 8rpx ;
|
||||
padding: 0 14rpx;
|
||||
background-image: linear-gradient(-45deg, #ff8c01, #ff5600);
|
||||
font-size: 26rpx;
|
||||
line-height: 46rpx;
|
||||
}
|
||||
.progress-status-daibu{
|
||||
color: #fff;
|
||||
border-radius:30rpx 30rpx 30rpx 8rpx ;
|
||||
padding: 0 14rpx;
|
||||
background-image: linear-gradient(-45deg, #2e87dc, #40a1ff);
|
||||
font-size: 26rpx;
|
||||
line-height: 46rpx;
|
||||
}
|
||||
|
||||
.progress-status-chaoshi{
|
||||
// color: #019c88;
|
||||
// font-weight: bold;
|
||||
// font-size: 30rpx;
|
||||
// margin-top: -5rpx;
|
||||
color: #ff0000;
|
||||
border-radius:20rpx 8rpx 20rpx 8rpx ;
|
||||
padding: 4rpx 10rpx;
|
||||
font-size: 28rpx;
|
||||
color: #fff;
|
||||
border-radius:30rpx 30rpx 30rpx 8rpx ;
|
||||
padding: 0 14rpx;
|
||||
background-image: linear-gradient(-45deg, #ffb342, #ec8700);
|
||||
font-size: 26rpx;
|
||||
line-height: 46rpx;
|
||||
}
|
||||
|
||||
.order-details{
|
||||
font-size: 32rpx;
|
||||
font-weight: bold;
|
||||
|
|
@ -1225,9 +1293,9 @@
|
|||
}
|
||||
.jishi-index{
|
||||
width: 100%;
|
||||
height: 230px;
|
||||
height: 286px;
|
||||
padding: 0 20px;
|
||||
background:url('../../static/index/technician15.png');
|
||||
background-image: url('../../static/index/technician15.png');
|
||||
background-repeat: no-repeat;
|
||||
background-size: 100%;
|
||||
}
|
||||
|
|
@ -1258,4 +1326,53 @@
|
|||
.u-font-16{
|
||||
font-weight: bold;
|
||||
}
|
||||
.title-font{
|
||||
font-size: 28rpx;
|
||||
color: #666666;
|
||||
}
|
||||
.title-font2{
|
||||
font-size: 28rpx;
|
||||
color: #999;
|
||||
}
|
||||
.value-font{
|
||||
font-size: 32rpx;
|
||||
color: #333333;
|
||||
}
|
||||
|
||||
.padding-sm{
|
||||
padding: 11px 11px 0px 11px;
|
||||
}
|
||||
.avatar-section{
|
||||
padding:30rpx 0 50rpx 0;
|
||||
position: relative;
|
||||
}
|
||||
.back-img{
|
||||
padding: 15rpx;
|
||||
border-radius: 50%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
position: relative;
|
||||
}
|
||||
.popop-kuang{
|
||||
width: 150rpx;
|
||||
height: 150rpx;
|
||||
position: absolute;
|
||||
}
|
||||
.avatar-section-text{
|
||||
font-size: 32rpx;
|
||||
color: #019c88;
|
||||
font-weight: bold;
|
||||
}
|
||||
.money_text1{
|
||||
font-size:46rpx;
|
||||
font-weight: bold;
|
||||
}
|
||||
.money_text2{
|
||||
font-size:26rpx;
|
||||
}
|
||||
.online-tag {
|
||||
color: #019c88;
|
||||
font-size: 26rpx;
|
||||
}
|
||||
</style>
|
||||
|
|
@ -192,7 +192,7 @@
|
|||
.save-btn{
|
||||
margin-top: 35rpx;
|
||||
color: #FFFFFF;
|
||||
background: linear-gradient(to right, #223845, #00a85b);
|
||||
background-image: linear-gradient(-45deg, #17bd6e, #019c88);
|
||||
padding: 15rpx 40rpx;
|
||||
border-radius: 50rpx;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,18 +2,18 @@
|
|||
<view>
|
||||
<view class="page-head">
|
||||
<view class="page-head-hd">
|
||||
<view class="page-head-btn" @click="fanhui">
|
||||
<i class="btn-icon"></i>
|
||||
<view class="service-head-top-left">
|
||||
<!-- <image class="service-back" @click="fanhui" src="../../static/fanhui.png"></image> -->
|
||||
<image class="page-head-img" src="../../static/videoimg.png"></image>
|
||||
</view>
|
||||
<view class="page-head-mian">
|
||||
<view class="page-head__title">
|
||||
商家信息
|
||||
</view>
|
||||
<view class="page-head-ft">
|
||||
<view class="page-head-xuan" @click="xuanzhe">
|
||||
<image class="service-viedeimg" src="../../static/videoimg1.png"></image>
|
||||
选择
|
||||
</view>
|
||||
<view class="" @click="setVideo">
|
||||
<view class="page-head-xuan" @click="setVideo">
|
||||
<image class="service-viedeimg" src="../../static/videoimg2.png"></image>
|
||||
发布视频
|
||||
</view>
|
||||
|
||||
|
|
@ -21,13 +21,13 @@
|
|||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<scroll-view :style="'width: 100%; height: '+ (windowHeight) +'px; background-color: #000000;'" :scroll-y="true" @scrolltolower="scrolltolower" :lower-threshold="lowerThreshold">
|
||||
<view style="display: flex; flex-direction: row; flex-wrap: wrap;padding-top: 70px;">
|
||||
<scroll-view :style="'width: 100%; height: '+ (windowHeight) +'px; background-color: #f5f5f5;'" :scroll-y="true" @scrolltolower="scrolltolower" :lower-threshold="lowerThreshold">
|
||||
<view style="display: flex; flex-direction: row; flex-wrap: wrap;padding-top: 46px;">
|
||||
<checkbox-group class="checkbox-group" @change="checkboxChange">
|
||||
<view class="checkbox-group-list" v-for="(list,index) in dataList" :key="index">
|
||||
<view class="data-list">
|
||||
<image v-if="checkboxShow==1" @click="towxh5Video(list)" :src="list.picPath" mode="aspectFill" style="width: 100%; height: 100%;"></image>
|
||||
<image v-if="checkboxShow==0" :src="list.picPath" mode="aspectFill" style="width: 100%; height: 100%;"></image>
|
||||
<image v-if="checkboxShow==1" @click="towxh5Video(list)" :src="list.picPath" mode="aspectFill" style="width: 100%; height: 100%;border-radius: 10rpx;"></image>
|
||||
<image v-if="checkboxShow==0" :src="list.picPath" mode="aspectFill" style="width: 100%; height: 100%; border-radius: 10rpx;"></image>
|
||||
<checkbox v-if="checkboxShow==0" class="check-list" style="border-radius:50%;" activeBackgroundColor="#029d88" color="#029d88" :value="list.id.toString()" :checked="checkbox"/>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -35,6 +35,7 @@
|
|||
</view>
|
||||
</scroll-view>
|
||||
<view class="shanchu" v-if="checkboxShow==0" @click="deleteVodeo">
|
||||
<image class="service-deleimg" src="../../static/dele.png"></image>
|
||||
<span>删除</span>
|
||||
</view>
|
||||
<uni-popup style="width: 100%;height: 100vh;" type="center" ref="pinglun" @touchmove.stop.prevent="moveHandle">
|
||||
|
|
@ -49,6 +50,7 @@
|
|||
:show-center-play-btn='false'
|
||||
@click="jieshu"
|
||||
:src="filePath"></video>
|
||||
<view class="videoConten">{{contentVideo}}</view>
|
||||
<view class="videoHover" v-if="playShow==true" @click="kaishi">
|
||||
<image class="playState" src="@/static/play.png"></image>
|
||||
</view>
|
||||
|
|
@ -75,7 +77,8 @@
|
|||
filePath:'',
|
||||
playShow:false,
|
||||
videoId:0,
|
||||
couponId:''
|
||||
couponId:'',
|
||||
contentVideo:''
|
||||
}
|
||||
},
|
||||
onLoad() {
|
||||
|
|
@ -99,6 +102,7 @@
|
|||
}
|
||||
this.$Request.get("/app/shipinquan/delete",data).then(res => {
|
||||
if (res.code == 0) {
|
||||
this.page=1;
|
||||
this.get()
|
||||
uni.showToast({
|
||||
title:'删除成功！',
|
||||
|
|
@ -120,18 +124,29 @@
|
|||
this.checkboxShow=!this.checkboxShow
|
||||
},
|
||||
guanbi(){
|
||||
this.playShow=false;
|
||||
const videoContext = uni.createVideoContext('myVideo', this);
|
||||
videoContext.pause(); // 播放视频
|
||||
this.$refs.pinglun.close("center")
|
||||
},
|
||||
jieshu(){
|
||||
this.playShow=true;
|
||||
const videoContext = uni.createVideoContext('myVideo', this);
|
||||
videoContext.pause(); // 播放视频
|
||||
this.playShow=true
|
||||
},
|
||||
kaishi(){
|
||||
this.playShow=false;
|
||||
const videoContext = uni.createVideoContext('myVideo', this);
|
||||
videoContext.src = this.filePath; // 设置视频源
|
||||
videoContext.play(); // 播放视频
|
||||
this.playShow=false
|
||||
},
|
||||
towxh5Video(item){
|
||||
this.playShow=false;
|
||||
console.log(" this.playShow", this.playShow)
|
||||
this.filePath=item.filePath;
|
||||
this.contentVideo=item.content
|
||||
this.videoId=item.id
|
||||
this.$refs.pinglun.open("center")
|
||||
},
|
||||
setVideo(){//发布视频
|
||||
uni.navigateTo({
|
||||
|
|
@ -143,11 +158,7 @@
|
|||
url:'/pages/my/index'
|
||||
})
|
||||
},
|
||||
towxh5Video(item){
|
||||
this.filePath=item.filePath;
|
||||
this.videoId=item.id
|
||||
this.$refs.pinglun.open("center")
|
||||
},
|
||||
|
||||
towxh5Videos(index){
|
||||
let list = []
|
||||
let videoNumber = 36;//（请输入 6 的倍数，来控制 DOM 节点的总视频数量）
|
||||
|
|
@ -199,12 +210,13 @@
|
|||
// 这里就是数据加载完以后再向后端发送数据的地方
|
||||
this.page++;
|
||||
var data={
|
||||
createBy:uni.getStorageSync('userId'),
|
||||
page: this.page,
|
||||
limit:this.limit,
|
||||
}
|
||||
this.$Request.get("/app/shipinquan/list", data).then(res => {
|
||||
if (res.code == 0) {
|
||||
var msg = res.data.records
|
||||
var msg = res.data.list
|
||||
for (let i = 0; i < msg.length; i++) {
|
||||
this.dataList.push(msg[i])
|
||||
}
|
||||
|
|
@ -231,12 +243,13 @@
|
|||
},
|
||||
get(){
|
||||
var data={
|
||||
createBy:uni.getStorageSync('userId'),
|
||||
page: this.page,
|
||||
limit:this.limit,
|
||||
}
|
||||
this.$Request.get("/app/shipinquan/list", data).then(res => {
|
||||
if (res.code == 0) {
|
||||
this.dataList=res.data.records
|
||||
this.dataList=res.data.list
|
||||
} else {
|
||||
uni.showToast({
|
||||
title: res.msg,
|
||||
|
|
@ -264,36 +277,40 @@
|
|||
<style scoped>
|
||||
.shanchu{
|
||||
width: 100%;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
text-align: center;
|
||||
background-color: #fff;
|
||||
height: 48px;
|
||||
position: fixed;
|
||||
bottom:12px;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
margin: 0 auto;
|
||||
}
|
||||
.check-list{
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
margin-left: 5px;
|
||||
margin-bottom: 5px;
|
||||
left: 0rpx;
|
||||
margin-bottom:10px;
|
||||
margin-left: 10px;
|
||||
}
|
||||
.data-list{
|
||||
width:100%;
|
||||
height:100%;
|
||||
background-color: #000000;
|
||||
|
||||
background-color: #fff;
|
||||
}
|
||||
.checkbox-group-list{
|
||||
position: relative;
|
||||
width: 33%;
|
||||
height: 350upx;
|
||||
width:48%;
|
||||
margin: 0 auto;
|
||||
height:400upx;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
flex-wrap: wrap;
|
||||
margin-top: 5upx;
|
||||
margin-left: 1px;
|
||||
margin-top:12upx;
|
||||
margin-left:2px;
|
||||
}
|
||||
.checkbox-group{
|
||||
width: 100%;
|
||||
width:96%;
|
||||
margin: 0 auto;
|
||||
height: 100%;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
|
|
@ -301,19 +318,42 @@
|
|||
}
|
||||
/deep/.uni-checkbox-input{
|
||||
border-radius: 50%;
|
||||
width: 26px;
|
||||
height: 26px;
|
||||
width: 23px;
|
||||
height: 24px;
|
||||
}
|
||||
.page-head-xuan{
|
||||
margin-left: 10px;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
font-size: 24rpx;
|
||||
color: #333;
|
||||
padding:10rpx 20rpx;
|
||||
border: 1px solid #333;
|
||||
border-radius: 30rpx;
|
||||
background: #f0f0f0;
|
||||
}
|
||||
.page-head-mian{
|
||||
width: 60%;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
}
|
||||
.videoConten{
|
||||
width: 70%;
|
||||
position: absolute;
|
||||
bottom: 0px;
|
||||
margin-bottom: 60px;
|
||||
height: 30px;
|
||||
display: -webkit-box;
|
||||
-webkit-box-orient: vertical;
|
||||
-webkit-line-clamp: 2; /* 定义文本的行数 */
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
word-break: break-all;
|
||||
margin-left: 15px;
|
||||
|
||||
}
|
||||
.videoHover{
|
||||
width: 76px;
|
||||
height: 76px;
|
||||
|
|
@ -360,8 +400,6 @@
|
|||
}
|
||||
|
||||
.page-head-ft{
|
||||
display: -webkit-box;
|
||||
display: -webkit-flex;
|
||||
display: flex;
|
||||
-webkit-box-align: center;
|
||||
-webkit-align-items: center;
|
||||
|
|
@ -372,6 +410,7 @@
|
|||
flex-direction: row-reverse;
|
||||
font-size: 13px;
|
||||
box-sizing: border-box;
|
||||
margin-right: 20rpx;
|
||||
}
|
||||
.btn-icon{
|
||||
color: rgb(0, 0, 0);
|
||||
|
|
@ -430,4 +469,29 @@
|
|||
transition-property: all;
|
||||
color: rgb(0, 0, 0);
|
||||
}
|
||||
.service-back{
|
||||
width: 20px;
|
||||
height: 36rpx;
|
||||
margin-right:5px;
|
||||
margin-left: 10rpx;
|
||||
}
|
||||
.service-head-top-left{
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
}
|
||||
.page-head-img{
|
||||
width: 120rpx;
|
||||
height: 40rpx;
|
||||
margin-left:16rpx;
|
||||
}
|
||||
.service-viedeimg{
|
||||
width: 32rpx;
|
||||
height: 32rpx;
|
||||
margin-right: 10rpx;
|
||||
}
|
||||
.service-deleimg{
|
||||
width: 40rpx;
|
||||
height:40rpx;}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -1,12 +1,11 @@
|
|||
<template>
|
||||
<view style="padding-bottom: 100upx; margin-top: 20rpx;">
|
||||
<view class=" padding bg radius margin">
|
||||
<view>
|
||||
<view class="padding bg radius margin">
|
||||
<view class="padding-top">发布内容</view>
|
||||
<view class="margin-tb-sm">
|
||||
<u-input v-model="form.describes" style="border-radius: 20rpx;"
|
||||
type="textarea" height="200" placeholde="请填写发布内容" maxlengt="200" :clearable="false" />
|
||||
</view>
|
||||
<view style="height: 15rpx;"></view>
|
||||
</view>
|
||||
<view class=" padding bg radius margin">
|
||||
<view class="margin-top-sm">上传视频</view>
|
||||
|
|
@ -21,12 +20,10 @@
|
|||
</view>
|
||||
</view>
|
||||
<view class="margin-top" @click="addvideo" v-if="videosList.length<=0">
|
||||
<view style="width: 200rpx;height: 200rpx;background: #f7f8fa;"
|
||||
class="flex justify-center align-center">
|
||||
<view class="flex justify-center align-center video-img">
|
||||
<view>
|
||||
<view class="text-center">
|
||||
<image src="../../static/images/my/avatar.png" style="width: 80rpx;height: 80rpx;">
|
||||
</image>
|
||||
<image src="../../static/images/my/video.png" style="width: 80rpx;height: 80rpx;"></image>
|
||||
</view>
|
||||
<view class="text-center add-word">添加视频</view>
|
||||
</view>
|
||||
|
|
@ -46,24 +43,20 @@
|
|||
</view>
|
||||
</view>
|
||||
<view class="margin-top" @click="addImage(4)" v-if="form.headImg.length<=0">
|
||||
<view style="width: 200rpx;height: 200rpx;background: #f7f8fa;"
|
||||
class="flex justify-center align-center">
|
||||
<view class="flex justify-center align-center video-img">
|
||||
<view>
|
||||
<view class="text-center">
|
||||
<image src="../../static/images/my/avatar.png" style="width: 80rpx;height: 80rpx;">
|
||||
</image>
|
||||
<image src="../../static/images/my/avatar.png" style="width: 80rpx;height: 80rpx;"></image>
|
||||
</view>
|
||||
<view class="text-center add-word">添加头像</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
|
||||
|
||||
<view class="tabbar" style="background: linear-gradient(to right, #019c88, #2dbe93); border-radius: 50rpx;"
|
||||
@click="submit()">提交发布
|
||||
<view class="push-button">
|
||||
<view class="tabbar"
|
||||
@click="submit()">发布
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
|
@ -132,8 +125,8 @@
|
|||
icon: 'none'
|
||||
})
|
||||
setTimeout(function() {
|
||||
uni.switchTab({
|
||||
url: '/pages/my/index'
|
||||
uni.navigateTo({
|
||||
url: '/pages/video/index'
|
||||
})
|
||||
}, 1000)
|
||||
} else {
|
||||
|
|
@ -207,11 +200,10 @@
|
|||
|
||||
.bg {
|
||||
width: 94%;
|
||||
margin:30rpx auto;
|
||||
margin:20rpx auto;
|
||||
background-color: #FFFFFF;
|
||||
padding: 20rpx 36rpx;
|
||||
border-radius: 26rpx;
|
||||
|
||||
}
|
||||
.add-word{
|
||||
font-size: 26rpx;
|
||||
|
|
@ -232,14 +224,14 @@
|
|||
flex: 200rpx 1 !important;
|
||||
}
|
||||
|
||||
.footer {
|
||||
/*.footer {
|
||||
padding-left: 30upx;
|
||||
font-size: 24upx;
|
||||
color: #666666;
|
||||
text-align: center;
|
||||
display: flex;
|
||||
margin-bottom: 20rpx;
|
||||
}
|
||||
}*/
|
||||
|
||||
.u-input__input {
|
||||
color: balck !important;
|
||||
|
|
@ -250,24 +242,34 @@
|
|||
line-height: 78upx;
|
||||
/* background: #f7f7f7; */
|
||||
}
|
||||
|
||||
.push-button{
|
||||
width: 100%;
|
||||
height: 48px;
|
||||
position: fixed;
|
||||
bottom: 0px;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
margin: 0 auto;
|
||||
}
|
||||
.tabbar {
|
||||
width: 690upx;
|
||||
height: 86upx;
|
||||
background: #019c88;
|
||||
border-radius: 8upx;
|
||||
display: inline-block;
|
||||
width: 92%;
|
||||
margin: 0 auto;
|
||||
text-align: center;
|
||||
line-height: 86upx;
|
||||
color: #FFFFFF;
|
||||
margin-top: 20rpx;
|
||||
text-align: center;
|
||||
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
|
||||
height: 40px;
|
||||
border-radius: 28px;
|
||||
color: #ffffff;
|
||||
line-height: 40px;
|
||||
margin-top: 4px;
|
||||
font-size: 17px;
|
||||
}
|
||||
|
||||
.popup_pay {
|
||||
|
||||
width: 100%;
|
||||
position: relative;
|
||||
padding-bottom: 45rpx;
|
||||
padding-bottom: 0rpx;
|
||||
/* height: 160px; */
|
||||
/* #ifndef MP-WEIXIN */
|
||||
/* height: 130px; */
|
||||
|
|
@ -296,4 +298,10 @@
|
|||
.bgCol2 {
|
||||
color: #557EFD;
|
||||
}
|
||||
.video-img{
|
||||
width: 200rpx;
|
||||
height: 200rpx;
|
||||
background: #f7f8fa;
|
||||
border-radius: 20rpx;
|
||||
}
|
||||
</style>
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 177 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 56 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 104 KiB |
|
|
@ -0,0 +1,615 @@
|
|||
page{
|
||||
background-color: #e5e5e5;
|
||||
}
|
||||
@font-face {font-family:"HMfont-home";src:url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAn8AAsAAAAAE1wAAAmvAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCFDAqWYJI9ATYCJANACyIABCAFhFUHgV8bThBRlFFWNdkXBXbDsSFQq221McNWrxUbYqGhiTju98MTeXqNh/9fo90388cEMe0bwSOJRIjavZIgESqnE5J5JqQVDZH/XdNfoHSAjqKqRsA+Tf/Ruya33E/bkdHsJtycY2XWAGbM5oenzf173A3lHrEilsmMbu74Y5VmYtxpgza9DMxkWL0gfjGbGRE54AL2f2ut3h2u8Q7RaZRCjDPLIv8cfAUR30MtEUWbSReVJkk0RB4lWWkNg7WVA1sBKmIUdr0uzibQOmxA4vrWwQXkJUweKHPfdwXkA+FSik2o1aVizyTegEKdvWINwGv59bEGY9GeTJFjW95pswIrzz3LYi//0O4JEaDrY3DZjxwXgUR8V3IfIeXARaloVRXT3mK/tsi3LubcJfese8l96Xbd1l1ve2z7eJp5lv3zB7URSdJNYd3Dfm7UUxxkGu0sLFcbVEa5pP3D6/QmokQw3OGzfJp/2kBkLJYQDYuziJbFJUSweIkoWXQRNYuEGFi0BLzFOhAjS4+InKUPRGI5I2a+kg7VSWUGoXoos2BNmGIWexwFroD8IUD6C1A9lYp8F3ClwsFgcgPdNpN08v1czkEOJ4aeieaC3QyVfb9PX2kbn9/0CwTeNAm79H1Kc2x3i9C7LcEZtMSLfE6T4aM+YWOm06dZ5cm9I+xoYw+rqGlScKKlHytu9h6Dw0E5nXK7nbTZknT1jFldR9cuzNMz9Srf7FydqpYW5mRr6Dq1OC9HqzYzoiw1cjohV2tX1Ji1K9bSdVkEbaxS1xQwpmpVpUFheyyzPyGdbXKHexkByib+vtgeK1X75xKqWl+grUNIbRZDXT31tBMiPZAyF0KmniCQhSgACkh5+gIxtvTS/si+VjbAuY6SMdCzbqInzwkjk5ENzMCkNv+ghQQ0qSSAUGmAMQoBozoAIrUe6qpzM+tma1T1jDgvVzdBWcIcLT170njGQU3cCpnUTSdkHH3ltwPHpKotTIP6HH12Lvd4czCWgbJYhY1U5ddlTCICSs1is0in8tXExk7VVRuMQhIQGgOtFcolPmMkIqDVduTGEOn1jI4gFERmSUsv3rGmoKUEQLITLUyzqpFukq8T6U+omVQsT8XHxsnipPEyBAlKNmkNMlMJgOT5Tpsoo2RGP3lOTQyk5GRBgJKw2WQsarWzSa1aLF/+UBk2PkA3wEkBM/RwOLJ0ORWiVCR3YYAAFyIlAdaNqEnmh0sTqOsAq97R85Jt+HGHrNKWgDHmxOPxumKmRGzudayPtogu9D2Zx688C3D6XJSgpgF6MJbomdtyOYBgcXOGSgMAPXqy+F11pMYHlFLCkkKM0S1T+U5SN0Ynh39SxcxmTPNHrTFIuieyxYgZXSDUAPpLLT2ZciVvihOh05k+JIAjoL7HtNsVFc5Rl+1hgAAIlNqGX3GEK0llMm0nZUdmhQzymg3Q9j6yO4FQsmqtQbXmZ+z+sOynUrt3nmbeXu3MYW9f8y38128LpWAVeyLMz4cTORbEDPYKHU19Oyx0OF12GIhfEx+/RRIm2RzPeIPE2yYRM7HBWBx+GvANWXAlMYcmWriz1/Tt2bk+jq7CdOzMu5zsn3zZXwg2Gu14YCBuh3NggN0DI8BbJpCXZb2I4xh+kdAmbU0IA6HYquya81nqYSk87Xgi35ur4HnxZWEvnoLrzbOEjHmJiY2JjV6I8c4ynSEsJTKcHxuWYPRFFleV2Sbi0Dsk4XmDSToXTMnUnW/PW9J9W4UCgP+h0rTi9tiJd6qQgk2lPI/KKeybAPx+c7vZHdimbruzyCP9iZvd0VuBuIniuXirHQ8oG2IThFIUI8QOhjfNMg86GH4Bv4ixLlr4BDi2wDDwXTYYTgfnBJur1nAw2yGngw96JhQo+48cMWVE8kWwcA55ZuzwkSP/mpp9D6wFm2e1Bc8cPVraL2Ng7y6KfSNHqQfTYByYMmbT73WNmwZs6m8sBR54XCndTHwvu6v+8N+Jze9/jeGd8bpoHePtMv0/9U6e78bTtf+aly55P40cNtJ3PH3U6xQ9DkRNos+Chp2TpNwX4lZOwkTa4nOLPxpMLc8Sm0srSwD6Y1KW7ftPZ68x3DWS8d4cJbAKE6QJEfRrhAafMLV0RoCRLhKdBaJzNtzPD7dxLIgZ7Al4006exyHEYXMewjqApFokPRIu9FvLiPf96uWlpuZmRZKiH1i0OCNj1ar7zSDqYiRbCQsMrKUXZswxBkQEbCmv2RJgKK82+UcGbpk+0woVSxekQrYCzp4Hk30E3oHhAh+4fLcOPCfzOVu3cvKkHAWzNAVyjAyOQsrJix47n0OZpbTUDKdJp8CZs+BkAKfMnDkF+kJmmrcN4OSZs8CRuwZ+N76gampCxtj83XWO5X1GYc7hIypq+N32eTe6Wr/GfXW5GukBLnvJ1gEPhlmsuUHzg3Osp/vJCZ4flGsFf27fjV18spjdTfQUuVANcgldRA3hKhSUutCGgGhDaMo0tXMHwiUq3gG5entO2xmnECa3H53AjRpKFFYIK7qrHjMJ75sEC91BPlGc0TlZY9qlsdcuZaXy0D3hfz4cmLd2WzbK3Xhhdw7c2VLCxtxsFCMEo8bArEww9ruOrc5joK9g1xp85MghQ4wyuPV71+/tMVxAMmzA1lSt+WmbjFkwL/lV6az7APzZ5qvVmmy7b1bJGrTDhmRfMBYbWMZmNOu3bJdPlLL/5WOR2XZCTJpmU4mx8lv9Fg76T8NagO4vUacJ+n/Sr0b/LYb8+1z5QCb935a0m6WWYXzwh4DO2Sa9g2jEnJ6tYwTU5jp7N2RmaHkn/gjEb/fXpmpXbkpAGaAv7pnKAfdc6bg4GZx1L3QuQ8lVC3BvXbC8f2eHQEqkBuc9aO6h9849M3oPucrgAyQY/HEv7PYJJQy23Ft3/R+xczqmsHWDgrDCyzfcl1o5ehKxnUOr5Bm6NhTGR4u1rtDEvlZ8dGgklLeNCk3ZbeKaO0bkcMfoKt+6ng/DUPPI6AAlDXlE0dzwsKPadkjqKjDXGEgg4b2CK7vx65M0xSlPmNsOA58/g1xWSDDKeq/KV5AR89+zc6OGjKSKtxUqR4NtF47VuMZemcTBDQxGqzqqrXIMCnm2xkXq1QJIIkO8EpmROcOkIyevYmhUqurWBmgCe4U5WJFHiiLKqKKOJtrooo8hxphihl6g5bGv3MAXkfBvPaFbVq6ga4Uq+wWdEfo6NVTmr1oVkYoye2NvfCWLmYQx0sjozFSxszhZ4Ctjb7QtavLQDNa0L5HRZQYJYxrNLbJR4QhZvOV46Fm/lqB428nsrJSx/OwbEgYA') format('woff2');}
|
||||
.icon {
|
||||
font-family:"HMfont-home" !important;
|
||||
font-size:56upx;
|
||||
font-style:normal;
|
||||
color: #333;
|
||||
&.biaoqing:before {
|
||||
content: "\e797";
|
||||
}
|
||||
&.jianpan:before {
|
||||
content: "\e7b2";
|
||||
}
|
||||
&.yuyin:before {
|
||||
content: "\e805";
|
||||
}
|
||||
&.tupian:before {
|
||||
content: "\e639";
|
||||
}
|
||||
&.chehui:before {
|
||||
content: "\e904";
|
||||
}
|
||||
&.luyin:before {
|
||||
content: "\e905";
|
||||
}
|
||||
&.luyin2:before {
|
||||
content: "\e677";
|
||||
}
|
||||
&.other-voice:before {
|
||||
content: "\e667";
|
||||
}
|
||||
&.my-voice:before {
|
||||
content: "\e906";
|
||||
}
|
||||
&.hongbao:before {
|
||||
content: "\e626";
|
||||
}
|
||||
&.tupian2:before {
|
||||
content: "\e674";
|
||||
}
|
||||
&.paizhao:before {
|
||||
content: "\e63e";
|
||||
}
|
||||
&.add:before {
|
||||
content: "\e655";
|
||||
}
|
||||
&.close:before {
|
||||
content: "\e607";
|
||||
}
|
||||
&.to:before {
|
||||
content: "\e675";
|
||||
}
|
||||
}
|
||||
.hidden{
|
||||
display: none !important;
|
||||
}
|
||||
.popup-layer{
|
||||
&.showLayer{transform: translate3d(0,-42vw,0);}
|
||||
transition: all .15s linear;
|
||||
width: 96%;
|
||||
height: 42vw;
|
||||
padding: 20upx 2%;
|
||||
background-color: #f3f3f3;
|
||||
border-top: solid 1upx #ddd;
|
||||
position: fixed;
|
||||
z-index: 20;
|
||||
top: 100%;
|
||||
.emoji-swiper{
|
||||
height: 40vw;
|
||||
swiper-item{
|
||||
display: flex;
|
||||
align-content: flex-start;
|
||||
flex-wrap: wrap;
|
||||
view{
|
||||
width: 12vw;
|
||||
height: 12vw;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
image{
|
||||
width: 8.4vw;
|
||||
height: 8.4vw;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.more-layer{
|
||||
width: 100%;
|
||||
height: 42vw;
|
||||
.list{
|
||||
width: 100%;
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
.box{
|
||||
width: 18vw;
|
||||
height: 18vw;
|
||||
border-radius: 20upx;
|
||||
background-color: #fff;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
margin: 0 3vw 2vw 3vw;
|
||||
.icon{
|
||||
font-size: 70upx;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.input-box{
|
||||
width: 98%;
|
||||
min-height: 100upx;
|
||||
padding: 0 1%;
|
||||
background-color: #f2f2f2;
|
||||
display: flex;
|
||||
position: fixed;
|
||||
z-index: 20;
|
||||
bottom:-2upx;
|
||||
&.showLayer{transform: translate3d(0,-42vw,0);}
|
||||
transition: all .15s linear;
|
||||
border-bottom: solid 1upx #ddd;
|
||||
.voice,.more{
|
||||
flex-shrink: 0;
|
||||
width: 90upx;
|
||||
height: 100upx;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.send{
|
||||
//H5发送按钮左边距
|
||||
/* #ifdef H5 */
|
||||
margin-left: 20upx;
|
||||
/* #endif */
|
||||
flex-shrink: 0;
|
||||
width: 100upx;
|
||||
height: 100upx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
.btn{
|
||||
width: 90upx;
|
||||
height: 56upx;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
background:linear-gradient(to right,#f09b37,#eb632c);
|
||||
color: #fff;
|
||||
border-radius: 6upx;
|
||||
font-size: 24upx;
|
||||
}
|
||||
}
|
||||
.textbox{
|
||||
width: 100%;
|
||||
min-height: 70upx;
|
||||
margin-top: 15upx;
|
||||
.voice-mode{
|
||||
width: calc(100% - 2upx);
|
||||
height: 68upx;
|
||||
border-radius: 70upx;
|
||||
border:solid 1upx #cdcdcd;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
font-size: 28upx;
|
||||
background-color: #fff;
|
||||
color: #555;
|
||||
&.recording{
|
||||
background-color: #e5e5e5;
|
||||
}
|
||||
}
|
||||
.text-mode{
|
||||
width: 100%;
|
||||
min-height: 70upx;
|
||||
display: flex;
|
||||
background-color: #fff;
|
||||
border-radius: 40upx;
|
||||
.box{
|
||||
width: 100%;
|
||||
padding-left: 30upx;
|
||||
min-height: 70upx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
textarea{
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
.em{
|
||||
flex-shrink: 0;
|
||||
width: 80upx;
|
||||
padding-left: 10upx;
|
||||
height: 70upx;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.record{
|
||||
width: 40vw;
|
||||
height: 40vw;
|
||||
position: fixed;
|
||||
top: 55%;
|
||||
left: 30%;
|
||||
background-color: rgba(0,0,0,.6);
|
||||
border-radius: 20upx;
|
||||
.ing{
|
||||
width: 100%;
|
||||
height: 30vw;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
// 模拟录音音效动画
|
||||
@keyframes volatility {
|
||||
0% {background-position: 0% 130%;}
|
||||
20% {background-position: 0% 150%;}
|
||||
30% {background-position: 0% 155%;}
|
||||
40% {background-position: 0% 150%;}
|
||||
50% {background-position: 0% 145%;}
|
||||
70% {background-position: 0% 150%;}
|
||||
80% {background-position: 0% 155%;}
|
||||
90% {background-position: 0% 140%;}
|
||||
100% {background-position: 0% 135%;}
|
||||
}
|
||||
.icon{
|
||||
background-image:linear-gradient(to bottom,#f09b37,#fff 50%);
|
||||
background-size:100% 200%;
|
||||
animation: volatility 1.5s ease-in-out -1.5s infinite alternate;
|
||||
-webkit-background-clip:text;
|
||||
-webkit-text-fill-color:transparent;
|
||||
font-size: 150upx;
|
||||
color: #f09b37;
|
||||
}
|
||||
}
|
||||
.cancel{
|
||||
width: 100%;
|
||||
height: 30vw;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
.icon{
|
||||
color: #fff;
|
||||
font-size: 150upx;
|
||||
}
|
||||
}
|
||||
.tis{
|
||||
width: 100%;
|
||||
height: 10vw;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
font-size: 28upx;
|
||||
color: #fff;
|
||||
&.change{
|
||||
color: #f09b37;
|
||||
}
|
||||
}
|
||||
}
|
||||
.content{
|
||||
width: 100%;
|
||||
.msg-list{
|
||||
width: 96%;
|
||||
padding: 0 2%;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
bottom: 100upx;
|
||||
.loading{
|
||||
//loading动画
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
@keyframes stretchdelay {
|
||||
0%, 40%, 100% {
|
||||
transform: scaleY(0.6);
|
||||
}
|
||||
20% {
|
||||
transform: scaleY(1.0);
|
||||
}
|
||||
}
|
||||
.spinner {
|
||||
margin: 20upx 0;
|
||||
width: 60upx;
|
||||
height: 100upx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
view {
|
||||
background-color: #f06c7a;
|
||||
height: 50upx;
|
||||
width: 6upx;
|
||||
border-radius: 6upx;
|
||||
animation: stretchdelay 1.2s infinite ease-in-out;
|
||||
}
|
||||
.rect2 {
|
||||
animation-delay: -1.1s;
|
||||
}
|
||||
.rect3 {
|
||||
animation-delay: -1.0s;
|
||||
}
|
||||
.rect4 {
|
||||
animation-delay: -0.9s;
|
||||
}
|
||||
.rect5 {
|
||||
animation-delay: -0.8s;
|
||||
}
|
||||
}
|
||||
}
|
||||
.row{
|
||||
.system{
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
view{
|
||||
padding: 0 30upx;
|
||||
height: 50upx;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
background-color: #c9c9c9;
|
||||
color: #fff;
|
||||
font-size: 24upx;
|
||||
border-radius: 40upx;
|
||||
}
|
||||
.red-envelope{
|
||||
image{
|
||||
margin-right: 5upx;
|
||||
width: 30upx;
|
||||
height: 30upx;
|
||||
}
|
||||
}
|
||||
}
|
||||
&:first-child{
|
||||
margin-top: 20upx;
|
||||
}
|
||||
padding: 20upx 0;
|
||||
.my .left,.other .right{
|
||||
width: 100%;
|
||||
display: flex;
|
||||
.bubble{
|
||||
max-width: 70%;
|
||||
min-height: 50upx;
|
||||
border-radius: 10upx;
|
||||
padding: 15upx 20upx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
font-size: 32upx;
|
||||
word-break: break-word;
|
||||
&.img{
|
||||
background-color: transparent;
|
||||
padding:0;
|
||||
overflow: hidden;
|
||||
image{
|
||||
max-width: 350upx;
|
||||
max-height: 350upx;
|
||||
}
|
||||
}
|
||||
&.red-envelope{
|
||||
background-color: transparent;
|
||||
padding:0;
|
||||
overflow: hidden;
|
||||
position: relative;
|
||||
justify-content: center;
|
||||
align-items: flex-start;
|
||||
image{
|
||||
width: 250upx;
|
||||
height: 313upx;
|
||||
}
|
||||
.tis{
|
||||
position: absolute;
|
||||
top: 6%;
|
||||
font-size: 26upx;
|
||||
color: #9c1712;
|
||||
}
|
||||
.blessing{
|
||||
position: absolute;
|
||||
bottom: 14%;
|
||||
color: #e9b874;
|
||||
width: 80%;
|
||||
text-align: center;
|
||||
overflow: hidden;
|
||||
// 最多两行
|
||||
display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 2;
|
||||
}
|
||||
}
|
||||
&.voice{
|
||||
.icon{
|
||||
font-size: 40upx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
.icon:after
|
||||
{
|
||||
content:" ";
|
||||
width: 53upx;
|
||||
height: 53upx;
|
||||
border-radius: 100%;
|
||||
position: absolute;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
.length{
|
||||
font-size: 28upx;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.my .right,.other .left{
|
||||
flex-shrink: 0;
|
||||
width: 80upx;
|
||||
height: 80upx;
|
||||
image{
|
||||
width: 80upx;
|
||||
height: 80upx;
|
||||
border-radius: 10upx;
|
||||
}
|
||||
}
|
||||
.my{
|
||||
width: 100%;
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
.left{
|
||||
min-height: 80upx;
|
||||
|
||||
align-items: center;
|
||||
justify-content: flex-end;
|
||||
.bubble{
|
||||
background-color: #f06c7a;
|
||||
color: #fff;
|
||||
|
||||
&.voice{
|
||||
.icon{
|
||||
color: #fff;
|
||||
}
|
||||
.length{
|
||||
margin-right: 20upx;
|
||||
}
|
||||
}
|
||||
&.play{
|
||||
@keyframes my-play {
|
||||
0% {
|
||||
transform: translateX(80%);
|
||||
}
|
||||
100% {
|
||||
transform: translateX(0%);
|
||||
}
|
||||
}
|
||||
.icon:after
|
||||
{
|
||||
border-left: solid 10upx rgba(240,108,122,.5);
|
||||
animation: my-play 1s linear infinite;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.right{
|
||||
margin-left: 15upx;
|
||||
}
|
||||
}
|
||||
.other{
|
||||
width: 100%;
|
||||
display: flex;
|
||||
.left{
|
||||
margin-right: 15upx;
|
||||
}
|
||||
.right{
|
||||
flex-wrap: wrap;
|
||||
.username{
|
||||
width: 100%;
|
||||
height: 45upx;
|
||||
font-size: 24upx;
|
||||
color: #999;
|
||||
display: flex;
|
||||
.name{
|
||||
margin-right: 50upx;
|
||||
}
|
||||
}
|
||||
.bubble{
|
||||
background-color: #fff;
|
||||
color: #333;
|
||||
&.voice{
|
||||
.icon{
|
||||
color: #333;
|
||||
|
||||
}
|
||||
.length{
|
||||
margin-left: 20upx;
|
||||
}
|
||||
}
|
||||
&.play{
|
||||
@keyframes other-play {
|
||||
0% {
|
||||
transform: translateX(-80%);
|
||||
}
|
||||
100% {
|
||||
transform: translateX(0%);
|
||||
}
|
||||
}
|
||||
.icon:after
|
||||
{
|
||||
border-right: solid 10upx rgba(255,255,255,.8);
|
||||
|
||||
animation: other-play 1s linear infinite;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.windows{
|
||||
|
||||
.mask{
|
||||
position: fixed;
|
||||
top: 100%;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
z-index: 1000;
|
||||
background-color: rgba(0,0,0,.6);
|
||||
opacity: 0;
|
||||
transition: opacity .2s ease-out;
|
||||
}
|
||||
.layer{
|
||||
position: fixed;
|
||||
width: 80%;
|
||||
height: 70%;
|
||||
left: 10%;
|
||||
z-index: 1001;
|
||||
border-radius: 20upx;
|
||||
overflow: hidden;
|
||||
top:100%;
|
||||
transform: scale3d(.5,.5,1);
|
||||
transition: all .2s ease-out;
|
||||
}
|
||||
&.show{
|
||||
display: block;
|
||||
.mask{
|
||||
top: 0;
|
||||
opacity: 1;
|
||||
}
|
||||
.layer{
|
||||
transform: translate3d(0,-85vh,0) scale3d(1,1,1);
|
||||
}
|
||||
}
|
||||
&.hide{
|
||||
display: block;
|
||||
.mask{
|
||||
top: 0;
|
||||
opacity: 0;
|
||||
}
|
||||
.layer{
|
||||
//transform: translate3d(0,-85vh,0) scale3d(.5,.5,1);
|
||||
}
|
||||
}
|
||||
}
|
||||
.open-redenvelope{
|
||||
width: 100%;
|
||||
height: 70vh;
|
||||
background-color: #cf3c35;
|
||||
position: relative;
|
||||
.top{
|
||||
width: 100%;
|
||||
background-color: #fe5454;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
flex-wrap: wrap;
|
||||
border-radius: 0 0 100% 100%;
|
||||
box-shadow: inset 0 -20upx 0 #9c1712;
|
||||
.close-btn{
|
||||
width: 100%;
|
||||
height: 80upx;
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
margin-bottom: 30upx;
|
||||
.icon{
|
||||
color: #9c1712;
|
||||
margin-top: 10upx;
|
||||
margin-right: 10upx;
|
||||
}
|
||||
}
|
||||
image{
|
||||
width: 130upx;
|
||||
height: 130upx;
|
||||
border: solid 12upx #cf3c35;
|
||||
border-radius: 100%;
|
||||
|
||||
margin-bottom: -65upx;
|
||||
}
|
||||
margin-bottom: 65upx;
|
||||
}
|
||||
.from,.blessing,.money,.showDetails{
|
||||
width: 90%;
|
||||
padding: 5upx 5%;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
font-size: 32upx;
|
||||
color: #fff;
|
||||
}
|
||||
.money{
|
||||
font-size: 100upx;
|
||||
color: #f8d757;
|
||||
display: flex;
|
||||
padding-top: 20upx;
|
||||
}
|
||||
.showDetails{
|
||||
position: absolute;
|
||||
bottom: 20upx;
|
||||
align-items: center;
|
||||
font-size: 28upx;
|
||||
color: #f8d757;
|
||||
.icon{
|
||||
font-size: 26upx;
|
||||
color: #f8d757;
|
||||
}
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 2.3 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 84 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 57 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 43 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 6.9 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.7 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.7 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.5 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.7 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.7 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.9 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.8 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.4 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.8 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 4.5 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.1 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.5 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 7.7 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.1 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.7 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.5 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.3 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.9 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 7.3 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 7.3 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.7 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.8 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.9 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.9 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.2 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.3 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.9 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.5 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.2 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 5.0 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 5.4 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 6.6 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 4.1 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.0 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 12 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.4 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.2 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.7 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 9.6 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.2 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 12 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 4.0 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.5 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 4.2 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 4.6 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.6 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 5.8 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.0 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.6 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.4 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.0 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.2 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.3 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.1 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 4.7 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.5 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.5 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.5 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.1 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.2 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 971 B |
Binary file not shown.
|
After Width: | Height: | Size: 988 B |
Binary file not shown.
|
After Width: | Height: | Size: 1.3 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.1 KiB |
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue