yangjun
/
sadjv3_jishi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_jishi

This commit is contained in:
yangjun 2024-06-27 16:15:54 +08:00
parent 593e3cc33b ca6b1b2e77
commit a401ad26df
8 changed files with 40 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
App.vue
View File

@ -754,9 +754,9 @@ export default {
@import 'components/colorui/icon.css';
@import './static/css/common.css';
@import './static/css/simplepro.css';
/deep/.uni-scroll-view-content{
height: 350px !important;
}
// /deep/.uni-scroll-view-content{
// height: 350px !important;
// }
page {
background-color: #FFFFFF;
color: #343546;

4
common/config.js
View File

@ -4,8 +4,8 @@
//测试环境
const PROT = "http://"
// const ROOTHOST = "47.75.182.93:8090";
// const ROOTHOST = "192.168.2.222:8187";
const ROOTHOST = "120.46.52.165";
const ROOTHOST = "192.168.2.222:8187";
// const ROOTHOST = "120.46.52.165";
// const ROOTHOST = "192.168.0.115:8187";
// const ROOTHOST = "192.168.1.169:8187";
// 后端本地张聪

32
my/fund/index.css
View File

@ -61,9 +61,14 @@
background-color: #FFFFFF;
border-radius: 10px;
padding: 10px;
box-shadow: 2px 2px 15px 1px #b5b5b5;
}
.innerTimer{
font-size: 14px;
margin-top: 5px;
color: #666;
margin-right: 10px;
}
.totalIntegral {
padding-left: 20px;
}
@ -123,12 +128,11 @@
background-color: #FFFFFF;
border-radius: 10px;
margin: 15px;
box-shadow: 2px 2px 15px 1px #b5b5b5;
}
}
.optionsDetailImport {
padding-left: 10px;
margin-top: 15px;
margin-top: 20px;
}
.dateHeader {
@ -169,7 +173,7 @@
.bottomActiveTab {
color: #0aa86a;
color: #019c88;
}
.bottomDefaultTab {
@ -207,34 +211,38 @@
.storedIntegralTopOfRight view:nth-child(2) {
font-size: 20px;
color: #cd908e;
color: #f97c62;
}
.storedIntegralMiddle {
width: 100%;
display: flex;
justify-content: space-between;
margin-top: 28rpx;
margin-top: 20rpx;
align-items: center;
}
.storedIntegralMiddle view:nth-child(1) {
margin-left: 3px;
color: #666;
}
.storedIntegralMiddleofRight {
margin-right: 19px;
color: #666;
}
.storedIntegralBottom {
margin-top: 28rpx;
padding-bottom: 15px;
margin-top: 18rpx;
padding-bottom: 20px;
margin-left: 3px;
border-bottom: 1px solid #f4f4f4;
color:#999;
}
.withdrawalMoneyBtn {
width: 80%;
height: 40px;
width: 92%;
height: 45px;
border-radius: 20px;
font-size: 20px;
color: #FFFFFF;

4
my/order/revenueDetails.vue
View File

@ -276,11 +276,11 @@
服务完成
</view>
<view class="footers-btn footers-true" @click="nineState(order.ordersId)"
v-if="order.status == 9&&order.refusalContent==''||order.refusalContent==null"
v-if="order.status == 9&& !item.refusalContentl"
>
确认接单
</view>
<view class="footers-btn footers-bor" v-if="order.status == 9&&order.refusalContent==''||order.refusalContent==null"
<view class="footers-btn footers-bor" v-if="order.status == 9&& !item.refusalContentl"
@click="toggleJ('bottom',order.ordersId)"
>
拒单申请

4
my/wallet/index.vue
View File

@ -699,9 +699,9 @@
.dhjsbg {
width: 100%;
height: 144px;
height: 166px;
padding: 15px;
background-image: url('../../static/index/fun_banner4.png');
background:#f6f6f6 url('../../static/index/fun_banner4.png');
background-repeat: no-repeat;
background-size: 100% 100%;
display: flex;

13
pages/order/index.vue
View File

@ -79,7 +79,7 @@
<view class="text-green" v-if="item.state ==3||item.state ==4">已完成</view> -->
<view class="text-green">预约时间：{{ item.serveTime }}</view>S
<view class="text-green">预约时间：{{ item.serveTime }}</view>
<view v-if="item.status == 9&& item.refusalContent" class="judan">
拒单审核中...
</view>
@ -549,8 +549,12 @@
this.$Request.getT("/app/artificer/jishiQueren",{
ordersId:ordersId
}).then(res => {
if (res.code == 0) {
that.$queue.showToast(res.msg);
if (res.code == 200) {
console.log("asdsad")
uni.showToast({
title:'已确认接单'
})
that.upCallback(1)
} else {
that.$queue.showToast(res.msg);
}
@ -749,8 +753,7 @@
// console.log(this.endTime)
this.mescroll.resetUpScroll()
},
goNav(e, name) {
console.log(e)
goNav(e,name) {
if (this.userId) {
uni.navigateTo({
url: e

2
pages/public/login.vue
View File

@ -40,7 +40,7 @@
<!-- #endif -->
<!-- #ifndef MP-WEIXIN -->
<view style="text-align: center;">
<view style="font-size: 43upx;margin-top: 32upx;color: #333333;margin-top: 100rpx;">欢迎登录盛安到家</view>
<view style="font-size: 48upx;margin-top: 32upx;color: #333333;margin-top: 100rpx;">欢迎登录盛安到家</view>
<image style="width: 300upx;height: 300upx;margin-top: 200upx;margin-bottom:100rpx;border-radius:20upx"
src="../../static/logo.png"></image>
<button v-if="weixinLogin" class="confirm-btn" @click="weixinLo">微信登录</button>

4
uview-ui/libs/request/index.js
View File

@ -103,8 +103,8 @@ class Request {
this.config = {
// baseUrl: 'https://admin.sjajk.com/', // 请求的根域名//生产需替换
// baseUrl: 'http://47.75.182.93:8090/', // 请求的根域名
baseUrl: 'http://120.46.52.165/', // 请求的根域名
// baseUrl: 'http://192.168.2.222:8187/', // 请求的根域名
// baseUrl: 'http://120.46.52.165/', // 请求的根域名
baseUrl: 'http://192.168.2.222:8187/', // 请求的根域名
// 默认的请求头
header: {},
method: 'POST',