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

common/locales/zh.js

@@ -1,32 +1,51 @@
 export default {
-	login:{
-		code:"获取验证码",
-		login:"登录",
-		sign:"立即注册",
-		no:"还没有账号?",
-		Lan:"切换语言—中文",
-		mobile:"请输入手机号",
-		code:"请输入验证码"
+	login: {
+		code: "获取验证码",
+		login: "登录",
+		sign: "立即注册",
+		no: "还没有账号?",
+		Lan: "切换语言—中文",
+		mobile: "请输入手机号",
+		code: "请输入验证码"
 	},
 	//扫码页面
-	scanenter:{
-		title:'扫码入库',
-		tips:'提示',
-		tips_s:'胎号',
-		input:'手动录入',
-		number:'胎号',
-		Specifications:'规格',
-		operation:'操作',
-		slide:'没有更多啦',
-		confirm:'扫码确认',
-		pleaseenter:'请输入胎号',
-		pleaseenter_s:'请输入轮胎胎号',
-		nodata:'请扫码或录入后再点击!',
-		networkstate:'无网络，请连接网络后再试~',
-		networkstate_s:'网络繁忙请稍后再试',
-		locationstate:'获取地址失败, 请检查是否开启定位权限~',
-		repeat:'请勿重复录入',
-		inputsuccess:'录入成功',
-		scansuccess:'扫码成功'
+	scanenter: {
+		title: '扫码入库',
+		tips: '提示',
+		tips_s: '胎号',
+		input: '手动录入',
+		number: '胎号',
+		Specifications: '规格',
+		operation: '操作',
+		slide: '没有更多啦',
+		confirm: '扫码确认',
+		pleaseenter: '请输入胎号',
+		pleaseenter_s: '请输入轮胎胎号',
+		nodata: '请扫码或录入后再点击!',
+		networkstate: '无网络，请连接网络后再试~',
+		networkstate_s: '网络繁忙请稍后再试',
+		locationstate: '获取地址失败, 请检查是否开启定位权限~',
+		repeat: '请勿重复录入',
+		inputsuccess: '录入成功',
+		scansuccess: '扫码成功'
+	},
+	//入库明细
+	scancodeenter: {
+		total: '库存总量',
+		tips: '请输入胎号或规格',
+		tabs_a: '全部',
+		tabs_b: '品牌',
+		tabs_c: '时间',
+		scrollingtips: [{
+				name: '努力加载中'
+			},
+			{
+				name: '没有更多啦'
+			},
+			{
+				name: '加载中'
+			}
+		],
+		nodata:'无数据'
 	}
-}
+}

manifest.json

@@ -1,8 +1,8 @@
 {
-    "name" : "耀灵全钢店管家",
+    "name" : "耀灵掌上通",
     "appid" : "__UNI__0C3473D",
     "description" : "测试",
-    "versionName" : "0.0.2",
+    "versionName" : "0.0.3",
     "versionCode" : "100",
     "transformPx" : false,
     "app-plus" : {

pages.json

@@ -197,6 +197,14 @@
 					"navigationBarBackgroundColor": "#058BF9"
 				}
 			},
+			//我的经营品牌
+			{
+				"path":"management",
+				"style":{
+					"navigationBarTitleText":"我的经营品牌",
+					"navigationBarBackgroundColor":"#058BF9"
+				}
+			},
 			//优惠卷
 			{
 				"path": "coupon",

pages/login/register.vue

@@ -114,7 +114,7 @@
 					"registerDate": this.licenseDate.establishment.words,
 					"status": "",
 					"storeId": 0,
-					"type": this.licenseDate.site.words
+					"type": this.licenseDate.type.words
 				}
 				uni.$emit('dataUrl', {
 					licenseUrl: this.licenseUrl,

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/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/agent-stock/agent-stock.vue

@@ -123,16 +123,13 @@
 				var _this = this;
 				request({
 					url: '/app/appAgent/getStoreAgentCondition',
-					method: 'get',
-					data: {
-
-					}
 				}).then(res => {
+					console.log(res.data.data.brands)
 					if (res.data.code == 0) {
 						console.log(res)
 						// 获取品牌列表
 						_this.brandList = [];
-						res.data.data.brands.forEach(function(val, index) {
+						res.data.data.data.brands.forEach(function(val, index) {
 							_this.brandList.push({
 								value: index,
 								label: val
@@ -140,7 +137,7 @@
 						});
 						// 获取花纹列表
 						_this.patternList = [];
-						res.data.data.patterns.forEach(function(val, index) {
+						res.data.data.data.patterns.forEach(function(val, index) {
 							_this.patternList.push({
 								value: index,
 								label: val
@@ -156,11 +153,6 @@
 					}
 				}).catch(err => {
 					console.log(err)
-					uni.showToast({
-						title: _this.$store.state.showServerErrorMsg,
-						icon: "none",
-						duration: _this.$store.state.showToastDuration
-					});
 					this.currentPage -= 1;
 				}).finally(() => {
 					setTimeout(() => {
@@ -219,11 +211,6 @@
 					}
 				}).catch(err => {
 					console.log(err)
-					uni.showToast({
-						title: _this.$store.state.showServerErrorMsg,
-						icon: "none",
-						duration: _this.$store.state.showToastDuration
-					});
 					this.currentPage -= 1;
 				}).finally(() => {
 					setTimeout(() => {

pages/me/index.vue

@@ -143,11 +143,11 @@
 							</view>
 							<view class="u-flex u-row-centter" style="flex-direction: column; width: 25%" @click="inPage(6)">
 								<view>
-									<u-image width="80rpx" height="80rpx" src="../../static/sailun/coupon.png" :lazy-load="true" shape="circle">
+									<u-image width="80rpx" height="80rpx" src="../../static/sailun/brand.png" :lazy-load="true" shape="circle">
 									</u-image>
 								</view>
 								<view style="color: #000000" class="u-m-t-10">
-									我的优惠券
+									经营品牌
 								</view>
 							</view>
 							<view class="u-flex u-row-centter" style="flex-direction: column; width: 25%" @click="inPage(7)">
@@ -307,10 +307,10 @@
 						}
 					case 6:
 						{
-							this.$u.toast("我的优惠券暂不开放");
-							// this.$u.route({
-							// 	url: 'pages/me/coupon',
-							// })
+							// this.$u.toast("我的优惠券暂不开放");
+							this.$u.route({
+								url: 'pages/me/management',
+							})
 							break;
 						}
 					case 7:

pages/me/management.vue

@@ -0,0 +1,255 @@
+<template>
+	<!-- 我的经营品牌 -->
+	<view class="whole">
+		<view class="head">
+			<view class="behind"></view>
+			<view class="below">
+				<view class="nothing" v-if="judge==true">
+					<u-empty mode="page" text="暂无数据"></u-empty>
+				</view>
+				<view class="content" v-else v-for="(item, index) in supplier_s" :key="index">
+					<view class="content_s">
+						<view class="title">
+							<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" :disabled="true"/>
+							</u-form-item>
+							<u-form-item>
+								<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>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		request
+	} from '../../common/request/request'
+	require("promise.prototype.finally").shim()
+	export default {
+		data() {
+			return {
+				judge: true,
+				supplier_s: [] //经销商信息
+			}
+		},
+		created() {
+			uni.showLoading({
+				title: '加载中...'
+			});
+			console.log("加载中")
+			setTimeout(function() {
+				uni.hideLoading();
+			}, 1000);
+			this.supplier()
+		},
+		methods: {
+			supplier() {
+				uni.getNetworkType({
+					success: function(res) {
+						let none = res.networkType
+						console.log(res.networkType);
+						if (none == 'none') {
+							uni.showToast({
+								icon: 'none',
+								title: '无网络，请连接网络后再试~',
+								position: "bottom"
+							})
+						}
+					}
+				});
+				request({
+					url: '/app/appAgent/getBrandAgent',
+					method: 'get',
+					params: {
+						storeId: this.$store.state.storeInfo.storeId,
+						// userId: this.$store.state.storeInfo.userId
+					}
+				}).then(res => {
+					console.log(res)
+					if (res.data.code == 0) {
+						this.supplier_s = res.data.data.data
+						this.judge = false
+					} else if (res.data.code == 500) {
+						uni.showToast({
+							icon: 'none',
+							title: '出错了，请稍后再试',
+							position: "bottom"
+						})
+					}
+				}).catch(err => {
+					console.log(err)
+					uni.showToast({
+						icon: 'none',
+						title: '出错了，请稍后再试',
+						position: "bottom"
+					})
+				}).finally(() => {
+					// Loading.close()
+				})
+			}
+		}
+
+	}
+</script>
+
+<style lang="scss" scoped>
+	.behind {
+		width: 750rpx;
+		height: 462rpx;
+		background: url(../../static/sailun/behind.png) no-repeat;
+		background-size: 100% 100%;
+		background-repeat: no-repeat;
+		margin-top: -150rpx;
+		padding-top: 100px;
+	}
+
+	.below {
+		margin-top: -270rpx;
+	}
+
+	.nothing {
+		width: 96%;
+		height: 800rpx;
+		background-color: #FFFFFF;
+		margin: 0 auto;
+		margin-top: 20rpx;
+		border-radius: 20rpx;
+		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;
+		background: #FFFFFF;
+		box-shadow: 0px 10rpx 30rpx 0px rgba(223, 223, 223, 0.51);
+		border-radius: 18px;
+		margin: 0 auto;
+		padding-top: 30rpx;
+		margin-top: 20rpx;
+		padding-bottom: 40rpx;
+
+		.content_s {
+			width: 92%;
+			// height: 330rpx;
+			height: auto;
+			margin: 0 auto;
+			margin-top: 10rpx;
+
+			.information {
+				margin-top: 10rpx;
+			}
+
+			.information_E {
+				// display: flex;
+				width: 100%;
+				flex-flow: wrap;
+				justify-content: space-around;
+				align-items: center;
+			}
+
+			.title {
+				border-bottom: 1rpx solid #EBEBEB;
+				padding-bottom: 15rpx;
+			}
+
+			.strip {
+				width: 4px;
+				height: 20px;
+				background: #0292FD;
+				float: left;
+				margin-right: 10rpx;
+				margin-top: 5rpx;
+			}
+		}
+	}
+</style>

pages/me/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/suppliers.vue

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