static文件下的图片压缩

App.vue

@@ -9,26 +9,18 @@
 		// 优先于show方法
 		onLaunch: function() {
 			// 配置全局域名
-			// #ifdef APP-PLUS
-				this.globalData.hostapi = 'https://7and5.cn';
-			// #endif
-			// #ifdef MP-WEIXIN
-				this.globalData.hostapi = 'https://7and5.cn';
-			// #endif
 			// #ifdef H5
 				this.globalData.hostapi = 'https://7and5.cn';
 				// this.globalData.hostapi = '/web';
 			// #endif 
 		},
 		onShow: function() {
-			// if(uni.getStorageSync('token')){
-				// 刷新token
-				// this.$toolAll.tools.refreshToken();
+			if(uni.getStorageSync('token')){
 				// 每十分钟更新用户地理位置
 				this.$toolAll.tools.renewLocationEv();
-			// }
-			// 检测是否开启GPS定位服务
-			this.$toolAll.tools.checkOpenGPSServiceByAndroidIOS();
+				// 检测是否开启GPS定位服务
+				this.$toolAll.tools.checkOpenGPSServiceByAndroidIOS();
+			}
 		},
 		onHide: function() {
 		

pages/appreciationServe/appreciationServe.vue

@@ -132,7 +132,15 @@
         },
         onLoad(op) {
             this.getType()
-            if (op.index != undefined) this.typeIndex = op.index;
+            if (op.index != undefined) {
+				if(op.index==2) {
+					this.typeIndex = 3;
+				} else if(op.index==3) {
+					this.typeIndex = 2;
+				} else {
+					this.typeIndex = op.index;
+				}
+			} 
         },
         methods: {
             // 切换类型

pages/project/details.vue

@@ -75,8 +75,8 @@
 					<view class="list">
 						<view class="li pad-z40 fon27 col9" :class="index==0 ? 'activeTrack' : ''" v-for="(item,index) in recordList" :key="index">
 							<view class="disac fw line-h60">
-								<view class="text">{{item.time_line}}</view>
-								<!-- <view class="date">2020-05-15 16:00</view> -->
+								<view class="text">{{item.value}}</view>
+								<view class="date">{{item.time}}</view>
 							</view>
 						</view>
 						<pitera v-if="recordList.length==0" :textStr="nomoreText"></pitera>
@@ -142,9 +142,11 @@
 				this.$requst.get('/universal/api.project/recording',params).then(res=>{
 					if(res.code) {
 						/**
-						 * {
-						 * 	 time_line:''
-						 * }
+						{
+						  	order_id:23
+							time:"2022-04-18"
+							value:"【其打嗝】提交 供电不足 工单 GD20220418-000022"
+						}
 						 */
 						this.recordList = res.data.data;
 					} else {

pages/workOrder/details.vue

@@ -5,7 +5,7 @@
             <view slot="content" style="margin:-30rpx -30rpx 0 -30rpx;">
                 <view class="details-nav" :style="{top:statusBarHeight + 'px'}">
                     <view class="li pad-sx36" @click="detailsNavpa(index)" :class="item.state?'on':''"
-                        v-for="(item,index) in detailsNav">
+                        v-for="(item,index) in detailsNav" :key="index">
                         {{item.title}}
                     </view>
                 </view>
@@ -258,8 +258,8 @@
                 swiperCurrent: 0,
                 swiHeight:0,
 				statusBarHeight:uni.getSystemInfoSync().statusBarHeight + 40,
-				statusText:'',
-                isrideo: true,
+				statusText:'',//状态文字
+				statusColor:'',//状态背景颜色
                 detailsNav: [{
                         title: "基础信息",
                         state: true
@@ -296,6 +296,7 @@
 		onLoad(op) {
 			this.statusText = op.statusText;
 			this.statusColor = op.statusColor;
+			console.log(this.statusColor,299);
 			if(op.orderId!=undefined) {
 				this.orderId = op.orderId;
 				// 调取获取工单详情事件
@@ -334,9 +335,6 @@
 					}
 				})
 			},
-            isrideoFun(is) {
-                this.isrideo = is
-            },
             copy(value) {
                 //提示模板
                 uni.showModal({

pages/workOrder/workOrderLlsit.vue

@@ -41,7 +41,7 @@
 									<view class="text clips1">{{item.project_name}}</view>
 									<view class="icon" :style="{backgroundColor: item.btn.attributes.color || '#DDDDDD'}">{{item.btn.attributes.text}}</view>
 								</view>
-								<view class="disjb fc line-h38" style="margin-left: -20rpx;">
+								<view class="disjb fc line-h36" style="margin-left: -20rpx;">
 									<view class="serial-number scal09">
 										<view class="type">#{{item.fault_type}}#</view>
 										<view class="date">{{item.failure_time}}</view>
@@ -111,6 +111,7 @@
 			}
 		},
 		onReachBottom() {
+			console.log(this.total,this.dataList.length,114);
 			if(this.total!=this.dataList.length) {
 				this.dataPage.page++;
 				this.getDatalist();
@@ -130,12 +131,18 @@
                     // this.$toolAll.tools.showToast(res.msg);
                     if (res.code) {
                         this.array=[...res.data]
-                        // 调用获取工单列表事件
                         if(this.statusId){
                             this.workeOrderStatusIndex = this.array.findIndex(item=>item.id==this.statusId);
-                            if(this.workeOrderStatusIndex!=-1) this.workeOrderStatus = '';
+                            if(this.workeOrderStatusIndex!=-1) {
+								this.workeOrderStatus = '';
+								this.dataPage.order_status = this.array[this.workeOrderStatusIndex].id;
+							}
                         }
-                        this.getDatalist();
+						// 如果页数等于1
+						if(this.dataPage.page==1) {
+							// 调用获取工单列表事件
+							this.getDatalist();
+						}
                     }
                 })
             },