Browse Source

bug修改

twt 2 years ago
parent
commit
5a6b5650ca

+ 2 - 1
operatingCompany/manifest.json

@@ -60,7 +60,8 @@
             "scope.userLocation" : {
             "scope.userLocation" : {
                 "desc" : "获取门店地址"
                 "desc" : "获取门店地址"
             }
             }
-        }
+        },
+		"requiredPrivateInfos" : [ "getLocation", "chooseLocation" ]
     },
     },
     "mp-alipay" : {
     "mp-alipay" : {
         "usingComponents" : true
         "usingComponents" : true

+ 1 - 1
operatingCompany/pages/entryReport/entryReport.vue

@@ -205,7 +205,7 @@
 					that.getShopData()
 					that.getShopData()
 				},
 				},
 				fail() {
 				fail() {
-
+                  that.getShopData()
 				}
 				}
 			})
 			})
 			//#ifdef H5 
 			//#ifdef H5 

+ 14 - 2
operatingCompany/pages/entryReport/entryredItem.vue

@@ -24,7 +24,7 @@
 					<view class="cglineRight" >{{yueduData.eurPercent}}%</view>
 					<view class="cglineRight" >{{yueduData.eurPercent}}%</view>
 				</view>
 				</view>
 			</view>
 			</view>
-			<view class="boxLine" v-for="(item,index) in categoryList[index1].sectionList[index2].itemList">
+			<view class="boxLine" v-for="(item,index) in itemList">
 				<view class="boxLineTop xzstoreBox">
 				<view class="boxLineTop xzstoreBox">
 					<view class="itemName">{{item.itemName}}</view>
 					<view class="itemName">{{item.itemName}}</view>
 					<view class="store xzstore" v-if="item.keyType==4" @click="pickerClick(item)">
 					<view class="store xzstore" v-if="item.keyType==4" @click="pickerClick(item)">
@@ -83,6 +83,7 @@
 				yuedu:false,
 				yuedu:false,
 				shopId:'',
 				shopId:'',
 				yueduData:'',
 				yueduData:'',
+				itemList:'',
 			}
 			}
 		},
 		},
 		onLoad(opt) {
 		onLoad(opt) {
@@ -167,6 +168,14 @@
 			   }
 			   }
 		   }) */
 		   }) */
 		    console.log(this.categoryList);
 		    console.log(this.categoryList);
+			this.itemList =  JSON.parse(JSON.stringify(this.categoryList[this.index1].sectionList[this.index2].itemList))  
+		},
+		onHide() {
+			//console.log("onHide")
+		},
+		onUnload(){
+			console.log("onUnload");
+			
 		},
 		},
 		methods: {
 		methods: {
 			numberxz(event){
 			numberxz(event){
@@ -280,12 +289,14 @@
 				});
 				});
 			},
 			},
 			sub(){
 			sub(){
+				 // this.categoryList[this.index1].sectionList[this.index2].itemList =this.itemList;
 				console.log(this.categoryList);
 				console.log(this.categoryList);
 				var go=true;
 				var go=true;
 				var gonum=true;
 				var gonum=true;
 				var gonumTxt=''
 				var gonumTxt=''
 				//return false;
 				//return false;
-				this.categoryList[this.index1].sectionList[this.index2].itemList.forEach(item=>{
+				this.itemList.forEach(item=>{
+				//this.categoryList[this.index1].sectionList[this.index2].itemList.forEach(item=>{
 					if(item.keyType==3){
 					if(item.keyType==3){
 						//item.itemValue=item.imgArr.join(',')//+'+'+item.;
 						//item.itemValue=item.imgArr.join(',')//+'+'+item.;
 						item.itemValue='',
 						item.itemValue='',
@@ -347,6 +358,7 @@
 					});
 					});
 					return false;
 					return false;
 				}
 				}
+				this.categoryList[this.index1].sectionList[this.index2].itemList =this.itemList;
 				//return false;
 				//return false;
 				this.categoryList[this.index1].sectionList[this.index2].check=true;
 				this.categoryList[this.index1].sectionList[this.index2].check=true;
 				if(this.yuedu){
 				if(this.yuedu){

+ 8 - 4
operatingCompany/pages/entryReport/signIn.vue

@@ -65,7 +65,7 @@
 				lat: '',
 				lat: '',
 				covers:[],
 				covers:[],
 				addressName:'',
 				addressName:'',
-				appkey:'064b6a4a8ade55656edcde2f528876de',
+				appkey:'1f1572c339215a646784f2489d4d049f',
 				keywords:'',
 				keywords:'',
 				addressList:'',
 				addressList:'',
 				ckIndex:0,
 				ckIndex:0,
@@ -81,6 +81,7 @@
 				anomalySignList:[],
 				anomalySignList:[],
 				reasonIDTxt:'',
 				reasonIDTxt:'',
 				otherShow:false,
 				otherShow:false,
+				newAddress:''
 			}
 			}
 		},
 		},
 		onLoad(opt) {
 		onLoad(opt) {
@@ -310,10 +311,12 @@
 				this.getLocationList()
 				this.getLocationList()
 			},
 			},
 			getLocationList() {
 			getLocationList() {
-				console.log("getLocationList")
+				console.log("getLocationList"+this.newAddress)
 				let _this = this;
 				let _this = this;
-				let data = {};
-				data.keywords =this.addressName;
+				let data = {
+					keywords:'',location:'',key:''
+				};
+				data.keywords =this.newAddress;
 				data.location = this.lng+','+this.lat;
 				data.location = this.lng+','+this.lat;
 				data.key=this.appkey;
 				data.key=this.appkey;
 				uni.request({
 				uni.request({
@@ -340,6 +343,7 @@
 						/* _this.list = res.data.tips; */
 						/* _this.list = res.data.tips; */
 						//console.log(res.data.regeocode.formatted_address)
 						//console.log(res.data.regeocode.formatted_address)
 						_this.addressName=res.data.regeocode.formatted_address;
 						_this.addressName=res.data.regeocode.formatted_address;
+						_this.newAddress=res.data.regeocode.addressComponent.township+res.data.regeocode.addressComponent.streetNumber.street+res.data.regeocode.addressComponent.streetNumber.number
 						console.log(_this.addressName)
 						console.log(_this.addressName)
 						_this.getLocationList()
 						_this.getLocationList()
 					}
 					}

+ 6 - 2
operatingCompany/pages/reportManage/reportDetail.vue

@@ -403,10 +403,14 @@
 			uni.getLocation({
 			uni.getLocation({
 				success(res) {
 				success(res) {
 					that.lng = res.longitude
 					that.lng = res.longitude
-					that.lat = res.latitude
+					that.lat =res.latitude
 					that.getSuperCheckSheetInfo()
 					that.getSuperCheckSheetInfo()
 				},
 				},
-				fail() {}
+				fail() {
+					that.lng = ''
+					that.lat = ''
+					that.getSuperCheckSheetInfo()
+				}
 
 
 			})
 			})
 			//this.getSuperCheckSheetInfo();
 			//this.getSuperCheckSheetInfo();