commit -m 5月小需求

components/cm-module/pageTemplate/templateA.vue

@@ -167,7 +167,7 @@
 		methods:{
 			initData(data){
 				this.floorData = data
-				// console.log(this.floorData)
+				console.log('userIdentity',this.userIdentity)
 				this.$api.getStorage().then((resolve) =>{
 					this.shopId = resolve.shopId ? resolve.shopId : 0
 				}).catch(err => {
@@ -189,7 +189,8 @@
 			},
 			BannerNavigateTo(linkType,linkId,linkHref,keyword) {//跳转
 				this.$api.BannerNavigateTo(linkType,linkId,linkHref,keyword)
-			}
+			},
+			
 		}
 	}
 </script>

pages/tabBar/home/index.vue

@@ -13,7 +13,7 @@
 		</view>	
 		<!-- 楼层 -->
 		<view class="container-section tui-skeleton">
-			<page-floor :list="pageList" :pageType='1' v-if="isRequest"></page-floor>
+			<page-floor :list="pageList" :userIdentity="userIdentity" :pageType='1' v-if="isRequest"></page-floor>
 			<supplier-list :supplierObj="supplierObj" v-if="isRequest"></supplier-list>
 		</view>
 		<!-- 侧边 -->

pages/user/order/order-payment.vue

@@ -326,6 +326,7 @@
 	}
 	.container-cash{
 		width: 100%;
+		padding-bottom: 250rpx;
 		.pay-bring-title{
 			box-sizing: border-box;
 			width: 100%;

services/ajax.env.js

@@ -5,8 +5,8 @@ if(process.env.NODE_ENV === 'development'){
 	// URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.2.81:8008'
 	// URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址
-    URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
-	// URL_CONFIG = 'https://spi.caimei365.com'
+    // URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
+	URL_CONFIG = 'https://spi.caimei365.com'
 }else{
     // 生产环境
 	URL_CONFIG = 'https://spi-b.caimei365.com'

services/config.env.js

@@ -3,8 +3,8 @@ if(process.env.NODE_ENV === 'development'){
     // 开发环境
     // URL_CONFIG = 'http://192.168.2.75:18002'	 //超超联调地址
 	// URL_CONFIG = 'http://192.168.2.67:18002'	 //裴裴联调地址
-	URL_CONFIG = 'https://core-b.caimei365.com'
-	// URL_CONFIG = 'https://core.caimei365.com'
+	// URL_CONFIG = 'https://core-b.caimei365.com'
+	URL_CONFIG = 'https://core.caimei365.com'
 }else{
     // 生产环境
 	URL_CONFIG = 'https://core-b.caimei365.com'