Merge branch 'test' of git.echepei.com:sailun/sailun-tbr-web into test

App.vue

@@ -38,44 +38,15 @@
 				})
 			}
 		},
-		onLaunch() {
-			request({
-					url: '/baseReq/apkUpgrade',
-					method: 'get',
-					params: {
-						osType: 0
-					}
-				}).then(res => {
-					console.log(res)
-					console.log(res.data.forceVersion) //最低版本
-					console.log(res.data.msg) //更新文案
-					console.log(res.data.url) //下载最新版地址
-					console.log(res.data.version) //最新版本
-					
-					plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => {
-						console.log(wgtinfo);
-						console.log(wgtinfo.version); //版本号
-						
-						if (wgtinfo.version != res.data.forceVersion || wgtinfo.version != res.data.version) {
-							console.log("需要更新")
-						}else{
-							console.log("已是最新版本")
-						}
-						
-					})
-
-				}).catch(err => {
-					console.log(err)
-				})
-				.finally(() => {
-					// Loading.close()
-				})
-
-			// 1.1.0版本之前关于http拦截器代码，已平滑移动到/common/http.interceptor.js中
-			// 注意，需要在/main.js中实例化Vue之后引入如下(详见文档说明)：
-			// import httpInterceptor from '@/common/http.interceptor.js'
-			// Vue.use(httpInterceptor, app)
-		},
+		// onLaunch() {
+		// 	this.$u.route({
+		// 		url: 'pages/login/upgrade'
+		// 	})
+		// 	// 1.1.0版本之前关于http拦截器代码，已平滑移动到/common/http.interceptor.js中
+		// 	// 注意，需要在/main.js中实例化Vue之后引入如下(详见文档说明)：
+		// 	// import httpInterceptor from '@/common/http.interceptor.js'
+		// 	// Vue.use(httpInterceptor, app)
+		// },
 		onShow() {}
 	}
 </script>

pages/me/Reward-details/index.vue

@@ -11,7 +11,7 @@
 						<u-select @cancel="clear" style=" color: #fff;" @confirm="confirm" v-model="showBrand" value-name="brandId" label-name="brandName" :list="brandList"></u-select>
 						<u-calendar style=" color: #fff;" @change="changetime" v-model="showDate" :mode="mode"></u-calendar>
 						<view @click="search">
-							<u-search :show-action="true" :animation="true"></u-search>
+							<u-search placeholder="请输入胎号或规格" v-model="input" :clearabled="true" @custom="handleSearch" :show-action="true" :animation="true"></u-search>
 						</view>
 					</view>
 					<view v-if="count!=0">
@@ -56,11 +56,12 @@
 						
 					</view>
 			
-			<u-loadmore :status="status" />
+			
 		</view>
 		<view v-else style="margin-top: 400rpx;">
 			<u-empty text="暂无数据" mode="list"></u-empty>
 		</view>
+		<u-loadmore v-if="datalist.length>3" :status="status" />
 	</view>
 </template>
 
@@ -75,6 +76,7 @@
 				datalist: [],
 				status: 'loadmore',
 				getWay: '',
+				input: '',
 				list: [{
 					name: '全部'
 				}, {
@@ -82,31 +84,7 @@
 				}, {
 					name: '时间',
 				}],
-				
-				itemList: [{
-					head: "赛轮 12R22.5 18PR S838",
-					body: "12R22.5 152/149K 18PR S838 LBGSL 0L",
-					open: true,
-					disabled: true
-				}, {
-					head: "赛轮 12R22.5 18PR S838",
-					body: "12R22.5 152/149K 18PR S838 LBGSL 0L",
-					open: false,
-				}, {
-					head: "赛轮 12R22.5 18PR S838",
-					body: "12R22.5 152/149K 18PR S838 LBGSL 0L",
-					open: false,
-				}],
 				brandList:JSON.parse(JSON.stringify([])),
-				// brandList: [{
-				// 		value: '1',
-				// 		label: '赛轮'
-				// 	},
-				// 	{
-				// 		value: '2',
-				// 		label: '黑鹰'
-				// 	}
-				// ],
 				current: 0,
 				// 默认页数
 				current1: 1,
@@ -138,6 +116,7 @@
 						data: {
 							storeId:this.$store.state.storeInfo.storeId,
 							userId:this.$store.state.storeInfo.userId,
+							'searchKey': this.input,
 							'current': this.current1,
 							'size': '10'
 						}
@@ -151,9 +130,9 @@
 						// 判断扫码类型
 						for (var i = 0; i < res.data.data.length; i++) {
 							if (res.data.data[i].getWay == 0) {
-								this.getWay = "车主扫码"
-							} else {
 								this.getWay = "门店扫码"
+							} else {
+								this.getWay = "车主扫码"
 							}
 						}
 					}).catch(err => {
@@ -182,7 +161,7 @@
 							'current': '1',	
 							'size': '10',
 							'startTime': this.startTime +' 00:00:00',
-							'endTime': this.endTime +' 00:00:00'
+							'endTime': this.endTime +' 23:59:59'
 						}
 					}).then(res => {
 						console.log(res)
@@ -234,6 +213,11 @@
 				
 					})
 			},
+			// 搜索框
+			handleSearch(e) {
+				console.log(e)
+				this.data()
+			},
 			// 点击获取品牌
 			confirm(e) {
 				

pages/me/Settlement-center/index.vue

@@ -130,6 +130,7 @@
 			// 选中某个复选框时，由checkbox时触发
 			// ,bollean,index
 			checkboxChange(e,index,dataArr){
+				console.log(index)
 				console.log(e)
 				let newArr = []
 				console.log(this.Arry)
@@ -145,6 +146,7 @@
 					newArr.push(obj)
 				})
 				this.Arry[index] = newArr
+				console.log(newArr)
 				if(this.Arry[index].length == dataArr.filter((item)=>{
 					return item.usableMoney != 0
 				}).length ){

pages/me/Write-off-management/index.vue

@@ -59,7 +59,7 @@
 
 				],
 				length: '',
-				status: 'loadmore',
+				status: '没',
 				pages: '',
 				b2bStatus: '',
 				list: [{