同步代码

package-lock.json

@@ -31,6 +31,7 @@
         "cos-wx-sdk-v5": "^1.4.0",
         "crypto-js": "^4.1.1",
         "flyio": "^0.6.2",
+        "js-base64": "^3.7.2",
         "regenerator-runtime": "^0.12.1",
         "uview-ui": "^2.0.29",
         "vue": "^2.6.11",
@@ -13257,6 +13258,11 @@
         "node": ">=6"
       }
     },
+    "node_modules/js-base64": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmmirror.com/js-base64/-/js-base64-3.7.2.tgz",
+      "integrity": "sha512-NnRs6dsyqUXejqk/yv2aiXlAvOs56sLkX6nUdeaNezI5LFFLlsZjOThmwnrcwh5ZZRwZlCMnVAY3CvhIhoVEKQ=="
+    },
     "node_modules/js-message": {
       "version": "1.0.7",
       "resolved": "https://registry.npmmirror.com/js-message/-/js-message-1.0.7.tgz",
@@ -30691,6 +30697,11 @@
         }
       }
     },
+    "js-base64": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmmirror.com/js-base64/-/js-base64-3.7.2.tgz",
+      "integrity": "sha512-NnRs6dsyqUXejqk/yv2aiXlAvOs56sLkX6nUdeaNezI5LFFLlsZjOThmwnrcwh5ZZRwZlCMnVAY3CvhIhoVEKQ=="
+    },
     "js-message": {
       "version": "1.0.7",
       "resolved": "https://registry.npmmirror.com/js-message/-/js-message-1.0.7.tgz",

package.json

@@ -69,6 +69,7 @@
     "cos-wx-sdk-v5": "^1.4.0",
     "crypto-js": "^4.1.1",
     "flyio": "^0.6.2",
+    "js-base64": "^3.7.2",
     "regenerator-runtime": "^0.12.1",
     "uview-ui": "^2.0.29",
     "vue": "^2.6.11",

src/App.vue

@@ -3,6 +3,7 @@
 	import memberAPI from "@/api/member.js";
 	import goodsApi from "@/api/goods.js";
 	import store from "@/store/index.js";
+	import { encode, decode } from 'js-base64';
 	export default {
 		globalData: {
 			imageServer: 'https://hbl-1305371387.cos.ap-chengdu.myqcloud.com/company/QSQD/',	//图片服务器地址且时且多
@@ -16,7 +17,7 @@
 				longitude: null	//经度
 			},
 			appId: '',
-			companyId: '',
+			companyId: ''
 		},
 		onLaunch() {
 			this.onCheckUpdate();
@@ -318,6 +319,20 @@
 						});
 					}
 				}
+			},
+			isBase64(str) {
+				const result = decode(str);
+				if (result.includes('BPA_BASE64')) {
+					return true;
+				} else {
+					false;
+				}
+			},
+			encodeBPABase64(str) {
+				return encode('BPA_BASE64' + str);
+			},
+			decodeBPABase64(str) {
+				return decode(str).replace('BPA_BASE64', '');
 			}
 		}
 	}

src/api/pay.js

@@ -35,5 +35,13 @@ export default {
 			data: data,
 			interfaceType: 2
 		});
+	},
+	//获取手机号
+	getUserPhone(code) {
+		return request({
+			url : 'api/wechat/user/phone?code=' + code,
+			method: 'GET',
+			interfaceType: 2
+		});
 	}
 }

src/components/SettlementPopup/SettlementPopup.vue

@@ -88,6 +88,7 @@
 <script>
 	import { debounce } from "@/utils/DebounceAndThrottle.js";
 	import store from '@/store/index.js';
+	import memberAPI from "@/api/member";
 	export default {
 		name:"SettlementPopup",
 		data() {
@@ -156,22 +157,15 @@
 			onStapleFoodPlusFromCart(food) {
 				store.commit('onStapleFoodPlusFromCart', food);
 			},
-			onCheckUserInfo() {
-				const user = getApp().onGetUserStorage();
-				if (user != null) {
-					if (user.openId != null) {
-						this.isLogin = true;
-						if (user.memberInfo_Id != null) {
-							this.isMember = true;
-						} else {
-							this.isMember = false;
-						}
-					} else {
-						this.isLogin = false;
-					}
-				} else {
-					this.isLogin = false;
-					this.isMember = false;
+			async onCheckUserInfo() {
+				const userStorage = getApp().onGetUserStorage();
+				if (userStorage.openId) {
+					this.isLogin = true;
+				}
+				const response = await memberAPI.selectMemberByOpenId(userStorage.openId);
+				if (response.isSuccess && response.data?.memberInfo_Id) {
+					this.isMember = true;
+					store.commit('onChangeUserIsVip', true);
 				}
 			},
 			onJumpRegister() {

src/pages.json

@@ -318,7 +318,16 @@
                 "enablePullDownRefresh": false
             }
             
-        }
+        },
+		{
+		    "path" : "pages/homeBeefWorkShop/homeBeefWorkShop",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "首页",
+		        "enablePullDownRefresh": false
+		    }
+		    
+		}
     ],
 	"tabBar": {
 		"color": "#999999",
@@ -326,6 +335,12 @@
 		"borderStyle": "black",
 		"backgroundColor": "#ffffff",
 		"list": [
+			// {
+			// 	"pagePath": "pages/homeBeefWorkShop/homeBeefWorkShop",
+			// 	"iconPath": "static/images/home.png",
+			// 	"selectedIconPath": "static/images/home-active.png",
+			// 	"text": "首页"
+			// },
 			{
 				"pagePath": "pages/homeNew/homeNew",
 				"iconPath": "static/images/home.png",

src/pages/applicableStore/applicableStore.vue

@@ -49,7 +49,7 @@
 						return a.toUserDistance - b.toUserDistance;
 					});
 					storeList.forEach(item => {
-						if (item.toUserDistance <= 10) {
+						if (item.toUserDistance <= 9999) {
 							this.storeList.push(item);
 						}
 					});

src/pages/confirmOrder/confirmOrder.vue

@@ -265,7 +265,7 @@
 			this.onDeleteZeroFeed();
 			this.onGetLoginUser();
 			this.onFetchMemberInfo().then(() => {
-				if(this.memberInfo.memberInfo_Id) {
+				if(this.memberInfo?.memberInfo_Id) {
 					this.onAutoPartActivity().then(() => {
 						this.onFetchCouponList();
 					});
@@ -552,13 +552,6 @@
 				let response = await memberAPI.selectMemberByOpenId(userStorage.openId);
 				if (response.isSuccess == true) {
 					this.memberInfo = response.data;
-				} else {
-					uni.showToast({
-						title: response.msg,
-						duration: 2000,
-						icon: 'none',
-						mask: true
-					});
 				}
 			},
 			onInitGoodId() {

src/pages/food/food.vue

@@ -53,10 +53,7 @@
 				isInnerDistance: false,
 				isShowLoactionAuth: false,
 				friendShare: {},
-				adverList: [
-					'https://hbl-test-1305371387.cos.ap-chengdu.myqcloud.com/Franchisee/qw/applet/133059528564315622.png',
-					'https://hbl-test-1305371387.cos.ap-chengdu.myqcloud.com/Franchisee/qw/applet/133059528580064561.png'
-				]
+				adverList: []
 			}
 		},
 		onLoad(options) {
@@ -72,7 +69,9 @@
 			if (!this.isScanShow) {
 				this.onGetUserLocation();
 			}
-			this.onFetchStoreStyles();
+			getApp().onFetchStoreList().then(() => {
+				this.onFetchStoreStyles();
+			});
 		},
 		onHide() {
 			if(this.$refs.goodsListRef) {
@@ -105,7 +104,7 @@
 						return a.toUserDistance - b.toUserDistance;
 					});
 					storeList.forEach(item => {
-						if (item.toUserDistance <= 10) {
+						if (item.toUserDistance <= 9999) {
 							this.storeList.push(item);
 							this.isInnerDistance = true;
 						}
@@ -115,6 +114,7 @@
 					} else {
 						store.commit('onInitChooseStore', this.storeList[0]);
 					}
+					getApp().globalData.companyId = this.currentStore.companyId;
 				} else {
 					uni.showToast({
 						title: response.msg,

src/pages/homeNew/homeNew.vue

@@ -16,7 +16,11 @@
 			<!-- 加入会员 -->
 			<view class="click-member" @click="onJumpRegisterMember"></view>
 			<!-- 签到 -->
-			<view class="click-sign-in"></view>
+			<view class="click-sign-in">
+				<view class="click-sign-in-text">
+					菜品预定
+				</view>
+			</view>
 			<!-- 新品体验 -->
 			<view class="click-new-product"></view>
 			<!-- 好友分享 -->
@@ -123,38 +127,30 @@
 			onJumpRegisterMember: debounce(function() {
 				getApp().onCheckUserSession().then( async (response) => {
 					const userStorage = getApp().onGetUserStorage();
-					if (userStorage) {
-						if (!userStorage.memberInfo_Id) {
-							let memberRes = await memberAPI.selectMemberByOpenId(userStorage.openId);
-							if (memberRes.isSuccess) {
-								if (memberRes.data.memberInfo_Id != null && memberRes.data.phone != null) {
-									this.memberInfo = memberRes.data;
-									uni.navigateTo({
-										url: '/pages/memberCardDetail/memberCardDetail'
-									});
-								} else {
-									uni.navigateTo({
-										url: '/pages/memberRegister/memberRegister'
-									});
-								}
-							} else {
-								uni.showToast({
-									title: memberRes.msg || '服务端出错！',
-									duration: 2000,
-									icon: 'none',
-									mask: true
-								});
-							}
-						} else {
-							this.memberInfo = userStorage;
+					let memberRes = await memberAPI.selectMemberByOpenId(userStorage.openId);
+					if (memberRes.isSuccess) {
+						getApp().onSetUserStorage(memberRes.data);
+						if (memberRes.data.memberInfo_Id && memberRes.data.phone) {
+							this.memberInfo = memberRes.data;
 							uni.navigateTo({
 								url: '/pages/memberCardDetail/memberCardDetail'
 							});
+						} else {
+							uni.navigateTo({
+								url: '/pages/memberRegister/memberRegister'
+							});
 						}
-						
 					} else {
-						uni.navigateTo({
-							url: '/pages/memberRegister/memberRegister'
+						if (memberRes?.msg === '会员不存在') {
+							uni.navigateTo({
+								url: '/pages/memberRegister/memberRegister'
+							});
+						}
+						uni.showToast({
+							title: memberRes.msg || '服务端出错！',
+							duration: 2000,
+							icon: 'none',
+							mask: true
 						});
 					}
 				});
@@ -367,6 +363,14 @@
 		height: 220rpx;
 	}
 	
+	.click-sign-in-text {
+		top: 18rpx;
+		position: relative;
+		color: #FFF;
+		left: 70rpx;
+		font-size: 30rpx;
+	}
+	
 	.click-new-product {
 		position: absolute;
 		top: 398rpx;

src/pages/leaveMessage/leaveMessage.vue

@@ -8,7 +8,7 @@
 				e-mail:
 			</view>
 			<view class="leave-message-title">
-				ocon19@163.com
+				SCHBLKJ@163.COM
 			</view>
 		</view>
 		<view class="image-iconfont">

src/pages/memberRegister/memberRegister.vue

@@ -86,6 +86,7 @@
 	import goodsAPI from "@/api/goods";
 	import store from '@/store/index.js';
 	import COS from "@/utils/cos-wx-sdk-v5";
+	import { encode, decode } from 'js-base64';
 	export default {
 		data() {
 			return {
@@ -99,7 +100,7 @@
 					gender: '',
 					phone: ''
 				},
-				backgroundIMG: 'https://hbl-test-1305371387.cos.ap-chengdu.myqcloud.com/Franchisee/qw/applet/133059578415645499.png'
+				backgroundIMG: 'https://hbl-test-1305371387.cos.ap-chengdu.myqcloud.com/Franchisee/gz/applet/133064030402220970.png'
 			}
 		},
 		computed: {
@@ -116,15 +117,9 @@
 			},
 			async onGetUserPhone(options) {
 				const user = getApp().onGetUserStorage();
-				let jsonData = {
-					"aesiv": options.detail.iv,
-					"encryptedData": options.detail.encryptedData,
-					"session_key": user.session_key,
-					"openId": user.openId
-				}
-				let response = await payAPI.decryptUserInfo(jsonData);
-				if (response.succeeded == true) {
-					this.userInfo.phone = response.data.purePhoneNumber;
+				let response = await payAPI.getUserPhone(options.detail.code);
+				if (response.statusCode === 200) {
+					this.userInfo.phone = response.data;
 				} else {
 					uni.showToast({
 						title: '手机号获取失败，请重试',
@@ -146,7 +141,7 @@
 					const user = getApp().onGetUserStorage();
 					if (this.isAgree) {
 						let registerJson = {
-							"nickName": this.userInfo.nickName || '默认用户名',
+							"nickName": getApp().encodeBPABase64(this.userInfo.nickName || '默认用户名'),
 							"sex": user.gender || 0,
 							"headImgUrl": this.userInfo.avatarUrl || this.imageServer.concat('1160f23a-d924-4739-9806-156a26494674.png'),
 							"platformMemberId": user.openId,

src/pages/my/my.vue

@@ -56,7 +56,7 @@
 			</view>
 		</view>
 		<!-- 当季特推 -->
-		<view class="current-season">
+		<view class="current-season" v-if="false">
 			<view class="curret-season-title">
 				当季特推
 			</view>
@@ -110,12 +110,13 @@
 	import { mapState } from 'vuex';
 	import memberAPI from "@/api/member.js";
 	import { debounce } from "@/utils/DebounceAndThrottle.js";
+	import { encode, decode } from 'js-base64';
 	export default {
 		data() {
 			return {
 				imageServer: getApp().globalData.imageServer,
 				user: null,
-				backgroundIMG: 'https://hbl-test-1305371387.cos.ap-chengdu.myqcloud.com/Franchisee/qw/applet/133059560839997004.png'
+				backgroundIMG: 'https://hbl-test-1305371387.cos.ap-chengdu.myqcloud.com/Franchisee//applet/133084018080267644.png'
 			}
 		},
 		computed: {
@@ -125,61 +126,104 @@
 		},
 		onShow() {
 			const userStorage = getApp().onGetUserStorage();
-			//判断是否有本地缓存
-			if (userStorage != null) {
-				this.user = userStorage;
-				//判断是否是会员
-				if (userStorage.memberInfo_Id != null && userStorage.phone != null) {
-					this.user = userStorage;
-				} else {
-					memberAPI.selectMemberByOpenId(userStorage.openId).then(response => {
-						if (response.data.memberInfo_Id != null) {
-							this.user = response.data;
-							getApp().onSetUserStorage(response.data);
-						}
-					});
+			memberAPI.selectMemberByOpenId(userStorage.openId).then(response => {
+				if (response.isSuccess) {
+					if (response.data.nickName && getApp().isBase64(response.data.nickName)) {
+						response.data.nickName = getApp().decodeBPABase64(response.data.nickName);
+					}
+					this.user = response.data;
+					getApp().onSetUserStorage(response.data);
 				}
-			} else {
-				this.user = null;
-			}
+			});
 			this.onFetchStoreStyles();
 		},
 		methods: {
 			onPersonalData: debounce(function() {
 				getApp().onCheckUserSession('personal').then( async response => {
-					if (this.user.memberInfo_Id == null) {
-						uni.navigateTo({
-							url: '/pages/memberRegister/memberRegister'
-						});
+					const userStorage = getApp().onGetUserStorage();
+					const memberRes = await memberAPI.selectMemberByOpenId(userStorage.openId);
+					if (memberRes.isSuccess) {
+						getApp().onSetUserStorage(memberRes.data);
+						if (memberRes.data.memberInfo_Id && memberRes.data.phone) {
+							uni.navigateTo({
+								url: '/pages/personal/personal'
+							});
+						} else {
+							uni.navigateTo({
+								url: '/pages/memberRegister/memberRegister'
+							});
+						}
 					} else {
-						uni.navigateTo({
-							url: '/pages/personal/personal'
+						if (memberRes?.msg === '会员不存在') {
+							uni.navigateTo({
+								url: '/pages/memberRegister/memberRegister'
+							});
+						}
+						uni.showToast({
+							title: memberRes.msg || '服务端出错！',
+							duration: 2000,
+							icon: 'none',
+							mask: true
 						});
 					}
 				});
 			}, 2000, true),
 			onMemberInfo: debounce( function() {
 				getApp().onCheckUserSession('memberCardDetail').then( async response => {
-					if (this.user.memberInfo_Id == null) {
-						uni.navigateTo({
-							url: '/pages/memberRegister/memberRegister'
-						});
+					const userStorage = getApp().onGetUserStorage();
+					const memberRes = await memberAPI.selectMemberByOpenId(userStorage.openId);
+					if (memberRes.isSuccess) {
+						getApp().onSetUserStorage(memberRes.data);
+						if (memberRes.data.memberInfo_Id && memberRes.data.phone) {
+							uni.navigateTo({
+								url: '/pages/memberCardDetail/memberCardDetail'
+							});
+						} else {
+							uni.navigateTo({
+								url: '/pages/memberRegister/memberRegister'
+							});
+						}
 					} else {
-						uni.navigateTo({
-							url: '/pages/memberCardDetail/memberCardDetail'
+						if (memberRes?.msg === '会员不存在') {
+							uni.navigateTo({
+								url: '/pages/memberRegister/memberRegister'
+							});
+						}
+						uni.showToast({
+							title: memberRes.msg || '服务端出错！',
+							duration: 2000,
+							icon: 'none',
+							mask: true
 						});
 					}
 				});
 			}, 2000, true),
 			onJumpCoupon: debounce(function() {
 				getApp().onCheckUserSession('coupon').then( async response => {
-					if (this.user.memberInfo_Id == null) {
-						uni.navigateTo({
-							url: '/pages/memberRegister/memberRegister'
-						});
+					const userStorage = getApp().onGetUserStorage();
+					const memberRes = await memberAPI.selectMemberByOpenId(userStorage.openId);
+					if (memberRes.isSuccess) {
+						getApp().onSetUserStorage(memberRes.data);
+						if (memberRes.data.memberInfo_Id && memberRes.data.phone) {
+							uni.navigateTo({
+								url:'/pages/coupon/coupon'
+							});
+						} else {
+							uni.navigateTo({
+								url: '/pages/memberRegister/memberRegister'
+							});
+						}
 					} else {
-						uni.navigateTo({
-							url:'/pages/coupon/coupon'
+						if (memberRes?.msg === '会员不存在') {
+							uni.navigateTo({
+								url: '/pages/memberRegister/memberRegister'
+							});
+						}
+						uni.showToast({
+							title: memberRes.msg || '服务端出错！',
+							duration: 2000,
+							icon: 'none',
+							mask: true
 						});
 					}
 				});
@@ -224,8 +268,9 @@
 		height: 100rpx;
 	}
 	.my-container {
-		padding-bottom: 50rpx;
-		background-color: #EBEBEB;
+		height: 100vh;
+		/* padding-bottom: 50rpx; */
+		background-color: #F1F1F1;
 	}
 	
 	.my-header-cover {
@@ -233,6 +278,10 @@
 		width: 100%;
 	}
 	
+	.service-area {
+		margin-top: 195rpx;
+	}
+	
 	.image-common-cover {
 		width: 100%;
 		height: 100%;
@@ -338,6 +387,7 @@
 		padding-left: 30rpx;
 		padding-bottom: 30rpx;
 		font-weight: 600;
+		color: #FFF;
 	}
 	
 	.season-item {

src/pages/personal/personal.vue

@@ -95,6 +95,7 @@
 	import payAPI from "@/api/pay.js";
 	import goodsAPI from "@/api/goods";
 	import COS from "@/utils/cos-wx-sdk-v5";
+	import { encode, decode } from 'js-base64';
 	export default {
 		data() {
 			return {
@@ -150,6 +151,9 @@
 				let response = await memberAPI.selectMemberByOpenId(user.openId);
 				if (response.isSuccess == true) {
 					if (response.data.memberInfo_Id != null) {
+						if (response.data.nickName && getApp().isBase64(response.data.nickName)) {
+							response.data.nickName = getApp().decodeBPABase64(response.data.nickName);
+						}
 						this.memberCard = response.data;
 					} else {
 						uni.showToast({
@@ -225,7 +229,9 @@
 			},
 			//保存用户信息
 			async onSaveUserInfo() {
-				let registerRes = await memberAPI.insertOrUpdateMember(this.memberCard);
+				const tempJSON = JSON.parse(JSON.stringify(this.memberCard));
+				tempJSON.nickName = getApp().encodeBPABase64(tempJSON.nickName);
+				let registerRes = await memberAPI.insertOrUpdateMember(tempJSON);
 				if (registerRes.isSuccess == true) {
 					uni.showToast({
 						title: '用户信息更新成功！',

src/pages/position/position.vue

@@ -2,13 +2,13 @@
 	<view class="position-container">
 		<view class="position-box">
 			<view class="position-title">
-				环球中心N5栋
+				成都市高新区
 			</view>
 			<view class="position-title">
-				911B-911C
+				环球中心N5-911B
 			</view>
 			<view class="position-title">
-				四川黑菠萝科技有限公司
+				四川黑菠萝科技
 			</view>
 		</view>
 		<view class="image-iconfont">

src/pages/welcome/welcome.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="welcome-container">
 		<view class="welcome-cover">
-			<image :src="imageServer.concat('1afb7408-4440-4647-8dcf-9f6638aaa0b6.png')" class="image-common-cover"></image>
+			<image :src="welcomeLogo" class="image-common-cover"></image>
 		</view>
 		<view class="welcome-btn" @click="onToHome">
 			开启美食之旅
@@ -17,15 +17,20 @@
 		data() {
 			return {
 				imageServer: getApp().globalData.imageServer,
+				// welcomeLogo: 'https://hbl-test-1305371387.cos.ap-chengdu.myqcloud.com/Franchisee/gz/applet/133064130026925378.png'
+				welcomeLogo: 'https://hbl-test-1305371387.cos.ap-chengdu.myqcloud.com/Franchisee/qw/applet/133094239921335904.png'
 			}
 		},
 		computed: {
 			...mapState([
-				'currentStore'
+				'currentStore',
+				'storeStyles'
 			])
 		},
 		created() {
-			getApp().onFetchStoreList();
+			getApp().onFetchStoreList().then(() => {
+				this.onFetchStoreStyles();
+			});
 		},
 		onShareAppMessage(res) {
 		    return {
@@ -45,6 +50,16 @@
 					url: '/pages/homeNew/homeNew'
 				});
 			},
+			//获取页面风格
+			onFetchStoreStyles() {
+				const findStyles = this.storeStyles.find(item => item.pageRoute === '/welcome');
+				if (findStyles) {
+					const findCarouse = findStyles.list.find(item => item.materialCode === "welcome_logo");
+					if(findCarouse) {
+						this.welcomeLogo = JSON.parse(findCarouse.materialPath)[0];
+					}
+				}
+			},
 		}
 	}
 </script>
@@ -58,7 +73,7 @@
 	
 	.welcome-cover {
 		width: 200rpx;
-		height: 200rpx;
+		height: 250rpx;
 		position: absolute;
 		top: 50%;
 		left: 50%;
@@ -67,7 +82,7 @@
 	
 	.welcome-btn {
 		position: absolute;
-		top: 60%;
+		top: 65%;
 		left: 50%;
 		transform: translate(-50%, 0%);
 		color: $theme-color;

src/uni.scss

@@ -13,7 +13,8 @@
  */
 @import 'uview-ui/theme.scss';
 /* 颜色变量 */
-$theme-color: #305936;
+// #51A97D #135C31
+$theme-color: #51A97D; 
 
 /* 行为相关颜色 */
 $uni-color-primary: #007aff;

src/utils/request.js

@@ -1,21 +1,22 @@
 import Encrypt from "./crypto.js";
 let BASE_URL = '';
-//  BASE_URL = 'https://www.black-pa.com:5500/pro';	//线上正式
- // BASE_URL = 'https://www.black-pa.com:5500/dev';	//线上开发
- BASE_URL = 'https://www.black-pa.com:5500/test';	//线上测试
+ // BASE_URL = 'https://www.black-pa.com:5500/pro';		//线上正式
+ // BASE_URL = 'https://www.black-pa.com:5500/dev';		//线上开发
+ // BASE_URL = 'https://www.black-pa.com:5500/test';	//线上测试
 
- // BASE_URL = 'https://bpa.black-pa.com:21527';	//本地开发
- // BASE_URL = 'https://bpa.black-pa.com:21528';	//本地测试
+ BASE_URL = 'https://bpa.black-pa.com:21527';		//本地开发 
+ // BASE_URL = 'http://192.168.1.21:5001';
+ // BASE_URL = 'https://bpa.black-pa.com:21528';		//本地测试
 
-const Franchisee = '/kitchen';								//加盟商：0
-const Order = '/order';										//订单： 1
-const Pay = '/wechat/';										//支付:	2
+const Franchisee = '/kitchen';							//加盟商：0
+const Order = '/order';									//订单： 1
+const Pay = '/wechat/';									//支付:	2
 
 const accountInfo = uni.getAccountInfoSync();
 if (accountInfo.miniProgram.envVersion === 'trial') {
 	BASE_URL = 'https://www.black-pa.com:5500/test';	
 } else if (accountInfo.miniProgram.envVersion === 'release') {
-	BASE_URL = 'https://www.black-pa.com:5500/pro';	
+	BASE_URL = 'https://www.black-pa.com:5500/pro';
 }
 
 const request = (options) => {
@@ -41,6 +42,10 @@ const request = (options) => {
 			title: '加载中',
 			mask: true
 		});
+		let TenantId = "";
+		if (options.url !== '/api/StoreHelper/GetAllStore') {
+			TenantId = getApp().globalData.companyId;
+		}
 		uni.request({
 			url: BASE_URL + interfaceType  + options.url,
 			method: options.method || 'GET',
@@ -78,7 +83,6 @@ const request = (options) => {
 					isSuccess: false,
 					msg: '服务端问题' + JSON.stringify(error.errMsg)
 				}
-				console.log('服务端问题', error);
 				resolve(response);
 			},
 			complete: () => {