bug 修复

http/baseApi.js

@@ -1,6 +1,6 @@
-const BaseApi = 'http://gpu.ringzle.com:8082/witcarbon-app/app'
+//const BaseApi = 'http://gpu.ringzle.com:8082/witcarbon-app/app'
 //严工
-//const BaseApi = 'http://192.168.1.2:9013/witcarbon-app/app'
+const BaseApi = 'http://192.168.1.55:9013/witcarbon-app/app'
 
 
 

pages.json

@@ -1,7 +1,6 @@
 {
 	"pages": [
 
-
 		{
 			"path": "pages/login/login",
 			"style": {
@@ -34,13 +33,6 @@
 				"navigationStyle": "custom" // 隐藏系统导航栏
 			}
 		},
-		// {
-		// 	"path": "pages/equipment/equipment",
-		// 	"style": {
-		// 		"navigationBarTitleText": "设备"
-		// 	}
-
-		// },
 		{
 			"path": "pages/Workorder/Workorder",
 			"style": {
@@ -48,12 +40,6 @@
 				"navigationStyle": "custom" // 隐藏系统导航栏
 			}
 		},
-		// {
-		// 	"path": "pages/Energyconsumption/Energyconsumption",
-		// 	"style": {
-		// 		"navigationBarTitleText": "能耗"
-		// 	}
-		// },
 		{
 			"path": "pages/my/my",
 			"style": {
@@ -71,20 +57,6 @@
 				"navigationBarBackgroundColor": "white"
 			}
 
-		}, {
-			"path": "pages/my/Mydistribution/Mydistribution",
-			"style": {
-				"navigationBarTitleText": "我的派发",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/my/Mytask/Mytask",
-			"style": {
-				"navigationBarTitleText": "我的任务",
-				"enablePullDownRefresh": false
-			}
-
 		}, {
 			"path": "pages/my/Commentssuggestions/Commentssuggestions",
 			"style": {
@@ -92,13 +64,6 @@
 				"enablePullDownRefresh": false
 			}
 
-		}, {
-			"path": "pages/my/Personalinformation/Informationmodification/Informationmodification",
-			"style": {
-				"navigationBarTitleText": "个人信息修改",
-				"enablePullDownRefresh": false
-			}
-
 		}, {
 			"path": "pages/my/Changepassword/Changepassword",
 			"style": {
@@ -106,27 +71,6 @@
 				"enablePullDownRefresh": false
 			}
 
-		}, {
-			"path": "pages/my/Mytask/Taskdetails/Taskdetails",
-			"style": {
-				"navigationBarTitleText": "任务详情",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/my/Mydistribution/distributiondetil/distributiondetil",
-			"style": {
-				"navigationBarTitleText": "派送详情",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/my/Mydistribution/distributionedit/distributionedit",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-
 		}, {
 			"path": "pages/Workorder/Tenantbill/Tenantbill",
 			"style": {

pages/Energyconsumption/Energyconsumption.vue

@@ -1,22 +0,0 @@
-<template>
-	<view>
-		
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style>
-
-</style>

pages/Workorder/Intelligentdoorlock/Intelligentdoorlock.vue

@@ -119,7 +119,14 @@
 					.then((res) => {
 						if (res.data.code == 0) {
 							this.showms = false;
-							this.$refs.uNotify.success(res.data.msg);
+							uni.showModal({
+								title: '提示',
+								showCancel:false,
+								content:'临时密码是：'+res.data.data,
+								success: function (res) {
+									
+								}
+							});
 						} else {
 							this.$refs.uNotify.error(res.data.msg);
 						}

pages/Workorder/Intelligentdoorlock/Tenantdetails/Tenantdetails.vue

@@ -5,10 +5,9 @@
 				共有 <span style="color: red">{{totalnumber}}</span>条记录
 			</view>
 
-			<u-list @scrolltolower="scrolltolower" :pagingEnabled='true'
-			 style="height:400px;flex:1;">
+			<u-list @scrolltolower="scrolltolower" :pagingEnabled='true' style="height:400px;flex:1;">
 				<u-list-item v-for="(item, index) in indexList" :key="index">
-					<view class="companylist">			
+					<view class="companylist">
 						<h3>{{item.roomName}}</h3>
 						<view class="Currentamount">
 							房间编号:{{item.roomId}}
@@ -22,9 +21,9 @@
 						<view class="Currentamount">
 							区域名称: {{item.areaName}}
 						</view>
-					<view class="Currentamount">
-						更新时间: {{item.updateDate}}
-					</view>
+						<view class="Currentamount">
+							更新时间: {{item.updateDate}}
+						</view>
 					</view>
 
 				</u-list-item>
@@ -38,7 +37,6 @@
 </template>
 
 <script>
-
 	export default {
 
 		data() {
@@ -50,13 +48,13 @@
 				indexList: [],
 				dataList: [],
 				dataForm: {
-					 "currentPage":1,
-					  "deviceId": "",
-					  "pageSize": 10,
-					  "roomId": "",
-					  "tempPwd": "",
-					  "tenantsId": "",
-					  "userName": ""
+					"currentPage": 1,
+					"deviceId": "",
+					"pageSize": 10,
+					"roomId": "",
+					"tempPwd": "",
+					"tenantsId": "",
+					"userName": ""
 				},
 
 				showtype: false,
@@ -75,9 +73,9 @@
 			}
 		},
 		//监听页面加载，其参数为上个页面传递的数据，参数类型为 Object（用于页面传参
-	
+
 		onLoad(options) {
-			this.dataForm.roomId= options.companyOrgId;
+			this.dataForm.roomId = options.companyOrgId;
 			this.getalldata();
 		},
 		//监听页面初次渲染完成。注意如果渲染速度快，会在页面进入动画完成前触发
@@ -97,7 +95,7 @@
 
 
 		methods: {
-			
+
 			scrolltolower() {
 				if (this.pd) {
 					this.getalldata();
@@ -138,30 +136,36 @@
 </script>
 
 <style lang="scss">
-	.billall{height:100%}
-	.u-listdata{
-		    height: 100%;
-		    display: flex;
-		    flex-direction: column;
+	.billall {
+		height: 100%
 	}
+
+	.u-listdata {
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+	}
+
 	.companylist {
 		margin: 0 32rpx 24rpx;
 		background: #fff;
 		padding: 24rpx 32rpx;
 		border-radius: 8rpx;
 		position: relative;
+
 		h3 {
 			margin-bottom: 16rpx;
 		}
+
 		.Currentamount {
 			margin-bottom: 8rpx;
 			color: #999;
-	
+
 			span {
 				color: #FA5555;
 				padding-left: 9rpx;
 			}
 		}
-	
+
 	}
 </style>

pages/Workorder/Remotecontrol/Remotecontrol.vue

@@ -26,7 +26,7 @@
 					<u-icon name="arrow-down-fill" color="#666" size="16" class="inline"></u-icon>
 				</picker>
 			</view>
-			<view class="drawdownMenu" v-if="deviceType=='Relay'">
+			<view class="drawdownMenu">
 				<picker @change="(val)=>confirmHandle(val,'deviceStatus')" :value="deviceStatusIndex"
 					:range="deviceStatusList" style="width:100%;height: 100%;" range-key="text">
 					<view class="uni-input">{{deviceStatusList[deviceStatusIndex].text}}</view>
@@ -149,23 +149,18 @@
 				modeTypeList: [],
 				modeTypeIndex: 0,
 				temperatureList: [],
-				tempIndex: 0,
 				columns: [],
 				speedTypeList: [],
 				speedTypeIndex: 0,
 				dataForm: {
 					page: 1,
 					limit: 10,
+					opStatus:'',
 					buildingId: "",
 					storeyId: "",
 					status: "",
 					controlCategory: "CommonLighting",
 				},
-				airIcon:{
-					2:'',
-					4:'',
-					8:''
-				},
 				mytitle: '',
 				total: 0,
 				refreshing: false,
@@ -206,11 +201,18 @@
 				this.getDataList();
 			}
 		},
-		onLoad() {
-
+		onLoad(v) {
+			uni.setNavigationBarTitle({
+				title:v.type==1?'空调控制':'照明控制'
+			})
+			if(v.type==1){
+				this.deviceType="AirConditioner";
+				this.deviceTypeIndex=0;
+			}else{
+				this.deviceType='Relay';
+				this.deviceTypeIndex=1;
+			}
 			let getDictDataList = uni.getStorageSync('getDictDataList');
-
-
 			for (let i = 0; i < getDictDataList.length; i++) {
 				if (getDictDataList[i].dictType == 'ModeType') {
 					this.modeTypeList = getDictDataList[i].dataList
@@ -374,6 +376,7 @@
 				if(e.value[0]){
 					a=e.value[0].orgName=='全部'?'跨境电商':e.value[0].orgName;
 					this.dataForm.buildingId = e.value[0].orgId;
+					this.dataForm.storeyId="";
 				}
 				if(e.value[1]){
 					b=e.value[1].orgName=='全部'?'':e.value[1].orgName;
@@ -431,7 +434,7 @@
 							this.columnData = allfloor;
 							this.dataList = []; // 清空数组
 							this.dataForm.page = 1;
-							this.getDataList()
+							//this.getDataList()
 						} else {
 							this.showdct = true
 						}
@@ -499,6 +502,7 @@
 					if (type == "deviceStatus") {
 						this.deviceStatus = this.deviceStatusList[e.detail.value].value;
 						this.dataForm.status = this.deviceStatus;
+						this.dataForm.opStatus = this.deviceStatus;
 						this.onRefresh();
 					}
 					if (type == "modeType" || type == "speedType" || type == "temp") {

pages/Workorder/Videosurveillance/Videoplayback/Videoplayback.vue

@@ -1,6 +1,5 @@
 <template>
 	<view class="shipin">
-		<!--   <div id="video-container" class="myplayer" ref="myPlayer"></div> -->
 		    <web-view :src="url"></web-view>
 	</view>
 </template>

pages/Workorder/Workorder.vue

@@ -2,7 +2,7 @@
 	<view class="content">
 		<u-cell-group class="toptemplate">
 			<view style="height: 20px;"></view>
-			<u-cell title="电商园四期—B座" :border="false">
+			<u-cell title="跨境电商" :border="false">
 				<u-icon slot="icon" size="40" color="#fff" name="map"></u-icon>
 			</u-cell>
 		</u-cell-group>
@@ -101,7 +101,7 @@
 				tabimg4: require('@/static/tab/w1.png'),
 				tabimg5: require('@/static/tab/y2.png'),
 				tabimg6: require('@/static/tab/y1.png'),
-				value1: 1,
+				value1: 2,
 				elec: require('@/static/imgs/elec.png'),
 				water: require('@/static/imgs/water.png'),
 				ac: require('@/static/imgs/ac.png'),
@@ -127,9 +127,9 @@
 					url: '/pages/Workorder/Workorder'
 				})
 			},
-			Remotecontrol() {
+			Remotecontrol(v) {
 				uni.navigateTo({
-					url: '/pages/Workorder/Remotecontrol/Remotecontrol'
+					url: '/pages/Workorder/Remotecontrol/Remotecontrol?type='+v
 				})
 			},
 			Intelligentdoorlock() {

pages/equipment/equipment.vue

@@ -1,22 +0,0 @@
-<template>
-	<view>
-		
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style>
-
-</style>

pages/index/BillPending/BillPending.vue

@@ -1,8 +1,8 @@
 <template>
-	
+
 	<view class="page">
 		<u-tabs :list="tabs" @click="sectionChange" style="background-color: #fff;" :current=current
-			:itemStyle="{'width':'375rpx','padding':'24rpx'}" lineHeight="2px" lineWidth="30px"></u-tabs>
+			:itemStyle="{'width':'250rpx','padding':'24rpx'}" lineHeight="2px" lineWidth="30px"></u-tabs>
 		<!-- 账单明细 -->
 		<view class="contain" v-show="cdshow==0">
 			<view class="topbilledit">
@@ -27,16 +27,16 @@
 								v-if="item.showMore" color="#999"></u-icon>
 							<u-icon name="arrow-down" @click="item.showMore=true" class="iconBtn" size="22px"
 								color="#999" v-else></u-icon>
-							<checkbox :checked="item.check" class="check" />
-							<view class="title" @click="paybills(item)">
+							<checkbox :checked="item.check" class="check" @click="checkItem(item)" />
+							<view class="title">
 								物业费: <span>￥{{item.amount}}</span>
-								<view class="status" v-if='item.status==1'>
+								<view class="status s1" v-if='item.status==1'>
 									已支付
 								</view>
-								<view class="status" v-if='item.status==2'>
+								<view class="status s2" v-if='item.status==2'>
 									待支付
 								</view>
-								<view class="status" v-if='item.status==3'>
+								<view class="status s3" v-if='item.status==3'>
 									支付失败
 								</view>
 							</view>
@@ -66,8 +66,57 @@
 				</view>
 			</view>
 		</view>
-		<!--缴费记录 -->
+		<!-- 我的订单 -->
 		<view class="contain" v-show="cdshow==1">
+			<view class="topbilledit" @click="orderTypechange">
+				<view class="changetime1">
+					{{myorderType}}
+				</view>
+				<view class="changetime2">
+					<u-icon name="arrow-down-fill" color="#999" size="20"></u-icon>
+				</view>
+			</view>
+			<view class="u-listdata">
+				<view style="padding:16rpx 0 16rpx 32rpx">
+					共有 <span style="color: red">{{orderTotalnumber}}</span>条记录
+				</view>
+				<u-list @scrolltolower="orderScrolltolower" :pagingEnabled='true' style="height:400px;flex:1;">
+					<u-list-item v-for="(item, index) in orderList" :key="index">
+						<view class="paisong2" @click="orderDetail(item)">
+							<view class="status" v-if='item.status==0' style="background-color: #FF9C27;">
+								待支付
+							</view>
+							<view class="status" v-if='item.status==1'>
+								已支付
+							</view>
+							<view class="status" v-if="item.status=='-1'" style="background-color: #9DA0AC;">
+								已关闭
+							</view>
+
+							<view class="subtit" style="margin-top: 20rpx;">
+								支付金额: <span>￥{{item.payAmount}}</span>
+							</view>
+							<view class="subtit" v-if="status=='1'">
+								支付时间: {{item.payAt}}
+							</view>
+							<view class="subtit">
+								下单时间: {{item.createDate}}
+							</view>
+							<view class="subtit">
+								交易类型: 微信支付
+							</view>
+							<view class="operation" v-if="item.status==0">
+								<text @click.stop="cancle(item.id,index)">取消订单</text>
+								<text class="p2">继续付款</text>
+							</view>
+						</view>
+					</u-list-item>
+				</u-list>
+			</view>
+
+		</view>
+		<!--缴费记录 -->
+		<view class="contain" v-show="cdshow==2">
 			<!-- 	列表 -->
 			<view class="u-listdata">
 				<view class="topbilledit" @click="typechange">
@@ -78,7 +127,7 @@
 						<u-icon name="arrow-down-fill" color="#999" size="20"></u-icon>
 					</view>
 				</view>
-				<view style="padding:20rpx 0 0 30rpx">
+				<view style="padding:16rpx 0 0 30rpx">
 					共有 <span style="color: red">{{totalnumber}}</span>条记录
 				</view>
 				<u-list @scrolltolower="scrolltolower2" :pagingEnabled='true'
@@ -91,6 +140,18 @@
 							<view class="status s2" v-if="item.type=='PreStorage'">
 								预存
 							</view>
+							<view class="status s3" v-if="item.type=='Refund'">
+								退费
+							</view>
+							<view class="status s4" v-if="item.type=='Water'">
+								水费
+							</view>
+							<view class="status s4" v-if="item.type=='Elec'">
+								电费
+							</view>
+							<view class="status s4" v-if="item.type=='PropertyFee'">
+								物业费
+							</view>
 							<div class="title">{{item.tenantInfo.name}}</div>
 							<view class="subtit">
 								扣缴金额:{{item.amount}}
@@ -118,15 +179,14 @@
 		</view>
 		<u-picker :show="showtype" itemHeight="76" :columns="columnstype" keyName="dictLabel" @confirm="confirmtype"
 			@cancel='canceltype'></u-picker>
-		<u-popup :show="showpay" @close="closepay" @open="openpay" mode="bottom" :round="10" :closeable=true
-			:closeOnClickOverlay=true>
+		<!-- <text>请选择支付方式</text> -->
+		<u-popup :show="showpay" @close="closepay" mode="bottom" :round="10" :closeable=true :closeOnClickOverlay=true>
 			<view class="paytall">
-				<!-- <text>请选择支付方式</text> -->
 				<view class="hejitop">
 					￥ {{heji}}
 				</view>
 				<view class="zhifufs">
-					<u-radio-group @change="groupChange" v-model="radiovalue1" placement="column" iconPlacement="right">
+					<u-radio-group v-model="zhifufangshi" placement="column" iconPlacement="right">
 						<u-radio :customStyle="{marginBottom: '8px'}" v-for="(item, index) in radiolist1" :key="index"
 							:label="item.name" :name="item.id">
 						</u-radio>
@@ -137,8 +197,11 @@
 				</view>
 			</view>
 		</u-popup>
+		<!-- 充值提示框 -->
 		<u-modal :show="showjiaofei" title="提示" content='当前账户余额不足,请问是否充值？' @confirm="jiaofeiconfirm"
-			@cancel='jiaofeicancel' :showCancelButton=true></u-modal>
+			@cancel='cancleJiaofei()' :showCancelButton=true>
+		</u-modal>
+		<!-- 支付框 -->
 		<view class="canys" v-if="zhifucanvas">
 			<h4>请用微信扫码二维码</h4>
 			<canvas class="zhifucanvas" canvas-id='canvas'></canvas>
@@ -146,9 +209,10 @@
 				<u-button type="primary" :plain="true" text="关闭" style="border:none" @click="guanbi"></u-button>
 			</view>
 		</view>
-		<u-popup :show="showpayjine" @close="closepay1" @open="openpay1" mode="bottom" :round="10" :closeable=true
+		<!-- 预存 -->
+		<u-popup :show="showpayjine" @close="closepay1" mode="bottom" :round="10" :closeable=true
 			:closeOnClickOverlay=true>
-			<view class="paytall1">
+			<view class="paytall1" style="padding-bottom: 20rpx;">
 				<view class="hejitop">
 					预存
 				</view>
@@ -164,14 +228,20 @@
 				</view>
 			</view>
 		</u-popup>
+		<!-- 订单类型 -->
+		<u-picker :show="orderShowtype" :itemHeight="80" :columns="orderColumnstype" keyName="label"
+			@confirm="orderConfirmtype" @cancel='orderCanceltype'>
+		</u-picker>
 		<u-notify ref="uNotify" message=""></u-notify>
 	</view>
 </template>
 
 <script>
+	import {
+		methods
+	} from '../../../uni_modules/uview-ui/libs/mixin/mixin';
 	var QRCode = require('@/utils/qrcode.js');
 	const BaseApi = require("@/http/baseApi.js");
-	//	import {isEmpty,getDictDataList} from "@/utils/index";
 	export default {
 		name: 'Workordertodone',
 		data() {
@@ -181,6 +251,8 @@
 			return {
 				tabs: [{
 					name: '账单明细',
+				}, {
+					name: '我的订单',
 				}, {
 					name: '扣缴记录'
 				}],
@@ -200,24 +272,51 @@
 				showMore: false,
 				Predepositshow: true,
 				showpayjine: false,
-				showcw: false,
 				zhifucanvas: false,
 				radiolist1: [],
 				radiovalue1: '微信',
 				showjiaofei: false,
 				showpay: false,
-				quanxuan: true,
-				zhifumk: false,
-				mytype: '扣缴类型',
 				myday: currentDate,
 				totalnumber: 0,
 				jfnodata: false,
 				showtype: false,
-				cdshow: 0,
-				fatherparameter: {},
-				expensedata: '全部',
-				list: ['账单明细', '缴费记录', ],
-				current: 0,
+				//账单明细
+				billIds: [],
+				// 订单
+				myorderType: '类型',
+				orderPd: true,
+				orderShowtype: false,
+				orderTotalnumber: 0,
+				orderList: [],
+				orderDataForm: {
+					status: "",
+					page: 1,
+					limit: 10,
+				},
+				orderColumnstype: [
+					[{
+							label: '全部',
+							id: ''
+
+						}, {
+							label: '已关闭',
+							id: '-1'
+						},
+						{
+							label: '待支付',
+							id: '0'
+						},
+						{
+							label: '已支付',
+							id: '1'
+						},
+					]
+				],
+				//end
+				//扣缴记录
+				mytype: '扣缴类型',
+				indexList2: [],
 				dataForm: {
 					tenantId: '',
 					costCycle: currentDate,
@@ -225,63 +324,32 @@
 					page: 1,
 					limit: 10,
 				},
+				cdshow: 0,
+				current: 0,
 				zhanghuyue: 0,
 				heji: 0,
 				indexList1: [],
-				indexList11: [],
-				indexList2: [],
-				payStatusList: [],
 				nodata: true,
 				pd: true,
 				zhifufangshi: '',
 				columnstype: [],
-				repairTypeList: [],
-				UrgencyTypelist: [],
-				PayStatus: [],
 				PropertyType: [],
-				userInfotenantName: '',
 			}
 		},
 		//监听页面加载，其参数为上个页面传递的数据，参数类型为 Object（用于页面传参
 		onLoad: function(options) { //option为object类型，会序列化上个页面传递的参数
 			let userInfo = JSON.parse(decodeURIComponent(options.info));
-			// console.log('userInfo', userInfo);
-			this.userInfotenantName = userInfo.tenantName;
 			this.dataForm.tenantId = userInfo.tenantId;
-
 			let getDictDataList = uni.getStorageSync('getDictDataList');
-			//  console.log('111111111111111111', userInfo)
 			for (let i = 0; i < getDictDataList.length; i++) {
 				if (getDictDataList[i].dictType == 'PayType') {
 					this.columnstype = [getDictDataList[i].dataList]
 				}
-				if (getDictDataList[i].dictType == 'PayStatus') {
-					this.PayStatus = [getDictDataList[i].dataList]
-				}
 				if (getDictDataList[i].dictType == 'PropertyType') {
 					this.PropertyType = [getDictDataList[i].dataList]
 				}
 			}
-			this.indexList11 = [{
-				showMore: false,
-				status: 2,
-				amount: 300,
-				billLists: [{
-					amount: 100,
-
-				}, {
-					amount: 200,
-
-				}, {
-					amount: 130,
-
-				}]
-			}]
-
-			//  console.log('111111111111111111', this.PayStatus)
-
-			this.getpaisongdata();
-
+			this.getpaisongdata(); //账单明细
 		},
 		//监听页面初次渲染完成。注意如果渲染速度快，会在页面进入动画完成前触发
 		onReady() {},
@@ -293,19 +361,41 @@
 		onUnload() {},
 		//监听用户下拉动作，一般用于下拉刷新
 		onPullDownRefresh() {},
-
-
 		methods: {
 			guanbi() {
 				this.zhifucanvas = false;
-				this.Predepositshow = true;
-				this.queryOrder1();
-				this.queryOrder2();
+				this.dataForm.page = 1;
+				this.indexList1 = [];
+				this.getpaisongdata();
 			},
+			// 创建订单
+			createOrder(postdata,type) {
+				uni.request({
+					url: BaseApi.BaseApi + '/pay/createOrder',
+					method: "POST",
+					data: postdata,
+					header: {
+						'content-type': 'application/x-www-form-urlencoded',
+						"token": uni.getStorageSync('tokendata'),
+					},
+					success: (res) => {
+						if(type){
+						let qrcode = new QRCode('canvas', {
+							text: res.data.codeUrl, // weixin://wxpay/bizpayurl?pr=sZz****
+							width: 213,
+							height: 213,
+							colorDark: "black",
+							colorLight: "white",
+							correctLevel: QRCode.CorrectLevel.H,
+						});
+						}
+					}
+				});
+			},
+			//确认预存
 			Confirmationpaymentjine() {
-				this.zhifucanvas = true;
 				this.$refs.uForm.validate().then(res => {
-					uni.$u.toast('校验通过')
+					this.zhifucanvas = true;
 					this.showpayjine = false;
 					this.Predepositshow = false;
 					let postdata = {
@@ -314,36 +404,11 @@
 						tradeType: 'NATIVE',
 						billIds: ''
 					}
-					uni.request({
-						url: BaseApi.BaseApi + '/pay/createOrder',
-						method: "POST",
-						data: postdata,
-						header: {
-							'content-type': 'application/x-www-form-urlencoded',
-							"token": uni.getStorageSync('tokendata'),
-						},
-						success: (res) => {
-							let qrcode = new QRCode('canvas', {
-								text: res.data.codeUrl, // weixin://wxpay/bizpayurl?pr=sZz****
-								width: 213,
-								height: 213,
-								colorDark: "black",
-								colorLight: "white",
-								correctLevel: QRCode.CorrectLevel.H,
-							});
-
-						}
-					});
-
-
+					this.createOrder(postdata,1);
 				}).catch(errors => {
-					uni.$u.toast('校验失败')
+					//Funi.$u.toast('校验失败')
 				})
 			},
-			groupChange(n) {
-				console.log('groupChange', n);
-				this.zhifufangshi = n;
-			},
 			Predeposit() {
 				this.showpayjine = true;
 			},
@@ -353,9 +418,7 @@
 				this.indexList1 = [];
 				this.dataForm.page = 1;
 				this.getpaisongdata();
-
 			},
-
 			queryOrder2() {
 				this.Predepositshow = true;
 				this.zhifucanvas = false;
@@ -363,25 +426,22 @@
 				this.dataForm.page = 1;
 				this.getpayrecord();
 			},
+			//提交订单
 			Confirmationpayment() {
+				this.showpay=false;
 				if (this.zhifufangshi == 'zhanghu') {
+					//余额是否足够支付，不够提示充值
+					let billIdslist = this.billIds;
 					if (this.zhanghuyue >= this.heji) {
-						console.log('账户余额支付', )
-						let billIdslist = [this.indexList1[0].billLists[0].id, this.indexList1[0].billLists[1].id,
-							this.indexList1[0].billLists[2].id
-						];
 						let postdata = {
-							amount: String(this.zhanghuyue - this.heji),
+							amount: String(this.heji),
 							tenantId: this.dataForm.tenantId,
 							payType: 'Account',
 							billIds: billIdslist
 						}
-
 						this.$api.post('/billinfo/billPay', postdata)
 							.then(res => {
-								//   console.log('111111111111111111', res)
 								if (res.data.code == 0) {
-									this.zhifucanvas = true;
 									this.$refs.uNotify.success(res.data.msg)
 									this.showpay = false;
 									this.indexList1 = [];
@@ -390,108 +450,50 @@
 								} else {
 									this.$refs.uNotify.error(res.data.msg)
 									this.showpay = false;
-									this.indexList1 = [];
-									this.dataForm.page = 1;
-									this.getpaisongdata();
 								}
 							})
 
 					} else if (this.zhanghuyue < this.heji) {
+						let postdata = {
+							totalFee: this.heji,
+							tenantId: this.dataForm.tenantId,
+							tradeType: 'NATIVE',
+							billIds: billIdslist
+						}
+						this.createOrder(postdata)
 						this.showjiaofei = true;
-
 					}
-
 				} else if (this.zhifufangshi == 'weixin') {
 					this.zhifucanvas = true;
 					this.showpay = false;
-					let billIdslist = this.indexList1[0].billLists[0].id + ',' +
-						this.indexList1[0].billLists[1].id + ',' + this.indexList1[0].billLists[2].id;
-					// let postdata = {
-					// 	totalFee: String(this.heji),
-					// 	tenantId:Math.floor(this.dataForm.tenantId),
-					// 	tradeType: 'NATIVE',
-					// 	billIds: billIdslist
-					// }
-
+					let billIdslist = this.billIds.join(',');
 					let postdata = {
-						totalFee: '0.01',
+						totalFee:this.heji,
 						tenantId: this.dataForm.tenantId,
 						tradeType: 'NATIVE',
 						billIds: billIdslist
 					}
-					uni.request({
-						url: BaseApi.BaseApi + '/pay/createOrder',
-						method: "POST",
-						data: postdata,
-						header: {
-							'content-type': 'application/x-www-form-urlencoded',
-							"token": uni.getStorageSync('tokendata'),
-						},
-						success: (res) => {
-							//	window.open(res.codeUrl, '_blank);
-							let qrcode = new QRCode('canvas', {
-								text: res.data.codeUrl, // weixin://wxpay/bizpayurl?pr=sZz****
-								width: 213,
-								height: 213,
-								colorDark: "black",
-								colorLight: "white",
-								correctLevel: QRCode.CorrectLevel.H,
-							});
-							//10秒之后调取查询订单
-							// let that = this;
-							// setTimeout(function () {
-							//     that.queryOrder1();
-							// }, 15000);
-
-						}
-					});
-
-
+					this.createOrder(postdata,1);
 				}
+				this.heji=0;
 			},
+			//确认提前缴费
 			jiaofeiconfirm() {
-				this.showpay = false;
-				let billIdslist = this.indexList1[0].billLists[0].id + ',' +
-					this.indexList1[0].billLists[1].id + ',' + this.indexList1[0].billLists[2].id;
-				let postdata = {
-					totalFee: String(this.heji - this.zhanghuyue),
-					tenantId: this.dataForm.tenantId,
-					tradeType: 'NATIVE',
-					billIds: billIdslist
-				}
-				uni.request({
-					url: BaseApi.BaseApi + '/pay/createOrder',
-					method: "POST",
-					data: postdata,
-					header: {
-						'content-type': 'application/x-www-form-urlencoded',
-						"token": uni.getStorageSync('tokendata'),
-					},
-					success: (res) => {
-						//	window.open(res.codeUrl, '_blank);
-						let qrcode = new QRCode('canvas', {
-							text: res.data.codeUrl, // weixin://wxpay/bizpayurl?pr=sZz****
-							width: 213,
-							height: 213,
-							colorDark: "black",
-							colorLight: "white",
-							correctLevel: QRCode.CorrectLevel.H,
-						});
-						//10秒之后调取查询订单
-						// let that = this;
-						// setTimeout(function () {
-						//     that.queryOrder1();
-						// }, 15000);
-
-					}
-				});
+				this.showpayjine = true;
+				this.showjiaofei = false;
+				this.dataForm.page = 1;
+				this.indexList1 = [];
+				this.getpaisongdata();
 			},
-			jiaofeicancel() {
+			// 取消缴费
+			cancleJiaofei(){
 				this.showjiaofei = false;
+				this.dataForm.page = 1;
+				this.indexList1 = [];
+				this.getpaisongdata();
 			},
-
 			Immediatepayment() {
-
+				//获取账户余额
 				this.$api.get('/accountinfo/detail/' + this.dataForm.tenantId, {})
 					.then(res => {
 						this.zhanghuyue = res.data.data.amount;
@@ -509,30 +511,45 @@
 						]
 					})
 			},
-			openpay() {
-				console.log('open');
-			},
 			closepay() {
 				this.showpay = false
-				// console.log('close');
-			},
-			openpay1() {
-				console.log('open');
 			},
 			closepay1() {
 				this.showpayjine = false
-				// console.log('close');
 			},
-
-			paybills(e) {
+			//勾选账单明细
+			checkItem(e) {
 				e.check = !e.check;
 				if (e.check) {
-					this.zhifumk = e.check
+					this.heji += e.amount;
+					for (let i = 0; i < e.billLists.length; i++) {
+						this.billIds.push(e.billLists[i].id);
+					}
 				} else {
-					console.log('222222', e.check)
-					this.zhifumk = e.check
+					if (this.heji > 0) {
+						this.heji -= e.amount;
+					}
+					for (let i = 0; i < e.billLists.length; i++) {
+						let ind = this.billIds.indexOf(e.billLists[i].id);
+						if (ind > -1) {
+							this.billIds.splice(ind, 1);
+						}
+					}
 				}
 			},
+			// 我的订单
+			cancle(id, ind) {
+				let that=this;
+				uni.request({
+					url: BaseApi.BaseApi + '/pay/closeOrder/' + id,
+					methods: 'get',
+					success(res) {
+						if (res.data.returnCode =="SUCCESS") {
+							that.orderList.splice(ind, 1);
+						}
+					}
+				})
+			},
 			dateChange(e) {
 				this.myday = e.target.value;
 				this.dataForm.costCycle = e.target.value;
@@ -540,8 +557,6 @@
 				this.indexList1 = [];
 				this.getpaisongdata();
 			},
-
-
 			sectionChange(val) {
 				this.current = val.index;
 				if (val.index == 0) {
@@ -551,6 +566,11 @@
 					this.getpaisongdata();
 				} else if (val.index == 1) {
 					this.cdshow = 1;
+					this.orderList = [];
+					this.orderDataForm.page = 1;
+					this.getorderList();
+				} else if (val.index == 2) {
+					this.cdshow = 2;
 					this.indexList2 = [];
 					this.dataForm.page = 1;
 					this.getpayrecord();
@@ -597,24 +617,23 @@
 					.then(res => {
 						this.totalnumber = res.data.data.length;
 						if (res.data.data.length != 0) {
-							//check
 							for (let i = 0; i < res.data.data.length; i++) {
 								res.data.data[i].check = false;
+								res.data.data[i].showMore = false;
 							}
-							this.heji = res.data.data[0].amount;
 							this.indexList1.push(...res.data.data);
-
 							this.dataForm.page = this.dataForm.page + 1;
 							this.pd = true;
 							this.jfnodata = false;
 						} else {
-							uni.showToast({
-								title: '暂无更多数据了',
-								icon: 'none',
-								duration: 1500
-							})
+							if(this.dataForm.page!=1){
+								uni.showToast({
+									title: '暂无更多数据了',
+									icon: 'none',
+									duration: 1500
+								})
+							}
 							this.pd = false;
-							//this.jfnodata=true
 						}
 
 					})
@@ -637,7 +656,6 @@
 			},
 			confirmtype(e) {
 				this.indexList2 = [];
-				//console.log('111111111111111111', e.value[0])
 				this.showtype = false;
 				if (e.value[0].dictValue == 'all') {
 					this.mytype = e.value[0].dictLabel;
@@ -655,6 +673,52 @@
 			canceltype() {
 				this.showtype = false;
 			},
+			// 订单
+			orderDetail(e) {
+				uni.navigateTo({
+					url: `/pages/my/Myorder/Orderdetails/Orderdetails?companyOrgId=${e.id}`
+				});
+			},
+			orderScrolltolower() {
+				if (this.orderPd) {
+					this.getorderList();
+				} else {
+					return
+				}
+			},
+			getorderList() {
+				this.$api.get('/order/page', this.orderDataForm)
+					.then(res => {
+						this.orderTotalnumber = res.data.data.total;
+						if (res.data.data.list.length != 0) {
+							this.orderList.push(...res.data.data.list);
+							this.orderDataForm.page = this.orderDataForm.page + 1;
+							this.orderPd = true;
+						} else {
+							uni.showToast({
+								title: '暂无更多数据了',
+								icon: 'none',
+								duration: 1500
+							})
+							this.orderPd = false;
+						}
+					})
+			},
+
+			orderCanceltype() {
+				this.orderShowtype = false;
+			},
+			orderConfirmtype(e) {
+				this.orderShowtype = false;
+				this.myorderType = e.value[0].label;
+				this.orderDataForm.status = e.value[0].id;
+				this.orderList = [];
+				this.orderDataForm.page = 1;
+				this.getorderList();
+			},
+			orderTypechange() {
+				this.orderShowtype = true;
+			},
 
 
 		}
@@ -740,13 +804,16 @@
 	.paytall {
 		padding: 12px 0;
 	}
+
 	.heji span {
 		color: #ED3A25;
 	}
+
 	.likezhifu {
 		margin-left: 20rpx;
 		margin-right: 30rpx;
 	}
+
 	.zhifu {
 		position: fixed;
 		right: 0;
@@ -764,6 +831,7 @@
 			justify-content: flex-end;
 		}
 	}
+
 	.page {
 		height: 100%;
 		overflow: hidden;
@@ -803,6 +871,7 @@
 		}
 
 		.title {
+			width: 90%;
 			font-size: 32rpx;
 			color: #0C1935;
 			margin-bottom: 16rpx;
@@ -813,17 +882,27 @@
 			}
 
 			.status {
-				width: 100rpx;
-				padding: 6rpx;
+				width: 50px;
+				padding: 3px 3px 10px 3px;
 				text-align: center;
-				font-size: 24rpx;
+				font-size: 13px;
 				color: #fff;
 				background-color: #09C700;
-				border-radius: 22rpx;
+				border-radius: 11px;
 				position: absolute;
 				left: 40%;
-				top: 20rpx;
-				transform: scale(.85);
+				top: 6px;
+				transform: scale(0.8);
+
+				&.s1 {
+					background: url('@/static/imgs/paySuccess.png') no-repeat;
+					background-size: 100%;
+				}
+
+				&.s2 {
+					background: url('@/static/imgs/payerror.png') no-repeat;
+					background-size: 100%;
+				}
 			}
 		}
 
@@ -834,8 +913,8 @@
 
 		.check {
 			position: absolute;
-			left: 20rpx;
-			top: 32rpx;
+			left: 16rpx;
+			top: 24rpx;
 			z-index: 1;
 			font-size: 0;
 			transform: scale(.7)
@@ -869,8 +948,17 @@
 			&.s2 {
 				background-color: #09C700;
 			}
+
+			&.s3 {
+				background-color: #FA5555;
+			}
+
+			&.s4 {
+				background-color: #FF9C27;
+			}
 		}
 	}
+
 	.topbilledit {
 		display: flex;
 		justify-content: center;
@@ -882,4 +970,25 @@
 	.changetime2 {
 		padding-left: 10rpx;
 	}
+
+	.operation {
+		text-align: right;
+		margin-right: -32rpx;
+		height: 70rpx;
+		margin-top: 32rpx;
+
+		text {
+			padding: 6px 12px;
+			font-size: 12px;
+			border: 1px solid #D8D8D8;
+			border-radius: 20px;
+			margin-right: 16px;
+
+			&.p2 {
+				border-color: #2E69EB;
+				color: #2E69EB;
+			}
+		}
+
+	}
 </style>

pages/index/Onlinewarranty/Onlinewarranty.vue

@@ -6,21 +6,20 @@
 				<!-- <u-form-item labelWidth='180' label="任务名称:" prop="userInfo.contactPerson" borderBottom ref="item1">
                     <u--input v-model="model1.userInfo.contactPerson" border="none"></u--input>
                 </u-form-item> -->
-
-				<u-form-item labelWidth='180' label="报修位置:" prop="userInfo.repairPositionName" borderBottom
-					@click="showfloor = true;" ref="item1" :required=true>
-
-					<u--input v-model="model1.userInfo.repairPositionName" disabled disabledColor="#ffffff"
-						placeholder="请选择报修位置" border="none"></u--input>
-					<u-icon name="arrow-right" class="ml5"></u-icon>
-				</u-form-item>
 				<u-form-item labelWidth='180' label="报修区域:" prop="userInfo.repairRegionName" borderBottom
 					@click="showSex = true;" ref="item1" :required=true>
 					<u--input v-model="model1.userInfo.repairRegionName" disabled disabledColor="#ffffff"
 						placeholder="请选择报修区域" border="none"></u--input>
 					<u-icon name="arrow-right" class="ml5"></u-icon>
 				</u-form-item>
+				<u-form-item labelWidth='180' label="报修位置:" prop="userInfo.repairPositionName" borderBottom
+					@click="showfloors();" ref="item1" :required=true>
 
+					<u--input v-model="model1.userInfo.repairPositionName" disabled disabledColor="#ffffff"
+						placeholder="请选择报修位置" border="none"></u--input>
+					<u-icon name="arrow-right" class="ml5"></u-icon>
+				</u-form-item>
+				{{model1.userInfo.repairType}}
 				<u-form-item labelWidth='180' label="报修类型:" prop="userInfo.repairTypeName" borderBottom
 					@click="showtaskdegree = true;" ref="item1" :required=true>
 					<u--input v-model="model1.userInfo.repairTypeName" disabled disabledColor="#ffffff"
@@ -35,13 +34,15 @@
 					:required=true>
 					<u--input v-model="model1.userInfo.contactPhone" border="none" placeholder="请输入"></u--input>
 				</u-form-item>
-				<u-form-item labelWidth='180' label="故障描述:" prop="userInfo.faultDes" ref="item1" :required=true>
+				<u-form-item labelWidth='180' class="ms" label="故障描述:" prop="userInfo.faultDes" ref="item1"
+					:required=true>
 				</u-form-item>
 				<u-form-item labelWidth='180' borderBottom style="padding: 0;">
 					<u-textarea v-model="model1.userInfo.faultDes" border="none" placeholder="请输入" height="140"
 						style="padding: 0 20rpx;"></u-textarea>
 				</u-form-item>
-				<u-form-item labelWidth='180' label="上传照片:" prop="userInfo.faultPics" ref="item1" :required=true>
+				<u-form-item class="ms" labelWidth='180' label="上传照片:" prop="userInfo.faultPics" ref="item1"
+					:required=true>
 				</u-form-item>
 				<u-form-item labelWidth='180' borderBottom>
 					<view class="uploadPart">
@@ -71,7 +72,8 @@
 		</u-picker>
 		<u-picker :show="showfloor" ref="uPicker" :itemHeight="80" :loading="loading" @confirm="confirmfloor"
 			@cancel='cancelfloor' keyName="orgName" :columns="columns" @change="changeHandler"></u-picker>
-
+		<u-picker :show="showfloor2" ref="uPicker" :itemHeight="80" :loading="loading" @confirm="confirmfloor"
+			@cancel='cancelfloor' keyName="orgName" :columns="columns2" @change="changeHandler"></u-picker>
 	</view>
 </template>
 
@@ -90,10 +92,14 @@
 					[],
 					[]
 				],
+				columns2: [
+					[],
+					[]
+				],
 				columnData: [],
 				columnDatalist: [],
 				showfloor: false,
-
+				showfloor2: false,
 				myposition: '',
 				showSex: false,
 				showday: false,
@@ -107,7 +113,6 @@
 						buildingId: "", //  楼栋ID
 						storeyId: "", //  层数ID
 						houseId: "", //  房间ID
-						repairPosition: "", //  房间ID
 						repairPositionName: "", //报修位置名称
 						repairRegion: '', //报修修区域
 						repairRegionName: "", //报修区域名称
@@ -159,8 +164,12 @@
 						message: '请填写故障描述',
 						trigger: ['blur', 'change']
 					},
-
-
+					"userInfo.faultPics": {
+						type: 'string',
+						required: true,
+						message: '请上传照片',
+						trigger: ['blur', 'change']
+					},
 					'userInfo.contactPhone': [{
 							required: true,
 							message: '请填写联系电话',
@@ -178,7 +187,12 @@
 							trigger: ['change', 'blur'],
 						}
 					],
-
+					'userInfo.repairRegionName': {
+						type: 'string',
+						required: true,
+						message: '请选择报修区域',
+						trigger: ['blur', 'change']
+					},
 					'userInfo.repairRegionName': {
 						type: 'string',
 						required: true,
@@ -203,13 +217,30 @@
 
 			};
 		},
+		watch:{
+			"model1.userInfo.repairRegionName"(newval,oldval){
+				if(newval!=oldval){
+					this.model1.userInfo.repairPositionName = '';
+					this.model1.userInfo.buildingId = '';
+					this.model1.userInfo.storeyId = '';
+					this.model1.userInfo.houseId = '';
+				}
+			}
+		},
 		onLoad() {
 			this.getfloor();
 			//	this.loadmore();
 		},
-
+	
 		methods: {
-
+			//显示区域选择
+			showfloors() {
+				if (this.model1.userInfo.repairRegionName == '公共区域') {
+					this.showfloor2 = true;
+				} else {
+					this.showfloor = true;
+				}
+			},
 			// 删除图片
 			deletePic(event) {
 				this.fileList1.splice(event.index, 1)
@@ -244,6 +275,7 @@
 
 			},
 			changeHandler(e) {
+				console.log(e)
 				const {
 					columnIndex,
 					value,
@@ -252,23 +284,18 @@
 					indexs,
 					picker = this.$refs.uPicker
 				} = e
-				//	console.log('999999', columnIndex, index, indexs)
 				if (columnIndex == 0) {
-					//	this.loading = true
-
 					picker.setColumnValues(1, this.alldata[index].childrenList)
-					if (this.alldata[indexs[0]].childrenList[0].childrenList == null) {
-						//console.log('66666', )
-						picker.setColumnValues(2, [])
-					} else {
-						//	console.log('00000000', )
-						picker.setColumnValues(2, this.alldata[indexs[0]].childrenList[0].childrenList)
+					if (this.model1.userInfo.repairRegionName == '室内') {
+						if (this.alldata[indexs[0]].childrenList[0].childrenList == null) {
+							picker.setColumnValues(2, [])
+						} else {
+							picker.setColumnValues(2, this.alldata[indexs[0]].childrenList[0].childrenList)
+						}
 					}
 
-				} else if (columnIndex == 1) {
+				} else if (this.model1.userInfo.repairRegionName == '室内' && columnIndex == 1) {
 					// picker为选择器this实例，变化第三列对应的选项
-					//	console.log('2222222',this.alldata[indexs[0]].childrenList[indexs[1]])
-
 					if (this.alldata[indexs[0]].childrenList[indexs[1]].childrenList == null) {
 						picker.setColumnValues(2, [])
 					} else {
@@ -280,58 +307,49 @@
 
 			},
 			confirmfloor(e) {
-				if (e.value[2] == undefined) {
+				if(this.model1.userInfo.repairRegionName == '室内'){
+					if (e.value[2] == undefined) {
+						this.model1.userInfo.repairPositionName = e.value[0].orgName + '/' + e.value[1].orgName;
+						this.model1.userInfo.buildingId = e.value[0].orgId;
+						this.model1.userInfo.storeyId = e.value[1].orgId;
+						this.model1.userInfo.houseId = '';
+					} else {
+						this.model1.userInfo.repairPositionName = e.value[0].orgName + '/' + e.value[1].orgName + '/' + e
+							.value[2].orgName;
+						this.model1.userInfo.buildingId = e.value[0].orgId;
+						this.model1.userInfo.storeyId = e.value[1].orgId;
+						this.model1.userInfo.houseId = e.value[2].orgId;
+					}
+					this.showfloor = false;
+				}else{
 					this.model1.userInfo.repairPositionName = e.value[0].orgName + '/' + e.value[1].orgName;
-
-					this.model1.userInfo.buildingId = e.value[0].orgId;
-					this.model1.userInfo.storeyId = e.value[1].orgId;
-					this.model1.userInfo.houseId = e.value[1].orgId;
-					this.model1.userInfo.repairPosition = e.value[1].orgId;
-				} else {
-					this.model1.userInfo.repairPositionName = e.value[0].orgName + '/' + e.value[1].orgName + '/' + e
-						.value[2].orgName;
 					this.model1.userInfo.buildingId = e.value[0].orgId;
 					this.model1.userInfo.storeyId = e.value[1].orgId;
-					this.model1.userInfo.houseId = e.value[2].orgId;
-					this.model1.userInfo.repairPosition = e.value[2].orgId;
+					this.model1.userInfo.houseId = '';
+					this.showfloor2 = false;
 				}
-
-				this.showfloor = false;
-
-				// this.getalldata();
 			},
 			cancelfloor() {
+				if(this.model1.userInfo.repairRegionName == '室内'){
 				this.showfloor = false;
+				}else{
+					this.showfloor2 = false;
+				}
 			},
 			getfloor() {
 				this.$api.get('/control/getOrgStructureTree', {})
 					.then(res => {
 						if (res.data.code == 0) {
-							//this.dataForm.projectId = res.data.data[0].orgId;
-
-							//	this.model1.userInfo.myposition = res.data.data[0].orgcontactPerson;
 							this.alldata = res.data.data[0].childrenList;
-							for (let pi = 0; pi < this.alldata.length; pi++) {
-								for (let i = 0; i < this.alldata[pi].childrenList.length; i++) {
-									if (!this.alldata[pi].childrenList[i].childrenList) {
-										this.alldata[pi].childrenList[i].childrenList = [{
-											orgName: '公共区域',
-											orgId: ''
-										}];
-									} else {
-										this.alldata[pi].childrenList[i].childrenList.unshift({
-											orgName: '公共区域',
-											orgId: ''
-										})
-									}
-								}
-							}
 							this.columns = [
 								this.alldata,
 								this.alldata[0].childrenList,
-								this.alldata[0].childrenList[0].childrenList
+								[]
+							]
+							this.columns2 = [
+								this.alldata,
+								this.alldata[0].childrenList,
 							]
-							console.log(this.columns)
 
 						} else {
 							this.showdct = true
@@ -339,9 +357,7 @@
 					})
 			},
 			onShowDatePicker() { //显示
-
 				this.showPicker = true;
-				//  this.value =this.model1.userInfo.repairPositioncontactPerson;
 			},
 
 			returndata() {
@@ -350,9 +366,7 @@
 				});
 			},
 			editdata() {
-				//console.log('111111111111111111', this.model1.userInfo)
 				this.$refs.form1.validate().then(res => {
-					//	uni.$u.toast('校验通过')
 					this.$api.post('/repairorder', this.model1.userInfo)
 						.then(res => {
 							uni.navigateBack({
@@ -362,7 +376,7 @@
 
 
 				}).catch(errors => {
-					uni.$u.toast('校验失败')
+					//		uni.$u.toast('校验失败')
 				})
 
 
@@ -394,7 +408,7 @@
 	};
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 	.uploadPart {
 		display: flex;
 		justify-content: center;

pages/index/Workordertodone/Workordertodone.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="page">
 		<u-tabs :list="list" @click="sectionChange" style="background-color: #fff;" :current=current
-			:itemStyle="{'width':'250rpx','padding':'24rpx'}" lineHeight="2px" lineWidth="30px"></u-tabs>
+			:itemStyle="{'width':wid,'padding':'24rpx'}" lineHeight="2px" lineWidth="30px"></u-tabs>
 		<!-- 待指派 -->
 		<view class="contain" v-show="cdshow==0">
 			<view style="padding:16rpx 0 16rpx 32rpx">
@@ -117,6 +117,7 @@
 		name: 'Workordertodone',
 		data() {
 			return {
+				wid:'250rpx',
 				totalnumber: 0,
 				jfnodata: false,
 				showtype: false,
@@ -143,10 +144,8 @@
 		//监听页面加载，其参数为上个页面传递的数据，参数类型为 Object（用于页面传参
 		onLoad: function(options) { //option为object类型，会序列化上个页面传递的参数
 			let permissions = uni.getStorageSync('ButtonPermissions');
-
 			let isHave = permissions.includes('app:Tobeassigned');
 			this.gly = permissions.includes('app:Tobeassigned');
-			//  console.log('2222',isHave)
 			if (isHave) {
 				this.list = [{
 					name: '待指派'
@@ -161,6 +160,7 @@
 				this.dataForm.status = 1;
 				this.getpaisongdata();
 			} else {
+				this.wid="375rpx";
 				this.list = [{
 					name: '已指派(待维修)'
 				}, {
@@ -219,7 +219,7 @@
 						this.dataForm.page = 1;
 						this.dataForm.status = 2;
 						this.getpaisongdata();
-					} else if (index == 1) {
+					} else if (val.index == 1) {
 						this.cdshow = 2;
 						this.indexList = [];
 						this.dataForm.page = 1;

pages/index/Workordertodone/hasrepaired/hasrepaired.vue

@@ -42,6 +42,8 @@
 				</u-cell>
 				<u-cell title="联系电话" :value="details.weixiudh">
 				</u-cell>
+				<u-cell title="完成时间" :value="details.repairFinishTime">
+				</u-cell>
 			</u-cell-group>
 		</view>
 		<!--确定弹窗-->

pages/index/index.vue

@@ -2,7 +2,7 @@
 	<view class="content">
 		<u-cell-group class="toptemplate">
 			<view style="height: 20px;"></view>
-			<u-cell title="电商园四期—B座" :border="false">
+			<u-cell title="跨境电商" :border="false">
 				<u-icon slot="icon" size="40" color="#fff" name="map"></u-icon>
 				<u-icon slot="right-icon" size="40" color="#fff" name="account" @click="toUser()"></u-icon>
 			</u-cell>
@@ -591,6 +591,7 @@
 		border-radius: 8rpx;
 		.table{
 			height: 80rpx;
+			font-size: 24rpx;
 			&.t1{
 				border-top:1px solid #eee;
 				height:90rpx

pages/login/Privacyagreement.vue

@@ -134,6 +134,10 @@
 </script>
 
 <style lang="scss">
+.content{
+	padding: 16px;
+	line-height: 28px;
+}
 
 
 </style>

pages/login/login.vue

@@ -1,83 +1,47 @@
 <template>
-  <view class="content">
-    <view class="info_bg">
-      <image src="../../static/management/login-bg.png" class="bgImg"></image>
-      <div class="title">
-        <image src="../../static/management/logo.svg"></image>
-       <!-- <text>双碳感知资产运营管理平台</text> -->
-		 <text>传能</text>
-      </div>
-    </view>
-    <view class="form-box">
-      <view class="loginTxt">登录</view>
-      <view class="row-input">
-        <u-icon
-          name="account"
-          color="#2979ff"
-          size="50"
-          style="padding: 0 20rpx"
-        ></u-icon>
-        <input
-          v-model="account"
-          placeholder="请输入用户账号"
-          maxlength="18"
-          clearable
-        />
-      </view>
-      <view class="row-input">
-        <u-icon
-          name="lock"
-          color="#2979ff"
-          size="50"
-          style="padding: 0 20rpx"
-        ></u-icon>
-        <input
-          v-model="password"
-          placeholder="登陆密码"
-          clearable
-          :password="!isShowPassword"
-        />
-        <u-icon
-          name="eye-fill"
-          color="#2979ff"
-          size="50"
-          style="padding-right: 20rpx"
-          v-if="isShowPassword"
-          @click="showOrHide"
-        ></u-icon>
-        <u-icon
-          name="eye-off"
-          color="#2979ff"
-          size="50"
-          style="padding-right: 0rpx"
-          v-else
-          @click="showOrHide"
-        >
-        </u-icon>
-      </view>
-
-      <view class="Userprotocols">
-        <view class="Userprotocolchecked">
-          <checkbox :checked="rememberPsw" @click="checkboxChange" />
-        </view>
-        <view class="Userprotocoltext">记住账号密码</view>
-      </view>
-
-      <view class="Userprotocol">
-        <view class="Userprotocolchecked">
-          <checkbox
-            :checked="isChecked"
-            @click="isChecked = !isChecked"
-            style="transform: scale(0.7)"
-          ></checkbox>
-        </view>
-        <view class="Userprotocoltext">我已阅读并同意 <span  @click="useragement">用户协议</span> 和 <span  @click="Userprotocol">隐私政策</span> </view
-        >
-      </view>
-      <view class="login-btn" @click="loginbtn">登录</view>
-    </view>
-    <u-toast ref="uToast" />
-  </view>
+	<view class="content">
+		<view class="info_bg">
+			<image src="../../static/management/login-bg.png" class="bgImg"></image>
+			<div class="title">
+				<image src="../../static/management/logo.svg"></image>
+				<!-- <text>双碳感知资产运营管理平台</text> -->
+				<text>传能</text>
+			</div>
+		</view>
+		<view class="form-box">
+			<view class="loginTxt">登录</view>
+			<view class="row-input">
+				<u-icon name="account" color="#2979ff" size="50" style="padding: 0 20rpx"></u-icon>
+				<input v-model="account" placeholder="请输入用户账号" maxlength="18" clearable />
+			</view>
+			<view class="row-input">
+				<u-icon name="lock" color="#2979ff" size="50" style="padding: 0 20rpx"></u-icon>
+				<input v-model="password" placeholder="登陆密码" clearable :password="!isShowPassword" />
+				<u-icon name="eye-fill" color="#2979ff" size="50" style="padding-right: 20rpx" v-if="isShowPassword"
+					@click="showOrHide"></u-icon>
+				<u-icon name="eye-off" color="#2979ff" size="50" style="padding-right: 0rpx" v-else @click="showOrHide">
+				</u-icon>
+			</view>
+
+			<view class="Userprotocols">
+				<view class="Userprotocolchecked">
+					<checkbox style="transform: scale(0.85)" :checked="rememberPsw" @click="checkboxChange" />
+				</view>
+				<view class="Userprotocoltext">记住账号密码</view>
+			</view>
+
+			<view class="Userprotocol">
+				<view class="Userprotocolchecked">
+					<checkbox :checked="isChecked" @click="isChecked = !isChecked" style="transform: scale(0.7)">
+					</checkbox>
+				</view>
+				<view class="Userprotocoltext">我已阅读并同意 <span @click="useragement">用户协议</span> 和 <span
+						@click="Userprotocol">隐私政策</span> </view>
+			</view>
+			<view class="login-btn" @click="loginbtn">登录</view>
+		</view>
+		<u-toast ref="uToast" />
+	</view>
 </template>
 
 <script>
@@ -85,7 +49,7 @@
 		data() {
 			return {
 				isChecked: true,
-				rememberPsw:true,
+				rememberPsw: true,
 				isShowPassword: false,
 				account: "",
 				password: "",
@@ -99,71 +63,71 @@
 			//	 this.getCaptcha();
 			//this.getDeviceInfo();
 			//this.getOAID();
-			
+
 		},
 		onUnload() {
 			//触发水印显示
 			uni.$emit("ly-show-watermark");
 		},
-		mounted() {//记住密码
-				//缓存的账号
-				const HBusername = uni.getStorageSync('HBusername');
-				//缓存的密码
-				const HBpassword = uni.getStorageSync('HBpassword');
-						//console.log("缓存的账号:"+HBusername)
-						//console.log("缓存的密码:"+HBpassword)
-						//有缓存就赋值给文本没有就清空
-					if (HBusername && HBpassword) {
-						this.account = HBusername;
-						this.password = HBpassword;
-					} else {
-						this.account = '';
-						this.password = '';
-					}
-					//自动登录
-				},
-		
+		mounted() { //记住密码
+			//缓存的账号
+			const HBusername = uni.getStorageSync('HBusername');
+			//缓存的密码
+			const HBpassword = uni.getStorageSync('HBpassword');
+			//console.log("缓存的账号:"+HBusername)
+			//console.log("缓存的密码:"+HBpassword)
+			//有缓存就赋值给文本没有就清空
+			if (HBusername && HBpassword) {
+				this.account = HBusername;
+				this.password = HBpassword;
+			} else {
+				this.account = '';
+				this.password = '';
+			}
+			//自动登录
+		},
+
 		methods: {
-			getDeviceInfo(){
+			getDeviceInfo() {
 				plus.device.getInfo({
-					success:function(e){
-						console.log('getDeviceInfo success: '+JSON.stringify(e));
-						
+					success: function(e) {
+						console.log('getDeviceInfo success: ' + JSON.stringify(e));
+
 					},
-					fail:function(e){
-						console.log('getDeviceInfo failed: '+JSON.stringify(e));
+					fail: function(e) {
+						console.log('getDeviceInfo failed: ' + JSON.stringify(e));
 					}
 				});
 			},
-			 getOAID(){
+			getOAID() {
 				plus.device.getOAID({
-					success:function(e){
-						console.log('getOAID success: '+JSON.stringify(e));
+					success: function(e) {
+						console.log('getOAID success: ' + JSON.stringify(e));
 					},
-					fail:function(e){
-						console.log('getOAID failed: '+JSON.stringify(e));
+					fail: function(e) {
+						console.log('getOAID failed: ' + JSON.stringify(e));
 					}
 				});
 			},
-			
-			
-			
+
+
+
 			//复选框
-						checkboxChange: function(e) {
-							this.rememberPsw=!this.rememberPsw;
-							  console.log('111111111111111111',this.rememberPsw)							
-							if (this.rememberPsw == true) {
-								//获取缓存的账号 赋值
-								uni.getStorageSync('HBusername',this.account);
-								uni.getStorageSync('HBpassword',this.password);
-							} else {//销毁
-								uni.removeStorageSync('HBusername');
-								uni.removeStorageSync('HBpassword');              
-							}
-						},
-		
-			
-			
+			checkboxChange: function(e) {
+				this.rememberPsw = !this.rememberPsw;
+				console.log('111111111111111111', this.rememberPsw)
+				if (this.rememberPsw == true) {
+					//获取缓存的账号 赋值
+					uni.getStorageSync('HBusername', this.account);
+					uni.getStorageSync('HBpassword', this.password);
+				} else { //销毁
+					uni.removeStorageSync('HBusername');
+					uni.removeStorageSync('HBpassword');
+				}
+			},
+
+
+
 			loginbtn() {
 				if (this.account == "") {
 					this.$refs.uToast.show({
@@ -203,9 +167,9 @@
 							type: "error",
 							message: "请输入密码",
 						});
-							return false
+						return false
 					}
-					
+
 					let formData = {
 						username: this.account,
 						password: this.password,
@@ -215,18 +179,18 @@
 						if (res.data.code == 0) {
 							uni.setStorageSync("tokendata", res.data.data.token); //token
 							uni.setStorageSync("Userinformation", formData); //用户信息
-							
-							 //勾选就缓存账号和密码
-						if (this.rememberPsw) {
-							uni.setStorageSync('HBusername', this.account);
-							uni.setStorageSync('HBpassword', this.password);
-						} else {//销毁缓存
-							uni.removeStorageSync('HBusername');
-							uni.removeStorageSync('HBpassword');
-						}
-						
-							
-							
+
+							//勾选就缓存账号和密码
+							if (this.rememberPsw) {
+								uni.setStorageSync('HBusername', this.account);
+								uni.setStorageSync('HBpassword', this.password);
+							} else { //销毁缓存
+								uni.removeStorageSync('HBusername');
+								uni.removeStorageSync('HBpassword');
+							}
+
+
+
 							//获取用户的信息，如组织架构，个人信息，权限等
 							Promise.all([
 								this.getpermissions(),
@@ -302,14 +266,14 @@
 					complete: () => {},
 				});
 			},
-useragement(){
-	uni.navigateTo({
-		url: "/pages/login/useragree",
-		success: (res) => {},
-		fail: () => {},
-		complete: () => {},
-	});
-},
+			useragement() {
+				uni.navigateTo({
+					url: "/pages/login/useragree",
+					success: (res) => {},
+					fail: () => {},
+					complete: () => {},
+				});
+			},
 
 			// 找回密码
 			forget() {
@@ -335,28 +299,30 @@ useragement(){
 </script>
 
 <style lang="scss">
-	.Userprotocol{
+	.uni-input-placeholder{text-align: left;}
+	.Userprotocol {
 		margin-top: 60rpx;
 		display: flex;
 		align-items: center;
 		justify-content: flex-end;
 		font-size: 12px;
 	}
-	
-	.Userprotocols{
+
+	.Userprotocols {
 		margin-top: -30rpx;
-		margin-right:-70rpx;
+		margin-left: -30rpx;
 		display: flex;
 		align-items: center;
-		justify-content: flex-end;
 		transform: scale(.75);
 	}
-	.Userprotocoltext{
-		color: #5C8FFF;
-		span{
-			color: #a1a2a3;
+
+	.Userprotocoltext {
+		color: #999;
+		span {
+			color: #5C8FFF;
 		}
 	}
+
 	.form-box {
 		width: 91%;
 		background: #fff;
@@ -390,12 +356,14 @@ useragement(){
 				flex: 1;
 			}
 		}
-		.Userprotocol{
+
+		.Userprotocol {
 			display: flex;
-			    align-items: center;
-			    justify-content: center;
-			    margin-top: 140rpx;
+			align-items: center;
+			justify-content: center;
+			margin-top: 100rpx;
 		}
+
 		.login-btn {
 			margin-top: 20rpx;
 			font-size: 16px;

pages/login/useragree.vue

@@ -167,6 +167,9 @@
 </script>
 
 <style lang="scss">
-
+.content{
+	padding: 16px;
+	line-height: 28px;
+}
 
 </style>

pages/my/Mydistribution/Mydistribution.vue

@@ -1,57 +0,0 @@
-<template>
-	<view class="OutermostLayer">		
-		
-			<view class="paifa">
-				<view class="addllayer">
-						<u-button type="primary" text="添加" @click="addnewdata"></u-button>
-				</view>
-					<u-cell-group>				
-						 <u-cell title="电力维修" label="B栋13楼电力设备出现问题" @click="distributiondetil"  :isLink="true">
-							 <u-icon slot="icon" size="45" name="order"></u-icon>
-						 </u-cell>
-						 <u-cell title="电力维修" label="B栋13楼电力设备出现问题"  @click="distributiondetil"   :isLink="true">
-						 					 <u-icon slot="icon" size="45" name="order"></u-icon>
-						 </u-cell>
-						 <u-cell title="电力维修" label="B栋13楼电力设备出现问题"  @click="distributiondetil"  :isLink="true">
-						 					 <u-icon slot="icon" size="45" name="order"></u-icon>
-						 </u-cell>
-						 <u-cell title="电力维修" label="B栋13楼电力设备出现问题"  @click="distributiondetil"  :isLink="true">
-						 					 <u-icon slot="icon" size="45" name="order"></u-icon>
-						 </u-cell>
-					</u-cell-group>
-			</view>
-			
-		</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			distributiondetil(){
-				uni.navigateTo({
-					url: 'distributiondetil/distributiondetil'
-				})
-			},
-			addnewdata(){
-				uni.navigateTo({
-					url: '/pages/my/Mydistribution/distributionedit/distributionedit'
-				})
-			}
-			
-		}
-	}
-</script>
-
-<style>
-.addllayer{
-	margin-bottom: 20rpx;
-}
-.paifa{
-	padding: 20rpx;
-}
-</style>

pages/my/Mydistribution/distributiondetil/distributiondetil.vue

@@ -1,87 +0,0 @@
-<template>
-	<view class="OutermostLayer">
-			<u-cell-group>				
-				<u-cell icon="integral-fill" title="任务名称" value="电力设备监测" >
-					<u-icon slot="icon" size="40" name="order"></u-icon>					
-				</u-cell>
-				<u-cell icon="integral-fill" title="办结日期" value="2023-05-15" >
-					<u-icon slot="icon" size="40" name="calendar"></u-icon>					
-				</u-cell>
-				<u-cell icon="integral-fill" title="任务类型" value="监测" >
-					<u-icon slot="icon" size="40" name="grid"></u-icon>					
-				</u-cell>
-				<u-cell icon="integral-fill" title="紧急程度" value="一般" >
-					<u-icon slot="icon" size="40" name="pushpin"></u-icon>					
-				</u-cell>
-				<u-cell icon="integral-fill" title="办理人员" value="杨刚" >
-					<u-icon slot="icon" size="40" name="man-add"></u-icon>					
-				</u-cell>
-			</u-cell-group>
-		<view class="description">
-			<view class="taskdetals1">
-				<u-icon name="list-dot"  size="35"></u-icon>
-			</view>
-			<view class="taskdetals2">
-				请在5月15号之前，把B栋所有楼层的灯光设备检查完毕，并详细记录每层楼道的灯光寿命情况，把损坏的灯泡上报维修部。				
-			</view>
-		</view>
-		
-		<view class="guidang">
-			
-			<view class="queding">
-				<u-button type="primary" :plain="true" text="返回" @click="returndata"></u-button>
-			</view>
-			<view class="queding">
-				<u-button type="primary" text="修改" @click="editdata"></u-button>
-			</view>
-		</view>
-		</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			editdata(){
-				uni.navigateTo({
-					url: '/pages/my/Mydistribution/distributionedit/distributionedit'
-				})
-			},
-			returndata(){
-				uni.navigateBack({
-					delta: 1
-				});
-			},
-		}
-	}
-</script>
-
-<style>
-	.description {
-		display: flex;
-		align-items: center;
-		width: 100%;
-		margin-top: 30rpx;
-	}
-	.taskdetals1 {}
-	
-	.taskdetals2 {
-		font-size: 25rpx;
-		padding-left: 15rpx;
-	}
-	.guidang {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		margin-top: 40rpx;
-		padding: 30rpx;
-	}
-	
-	.queding {
-		width: 40%;
-	}
-</style>

pages/my/Mydistribution/distributionedit/distributionedit.vue

@@ -1,237 +0,0 @@
-<template>
-	<view class="OutermostLayer">
-
-<view class="wfgz">
-	<!-- 注意，如果需要兼容微信小程序，最好通过setRules方法设置rules规则 -->
-	<u--form labelPosition="left" :model="model1" :rules="rules" ref="form1">
-		<u-form-item labelWidth='180' label="任务名称:" prop="userInfo.name" borderBottom ref="item1">
-			<u--input v-model="model1.userInfo.name" border="none"></u--input>
-		</u-form-item>
-		<u-form-item labelWidth='180' label="办结日期:" prop="userInfo.mydays" borderBottom @click="showPicker = true;"
-			ref="item1">
-			<u--input v-model="model1.userInfo.mydays" disabled disabledColor="#ffffff" placeholder="请选择办结日期"
-				border="none"></u--input>
-
-			<u-icon slot="right" name="arrow-right"></u-icon>
-		</u-form-item>
-
-		<u-form-item labelWidth='180' label="任务类型:" prop="userInfo.tasktype" borderBottom @click="showSex = true;"
-			ref="item1">
-			<u--input v-model="model1.userInfo.tasktype" disabled disabledColor="#ffffff" placeholder="请选择任务类型"
-				border="none"></u--input>
-			<u-icon slot="right" name="arrow-right"></u-icon>
-		</u-form-item>
-
-		<u-form-item labelWidth='180' label="紧急程度:" prop="userInfo.taskdegree" borderBottom
-			@click="showtaskdegree = true;" ref="item1">
-			<u--input v-model="model1.userInfo.taskdegree" disabled disabledColor="#ffffff" placeholder="请选择紧急程度"
-				border="none"></u--input>
-			<u-icon slot="right" name="arrow-right"></u-icon>
-		</u-form-item>
-
-		<u-form-item labelWidth='180' label="办理人员:" prop="userInfo.taskdegree" borderBottom
-			@click="showtaskpeople = true;" ref="item1">
-			<u--input v-model="model1.userInfo.taskpeople" disabled disabledColor="#ffffff" placeholder="请选择办理人员"
-				border="none"></u--input>
-			<u-icon slot="right" name="arrow-right"></u-icon>
-		</u-form-item>
-	</u--form>
-
-	<view class="guidang">
-		<view class="queding">
-			<u-button type="primary" :plain="true" text="返回" @click="returndata"></u-button>
-		</view>
-		<view class="queding">
-			<u-button type="primary" text="提交" @click="editdata"></u-button>
-		</view>
-	</view>
-</view>
-
-
-		<u-picker @cancel='showtaskpeople = false' @confirm='peopleconfirm' :show="showtaskpeople"
-			:columns="columnspeople" keyName="label" :itemHeight="80">
-		</u-picker>
-
-
-		<u-picker @cancel='showtaskdegree = false' @confirm='degreeconfirm' :show="showtaskdegree"
-			:columns="columnshowtaskdegree" keyName="label" :itemHeight="80">
-		</u-picker>
-
-		<u-picker @cancel='showSex = false' :itemHeight="80" @confirm='typeconfirm' :show="showSex" :columns="columns" keyName="label">
-		</u-picker>
-
-		<mx-date-picker :show="showPicker" type="date" :value="model1.userInfo.mydays" :show-tips="true"
-			:begin-text="'入住'" :end-text="'离店'" :show-seconds="true" @confirm="ed" @cancel="ed" />
-	</view>
-</template>
-
-<script>
-	import MxDatePicker from "@/components/mx-datepicker/mx-datepicker.vue";
-	export default {
-		components: {
-			MxDatePicker
-		},
-		data() {
-			return {
-				showSex: false,
-				showday: false,
-				showPicker: false,
-				showtaskdegree: false,
-				showtaskpeople: false,
-
-				model1: {
-					userInfo: {
-						name: '维修灯具',
-						tasktype: '维修',
-						mydays: '2023/04/15',
-						taskdegree: '一般',
-						taskpeople: '杨刚',
-					},
-				},
-				columns: [
-					[{
-						label: '巡查',
-						id: 1
-
-					}, {
-						label: '维修',
-						id: 2
-					}]
-				],
-
-				columnshowtaskdegree: [
-					[{
-							label: '一般',
-							id: 1
-
-						}, {
-							label: '重要',
-							id: 2
-						},
-						{
-							label: '紧急',
-							id: 3
-						},
-						{
-							label: '非常紧急',
-							id: 4
-						},
-					]
-				],
-				columnspeople: [
-					[{
-						label: '杨刚',
-						id: 1
-
-					}, {
-						label: '李伟',
-						id: 2
-					}]
-				],
-
-				rules: {
-					'userInfo.name': {
-						type: 'string',
-						required: true,
-						message: '请填写姓名',
-						trigger: ['blur', 'change']
-					},
-					'userInfo.sex': {
-						type: 'string',
-						required: true,
-						message: '请选择任务类型',
-						trigger: ['blur', 'change']
-					},
-					'userInfo.mydays': {
-						type: 'string',
-						required: true,
-						message: '请选择办结日期',
-						trigger: ['change']
-					},
-					'userInfo.taskdegree': {
-						type: 'string',
-						required: true,
-						message: '请选择紧急程度',
-						trigger: ['blur', 'change']
-					},
-					'userInfo.taskpeople': {
-						type: 'string',
-						required: true,
-						message: '请选择办理人员',
-						trigger: ['blur', 'change']
-					},
-
-				},
-
-			};
-		},
-		methods: {
-			onShowDatePicker() { //显示
-
-				this.showPicker = true;
-				//  this.value =this.model1.userInfo.mydays;
-			},
-			ed(e) { //选择
-				this.showPicker = false;
-				if (e) {
-					this.model1.userInfo.mydays = e.value;
-				}
-			},
-			returndata() {
-				uni.navigateBack({
-					delta: 1
-				});
-			},
-			editdata() {
-uni.navigateBack({
-					delta: 1
-				});
-			},
-
-			typeconfirm(e) {
-				console.log('111111111111111111', e.value[0].label)
-				this.model1.userInfo.tasktype = e.value[0].label;
-				this.showSex = false;
-				// this.model1.userInfo.sex = e.name
-				this.$refs.form1.validateField('userInfo.tasktype')
-			},
-
-			degreeconfirm(e) {
-				//console.log('111111111111111111', e.value[0].label)
-				this.model1.userInfo.taskdegree = e.value[0].label;
-				this.showtaskdegree = false;
-				// this.model1.userInfo.sex = e.name
-				this.$refs.form1.validateField('userInfo.taskdegree')
-			},
-			peopleconfirm(e) {
-				//console.log('111111111111111111', e.value[0].label)
-				this.model1.userInfo.taskpeople = e.value[0].label;
-				this.showtaskpeople = false;
-				// this.model1.userInfo.sex = e.name
-				this.$refs.form1.validateField('userInfo.taskpeople')
-			},
-
-
-		},
-		onReady() {
-			//如果需要兼容微信小程序，并且校验规则中含有方法等，只能通过setRules方法设置规则。
-			this.$refs.form1.setRules(this.rules)
-		},
-	};
-</script>
-
-<style>
-	.guidang {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		margin-top: 40rpx;
-	}
-
-	.queding {
-		width: 40%;
-	}
-	.wfgz{
-		padding: 20rpx;
-	}
-</style>

pages/my/Myorder/Orderdetails/Orderdetails.vue

@@ -1,71 +1,27 @@
 <template>
 	<view class="billall">
-
-		<view class="u-listdata">
-
-			<view class="Orderstatus">
-				<view class="Orderstatus1">
-					订单状态：{{alldata.status}}
-				</view>
-				<view class="Orderstatus1">
-					支付金额：{{alldata.payAmount}}
-				</view>
-				<view class="Orderstatus1">
-					支付时间：{{alldata.payAt}}
+		<view class="top">
+			<view class="title">总费用</view>
+			<view class="money">{{alldata.payAmount}}</view>
+		</view>
+		<view class="detailContent">
+			<view class="mb8">当前状态：{{alldata.status}}</view>
+			<view class="mb8">账单时间：{{alldata.createDate}}</view>
+			<view class="mingxi">
+				<text>账单明细：</text>
+				<view>
+					<view v-for="(item, index) in indexList" :key="index" class="mb4">
+						{{item.costType}}:￥{{item.amount}}
+					</view>
 				</view>
-
-
 			</view>
-
-			<u-list :pagingEnabled='true'>
-				<u-list-item v-for="(item, index) in indexList" :key="index">
-
-					<view class="companylist">
-					<!-- 	<view class="outstanding" v-if='item.status==2'>
-							未支付
-						</view>
-						<view class="settled" v-if='item.status==1'>
-							已支付
-						</view>
-						<view class="guanbi" v-if="item.status=='3'">
-							支付失败
-						</view> -->
-
-						<view class="Currentamount" style="margin-top: 20rpx;">
-							金额: <span>￥{{item.amount}}</span>
-						</view>
-						<view class="Currentamount">
-							账单类型: {{item.billType}}--{{item.costType}}
-						</view>
-						<view class="Currentamount">
-							计费周期: {{item.costCycle}}
-						</view>
-						<view class="Currentamount">
-							创建时间: {{item.createDate}}
-						</view>
-						
-
-					</view>
-
-				</u-list-item>
-			</u-list>
-
 		</view>
-
 		<view class="dibu" v-show="dibucaidan">
-			<!-- <view class="yucun">
-		<u-button type="success" text="预存" @click="prestore('预存')"></u-button>
-	</view>
-	<view class="yucun">
-		<u-button type="primary" text="补助" @click="prestore('补助')"></u-button>
-	</view> -->
+		
 			<view class="yucun" v-if='tk'>
 				<u-button type="error" text="退费" @click="prestore('退费')"></u-button>
 			</view>
 		</view>
-
-		<!-- 	<u-modal :show="showtype" @cancel='showtype=false' @confirm="confirmtf" :showCancelButton=true title="提示"
-			content='请确定是否退费？'></u-modal> -->
 		<u-popup :show="showpayjine" @close="closepay1" @open="openpay1" mode="bottom" :round="10" :closeable='true' :closeOnClickOverlay='false'>
 			<view class="paytall1">
 				<!-- <text>请选择支付方式</text> -->
@@ -92,23 +48,13 @@
 				</view>
 			</view>
 		</u-popup>
-
-
-
-
 		<u-notify ref="uNotify" message=""></u-notify>
 	</view>
 </template>
 
 <script>
-	//import { isEmpty, getDictDataList } from "@/utils/index";
 	export default {
-		components: {
-
-		},
-		
 		data() {
-
 			return {
 				tk:false,
 				zhifucanvas: false,
@@ -231,11 +177,10 @@
 
 
 			getalldata(e) {
-this.indexList=[];
+				this.indexList=[];
 				this.$api.get('/order/' + e, {})
 					.then(res => {
-						
-					//	console.log('111111111111111111', res.data.data)
+					console.log('111111111111111111', res.data.data)
 						if (res.data.data.status == '-1') {
 							res.data.data.status = '已关闭';
 							this.tk=false;
@@ -452,7 +397,32 @@ this.indexList=[];
 
 	}
 
-	.billall {}
+	.billall {
+		padding: 40rpx 80rpx;
+		background-color: #fff;
+		.top{
+			text-align: center;
+			border-bottom: 1px solid #eee;
+			color: #0C1935;
+			.title{
+				font-size: 32rpx;
+			}
+			.money{
+				font-size: 48rpx;
+				margin: 24rpx 0 40rpx;
+				font-weight: 600;
+			}
+		}
+		.detailContent{
+			color: #9DA0AC;
+			padding-top: 16rpx;
+			.mingxi{
+				display: flex;
+			}
+			.mb8{margin-bottom: 16rpx;}
+			.mb4{margin-bottom: 8rpx;}
+		}
+	}
 
 	.topbill {
 		display: flex;

pages/my/Mytask/Mytask.vue

@@ -1,139 +0,0 @@
-<template>
-	<view class="OutermostLayer">
-		<view style="width: 100%; height:350rpx">
-			<l-echart ref="mychart"></l-echart>
-		</view>
-		<h4>任务列表</h4>
-		<u-subsection :list="list" :current="curNow" @change="sectionChange"></u-subsection>
-
-		<u-cell-group v-for="(item,index) in taskList" :key="index">
-			<u-cell :title="item.tiname" :label="item.tilable" center :isLink="true"  @click="taskdetal(item)">
-				<u-icon slot="icon" :color="item.completecolor" size="45" :name="item.completeicon"></u-icon>
-			</u-cell>
-
-		</u-cell-group>
-
-	</view>
-</template>
-
-<script>
-	import * as echarts from 'echarts';
-
-	export default {
-		data() {
-			return {
-				teskdata: [150, 230, 224, 218, 135, 147, 260],
-				list: ['所有任务', '已完成', '未完成'],
-				curNow: 0,
-				taskList: [{
-						tiname: '水表维修',
-						tilable: 'A栋1304卫生间水表漏水',
-						complete: true,
-						completecolor: '#4CC417',
-						completeicon: 'thumb-up-fill'
-					},
-					{
-						tiname: '电表监测',
-						tilable: 'B栋13层电表监测',
-						complete: true,
-						completecolor: '#4CC417',
-						completeicon: 'thumb-up-fill'
-					},
-					{
-						tiname: '水表维修',
-						tilable: 'B栋305卫生间水表停转',
-						complete: false,
-						completecolor: '#E41B17',
-						completeicon: 'thumb-down'
-					},
-					{
-						tiname: '灯泡监测',
-						tilable: 'B栋13层灯泡监测',
-						complete: true,
-						completecolor: '#4CC417',
-						completeicon: 'thumb-up-fill'
-					},
-					{
-						tiname: '水表监测',
-						tilable: 'B栋13层监测',
-						complete: false,
-						completecolor: '#E41B17',
-						completeicon: 'thumb-down'
-					},
-
-				],
-
-
-			};
-		},
-
-		mounted() {
-			this.getdata()
-
-		},
-
-		methods: {
-			sectionChange(index) {
-				this.curNow = index;
-
-			},
-			taskdetal(e){
-				  console.log('111111111111111111',e)
-				uni.navigateTo({
-					url: 'Taskdetails/Taskdetails'
-				})
-			},
-			
-			getdata() {
-				let option = {
-					color:['#4CC417','#E41B17'],
-					tooltip: {
-						trigger: 'item'
-					},
-					 legend: {
-					    top: '1',
-					    left: 'center'
-					  },
-					series: [{
-						name: 'Access From',
-						type: 'pie',
-						radius: '50%',
-						data: [
-							{
-								value: 35,
-								name: '已完成'
-							},
-							{
-								value: 10,
-								name: '未完成'
-							},
-						
-						],
-						  label: {
-						          formatter: '{b}: ({d}%)'
-						        },
-						emphasis: {
-							itemStyle: {
-								shadowBlur: 10,
-								shadowOffsetX: 0,
-								shadowColor: 'rgba(0, 0, 0, 0.5)'
-							}
-						}
-					}]
-				};
-
-				this.$refs.mychart.init(echarts, chart => {
-					chart.setOption(option);
-				});
-			},
-
-
-		}
-	}
-</script>
-
-<style>
-	.OutermostLayer h4 {
-		padding-bottom: 30rpx;
-	}
-</style>

pages/my/Mytask/Taskdetails/Taskdetails.vue

@@ -1,165 +0,0 @@
-<template>
-	<view class="OutermostLayer">
-		<view class="renwu">
-			<view class="tasktime">
-				任务需在5月15号之前完成，当前剩余49天
-			</view>
-			<u-divider text="分割线" :dot="true"></u-divider>
-			<view class="tasktop">
-				<view class="tasktop1">
-					<view class="taskdetals1">
-						<u-icon name="man-add-fill" color="#2979ff" size="35"></u-icon>
-					</view>
-					<view class="taskdetals2">
-						发布人：李伟
-					</view>
-				</view>
-				<view class="tasktop1">
-					<view class="taskdetals1">
-						<u-icon name="calendar-fill" color="#2979ff" size="35"></u-icon>
-					</view>
-					<view class="taskdetals2">
-						办结日期：2023-05-15
-					</view>
-				</view>
-				<view class="tasktop1">
-					<view class="taskdetals1">
-						<u-icon name="bell-fill" color="#2979ff" size="35"></u-icon>
-					</view>
-					<view class="taskdetals2">
-						紧急程度：一般
-					</view>
-				</view>
-				<view class="tasktop1">
-					<view class="taskdetals1">
-						<u-icon name="tags-fill" color="#2979ff" size="35"></u-icon>
-					</view>
-					<view class="taskdetals2">
-						任务类型：日常性工作
-					</view>
-				</view>
-			</view>
-			<view class="description">
-				<view class="taskdetals1">
-					<u-icon name="file-text-fill" color="#2979ff" size="35"></u-icon>
-				</view>
-				<view class="taskdetals2">
-					请在5月15号之前，把B栋所有楼层的灯光设备检查完毕，并详细记录每层楼道的灯光寿命情况，把损坏的灯泡上报维修部。				
-				</view>
-			</view>
-			<u-divider text="分割线" :dot="true"></u-divider>
-			<u--textarea v-model="opinion" placeholder="请详细描述反馈" count></u--textarea>
-			
-			<view class="guidang">
-				<view class="queding">
-					<u-button type="primary" text="归档" @click="guidang"></u-button>
-				</view>
-				<view class="queding">
-					<u-button type="primary" :plain="true" text="转办" @click="zhuanban"></u-button>
-				</view>
-			</view>
-			
-			<u-picker :show="show" :itemHeight="80" title='转办人' @cancel='closezb' @confirm="confirm" :columns="columns" keyName="label">
-			</u-picker>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				opinion: '',
-				show: false,
-				columns: [
-					[{
-						label: '李伟',
-						id: 2021
-					}, {
-						label: '杨刚',
-						id: 804
-					}]
-				],
-			}
-		},
-		onLoad() {},
-		//监听页面初次渲染完成。注意如果渲染速度快，会在页面进入动画完成前触发
-		onReady() {},
-		methods: {
-			zhuanban() {
-				this.show = true;
-
-			},
-			closezb() {
-				this.show = false;
-			},
-			confirm(e) {
-				console.log('confirm', e)
-				this.show = false;
-				uni.navigateBack({
-					delta: 1
-				});
-			},
-			guidang() {
-				uni.navigateBack({
-					delta: 1,
-				});
-			},
-
-		}
-	}
-</script>
-
-
-<style>
-	.renwu{
-		padding: 20rpx;
-	}
-	.guidang {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		margin-top: 40rpx;
-	}
-
-	.queding {
-		width: 40%;
-	}
-
-	.tasktime {
-		font-size: 20rpx;
-		color: #407CF7;
-	}
-
-	.tasktop {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		flex-wrap: wrap;
-	}
-
-	.tasktop1 {
-		width: 50%;
-		height: 50rpx;
-		display: flex;
-		align-items: center;
-	}
-
-	.description {
-		display: flex;
-		align-items: center;
-		width: 100%;
-		margin-top: 10rpx;
-	}
-
-	.taskdetals1 {}
-
-	.taskdetals2 {
-		font-size: 25rpx;
-		padding-left: 15rpx;
-	}
-
-	.description {
-		font-size: 25rpx;
-	}
-</style>

pages/my/Personalinformation/Informationmodification/Informationmodification.vue

@@ -1,261 +0,0 @@
-<template>
-	<view class="OutermostLayer">
-	<view class="Personalinformationedit">
-
-				<!-- 注意，如果需要兼容微信小程序，最好通过setRules方法设置rules规则 -->
-				<u--form
-						labelPosition="left"
-						:model="model1"
-						:rules="rules"
-						ref="form1">
-					<u-form-item
-					labelWidth="120"
-							label="用户名:"
-							prop="userInfo.realName"
-							borderBottom
-							ref="item1"				>
-						<u--input
-								v-model="model1.userInfo.realName"
-								clearable
-								border="none"
-						></u--input>
-					</u-form-item>
-					<u-form-item
-					labelWidth="120"
-							label="手机:"
-							prop="userInfo.mobile"
-							borderBottom
-							ref="item1"
-					>
-						<u--input
-								v-model="model1.userInfo.mobile"
-								clearable
-								border="none"
-						></u--input>
-					</u-form-item>
-					<u-form-item
-					labelWidth="120"
-							label="邮箱:"
-							prop="userInfo.email"
-							borderBottom
-							ref="item1"
-					>
-						<u--input
-								v-model="model1.userInfo.email"
-								clearable
-								border="none"
-						></u--input>
-					</u-form-item>
-					<u-form-item
-							label="性别:"
-								labelWidth="120"
-							prop="userInfo.gender"
-							borderBottom
-							@click="showSex = true"
-							ref="item1"
-					>
-						<u--input
-								v-model="model1.userInfo.gender"
-								disabled
-								disabledColor="#ffffff"
-								placeholder="请选择性别"
-								border="none"
-						></u--input>
-						<u-icon
-								slot="right"
-								name="arrow-right"
-						></u-icon>
-					</u-form-item>
-					<!--<u-form-item-->
-					<!--labelWidth="120"-->
-							<!--label="地址:"-->
-							<!--prop="userInfo.address"-->
-							<!--borderBottom-->
-							<!--ref="item1"				>-->
-						<!--<u&#45;&#45;input-->
-								<!--v-model="model1.userInfo.address"-->
-								<!--clearable-->
-								<!--border="none"-->
-						<!--&gt;</u&#45;&#45;input>-->
-					<!--</u-form-item>-->
-					<u-form-item
-					labelWidth="120"
-							label="部门:"
-							prop="userInfo.deptName"
-							borderBottom
-							ref="item1"				>
-						<u--input
-								v-model="model1.userInfo.deptName"
-								clearable
-								border="none"
-						></u--input>
-					</u-form-item>
-				
-				</u--form>
-				
-
-				<view class="submitdata">
-					<u-button  type="primary" @click="submit">提交</u-button>
-				</view>
-			</view>
-		<u-notify ref="uNotify" message="" ></u-notify>
-
-		<u-picker :show="showSex" :itemHeight="80" @cancel="showSex = false"  @confirm="sexSelect" :columns="actions" keyName="name"></u-picker>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				getuserInfo:{},
-				showSex: false,
-				model1: {
-					userInfo: {
-						realName: '',
-						gender: '',
-						mobile:'',
-						email:'',
-						deptName:'合肥传秀科技技术部',
-					
-					},
-				},
-				actions: [
-					[
-						{
-							id:0,
-							name: '男',
-						},
-						{
-							id:1,
-							name: '女',
-						},
-						{id:2,
-							name: '保密',
-						},
-					]
-				],
-				rules: {
-					'userInfo.name': {
-						type: 'string',
-						required: true,
-						message: '请填写姓名',
-						trigger: ['blur', 'change']
-					},
-				'userInfo.email': [
-							{
-								required: true,
-								message: '请输入邮箱号',
-								trigger: ['change','blur'],
-							},
-							{
-								// 自定义验证函数，见上说明
-								validator: (rule, value, callback) => {
-									// 上面有说，返回true表示校验通过，返回false表示不通过
-									// uni.$u.test.mobile()就是返回true或者false的
-									return uni.$u.test.email(value);
-								},
-								message: '邮箱不正确',
-								// 触发器可以同时用blur和change
-								trigger: ['change','blur'],
-							}
-						],
-						'userInfo.mobile': [
-									{
-										required: true,
-										message: '请输入邮箱',
-										trigger: ['change','blur'],
-									},
-									{
-										// 自定义验证函数，见上说明
-										validator: (rule, value, callback) => {
-											// 上面有说，返回true表示校验通过，返回false表示不通过
-											// uni.$u.test.mobile()就是返回true或者false的
-											return uni.$u.test.mobile(value);
-										},
-										message: '手机号码不正确',
-										// 触发器可以同时用blur和change
-										trigger: ['change','blur'],
-									}
-								],
-
-
-					'userInfo.gender': {
-						type: 'string',
-						max: 2,
-						required: true,
-						message: '请选择',
-						trigger: ['blur', 'change']
-					},
-				},
-
-			};
-		},
-		onLoad(options){
-		let userInfo= uni.getStorageSync('getuserInfo');
-			if(userInfo.gender==0){
-				userInfo.gender='男'
-			}else if(userInfo.gender==1){
-				userInfo.gender='女'
-			}else if(userInfo.gender==2){
-				userInfo.gender='保密'
-			}
-		//	console.log('111111111111111111',userInfo)
-			this.model1.userInfo=userInfo;
-			//this.getuserInfo
-
-		},
-		methods: {
-
-			sexSelect(e) {
-				//console.log('111111111111111111',e)
-				this.model1.userInfo.gender = e.value[0].name;
-				this.$refs.form1.validateField('userInfo.gender')
-				this.showSex=false;
-			},
-			submit() {
-						this.$refs.form1.validate().then(res => {
-
-							if(this.model1.userInfo.gender=='男'){
-								this.model1.userInfo.gender=0
-							}else if(this.model1.userInfo.gender=='女'){
-								this.model1.userInfo.gender=1
-							}else if(this.model1.userInfo.gender=='保密'){
-								this.model1.userInfo.gender=2
-							}
-							this.$api.put('/user',this.model1.userInfo)
-									.then(res=>{
-										console.log('111111111111111111',res)
-										if(res.data.code==0){
-											uni.navigateBack({
-												delta: 1
-											});
-										}else{
-											this.$refs.uNotify.error(res.data.msg)
-										}
-									})
-
-
-						}).catch(errors => {
-							uni.$u.toast('校验失败')
-						})
-					},
-
-		},
-		onReady() {
-			//如果需要兼容微信小程序，并且校验规则中含有方法等，只能通过setRules方法设置规则。
-	    	this.$refs.form1.setRules(this.rules)
-	    },
-	};
-</script>
-
-<style lang="scss">
-.Personalinformationedit{
-	padding: 30rpx;
-
-}
-.submitdata{
-	margin-top: 40rpx;
-}
-
-</style>