Merge remote-tracking branch 'origin/master'

src/App.vue

@@ -194,7 +194,6 @@ export default {
 
       updateManager.onCheckForUpdate(function (res) {
         // 请求完新版本信息的回调
-        console.log(res.hasUpdate);
       });
 
       updateManager.onUpdateReady(function (res) {
@@ -273,7 +272,6 @@ export default {
       }
     },
     initShare(option) {
-      console.log(option, "option-initShare");
       option = option || {};
       if (AnalysysAgent && option.user_id) {
         let shareUserInfo = {

src/components/createCom/XhCheckbox.vue

@@ -32,7 +32,6 @@
 				}
 				const dataValue = this.dataValue
 				let flag = Array.isArray(dataValue) && dataValue.indexOf(item)>-1
-				console.log(flag,'flag')
 				return flag
 			},
 			setValue(txt) {

src/components/createCom/XhFiles.vue

@@ -156,12 +156,10 @@
 				// 	load: false, //（默认 true 说明：本接口是否提示加载动画）
 				// 	maxSize: 300000, //（默认 无 说明：上传的文件最大字节数限制，默认不限制）
 				// 	onEachUpdate: res => {
-				// 		console.log("上传成功返回：",res);
 				// 		const value = [uploader.qiniuTokenObj.visitPrefix + res.url]
 				// 		this.valueChange(value)
 				// 	},
 				// 	Update: res => {
-				// 		console.log("上传进度返回：",res);
 				// 	}
 				// }
 				// uploader.qnFileUpload(options)

src/components/createCom/XhPicker.vue

@@ -64,15 +64,12 @@
 				})
 				this.dataValue = result
 				this.valueChange(result)
-				console.log(result,'result')
 			},
 			columnchange(data){
-				console.log(data,'data')
 				// 树列改变时进行联动操作
 				const {column ,index} = data
 				let arr = [9,10,50]
 				this.settings.splice(column+1,1,arr)
-				console.log(this.settings,'this.settings')
 			},
 		}
 	}

src/components/createCom/XhScan.vue

@@ -44,8 +44,6 @@
 				    success: function (res) {
 						self.dataValue = res.result
 						self.valueChange(res.result)
-				        // console.log('条码类型：' + res.scanType);
-				        // console.log('条码内容：' + res.result);
 				    }
 				});
 			},

src/components/createCom/XhServiceMeasure.vue

@@ -146,12 +146,10 @@
 				this.valueChange(JSON.stringify(result))
 			},
 			columnchange(data){
-				// console.log(data,'data')
 				// // 树列改变时进行联动操作
 				// const {column ,index} = data
 				// let arr = [9,10,50]
 				// this.settings.splice(column+1,1,arr)
-				// console.log(this.settings,'this.settings')
 			},
 		}
 	}

src/components/photo/setting.vue

@@ -89,7 +89,6 @@
 		},
 		computed: {
 			itemList() {
-				console.log(this.result)
 				if (this.result['lowerLeft']) {
 					var arr = this.result['lowerLeft']['body']
 					return arr.filter((item) => {

src/components/photo/standard - 副本.vue

@@ -64,17 +64,14 @@
 					// let swiperList = JSON.parse(JSON.stringify(val))
 					// let len = tabs.length
 					// let tabList = [{name:'拍照要求'}].concat(Array.from({name:'示意图'},len))
-					// console.log(tabList,'tabList')
 				}
 			},
 		},
 		created() {
 			// getApp().trackPage('照片预览页')
-			// console.log(e, 'e')
 			// if (e.img) {
 			// 	this.images = [e.img]
 			// }
-			// console.log(this.images, 'this.images')
 		},
 		mounted(){
 			this.changeList(this.currentItem.images)
@@ -112,7 +109,6 @@
 			},
 			// swiper-item左右移动，通知tabs的滑块跟随移动
 			transition(e) {
-				// console.log(e.detail,'e.detail-transition')
 				// let dx = e.detail.dx;
 				// this.$refs.uTabs.setDx(dx);
 			},
@@ -122,7 +118,6 @@
 			// 由于swiper的内部机制问题，快速切换swiper不会触发dx的连续变化，需要在结束时重置状态
 			// swiper滑动结束，分别设置tabs和swiper的状态
 			animationfinish(e) {
-				// console.log(e.detail,'e.detail-animationfinish')
 				// let current = e.detail.current;
 				// this.$refs.uTabs.setFinishCurrent(current);
 				// this.swiperCurrent = current;

src/components/tabBarList/index.vue

 <template>
-	<view :class="['content', {'fixed': fixed}]">
-		<u-navbar :is-back="false" :is-fixed="false" :background="{ background: 'transparent' }" :border-bottom="false">
-			<text class="title-view">{{title}}</text>
-		</u-navbar>
+	<view :class="['content', {'fixed': fixed}]">
+		<view @click="handleClick">
+			<u-navbar :is-back="false" :is-fixed="false" :background="{ background: 'transparent' }" :border-bottom="false">
+				<text class="title-view">{{title}}</text>
+			</u-navbar>
+		</view>
 		<slot></slot>
 	</view>
 </template>
@@ -25,7 +27,9 @@
 			}
 		},
 		methods: {
-
+			handleClick() {
+				this.$emit('click')
+			}
 		}
 	}
 </script>

src/components/take/index.vue

@@ -248,7 +248,7 @@
 							waterInfo.address = i
 						},
 						fail: function(err) {
-							//console.log(err, 'err')
+							console.log(err, 'err')
 						}
 					};
 					if (waterInfo.latitude && waterInfo.longitude) {
@@ -383,7 +383,6 @@
 				const waterSetting = this.waterSetting
 				const globalTempPath = getApp().globalData.photo.tempPath
 				const ratio = this.ratio
-				console.log(this.ratio,'this.ratio')
 				// const ratio = 0.5
 				let canvasWidth = this.cameraWidth * ratio
 				let canvasHeight = this.cameraHeight * ratio

src/components/take/readme.md

@@ -84,7 +84,6 @@ export default {
 		},
 		// 拍照完成或关闭相机
 		closeTake(images) {
-			console.log(images)
 			this.takeStatus = false
 		}
 	}

src/components/upload - 副本/qiniup.js

@@ -91,7 +91,6 @@ export default {
 				}
 				
 				qiniuUploader.upload(params, (res) => {
-					console.log(res,'res')
 					let inLen = self.maximum - fileList.length
 					if (inLen > 0) {
 						item.src = file

src/components/upload - 副本/upload.js

@@ -61,7 +61,6 @@ export default {
 			uni.chooseImage({
 				count: this.selectNum, //默认9  this.selectNum
 				success: (chooseImageRes) => {
-					console.log(chooseImageRes,'chooseImageRes')
 					for (var i = 0; i < chooseImageRes.tempFilePaths.length; i++) {
 						let file = chooseImageRes.tempFilePaths[i];
 						let index = file.lastIndexOf('/');
@@ -82,7 +81,6 @@ export default {
 						}
 						if (newLen > 0) {
 							qiniuUploader.upload(params, (res) => {
-								console.log(res,'res')
 								let inLen = this.selectNum - this.imgList.length
 								if (inLen > 0) {
 									item.src = file

src/components/upload/index.js

@@ -25,7 +25,6 @@ export default {
 		};
 	},
 	created() {
-		// console.log(uploader,'uploader')
 		// this.initQiniu()
 	},
 	methods: {	
@@ -129,7 +128,6 @@ export default {
 						imgList[res.fileIndex]
 						self.imgList = imgList
 						// 多文件上传每个文件进度条
-						//console.log(res,'res---onProgressUpdate')
 					},
 					onEachUpdate(res){
 						// 多文件上传每个文件上传成功触发
@@ -138,7 +136,6 @@ export default {
 							imgList[res.fileIndex].src = uploader.qiniuTokenObj.visitPrefix + res.url
 						}
 						self.imgList = imgList
-						//console.log(res,'res---onEachUpdate')
 					},
 					cardType: category,
 					...config
@@ -146,8 +143,6 @@ export default {
 				
 				// 不需要进度条等可直接获取
 				let res = await uploader.qnImgUpload(options)
-				// console.log(self.imgList,'self.imgList')
-				// console.log(uploader,uploader.qiniuTokenObj,'qiniuTokenObj')
 				// let imgList = res.map(item=>{
 				// 	return {
 				// 		key:item,

src/components/upload/qiniup.js

@@ -91,7 +91,6 @@ export default {
 				}
 				
 				qiniuUploader.upload(params, (res) => {
-					console.log(res,'res111')
 					let inLen = self.maximum - fileList.length
 					if (inLen > 0) {
 						item.src = file

src/components/upload/task.js

@@ -21,7 +21,7 @@ export default {
         }
 		const result = await uploader.qnFileUpload(options)
 
-        if (result) { // 匹配已上传完成的图片，更新缓存数据
+        if (result && !result.statusCode) { // 匹配已上传完成的图片，更新缓存数据
             let newTask = [] 
             let delImg = [] 
             uploadTask.forEach(v => {

src/pages/exam/index.vue

@@ -392,15 +392,6 @@
 
 			itemClick: function(currentItem, ikey) {
 				this.isSelect = true
-
-				// console.log('选点点击--处理前--this.currentItem：')
-				// console.log(this.currentItem)
-				// console.log('选点点击--处理前--ikey：')
-				// console.log(ikey)
-				// console.log('选点点击--处理前--题目类型，1单选，2多选，3简答：')
-				// console.log(this.currentItem.question.answerType)
-
-
 				//answerType 题目类型，1单选，2多选，3简答，
 
 				for (let i = 0; i < this.currentItem.answerList.length; i++) {
@@ -434,12 +425,6 @@
 
 				//有选答案
 				this.isSelect = isSelect
-
-				// console.log('选点点击--处理后--this.currentItem.answerList：')
-				// console.log(this.currentItem.answerList)
-
-
-
 			},
 			// 点击下一步
 			handleClick() {

src/pages/index/index.vue

 <template>
-	<TabBarPage title="扳手会" :fixed="true">
+	<TabBarPage title="扳手会" :fixed="true" @click="goTop">
 		<view class="content-view">
-	<scroll-view style="height: 100%;" scroll-y @scrolltolower="reachBottom"
+	<scroll-view style="height: 100%;" scroll-y @scrolltolower="reachBottom" :scroll-top="scrollTop" @scroll="scroll"
 		scroll-anchoring scroll-y="true" refresher-enabled="true" :refresher-triggered="triggered" :refresher-threshold="100"
-				refresher-background="#F4F5F7" @refresherpulling="triggered = true" @refresherrefresh="onRefresh"
+				refresher-background="#F4F5F7" @refresherpulling="triggered = true" @refresherrefresh="onRefresh" 
 				@refresherrestore="onRestore" @refresherabort="onAbort" enable-back-to-top>
 		<!-- <TabBarPage title="扳手会"> -->
 		<image class="banner-image" :src="bannerImage" @click="handleClickBanner"></image>
@@ -116,7 +116,11 @@
 				waitInit: false, // 当token为空时，等待自动登录结束
 				triggered: false,
 				_freshing: false,
-				visible: false,
+				visible: false,
+				scrollTop: 0,
+				old: {
+					scrollTop: 0
+				}
 			};
 		},
 		watch: {
@@ -275,6 +279,15 @@
 			onRestore() {
 				this.triggered = 'restore'; // 需要重置
 			},
+			scroll(e) {
+				this.old.scrollTop = e.detail.scrollTop
+			},
+			goTop(e) {
+				this.scrollTop = this.old.scrollTop
+				this.$nextTick(function() {
+					this.scrollTop = 0
+				});
+			},
 			/* 立即入驻 */
 			immediatelyIn() {
 				if (this.vuex_token) {

src/pages/mine/contract/index.vue

@@ -55,7 +55,6 @@ export default {
                             res.data[i].name = res.data[i].name.replace(re, "");
                         }
                         this.res = this.res.concat(res.data);
-                        console.log(this.res);
                     }
                 } else {
                     //接口请求失败的处理

src/pages/order/detail.vue

@@ -247,7 +247,7 @@
 			}
 			this.loadOrderDetail()
 			this.loadOrderRecord()
-			// this.getLocation()
+			this.getLocation()
 			this.getSignDistance()
 		},
 		onHide() {

src/pages/settle/age.vue

@@ -45,8 +45,6 @@
 			itemClick: function (item, ikey) {
 				this.selected_age = item.title
 				this.selected_index = ikey
-				console.log(item.title)
-				console.log(ikey)
 			},
 			
 			confirmClick: function () {

src/pages/settle/base.vue

@@ -344,7 +344,6 @@
 					...baseInfo,
 					recommender: getApp().globalData.settleRecommend
 				}
-				console.log(params, 'params')
 				params.service_area = baseInfo.service_area.join(',')
 				const res = await this.$u.api.submitSettleBaseInfo(params)
 				this.saving = false;

src/pages/settle/pay-ensure.vue

@@ -161,7 +161,6 @@
 					// appid:'wxd1d6eede324b0465'
 				}
 				const response = await this.$u.api.paySettleDeposit(params)
-				console.log(response)
 				if (response.code !== 200) {
 					this.saving = false
 					uni.showToast({
@@ -188,7 +187,6 @@
 						})
 					} else if (result == "fail") {
 						// charge 不正确或者微信公众账号/QQ 公众号/支付宝口碑支付失败时会在此处返回
-						// console.log(err.msg)
 						this.showPopView()
 					} else if (result == "cancel") {
 						// 微信公众账号、QQ 公众号、支付宝口碑支付取消支付
@@ -210,11 +208,9 @@
 					cancelText: '失败',
 					success: ((res) => {
 							if (res.confirm) {
-								// console.log(res.confirm,'res.confirm')
 								this.pending()
 							} else if (res.cancel) {
 								this.pending()
-								console.log('用户点击取消');
 							}
 					})
 				});

src/pages/settle/prompt.vue

@@ -169,7 +169,6 @@
 				// const status = 7
 				const infoArr = this.promptList.filter(item => {
 					const itemStatus = item.status
-					// console.log(itemStatus,'itemStatus')
 					let idx = -2
 					if (Array.isArray(itemStatus)) {
 						idx = itemStatus.indexOf(status)
@@ -229,7 +228,6 @@
 			// 										if (res.confirm) {
 			// 											uni.openSetting({
 			// 												success(res) {
-			// 												  console.log(res.authSetting)
 			// 												}
 			// 											});
 			// 										}

src/plugins/uploader/index.js

@@ -28,7 +28,6 @@ let uploader = new request(baseOptions);
 // 添加获取七牛云token的方法
 uploader.getQnToken = function(params) {
 	//该地址需要开发者自行配置（每个后台的接口风格都不一样）
-	// console.log(uploader.get,'uploader.get')
 	return new Promise((resolve, reject) => {
 		uploader.post(baseOptions.qiniuUploadUrl, params).then(data => {
 			/*
@@ -118,13 +117,6 @@ let loginPopupNum = 0;
 //所有接口数据处理（可在接口里设置不调用此方法）
 //此方法需要开发者根据各自的接口返回类型修改，以下只是模板
 uploader.dataFactory = async function(res) {
-	console.log("接口请求数据", {
-		url: res.url,
-		resolve: res.response,
-		header: res.header,
-		data: res.data,
-		method: res.method,
-	});
 	if (res.response.statusCode && res.response.statusCode == 200) {
 		// let httpData = res.response.data;
 		let httpData = res.response;
@@ -132,7 +124,6 @@ uploader.dataFactory = async function(res) {
 			httpData = JSON.parse(httpData);
 		}
 		/*********以下只是模板(及共参考)，需要开发者根据各自的接口返回类型修改*********/
-		console.log(httpData, 'httpData')
 		//判断数据是否请求成功
 		if (httpData.statusCode === 200) {
 			// 返回正确的结果(then接受数据)

src/plugins/uploader/request/core/request.js

@@ -31,7 +31,6 @@ export default class request {
 
 	//get请求
 	get(url = '', data = {}, options = {}) {
-		console.log(this.request,'this.request')
 		return this.request({
 			method: "GET",
 			data: data,

src/plugins/uploader/request/core/utils.js

@@ -67,7 +67,6 @@ export const dispatchRequest = function(requestInfo) {
 		}
 		// #endif
 		let requestTask = uni.request(requestData);
-		console.log(requestTask,requestData,'requestTask')
 		setTimeout(() => {
 			if(requestAbort){
 				requestTask.abort();

src/plugins/uploader/request/upload/utils.js

@@ -16,7 +16,6 @@ export const randomChar = function(l, url = "") {
 }
 //图片选择
 export const chooseImage = function(data) {
-	console.log(data,'data-chooseImage')
 	return new Promise((resolve, reject) => {
 		uni.chooseImage({
 			count: data.count || 9, //默认9
@@ -125,9 +124,6 @@ export const qiniuUpload = function(requestInfo, qnRes) {
 							uptokenURL: 'UpTokenURL.com/uptoken' // 上传地址
 						}, (res) => {
 							requestInfo.onProgressUpdate && requestInfo.onProgressUpdate(Object.assign({}, fileData, res));
-							// console.log('上传进度', res.progress)
-							// console.log('已经上传的数据长度', res.totalBytesSent)
-							// console.log('预期需要上传的数据总长度', res.totalBytesExpectedToSend)
 						});
 					}
 				// });

src/router/index.js

@@ -15,7 +15,6 @@ router.beforeEach((to, from, next) => {
 });
 // 全局路由后置守卫
 router.afterEach((to, from) => {
-    console.log('跳转结束')
 })
 
 export {

src/utils/login.js

@@ -77,7 +77,6 @@ function oauth() {
 		uni.getProvider({
 			service: 'oauth',
 			success: function (res) {
-				console.log(res.provider)
 				if (~res.provider.indexOf('weixin')) {
 					// weixin		微信登录
 					login('weixin').then(res=>{resolve(res)}).catch(err=>{reject(err)})
@@ -107,7 +106,6 @@ function login(provider) {
 		uni.login({
 			provider: provider,
 			success(res) {
-				console.log(JSON.stringify(res));
 				resolve(res);
 			},
 			fail(err) {