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

components/mi-map/mi-map.vue

@@ -42,11 +42,11 @@
 			},
 			positionIcon: {
 				type: String,
-				default: 'https://s2.ax1x.com/2020/03/10/8CvKmt.png'
+				default: '../../static/sailun/gps-icon.png'
 			},
 			myPositionIcon: {
 				type: String,
-				default: 'https://s2.ax1x.com/2020/03/10/8CjxSJ.png'
+				default: '../../static/sailun/8CjxSJ.png'
 			}
 		},
 		data() {
@@ -61,7 +61,6 @@
 					address: '请选择集合地点'
 				},
 				controls: [], // 地图中心点图标, 可更换iconPath, 详情见官方文档关于map组件的介绍
-
 			};
 		},
 		mounted() {
@@ -76,8 +75,8 @@
 					this.controls = [{
 						iconPath: this.positionIcon,
 						position: {
-							left: uni.getSystemInfoSync().screenWidth/2-15,
-							top: uni.getSystemInfoSync().screenHeight/2-225,
+							left: uni.getSystemInfoSync().windowWidth/2-15,
+							top: (uni.getSystemInfoSync().windowHeight-240)/2-15,
 							width: 30,
 							height: 30,
 						},
@@ -93,7 +92,6 @@
 					geocode: true,
 					success: function(res) {
 						this_.initMap(res)
-						console.log(res);
 					},
 					fail: function(e) {
 						uni.showToast({
@@ -123,7 +121,6 @@
 					latitude: res.latitude,
 					address: await this.getAddressName(res)
 				})
-				console.log('当前位置:' + res.latitude + '|' + res.longitude);
 			},
 
 			// 监听地图位置变化
@@ -136,7 +133,6 @@
 						that.mapCtx.getCenterLocation({
 							success: res => {
 								this.checkMap(res)
-								console.log(res);
 							},
 							fail: err => {
 								console.log(err);
@@ -190,12 +186,7 @@
 			},
 			// 计算地图的高度
 			initMapH() {
-				// #ifdef APP-PLUS
-				this.mapH = uni.getSystemInfoSync().windowHeight - 210;
-				// #endif
-				// // #ifndef APP-PLUS
-				// this.mapH = uni.getSystemInfoSync().windowHeight - 170;
-				// // #endif
+				this.mapH = uni.getSystemInfoSync().windowHeight-210;
 			},
 			// 移动到我的位置
 			toMyLocation() {
@@ -214,9 +205,6 @@
 
 <style lang="scss" scoped>
 	.server-place {
-		position: fixed;
-		left: 0;
-		top: 0;
 		height: 100vh;
 		width: 100%;
 		z-index: 999;
@@ -227,7 +215,6 @@
 			justify-content: center;
 			align-items: center;
 			flex-direction: column;
-
 			.my-location {
 				width: 700rpx;
 				height: 100rpx;

manifest.json

@@ -25,7 +25,8 @@
         "nvueCompiler" : "uni-app",
         "compilerVersion" : 3,
         "modules" : {
-            "Maps" : {}
+            "Maps" : {},
+            "Geolocation" : {}
         },
         "distribute" : {
             "android" : {
@@ -57,11 +58,11 @@
             },
             "ios" : {
                 "privacyDescription" : {
-                    "NSPhotoLibraryUsageDescription" : "注册时从相册中选择图片作为执照或者门头照",
-                    "NSPhotoLibraryAddUsageDescription" : "注册时从相册中选择图片作为执照或者门头照",
-                    "NSCameraUsageDescription" : "扫码出入库需要启动摄像头扫描二维码",
-                    "NSLocationWhenInUseUsageDescription" : "注册时需要地区定位，扫码是需要开启电子围栏",
-                    "NSLocationAlwaysAndWhenInUseUsageDescription" : "注册时需要地区定位，扫码是需要开启电子围栏"
+                    "NSPhotoLibraryUsageDescription" : "该应用需要读取你的相册，以便为你编辑门店信息",
+                    "NSPhotoLibraryAddUsageDescription" : "该应用需要读取你的相册，以便为你编辑门店信息",
+                    "NSCameraUsageDescription" : "该应用需要你的相机，以便你拍摄上传门店信息",
+                    "NSLocationWhenInUseUsageDescription" : "该应用需要你的地理位置，以便为你提供当前位置信息",
+                    "NSLocationAlwaysAndWhenInUseUsageDescription" : "该应用需要你的地理位置，以便为你提供当前位置信息"
                 }
             },
             "sdkConfigs" : {
@@ -71,6 +72,13 @@
                         "appkey_ios" : "KYoTmSbggKUatksUwZKXrFmZX9oiVBrR",
                         "appkey_android" : "4wYVsEvjrdDXtsbRYsNTy1f01PAYbZin"
                     }
+                },
+                "geolocation" : {
+                    "baidu" : {
+                        "__platform__" : [ "ios", "android" ],
+                        "appkey_ios" : "KYoTmSbggKUatksUwZKXrFmZX9oiVBrR",
+                        "appkey_android" : "4wYVsEvjrdDXtsbRYsNTy1f01PAYbZin"
+                    }
                 }
             },
             "icons" : {

pages/login/index.vue

@@ -65,7 +65,8 @@
 				loading: false,
 				codeLoading: false,
 				SystemInfo: '',
-				networkType: ''
+				networkType: '',
+				version:''
 			}
 		},
 		computed: {
@@ -82,11 +83,23 @@
 					this.networkType = res.networkType
 				}
 			});
-			if(this.SystemInfo.platform=="ios"){
-				this.judgeIosPermission()
-			}else{
-				this.requestAndroidPermission()
-			}			
+			uni.getLocation({
+			    success:res=>{
+			    },
+				fail:err=>{
+					if(this.SystemInfo.platform=="ios"){
+						this.judgeIosPermission()
+					}else{
+						this.requestAndroidPermission()
+					}	
+				}
+			});
+			plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => {
+				this.version=wgtinfo.version
+			})
+			uni.$on('loginphone',data=>{
+				this.tel=data
+			})
 		},
 		methods: {
 			...mapMutations(['login']),
@@ -95,7 +108,7 @@
 				if (!result) {
 					uni.showModal({
 						title: "温馨提示",
-						content: "为了更好地服务，请开启定位权限，是否同意?",
+						content: "为了更好地为您服务，请开启定位权限，请问是否同意？?",
 						cancelText: "不同意",
 						confirmText: "同意",
 						success: res => {
@@ -136,7 +149,7 @@
 							"osVersion": this.SystemInfo.system,
 							"phoneBrand": this.SystemInfo.brand,
 							"phoneModel": this.SystemInfo.model,
-							"appVersion": "1.00",
+							"appVersion": this.version,
 							"networkType": this.networkType,
 						}
 					}).then(res => {
@@ -176,7 +189,6 @@
 							"opreaType": "1"
 						},
 					}).then(res => {
-						console.log(res)
 						if (res.data.code == 0) {
 							if (this.$refs.uCode.canGetCode) {
 								this.$refs.uCode.start();

pages/login/register.vue

@@ -4,7 +4,7 @@
 			<view slot="head">
 				<view class="u-flex">
 					<view style="width: 8rpx;height: 34rpx;background: #0292FD;margin-right:20rpx;"></view>
-					请按照要求上传您的营业执照和门店照
+					请按照要求上传您的营业执照和门头照片
 				</view>
 			</view>
 			<view slot="body">
@@ -15,7 +15,7 @@
 					</view>
 				</u-upload>
 				<view class="u-flex u-row-center" style="color: #787878;margin: 20rpx 0 60rpx 0;">
-					点击上传营业执照
+					请上传营业执照
 				</view>
 				<u-upload :custom-btn="true" max-count="1" class="u-flex u-row-center" :action="action" :form-data="storepicType"
 				 @on-change="getStoredata" @on-remove="storeRemove">
@@ -24,12 +24,12 @@
 					</view>
 				</u-upload>
 				<view class="u-flex u-row-center" style="color: #787878;margin: 20rpx 0;">
-					点击上传门头照
+					请上传门头照片
 				</view>
 			</view>
 		</u-card>
-		<view style="color: #787878;margin-left: 40rpx;">
-			注：上传完营业执照请确认和营业执照一致。
+		<view style="color: #787878;margin: 0 40rpx;">
+			注：请确保系统识别的营业执照名称和法人信息与营业执照上的信息保持一致
 		</view>
 		<view style="margin: 30rpx;">
 			<u-button type="primary" @click="nextStep" v-if="showLicense&&showStore">下一步</u-button>

pages/login/register_2.vue

@@ -13,13 +13,18 @@
 						<view style="margin-right: 10rpx;">
 							<u-icon name="home" size="36"></u-icon>
 						</view>
+						<view style="margin-right: 10rpx;">门店名称</view>
 						<u-input v-model="form.store" placeholder="请输入门店名称" />
 					</u-form-item>
 					<u-form-item prop="company">
 						<view style="margin-right: 10rpx;">
 							<u-icon name="home" size="36"></u-icon>
 						</view>
+						<view style="margin-right: 10rpx;">公司名称</view>
 						<u-input v-model="form.company" placeholder="请输入公司名称" :disabled="true" />
+						<view style="font-size: 16rpx;color: red;">
+							不可修改
+						</view>
 					</u-form-item>
 					<u-form-item prop="name">
 						<view style="margin-right: 10rpx;">
@@ -42,16 +47,6 @@
 							<u-button size="mini" type="primary" @click="getCode" shape="circle" :loading="codeLoading">{{codeText}}</u-button>
 						</view>
 					</u-form-item>
-					<!-- 					<u-form-item prop="region">
-						<view style="margin-right: 10rpx;">
-							<u-icon name="map" size="36"></u-icon>
-						</view>
-						<u-input :select-open="pickerShow" v-model="form.region" placeholder="点击选择省市区" @click="pickerShow = true"
-						 :disabled="true"></u-input>
-						<view class="" slot="right">
-							<u-icon name="arrow-right" color="#666666" size="36"></u-icon>
-						</view>
-					</u-form-item> -->
 					<u-form-item prop="region">
 						<view style="margin-right: 10rpx;">
 							<u-icon name="map" size="36"></u-icon>
@@ -72,7 +67,6 @@
 					</u-form-item>
 				</u-form>
 				<u-verification-code ref="uCode" @change="codeChange"></u-verification-code>
-				<u-picker mode="region" v-model="pickerShow" @confirm="regionConfirm" :default-region="defaultRegion"></u-picker>
 			</view>
 		</u-card>
 		<view style="margin: 30rpx;">
@@ -91,8 +85,6 @@
 		data() {
 			return {
 				codeText: '',
-				pickerShow: false,
-				defaultRegion: [],
 				form: {
 					store: '',
 					company: '',
@@ -105,7 +97,7 @@
 					province: "",
 					city: "",
 					district: "",
-					addressInfo: "",
+					addressInfo: ""
 				},
 				rules: {
 					store: [{
@@ -114,12 +106,12 @@
 							trigger: 'blur,change'
 						},
 						{
-							pattern: /^[\u4e00-\u9fa5_a-zA-Z()（）]+$/g,
+							pattern: /^[\u4e00-\u9fa5_a-zA-Z()（）0-9]+$/g,
 							// 正则检验前先将值转为字符串
 							transform(value) {
 								return String(value);
 							},
-							message: '门店名称必须为中文或英语',
+							message: '门店名称必须为中文或英语、数字',
 							// 触发器可以同时用blur和change，二者之间用英文逗号隔开
 							trigger: ['change', 'blur'],
 						},
@@ -135,17 +127,17 @@
 							trigger: 'blur,change'
 						}, {
 							min: 2,
-							max: 10,
-							message: '姓名长度在2到10个字符',
+							message: '姓名长度至少在2个字符以上',
 							trigger: ['change', 'blur'],
 						},
 						{
 							// 此为同步验证，可以直接返回true或者false，如果是异步验证，稍微不同，见下方说明
-							validator: (rule, value, callback) => {
-								// 调用uView自带的js验证规则，详见：https://www.uviewui.com/js/test.html
-								return this.$u.test.chinese(value);
+							pattern: /^[\u4e00-\u9fa5_a-zA-Z ]+$/g,
+							// 正则检验前先将值转为字符串
+							transform(value) {
+								return String(value);
 							},
-							message: '姓名必须为中文',
+							message: '姓名必须为中文或英文',
 							// 触发器可以同时用blur和change，二者之间用英文逗号隔开
 							trigger: ['change', 'blur'],
 						}
@@ -196,7 +188,7 @@
 				dataUrl: "",
 				codeLoading: false,
 				modelshow: false,
-				modelcontent: "如果店名和联系人与营业执照不一致，请重新上传清晰度更高的营业执照"
+				modelcontent: "如果店名和联系人与营业执照不一致，请重新上传清晰度更高的营业执照？"
 			};
 		},
 		created() {
@@ -226,11 +218,9 @@
 			uni.getSystemInfo({
 				success: res => {
 					this.SystemInfo = res
-					console.log(res)
 				}
 			});
 			if (this.SystemInfo.platform == 'ios') {
-				this.judgeIosPermission('location')
 				uni.showModal({
 					title: "温馨提示",
 					content: "如果店名和联系人与营业执照不一致，请重新上传清晰度更高的营业执照？",
@@ -238,8 +228,7 @@
 					showCancel: false
 				})
 			} else {
-				this.requestAndroidPermission('android.permission.ACCESS_FINE_LOCATION')
-				this.modelshow = true
+				this.modelshow= true
 			}
 		},
 		methods: {
@@ -274,7 +263,6 @@
 							"opreaType": "0"
 						},
 					}).then(res => {
-						console.log(res)
 						if (res.data.code == 0) {
 							if (this.$refs.uCode.canGetCode) {
 								this.$refs.uCode.start();
@@ -296,12 +284,6 @@
 				}
 
 			},
-			regionConfirm(e) {
-				// this.form.region = e.province.label + '-' + e.city.label + '-' + e.area.label;
-				// this.form.province = e.province.label;
-				// this.form.city = e.city.label;
-				// this.form.district = e.area.label;
-			},
 			inMap() {
 				this.$u.route({
 					url: 'pages/login/register_map'
@@ -315,5 +297,8 @@
 </script>
 
 <style lang="scss" scoped>
-
+	.label-style {
+		font-size: 10rpx;
+		color: #F2F2F2;
+	}
 </style>

pages/login/register_3.vue

@@ -31,18 +31,13 @@
 				</view>
 				<u-line color="#e4e7ed"></u-line>
 				<view class="content">
-					<scroll-view scroll-y="true" style="height: 300rpx;">
-						<view class="u-flex u-row-center">
-							
-							<u-checkbox-group :wrap="true" @change="checkboxGroupChange" style="display: flex;justify-content: left">
-								<u-checkbox v-model="item.checked" v-for="(item, index) in allbrandList" :key="index" :name="item.brandCode" shape="circle">
-									<view class="u-flex u-row-left" style="width: 150rpx;">
-										{{item.brandCode}}
-									</view>
-								</u-checkbox>
-							</u-checkbox-group>
-						</view>
-					</scroll-view>
+					<u-checkbox-group :wrap="true" @change="checkboxGroupChange" style="display: flex;justify-content: left">
+						<u-checkbox v-model="item.checked" v-for="(item, index) in allbrandList" :key="index" :name="item.brandCode" shape="circle">
+							<view class="u-flex u-row-left" style="width: 150rpx;">
+								{{item.brandCode}}
+							</view>
+						</u-checkbox>
+					</u-checkbox-group>
 				</view>
 			</u-popup>
 			<u-card v-if="this.form.cooperation.length" :border="false" padding="30" box-shadow="0px 1px 10px rgba(0,0,0,0.2)"
@@ -150,8 +145,9 @@
 				},
 				protocol: false,
 				querybrandList: [],
-				brandList: [],
-				allbrandList:[]
+				// brandList: [],
+				allbrandList:[],//弹出窗获取brand数组
+				checkedBrandlist:[]//选中brand组成一个新数组
 			}
 		},
 		created() {
@@ -188,7 +184,7 @@
 					if (res.data.code == 0) {
 						this.agentList = res.data.Data.data
 						this.agentList = this.agentList.reduce((res, item, index, array) => {
-							for (let i = 0; i < array[index].regionBrandList.length; ++i) {
+							for (let i = 0; i < array[index].regionBrandList.length;i++) {
 								res.push({
 									brand: array[index].regionBrandList[i],
 									brandCode: array[index].regionBrandList[i],
@@ -202,15 +198,15 @@
 							}
 							return res;
 						}, []);
-						this.brandList = [...new Set(this.agentList.reduce((res, item, index, array) => {
-							res.push(item.brand)
-							return res;
-						}, []))].reduce((res, item, index, array) => {
-							res.push({
-								brand: item
-							})
-							return res;
-						}, []);
+						// this.brandList = [...new Set(this.agentList.reduce((res, item, index, array) => {
+						// 	res.push(item.brand)
+						// 	return res;
+						// }, []))].reduce((res, item, index, array) => {
+						// 	res.push({
+						// 		brand: item
+						// 	})
+						// 	return res;
+						// }, []);
 					}
 					if (res.data.code == 500) {
 						this.$u.toast(res.data.msg);
@@ -248,7 +244,7 @@
 				}).then(res => {
 					if (res.data.code == 0) {
 						this.querybrandList = res.data.data
-					this.querybrandList = this.querybrandList.filter(item => this.cooperations.indexOf(item.brandCode) > -1)
+						this.querybrandList = this.querybrandList.filter(item => this.checkedBrandlist.indexOf(item.brandCode) > -1)
 					}
 					if (res.data.code == 500) {
 						this.$u.toast(res.data.msg);
@@ -266,7 +262,7 @@
 					data: {},
 				}).then(res => {
 					if (res.data.code == 0) {
-						res.data.data.map(function(item, index) {
+						res.data.data.map((item, index)=> {
 							item.checked = false;
 						})
 						this.tasknameList = res.data.data
@@ -304,12 +300,15 @@
 				if (this.cooperations != null) {
 					this.form.cooperation = this.cooperations.toString();
 					this.checkedAgentlist = this.agentList.filter(item => this.cooperations.indexOf(item.brand) > -1)
+					this.checkedBrandlist=this.checkedAgentlist.reduce((res, item, index, array) => {
+							res.push(item.brand)
+							return res;
+						}, []);
 					this.getQuerybrand()
 					this.brandShow = false
 				} else {
 					console.log("至少选择一项")
 				}
-
 			},
 			getTaskconfirm(e) {
 				this.form.tasklist = e[0].label;
@@ -321,9 +320,10 @@
 				this.$refs.uForm.validate(valid => {
 					if (valid) {
 						this.brandAgentLvQueryList=this.checkedAgentlist.filter(item => (item.disabledGroup!=true))
-						let checkenLength=this.checkedAgentlist.filter(item => (item.checked==true))
-						if(checkenLength.length<this.brandAgentLvQueryList.length) return this.$u.toast('请完善任务条数');
-						if (!this.protocol) return this.$u.toast('请勾选协议');
+						let checkenLength=this.checkedAgentlist.filter(item => (item.checked==false))
+						if(!this.brandAgentLvQueryList.length) return this.$u.toast('未正确选择经销商，请正确选择');
+						if(checkenLength.length!=0) return this.$u.toast('请选择'+checkenLength[0].brand+"品牌签约任务");
+						if (!this.protocol) return this.$u.toast('请阅读并同意用户协议和隐私协议');
 						this.setData()
 					} else {
 						console.log('验证失败');
@@ -361,18 +361,19 @@
 					"version": 1.00,
 					"wd": this.formData.latitude,
 				}
+				this.loading = true
 				request({
 					url: '/sailun/appStoreBasicInfo/storeReg',
 					method: 'post',
 					data: data
 				}).then(res => {
 					if (res.data.code == 0) {
-						this.loading = true
-						this.$u.toast(res.data.msg);
+						this.$u.toast("注册资料已提交成功");
 						setTimeout(() => {
 							this.$u.route({
 								url: 'pages/login/index',
 							})
+							uni.$emit('loginphone',this.formData.phone)
 						}, 2000)
 					}
 					if (res.data.code == 500) {

pages/login/register_map.vue

@@ -13,7 +13,6 @@
 		},
 		data() {
 			return {
-				// mapShow: false,
 				positionObj: {},
 			};
 		},
@@ -49,8 +48,4 @@
         align-items: center;
         justify-content: center;
     }
-
-    .address{
-        // margin-top: 1rem;
-    }
 </style>

pages/me/Delivery-details/index.vue

@@ -216,7 +216,7 @@
 				this.show = true
 				if (this.list_a.length == 0) {
 					request({
-						url: '/baseReq/getBrandList',
+						url: '/baseReq/getBrandListByStoreId',
 						method: 'Post',
 						data: {
 							storeId: this.$store.state.storeInfo.storeId,

pages/me/Reward-details/index.vue

@@ -29,8 +29,9 @@
 			</view>
 			<!-- <u-tabs style="width: 500rpx;" bg-color="#0095ff" inactive-color="#FFFFFF" active-color="#fff" :list="list"
 						 :is-scroll="false" :current="current" @change="change"></u-tabs> -->
-			<u-select :mask-close-able="false" @cancel="clear" style=" color: #fff;" @confirm="confirm" v-model="showBrand"
-			 value-name="brandId" label-name="brandName" :list="brandList"></u-select>
+			<!-- <u-select :mask-close-able="false" @cancel="clear" style=" color: #fff;" @confirm="confirm" v-model="showBrand"
+			 value-name="brandId" label-name="brandName" :list="brandList"></u-select> -->
+			 <u-action-sheet :list="list_a" @click="click" @close="close" v-model="showBrand"></u-action-sheet>
 			<u-calendar style=" color: #fff;" @click="calendar" @change="changetime" v-model="showDate" :mode="mode"></u-calendar>
 			<view>
 				<u-search style="width: 320rpx;" placeholder="请输入胎号或规格" v-model="input" :clearabled="true" @change="handleSearch"
@@ -108,6 +109,7 @@
 				}, {
 					name: '时间',
 				}],
+				list_a: [],
 				brandList: JSON.parse(JSON.stringify([])),
 				current: 0,
 				// 默认页数
@@ -250,7 +252,7 @@
 			// 获取品牌列表
 			getBrandList() {
 				request({
-						url: '/baseReq/getBrandList',
+						url: '/baseReq/getBrandListByStoreId',
 						method: 'post',
 						data: {
 							storeId: this.$store.state.storeInfo.storeId,
@@ -258,6 +260,15 @@
 						}
 					}).then(res => {
 						this.brandList = JSON.parse(JSON.stringify(res.data.data))
+						for (var i = 0; i < this.brandList.length; i++) {
+							this.list_a.push({
+								brandCode: this.brandList[i].brandCode,
+								text: this.brandList[i].brandName,
+								color: '#000',
+								fontSize: 28
+							})
+						}
+						console.log(this.list_a)
 					}).catch(err => {
 						console.log(err)
 					})
@@ -272,15 +283,14 @@
 			// 搜索框
 			handleSearch(e) {
 				console.log(e)
-				
 				this.data()
 				this.datalist = []
 			},
 			// 点击获取品牌
-			confirm(e) {
+			click(e) {
 				console.log(e)
-				console.log(e[0].label)
-				this.label = e[0].label
+				console.log(this.list_a[e].text)
+				this.label = this.list_a[e].text
 				uni.showLoading({
 					title: '加载中...'
 				});
@@ -322,9 +332,9 @@
 			// 点击取消按钮
 
 
-			clear() {
-				this.current = 0
-				console.log("@@")
+			close() {
+				console.log("@@@")
+				this.whole()
 			},
 			change(index) {
 				this.current = index;
@@ -341,21 +351,16 @@
 			}
 		},
 		onReachBottom() {
-			console.log("@@@")
-			console.log(this.count)
-			console.log(this.datalength)
-			console.log(this.current1)
 			this.status = 'loading';
 			setTimeout(() => {
-							if (this.datalist.length >= this.count) {
-								this.status = 'nomore';
-							} else {
-								this.current1 = ++this.current1;
-								this.data()	
-								
-							}
-						}, 1000)
-				
+				if (this.datalist.length >= this.count) {
+					this.status = 'nomore';
+				} else {
+					this.current1 = ++this.current1;
+					this.data()
+				}
+			}, 1000)
+
 
 		}
 	}

pages/me/Settlement-center/index.vue

@@ -40,7 +40,9 @@
 </template>
 
 <script>
-	import {mapMutations} from 'vuex'
+	import {
+		mapMutations
+	} from 'vuex'
 	import {
 		request
 	} from '../../../common/request/request'
@@ -101,14 +103,14 @@
 								this.checkboxList[i] = false
 							}
 							this.inStore()
-						}else {
-						console.log(res)
-						uni.showToast({
-							title: res.data.msg,
-							icon: "none",
-							duration: _this.$store.state.showToastDuration
-						});
-					}
+						} else {
+							console.log(res)
+							uni.showToast({
+								title: res.data.msg,
+								icon: "none",
+								duration: _this.$store.state.showToastDuration
+							});
+						}
 
 					}).catch(err => {
 						console.log(err + "")
@@ -178,7 +180,7 @@
 
 						} else {
 							uni.showToast({
-								title: '核销返利失败!',
+								title: '请选择要核销的返利!',
 								icon: 'none',
 								duration: 2000
 							});

pages/me/Warehousing-details/index.vue

@@ -217,7 +217,7 @@
 				this.show = true
 				if (this.list_a.length == 0) {
 					request({
-						url: '/baseReq/getBrandList',
+						url: '/baseReq/getBrandListByStoreId',
 						method: 'Post',
 						data: {
 							storeId: this.$store.state.storeInfo.storeId,