bug修改

operatingCompany/common/request.js

@@ -1,7 +1,5 @@
  const baseUrl = 'http://58.56.15.138:20189/' 
- 
-
-//const baseUrl = 'https://api.dms.66km.com/'
+ //const baseUrl = 'https://api.dms.66km.com/'
  
 import md5 from './MD5.js'
 

operatingCompany/pages/AccountSet/AccountSet.vue

@@ -43,7 +43,8 @@
 			}
 		},
 		
-		onLoad() {
+		onLoad() {
+			this.$common.isUserId()
 			this.userInfo = uni.getStorageSync("userInfo");
 		},
 		methods: {

operatingCompany/pages/entryReport/entryReport.vue

@@ -70,7 +70,7 @@
 					</view>
 					<!-- 门店类型-开业时间-联系人 -->
 					<view class="shopType"><text style='color: #B98B5D;'>{{item.levelName}}</text> ·
-						<text v-if="item.OpeningTime != null">{{item.OpeningTime}}</text> 联系人：{{item.Contactor}}
+						<text v-if="item.OpeningTime != null">{{item.OpeningTime.slice(0,item.OpeningTime.length-8) }}</text> 联系人：{{item.Contactor}}
 					</view>
 
 					<!-- 详细地址 -->
@@ -121,7 +121,7 @@
 					</view>
 					<!-- 门店类型-开业时间-联系人 -->
 					<view class="shopType"><text style='color: #B98B5D;'>{{item.levelName}}</text> ·
-						<text v-if="item.OpeningTime != null">{{item.OpeningTime}}</text> 联系人：{{item.Contactor}}
+						<text v-if="item.OpeningTime != null">{{item.OpeningTime.slice(0,item.OpeningTime.length-8)}}</text> 联系人：{{item.Contactor}}
 					</view>
 
 					<!-- 详细地址 -->

operatingCompany/pages/entryReport/entryredItem.vue

@@ -17,11 +17,11 @@
 				</view>
 				<view class="cgline">
 					<view class="cglineName">总采购额完成率</view>
-					<view class="cglineRight">{{yueduData.yearPercent}}%</view>
+					<view class="cglineRight" :class="{green:yueduData.level==1,yellow:yueduData.level==2,red:yueduData.level==3,}">{{yueduData.yearPercent}}%</view>
 				</view>
 				<view class="cgline">
 					<view class="cglineName">欧洲维修占比</view>
-					<view class="cglineRight" :class="{green:yueduData.level==1,yellow:yueduData.level==2,red:yueduData.level==3,}">{{yueduData.eurPercent}}%</view>
+					<view class="cglineRight" >{{yueduData.eurPercent}}%</view>
 				</view>
 			</view>
 			<view class="boxLine" v-for="(item,index) in categoryList[index1].sectionList[index2].itemList">
@@ -37,7 +37,7 @@
 						 </view>
 					</view>
 				</view>
-				<view class="boxlinedescribe">{{item.describe}}</view>
+				<view class="boxlinedescribe" v-if="item.describe">{{item.describe}}</view>
 				<view class="itemCklineBox" v-if="item.keyType==1">
 					<view class="itemCkline" :class="{itemckActive:name.check}" @click="itemXx(name,item.array)" v-for="(name,nameIndex) in item.array">{{name.name}}</view> 
 					<!-- <view class="itemCkline itemckActive">张杰</view> -->
@@ -451,4 +451,8 @@
 	.red{
 		color:#FF3B30 ;
 	}
+	.pickerView{
+		width: 500rpx;
+		text-align: right;
+	}
 </style>

operatingCompany/pages/entryReport/opinion.vue

@@ -10,7 +10,7 @@
 			<view class="lineCont">
 				<view class="lineContLeft">检测项</view>
 				<view class="lineContRight"  @click="pickerClick(item)">
-					<picker mode="multiSelector" @change="bindPickerChange" @columnchange="columnchange" :value="index" :range="array"
+					<picker mode="multiSelector" @change="bindPickerChange" @columnchange="columnchange" :value="pindex" :range="array"
 						 range-key="title">
 						 <view class="uni-picker">
 							 <view class="timeNoSpan jcxTitle" v-if="!item.checkName">{{title}}</view>
@@ -78,7 +78,7 @@
 				shopName:'',
 				Contactor:'',
 				nowDate:'',
-				index: [0, 0],
+				pindex: [0, 0],
 				array: [[],[]],
 				childArr: [], // 二级分类数据源
 				title: '请选择',
@@ -103,16 +103,16 @@
 				//console.log(e)
 				console.log('picker发送选择改变，携带值为', e.target.value)
 				let value = e.target.value;
-				this.index = value;
+				this.pindex = value;
 				if (this.array[0].length != 0) {
 					//this.title = this.array[0][this.index[0]].title
-					this.pickerItem.categoryName= this.array[0][this.index[0]].title
-					this.pickerItem.sheetCategoryID= this.array[0][this.index[0]].id
+					this.pickerItem.categoryName= this.array[0][this.pindex[0]].title
+					this.pickerItem.sheetCategoryID= this.array[0][this.pindex[0]].id
 				};
 				if (this.array[1].length != 0) {
 					//this.title += ',' + this.array[1][this.index[1]].title
-					this.pickerItem.checkName=this.array[1][this.index[1]].title;
-					this.pickerItem.sheetSectionID= this.array[1][this.index[1]].id;
+					this.pickerItem.checkName=this.array[1][this.pindex[1]].title;
+					this.pickerItem.sheetSectionID= this.array[1][this.pindex[1]].id;
 				}
    
 			},
@@ -133,7 +133,9 @@
 					categoryName:'',
 					checkName:'',
 				}
-				this.suggestList.push(obj)
+				this.suggestList.push(obj);
+				console.log(this.suggestList)
+				//this.suggestList.splice(1,0)
 			},
 			delOp(index){
 				var that=this;
@@ -334,6 +336,7 @@
 			},
 			// 获取二级分类
 			columnchange(e) {
+				console.log(e)
 				// 当滚动切换一级分类时，为当前的一级分类添加它的子类
 				if (e.detail.column == 0) {
 					// #ifdef H5
@@ -481,5 +484,6 @@
 	}
 	.jcxTitle{
 		width: 500rpx;
+		font-size: 28rpx;
 	}
 </style>

operatingCompany/pages/logIn/home.vue

@@ -14,7 +14,9 @@
 		  <view class="homePg">
 		  	<view class="bg">
 		  		<view class="logIn" @click="logIn">立即登录</view>
+				<view class="logOutBtn" @click="goIndex">取消登录</view>
 		  	</view>
+			
 		  </view>
 	  </view>
 		
@@ -48,8 +50,18 @@
 			}
 		},
 		methods: {
-
+            goIndex() {
+            	uni.navigateTo({
+            		url: '../index/index'
+            	})
+            },
 			logIn() {
+				/* uni.navigateTo({
+					url: '../logIn/logIn'
+				})
+				return false; */
+				//提交正式测试
+				
                 var that=this;
                 uni.getUserProfile({
                 	lang:'zh_CN',
@@ -192,7 +204,19 @@
 		line-height: 88rpx;
 		position: absolute;
 		left: 154rpx;
-		top: 874rpx;
+		top: 854rpx;
 		
 	}
+	.logOutBtn {
+		
+		width:750rpx;
+		height: 40rpx;
+		text-align: center;
+		line-height: 40rpx;
+		font-size: 28rpx;
+		color: #999999;
+		position: absolute;
+		left: 0rpx;
+		top: 954rpx;
+	}
 </style>

operatingCompany/pages/logIn/logIn.vue

@@ -175,7 +175,7 @@
 			,
 			goIndex() {
 				uni.navigateTo({
-					url: '../logIn/home'
+					url: '../index/index'
 				})
 			}
 		}

operatingCompany/pages/reportManage/reportDetail.vue

@@ -62,8 +62,8 @@
 				</view>
 				<view class="shopCont">
 					<view class="shopLevel" v-if="info.shopInfo.shopLevel">{{info.shopInfo.shopLevel}}</view>
-					<view class="openingTime" v-if="info.shopInfo.openingTime">·{{info.shopInfo.openingTime}}</view>
-					<view class="openingTime">联系人：{{info.shopInfo.contactor}} {{info.shopInfo.contactorPhone}}</view>
+					<view class="openingTime" v-if="info.shopInfo.openingTime">·{{info.shopInfo.openingTime.slice(0,info.shopInfo.openingTime.length-8)}}</view>
+					<view class="openingTime">联系人：{{info.shopInfo.contactor}} </view><!-- {{info.shopInfo.contactorPhone}} -->
 				</view>
 				<view class="address" v-if="info.shopInfo.address">
 					<view style="padding-right: 30rpx;">{{info.shopInfo.address}}</view>
@@ -83,6 +83,29 @@
 					<view class="categoryName">{{item.categoryName}}</view>
 					<view class="sectionList" v-for="(list,index2) in item.sectionList" :key="list.id">
 						<view class="checkName">{{list.checkName}}</view>
+						<!-- 月度采购金额 -->
+						<view class="boxLine2" v-if="list.isPurchase==1">
+							<view class="cgline">
+								<view class="cglineName">当月采购额</view>
+								<view class="cglineRight">￥{{list.month}}</view>
+							</view>
+							<view class="cgline">
+								<view class="cglineName">当月欧洲维修采购额</view>
+								<view class="cglineRight">￥{{list.eurMonth}}</view>
+							</view>
+							<view class="cgline">
+								<view class="cglineName">当年总采购额</view>
+								<view class="cglineRight">￥{{list.year}}</view>
+							</view>
+							<view class="cgline">
+								<view class="cglineName">总采购额完成率</view>
+								<view class="cglineRight" :class="{green:list.level==1,yellow:list.level==2,red:list.level==3,}">{{list.yearPercent}}%</view>
+							</view>
+							<view class="cgline">
+								<view class="cglineName">欧洲维修占比</view>
+								<view class="cglineRight" >{{list.eurPercent}}%</view>
+							</view>
+						</view>
 						<view class="itemList" v-for="(v,index3) in list.itemList" :key="v.id" >
 							<view class="itemTOp">
 								<view class="itemName">{{v.itemName}}</view>
@@ -105,29 +128,7 @@
 								
 							</view>
 						</view>
-						<!-- 月度采购金额 -->
-						<view class="boxLine2" v-if="list.isPurchase==1">
-							<view class="cgline">
-								<view class="cglineName">当月采购额</view>
-								<view class="cglineRight">￥{{list.month}}</view>
-							</view>
-							<view class="cgline">
-								<view class="cglineName">当月欧洲维修采购额</view>
-								<view class="cglineRight">￥{{list.eurMonth}}</view>
-							</view>
-							<view class="cgline">
-								<view class="cglineName">当年总采购额</view>
-								<view class="cglineRight">￥{{list.year}}</view>
-							</view>
-							<view class="cgline">
-								<view class="cglineName">总采购额完成率</view>
-								<view class="cglineRight">{{list.yearPercent}}%</view>
-							</view>
-							<view class="cgline">
-								<view class="cglineName">欧洲维修占比</view>
-								<view class="cglineRight" :class="{green:list.level==1,yellow:list.level==2,red:list.level==3,}">{{list.eurPercent}}%</view>
-							</view>
-						</view>
+						
 					</view>
 				</view>
 				
@@ -1014,7 +1015,8 @@
 	.boxLine2{
 		padding: 10rpx 20rpx;
 		background: #FFFFFF;
-		margin-bottom: 20rpx;
+		/* margin-bottom: 20rpx; */
+		border-bottom: 1px solid #EEEEEE;
 	}
 	.cgline{
 		display: flex;

operatingCompany/pages/shop/shopIndex/editWork.vue

@@ -2,7 +2,10 @@
 	<view class="content">
 		<view class="suggestLine" v-for="(item,index) in list">
 			<view class="suggestLineTop">建议({{index+1}})</view>
-			<view class="suggestCont">{{item.suggest}}</view>
+			<view class="suggestCont" style="color: #666666;font-size: 26rpx;padding-bottom: 20rpx;">
+				<view class="">{{item.categoryName}}-{{item.checkName}}</view>
+			</view>
+			<view class="suggestCont" style="padding-top: 0;">{{item.suggest}}</view>
 			<view class="suggestLineBottom">
 				<view class="suggestLineBottomTxt">预计完成日期:{{item.orderFinishTime.slice(0,item.orderFinishTime.length-8)}}</view>
 				<view class="suggestLineBottomTxt">负责人:{{item.managerName}}</view>
@@ -14,6 +17,7 @@
 			</view>
 			<view class="workBox" v-if="item.exeState==1">
 				<view class="workTitle">作业情况</view>
+				
 				<view class="exeContent">
 					<view class="exeContent" v-if="item.exeContent">{{item.exeContent}}</view>
 				</view>