Merge remote-tracking branch 'origin/master'

# Conflicts:
#	config.js
#	pages/login/login.vue
#	pages/my/carManage.vue

api/login.js

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

pages/details/details.vue

@@ -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({

pages/details/map.vue

@@ -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() {

pages/details/mapDetails.vue

@@ -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) {

pages/login/login.vue

@@ -140,14 +140,7 @@
 				}
 			},
 		},
-		onShow(){
+    mounted(){
-				console.log(144,144);
-		  getTenantIdByWebsite(this.tenantCode).then(res => {
-			const tenantId = res.data;
-			if (tenantId && tenantId >= 0) {
-			  setTenantId(tenantId)
-			}
-		  })
     },
 		methods: {
 
@@ -275,7 +268,8 @@
 				}
 
 				uni.setStorageSync('identity', this.sfindex);
-				console.log(277);
+
+        const loginFun = () => {
           if (this.activeid == 0) {
             const data = {
               username: this.tel,
@@ -283,7 +277,6 @@
               type: 0
             }
             loginApp(data).then(res => {
-					
               setToken(res.data.accessToken)
               this.userinfo()
             })
@@ -312,6 +305,22 @@
 
             })
           }
+        }
+
+        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') {

pages/my/carManage.vue

@@ -236,3 +236,4 @@
 		right: 15px;
 	}
 </style>
+

pages/my/carManageForm.vue

@@ -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);
 						})
 

pages/my/my.vue

@@ -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);

pages/rescue/initiate.vue

@@ -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);
 						})
 

pages/rescue/order.vue

@@ -57,7 +57,8 @@
 						label: '扣车',
 						icon: require('@/static/icons/order/tuoche.png')
 					},
-				]
+				],
+        baseImageUrl: this.$baseImageUrl,
 			}
 		},
 		components: {