sunqiang/lanan-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: sunqiang:c3400d88b7f15c3e4ea15bf456bc17cad13efb1e
Branches Tags
sunqiang:master
...
compare: sunqiang:ad6f2127b43a7e8820eb4f7e17b93bda4e403350
Branches Tags
sunqiang:master

2 Commits
c3400d88b7 ... ad6f2127b4

Author SHA1 Message Date
ChuShiZ
ad6f2127b4 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	config.js
#	pages/login/login.vue
#	pages/my/carManage.vue
 2024-09-20 16:58:54 +08:00
ChuShiZ
b372a20e03 图片地址拼接 2024-09-19 19:55:35 +08:00
11 changed files with 96 additions and 80 deletions
Show Stats Expand all files Collapse all files

4
api/login.js
View File

@ -63,10 +63,10 @@ export function loginApp(data) {
// 使用租户域名（标识），获得租户编号
export function getTenantIdByWebsite(website) {
return request({
url: '/system/tenant/get-by-website',
url: '/system/tenant/getListByWebsite',
method: 'get',
params: {
website
}
})
}
}

2
main.js
View File

@ -64,4 +64,4 @@ export function createApp() {
app
}
}
// #endif
// #endif

12
pages/details/details.vue
View File

@ -51,7 +51,7 @@
<view class="box-title" v-if="detailsinfo.rescueInfo.rescueStatus == 6">待取车</view> -->
<view v-if="detailsinfo.rescueInfo.rescueStatus > 2" class="touxiang">
<image :src="baseUrl + detailsinfo.driverInfo.avatar" mode="aspectFit"></image>
<image :src="baseImageUrl + detailsinfo.driverInfo.avatar" mode="aspectFit"></image>
</view>
<view class="box-bs" v-if="detailsinfo.driverInfo != '' ">
<view class="orderCardStatusData" v-if="detailsinfo.rescueInfo.rescueStatus == 3">
@ -141,7 +141,7 @@
<view class="wrap-box" v-if="item.images">
<view class="img-box" v-for="(items,index) in item.images.split(',') " :key="index"
@click="previewImage(items)">
<image :src="baseUrl + items " mode=""></image>
<image :src="baseImageUrl + items " mode=""></image>
</view>
</view>
</view>
@ -164,7 +164,7 @@
<view class="wrap-box" style="margin-left: 20px;" v-if="item.images">
<view class="img-box" v-for="(items,index) in item.images.split(',') " :key="index"
@click="previewImage(items)">
<image :src="baseUrl + items " mode=""></image>
<image :src="baseImageUrl + items " mode=""></image>
</view>
</view>
</view> -->
@ -196,7 +196,7 @@
compass: true,
marker: [],
urlList: [],
baseUrl: this.$baseUrl,
baseImageUrl: this.$baseImageUrl,
detailsinfo: null,
timerId: null,
currentIndicator: 'none',
@ -254,7 +254,7 @@
},
methods: {
previewImage(url) {
let newsurl = this.baseUrl + url
let newsurl = this.baseImageUrl + url
this.urlList.push(newsurl)
console.log();
uni.previewImage({
@ -836,4 +836,4 @@
height: 100%;
}
}
</style>
</style>

7
pages/details/map.vue
View File

@ -10,7 +10,7 @@
<!-- 可选项 -->
<view class="bt-box" v-for="(item,index) in arr" :key="index" @click="getlist(item.id)">
<view class="bt-img">
<image :src="item.icon" mode=""></image>
<image :src="baseImageUrl + item.icon" mode=""></image>
</view>
<view class="zi" :class="{'sy' :ggindex == item.id }">{{item.title}}</view>
</view>
@ -32,7 +32,7 @@
<!-- 渲染的数据 -->
<view class="dz-box" v-for="(item,index) in arrlist" :key="index" @click="godetails(item.id)">
<view class="dz-left">
<image :src="item.imgs[0]" mode=""></image>
<image :src="baseImageUrl + item.imgs[0]" mode=""></image>
</view>
<view class="dz-right">
<view class="dz-title">{{item.title}}</view>
@ -67,6 +67,7 @@
scale: 13, //缩放级别
compass: true,
marker: [],
baseImageUrl: this.$baseImageUrl
}
},
onLoad() {
@ -346,4 +347,4 @@
color: #5BA8FF !important;
font-weight: bold !important;
}
</style>
</style>

11
pages/details/mapDetails.vue
View File

@ -2,7 +2,7 @@
<view class="container">
<headers title="地图详情"></headers>
<view class="c-top">
<image :src="imgs" mode=""></image>
<image :src="baseImageUrl + imgs" mode=""></image>
<!-- p -->
<view class="c-box">
<!-- 上 -->
@ -57,7 +57,8 @@
return {
id: '',
arr: {},
imgs: ''
imgs: '',
baseImageUrl: this.$baseImageUrl,
}
},
onLoad(option) {
@ -160,7 +161,7 @@
.biaoq {
// width: 136rpx;
height: 40rpx;
background: #E5EEF5;
border-radius: 20rpx 20rpx 20rpx 20rpx;
@ -168,7 +169,7 @@
background: #E5EEF5;
font-size: 24rpx;
font-weight: 400;
margin: 20rpx 0rpx;
padding: 5px 20px;
display: inline-block;
@ -274,4 +275,4 @@
height: 44rpx;
}
}
</style>
</style>

95
pages/login/login.vue
View File

@ -140,15 +140,8 @@
}
},
},
onShow(){
console.log(144,144);
getTenantIdByWebsite(this.tenantCode).then(res => {
const tenantId = res.data;
if (tenantId && tenantId >= 0) {
setTenantId(tenantId)
}
})
},
mounted(){
},
methods: {
setidentity(text) {
@ -275,43 +268,59 @@
}
uni.setStorageSync('identity', this.sfindex);
console.log(277);
if (this.activeid == 0) {
const data = {
username: this.tel,
password: this.wrod,
type: 0
}
loginApp(data).then(res => {
setToken(res.data.accessToken)
this.userinfo()
})
}
if (this.activeid == 1) {
const data = {
phone: this.tel,
code: this.yzm,
type: 1
}
request({
url: '/loginApp',
method: 'post',
data: data
}).then((res) => {
console.log('验证码请求', res);
if (res.code == 0) {
uni.showToast({
title: '登录成功',
icon: 'none'
})
const loginFun = () => {
if (this.activeid == 0) {
const data = {
username: this.tel,
password: this.wrod,
type: 0
}
loginApp(data).then(res => {
setToken(res.data.accessToken)
this.userinfo()
this.userinfo()
})
}
if (this.activeid == 1) {
const data = {
phone: this.tel,
code: this.yzm,
type: 1
}
request({
url: '/loginApp',
method: 'post',
data: data
}).then((res) => {
console.log('验证码请求', res);
if (res.code == 0) {
uni.showToast({
title: '登录成功',
icon: 'none'
})
setToken(res.data.accessToken)
this.userinfo()
}
}
})
}
})
}
}
getTenantIdByWebsite(this.tenantCode).then(res => {
if (res.code === 200 && res.data && res.data.length > 0) {
uni.showActionSheet({
itemList: res.data.map(m => m.name),
success: ({tapIndex}) => {
setTenantId(res.data[tapIndex].id)
loginFun()
}
})
} else {
setTenantId('')
loginFun()
}
})
},
userinfo() {
if (this.sfindex == 'user') {

3
pages/my/carManage.vue
View File

@ -235,4 +235,5 @@
bottom: 30px;
right: 15px;
}
</style>
</style>

18
pages/my/carManageForm.vue
View File

@ -72,7 +72,7 @@
<!-- <u-button type="error" v-if="carId" @click="delItem()" text="删除"></u-button> -->
<view class="deleteBtn" v-if="carId" @click="delItem()">删除</view>
<view class="saveBtn" @click="saveOrUpdate" >保存</view>
</view>
</view>
</view>
@ -120,7 +120,7 @@
carCheckTime: "", //年检到期时间
carLicenseColor: "", //车牌颜色
carUseNature: "", //使用性质
frameNumber: "" //车架号
frameNumber: "" //车架号
},
carUseNature: [], //使用性质列表
jycType: [], //救援车类型
@ -150,7 +150,7 @@
setTimeout(function() {
uni.navigateBack()
}.bind(this), 1000); // 2000毫秒后执行
}.bind(this), 1000); // 2000毫秒后执行
})
},
// 删除图片
@ -220,7 +220,7 @@
url: '/common/upload',
filePath: res.tempFilePath,
}).then((res) => {
this.imageList1.push(res.fileName)
this.imageList1.push(this.$baseImageUrl + res.data.url)
console.log(res);
})
@ -239,7 +239,7 @@
url: '/common/upload',
filePath: res.tempFilePath,
}).then((res) => {
this.imageList2.push(res.fileName)
this.imageList2.push(this.$baseImageUrl + res.data.url)
console.log(res);
})
@ -319,7 +319,7 @@
setTimeout(function() {
uni.navigateBack()
}.bind(this), 1000); // 2000毫秒后执行
}.bind(this), 1000); // 2000毫秒后执行
})
} else {
console.log(this.carInfo, 'update');
@ -335,7 +335,7 @@
})
setTimeout(function() {
uni.navigateBack()
}.bind(this), 1000); // 2000毫秒后执行
}.bind(this), 1000); // 2000毫秒后执行
})
}
@ -490,7 +490,7 @@
font-size: 24rpx;
}
}
.uploadBtn {
width: 120rpx;
height: 120rpx;
@ -540,4 +540,4 @@
align-items: center;
justify-content: center;
}
</style>
</style>

11
pages/my/my.vue
View File

@ -14,7 +14,7 @@
:maxCount="1" width="60" height="60">
<image src="http://www.nuoyunr.com/lananRsc/detection/touxiang.png" class="tximg" mode=""
v-if="!userinfo.avatar"></image>
<image :src=" baseUrl +userinfo.avatar " class="tximg" mode="" v-if="userinfo.avatar"></image>
<image :src="baseImageUrl + userinfo.avatar " class="tximg" mode="" v-if="userinfo.avatar"></image>
</u-upload>
</view>
<view class="c-title" v-if="!userinfo" @click="gologin">立即登录</view>
@ -185,7 +185,8 @@
},
msg: '4',
value: '',
baseUrl: this.$baseUrl
baseUrl: this.$baseUrl,
baseImageUrl: this.$baseImageUrl,
}
},
mounted() {
@ -227,7 +228,7 @@
async getUserinfo() {
await request({
url: '/getAppInfo',
url: '/rescue/getJcAppInfo',
method: 'get',
}).then((res) => {
if (res.code == 200) {
@ -282,7 +283,7 @@
}).then((res) => {
console.log(res.fileName);
this.onChooseavatar(res.fileName)
this.onChooseavatar(this.$baseImageUrl + res.data.url)
// this.releasebox.imageList.push(res.fileName)
// console.log(this.releasebox.imageList);
})
@ -360,7 +361,7 @@
return
}
let res = await request({
url: '/getAppInfo',
url: '/rescue/getJcAppInfo',
method: 'get',
})
console.log('个人信息', res);

8
pages/rescue/initiate.vue
View File

@ -285,7 +285,7 @@
this.car = res.data
console.log(res);
})
request({
url: '/rescue/dict/data/type/kcRescueRoad-180',
method: 'get'
@ -461,7 +461,9 @@
url: '/common/upload',
filePath: res.tempFilePath,
}).then((res) => {
this.imageList.push(res.fileName)
console.log('res.fileName', res.data.url)
this.imageList.push(this.$baseImageUrl + res.data.url)
console.log('this.imageList', this.imageList)
console.log(res);
})
@ -777,4 +779,4 @@
background: #327DFB;
border-radius: 12rpx;
}
</style>
</style>

5
pages/rescue/order.vue
View File

@ -57,7 +57,8 @@
label: '扣车',
icon: require('@/static/icons/order/tuoche.png')
},
]
],
baseImageUrl: this.$baseImageUrl,
}
},
components: {
@ -234,4 +235,4 @@
// #y5 {
// background-image: url('../../static/kc.png');
// }
</style>
</style>