diff --git a/common/config.js b/common/config.js
index dd53ce3..dae712e 100644
--- a/common/config.js
+++ b/common/config.js
@@ -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,
diff --git a/components/its-calendar/its-calendar.vue b/components/its-calendar/its-calendar.vue
index 0fae617..9a2d5a5 100644
--- a/components/its-calendar/its-calendar.vue
+++ b/components/its-calendar/its-calendar.vue
@@ -9,10 +9,10 @@
- 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 }}
@@ -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;
}
}
diff --git a/manifest.json b/manifest.json
index ffded07..8397946 100644
--- a/manifest.json
+++ b/manifest.json
@@ -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" : {
diff --git a/my/commission/index.css b/my/commission/index.css
index 8ca3571..50a2047 100644
--- a/my/commission/index.css
+++ b/my/commission/index.css
@@ -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);
- }
\ No newline at end of file
+ }
+ .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;
+ }
+
+
\ No newline at end of file
diff --git a/my/commission/index.vue b/my/commission/index.vue
index 8fb9d13..39d431d 100644
--- a/my/commission/index.vue
+++ b/my/commission/index.vue
@@ -21,21 +21,21 @@
-
-
-
- {{this.homePageDataNum.totalRevenue ? this.homePageDataNum.totalRevenue : 0 }}
-
-
- 本期收益(元)
+
+
+
+ {{this.homePageDataNum.totalRevenue ? this.homePageDataNum.totalRevenue : 0 }}
+
+ 本期收益(元)
+
+
-
-
+
{{this.homePageDataNum.projectBenefits ? this.homePageDataNum.projectBenefits : 0 }}
@@ -43,7 +43,7 @@
-
+
{{this.homePageDataNum.vehicleFareAmount ? this.homePageDataNum.vehicleFareAmount : 0 }}
@@ -119,7 +119,7 @@
-
@@ -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;
}
diff --git a/my/fund/index.vue b/my/fund/index.vue
index e12afa3..bc2de5a 100644
--- a/my/fund/index.vue
+++ b/my/fund/index.vue
@@ -64,7 +64,7 @@
备注: {{item.title}}
-
diff --git a/my/order/revenueDetails.vue b/my/order/revenueDetails.vue
index 3516e9b..647c943 100644
--- a/my/order/revenueDetails.vue
+++ b/my/order/revenueDetails.vue
@@ -19,10 +19,9 @@
+ class="mian-top-head-img">
-
{{order.entryName}}
待服务
@@ -35,20 +34,19 @@
确认接单
- 服务时长： {{order.duration}}分钟
+ 服务时长：{{order.duration}}分钟
-
- 项目价格：
-
+ 项目价格：
+
￥
{{order.priceMarkup}}
-
-
{{order.massageNum}}
@@ -60,9 +58,10 @@