杂项

component/customTabbar/index.vue

@@ -1,290 +1,326 @@
 <template>
-  <view class="tabbar-wrap">
-    <view class="tabbar">
-      <view 
-        v-for="(item, index) in tabs" 
-        :key="index" 
-        class="tab-item" 
-        @tap="routerPush(item.url)"
-      >
-		<image :src="curtTab === item.name ? item.activeIcon : item.icon" class="tab-icon"></image>
-        <text :class="['base-text', curtTab === item.name && 'checked']">{{ item.label }}</text>
-      </view>
-      <view v-if="!isScanCondeRentalCar" class="center-entrance" @tap="navToInputPage">
-       
-		<image  src="https://qiniu.bms16.com/Fm_kDVr1TIeIbbBW6-5bz0r-cECO" style="width: 122rpx; height: 122rpx;"></image>
-        <!-- <img src="https://qiniu.bms16.com/FhCHLz8rQJ5mpJ6nUA4RbKiVkUOo" style="width: 120rpx; height: 24rpx;"/> -->
-      </view>
-	  <view v-else class="center-entrance" @tap="navToInputPage">
-		<!-- <img src="https://qiniu.bms16.com/FqcCjRjhzHFUkZj76SMHNXCZHwb3" style="width: 122rpx; height: 122rpx;margin-bottom: 14rpx;"/> -->
-		<image src="https://qiniu.bms16.com/FqcCjRjhzHFUkZj76SMHNXCZHwb3" style="width: 122rpx; height: 122rpx;margin-bottom: 14rpx;"></image>
-	  	<view class="scan-text">扫一扫</view>
-	  </view>
-    </view>
-  </view>
+	<view class="tabbar-wrap">
+		<view class="tabbar">
+			<view v-for="(item, index) in tabs" :key="index" class="tab-item" @tap="routerPush(item.url)">
+				<image :src="curtTab === item.name ? item.activeIcon : item.icon" class="tab-icon"></image>
+				<text :class="['base-text', curtTab === item.name && 'checked']">{{ item.label }}</text>
+			</view>
+			<view v-if="!isScanCondeRentalCar" class="center-entrance" @tap="navToInputPage">
+
+				<image src="https://qiniu.bms16.com/Fm_kDVr1TIeIbbBW6-5bz0r-cECO"
+					style="width: 122rpx; height: 122rpx;"></image>
+				<!-- <img src="https://qiniu.bms16.com/FhCHLz8rQJ5mpJ6nUA4RbKiVkUOo" style="width: 120rpx; height: 24rpx;"/> -->
+			</view>
+			<view v-else class="center-entrance" @tap="navToInputPage">
+				<!-- <img src="https://qiniu.bms16.com/FqcCjRjhzHFUkZj76SMHNXCZHwb3" style="width: 122rpx; height: 122rpx;margin-bottom: 14rpx;"/> -->
+				<image src="https://qiniu.bms16.com/FqcCjRjhzHFUkZj76SMHNXCZHwb3"
+					style="width: 122rpx; height: 122rpx;margin-bottom: 14rpx;"></image>
+				<view class="scan-text">扫一扫</view>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script>
-var app = getApp();
-const storage = require('@/common/storage.js');
-const http = require('@/common/http.js');
-const config = require('@/common/config.js');
-const common = require('@/common/common.js');
-const appWhiteListFilter = require('@/common/appWhiteListFilter.js');
-export default {
-  props: {
-    curtTab: {
-      type: String,
-      default: 'home'
-    }
-  },
-  data() {
-    return {
-      selectedTab: uni.getStorageSync('selectedIndex') || 0,
-      tabs: [
-          { label: '设备', name: 'home', url: '/pages/index/index', 
-            icon: '/static/resource/images/home_i.png', 
-            activeIcon: '/static/resource/images/home_s.png' ,
-          },
-              { label: '服务', name: 'service', url: '/pages/service/service', 
-            icon: '/static/resource/images/service_i.png',
-            activeIcon: '/static/resource/images/service_s.png' ,
-          },
-              { label: '活动', name: 'active', url: '/pages/activity/activity', 
-            icon: '/static/resource/images/active_i.png',
-            activeIcon: '/static/resource/images/active_s.png' ,
-          },
-              { label: '我的', name: 'my', url: '/pages/my/my', 
-            icon: '/static/resource/images/my_i.png',
-            activeIcon: '/static/resource/images/my_s.png' ,
-          },
-      ],
-      userInfo: {
-        is_auth: 0,
-        status: 0
-      },
-	  // accountInfo: uni.getAccountInfoSync(),
-	  plate_number: '',
-	  isScanCondeRentalCar: false,
-    };
-  },
-  // created: function () {
-  //   if (appWhiteListFilter.isScanCondeRentalCar()) {
-  //   	this.setData({
-  //   		isScanCondeRentalCar: true
-  //   	})
-  //   }
-  // },
-  
-  mounted() {
-  	console.log(uni.getSystemInfoSync().safeArea)
-  },
-  methods: {
-    routerPush(url) {
-      // uni.setStorageSync('selectedIndex', data.index);
-      uni.switchTab({ url });
-      // uni.navigateTo({ url })
-    },
-	
-    async navToInputPage() {
-      const me = this
-      const userInfo = storage.getUserInfoData()
-      if (userInfo.user_name) {
-        const params =  await this._getParams()
-		var plate_number = params.carList.length!=0&&params.carList[0].license_plate_number?params.carList[0].license_plate_number:me.plate_number
-		if (params.wait_active_predetermine != null) { //预约车辆为待激活状态
-          if (params.wait_active_predetermine.order_status == 2) {
-            uni.showModal({
-              title: '提示',
-              content: '您有等待激活的车辆，是否跳转至订单详情页?',
-              cancelText: '取消',
-              confirmText: '确定',
-              success: function(res) {
-                if (res.confirm) {
-                  uni.navigateTo({
-                    url: '/pages/orderStatus/orderStatus?order_sn=' + params
-                      .wait_active_predetermine.order_sn
-                  });
-                }
-              }
-            })
-          }
-          return
-        }
-        if (params.carList.length == 0) {
-			if(me.isScanCondeRentalCar) {
-				uni.scanCode({
-					onlyFromCamera: true,
-					success: function (res) {
-						var location = uni.getStorageSync('user_current_location')
-						me.loadScanCode(location,res.result)
+	var app = getApp();
+	const storage = require('@/common/storage.js');
+	const http = require('@/common/http.js');
+	const config = require('@/common/config.js');
+	const common = require('@/common/common.js');
+	const appWhiteListFilter = require('@/common/appWhiteListFilter.js');
+	export default {
+		props: {
+			curtTab: {
+				type: String,
+				default: 'home'
+			}
+		},
+		data() {
+			return {
+				selectedTab: uni.getStorageSync('selectedIndex') || 0,
+				tabs: [{
+						label: '设备',
+						name: 'home',
+						url: '/pages/index/index',
+						icon: '/static/resource/images/home_i.png',
+						activeIcon: '/static/resource/images/home_s.png',
 					},
-					fail: function (res) { },
-					complete: function (res) { },
-				})
-			} else {
-				uni.navigateTo({
-					url: '/pages/scanCar/scanCar'
+					{
+						label: '服务',
+						name: 'service',
+						url: '/pages/service/service',
+						icon: '/static/resource/images/service_i.png',
+						activeIcon: '/static/resource/images/service_s.png',
+					},
+					{
+						label: '活动',
+						name: 'active',
+						url: '/pages/activity/activity',
+						icon: '/static/resource/images/active_i.png',
+						activeIcon: '/static/resource/images/active_s.png',
+					},
+					{
+						label: '我的',
+						name: 'my',
+						url: '/pages/my/my',
+						icon: '/static/resource/images/my_i.png',
+						activeIcon: '/static/resource/images/my_s.png',
+					},
+				],
+				userInfo: {
+					is_auth: 0,
+					status: 0
+				},
+				// accountInfo: uni.getAccountInfoSync(),
+				plate_number: '',
+				isScanCondeRentalCar: false,
+			};
+		},
+		// created: function () {
+		//   if (appWhiteListFilter.isScanCondeRentalCar()) {
+		//   	this.setData({
+		//   		isScanCondeRentalCar: true
+		//   	})
+		//   }
+		// },
+
+		mounted() {
+			console.log(uni.getSystemInfoSync().safeArea)
+		},
+		methods: {
+			routerPush(url) {
+				// uni.setStorageSync('selectedIndex', data.index);
+				uni.switchTab({
+					url
 				});
-			}
-        } else {
-          if (params.order_status == 3 || params.order_status == 4) { // 车辆状态为未激活
-            uni.showModal({
-              title: '提示',
-              content: '已有正在使用的车辆，是否跳转至车辆详情页?',
-              cancelText: '取消',
-              confirmText: '确定',
-              success: function(res) {
-                if (res.confirm) {
-                  const isReturnIndex = false
-                  uni.navigateTo({
-                    url: '/pages/battery/battery?plate_number=' + plate_number +'&isReturnIndex=' + isReturnIndex
-                  });
-                }
-              }
-            })
-          } else if (params.order_status == 5) {
-            uni.showModal({
-              title: '提示',
-              content: '请等待商家确认还车,是否跳转至订单详情页?',
-              cancelText: '取消',
-              confirmText: '确定',
-              success: function(res) {
-                if (res.confirm) {
-                  uni.navigateTo({
-                    url: '/pages/orderStatus/orderStatus?order_sn=' + params
-                      .carList[0].order_sn
-                  });
-                }
-              }
-            })
-          } else {
-            uni.showModal({
-              title: '提示',
-              content: '已有正在进行的订单，是否跳转至订单详情页?',
-              cancelText: '取消',
-              confirmText: '确定',
-              success: function(res) {
-                if (res.confirm) {
-                  uni.navigateTo({
-                    url: '/pages/orderStatus/orderStatus?order_sn=' + params
-                      .carList[0].order_sn
-                  });
-                }
-              }
-            })
-          }
-        }
-      } else if (userInfo.is_auth == 1 && userInfo.status != 2) {
-        uni.showModal({
-          title: '身份认证提示',
-          content: '尚未完成身份认证，是否进行身份认证?',
-          cancelText: '取消',
-          confirmText: '确定',
-          success: function(res) {
-            if (res.confirm) {
-              me.loadFaceToken()
-            }
-          }
-        })
-      } else {
-        uni.showModal({
-          title: '提示',
-          content: '您还未登录，请先登录',
-          showCancel: false,
-          confirmText: '确定',
-          success: function(res) {
-            if (res.confirm) {
-              //#ifdef MP-ALIPAY
-              uni.navigateTo({
-                url: '/pages/phoneLogin/phoneLogin',
-              })
-              //#endif
-              //#ifdef MP-WEIXIN
-              uni.navigateTo({
-                url: '/pages/login/login',
-              })
-              //#endif
-            }
-          }
-        })
-      }
-    }
-  
-  
-  }
-};
+				// uni.navigateTo({ url })
+			},
+
+			async navToInputPage() {
+				const me = this
+				if (!this.loadIsLogin()) false
+
+			},
+			loadGeneralQRData(options) {
+				if (('q' in options) || ('result' in options) && (options.result.indexOf(
+							"https://zx.uwenya.cc/xcx/s") != -
+						1)) {
+					var url = ''
+					if ('q' in options) {
+						url = decodeURIComponent(options.q);
+					}
+					if ('result' in options) {
+						url = options.result
+					}
+					var obj = this.getUrlParams(url)
+					if (('t' in obj) && ('d' in obj)) {
+						if (obj.t == 1 || obj.t == 2 || obj.t == 5 || obj.t == 4) {
+							uni.navigateTo({
+								url: '/pages/cabinetDetail/cabinetDetail?dev_id=' + obj.d + '&type=' +
+									obj.t,
+							})
+							return 101
+						}
+						if (obj.t == 10) {
+							this.navToInputPage(obj.d)
+							return 106
+						}
+					}
+
+				}
+			},
+			async navToInputPage(car_sn) {
+				const me = this
+				const {
+					userInfo = ''
+				} = storage.getUserInfoData()
+				if (userInfo.status - 0 == 2) {
+					const params = await this._getParams()
+					// var plate_number = params.carList.length != 0 && params.carList[0].license_plate_number ? params
+					// 	.carList[0].license_plate_number : me.plate_number
+					
+					if (params.carList.length == 0) {
+						var location = uni.getStorageSync('user_current_location')
+						me.loadScanCode(location, car_sn)
+					} else {
+						if (params.order_status) {
+							uni.showModal({
+								title: '提示',
+								content: '已有正在进行的订单，是否跳转至订单页?',
+								cancelText: '取消',
+								confirmText: '确定',
+								success: function(res) {
+									if (res.confirm) {
+										uni.navigateTo({
+											url: '/pages/orderStatus/orderStatus'
+										});
+									}
+								}
+							})
+							
+						}
+					}
+				}
+			},
+
+			loadScanCode(location, battery_sn) {
+				const pData = {
+					longitude: location.longitude,
+					latitude: location.latitude,
+					battery_sn: battery_sn
+				}
+				const me = this
+				http.postApi(config.API_FLK_CAR_DETAIL, pData, (resp) => {
+					uni.hideLoading()
+					if (resp.data.code === 200) {
+						if (resp.data.data.online === 0 || isOffline) {
+							common.simpleToast('此车辆已离线，请选择其他车辆')
+						} else {
+							if (resp.data.data.is_mine) {
+								//直接切换当前扫码的车辆
+								uni.setStorageSync('car_info', resp.data.data);
+								me.$emit('changCar',resp.data.data)
+								return
+							} else {
+								common.simpleToast('此车辆正在被使用！')
+								return
+							}
+						}
+					} else {
+						common.simpleToast(resp.data.msg)
+					}
+				})
+			},
+			_getParams() {
+				return new Promise((reslove, reject) => {
+					http.postApi(config.API_FLK_CAR_DEVICE_LIST, {}, res => {
+						const {
+							data = []
+						} = res.data.data
+						const obj = {
+							carList: data,
+							order_status: data.length ? data[0].hire_order_status : 0,
+						}
+						reslove(obj)
+					})
+				})
+			},
+			getUrlParams(url) {
+				// 通过 ? 分割获取后面的参数字符串
+				let urlStr = url.split('?')[1]
+				// 创建空对象存储参数
+				let obj = {};
+				// 再通过 & 将每一个参数单独分割出来
+				let paramsArr = urlStr.split('&')
+				for (let i = 0, len = paramsArr.length; i < len; i++) {
+					// 再通过 = 将每一个参数分割为 key:value 的形式
+					let arr = paramsArr[i].split('=')
+					obj[arr[0]] = arr[1];
+				}
+				return obj
+			},
+			async loadIsLogin() {
+				const user_token = storage.getUserToken()
+				if (!user_token) {
+					let res = await uni.showModal({
+						title: '提示',
+						content: '您还未登录，请先登录',
+						showCancel: true,
+						cancelText: '取消',
+						confirmText: '确定',
+					})
+					if (res[1].confirm) {
+						uni.navigateTo({
+							url: '/pages/loginRegister/login',
+						})
+					}
+					return false
+				} else {
+					return true
+				}
+			},
+
+
+		}
+	};
 </script>
 
 <style scoped>
-.tabbar-wrap {
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  /* border-bottom: env(safe-area-inset-bottom) solid #fff; */
-  z-index: 9999;
-  /* #ifdef APP */
-  /* 兼容 iOS < 11.2 */
-    padding-bottom: constant(safe-area-inset-bottom);
-    /* 兼容 iOS >= 11.2 */
-    padding-bottom: env(safe-area-inset-bottom);
-  /* #endif */
-  
-  
-}
-.tabbar {
-  height: 140rpx;
-  width: 100%;
-  /* background: url('https://qiniu.bms16.com/FiYy2ZOV_hGSJx32YAQSLZSbAOFq') no-repeat; */
-  /* background: url('https://qiniu.bms16.com/Fk8jEU5-RbARagKDYZy0tKWErKNF') no-repeat; */
-  background-size: 100%;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  position: relative;
-  bottom: 0;
-  background-color: #fff;
-  padding: 0 50rpx;
-}
-.tab-item {
-}
-.tab-item:nth-child(2) {
-  margin-right: 20%;
-}
-.tab-icon {
-  width: 48rpx;
-  height: 48rpx;
-  display: block;
-  margin: auto;
-}
-.center-entrance {
-  position: absolute;
-  left: 50%;
-  transform: translateX(-50%);
-  bottom: 34rpx;
-  display: flex;
-  flex-direction: column;
-  border-radius: 50%;
-  border: 10rpx solid #fff;
-  
-}
-.scan-text {
-	font-size: 10px;
-	text-align: center;
-	color: #828DA2;
-	font-weight: 600;
-}
-.base-text {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 500;
-  font-size: 22rpx;
-  color: #9EA9BB;
-  line-height: 20rpx;
-  text-align: center;
-  font-style: normal;
-}
-.checked {
-	color: #060809;
-}
+	.tabbar-wrap {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		/* border-bottom: env(safe-area-inset-bottom) solid #fff; */
+		z-index: 9999;
+		/* #ifdef APP */
+		/* 兼容 iOS < 11.2 */
+		padding-bottom: constant(safe-area-inset-bottom);
+		/* 兼容 iOS >= 11.2 */
+		padding-bottom: env(safe-area-inset-bottom);
+		/* #endif */
+
+
+	}
+
+	.tabbar {
+		height: 140rpx;
+		width: 100%;
+		/* background: url('https://qiniu.bms16.com/FiYy2ZOV_hGSJx32YAQSLZSbAOFq') no-repeat; */
+		/* background: url('https://qiniu.bms16.com/Fk8jEU5-RbARagKDYZy0tKWErKNF') no-repeat; */
+		background-size: 100%;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		position: relative;
+		bottom: 0;
+		background-color: #fff;
+		padding: 0 50rpx;
+	}
+
+	.tab-item {}
+
+	.tab-item:nth-child(2) {
+		margin-right: 20%;
+	}
+
+	.tab-icon {
+		width: 48rpx;
+		height: 48rpx;
+		display: block;
+		margin: auto;
+	}
+
+	.center-entrance {
+		position: absolute;
+		left: 50%;
+		transform: translateX(-50%);
+		bottom: 34rpx;
+		display: flex;
+		flex-direction: column;
+		border-radius: 50%;
+		border: 10rpx solid #fff;
+
+	}
+
+	.scan-text {
+		font-size: 10px;
+		text-align: center;
+		color: #828DA2;
+		font-weight: 600;
+	}
+
+	.base-text {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 22rpx;
+		color: #9EA9BB;
+		line-height: 20rpx;
+		text-align: center;
+		font-style: normal;
+	}
+
+	.checked {
+		color: #060809;
+	}
 </style>

manifest.json

@@ -1,6 +1,6 @@
 {
-    "name" : "弗兰克app",
-    "appid" : "__UNI__E67DD80",
+    "name" : "弗兰克",
+    "appid" : "__UNI__111A022",
     "description" : "",
     "versionName" : "1.3.0",
     "versionCode" : 130,

pages/carDetail/carDetail.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="car-detail-main">
 		<view v-if="car_detail.image" class="flex-row">
-			<img style="width: 600rpx;height: 406rpx;" :src="car_detail.image"
+			<img style="width: 600rpx;height: 406rpx; margin: auto; margin-bottom: 20rpx;" :src="car_detail.image"
 				alt="">
 		</view>
 		<view class="car-detail-model">
@@ -139,7 +139,7 @@
 					if (resp.data.code === 200) {
 						me.setData({
 							car_detail:resp.data.data,
-							price:(resp.data.data.rental_setting[0].hire_price/100).toFixed(2)
+							price:((resp.data.data.rental_setting[0]?.hire_price || 0)/100).toFixed(2)
 						})
 					} else {
 						common.simpleToast(resp.data.msg);

pages/index/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<view >
-		<block >
+		<block v-if="isLogin && car_list.length > 0">
 			<view class="container-view">
 			<view class="flex-row flex-between align-center padding_about_40">
 				<view class="car-name-view" @tap="navSwitchCar">
@@ -36,7 +36,7 @@
 			<Control :contrilList="contrilList" />
 			
 			
-			<view v-if="car_info.exchange_package_info.activity_time" class="flex-row flex-between map-card-view" >
+			<view v-if="car_info.exchange_package_info && car_info.exchange_package_info.activity_time" class="flex-row flex-between map-card-view" >
 				<MapCard latitude="23.099994" longitude="113.324004" :carAddress="carAddress" :carLocation="carLocation"/>
 				
 				<view class="card-right">
@@ -91,11 +91,12 @@
 			<view style="height: 264rpx;"></view>
 			</view>
 		</block>
-		<block v-if="false">
+		
+		<block v-else>
 			<UnleasedPages :model_list="model_list" :img_list="img_list" />
 		</block>
 		<BluetoothUnlockAuth ref="bluetoothUnlockAuth" />
-		<CustomTabbar curt-tab="home"/>
+		<CustomTabbar @changCar='changCar' curt-tab="home"/>
 	</view>
 </template>
 <script module="tools" lang="wxs" src="@/pages/common/wxs/tools.wxs"></script>
@@ -117,9 +118,10 @@
 	import permision from "@/js_sdk/wa-permission/permission.js"
 
 	export default {
-		
 		data() {
 			return {
+				img_list:[],
+				isLogin:false,
 				isOverdueShow:false,
 				contrilList:[],
 				carLocation: [{
@@ -158,9 +160,10 @@
 		 * 生命周期函数--监听页面加载
 		 */
 		onLoad: function(options) {
+			this.locationFn()
+				this.loadModelList()
 			const user_token = storage.getUserToken()
 				if (!user_token) {
-					
 					this.loadIsLogin()
 					return
 				}
@@ -175,10 +178,12 @@
 			const user_token = storage.getUserToken()
 			this.car_info = uni.getStorageSync('car_info') || {};
 				if (!user_token) {
-					this.loadIsLogin()
+					this.isLogin = false
+					//this.loadIsLogin()
 					return
 				}
-				if(!this.car_info.car_sn){
+				this.isLogin = true
+				if(this.car_info.car_sn){
 					this.loadUserCarList()
 				}
 			
@@ -191,6 +196,20 @@
 			}
 		},
 		methods: {
+			locationFn() {
+				uni.getLocation({
+					success(res) {
+						let myLocation = {
+							latitude: res.latitude,
+							longitude: res.longitude,
+						}
+						storage.setUserCurrentLocation(myLocation)
+					}
+				})
+			},
+			changCar(e){
+				this.car_info = e
+			},
 			routerLink(url){
 				uni.navigateTo({
 					url
@@ -259,6 +278,8 @@
 				http.postApi(config.API_RECOMMEND_CAR_MODEL_LIST, {}, (resp) => {
 					if (resp.data.code === 200) {
 						const list=resp.data.data
+						console.log('哈哈哈啊哈')
+						console.log(resp.data.data)
 						const img_list=resp.data.data.map(item=>item.image)
 						me.setData({
 							model_list:list,

pages/my/my.vue

@@ -142,7 +142,7 @@
 				}
 			},
 			loginHandle() {
-				if (!userInfo.nickname) {
+				if (!this.userInfo.nickname) {
 					uni.navigateTo({
 						url: '/pages/loginRegister/login'
 					})

pages/storeDetails/storeDetails.vue

@@ -163,7 +163,7 @@
 		 */
 		onLoad:  function(options) {
 			console.log(options, 'options');
-			this.shop_id = 25240 || ''
+			this.shop_id = options.admin_id || ''
 			this.locationFn()
 			
 		},