高敬炎 hace 2 años
padre
commit
670da96c3b

+ 2 - 2
unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/CircleManagementInfoServiceImpl.java

@@ -124,7 +124,7 @@ public class CircleManagementInfoServiceImpl implements ICircleManagementInfoSer
         if (circleManagementInfo.getStatus()==3){
             CardNewsInfo cardNewsInfo=new CardNewsInfo();
             cardNewsInfo.setNewsTitle("系统消息");
-            cardNewsInfo.setNewsContent("您创建的圈子"+circleManagementInfo.getCircleName()+"未通过审核,驳回原因:"+circleManagementInfo.getReason());
+            cardNewsInfo.setNewsContent("您创建的圈子"+circleManagementInfo.getCircleName()+"未通过审核,驳回原因:"+circleManagementInfo.getReason()+"。");
             cardNewsInfo.setReceiveId(circleManagementInfo.getCommonId());
             cardNewsInfo.setGmtCreate(now);
             cardNewsInfo.setGmtUpdate(now);
@@ -144,7 +144,7 @@ public class CircleManagementInfoServiceImpl implements ICircleManagementInfoSer
             }
             CardNewsInfo cardNewsInfo=new CardNewsInfo();
             cardNewsInfo.setNewsTitle("系统消息");
-            cardNewsInfo.setNewsContent("您创建的圈子"+circleManagementInfo.getCircleName()+"已通过审核,快去邀请好友一起加入吧");
+            cardNewsInfo.setNewsContent("您创建的圈子"+circleManagementInfo.getCircleName()+"已通过审核,快去邀请好友一起加入吧");
             cardNewsInfo.setReceiveId(circleManagementInfo.getCommonId());
             cardNewsInfo.setGmtCreate(now);
             cardNewsInfo.setGmtUpdate(now);

+ 2 - 3
unimall-admin/src/views/commonUserInfo/index.vue

@@ -301,14 +301,12 @@ export default {
   },
   methods: {
     sendMsg() {
-
-
       this.cardNewsInfo = {}
       this.msgObj = {
         newsTitle: '',
         newsContent: '',
       }
-      this.selectList = []
+      // this.selectList = []
       this.isShowMsg = true
     },
     /** 查询用户管理列表 */
@@ -342,6 +340,7 @@ export default {
           if (response.data) {
             this.msgSuccess("发送成功");
             this.isShowMsg = false;
+            this.selectList = []
           } else {
             this.msgError(response.msg);
           }

+ 93 - 61
xiaochengxu/pages/cardHolder/cardHolder.vue

@@ -330,11 +330,11 @@
 					<u-form :model="userInfo" ref="uForm">
 						<u-form-item label="头像">
 							<button class="avatar-wrapper" open-type="chooseAvatar" @chooseavatar="onChooseAvatar" slot="right">
-								<image class="avatar" style="height: auto;" :src="userInfo.head?userInfo.head:'https://mmbiz.qpic.cn/mmbiz/icTdbqWNOwNRna42FI242Lcia07jQodd2FJGIYQfG0LAJGFxM4FbnQP6yfMxBgJ0F3YRqJCJ1aPAK2dQagdusBZg/0'"></image>
+								<image class="avatar" :src="userInfo.head?userInfo.head:'https://mmbiz.qpic.cn/mmbiz/icTdbqWNOwNRna42FI242Lcia07jQodd2FJGIYQfG0LAJGFxM4FbnQP6yfMxBgJ0F3YRqJCJ1aPAK2dQagdusBZg/0'"></image>
 							</button>
 						</u-form-item>
 						<u-form-item label="昵称">
-								<u-input v-model="userInfo.nickname" class="weui-input" @blur="userNameInput" placeholder="请输入昵称" border="false"/>
+								<u-input inputAlign='right' v-model="userInfo.nickname" class="weui-input" @blur="userNameInput" placeholder="请输入昵称" border="false"/>
 							<!-- <input type="nickname" :value="userInfo.nickname" class="weui-input" @blur="userNameInput" placeholder="请输入昵称"/> -->
 						</u-form-item>
 					</u-form>
@@ -518,10 +518,11 @@
 				},
 				authUser(){
 					if(this.userInfo.nickname==''){
-						that.$refs.uToast.show({
-							type: 'error',
-							message: "请输入您的昵称",
-						})
+						uni.showToast({
+						  icon:"none",
+						  title: '请输入您的昵称',
+						  duration: 2000
+						});
 						return;
 					}
 					this.getTokenAsync1()
@@ -571,10 +572,11 @@
 				that.$request.baseRequest('commonUserApp', 'edit', {
 					commonUserInfo: JSON.stringify(that.userInfo)
 				}, failres => {
-					that.$refs.uToast.show({
-						type: 'error',
-						message: failres.errmsg,
-					})
+					uni.showToast({
+					  icon:"none",
+					  title: failres.errmsg,
+					  duration: 3000
+					});
 					uni.hideLoading()
 				}).then(res1 => {
 					that.userInfo = res1.data
@@ -588,10 +590,11 @@
 				that.$request.baseRequest('commonUserApp', 'edit', {
 					commonUserInfo: JSON.stringify(that.userInfo)
 				}, failres => {
-					that.$refs.uToast.show({
-						type: 'error',
-						message: failres.errmsg,
-					})
+					uni.showToast({
+					  icon:"none",
+					  title: failres.errmsg,
+					  duration: 3000
+					});
 					uni.hideLoading()
 				}).then(res1 => {
 					that.userInfo = res1.data
@@ -930,18 +933,20 @@
 						id: this.checkedList[i].data.id,
 					}, failres => {
 						console.log('res+++++', failres.errmsg)
-						this.$refs.uToast.show({
-							type: 'error',
-							message: failres.errmsg,
-						})
+						uni.showToast({
+						  icon:"none",
+						  title: failres.errmsg,
+						  duration: 3000
+						});
 					}).then(res => {
 						console.log(i, this.checkedList.length - 1)
 						if (i == this.checkedList.length - 1) {
 							uni.hideLoading()
-							this.$refs.uToast.show({
-								type: 'success',
-								message: '删除成功',
-							})
+							uni.showToast({
+							  icon:"success",
+							  title: '删除成功!',
+							  duration: 2000
+							});
 							this.delShow = false
 							this.islongPress = false
 							this.mescroll.resetUpScroll()
@@ -954,10 +959,11 @@
 				if (this.checkedList.length > 0) {
 					this.delShow = true
 				} else {
-					this.$refs.uToast.show({
-						type: 'error',
-						message: '请勾选后再进行删除!',
-					})
+					uni.showToast({
+					  icon:"none",
+					  title: '请勾选后再进行删除',
+					  duration: 2000
+					});
 				}
 			},
 
@@ -1015,15 +1021,17 @@
 						cardHolderInfo: JSON.stringify(this.currectData),
 					}, failres => {
 						console.log('res+++++', failres.errmsg)
-						this.$refs.uToast.show({
-							type: 'error',
-							message: failres.errmsg,
-						})
+						uni.showToast({
+						  icon:"none",
+						  title: failres.errmsg,
+						  duration: 3000
+						});
 					}).then(res => {
-						this.$refs.uToast.show({
-							type: 'success',
-							message: '修改备注成功',
-						})
+						uni.showToast({
+						  icon:"success",
+						  title: '修改备注成功!',
+						  duration: 2000
+						});
 						this.remark=''
 						this.modalShow = false
 						this.mescroll.resetUpScroll()
@@ -1049,15 +1057,17 @@
 						cardHolderInfo: JSON.stringify(this.currectData),
 					}, failres => {
 						console.log('res+++++', failres.errmsg)
-						this.$refs.uToast.show({
-							type: 'error',
-							message: failres.errmsg,
-						})
+						uni.showToast({
+						  icon:"none",
+						  title: failres.errmsg,
+						  duration: 3000
+						});
 					}).then(res => {
-						this.$refs.uToast.show({
-							type: 'success',
-							message: '修改分类成功',
-						})
+						uni.showToast({
+						  icon:"success",
+						  title: '修改分类成功!',
+						  duration: 2000
+						});
 						this.mescroll.resetUpScroll()
 					})
 				} else {
@@ -1088,10 +1098,11 @@
 							classify:this.typeName
 						}, failres => {
 							console.log('res+++++', failres.errmsg)
-							this.$refs.uToast.show({
-								type: 'error',
-								message: failres.errmsg,
-							})
+							uni.showToast({
+							  icon:"none",
+							  title: failres.errmsg,
+							  duration: 3000
+							});
 							uni.hideLoading()
 						}).then(res => {
 							console.log(res)
@@ -1119,10 +1130,11 @@
 							commonId: uni.getStorageSync("userInfo").id
 						}, failres => {
 							console.log('res+++++', failres.errmsg)
-							this.$refs.uToast.show({
-								type: 'error',
-								message: failres.errmsg,
-							})
+							uni.showToast({
+							  icon:"none",
+							  title: failres.errmsg,
+							  duration: 3000
+							});
 						}).then(res => {
 							res.data.items.unshift({
 								circleName:'全部分类'
@@ -1131,6 +1143,26 @@
 							
 							console.log(this.typeColumns)
 						})
+						
+						// await this.$request.baseRequest('admin.unimall.cardNewsInfo', 'list', {
+						// 	receiveId: uni.getStorageSync("userInfo").id,
+						// }, failres => {
+						// 	console.log('res+++++', failres.errmsg)
+						// 	uni.showToast({
+						// 	  icon:"none",
+						// 	  title: failres.errmsg,
+						// 	  duration: 3000
+						// 	});
+						// }).then(res => {
+						// 	this.noticeList = res.data.items
+						// 	if (this.noticeList.length > 0) {
+						// 		var data = this.noticeList.filter((item) => {
+						// 			return item.newsFlag == 0
+						// 		})
+						// 		this.unread = data ? data.length : 0
+						// 	}
+						// 	console.log(this.unread)
+						// })
 					}
 					
 				}
@@ -1144,10 +1176,11 @@
 							loginType: 1,
 							raw: JSON.stringify(wxres)
 						}, failres => {
-							that.$refs.uToast.show({
-								type: 'error',
-								message: failres.errmsg,
-							})
+							uni.showToast({
+							  icon:"none",
+							  title: failres.errmsg,
+							  duration: 3000
+							});
 							uni.hideLoading()
 						}).then(res => {
 							console.log(res.data)
@@ -1157,10 +1190,11 @@
 						})
 					},
 					fail: function(err) {
-						that.$refs.uToast.show({
-							type: 'error',
-							message: err.code,
-						})
+						uni.showToast({
+						  icon:"none",
+						  title: err.code,
+						  duration: 3000
+						});
 						// 登录授权失败  
 						// err.code是错误码
 					}
@@ -1648,13 +1682,11 @@
 	    }
 	}
 	.avatar-wrapper{
-		width: 150rpx;
-		height: 100rpx;
 		color: #333 !important;
-		text-align: center !important;
 		border: none !important;
 		border-radius:0 !important;
 		background-color:transparent !important;
+		padding: 0;
 	}
 	.avatar-wrapper::after {
 		border: none !important;

+ 10 - 8
xiaochengxu/pages/cardHolder/notice.vue

@@ -41,10 +41,11 @@
 					receiveId:uni.getStorageSync("userInfo").id,
 				}, failres => {
 					console.log('res+++++', failres.errmsg)
-					this.$refs.uToast.show({
-						type: 'error',
-						message: failres.errmsg,
-					})
+					uni.showToast({
+						icon:"none",
+						title: failres.errmsg,
+						duration: 3000
+					});
 					uni.hideLoading()
 				}).then(res => {
 					console.log(res)
@@ -61,10 +62,11 @@
 									cardNewsInfo:JSON.stringify(this.unreadList[i]),
 								}, failres => {
 									console.log('res+++++', failres.errmsg)
-									this.$refs.uToast.show({
-										type: 'error',
-										message: failres.errmsg,
-									})
+									uni.showToast({
+										icon:"none",
+										title: failres.errmsg,
+										duration: 3000
+									});
 									uni.hideLoading()
 								}).then(res => {})
 							}

+ 25 - 20
xiaochengxu/pages/cardHolder/scanCodeAddCard.vue

@@ -111,16 +111,18 @@
 						classify: this.cardInfo.classify
 					})
 				}, failres => {
-					this.$refs.uToast.show({
-						type: 'error',
-						message: failres.errmsg,
-					})
+					uni.showToast({
+						icon:"none",
+						title: failres.errmsg,
+						duration: 3000
+					});
 					uni.hideLoading()
 				}).then(res => {
-					this.$refs.uToast.show({
-						type: 'success',
-						message: '保存成功!',
-					})
+					uni.showToast({
+						icon:"success",
+						title: '保存成功!',
+						duration: 2000
+					});
 					uni.switchTab({
 						url: "/pages/cardHolder/cardHolder"
 
@@ -149,10 +151,11 @@
 					id: this.id
 				}, failres => {
 					console.log('res+++++', failres.errmsg)
-					this.$refs.uToast.show({
-						type: 'error',
-						message: failres.errmsg,
-					})
+					uni.showToast({
+					  icon:"none",
+					  title: failres.errmsg,
+					  duration: 3000
+					});
 					uni.hideLoading()
 				}).then(res => {
 					console.log(res,"this.cardInfo")
@@ -165,10 +168,11 @@
 				this.$request.baseRequest('admin.unimall.cardManagementInfo', 'list', {
 					commonId: uni.getStorageSync("userInfo").id
 				}, failres => {
-					this.$refs.uToast.show({
-						type: 'error',
-						message: failres.errmsg,
-					})
+					uni.showToast({
+					  icon:"none",
+					  title: failres.errmsg,
+					  duration: 3000
+					});
 					uni.hideLoading()
 				}).then(res => {
 					this.cardList = [res.data.items]
@@ -179,10 +183,11 @@
 					commonId: uni.getStorageSync("userInfo").id
 				}, failres => {
 					console.log('res+++++', failres.errmsg)
-					this.$refs.uToast.show({
-						type: 'error',
-						message: failres.errmsg,
-					})
+					uni.showToast({
+					  icon:"none",
+					  title: failres.errmsg,
+					  duration: 3000
+					});
 				}).then(res => {
 					this.columns = [res.data.items]
 					console.log(this.columns)

+ 5 - 4
xiaochengxu/pages/cardHolder/search.vue

@@ -110,10 +110,11 @@
 							voiceMessage: _file,
 						}, failres => {
 							console.log('res+++++', failres.errmsg)
-							this.$refs.uToast.show({
-								type: 'error',
-								message: failres.errmsg,
-							})
+							uni.showToast({
+								icon:"none",
+								title: failres.errmsg,
+								duration: 3000
+							});
 						}).then(res => {
 							uni.hideLoading()
 							console.log(res)

+ 15 - 12
xiaochengxu/pages/circle/changeCard.vue

@@ -253,10 +253,11 @@
 					status:this.status
 				}, failres => {
 					console.log('res+++++', failres.errmsg)
-					this.$refs.uToast.show({
-						type: 'error',
-						message: failres.errmsg,
-					})
+					uni.showToast({
+					  icon:"none",
+					  title: failres.errmsg,
+					  duration: 3000
+					});
 					uni.hideLoading()
 				}).then(res => {
 					uni.hideLoading()
@@ -272,17 +273,19 @@
 					updateFlag:type
 				}, failres => {
 					console.log('res+++++', failres.errmsg)
-					this.$refs.uToast.show({
-						type: 'error',
-						message: failres.errmsg,
-					})
+					uni.showToast({
+					  icon:"none",
+					  title: failres.errmsg,
+					  duration: 3000
+					});
 					uni.hideLoading()
 				}).then(res => {
 					uni.hideLoading()
-					this.$refs.uToast.show({
-						type: 'success',
-						message: "操作成功!",
-					})
+					uni.showToast({
+					  icon:"success",
+					  title: '操作成功!',
+					  duration: 2000
+					});
 					this.getList()
 				})
 			}

+ 10 - 8
xiaochengxu/pages/circle/circle.vue

@@ -88,10 +88,11 @@
 				status:1
 			}, failres => {
 				console.log('res+++++', failres.errmsg)
-				this.$refs.uToast.show({
-					type: 'error',
-					message: failres.errmsg,
-				})
+				uni.showToast({
+				  icon:"none",
+				  title: failres.errmsg,
+				  duration: 3000
+				});
 				uni.hideLoading()
 			}).then(res => {
 				uni.hideLoading()
@@ -147,10 +148,11 @@
 				}
 				this.$request.baseRequest('admin.unimall.circleManagementInfo', 'list', _data, failres => {
 					console.log('res+++++', failres.errmsg)
-					this.$refs.uToast.show({
-						type: 'error',
-						message: failres.errmsg,
-					})
+					uni.showToast({
+					  icon:"none",
+					  title: failres.errmsg,
+					  duration: 3000
+					});
 					uni.hideLoading()
 				}).then(res => {
 					uni.hideLoading()

+ 46 - 38
xiaochengxu/pages/circle/createCirclce.vue

@@ -89,10 +89,11 @@
 			this.$request.baseRequest('admin.unimall.cardManagementInfo', 'list', {
 				commonId: uni.getStorageSync("userInfo").id
 			}, failres => {
-				this.$refs.uToast.show({
-					type: 'error',
-					message: failres.errmsg,
-				})
+				uni.showToast({
+				  icon:"none",
+				  title: failres.errmsg,
+				  duration: 3000
+				});
 				uni.hideLoading()
 			}).then(res => {
 				uni.hideLoading()
@@ -114,10 +115,11 @@
 				if(this.list.length>0){
 					this.show=true
 				}else{
-					this.$refs.uToast.show({
-						type: 'error',
-						message: '暂无名片!',
-					})
+					uni.showToast({
+					  icon:"none",
+					  title: '暂无名片',
+					  duration: 2000
+					});
 				}
 				
 			},
@@ -127,25 +129,28 @@
 			submit() {
 				this.formData.circleLabel = []
 				if (!this.formData.circleName) {
-					this.$refs.uToast.show({
-						type: 'error',
-						message: '圈子名称不能为空!',
-					})
+					uni.showToast({
+					  icon:"none",
+					  title: '圈子名称不能为空!',
+					  duration: 2000
+					});
 					return
 				}
 				for (let i = 0; i < this.labelList.length; i++) {
 					if (!this.labelList[i].labelName) {
-						this.$refs.uToast.show({
-							type: 'error',
-							message: '标签内容不能为空!',
-						})
+						uni.showToast({
+						  icon:"none",
+						  title: '标签内容不能为空!',
+						  duration: 2000
+						});
 						return
 					}
 					if (this.labelList[i].labelName.length > 6 || this.labelList[i].labelName.length < 2) {
-						this.$refs.uToast.show({
-							type: 'error',
-							message: '标签内容2-6个字!',
-						})
+						uni.showToast({
+						  icon:"none",
+						  title: '标签内容2-6个字!',
+						  duration: 2000
+						});
 						return
 					}
 					this.formData.circleLabel.push(this.labelList[i].labelName)
@@ -155,18 +160,19 @@
 				this.$request.baseRequest('admin.unimall.circleManagementInfo', 'add', {
 					circleManagementInfo: JSON.stringify(this.formData)
 				}, failres => {
-					this.$refs.uToast.show({
-						type: 'error',
-						message: failres.errmsg,
-					})
+					uni.showToast({
+					  icon:"none",
+					  title: failres.errmsg,
+					  duration: 3000
+					});
+
 					uni.hideLoading()
 				}).then(res => {
-					this.$refs.uToast.show({
-						type: 'success',
-						message: '信息审核中,请留意消息通知!',
-						back:true,
-						duration:3000
-					})
+					uni.showToast({
+					  icon:"none",
+					  title: '信息审核中,请留意消息通知!',
+					  duration: 2000
+					});
 				})
 				setTimeout(() => {
 					uni.navigateBack()
@@ -174,10 +180,11 @@
 			},
 			add() {
 				if (this.labelList.length > 5) {
-					this.$refs.uToast.show({
-						type: 'error',
-						message: '“标签数量2-6个!',
-					})
+					uni.showToast({
+					  icon:"none",
+					  title: '标签数量2-6个!',
+					  duration: 2000
+					});
 					return
 				}
 				this.labelList.push({
@@ -186,10 +193,11 @@
 			},
 			subtract(index) {
 				if (this.labelList.length < 3) {
-					this.$refs.uToast.show({
-						type: 'error',
-						message: '“标签数量2-6个!',
-					})
+					uni.showToast({
+					  icon:"none",
+					  title: '标签数量2-6个!',
+					  duration: 2000
+					});
 					return
 				}
 				this.labelList.splice(index, 1)

+ 70 - 53
xiaochengxu/pages/circle/detail.vue

@@ -3,7 +3,7 @@
 		<view class="bgc">
 			<view class="content1">
 				<view class="left">
-					<image :src="dataObj.circleHead?dataObj.circleHead:'../../static/imgs/mySet/ewm.png'" mode="aspectFill" class="img"></image>
+					<image :src="dataObj.circleHead" mode="aspectFill" class="img"></image>
 				</view>
 				<view class="right">
 					<view  class="top flex flex-between">
@@ -153,17 +153,19 @@
 					}),
 				}, failres => {
 					console.log('res+++++', failres.errmsg)
-					this.$refs.uToast.show({
-						type: 'error',
-						message: failres.errmsg,
-					})
+					uni.showToast({
+					  icon:"none",
+					  title: failres.errmsg,
+					  duration: 3000
+					});
 					uni.hideLoading()
 				}).then(res => {
 					this.isShowChangeCard = false
-					this.$refs.uToast.show({
-						type: 'success',
-						message: "操作成功!"
-					})
+					uni.showToast({
+					  icon:"success",
+					  title: '操作成功!',
+					  duration: 2000
+					});
 					setTimeout(() => {
 						this.mescroll.resetUpScroll()
 					}, 500)
@@ -179,17 +181,19 @@
 					}),
 				}, failres => {
 					console.log('res+++++', failres.errmsg)
-					this.$refs.uToast.show({
-						type: 'error',
-						message: failres.errmsg,
-					})
+					uni.showToast({
+					  icon:"none",
+					  title: failres.errmsg,
+					  duration: 3000
+					});
 					uni.hideLoading()
 				}).then(res => {
 					this.isShowCard = false
-					this.$refs.uToast.show({
-						type: 'success',
-						message: "更改圈子名片成功!",
-					})
+					uni.showToast({
+					  icon:"success",
+					  title: '更改圈子名片成功!',
+					  duration: 2000
+					});
 					this.mescroll.resetUpScroll()
 				})
 			},
@@ -214,18 +218,20 @@
 					id: this.dataObj.circleCardInfo.id,
 				}, failres => {
 					console.log('res+++++', failres.errmsg)
-					this.$refs.uToast.show({
-						type: 'error',
-						message: failres.errmsg,
-					})
+					uni.showToast({
+					  icon:"none",
+					  title: failres.errmsg,
+					  duration: 3000
+					});
 					uni.hideLoading()
 				}).then(res => {
 					this.isShowCard = false
 					this.show1=false
-					this.$refs.uToast.show({
-						type: 'success',
-						message: "退出成功!",
-					})
+					uni.showToast({
+					  icon:"success",
+					  title: '退出成功!',
+					  duration: 2000
+					});
 					this.mescroll.resetUpScroll()
 				})
 			},
@@ -252,18 +258,20 @@
 					}),
 				}, failres => {
 					console.log('res+++++', failres.errmsg)
-					this.$refs.uToast.show({
-						type: 'error',
-						message: failres.errmsg,
-					})
+					uni.showToast({
+					  icon:"none",
+					  title: failres.errmsg,
+					  duration: 3000
+					});
 					uni.hideLoading()
 				}).then(res => {
 					this.isShowCard = false
 					this.show = false
-					this.$refs.uToast.show({
-						type: 'success',
-						message: "加入成功!",
-					})
+					uni.showToast({
+					  icon:"success",
+					  title: '加入成功!',
+					  duration: 2000
+					});
 					this.mescroll.resetUpScroll()
 
 				})
@@ -276,10 +284,15 @@
 				} else if (this.cardList[0].length > 1) {
 					this.isShowCard = true
 				} else {
-					this.$refs.uToast.show({
-						type: 'error',
-						message: "您还没有自己的名片,请创建后再加入圈子",
-					})
+					uni.showToast({
+						icon:"none",
+						title: '您还没有自己的名片,请创建后再加入圈子!',
+						duration: 2000
+					});
+					// this.$refs.uToast.show({
+					// 	type: 'error',
+					// 	message: "您还没有自己的名片,请创建后再加入圈子",
+					// })
 				}
 
 			},
@@ -295,11 +308,12 @@
 					limit: page.size,
 				}, failres => {
 					console.log('res+++++', failres.errmsg)
-					this.$refs.uToast.show({
-						type: 'error',
-						message: failres.errmsg,
-					})
 					uni.hideLoading()
+					uni.showToast({
+					  icon:"none",
+					  title: failres.errmsg,
+					  duration: 3000
+					});
 				}).then(res => {
 					uni.hideLoading()
 					console.log(11)
@@ -319,10 +333,11 @@
 					commonId: this.userInfo.id
 				}, failres => {
 					console.log('res+++++', failres.errmsg)
-					this.$refs.uToast.show({
-						type: 'error',
-						message: failres.errmsg,
-					})
+					uni.showToast({
+					  icon:"none",
+					  title: failres.errmsg,
+					  duration: 3000
+					});
 				}).then(res => {
 					this.cardList = [res.data.items]
 				})
@@ -331,11 +346,12 @@
 					id: this.id
 				}, failres => {
 					console.log('res+++++', failres.errmsg)
-					this.$refs.uToast.show({
-						type: 'error',
-						message: failres.errmsg,
-					})
 					uni.hideLoading()
+					uni.showToast({
+					  icon:"none",
+					  title: failres.errmsg,
+					  duration: 3000
+					});
 				}).then(res => {
 					console.log(res.data)
 					this.dataObj = res.data
@@ -346,10 +362,11 @@
 			},
 			changeCard(val) {
 				if(!this.dataObj.circleCardInfo){
-					this.$refs.uToast.show({
-						type: 'error',
-						message: '请先加入圈子!',
-					})
+					uni.showToast({
+					  icon:"none",
+					  title: "请先加入圈子!",
+					  duration: 2000
+					});
 				}else{
 					this.selectRowCard = val
 					this.swapNameCards = true

+ 5 - 4
xiaochengxu/pages/circle/lookHome.vue

@@ -117,10 +117,11 @@
 				}
 				this.$request.baseRequest('admin.unimall.personalHomepageInfo', 'get',data, failres => {
 					console.log('res+++++', failres.errmsg)
-					this.$refs.uToast.show({
-						type: 'error',
-						message: failres.errmsg,
-					})
+					uni.showToast({
+					  icon:"none",
+					  title: failres.errmsg,
+					  duration: 3000
+					});
 					uni.hideLoading()
 				}).then(res => {
 					console.log(res)

+ 5 - 4
xiaochengxu/pages/circle/search.vue

@@ -106,10 +106,11 @@
 							voiceMessage: _file,
 						}, failres => {
 							console.log('res+++++', failres.errmsg)
-							this.$refs.uToast.show({
-								type: 'error',
-								message: failres.errmsg,
-							})
+							uni.showToast({
+							  icon:"none",
+							  title: failres.errmsg,
+							  duration: 3000
+							});
 						}).then(res => {
 							uni.hideLoading()
 							console.log(res)

+ 37 - 37
xiaochengxu/pages/mySet/cardType.vue

@@ -1,6 +1,7 @@
 <template>
 	<view class="content">
-		<u-loading-page loading-mode='spinner' image="/static/imgs/logo.png" iconSize='60' :loading='loading'></u-loading-page>
+		<u-loading-page loading-mode='spinner' image="/static/imgs/logo.png" iconSize='60'
+			:loading='loading'></u-loading-page>
 		<view v-show='!loading' class="content1">
 			<view v-for='item in cardTypeList'>
 				<view class='flex row flex-between'>
@@ -41,7 +42,7 @@
 				cardTypeData: {},
 				userInfo: {},
 				canReset: false,
-				loading:true,
+				loading: true,
 			};
 		},
 		onLoad() {
@@ -61,11 +62,12 @@
 					commonId: uni.getStorageSync("userInfo").id
 				}, failres => {
 					console.log('res+++++', failres.errmsg)
-					this.$refs.uToast.show({
-						type: 'error',
-						message: failres.errmsg,
-					})
 					uni.hideLoading()
+					uni.showToast({
+						icon: "none",
+						title: failres.errmsg,
+						duration: 3000
+					});
 				}).then(res => {
 					// this.cardTypeList = res.data.items
 					uni.hideLoading()
@@ -79,7 +81,7 @@
 						// if (itemIndex != -1) {
 						// 	var data = res.data.items.splice(itemIndex, 1)
 						// 	res.data.items = data.concat(res.data.items)
-							
+
 						// } else {
 						// 	res.data.items = [].concat(res.data.items)
 						// }
@@ -87,9 +89,9 @@
 					} else {
 						this.cardTypeList = []
 					}
-					setTimeout(()=>{
-						that.loading=false
-					},1000)
+					setTimeout(() => {
+						that.loading = false
+					}, 1000)
 				})
 			},
 			del(item) {
@@ -102,21 +104,19 @@
 					id: item.id
 				}, failres => {
 					console.log('res+++++', failres.errmsg)
+					uni.hideLoading()
 					uni.showToast({
 						title: failres.errmsg,
 						icon: 'none',
 						duration: 2000
 					})
-					uni.hideLoading()
 				}).then(res => {
 					uni.hideLoading()
-					this.$refs.uToast.show({
-						type: 'success',
-						message: '删除成功!',
-						complete() {
-							that.getList()
-						}
-					})
+					uni.showToast({
+						icon: "success",
+						title: '删除成功!',
+						duration: 2000
+					});
 				})
 			},
 			stick(item) {
@@ -135,7 +135,7 @@
 							id: item.id
 						})
 					}
-				} 
+				}
 				this.$request.baseRequest(type, type1, data, failres => {
 					console.log('res+++++', failres.errmsg)
 					uni.showToast({
@@ -146,12 +146,10 @@
 					uni.hideLoading()
 				}).then(res => {
 					uni.hideLoading()
-					this.$refs.uToast.show({
-						type: 'success',
-						message: '置顶成功!',
-						complete() {
-							that.getList()
-						}
+					uni.showToast({
+						icon: "success",
+						title: '置顶成功!',
+						duration: 2000
 					})
 				})
 			},
@@ -180,27 +178,28 @@
 					cardClassifyInfo: JSON.stringify(this.cardTypeData)
 				}, failres => {
 					console.log('res+++++', failres.errmsg)
-					this.$refs.uToast.show({
-						type: 'error',
-						message: failres.errmsg,
-					})
 					uni.hideLoading()
+					uni.showToast({
+						icon: "none",
+						title: failres.errmsg,
+						duration: 3000
+					});
+
 				}).then(res => {
 					uni.hideLoading()
 					this.show = false
 					this.cardTypeData = {
 						commonId: uni.getStorageSync("userInfo").id,
 					}
-					this.$refs.uToast.show({
-						type: 'success',
-						message: '操作成功',
-						complete() {
+					uni.showToast({
+						icon: "success",
+						title: '修改成功!',
+						duration: 2000,
+						complete: function() {
 							that.getList()
 						}
-
 					})
 				})
-
 			}
 		}
 	}
@@ -243,7 +242,8 @@
 		margin: 0 20rpx;
 		border-radius: 20rpx;
 	}
-	.slot-content{
-		width:100%;
+
+	.slot-content {
+		width: 100%;
 	}
 </style>

+ 15 - 12
xiaochengxu/pages/mySet/editCard.vue

@@ -278,11 +278,12 @@
 					dictType: "card_template"
 				}, failres => {
 					console.log('res+++++', failres.errmsg)
-					this.$refs.uToast.show({
-						type: 'error',
-						message: failres.errmsg,
-					})
 					uni.hideLoading()
+					uni.showToast({
+					  icon:"none",
+					  title: failres.errmsg,
+					  duration: 3000
+					});
 				}).then(res => {
 					console.log("img", res)
 					this.imgList = res.data.items
@@ -349,17 +350,19 @@
 				this.$request.baseRequest('admin.unimall.cardManagementInfo', 'update', {
 					cardManagementInfo: JSON.stringify(this.cardInfo)
 				}, failres => {
-					this.$refs.uToast.show({
-						type: 'error',
-						message: failres.errmsg,
-					})
 					uni.hideLoading()
+					uni.showToast({
+					  icon:"none",
+					  title: failres.errmsg,
+					  duration: 3000
+					});
 				}).then(res => {
 					this.isSubmit = false
-					this.$refs.uToast.show({
-						type: 'success',
-						message: '编辑成功!',
-					})
+					uni.showToast({
+					  icon:"success",
+					  title: '编辑成功!',
+					  duration: 2000
+					});
 					uni.navigateBack()
 				})
 			},

+ 14 - 16
xiaochengxu/pages/mySet/editNickName.vue

@@ -33,26 +33,24 @@
 				this.$request.baseRequest('commonUserApp', 'edit', {
 					commonUserInfo: JSON.stringify(this.userInfo)
 				}, failres => {
-					this.$refs.uToast.show({
-						type: 'error',
-						message: failres.errmsg,
-					})
 					uni.hideLoading()
+					uni.showToast({
+					  icon:"none",
+					  title: failres.errmsg,
+					  duration: 3000
+					});
 				}).then(res => {
 					this.userInfo = res.data
 					uni.setStorageSync("userInfo", this.userInfo)
-					let params = {
-						type: 'success',
-						message: "修改成功",
-						url: '/pages/mySet/mySet'
-					}
-					this.$refs.uToast.show({
-						...params,
-						complete() {
-							params.url && uni.switchTab({
-								url: params.url
-							})
-						}
+					uni.showToast({
+					  icon:"success",
+					  title: '修改成功!',
+					  duration: 2000,
+					  complete:function(){
+					    uni.switchTab({
+					      url: "/pages/mySet/mySet"
+					    })
+					  }
 					})
 				})
 			}

+ 10 - 9
xiaochengxu/pages/mySet/lookCard.vue

@@ -97,18 +97,19 @@
 					}
 					this.$request.baseRequest(type, type1,{certificateImage:this.currectData.certificateImage}, failres => {
 						console.log('res+++++', failres.errmsg)
-						this.$refs.uToast.show({
-							type: 'error',
-							message: failres.errmsg,
-						})
 						uni.hideLoading()
+						uni.showToast({
+						  icon:"none",
+						  title: failres.errmsg,
+						  duration: 3000
+						});
 					}).then(res => {
-						console.log(res.data.recPersonNo,res.data.bankNo)
-						this.$refs.uToast.show({
-							type: 'success',
-							message: '识别成功',
-						})
 						uni.hideLoading()
+						uni.showToast({
+						  icon:"success",
+						  title: '识别成功!',
+						  duration: 2000
+						});
 						if(e.value[0]=='识别身份证号'){
 							this.cardList[this.index].personNo=res.data.recPersonNo
 							this.cardList[this.index].personNo1 = '*' + (this.cardList[this.index].personNo.substring(this.cardList[this.index].personNo.length - 4))

+ 83 - 68
xiaochengxu/pages/mySet/myCard.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<u-navbar placeholder title="我的证件" @leftClick="leftClick">
+		<u-navbar placeholder title="我的证件" @leftClick="leftClick" bgColor="#112253" titleStyle ="color:#fff" leftIconColor="#fff">
 		</u-navbar>
 		<view class="flex content1 flex-between">
 			<view @click='addclick' class="button">
@@ -74,9 +74,9 @@
 					<view v-else style='padding-left:20rpx;' >
 						<u-upload  @afterRead="afterRead" :fileList="fileList2" @delete="deletePic" name="2" multiple
 						:maxCount="1" height='190' width='340'>
-							<view class="">
+							<!-- <view class="">
 								123
-							</view>
+							</view> -->
 							<!-- <image src="https://cdn.uviewui.com/uview/demo/upload/positive.png" 
 								mode="widthFix" style="width: 250px;height: 150px;"></image> -->
 							</u-upload>
@@ -262,19 +262,21 @@
 							certificateManagementInfo: JSON.stringify(item)
 						}, failres => {
 							console.log('res+++++', failres.errmsg)
-							this.$refs.uToast.show({
-								type: 'error',
-								message: failres.errmsg,
-							})
 							uni.hideLoading()
+							uni.showToast({
+							  icon:"none",
+							  title: failres.errmsg,
+							  duration: 3000
+							});
 						}).then(res => {
-							this.$refs.uToast.show({
-								type: 'success',
-								message: '编辑成功',
-							})
+							uni.hideLoading()
+							uni.showToast({
+							  icon:"success",
+							  title: '编辑成功!',
+							  duration: 2000
+							});
 							this.modalshow = false
 							this.checkedList = []
-							uni.hideLoading()
 							this.mescroll.resetUpScroll()
 						})	
 					}
@@ -292,19 +294,22 @@
 					id: this.id
 				}, failres => {
 					console.log('res+++++', failres.errmsg)
-					this.$refs.uToast.show({
-						type: 'error',
-						message: failres.errmsg,
-					})
+					uni.showToast({
+					  icon:"none",
+					  title: failres.errmsg,
+					  duration: 3000
+					});
 					uni.hideLoading()
 				}).then(res => {
-					this.$refs.uToast.show({
-						type: 'success',
-						message: '删除成功',
-					})
+					
+					uni.hideLoading()
+					uni.showToast({
+					  icon:"success",
+					  title: '删除成功!',
+					  duration: 2000
+					});
 					this.modalshow = false
 					this.checkedList = []
-					uni.hideLoading()
 					this.mescroll.resetUpScroll()
 				})
 			},
@@ -330,18 +335,20 @@
 					certificateImage: this.cardList[this.checkedList[0]].certificateImage
 				}, failres => {
 					console.log('res+++++', failres.errmsg)
-					this.$refs.uToast.show({
-						type: 'error',
-						message: failres.errmsg,
-					})
 					uni.hideLoading()
+					uni.showToast({
+					  icon:"none",
+					  title: failres.errmsg,
+					  duration: 3000
+					});
 				}).then(res => {
 					console.log(res.data)
-					this.$refs.uToast.show({
-						type: 'success',
-						message: '识别成功',
-					})
 					uni.hideLoading()
+					uni.showToast({
+					  icon:"success",
+					  title: '识别成功!',
+					  duration: 2000
+					});
 					this.credentials = res.data
 					this.credentialsShow = true
 				})
@@ -366,10 +373,11 @@
 			},
 			share() {
 				if (this.checkedList.length == 0) {
-					this.$refs.uToast.show({
-						type: 'error',
-						message: '请勾选想要分享的证件!',
-					})
+					uni.showToast({
+					  icon:"none",
+					  title: '请勾选想要分享的证件!!',
+					  duration: 2000
+					});
 					return
 				}
 				var arr=[]
@@ -387,17 +395,19 @@
 			imageOCR() {
 				console.log(this.cardList, this.checkedList)
 				if (this.checkedList.length == 0) {
-					this.$refs.uToast.show({
-						type: 'error',
-						message: '请勾选想要识别的证件!',
-					})
+					uni.showToast({
+					  icon:"none",
+					  title: '请勾选想要识别的证件!',
+					  duration: 2000
+					});
 					return
 				}
 				if (this.checkedList.length > 1) {
-					this.$refs.uToast.show({
-						type: 'error',
-						message: '一次只能勾选一张证件!',
-					})
+					uni.showToast({
+					  icon:"none",
+					  title: '一次只能勾选一张证件',
+					  duration: 3000
+					});
 					return
 				}
 				this.show = true
@@ -426,19 +436,21 @@
 					certificateManagementInfo: JSON.stringify(this.shibieList)
 				}, failres => {
 					console.log('res+++++', failres.errmsg)
-					this.$refs.uToast.show({
-						type: 'error',
-						message: failres.errmsg,
-					})
+					uni.showToast({
+					  icon:"none",
+					  title: failres.errmsg,
+					  duration: 3000
+					});
 					uni.hideLoading()
 				}).then(res => {
-					this.$refs.uToast.show({
-						type: 'success',
-						message: '编辑成功',
-					})
+					uni.hideLoading()
+					uni.showToast({
+					  icon:"success",
+					  title: '编辑成功!',
+					  duration: 2000
+					});
 					this.credentialsShow = false
 					this.checkedList = []
-					uni.hideLoading()
 					this.mescroll.resetUpScroll()
 				})
 			},
@@ -465,10 +477,11 @@
 			},
 			add() {
 				if (!this.cardData.certificateImage) {
-					this.$refs.uToast.show({
-						type: 'error',
-						message: '请上传证件照片!',
-					})
+					uni.showToast({
+					  icon:"none",
+					  title: "请上传证件照片",
+					  duration: 2000
+					});
 					return
 				}
 				uni.showLoading({
@@ -478,19 +491,20 @@
 					certificateManagementInfo: JSON.stringify(this.cardData)
 				}, failres => {
 					console.log('res+++++', failres.errmsg)
-					this.$refs.uToast.show({
-						type: 'error',
-						message: failres.errmsg,
-					})
 					uni.hideLoading()
+					uni.showToast({
+					  icon:"none",
+					  title: failres.errmsg,
+					  duration: 3000
+					});
 				}).then(res => {
-
-					this.$refs.uToast.show({
-						type: 'success',
-						message: '提交成功',
-					})
 					// if (res.errno == 200) {
 					uni.hideLoading()
+					uni.showToast({
+					  icon:"success",
+					  title: '提交成功!',
+					  duration: 2000
+					});
 					this.fileList1 = []
 					this.addstatus = false
 					this.cardData = {
@@ -569,12 +583,13 @@
 					commonId: uni.getStorageSync("userInfo").id
 				}, failres => {
 					console.log('res+++++', failres.errmsg)
-					this.$refs.uToast.show({
-						type: 'error',
-						message: failres.errmsg,
-					})
-					this.mescroll.endBySize(curPageLen, totalPage)
 					uni.hideLoading()
+					uni.showToast({
+					  icon:"none",
+					  title: failres.errmsg,
+					  duration: 3000
+					});
+					this.mescroll.endBySize(curPageLen, totalPage)
 				}).then(res => {
 					console.log(res)
 					if (page.num == 1) this.cardList = [];

+ 31 - 42
xiaochengxu/pages/mySet/myHome.vue

@@ -56,25 +56,25 @@
 				<view class='content' v-else>{{companyData.scopeOfBusiness}}</view>
 			</view>
 			<view class='compInformation' v-if='!editstatus'>
-				<view class="row flex top-m align-item-center">
+				<view v-if="companyData.companyAddress" class="row flex top-m align-item-center">
 					<view class='image-wrap'>
 						<image style='width:24rpx;height:31rpx;'  src="../../static/imgs/mySet/home/address.png" mode=""></image>
 					</view>
 					<view>地址:{{companyData.companyAddress}}</view>
 				</view>
-				<view class="row flex top-m align-item-center">
+				<view v-if="companyData.phone" class="row flex top-m align-item-center">
 					<view class='image-wrap'>
 						<image style='width:27rpx;height:28rpx;' src="../../static/imgs/mySet/home/phone.png" mode=""></image>
 					</view>
 					<view>电话:{{companyData.phone}}</view>
 				</view>
-				<view class="row flex top-m align-item-center">
+				<view v-if="companyData.portraiture" class="row flex top-m align-item-center">
 					<view class='image-wrap'>
 						<image style='width:27rpx;height:28rpx;' src="../../static/imgs/mySet/home/portraiture.png" mode=""></image>
 					</view>
 					<view>座机:{{companyData.portraiture}}</view>
 				</view>
-				<view class="row flex top-m align-item-center">
+				<view v-if="companyData.postbox" class="row flex top-m align-item-center">
 					<view class='image-wrap'>
 						<image style='width:29rpx;height:25rpx;' src="../../static/imgs/mySet/home/postbox.png" mode=""></image>
 					</view>
@@ -188,11 +188,12 @@
 				}
 				this.$request.baseRequest('admin.unimall.personalHomepageInfo', type,data, failres => {
 					console.log('res+++++', failres.errmsg)
-					this.$refs.uToast.show({
-						type: 'error',
-						message: failres.errmsg,
-					})
 					uni.hideLoading()
+					uni.showToast({
+					  icon:"none",
+					  title: failres.errmsg,
+					  duration: 3000
+					});
 				}).then(res => {
 					console.log(res)
 					if(type=='list'){
@@ -267,18 +268,21 @@
 						personalHomepageInfo:JSON.stringify(this.companyData)
 					}, failres => {
 						console.log('res+++++', failres.errmsg)
-						this.$refs.uToast.show({
-							type: 'error',
-							message: failres.errmsg,
-						})
-						uni.hideLoading()
+						uni.showToast({
+						  icon:"none",
+						  title: failres.errmsg,
+						  duration: 3000
+						});
+
 					}).then(res => {
 						// if (res.errno == 200) {
 						uni.hideLoading()
-						this.$refs.uToast.show({
-							type: 'success',
-							message: '编辑成功',
-						})
+						uni.showToast({
+						  icon:"success",
+						  title: '编辑成功!',
+						  duration: 2000
+						});
+
 						this.getList()
 						// }
 					})
@@ -287,22 +291,20 @@
 						personalHomepageInfo:JSON.stringify(this.companyData)
 					}, failres => {
 						console.log('res+++++', failres.errmsg)
-						this.$refs.uToast.show({
-							type: 'error',
-							message: failres.errmsg,
-						})
 						uni.hideLoading()
+						uni.showToast({
+						  icon:"none",
+						  title: failres.errmsg,
+						  duration: 3000
+						});
 					}).then(res => {
-						// if (res.errno == 200) {
 						uni.hideLoading()
-						this.$refs.uToast.show({
-							type: 'success',
-							message: '提交成功',
-						})
-
+						uni.showToast({
+						  icon:"success",
+						  title: '提交成功!',
+						  duration: 2000
+						});
 						this.getList()
-						
-						// }
 					})
 				}
 				
@@ -349,19 +351,6 @@
 							resolve(result)
 						}
 					)
-					// let a = uni.uploadFile({
-					// 	url: 'http://192.168.2.21:7001/upload', // 仅为示例,非真实的接口地址
-					// 	filePath: url,
-					// 	name: 'file',
-					// 	formData: {
-					// 		user: 'test'
-					// 	},
-					// 	success: (res) => {
-					// 		setTimeout(() => {
-					// 			resolve(res.data.data)
-					// 		}, 1000)
-					// 	}
-					// });
 				})
 			},
 		}

+ 25 - 20
xiaochengxu/pages/mySet/myInfo.vue

@@ -628,11 +628,12 @@
 				this.$request.baseRequest('admin.unimall.cardManagementInfo', 'list', {
 					commonId: this.userInfo.id
 				}, failres => {
-					this.$refs.uToast.show({
-						type: 'error',
-						message: failres.errmsg,
-					})
 					uni.hideLoading()
+					uni.showToast({
+					  icon:"none",
+					  title: failres.errmsg,
+					  duration: 3000
+					});
 				}).then(res => {
 					this.cardList = res.data.items
 					setTimeout(()=>{
@@ -658,17 +659,19 @@
 					}
 				}
 				that.$request.baseRequest('admin.unimall.cardManagementInfo', 'delete', _data, failres => {
-					this.$refs.uToast.show({
-						type: 'error',
-						message: failres.errmsg,
-					})
 					uni.hideLoading()
+					uni.showToast({
+					  icon:"none",
+					  title: failres.errmsg,
+					  duration: 3000
+					});
 				}).then(res => {
 					this.isShowDel = false
-					this.$refs.uToast.show({
-						type: 'success',
-						message: '删除成功!',
-					})
+					uni.showToast({
+					  icon:"success",
+					  title: '删除成功!',
+					  duration: 2000
+					});
 					this.init()
 				})
 			},
@@ -688,15 +691,17 @@
 						id: val.id
 					})
 				}, failres => {
-					this.$refs.uToast.show({
-						type: 'error',
-						message: failres.errmsg,
-					})
 					uni.hideLoading()
+					uni.showToast({
+					  icon:"none",
+					  title: failres.errmsg,
+					  duration: 3000
+					});
 				}).then(res => {
-					this.$refs.uToast.show({
-						type: 'success',
-						message: '置顶成功!',
+					uni.showToast({
+					  icon:"success",
+					  title: '置顶成功!',
+					  duration: 2000
 					})
 					this.init()
 				})
@@ -875,7 +880,7 @@
 			.left {
 				position: absolute;
 				padding: 20rpx 0;
-				width: 310rpx;
+				width: 305rpx;
 				box-sizing: border-box;
 				display: flex;
 				justify-content: space-evenly;

+ 47 - 43
xiaochengxu/pages/mySet/mySet.vue

@@ -2,7 +2,8 @@
 	<view class="content">
 		<view class="content1 flex-between relative flex">
 			<view class="user flex">
-				<image :src="userInfo.head?userInfo.head:'../../static/imgs/mySet/head.png'" mode="widthFix" class="img" @click="editHead"></image>
+				<image :src="userInfo.head?userInfo.head:'../../static/imgs/mySet/head.png'" mode="widthFix" class="img"
+					@click="editHead"></image>
 				<view class="name">
 					{{userInfo.nickname}}
 				</view>
@@ -10,8 +11,8 @@
 			<view class="position">
 				<image @click='selectCard' src="../../static/imgs/mySet/share.png" mode="widthFix" class="right-img">
 
-				<image @click='selectCard1' src="../../static/imgs/mySet/ewm.png" mode="widthFix" class="right-img">
-				</image>
+					<image @click='selectCard1' src="../../static/imgs/mySet/ewm.png" mode="widthFix" class="right-img">
+					</image>
 			</view>
 		</view>
 		<view class="content2">
@@ -56,8 +57,8 @@
 				cardList: [],
 				canvasData: {},
 				currectData: {},
-				list:[],
-				index:0,
+				list: [],
+				index: 0,
 				selectCode: '',
 				show: false,
 				clicknum: 0,
@@ -110,24 +111,27 @@
 		beforeDestroy() {
 			this.show = false
 		},
-
+		onShow() {
+			this.userInfo = uni.getStorageSync("userInfo")
+		},
 		onLoad() {
 			that = this
 			this.userInfo = uni.getStorageSync("userInfo")
-			if(!this.userInfo.nickname){
+			if (!this.userInfo.nickname) {
 				let code = ""
-				for(var i=0;i<6;i++){
-				    code += parseInt(Math.random()*10);
+				for (var i = 0; i < 6; i++) {
+					code += parseInt(Math.random() * 10);
 				}
-				this.userInfo.nickname = 'user'+code
+				this.userInfo.nickname = 'user' + code
 				this.$request.baseRequest('commonUserApp', 'edit', {
 					commonUserInfo: JSON.stringify(this.userInfo)
 				}, failres => {
-					this.$refs.uToast.show({
-						type: 'error',
-						message: failres.errmsg,
-					})
 					uni.hideLoading()
+					uni.showToast({
+						icon: "none",
+						title: failres.errmsg,
+						duration: 3000
+					});
 				}).then(res => {
 					this.userInfo = res.data
 					uni.setStorageSync("userInfo", this.userInfo)
@@ -137,11 +141,13 @@
 				this.$request.baseRequest('admin.unimall.cardManagementInfo', 'list', {
 					commonId: this.userInfo.id
 				}, failres => {
-					this.$refs.uToast.show({
-						type: 'error',
-						message: failres.errmsg,
-					})
 					uni.hideLoading()
+					uni.showToast({
+						icon: "none",
+						title: failres.errmsg,
+						duration: 3000
+					});
+
 				}).then(res => {
 					this.list = res.data.items
 					this.cardList = [res.data.items]
@@ -188,25 +194,23 @@
 								that.$request.baseRequest('commonUserApp', 'edit', {
 									commonUserInfo: JSON.stringify(that.userInfo)
 								}, failres => {
-									that.$refs.uToast.show({
-										type: 'error',
-										message: failres.errmsg,
-									})
 									uni.hideLoading()
+									uni.showToast({
+									  icon:"none",
+									  title: failres.errmsg,
+									  duration: 3000
+									});
 								}).then(res => {
 									uni.setStorageSync("userInfo", that.userInfo)
-									let params = {
-										type: 'success',
-										message: "修改成功",
-										url: '/pages/mySet/mySet'
-									}
-									that.$refs.uToast.show({
-										...params,
-										complete() {
-											params.url && uni.switchTab({
-												url: params.url
-											})
-										}
+									uni.showToast({
+									  icon:"success",
+									  title: '修改成功!',
+									  duration: 2000,
+									  complete:function(){
+										  uni.switchTab({
+										  	url: "/pages/mySet/mySet"
+										  })
+									  }
 									})
 								})
 							}
@@ -219,18 +223,18 @@
 			},
 			selectCard() {
 
-				if(this.cardList[0].length>0){
-					this.index=0
+				if (this.cardList[0].length > 0) {
+					this.index = 0
 					this.cardChange({
 						value: this.cardList[[0]]
 					})
 				} else if (this.cardList[0].length == 0) {
-					this.$refs.uToast.show({
-						type: 'error',
-						message: '您还未创建名片',
+					uni.showToast({
+					  icon:"none",
+					  title: '您还未创建名片',
+					  duration: 3000
 					})
 				}
-
 			},
 			selectCard1() {
 				console.log(this.cardList[0])
@@ -272,7 +276,7 @@
 							'../../static/imgs/card/defaulthead.png',
 						shape: 'circle',
 						use: 'head',
-						imageType:this.currectData.headSculpture?'wl':'bd',
+						imageType: this.currectData.headSculpture ? 'wl' : 'bd',
 						x: 30,
 						y: 30,
 						width: 100,
@@ -525,8 +529,8 @@
 				// 生成成功,会把临时路径在这里返回
 				this.poster = url;
 				console.log(url)
-				if(this.index==0){
-					this.show=true
+				if (this.index == 0) {
+					this.show = true
 				}
 				// this.show=false
 				uni.hideLoading()

+ 22 - 16
xiaochengxu/pages/mySet/newCard.vue

@@ -299,11 +299,13 @@
 					dictType: "card_template"
 				}, failres => {
 					console.log('res+++++', failres.errmsg)
-					this.$refs.uToast.show({
-						type: 'error',
-						message: failres.errmsg,
-					})
 					uni.hideLoading()
+					uni.showToast({
+					  icon:"none",
+					  title: failres.errmsg,
+					  duration: 3000
+					});
+
 				}).then(res => {
 					console.log("img", res)
 					this.imgList = res.data.items
@@ -374,28 +376,32 @@
 				this.$request.baseRequest('admin.unimall.cardManagementInfo', 'add', {
 					cardManagementInfo: JSON.stringify(this.cardInfo)
 				}, failres => {
-					this.$refs.uToast.show({
-						type: 'error',
-						message: failres.errmsg,
-					})
+					uni.showToast({
+					  icon:"none",
+					  title: failres.errmsg,
+					  duration: 3000
+					});
+
 					uni.hideLoading()
 				}).then(res => {
 					this.isSubmit = false
-					this.$refs.uToast.show({
-						type: 'success',
-						message: '提交成功!',
-					})
+					uni.showToast({
+					  icon:"success",
+					  title: '保存成功!',
+					  duration: 2000
+					});
 					this.$request.baseRequest('admin.unimall.personalHomepageInfo', 'list', {
 						page: 1,
 						limit: 10,
 						commonId: uni.getStorageSync("userInfo").id
 					}, failres => {
 						console.log('res+++++', failres.errmsg)
-						this.$refs.uToast.show({
-							type: 'error',
-							message: failres.errmsg,
-						})
 						uni.hideLoading()
+						uni.showToast({
+						  icon:"none",
+						  title: failres.errmsg,
+						  duration: 3000
+						});
 					}).then(res => {
 						if (res.data.items.length > 0) {
 							uni.navigateBack()

+ 10 - 8
xiaochengxu/pages/mySet/set.vue

@@ -60,16 +60,18 @@
 					commonUserInfo: JSON.stringify(data)
 				}, failres => {
 					console.log('res+++++', failres.errmsg)
-					this.$refs.uToast.show({
-						type: 'error',
-						message: failres.errmsg,
-					})
+					uni.showToast({
+					  icon:"none",
+					  title: failres.errmsg,
+					  duration: 3000
+					});
 					uni.hideLoading()
 				}).then(res => {
-					this.$refs.uToast.show({
-						type: 'success',
-						message: '设置成功',
-					})
+					uni.showToast({
+					  icon:"success",
+					  title: '设置成功!',
+					  duration: 2000
+					});
 					let userInfo = uni.getStorageSync("userInfo")
 					if (status == 1) {
 						if (e) {