修改邀请码登录机构用户不需要绑定邮箱

App.vue

@@ -75,7 +75,6 @@
 							this.$store.commit('updateStatus',response.data)
 						})
 					})
-
 				})
 			},
 			refresh(){

README.md

@@ -12,9 +12,8 @@ caimei-applets-caimei --采美商城小程序
 	-下载安装HBuild-X
 	-导入项目文件
 	-点击运行到小程序模拟器->微信开发者工具(自动会编译打包开大微信开发者工具运行)
-
 使用说明
 
 这是一个基于uni-app的项目，所以要用HBuild-X 来打开预览(支持小程序、安卓、苹果)
 
-参与贡献
+

api/seller.js

@@ -394,7 +394,11 @@ export function shoppingCartUpdate(params) {
 export function sellerBindingOperation(params) {
 	return new Promise(function(resolve,reject) {
 		request.post('/seller/bindingOperation',params,true,res => {
-			resolve(res)
+			if(res.code == 0 || res.code == 4){
+				resolve(res)
+			}else{
+				reject(res)
+			}
 		})
 	})
 }

api/use.js

@@ -222,7 +222,11 @@ export function bindingWechat(params) {
 export function invitationCodeLogin(params) {
 	return new Promise(function(resolve,reject) {
 		request.post('/club/invitationCode',params,true, res => {
-			resolve(res)
+			if(res.code == 0 || res.code == 4){
+				resolve(res)
+			}else{
+				reject(res)
+			}
 		})
 	})
 }

common/config/common.js

@@ -37,6 +37,22 @@ const utils = {
 		//密码为8~20位数字和字母组合
 		return RegExp(/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/).test(value);
 	},
+	hidePhone:function(value) {
+		return value.replace(/^(\d{3})\d{4}(\d+)/,"$1****$2")
+	},
+	desensitizationName:function(value){
+		if(null != value && value != undefined){
+			if(value.length <= 3){
+				let ruten = value.substring(1);
+				return value.replace(ruten,'**');
+			} else if(value.length > 3 && value.length <= 6){
+				let ruten = value.substring(2);
+				return value.replace(ruten,'**');
+			} 
+		} else {
+			return "";
+		}
+	},
 	formatNum: function(num) {
 		//格式化手机号码
 		if (utils.isMobile(num)) {
@@ -119,5 +135,7 @@ module.exports = {
 	rmoney: utils.rmoney,
 	formatDate: utils.formatDate,
 	bankRegex: utils.bankRegex,
-	checkData:utils.checkData
+	checkData:utils.checkData,
+	hidePhone:utils.hidePhone,
+	desensitizationName:utils.desensitizationName
 }

common/config/config.js

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

components/jyf-Parser/index.vue

@@ -380,7 +380,7 @@
 					// #ifdef APP-PLUS
 					setTimeout(() => {
 						this.loadVideo = true;
-					}, 3000);
+					}, 2000);
 					// #endif
 				})
 			}

components/module/creatOrder/freight.vue

@@ -3,7 +3,8 @@
 		 <!-- 运费信息 -->
 		<view class="invoice-freight">
 			<view class="freight-left">
-				运费<text class="iconfont icon-yunfeishuoming" @click="showTip"></text>
+				运费
+				<!-- <text class="iconfont icon-yunfeishuoming" @click="showTip"></text> -->
 			</view>
 			<view class="freight-right">
 				<text>{{freightText}}</text>

components/module/listTemplate/buyagainList.vue

@@ -160,7 +160,7 @@
 						}
 					}
 				}).catch(response =>{
-					this.$util.msg(response.msg,3000);
+					this.$util.msg(response.msg,2000);
 				})
 			},
 			operationHanld(prop){

components/module/listTemplate/commodityList.vue

@@ -165,7 +165,7 @@
 							}
 						}
 					}).catch(response =>{
-						this.$util.msg(response.msg,3000);
+						this.$util.msg(response.msg,2000);
 					})
 				})
 				

components/module/listTemplate/immediatelyList.vue

@@ -180,12 +180,12 @@
 						this.isShowEmptyText ='暂无相关商品'
 					}
 				}).catch(response =>{
-					this.$util.msg(response.msg,3000);
+					this.$util.msg(response.msg,2000);
 				})
 			},
 			searchOpertor(){//搜索商品
 				if(this.searchInputVal == ''){
-					this.$util.msg('请输入商品关键词',3000)
+					this.$util.msg('请输入商品关键词',2000)
 					return
 				}
 				this.pageNum = 1

components/module/listTemplate/productList.vue

@@ -165,7 +165,7 @@
 						}
 					}
 				}).catch(response =>{
-					this.$util.msg(response.msg,3000);
+					this.$util.msg(response.msg,2000);
 				})
 			},
 			operationHanld(prop){

components/module/modelAlert/errorAlert.vue

@@ -0,0 +1,134 @@
+<template name="alert">
+	<view class="alert spec" :class="specClass">
+		<!-- 运费弹窗说明 -->
+		<view class="freight-alert"  @tap="hideFreight">
+			<view class="content">
+				<view class="title">
+					<text>提示</text>
+				</view>
+				<view class="text-content">
+					<view class="text">
+						<text>系统检测到您的微信已绑定供应商账户，不能继续登录</text>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default{
+		name:'alert',
+		props:{},
+		data() {
+			return{
+				
+			}
+		},
+		created() {
+			
+		},
+		onLoad(){
+			
+		},
+		methods:{
+			hideFreight(){
+				this.$parent.isErrorAlert = false
+			},
+		},
+		onShow(){
+	
+		}
+	}
+</script>
+
+<style lang="scss">
+	/*弹窗*/
+	.model-warp.none{
+		display: none;
+	}
+	.model-warp.show{
+		display: block;
+	}
+	.freight-alert{
+		width: 100%;
+		height: 100%;
+		background: rgba(0,0,0,.5);
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 8888;
+		transition: all 0.4s;
+		&.none{
+			display: none;			
+		}
+		&.show{
+			display: block;
+		}
+		.content{
+			width: 530rpx;
+			height: 300rpx;
+			position: absolute;
+			background: $bg-color;
+			left: 0;
+			right: 0;
+			bottom: 0;
+			top: 0;
+			margin: auto;
+			padding: 20rpx 25rpx;
+			border-radius: 12rpx;
+			.title{
+				width: 100%;
+				height: 68rpx;
+				line-height: 68rpx;
+				font-size: $font-size-28;
+				color: $text-color;
+				text-align: center;
+				margin-bottom: 32rpx;
+				position: relative;
+				.icon-iconfontguanbi{
+					width: 68rpx;
+					height: 68rpx;
+					text-align: center;
+					line-height: 68rpx;
+					position: absolute;
+					right: 0;
+					top: 0;
+					font-size: $font-size-36;
+					color: #999999;
+				}
+			}
+			.text-content{
+				width: 100%;
+				height: auto;
+				.text{
+					padding: 40rpx 0;
+					line-height: 44rpx;
+					font-size: $font-size-26;
+					color:#666666;
+					text-align: justify;
+				}
+				.text-h1{
+					line-height: 44rpx;
+					font-size: $font-size-28;
+					color: $text-color;
+					text-align: justify;
+				}
+			}
+			.btn{
+				width: 100%;
+				height: 88rpx;
+				float: left;
+				background: $btn-confirm;
+				line-height: 88rpx;
+				font-size: $font-size-28;
+				text-align: center;
+				color: #FFFFFF;
+				border-radius: 0;
+				padding: 0;
+				margin-top: 2rpx;
+			}
+		}
+	}
+	
+</style>

components/module/orderDetails/logisticsRecord.vue

@@ -62,9 +62,9 @@
 				thorui.getClipboardData(data, (res) => {
 					// #ifdef H5
 					if (res) {
-						this.$util.msg("复制成功",3000);
+						this.$util.msg("复制成功",2000);
 					} else {
-						this.$util.msg("复制失败",3000);
+						this.$util.msg("复制失败",2000);
 					}
 					// #endif
 				})

components/module/orderDetails/orderInformation.vue

@@ -116,9 +116,9 @@
 				thorui.getClipboardData(data, (res) => {
 					// #ifdef H5
 					if (res) {
-						this.$util.msg("复制成功",3000);
+						this.$util.msg("复制成功",2000);
 					} else {
-						this.$util.msg("复制失败",3000);
+						this.$util.msg("复制失败",2000);
 					}
 					// #endif
 				})

components/seller/home.vue

@@ -67,7 +67,7 @@
 								</view>
 								<view class="" v-if="hasLogin">
 									<view class="title-none" v-if="item.price1TextFlag == '1'">
-										<text class="p big">尚未公开价格</text>
+										<text class="p big">未公开价格</text>
 									</view>
 									<view class="price tui-skeleton-rect" v-else>
 										<text class="p sm">￥</text>

components/seller/user.vue

@@ -1,30 +1,31 @@
 <template>
 	<view class="container user clearfix">
-		<view class="user-section">
-			<view class="u-header">
+		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="5"></tui-skeleton>
+		<view class="user-section tui-skeleton">
+			<view class="u-header tui-skeleton-fillet">
 				<image src="https://img.caimei365.com/group1/M00/03/94/Cmis216Sk_SAPDwvAAcTspdl8h0610.png" mode=""></image>
 				<view class="u-header-main">
 					<view class="user-item">
 						<view class="logo-m">
 							<image :src="headpic ? headpic:'https://img.caimei365.com/group1/M00/03/94/Cmis216Sk_OAZaxVAAANf4oruy4674.png'" mode=""></image>
-							<text class="txt">协销员工</text>
+							<text class="txt tui-skeleton-fillet">协销员工</text>
 						</view>
 					</view>
-					<view class="user-item">
+					<view class="user-item tui-skeleton-fillet">
 						<text class="u-h1">{{name}}</text>
 					</view>
 				</view>
 			</view>
 			<!-- 订单 -->
 			<view class="user-order">
-				<view class="tab-title" @click="navigator('/market/pages/order/order-list?listType=0')">
-					<text class="cell-tit">我的订单</text>
-					<text class="cell-more">查看更多</text>
+				<view class="tab-title tui-skeleton-fillet" @click="navigator('/market/pages/order/order-list?listType=0')">
+					<text class="cell-tit tui-skeleton-fillet">我的订单</text>
+					<text class="cell-more tui-skeleton-fillet">查看更多</text>
 					<text class="iconfont icon-xiayibu"></text>
 				</view>
 				<view class="order-section">
 					<view class="order-item" @click="navigator('/market/pages/order/order-list?listType=1')" hover-class="common-hover"  :hover-stay-time="50">
-						<view class="order-icon">
+						<view class="order-icon tui-skeleton-fillet">
 							<image src="../../static/temp/order1@3x.png" mode=""></image>
 							<text 	v-if="beforeConfirmCount >0" 
 									class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
@@ -32,10 +33,10 @@
 									{{beforeConfirmCount == 99? '99+' : beforeConfirmCount}}
 							</text>
 						</view>
-						<text class="order-t">待确认</text>
+						<text class="order-t tui-skeleton-fillet">待确认</text>
 					</view>
 					<view class="order-item" @click="navigator('/market/pages/order/order-list?listType=2')"  hover-class="common-hover" :hover-stay-time="50">
-						<view class="order-icon">
+						<view class="order-icon tui-skeleton-fillet">
 							<image src="../../static/temp/order2@3x.png" mode=""></image>
 							<text  v-if="beforePayCount >0" 
 								   class="uni-badge uni-badge-error uni-small uni-badge--small icon-num " 
@@ -43,10 +44,10 @@
 								   {{beforePayCount == 99? '99+' : beforePayCount}}
 							</text>
 						</view>
-						<text class="order-t">待付款</text>
+						<text class="order-t tui-skeleton-fillet">待付款</text>
 					</view>
 					<view class="order-item" @click="navigator('/market/pages/order/order-list?listType=3')" hover-class="common-hover"  :hover-stay-time="50">
-						<view class="order-icon">
+						<view class="order-icon tui-skeleton-fillet">
 							<image src="../../static/temp/order3@3x.png" mode=""></image>
 							<text   v-if="beforeShipCount >0" 
 									class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
@@ -54,10 +55,10 @@
 									{{beforeShipCount == 99? '99+' : beforeShipCount}}
 							</text>
 						</view>
-						<text class="order-t">待发货</text>
+						<text class="order-t tui-skeleton-fillet">待发货</text>
 					</view>
 					<view class="order-item" @click="navigator('/market/pages/order/order-list?listType=4')" hover-class="common-hover"  :hover-stay-time="50">
-						<view class="order-icon">
+						<view class="order-icon tui-skeleton-fillet">
 							<image src="../../static/temp/order4@3x.png" mode=""></image>
 							<text 	v-if="shippedCount >0" 
 									class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
@@ -65,10 +66,10 @@
 									{{shippedCount == 99? '99+' : shippedCount}}
 							</text>
 						</view>
-						<text class="order-t">已发货</text>
+						<text class="order-t tui-skeleton-fillet">已发货</text>
 					</view>
 					<view class="order-item" @click="navigator('/market/pages/order/order-list?listType=5')" hover-class="common-hover"  :hover-stay-time="50">
-						<view class="order-icon">
+						<view class="order-icon tui-skeleton-fillet">
 							<image src="../../static/temp/order5@3x.png" mode=""></image>
 							<text 	v-if="refundsCount >0"
 									class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
@@ -76,14 +77,14 @@
 									{{refundsCount == 99? '99+' : refundsCount}}
 							</text>
 						</view>
-						<text class="order-t">退货/款</text>
+						<text class="order-t tui-skeleton-fillet">退货/款</text>
 					</view>
 				</view>
 			</view>
 			<!-- 底部跳转 -->
 			<view class="foot-list">
 				<view class="list-cell-item">
-					<view class="list-cell"  v-for="(item, index) in firstList" :key="index" @click="navigator(item.path)" hover-class="cell-hover" :hover-stay-time="50">
+					<view class="list-cell tui-skeleton-fillet"  v-for="(item, index) in firstList" :key="index" @click="navigator(item.path)" hover-class="cell-hover" :hover-stay-time="50">
 						<text class="cell-tit">{{item.name}}</text>
 						<text class="cell-more iconfont icon-xiayibu"></text>
 					</view>
@@ -109,8 +110,7 @@
 				headpic:'',
 				userMoney:0.00,
 				userId:'',
-				aboutHtml:'',
-				telPhone:'',
+				skeletonShow:true,
 				beforeConfirmCount:0,//待确认角标
 				beforePayCount:0, 	//待付款角标
 				beforeShipCount:0, //待发货角标
@@ -162,6 +162,7 @@
 						this.beforeShipCount = this.showBadge(sellerData.beforeShipCount)//待发货		
 						this.shippedCount = this.showBadge(sellerData.shippedCount)//已发货	
 						this.refundsCount = this.showBadge(sellerData.refundsCount)//退货/款	
+						this.skeletonShow = false;
 					}).catch(response =>{
 						this.$util.msg(response.msg,2000)
 					})

market/pages/club/allClub-list.vue

@@ -9,7 +9,7 @@
 					   v-model="searchInputVal" 
 					   @input="onShowClose" 
 					   @confirm="initclubList()" 
-					   placeholder="请输入机构关键词" 
+					   placeholder="机构名称/姓名/手机号" 
 					   maxlength="16"/>
 				<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText()"></text>
 			</view>
@@ -30,8 +30,8 @@
 							<view class="list-tel">
 								<text class="txt">{{item.name}}</text>
 								<text class="txt sm">
-									<text class="txt-le">{{item.linkMan1 ? item.linkMan1 : ''}}</text>
-									{{item.contractMobile1 ? item.contractMobile1 : item.contractMobile1}}
+									<text class="txt-le">{{item.linkMan1 ? desensitizationName(item.linkMan1) : ''}}</text>
+									{{item.contractMobile1 ? hidePhone(item.contractMobile1) : ''}}
 								</text>
 							</view>
 						</view>
@@ -175,6 +175,14 @@
 				this.isShowClose = false
 				this.pageNum=1
 				this.initclubList()
+			},
+			hidePhone(val){
+				let phone = this.$reg.hidePhone(val) 
+				return phone
+			},
+			desensitizationName(val){
+				let name = this.$reg.desensitizationName(val)
+				return name
 			}
 		},
 		onReachBottom() {
@@ -290,7 +298,7 @@
 					}
 				}
 				.list-tel{
-					margin-left: 18rpx;
+					margin: 0 15rpx;
 					.txt{
 						display: flex;
 						flex: 1;

market/pages/login/register.vue

@@ -360,7 +360,7 @@
 						uni.navigateBack({
 							delta: 1
 						});
-					},3000)
+					},2000)
 				}).catch(response =>{
 					this.$util.msg(response.msg,2000);
 				})

market/pages/order/order-history.vue

@@ -221,12 +221,14 @@
 			.list-opea{
 				flex: 3;
 				color: #166CE1;
+				align-items: center;
+				display: flex;
+				flex-direction: column;
 				.opea-p{
 					line-height: 70rpx;
 					font-size: $font-size-24;
 					color: #E11616;
 					text-align: right;
-					padding-right: 20rpx
 				}
 				.opea-type-dell{
 					width: 160rpx;

market/pages/search/search.vue

@@ -35,8 +35,7 @@
 							</view>
 							<view class="list-price" v-else>
 								<view class="price-larger" v-if="item.price1TextFlag == '1'">
-									<text class="txt">该商品尚未公开价格</text>
-									<text class="txt">购买请致电：0755-22907771</text>
+									<text class="txt">未公开价格</text>
 								</view>
 								<text v-else>￥<text class="price-larger">{{item.retailPrice.toFixed(2)}}</text></text>
 							</view>
@@ -167,7 +166,7 @@
 						}
 					}
 				}).catch(response =>{
-					this.$util.msg(response.msg,3000);
+					this.$util.msg(response.msg,2000);
 				})
 			},
 			onShowClose () {//输入框失去焦点时触发

pages/login/bindOperator.vue

@@ -207,16 +207,12 @@
 								headimgurl: this.wxUserInfo.avatarUrl,
 						}
 						sellerBindingOperation(params).then(response =>{
-							if(response.code == 0){
-								this.login(response.data);
-								this.$api.switchTabTo('/pages/tabBar/home/home')
-							}else if(response.code == 4){
-								this.login(response.data)
-								this.$api.navigateTo(`/pages/login/bindemail?pathType=1`)
-							}else{
-								this.$util.msg(response.msg,2000)
-							}
-						})						
+							this.login(response.data)
+							this.$api.switchTabTo('/pages/tabBar/home/home')
+						}).catch(response =>{
+							this.$util.msg(response.msg,2000)
+							this.isUserInfo = false
+						})			
 					}
 				})
 			}

pages/login/login.vue

@@ -1,3 +1,4 @@
+
 <template>
 	<view class="container login">
 		<view class="login-main">
@@ -59,16 +60,11 @@
 								headimgurl:res.userInfo.avatarUrl,
 						}							
 						invitationCodeLogin(params).then(response =>{
-							if(response.code == 0){
-								this.login(response.data)
-								this.$api.switchTabTo('/pages/tabBar/home/home')
-							}else if(response.code == 4){
-								this.login(response.data)
-								this.$api.navigateTo(`/pages/login/bindemail?pathType=1`)
-							}else{
-								this.$util.msg(response.msg,2000)
-								this.isUserInfo = false
-							}
+							this.login(response.data)
+							this.$api.switchTabTo('/pages/tabBar/home/home')
+						}).catch(response =>{
+							this.$util.msg(response.msg,2000)
+							this.isUserInfo = false
 						})
 					}
 				})

pages/login/password.vue

@@ -150,9 +150,11 @@
 					}
 				mobilePassword(params).then(res =>{
 					this.$util.msg(res.msg,2000);
-					uni.navigateBack({
-						delta: 1
-					});
+					setTimeout(()=>{
+						uni.navigateBack({
+							delta: 1
+						});
+					},2000)
 				}).catch( res =>{
 					this.$util.msg(res.msg,2000);
 				})
@@ -167,9 +169,11 @@
 					}
 				emailPassword(params).then(res =>{
 					this.$util.msg(res.msg,2000);
-					uni.navigateBack({
-						delta: 1
-					});
+					setTimeout(()=>{
+						uni.navigateBack({
+							delta: 1
+						});
+					},2000)
 				}).catch( res =>{
 					this.$util.msg(res.msg,2000);
 				})

pages/login/register.vue

@@ -451,7 +451,9 @@
 				}
 				organizationRegister(params).then(res =>{
 					this.$util.msg('您的机构账号已提交审核',2000);
-					this.$api.switchTabTo('/pages/tabBar/home/home')
+					setTimeout(()=>{
+						this.$api.switchTabTo('/pages/tabBar/home/home')
+					},2000)
 				}).catch(res =>{
 					this.$util.msg(res.msg,2000);
 				})

pages/search/search.vue

@@ -35,8 +35,7 @@
 							</view>
 							<view class="list-price" v-else>
 								<view class="price-larger" v-if="item.price1TextFlag == '1'">
-									<text class="txt">该商品尚未公开价格</text>
-									<text class="txt">购买请致电：0755-22907771</text>
+									<text class="txt">该未公开价格</text>
 								</view>
 								<text v-else>￥<text class="price-larger">{{item.retailPrice.toFixed(2)}}</text></text>
 							</view>
@@ -167,7 +166,7 @@
 						}
 					}
 				}).catch(response =>{
-					this.$util.msg(response.msg,3000);
+					this.$util.msg(response.msg,2000);
 				})
 			},
 			onShowClose () {//输入框失去焦点时触发

pages/tabBar/cart/cart.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="container cart clearfix">	
+	<view class="container cart clearfix" v-if="hasLogin"> 	
 		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="5"></tui-skeleton>
 		<view class="container-cart-main tui-skeleton">
 			<view v-if="!isEmpty" class="container-cart">

pages/tabBar/home/home.vue

@@ -76,7 +76,9 @@
 								</view>
 								<view v-else class="no-price">
 									<text class="p-no">价格:</text>
-									<uni-stars :stars="parseInt(item.price1Grade)"></uni-stars>
+									<view class="p-stars">
+										<uni-stars :stars="parseInt(item.price1Grade)"></uni-stars>
+									</view>
 								</view>	
 							</view>
 						</view>
@@ -262,7 +264,7 @@
 				console.log(e.detail.query)
 			},
 			showTost(){
-				// this.$util.msg("正在开发中，敬请期待~",2000);
+				// this.$util.msg("正在开发中，敬请期待~",2000)
 				this.$api.navigateTo(`/market/pages/login/login`)
 				// uni.navigateToMiniProgram({
 				// 	appId: 'wx5a5cda32926f55ac',
@@ -274,7 +276,6 @@
 				// 	success(res) {
 				// 		console.log(res)
 				// 		// 打开成功
-						
 				// 	}
 				// })
 			},
@@ -579,6 +580,9 @@
 					color: $color-system;
 					margin-right: 5rpx;
 				}
+				.p-stars{
+					margin-top: 3rpx;
+				}
 				image{
 					width:30rpx;
 					height: 36rpx;

pages/user/operator/addoperator.vue

@@ -62,7 +62,7 @@
 						configFlag:2
 					}
 				addOperator(params).then(response =>{
-					this.$util.msg('添加成功',2000);
+					this.$util.msg('添加成功',2000,true,'success')
 					setTimeout(() =>{
 						uni.navigateBack();
 					},2000)

pages/user/operator/list.vue

@@ -198,7 +198,7 @@
 			deleteOperator(id){//删除运营人员
 				this.$util.modal('','确定删除运营人员吗？','确定删除','取消',true,() =>{
 					deleteOperator({id:id}).then(response =>{
-						this.$util.msg('删除成功',2000)
+						this.$util.msg('删除成功',2000,true,'success')
 						this.initOperatorList()
 					}).catch(response =>{
 						this.$util.msg(response.msg,2000)
@@ -385,13 +385,12 @@
 					}
 				}
 				&.search{
-					width: 170rpx;
+					width: 175rpx;
 					padding: 0;
 					background: #FFFFFF;
 					.search-btn{
 						width: 170rpx;
 						height: 78rpx;
-						border: 1px solid $color-system;
 						border-radius: 14rpx;
 						font-size: $font-size-28;
 						color: #FFFFFF;
@@ -453,7 +452,7 @@
 			.opea-type{
 				flex-direction: column;
 				align-items: center;
-				margin-left: 20rpx;
+				margin-left: 35rpx;
 				float: left;
 				.opea-type-cell{
 					width: 186rpx;

pages/user/order/order-cashier.vue

@@ -137,9 +137,9 @@
 				thorui.getClipboardData(data, (res) => {
 					// #ifdef H5
 					if (res) {
-						this.$util.msg("复制成功",3000);
+						this.$util.msg("复制成功",2000);
 					} else {
-						this.$util.msg("复制失败",3000);
+						this.$util.msg("复制失败",2000);
 					}
 					// #endif
 				})

pages/user/order/order-logistics.vue

@@ -89,9 +89,9 @@
 				thorui.getClipboardData(data, (res) => {
 					// #ifdef H5
 					if (res) {
-						this.$util.msg("复制成功",3000);
+						this.$util.msg("复制成功",2000);
 					} else {
-						this.$util.msg("复制失败",3000);
+						this.$util.msg("复制失败",2000);
 					}
 					// #endif
 				})

pages/user/setting/password.vue

@@ -156,7 +156,7 @@
 								this.addressList = [];
 								this.initAddressList();
 							}else{
-								this.$util.msg(response.msg,3000);
+								this.$util.msg(response.msg,2000);
 								this.isShowDelModal = false;
 								setTimeout(function(){
 									uni.switchTab({

pages/user/setting/phone.vue

@@ -156,7 +156,7 @@
 								this.addressList = [];
 								this.initAddressList();
 							}else{
-								this.$util.msg(response.msg,3000);
+								this.$util.msg(response.msg,2000);
 								this.isShowDelModal = false;
 								setTimeout(function(){
 									uni.switchTab({