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

pages/home/Statistical-task/index.vue

@@ -87,7 +87,6 @@
 
 						}
 					}).then(res => {
-						console.log(res)
 						this.orderList = res.data.data
 						this.getPieData()
 					}).catch(err => {
@@ -101,7 +100,6 @@
 					})
 			},
 			getPieData() {
-				console.log('5555')
 				for (var i = 0; i < this.orderList.length; i++) {
 					var monthPie = {
 						series: []
@@ -132,7 +130,6 @@
 						}
 						monthObj.data = this.orderList[i].storeMonthList[j].data
 						this.data = this.orderList[i].storeMonthList[j].data
-						console.log(this.orderList[i].storeMonthList[j].data)
 						monthObj.name = this.orderList[i].storeMonthList[j].name+":"+this.orderList[i].storeMonthList[j].data
 						monthObj.percent = this.orderList[i].storeMonthList[j].percent
 						quarterObj.data = this.orderList[i].storeQuarterList[j].data
@@ -176,7 +173,7 @@
 						fontSize: 15 * _self.pixelRatio,
 					},
 					title: {
-						name: '已完成',
+						name: '完成',
 						color: '#666666',
 						fontSize: 13 * _self.pixelRatio,
 					},
@@ -190,8 +187,6 @@
 				});
 			},
 			touchPie(e, id) {
-				console.log(e, id)
-				console.log(id)
 				canvasObj[id].showToolTip(e, {
 					format: function(item) {
 						return item.name

pages/home/scancodequery/result.vue

@@ -2,7 +2,7 @@
 <template>
 	<view>
 		<view class="head">
-			<view class="tips" @click="scanning">
+			<view class="tips" @tap="$u.throttle(scanning, 500)">
 				<view>
 					<view><text>点击扫码</text></view>
 				</view>

pages/me/Delivery-details/index.vue

@@ -9,7 +9,7 @@
 			 active-color="#fff" inactive-color="#ffffff" bg-color="#ffffff00"></u-tabs> -->
 			<view style="width: 340rpx;height: 80rpx;text-align: center;padding-top: 25rpx;padding-left: 20rpx;float: left;margin-top: 0;margin-left: 30rpx;">
 				<view style="float: left;">
-					<text @click="whole">全部</text>
+					<text @tap="$u.throttle(whole, 500)">全部</text>
 					<view v-if="bottoma == true" style="width: 100%;height: 1rpx;background-color: #FFFFFF;border-radius: 10rpx;"></view>
 					<view v-else></view>
 				</view>

pages/me/Reward-details/index.vue

@@ -148,10 +148,7 @@
 							'size': '10'
 						}
 					}).then(res => {
-						console.log(res)
-						// this.datalist = res.data.data
 						this.count = res.data.count
-						// this.datalength = res.data.data.length
 						this.datalist = this.datalist.concat(res.data.data)
 
 						// 判断扫码类型
@@ -174,11 +171,9 @@
 					})
 			},
 			calendar() {
-				console.log("@@@")
 			},
 			// 全部事件
 			whole() {
-				console.log("@@")
 				this.bottoma = true
 				this.bottomb = false
 				this.bottomc = false
@@ -226,7 +221,6 @@
 							'endTime': this.endTime + ' 23:59:59'
 						}
 					}).then(res => {
-						console.log(res)
 						this.datalist = this.datalist.concat(res.data.data)
 						this.count = res.data.count
 						// 判断扫码类型
@@ -237,7 +231,6 @@
 								this.getWay = "门店扫码"
 							}
 						}
-						console.log(res.data.data)
 					}).catch(err => {
 						console.log(err)
 					})
@@ -268,7 +261,6 @@
 								fontSize: 28
 							})
 						}
-						console.log(this.list_a)
 					}).catch(err => {
 						console.log(err)
 					})
@@ -282,14 +274,11 @@
 			},
 			// 搜索框
 			handleSearch(e) {
-				console.log(e)
 				this.data()
 				this.datalist = []
 			},
 			// 点击获取品牌
 			click(e) {
-				console.log(e)
-				console.log(this.list_a[e].text)
 				this.label = this.list_a[e].text
 				uni.showLoading({
 					title: '加载中...'
@@ -305,7 +294,6 @@
 							'brandCode': this.label
 						}
 					}).then(res => {
-						console.log(res)
 						this.count = res.data.count
 						this.datalength = res.data.data.length
 						this.datalist = this.datalist.concat(res.data.data)
@@ -317,7 +305,6 @@
 								this.getWay = "门店扫码"
 							}
 						}
-						console.log(res.data.data)
 					}).catch(err => {
 						console.log(err)
 					})
@@ -333,7 +320,6 @@
 
 
 			close() {
-				console.log("@@@")
 				this.whole()
 			},
 			change(index) {
@@ -360,8 +346,6 @@
 					this.data()
 				}
 			}, 1000)
-
-
 		}
 	}
 </script>

pages/me/Settlement-center/index.vue

@@ -93,7 +93,6 @@
 						}
 					}).then(res => {
 						if (res.data.code == 0) {
-							console.log(res.data)
 							this.datalist = res.data.data
 							this.Arry.length = this.datalist.length
 							// 每个新建数组长度为空,全选为false
@@ -103,7 +102,6 @@
 							}
 							this.inStore()
 						} else {
-							console.log(res)
 							uni.showToast({
 								title: res.data.msg,
 								icon: "none",
@@ -112,7 +110,6 @@
 						}
 
 					}).catch(err => {
-						console.log(err + "")
 					})
 					.finally(() => {
 						setTimeout(() => {
@@ -133,10 +130,7 @@
 			// 选中某个复选框时，由checkbox时触发
 			// ,bollean,index
 			checkboxChange(e, index, dataArr) {
-				console.log(index)
-				console.log(e)
 				let newArr = []
-				console.log(this.Arry)
 				e.detail.value.forEach((item) => {
 					var obj = {
 						"storeId": this.$store.state.storeInfo.storeId,
@@ -145,11 +139,9 @@
 						"kunnr": JSON.parse(item).kunnr,
 						'userId': this.$store.state.storeInfo.userId
 					}
-					console.log(obj)
 					newArr.push(obj)
 				})
 				this.Arry[index] = newArr
-				console.log(newArr)
 				// 判断他是否全选
 				if (this.Arry[index].length == dataArr.filter((item) => {
 						return item.usableMoney != 0
@@ -162,8 +154,6 @@
 
 			// 核销返利
 			button(index) {
-				console.log(index)
-				console.log(this.Arry[index])
 				request({
 						url: '/myapp/storeCancel',
 						method: 'post',
@@ -200,7 +190,6 @@
 			checkboxGroupChange(e) {},
 			// 全选
 			checkedAll(index, e) {
-				console.log(index, e)
 				let newArr = []
 				// 根据奖励金额是否为0判断全选取消全选
 				if (this.Arry[index].length == e.storegentBrandList.filter((item) => {
@@ -225,7 +214,6 @@
 					this.Arry[index] = newArr
 				}
 
-				console.log(this.Arry, this.checkboxList)
 
 
 			}

pages/me/Warehousing-details/index.vue

@@ -9,7 +9,7 @@
 			 active-color="#fff" inactive-color="#ffffff" bg-color="#ffffff00"></u-tabs> -->
 			<view style="width: 340rpx;height: 80rpx;text-align: center;padding-top: 25rpx;padding-left: 20rpx;float: left;margin-top: 0;margin-left: 30rpx;">
 				<view style="float: left;">
-					<text @click="whole">全部</text>
+					<text @tap="$u.throttle(whole, 500)">全部</text>
 					<view v-if="bottoma == true" style="width: 100%;height: 1rpx;background-color: #FFFFFF;border-radius: 10rpx;"></view>
 					<view v-else></view>
 				</view>
@@ -139,7 +139,7 @@
 			this.whole()
 		},
 		onBackPress(options) {
-			console.log(options)
+			// console.log(options)
 			if (options.from == 'backbutton') {
 				this.$u.route({
 					type: 'switchTab',
@@ -150,12 +150,12 @@
 		},
 		methods: {
 			content_s() {
-				console.log(this.keyword)
+				// console.log(this.keyword)
 			},
 			inputbox(e) {
 				this.page = 1
-				console.log(e)
-				console.log(this.length)
+				// console.log(e)
+				// console.log(this.length)
 				this.itemList = []
 				this.brandCode = null
 				this.beginDate = null
@@ -165,7 +165,7 @@
 					this.status = 'nomore';
 					this.getPage()
 				} else {
-					console.log("什么情况")
+					// console.log("什么情况")
 					this.getPage()
 				}
 			},
@@ -177,19 +177,19 @@
 				this.itemList = []
 				this.beginDate = e.startDate + " 00:00:00"
 				this.endDate = e.endDate + " 23:59:59"
-				console.log(e)
-				console.log("触发了")
-				console.log(this.show_d)
+				// console.log(e)
+				// console.log("触发了")
+				// console.log(this.show_d)
 				this.current = 0
 				this.getPage()
 			},
 			click(index) {
 				this.page = 1
-				console.log(`点击了第${index + 1}项，内容为：${this.list_a[index].brandCode}`)
+				// console.log(`点击了第${index + 1}项，内容为：${this.list_a[index].brandCode}`)
 				this.brandCode = this.list_a[index].brandCode
 				this.itemList = []
 				this.judge = true
-				console.log(this.judge)
+				// console.log(this.judge)
 				this.getPage()
 			},
 			whole() {
@@ -203,7 +203,7 @@
 				this.endDate = null
 				this.content = null
 				this.page = 1
-				console.log(this.brandCode)
+				// console.log(this.brandCode)
 				this.getPage()
 			},
 			brand() {
@@ -224,10 +224,10 @@
 							userId: this.$store.state.storeInfo.userId
 						}
 					}).then(res => {
-						console.log(res)
-						console.log(res.data.data)
+						// console.log(res)
+						// console.log(res.data.data)
 						for (let i = 0; i < res.data.data.length; i++) {
-							console.log(res.data.data[i].brandCode)
+							// console.log(res.data.data[i].brandCode)
 							this.list_a.push({
 								brandCode: res.data.data[i].brandCode,
 								text: res.data.data[i].brandName,
@@ -236,7 +236,11 @@
 							})
 						}
 					}).catch(err => {
-						console.log(err)
+						uni.showToast({
+							icon: 'none',
+							title: '网络繁忙，请稍后再试~',
+							position: "bottom"
+						})
 					}).finally(() => {
 						// Loading.close()
 					})
@@ -296,15 +300,14 @@
 			// 	console.log(this.current)
 			// },
 			getPage() {
-				console.log(this.page)
-				console.log(this.brandCode)
-				console.log(this.beginDate)
-				console.log(this.endDate)
-				console.log(this.content)
+				// console.log(this.page)
+				// console.log(this.brandCode)
+				// console.log(this.beginDate)
+				// console.log(this.endDate)
+				// console.log(this.content)
 				uni.showLoading({
 					title: '加载中...'
 				});
-				console.log("加载中")
 				setTimeout(function() {
 					uni.hideLoading();
 				}, 1000);
@@ -323,7 +326,7 @@
 						content: this.content //搜索内容
 					}
 				}).then(res => {
-					console.log(res)
+					// console.log(res)
 					if(res.data.code == 500){
 						uni.showToast({
 							icon: 'none',
@@ -341,11 +344,16 @@
 						} else {
 							this.judge = false
 						}
-						console.log(this.itemList)
+						// console.log(this.itemList)
 						return this.itemList
 					}
 				}).catch(err => {
-					console.log(err)
+					// console.log(err)
+					uni.showToast({
+						icon: 'none',
+						title: '网络繁忙，请稍后再试~',
+						position: "bottom"
+					})
 				}).finally(() => {
 					// Loading.close()
 				})

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

@@ -109,13 +109,10 @@
 							'userId': this.$store.state.storeInfo.userId
 						}
 					}).then(res => {
-						console.log(res)
-						console.log(this.pages)
 						this.orderList = this.orderList.concat(res.data.data.records)
 						// 页数
 						this.pages = res.data.data.pages
 						for (let i = 0; i < res.data.data.records.length; i++) {
-							console.log(res.data.data.records[i].status)
 							if (res.data.data.records[i].status == 0) {
 								this.b2bStatus = "待审核"
 							} else if (res.data.data.records[i].status == 2) {
@@ -135,9 +132,7 @@
 						}, 300)
 					})
 			},
-			handleSearch: function(v) {
-				console.log(v)
-			},
+			
 			handleFilterBrand: function(v2) {
 				this.current = v2
 				if (v2 == 0) {
@@ -163,7 +158,6 @@
 							'userId': this.$store.state.storeInfo.userId
 						}
 					}).then(res => {
-						console.log(res)
 						this.orderList = res.data.data.records
 						// 页数
 						this.pages = res.data.data.pages
@@ -193,8 +187,6 @@
 		onReachBottom() {
 			setTimeout(() => {
 				if (this.current2 > this.pages) {
-					console.log(this.current2)
-					console.log(this.pages)
 					this.status = 'nomore'
 				} else {
 					this.current2 = ++this.current2;

pages/me/management.vue

@@ -1,5 +1,5 @@
 <template>
-	<!-- 经销商基本信息 -->
+	<!-- 我的经营品牌 -->
 	<view class="whole">
 		<view class="head">
 			<view class="behind"></view>
@@ -10,18 +10,26 @@
 				<view class="content" v-else v-for="(item, index) in supplier_s" :key="index">
 					<view class="content_s">
 						<view class="title">
-							<view></view>
+							<view class="strip"></view>
 							<h3>{{item.brand}}</h3>
+							<view :class="
+      item.status==='已拒绝'? 'state1':
+      item.status==='审核通过'? 'state2':'state'"
+        >
+								<view>{{item.status}}</view>
+								<view class="triangle"></view>
+							</view>
 						</view>
 						<view class="information_E">
 							<u-form-item>
-								<u-icon name="manager-o" custom-prefix="van-icon"/>
-								<u-input v-model="item.agentName" />
+								<u-icon name="manager-o" custom-prefix="van-icon" />
+								<u-input v-model="item.agentName" :disabled="true"/>
 							</u-form-item>
 							<u-form-item>
-								<u-icon name="orders-o" custom-prefix="van-icon"/>
-								<u-input v-model="item.signCount" />
+								<u-icon name="orders-o" custom-prefix="van-icon" />
+								<u-input v-model="item.signCount" :disabled="true"/>
 							</u-form-item>
+							<u-form-item label="原因:" v-if="item.cause != null"><u-input v-model="item.cause" :disabled="true"/></u-form-item>
 						</view>
 					</view>
 				</view>
@@ -43,6 +51,13 @@
 			}
 		},
 		created() {
+			uni.showLoading({
+				title: '加载中...'
+			});
+			console.log("加载中")
+			setTimeout(function() {
+				uni.hideLoading();
+			}, 1000);
 			this.supplier()
 		},
 		methods: {
@@ -68,11 +83,11 @@
 						// userId: this.$store.state.storeInfo.userId
 					}
 				}).then(res => {
-					console.log(res.data.data.data)
+					console.log(res)
 					if (res.data.code == 0) {
 						this.supplier_s = res.data.data.data
 						this.judge = false
-					}else if(res.data.code == 500){
+					} else if (res.data.code == 500) {
 						uni.showToast({
 							icon: 'none',
 							title: '出错了，请稍后再试',
@@ -120,6 +135,78 @@
 		box-shadow: 0 0 24rpx 0 rgba(101, 176, 249, 0.41);
 	}
 
+	.state {
+		width: 200rpx;
+		height: 60rpx;
+		background-color: #F6CF19;
+		float: right;
+		margin-top: -60rpx;
+		margin-right: -47rpx;
+		border-top-left-radius: 60rpx;
+		border-bottom-left-radius: 60rpx;
+		text-align: center;
+		line-height:60rpx;
+		color: #FFFFFF;
+		
+		.triangle {
+			width: 0px;
+			height: 0px;
+			margin-top: 0rpx;
+			margin-right: 0rpx;
+			border: 10rpx solid;
+			transform: rotate(270deg);
+			float: right;
+			border-color: #B89804 #B89804 transparent transparent;
+		}
+	}
+	.state1{
+		width: 200rpx;
+		height: 60rpx;
+		background-color: #FC1E1E;
+		float: right;
+		margin-top: -60rpx;
+		margin-right: -47rpx;
+		border-top-left-radius: 60rpx;
+		border-bottom-left-radius: 60rpx;
+		text-align: center;
+		line-height:60rpx;
+		color: #FFFFFF;
+		
+		.triangle {
+			width: 0px;
+			height: 0px;
+			margin-top: 0rpx;
+			margin-right: 0rpx;
+			border: 10rpx solid;
+			transform: rotate(270deg);
+			float: right;
+			border-color: #960000 #960000 transparent transparent;
+		}
+	}
+	.state2{
+		width: 200rpx;
+		height: 60rpx;
+		background-color: #0094FE;
+		float: right;
+		margin-top: -60rpx;
+		margin-right: -47rpx;
+		border-top-left-radius: 60rpx;
+		border-bottom-left-radius: 60rpx;
+		text-align: center;
+		line-height:60rpx;
+		color: #FFFFFF;
+		
+		.triangle {
+			width: 0px;
+			height: 0px;
+			margin-top: 0rpx;
+			margin-right: 0rpx;
+			border: 10rpx solid;
+			transform: rotate(270deg);
+			float: right;
+			border-color: #0F519C #0F519C transparent transparent;
+		}
+	}
 	.content {
 		width: 667rpx;
 		height: auto;
@@ -153,15 +240,15 @@
 			.title {
 				border-bottom: 1rpx solid #EBEBEB;
 				padding-bottom: 15rpx;
+			}
 
-				view {
-					width: 6px;
-					height: 20px;
-					background: #0292FD;
-					float: left;
-					margin-right: 10rpx;
-					margin-top: 5rpx;
-				}
+			.strip {
+				width: 4px;
+				height: 20px;
+				background: #0292FD;
+				float: left;
+				margin-right: 10rpx;
+				margin-top: 5rpx;
 			}
 		}
 	}

pages/me/suppliers.vue

@@ -36,6 +36,13 @@
 			}
 		},
 		created() {
+			uni.showLoading({
+				title: '加载中...'
+			});
+			console.log("加载中")
+			setTimeout(function() {
+				uni.hideLoading();
+			}, 1000);
 			this.supplier()
 		},
 		methods: {

pages/msg/System-message/index.vue

@@ -42,7 +42,6 @@
 
 		},
 		onLoad(options) {
-			console.log(options.sendUserId)
 			this.sendUserId = options.sendUserId
 		},
 		created() {
@@ -62,9 +61,7 @@
 
 						}
 					}).then(res => {
-						console.log(res)
 						this.orderList = res.data.list
-						// this.msgContent = res.data.list[0].msgContent
 						for(var i = 0; i<res.data.list.length; i++) {
 							this.msgContent = res.data.list[i].msgContent
 							this.sendUserId = res.data.list[i].sendUserId
@@ -93,14 +90,9 @@
 							'userId':this.$store.state.storeInfo.userId
 			
 						}
-					}).then(res => {
-						console.log(res)
-						
-			
-			
+					}).then(res => {		
 			
 					}).catch(err => {
-						console.log(err)
 					})
 					.finally(() => {
 						setTimeout(() => {

pages/msg/index.vue

@@ -61,7 +61,6 @@ export default {
   created() {},
   onShow() {
     this.getDate();
-    // this.addDate()
   },
   filters: {
     formatDate: function (time) {
@@ -97,16 +96,12 @@ export default {
         },
       })
         .then((res) => {
-          console.log(res);
           this.orderList = res.data.category;
-		  console.log(this.orderList.length)
           for (let i = 0; i < this.orderList.length; i++) {
-            // this.orderList = res.data.data.category[i]
             this.gatTime = this.orderList[i].gatTime;
           }
         })
         .catch((err) => {
-          console.log(err);
         })
         .finally(() => {
           setTimeout(() => {
@@ -116,13 +111,8 @@ export default {
         });
     },
     inSystem(index) {
-      console.log(index);
     },
     click(index) {
-      console.log(index);
-
-      // this.orderList.splice(index, 1);
-
       request({
         url: "/appMessage/deleteMessage",
         method: "post",
@@ -137,7 +127,6 @@ export default {
           this.getDate();
         })
         .catch((err) => {
-          console.log(err);
         })
         .finally(() => {
           setTimeout(() => {
@@ -148,8 +137,6 @@ export default {
     },
     // 如果打开一个的时候，不需要关闭其他，则无需实现本方法
     open(index) {
-      console.log(index);
-      console.log(this.orderList[index].show);
       this.orderList[index].show = true;
       this.orderList.map((val, idx) => {
         if (index != idx) this.orderList[idx].show = false;