电动车

page_fenbao/tousu/shtsxq.vue

@@ -133,8 +133,8 @@
 								<image src="https://api.ccttiot.com/smartmeter/img/static/udgL6KzisrZlMrk9AZb2" mode=""></image>
 							</view>
 							<view class="upload-item" v-for="(img,idx) in images" :key="idx">
-								<image :src="img" mode="aspectFill"></image>
+								<image :src="img" mode="aspectFill" @click="ClickImage(images, img)"></image>
-								<view class="del" @tap="removeImage(idx)">×</view>
+								<view class="del" @tap.stop="removeImage(idx)">×</view>
 							</view>
 						</view>
 						<text class="tip">最多上传4张</text>
@@ -393,7 +393,7 @@
 			getqiniuyun(){
 				this.$u.get("/common/qiniuToken").then((res) => {
 					if (res.code == 200) {
-						this.token = res.token
+						this.token = res.data
 					}
 				})
 			},

page_shanghu/gongzuotai/modelMt.vue

@@ -372,6 +372,14 @@ export default {
 			        'https://api.ccttiot.com/%E7%BB%84%2014534@3x-1758175543842.png',
 			        'https://api.ccttiot.com/%E7%BB%84%2014530@3x-1758175543842.png',
 			        'https://api.ccttiot.com/%E7%BB%84%201096@3x-1758175543796.png',
+					'https://api.ccttiot.com/%E7%BB%84%201051-1773632329508.png',
+					'https://api.ccttiot.com/%E7%BB%84%2014532-1773632329561.png',
+					'https://api.ccttiot.com/%E7%BB%84%2014534-1773632329598.png',
+					'https://api.ccttiot.com/%E7%BB%84%2014536-1773632329636.png',
+					'https://api.ccttiot.com/%E7%BB%84%201095-1773632329526.png',
+					'https://api.ccttiot.com/%E7%BB%84%2014531-1773632329546.png',
+					'https://api.ccttiot.com/%E7%BB%84%2014533-1773632329581.png',
+					'https://api.ccttiot.com/%E7%BB%84%2014535-1773632329618.png',
 			],
 			cheIcons: [
 			        'https://api.ccttiot.com/smartmeter/img/static/uei3dDAuPNNe9E65yi6g',
@@ -379,7 +387,11 @@ export default {
 					'https://api.ccttiot.com/smartmeter/img/static/u1FoIt3IRUOer3uGOOTI',
 					'https://api.ccttiot.com/smartmeter/img/static/ulHNoYWHpoTcnoIlzgbp',
 					'https://api.ccttiot.com/smartmeter/img/static/uI2eOX98s1wyr2LHzRK3',
-					'https://api.ccttiot.com/smartmeter/img/static/uHTSUlE69nyHst0ec8jV'
+					'https://api.ccttiot.com/smartmeter/img/static/uHTSUlE69nyHst0ec8jV',
+					'https://api.ccttiot.com/UTV%E8%B6%8A%E9%87%8E%E8%BD%A6-1773632311691.png',
+					'https://api.ccttiot.com/%E5%B1%A5%E5%B8%A6%E5%9D%A6%E5%85%8B-1773632329453.png',
+					'https://api.ccttiot.com/%E8%B6%8A%E9%87%8E%E6%B2%99%E6%BB%A9%E5%8D%A1%E4%B8%81%E8%BD%A6-1773632329487.png',
+					'https://api.ccttiot.com/%E7%A2%B0%E7%A2%B0%E8%BD%A6-1773632329469.png',
 			],
 			yunyinglist:[],
 			yunyingflag:false,
@@ -640,7 +652,7 @@ export default {
 							console.log(str.key)
 							_this.data.picture = 'https://api.ccttiot.com/' + str.key
 							console.log(_this.data.picture);
-						}
+						} 
 					})
 				}
 			})
@@ -678,9 +690,9 @@ export default {
 				return
 			}
 			if (this.modelId) {
-				// this.data.areaId = this.areaId
+				const submitData = { ...this.data }
-				this.data.userId = this.userinfo.userId
+				delete submitData.userId
-				this.$u.put("/bst/model", this.data).then((res) => {
+				this.$u.put("/bst/model", submitData).then((res) => {
 					if (res.code == 200) {
 						uni.showToast({
 							title: '操作成功',
@@ -699,9 +711,10 @@ export default {
 					}
 				})
 			} else {
-				this.data.areaId = this.areaId
+				const submitData = { ...this.data }
-				this.data.userId = this.userinfo.userId
+				submitData.areaId = this.areaId
-				this.$u.post("/bst/model", this.data).then((res) => {
+				submitData.userId = this.userinfo?.userId
+				this.$u.post("/bst/model", submitData).then((res) => {
 					if (res.code == 200) {
 						uni.showToast({
 							title: '操作成功',

page_shanghu/guanli/yunying.vue

@@ -160,10 +160,12 @@
 				</view>
 			</view>
 			<view class="yinshouqk">
-				<view class="name">
+				<view class="name income-title">
+					<text class="tip-icon" @click.stop="showIncomeExplain('bonus')">?</text>
 					我的收入<text style="color: rgb(242,75,23);margin-left: 10rpx;font-size: 32rpx;">{{yunyingobj.bonusActualAmount == null ? 0 : yunyingobj.bonusActualAmount}}</text>元
 				</view>
-				<view class="name" style="margin-top: 10rpx;">
+				<view class="name income-title" style="margin-top: 10rpx;">
+					<text class="tip-icon" @click.stop="showIncomeExplain('order')">?</text>
 					订单收入<text style="color: rgb(242,75,23);margin-left: 10rpx;font-size: 32rpx;">{{yunyingobj.orderActualReceivedAmount == null ? 0 : yunyingobj.orderActualReceivedAmount}}</text>元
 				</view>
 				<view class="zupibox">
@@ -530,6 +532,14 @@
 				} else {
 					this.twoshow = true
 				}
+			},
+			showIncomeExplain(type) {
+				const message = type === 'bonus' ? '结算后的分成收入' : '创建时间在此期间的订单收入'
+				uni.showToast({
+					title: message,
+					icon: 'none',
+					duration: 5000
+				})
 			}
 		}
 	}
@@ -701,6 +711,22 @@
 			font-size: 28rpx;
 			color: #3D3D3D;
 		}
+		.income-title{
+			display: flex;
+			align-items: center;
+		}
+		.tip-icon{
+			width: 30rpx;
+			height: 30rpx;
+			line-height: 30rpx;
+			border-radius: 50%;
+			background-color: #2C8AF0;
+			color: #FFFFFF;
+			text-align: center;
+			font-size: 22rpx;
+			margin-right: 12rpx;
+			flex-shrink: 0;
+		}
 	}
 	.riqi{
 		view{

page_user/huanbike.vue

@@ -192,11 +192,19 @@ export default {
 					key:'bike/video/'+math
 				},
 				success: function(res) {
-					uni.hideLoading()
+					if(res.data){
-					console.log(res,'resres');
+						uni.hideLoading()
-					let str = JSON.parse(res.data)
+						console.log(res,'resres');
-					console.log(str.key)
+						let str = JSON.parse(res.data)
-					_this.videoUrl = 'https://api.ccttiot.com/' + str.key
+						console.log(str.key)
+						_this.videoUrl = 'https://api.ccttiot.com/' + str.key
+					}else{
+						uni.showToast({
+							 title: '上传视频失败',
+							 icon: 'none',
+							 duration: 3000
+						})
+					}
 				}
 			})
 		},
@@ -393,11 +401,8 @@ page {
 			height: 370rpx;
 			background: rgba(255, 255, 255, 0.2);
 			border-radius: 40rpx;
-			// box-shadow: 0 rgba(0, 0, 0, 0.1);
 			backdrop-filter: blur(10rpx);
 			-webkit-backdrop-filter: blur(10rpx);
-			/* For Safari */
-			// border: 1rpx solid rgba(255, 255, 255, 0.3);
 			z-index: 10;
 
 		}
@@ -429,7 +434,6 @@ page {
 			position: fixed;
 			bottom: 100rpx;
 			left: 38rpx;
-			// margin-top: 128rpx;
 			display: flex;
 			align-items: center;
 			justify-content: center;

page_user/shoukuan/addsk.vue

@@ -311,10 +311,15 @@ export default {
 								    uni.navigateBack()
 								}, 1500)
 							}else{
-								uni.showToast({
+								uni.showModal({ 
-								  title: resp.msg,
+									title: '提示',
-								  icon: 'none',
+									content: resp.msg,
-								  duration:3000
+									showCancel: false,
+									success: (res) => {
+										if (res.confirm) {
+											
+										}
+									}
 								})
 							}
 						})
@@ -351,10 +356,15 @@ export default {
 	   	    	    uni.navigateBack()
 	   	    	}, 1500)
 	   	    }else{
-				uni.showToast({
+				uni.showModal({
-				  title: res.msg,
+					title: '提示',
-				  icon: 'none',
+					content: res.msg,
-				  duration:3000
+					showCancel: false,
+					success: (res) => {
+						if (res.confirm) {
+							
+						}
+					}
 				})
 			}
 	   })

pages/index/index.vue

@@ -858,13 +858,13 @@
 											  duration:5000
 											})
 										}else if(err.errMsg == 'openBluetoothAdapter:fail:not available'){
-													uni.showToast({
+												uni.showToast({
-													  title: '请检查手机蓝牙是否打开',
+												  title: '请检查手机蓝牙是否打开',
-													  icon: 'none',
+												  icon: 'none',
-													  duration:5000
+												  duration:5000
-													})
+												})
-												}
+											}
-									  }
+									    }
 									})
 								}
 							}
@@ -895,6 +895,7 @@
 					case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS: //获取附近蓝牙设备列表
 						if (options.result) {
 							this.devicesarr = options.data
+							console.log(this.devicesarr,'搜索的附近设备');
 						}
 						break;
 					case xBlufi.XBLUFI_TYPE.TYPE_CONNECTED: //连接回调是否连接上蓝牙
@@ -2668,7 +2669,7 @@
 															duration: 2000
 														})
 														that.orderobj.deviceLockStatus = 1
-													} else if (res.code == 20001 || res.code == 20002 || res.code == 20003) {
+													} else if (res.code == 20001 || res.code == 20002 || res.code == 20003) { //接口返回20001 20002 20003 都判定设备为离线走蓝牙命令
 														that.wenbentxt = '蓝牙解锁中...'
 														const findDevice = () => {
 															that.ver_dataflag = 2