pages/baocun/index.vue

@@ -75,7 +75,8 @@ export default {
 			}],
 			typeclick1:6,//1加入购物车，2购物车，3前往购买，4,5
 			typeclick:7,//1加入购物车，2购物车，3前往购买，4,5
-			ids:[]
+			ids:[],
+			alldata:{}
 		};
 	},
 	onLoad(e) {
@@ -89,8 +90,6 @@ export default {
 	},
 	created() {
 		this.sys = uni.getSystemInfoSync();
-		this.getFl();
-		this.getCj();
 		this.fenleichange();
 	},
 	methods: {
@@ -107,6 +106,9 @@ export default {
 						that.list1=[];
 						for(let i=0;i<res.data.data.length;i++){
 							that.list1.push(res.data.data[i].scene_name)
+							if(res.data.data[i].id==that.alldata.scene_id){
+								that.activeIndex1=i
+							}
 						}
 						that.list1all=res.data.data;
 					}
@@ -152,12 +154,15 @@ export default {
 			}).then(res => {
 				if (res.data.code == 200) {
 					that.familyname=res.data.data.data.title;
+					that.alldata=res.data.data.data;
 					var datalist=res.data.data.details,datalist1=[];
 					for(let i=0;i<datalist.length;i++){
 						datalist1.push(datalist[i].goods)
 					}
 					uni.setStorageSync("datalist",datalist1)
 					that.huancun();
+					that.getFl();
+					that.getCj();
 				}else{
 					
 				}
@@ -172,14 +177,16 @@ export default {
 			}).then(res => {
 				console.log(res.data)
 				if (res.data.code == 200) {
-					let pages = getCurrentPages(); // 当前页面
-					let beforePage = pages[pages.length - 2]; // 前一个页面
-					uni.navigateBack({
-						delta: 1,
-						success: function() {
-							beforePage.$vm.shuaxin()
-						}
-					});
+					setTimeout(function(){
+						let pages = getCurrentPages(); // 当前页面
+						let beforePage = pages[pages.length - 2]; // 前一个页面
+						uni.navigateBack({
+							delta: 1,
+							success: function() {
+								beforePage.$vm.shuaxin()
+							}
+						});
+					},2000)
 					that.$refs.toast.show({model:'success',label:res.data.msg})
 				}else{
 					that.$refs.toast.show({model:'error',label:res.data.msg})
@@ -229,6 +236,9 @@ export default {
 						that.listfl=[];
 						for(let i=0;i<res.data.data.length;i++){
 							that.listfl.push(res.data.data[i].category_name)
+							if(res.data.data[i].id==that.alldata.category_id){
+								that.activeIndex=i
+							}
 						}
 						that.listflall=res.data.data;
 					}
@@ -248,7 +258,7 @@ export default {
 				category_id:that.listflall[that.activeIndex].id,
 				memberinfo_id:that.itemuser.id,
 				ids:this.ids,
-				scene_id:that.list1all[that.activeIndex5].id
+				scene_id:that.list1all[that.activeIndex1].id
 			}
 			if(this.off==1){
 				// 保存

pages/bianji/index.vue

@@ -60,7 +60,6 @@ export default {
 	},
 	created() {
 		this.sys = uni.getSystemInfoSync();
-		this.getFl();
 		this.getCj();
 	},
 	methods: {
@@ -121,11 +120,12 @@ export default {
 			this.yixuanor=e;
 			this.activeIndexfl=0;
 			if(e==0){
-				var id=this.listcjall[0].id;
-				this.getYxuan(id)
+				// var id=this.listcjall[0].id;
+				this.getCj();
 			}else{
-				var id=this.listflall[0].id;
-				this.getKxuan(id)
+				// var id=this.listflall[0].id;
+				this.getCj();
+				this.getFl();
 			}
 		},
 		getYxuan(id){

pages/bianjigh/index.vue

@@ -79,14 +79,7 @@ export default {
 				}).then(res => {
 					if (res.data.code == 200) {
 						setTimeout(function(){
-							let pages = getCurrentPages(); // 当前页面
-							let beforePage = pages[pages.length - 2]; // 前一个页面
-							uni.navigateBack({
-								delta: 1,
-								success: function() {
-									beforePage.$vm.initshow()
-								}
-							});
+							uni.navigateBack();
 						},2000)
 						that.$refs.toast.show({model:'success',label:res.data.msg})
 					}else{
@@ -101,14 +94,7 @@ export default {
 				}).then(res => {
 					if (res.data.code == 200) {
 						setTimeout(function(){
-							let pages = getCurrentPages(); // 当前页面
-							let beforePage = pages[pages.length - 2]; // 前一个页面
-							uni.navigateBack({
-								delta: 1,
-								success: function() {
-									beforePage.$vm.initshow()
-								}
-							});
+							uni.navigateBack();
 						},2000)
 						that.$refs.toast.show({model:'success',label:res.data.msg})
 					}else{

pages/changan/index.vue

@@ -9,7 +9,7 @@
 				<!-- <text @click="qiehuanFun" style="vertical-align: middle;" class="text-size-m">切换</text> -->
 			</view>
 			<view class="dingwei" v-if="itemuser==0">
-				<text style="vertical-align: middle;" class="text-size-m mr-20">暂无家庭成员去添加</text>
+				<text style="vertical-align: middle;" class="text-size-m mr-20 ml-20">暂无家庭成员去添加</text>
 				<image @click="tianjia" style="vertical-align: middle;" src="/static/img/42.png" mode="widthFix"></image>
 			</view>
 		</view>
@@ -24,6 +24,7 @@
 					<view :class="item.is_have==0?'text-gray':''" class="text-align-center text-size-m mt-6 mb-6">{{item.goods_name}}</view>
 					<view v-if="item.is_have==0" class="hui"></view>
 				</view>
+				<tm-empty v-if="quanbuList.length ==0" label="暂无数据" color="white" icon="icon-paperplane-fill"></tm-empty>
 				<view style="clear: both;"></view>
 				<view v-if="quanbuList.length<total" class="more ma-30 pt-40" @click="gengmore()">
 					<image src="/static/img/30.png" mode="widthFix"></image>

pages/chengyuan/index.vue

@@ -26,11 +26,11 @@
 						</view>
 					</view>
 					<view style="clear: both;"></view>
-					<view class="anniu">
-						<tm-button v-if="id != ''" @click="quxiao()" theme="gray" size="n">删除</tm-button>
-						<tm-button @click="tijiao()" class="fr" theme="primary" size="n">确认</tm-button>
+					<view class="anniu" v-if="id != ''">
+						<tm-button @click="quxiao()" theme="gray" size="n">删除</tm-button>
+						<tm-button @click="tijiao()" class="fr" theme="primary" size="n">保存</tm-button>
 					</view>
-					<!-- <tm-button :round="24" class="sao mb-40" style="margin-top: 50px;" @click="tijiao()" block>保存</tm-button> -->
+					<tm-button v-else @click="tijiao()" :round="24" class="sao mb-40" style="margin-top: 50px;" block>保存</tm-button>
 				</view>
 			</tm-sheet>
 		</div>
@@ -63,14 +63,13 @@ export default {
 		};
 	},
 	onLoad(e) {
-		
-		this.reqData.username=e.username;
-		this.reqData.weight=e.weight;
-		this.reqData.height=e.height;
-		this.reqData.body_type=e.body_type;
+		this.reqData.username=e.username?e.username:'';
+		this.reqData.weight=e.weight?e.weight:'';
+		this.reqData.height=e.height?e.height:'';
+		this.reqData.body_type=e.body_type?e.body_type:'';
 		this.id=e.id?e.id:'';
 		if(e.body_type){
-			this.reqData.body_arr.push(this.chelianglis[e.body_type])
+			this.reqData.body_arr.push(this.chelianglis[(e.body_type-1)])
 		}
 		console.log(this.id)
 	},
@@ -99,7 +98,7 @@ export default {
 				return;
 			}
 			if(this.reqData.body_arr.length !=0){
-				this.reqData.body_type=this.reqData.body_arr[0].id;
+				this.reqData.body_type=this.reqData.body_arr[0].data.id;
 			}
 			if(that.id){
 				this.reqData.id=that.id;
@@ -114,14 +113,10 @@ export default {
 			}).then(res => {
 				console.log(res.data)
 				if (res.data.code == 200) {
-					let pages = getCurrentPages(); // 当前页面
-					let beforePage = pages[pages.length - 2]; // 前一个页面
-					uni.navigateBack({
-						delta: 1,
-						success: function() {
-							beforePage.$vm.getDate()
-						}
-					});
+					setTimeout(function(){
+						uni.navigateBack();
+					},2000)
+					that.$refs.toast.show({model:'success',label:res.data.msg})
 				}else{
 					that.$refs.toast.show({model:'error',label:res.data.msg})
 				}
@@ -137,23 +132,27 @@ export default {
 			}).then(res => {
 				console.log(res.data)
 				if (res.data.code == 200) {
-					let pages = getCurrentPages(); // 当前页面
-					let beforePage = pages[pages.length - 2]; // 前一个页面
-					uni.navigateBack({
-						delta: 1,
-						success: function() {
-							beforePage.$vm.getDate()
-						}
-					});
+					setTimeout(function(){
+						uni.navigateBack();
+					},2000)
+					that.$refs.toast.show({model:'success',label:res.data.msg})
 				}else{
 					that.$refs.toast.show({model:'error',label:res.data.msg})
 				}
 			})
 		},
 		obTstr2(o){
+			console.log(o)
 			if(Array.isArray(o)){
 				if(o.length.length===0) return "";
-				return o[0]?.title??""
+				if(o[0].data){
+					var name=o[0].data.title;
+				}else if(o[0]){
+					var name=o[0].title;
+				}else{
+					var name='';
+				}
+				return name
 			}
 			return ''
 		},
@@ -223,4 +222,5 @@ export default {
 	/deep/ .quindex uni-button{background-color: #0A84FF !important;}
 	.anniu{width: 80%;margin: 0 auto;margin-top: 20px;}
 	/deep/ .anniu .gray.bk{color: white !important;}
+	.sao{width: 88%;margin: 0 auto;}
 </style>

pages/chuanghome/index.vue

@@ -54,12 +54,12 @@
 				<view v-if="active==3">
 					<view>
 						<view class="fl zuo" style="width:70px;">
-							<view class="flex-center flex-col mt-30" style="position: relative;" v-for="(item,index) in reqData.role">
+							<view class="flex-center flex-col" style="position: relative;width: 70px;height: 70px;" v-for="(item,index) in reqData.role">
 								<image @click="qiehuanren(index)" block v-if="index==0" mode="widthFix" src="/static/img/53.png"></image>
 								<image @click="qiehuanren(index)" block v-else mode="widthFix" src="/static/img/61.png"></image>
-								<tm-badges icon="icon-times" @click="shanchu(item.timestamp)" v-if="(show==index && index !=0)"></tm-badges>
+								<image src="/static/icon/error.png" class="error" @click="shanchu(item.timestamp)" v-if="(show==index && index !=0)"></image>
 							</view>
-							<view class="flex-center flex-col mt-30" style="position: relative;" v-if="reqData.role.length<4">
+							<view class="flex-center flex-col" style="position: relative;margin-top: 40px;" v-if="reqData.role.length<4">
 								<image block mode="widthFix" src="/static/img/54.png" @click="add()"></image>
 							</view>
 						</view>
@@ -68,7 +68,7 @@
 							<tm-input  :required="true"  title="身高（cm）" v-model="item1.height" align="right"></tm-input>
 							<tm-input  :required="true"  title="体重（kg）" v-model="item1.weight" align="right"></tm-input>
 							<tm-pickers class="tan" :default-value.sync="item1.body_arr" rang-key="title" :list="chelianglis">
-								<tm-input name="shencai" title="身材" placeholder="请选择车型" disabled :value="obTstr2(item1.body_arr)" right-icon="icon-angle-right"></tm-input>
+								<tm-input name="shencai" title="身材" placeholder="请选择身材" disabled :value="obTstr2(item1.body_arr)" right-icon="icon-angle-right"></tm-input>
 							</tm-pickers>
 						</view>
 					</view>
@@ -168,16 +168,14 @@ export default {
 					return;
 				}
 				if(arr[i].body_arr.length !=0){
-					arr[i].body_type=arr[i].body_arr[0].id;
+					arr[i].body_type=arr[i].body_arr[0].data.id;
 				}
 			}
-			console.log(this.reqData)
 			myRequest({
 				url: "/api/Family/addFamilyMember",
 				method:'post',
 				data:that.reqData
 			}).then(res => {
-				console.log(res.data)
 				if (res.data.code == 200) {
 					uni.setStorageSync("family_id",res.data.data.family_id)
 					that.$refs.toast.show({model:'success',label:res.data.msg})
@@ -211,12 +209,12 @@ export default {
 		obTstr2(o){
 			if(Array.isArray(o)){
 				if(o.length.length===0) return "";
-				return o[0]?.title??""
+				var name=o[0]?o[0].data.title:'';
+				return name
 			}
 			return ''
 		},
 		querentm(e){
-			console.log(e)
 			this.reqData.wardrode_no=e;
 			this.active=2;
 		},
@@ -269,7 +267,7 @@ export default {
 	.shuru{border:1px solid #303030;border-radius: 10px;}
 	/deep/ .shuru .text-primary.bk{color:#303030 !important;}
 	/deep/ .shuru .border-grey-darken-4-b-1{border-bottom:none !important;}
-	.zuo image{width:60px;display: block;}
+	.zuo image{width:60px;display: block;position: absolute}
 	.you{border:1px solid #303030;border-radius: 10px;padding:10px;height: 300px;}
 	/deep/ .you .grey-darken-5{
 		background-color: #0d0d0d!important;
@@ -282,7 +280,9 @@ export default {
 	/deep/ .you .border-grey-darken-4-b-1 {
 	    border-bottom: solid 1px #313131 !important;
 	}
-	/deep/ .tm--badges{position: absolute;top: 0px;right:6px}
+	/deep/ .tm--badges{position: absolute;top: 0px !important;right:6px;width: 18px;height: 18px;}
 	.logincla{margin-top: 100px;}
 	/deep/ .quindex uni-button{background-color: #0A84FF !important;}
+	.error{height:18px !important;width: 18px !important;right: 3px !important;top:6px !important}
+	
 </style>

pages/dapei/index.vue

@@ -99,6 +99,9 @@ export default {
 	onLoad(e) {
 		
 	},
+	onShow(){
+		
+	},
 	created() {
 		this.sys = uni.getSystemInfoSync();
 		this.gettianqi();

pages/genghuan/index.vue

@@ -116,14 +116,7 @@ export default {
 					if(datalist[i].id==this.id){
 						datalist[i]=this.quanbuList[this.itemoff];
 						uni.setStorageSync("datalist",datalist)
-						let pages = getCurrentPages(); // 当前页面
-						let beforePage = pages[pages.length - 2]; // 前一个页面
-						uni.navigateBack({
-							delta: 1,
-							success: function() {
-								beforePage.$vm.huancun()
-							}
-						});
+						uni.navigateBack();
 					}
 				}
 				return
@@ -134,15 +127,10 @@ export default {
 				data:{y_id:that.id,g_id:id}
 			}).then(res => {
 				if (res.data.code == 200) {
+					setTimeout(function(){
+						uni.navigateBack();
+					},2000)
 					that.$refs.toast.show({model:'success',label:res.data.msg})
-					let pages = getCurrentPages(); // 当前页面
-					let beforePage = pages[pages.length - 2]; // 前一个页面
-					uni.navigateBack({
-						delta: 1,
-						success: function() {
-							beforePage.$vm.getDate()
-						}
-					});
 				}else{
 					that.$refs.toast.show({model:'error',label:res.data.msg})
 				}

pages/index/index.vue

@@ -597,4 +597,5 @@
 	/deep/ .zhuti .tm-grid{min-height: 70px !important;}
 	/deep/ .zhuti .bushan1{min-height: 160px !important;}
 	/deep/ .zhuti .bushan2{min-height: 157px !important;}
+	/deep/ .uni-tabbar{background-color: #1B1B1B !important;}
 </style>

pages/luru/index.vue

@@ -28,11 +28,8 @@
 				<view v-if="active==2">
 					<image block class="nicheng" mode="widthFix" :src="koutu"></image>
 					<view class="you black mt-30">
-						<!-- <tm-pickers v-for="item in arrbig" class="tan" :default-value.sync="item.choosevalue" rang-key="category_name" list="[]">
-							<tm-input title="分类" placeholder="请选择分类" disabled :value="obTstrnew(category_danarr,'')" right-icon="icon-angle-right"></tm-input>
-						</tm-pickers> -->
 						<view v-for="(item,index) in arrbig">
-							<tm-pickers v-if="item.type=='select'"  @confirm="xuanze" :indexfu="item.name" :list="item.value">
+							<tm-pickers class="tan" v-if="item.type=='select'"  @confirm="xuanze" :indexfu="item.name" :list="item.value">
 								<tm-input :title="item.name" align="right" :placeholder="'请选择'+item.name" v-model="item.choosevalue" disabled right-icon="icon-angle-right"></tm-input>
 							</tm-pickers>
 							<tm-input v-if="item.type=='text' && item.name !='颜色'" :title="item.name" v-model="item.choosevalue" align="right"></tm-input>
@@ -44,31 +41,6 @@
 								</view>
 							</view>
 						</view>
-						
-						<!-- <tm-listitem
-							v-for="item in arrbig"
-							:left-icon-size="80"
-							value="打开"
-							title="支付"
-							label="微信和支付宝微信和支付宝微信和支付宝微信和支付宝"
-							left-icon="https://cdn.roundicons.com/wp-content/uploads/2017/09/Lego-freebie-icon.png"
-							show-left-icon
-						></tm-listitem> -->
-						<!-- <tm-input :required="true" title="商品名称" v-model="reqData.goods_name" align="right"></tm-input> -->
-						<!-- <tm-pickers class="tan" :default-value.sync="category_danarr" rang-key="category_name" :list="category_arr">
-							<tm-input :required="true" title="分类" placeholder="请选择分类" :value="obTstr1(category_danarr,'category_name')" right-icon="icon-angle-right"></tm-input>
-						</tm-pickers> -->
-						<!-- <tm-pickers class="tan" :default-value.sync="role_danarr" rang-key="username" :list="role_arr">
-							<tm-input title="所属成员" :required="true" placeholder="请选择所属成员" disabled :value="obTstr3(role_danarr)" right-icon="icon-angle-right"></tm-input>
-						</tm-pickers> -->
-						<!-- <tm-input title="年份" v-model="reqData.year" align="right"></tm-input>
-						<tm-input title="颜色" v-model="reqData.color" align="right"></tm-input>
-						<tm-pickers class="tan" :default-value.sync="size_danarr" rang-key="title" :list="size_arr">
-							<tm-input title="尺码" placeholder="请选择尺码" disabled :value="obTstr2(size_danarr)" right-icon="icon-angle-right"></tm-input>
-						</tm-pickers>
-						<tm-input title="适用人群" v-model="reqData.type" align="right"></tm-input>
-						<tm-input title="品牌" v-model="reqData.brand" align="right"></tm-input>
-						<tm-input title="材料" v-model="reqData.science" align="right"></tm-input> -->
 					</view>
 					<tm-button :round="24" class="sao mb-40 mt-40" @click="chuangjianFun()" block>提交</tm-button>
 				</view>
@@ -109,33 +81,8 @@ export default {
 			arrbig:[],
 			koutu:'/static/img/53.png',
 			active:1,
-			category_arr:[],
-			category_danarr:[],
-			size_arr:[
-				{title:"S",id:1},
-				{title:"M",id:2},
-				{title:"L",id:3},
-				{title:"XL",id:4},
-				{title:"XXL",id:5},
-				{title:"其他",id:6},
-			],
-			size_danarr:[],
 			role_arr:[],
-			role_danarr:[],
-			reqData:{
-				goods_name:'',
-				category_id:'',
-				year:'',
-				color:'',
-				image:'',
-				type:'',
-				thumb:'',
-				size:'',
-				brand:'',
-				science:'',
-				role_id:'',
-				fenlei:[]
-			},
+			fenlei:[],
 		};
 	},
 	onLoad() {
@@ -143,9 +90,7 @@ export default {
 	},
 	created() {
 		this.sys = uni.getSystemInfoSync();
-		this.getFl();
 		this.getCY();
-		this.jiaobenFun()
 	},
 	methods: {
 		/* 显示获取颜色选择弹窗 */
@@ -159,37 +104,17 @@ export default {
 			/* 判断颜色值是否有效 */
 			if(color){
 				this.buttonColor=color;
-				console.log('选择的颜色值是：'+color);
 			}
 		},
 		showPickerColorPop(){
 			this.showPickerColor=true;
 		},
 		xuanze(data){
-			// var index=data[0].index;
-			// this.arrbig[index].choosevalue=data[0].data;
 			for(let i=0;i<this.arrbig.length;i++){
 				if(this.arrbig[i].name==data[0].name){
 					this.arrbig[i].choosevalue=data[0].data
 				}
 			}
-			console.log(data)
-			// console.log(this.arrbig)
-		},
-		getFl(){
-			var that=this;
-			myRequest({
-				url: "/api/Category/list",
-				method:'post',
-				data:{}
-			}).then(res => {
-				console.log(res.data)
-				if (res.data.code == 200) {
-					this.category_arr=res.data.data;
-				}else{
-					that.category_arr=[];
-				}
-			})
 		},
 		getCY(){
 			var that=this;
@@ -261,7 +186,7 @@ export default {
 			myRequest({
 				url: "/api/Goods/selectScript",
 				method:'post',
-				data:that.reqData
+				data:''
 			}).then(res => {
 				if (res.data.code == 200) {
 					// var arrbig=[
@@ -274,14 +199,21 @@ export default {
 					myRequest({
 						url: "/api/Category/list",
 						method:'post',
-						data:that.reqData
+						data:''
 					}).then(res => {
 						if (res.data.code == 200) {
-							var valuearr=[];
+							var valuearr=[],rolevaluearr=[];
 							for(let i=0;i<res.data.data.length;i++){
 								valuearr.push(res.data.data[i].category_name)
 							}
-							var arrsmall=[{name:"分类",value:valuearr,choosevalue:'',type:'select',classid:''}];
+							for(let i=0;i<that.role_arr.length;i++){
+								rolevaluearr.push(that.role_arr[i].username)
+							}
+							
+							var arrsmall=[
+								{name:"分类",value:valuearr,choosevalue:'',type:'select',classid:''},
+								{name:"所属成员",value:rolevaluearr,choosevalue:'',type:'select',classid:''},
+							];
 							that.arrbig=arrsmall.concat(that.arrbig)
 							that.fenlei=res.data.data;
 							that.active=2;
@@ -297,7 +229,6 @@ export default {
 		},
 		getBase64Image(path){
 			var that=this;
-			console.log(" 开始转换")
 			pathToBase64(path)
 			  .then(base64 => {
 			   that.shibie(base64)
@@ -335,36 +266,26 @@ export default {
 					that.$refs.toast.show({model:'warn',label:'请将数据填写完整'})
 					return
 				}
-				// 这里写循环放id
+			}
+			// 分类id
+			for(let i=0;i<that.fenlei.length;i++){
+				if(that.fenlei[i].category_name==that.arrbig[0].choosevalue){
+					that.arrbig[0].classid=that.fenlei[i].id
+				}
+			}
+			// 成员id
+			for(let i=0;i<that.role_arr.length;i++){
+				if(that.role_arr[i].category_name==that.arrbig[0].choosevalue){
+					that.arrbig[0].classid=that.role_arr[i].id
+				}
 			}
 			console.log(that.arrbig)
-			// if(that.reqData.goods_name==""){
-			// 	that.$refs.toast.show({model:'warn',label:'请输入商品名称'})
-			// 	return
-			// }
-			// if(that.category_danarr.length==0){
-			// 	that.$refs.toast.show({model:'warn',label:'请选择分类'})
-			// 	return
-			// }else{
-			// 	that.reqData.category_id=that.category_danarr[0].id
-			// }
-			// if(that.role_danarr.length==0){
-			// 	that.$refs.toast.show({model:'warn',label:'请选择成员'})
-			// 	return
-			// }else{
-			// 	that.reqData.role_id=that.role_danarr[0].id
-			// }
-			// if(that.size_danarr.length!=0){
-			// 	that.reqData.size=that.size_danarr[0].id
-			// }
 			// that.reqData.image=that.koutu;
-			// that.reqData.thumb=that.koutu;
 			// myRequest({
 			// 	url: "/api/Goods/addGodds",
 			// 	method:'post',
 			// 	data:that.reqData
 			// }).then(res => {
-			// 	console.log(res.data)
 			// 	if (res.data.code == 200) {
 			// 		that.active=3;
 			// 	}else{

pages/qiehuan/index.vue

@@ -22,7 +22,7 @@
 						<image v-else class="ml-20" style="vertical-align: middle;" src="/static/img/61.png" mode="widthFix"></image>
 						<text style="vertical-align: middle;" class="text-size-g text-white">{{item.username}}</text>
 					</view>
-					<view @click="qiehuanFun(item,index)">
+					<view @click="qiehuanFun(item)">
 						<text v-if="item.checked==1" class="text-size-g you" style="vertical-align: middle;">（当前用户）</text>
 						<tm-checkbox class="you" v-model="item.checked" label=""></tm-checkbox>
 					</view>
@@ -52,7 +52,7 @@ export default {
 	onLoad() {
 		
 	},
-	created() {
+	onShow() {
 		this.sys = uni.getSystemInfoSync();
 		if(uni.getStorageSync("itemuser")){
 			
@@ -80,17 +80,9 @@ export default {
 				data:{family_id:uni.getStorageSync("family_id"),id:item.id}
 			}).then(res => {
 				if (res.data.code == 200) {
-					let pages = getCurrentPages(); // 当前页面
-					let beforePage = pages[pages.length - 2]; // 前一个页面
-					console.log(beforePage)
-					uni.navigateBack({
-						delta: 1,
-						success: function() {
-							beforePage.$vm.qingkong()
-						}
-					});
+					uni.navigateBack();
 				}else{
-					
+					uni.navigateBack();
 				}
 			})
 		},

pages/user/index.vue

@@ -71,6 +71,7 @@ export default {
 			{title:'我的关注',type:'5'},
 			// {title:'系统通知',type:'6'},
 			// {title:'历史记录',type:'7'},
+			{title:'创建家庭',type:'8'},
 			{title:'内容推送',type:'9'},
 			]
 		};

pages/wardrobe/index.vue

@@ -67,11 +67,11 @@
 					<view v-if="item.is_have==0" class="hui"></view>
 				</view>
 				<view style="clear: both;"></view>
-				<view v-if="quanbuList.length<total" class="more ma-30 pt-40" @click="gengmore()">
+				<tm-empty v-if="wushuju" label="暂无数据" color="white" icon="icon-paperplane-fill"></tm-empty>
+				<!-- <view v-if="gengduo" class="more ma-30 pt-40" @click="gengmore()">
 					<image src="/static/img/30.png" mode="widthFix"></image>
 					<text class="text-size-s">下拉加载更多~</text>
-				</view>
-				<tm-empty v-if="quanbuList.length ==0" label="暂无数据" color="white" icon="icon-paperplane-fill"></tm-empty>
+				</view> -->
 			</tm-sheet>
 		</view>
 		<!-- 待取衣服 -->
@@ -118,6 +118,8 @@ export default {
 	data() {
 		return {
 			listqiu:[],
+			wushuju:false,
+			gengduo:false,
 			offset: [0, 0],
 			show_1:false,
 			pos:'center',
@@ -148,18 +150,16 @@ export default {
 			})
 		}
 	},
+	onShow() {
+		this.quanbuList=[];
+		this.fenleichange();
+		this.getfenltext();
+	},
 	created() {
 		this.sys = uni.getSystemInfoSync();
-		this.getfenltext()
-		this.fenleichange();
 		this.getQiu()
 	},
 	methods: {
-		qingkong(){
-			this.quanbuList=[];
-			this.fenleichange();
-			this.getfenltext();
-		},
 		qiehuanLb(e){
 			var that=this;
 			this.current=e;
@@ -215,11 +215,19 @@ export default {
 				if (res.data.code == 200) {
 					that.quanbuchang=res.data.data.chang;
 					that.quanbuList=that.quanbuList.concat(res.data.data.data);
+					if(that.quanbuList.length==0){
+						that.wushuju=true
+					}else{
+						that.wushuju=false
+					}
 					that.total=res.data.data.total;
 					that.count=res.data.data.count;
 					that.have=res.data.data.have;
 				}else{
 					that.quanbuList=[];
+					if(that.quanbuList.length==0){
+						that.wushuju=true
+					}
 				}
 			})
 		},
@@ -378,7 +386,7 @@ export default {
 	/deep/ .lunbo1{margin:0 !important;padding: 4px !important;margin-top: 5px !important;width: 46.6% !important;}
 	.tuijiantp{width: 100%;}
 	.tuijiantp image{width: 76px !important;height: 76px !important;}
-	.yichu{margin:0 !important;padding: 4px !important;margin-top: 10px !important;}
+	.yichu{margin:0 !important;padding: 4px !important;margin-top: 10px !important;min-height: 235px !important;}
 	/deep/ .qiehuan .text-white{
 		font-size: 14px;
 		background: #303440;