commit -m 采美豆

components/cm-module/activity/activityBean.vue

@@ -49,7 +49,7 @@
 				type: String,
 				default: ""
 			},
-			beanType:{//根据类型设置背景图片
+			beanType:{//根据类型设置背景图片:1注册机构，2升级会员机构，3普通机构修改资料，4会员机构修改资料，5下单成功，6线上支付成功，7确认收货成功
 				type: Number,
 				default: 1
 			},

components/cm-module/orderDetails/orderButton.vue

@@ -12,7 +12,10 @@
 			<view class="btn btn-cancel" v-if="btnState.isCancel" @click.stop="btnConfirm('cancel',order)">取消订单</view>
 			<!-- <view class="btn btn-delete" v-if="btnState.isDelete" @click.stop="btnConfirm('delete',order)">删除订单</view> -->
 			<view class="btn btn-query" v-if="btnState.isQuery && order.secondHandOrderFlag!=1" @click.stop="btnConfirm('query',order)">查看物流</view>
-			<view class="btn " v-if="btnState.isConfirm" @click.stop="btnConfirm('confirm',order)">确认收货</view>
+			<view class="btn " v-if="btnState.isConfirm" @click.stop="btnConfirm('confirm',order)">
+				确认收货
+				<view class="tips">采美豆</view>
+			</view>
 		</view>
 	</view>
 </template>

components/cm-module/orderDetails/orderListButton.vue

@@ -9,7 +9,10 @@
 			<view class="btn btn-cancel" v-if="btnState.isCancel" @click.stop="btnConfirm('cancel',order)">取消订单</view>
 			<!-- <view class="btn btn-delete" v-if="btnState.isDelete" @click.stop="btnConfirm('delete',order)">删除订单</view> -->
 			<view class="btn btn-query" v-if="btnState.isQuery && order.secondHandOrderFlag!=1" @click.stop="btnConfirm('query',order)">查看物流</view>
-			<view class="btn " v-if="btnState.isConfirm" @click.stop="btnConfirm('confirm',order)">确认收货</view>
+			<view class="btn btn-firm" v-if="btnState.isConfirm" @click.stop="btnConfirm('confirm',order)">
+				确认收货
+				<view class="tips">采美豆<text class="line"></text></view>
+			</view>
 		</view>
 	</view>
 </template>
@@ -177,6 +180,35 @@
 				color: #FFFFFF;
 				border: 2rpx solid #f94b4b;
 			}
+			.btn-firm{
+				position:relative;
+				.tips{
+					width: 74rpx;
+					height: 32rpx;
+					line-height: 32rpx;
+					padding: 0 7rpx;
+					border-radius: 16rpx;
+					background-color: #ffe6dc;
+					color: $color-system;
+					text-align: center;
+					font-size: $font-size-20;
+					position:absolute;
+					right: 0;
+					top: -40rpx;
+					z-index: 90;
+					.line{
+						display: block;
+						width: 20rpx;
+						height: 20rpx;
+						background-color: #ffe6dc;
+						position: relative;
+						bottom: 18rpx;
+						left: 15rpx;
+						z-index: -1;
+						transform:rotate(45deg);
+					}
+				}
+			}
 			.btn-share{
 				// background:linear-gradient(315deg,rgba(0,212,150,1) 0%,rgba(126,243,174,1) 100%);
 				position: relative;

pages/login/apply.vue

@@ -196,6 +196,17 @@
 								@onConfirm="onConfirm">
 			</mpvue-city-picker>
 		</view>
+		<!-- 提交审核提示弹窗 -->
+		<view class="tui-alert-box" v-if="isConfirmShow">
+			<view class="tui-alert-content">
+				<view class="tui-alert-main">
+					升级信息提交成功，审核通过后您的身份将
+					成为会员机构，并且获得<text class="red">100</text>
+					采美豆的奖励
+				</view>
+				<view class="tui-alert-btn" @click="handleClick">知道了</view>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -253,6 +264,7 @@
 				isShowAustomItem:false, //是否显示其他添加
 				customItemValue:'', 	//自定义项目
 				isMainproCheck:false,
+				isConfirmShow:false,
 				addressData:{
 					address:'请选择机构所在地区',
 					townId:'',			//区ID
@@ -424,14 +436,18 @@
 						mainProduct:this.mainProduct,
 				}
 				this.UserService.OrganizationRegister(params).then(response =>{
-					this.$util.msg('您的升级申请已提交审核',2000);
-					setTimeout(()=>{
-						uni.navigateBack();
-					},2000)
+					this.isConfirmShow = true
+					
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000);
 				})
 			},
+			handleClick(){//隐藏提示弹窗
+				this.isConfirmShow = false
+				setTimeout(()=>{
+					uni.navigateBack();
+				},2000)
+			},
 			// 三级联动选择
 			showMulLinkageThreePicker() {
 				this.isShowInput = true
@@ -1140,4 +1156,54 @@
 	  transform:scale(.8);
 	  -webkit-transform:translate(-50%, -50%) scale(1);
 	}
+	.tui-alert-box {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+		position: fixed;
+		left: 0;
+		top: 0;
+		opacity: 1;
+		background: rgba(51,51,51,0.5);
+		z-index: 99999;
+		.tui-alert-content{
+			width: 580rpx;
+			height: 324rpx;
+			border-radius: 16rpx;
+			background-color: #FFFFFF;
+			position: absolute;
+			top: 0;
+			bottom: 0;
+			right: 0;
+			left: 0;
+			margin: auto;
+			.tui-alert-main{
+				width: 100%;
+				height: 234rpx;
+				box-sizing: border-box;
+				padding: 60rpx 30rpx;
+				line-height: 60rpx;
+				font-size: $font-size-26;
+				color: #666666;
+				text-align: justify;
+				.red{
+					color: #e15616;
+				}
+			}
+			.tui-alert-btn{
+				width: 100%;
+				height: 90rpx;
+				box-sizing: border-box;
+				line-height: 90rpx;
+				background: $btn-confirm;
+				color: #FFFFFF;
+				text-align: center;
+				font-size: $font-size-28;
+				border-radius: 0  0 16rpx 16rpx ;
+			}
+		}
+	}
 </style>

pages/user/account/account.vue

@@ -153,7 +153,7 @@
 							userId:this.userID,
 							pageNum:1,
 							pageSize:this.pageSize,
-							 type:this.balanceType,
+							type:this.balanceType,
 						})
 						.then(response =>{
 						let infoData = response.data

pages/user/order/order-details.vue

@@ -47,6 +47,9 @@
 		</share-alert>		
 		<!-- 促销活动弹窗 -->
 		<activi-popup :Promotion="handlerPros" :popupShow="popupShow"></activi-popup>
+		<!-- 采美豆提示弹窗 -->
+		<activityBean :show="isActivityBean" :beanType="beanType"  @cancel="handleBeanlClick"></activityBean>
+		
 	</view>
 </template>
 
@@ -63,6 +66,8 @@
 	import shareAlert from '@/components/cm-module/modelAlert/shareAlert.vue'			 //分享弹窗
 	import orderModel from '@/components/cm-module/modelAlert/order-alert'			 //付款弹窗
 	import activiPopup from "@/components/cm-module/orderDetails/activipopu"		//促销活动弹窗
+	import activityBean from '@/components/cm-module/activity/activityBean.vue'
+	
 	
 	export default {
 		components:{
@@ -77,7 +82,8 @@
 			orderButton,
 			shareAlert,
 			orderModel,
-			activiPopup
+			activiPopup,
+			activityBean
 		},
 		data() {
 			return {
@@ -120,6 +126,8 @@
 				},
 				clauseData:{},
 				orderSubmitType:false,//自主订单
+				beanType:1,
+				isActivityBean:true,
 			}
 		},
 		onLoad(option){
@@ -384,6 +392,9 @@
 				})
 				return systeminfo
 			},
+			handleBeanlClick(){//关闭采美豆弹窗
+				this.isActivityBean = false
+			},
 		},
 		onShow() {
 

pages/user/order/order-list.vue

@@ -104,6 +104,8 @@
 		<share-alert   v-if="isShareModal" :orderID="btnoRderID" @shareConfirm ='onShareAppMessage' />
 		<!-- 透明模态层 -->
 		<modal-layer v-if='isModalLayer'></modal-layer>
+		<!-- 采美豆提示弹窗 -->
+		<activityBean :show="isActivityBean" :beanType="beanType"  @cancel="handleBeanlClick"></activityBean>
 	</view>
 </template>
 
@@ -118,6 +120,8 @@
 	import empty from "@/components/empty";
 	import shareAlert from '@/components/cm-module/modelAlert/shareAlert'			 //分享弹窗
 	import orderModel from '@/components/cm-module/modelAlert/order-alert'			 //付款弹窗
+	import activityBean from '@/components/cm-module/activity/activityBean.vue'
+	
 	
 	export default {
 		components: {
@@ -130,7 +134,8 @@
 			tuiSkeleton,
 			modalLayer,
 			shareAlert,
-			orderModel
+			orderModel,
+			activityBean
 		},
 		data() {
 			return {
@@ -174,6 +179,8 @@
 				modelType:0,
 				nomoreText: '上拉显示更多',
 				isOnloadFlag:false,
+				beanType:1,
+				isActivityBean:true,
 			}
 		},
 		onLoad(e) {
@@ -554,7 +561,10 @@
 					}
 				});
 				return HtmlStateText;
-			}
+			},
+			handleBeanlClick(){//关闭采美豆弹窗
+				this.isActivityBean = false
+			},
 		},
 		onPageScroll(e) {
 			this.scrollTop = e.scrollTop;

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'