修改bug

pages/bianji/index.vue

@@ -28,7 +28,7 @@
 					<text class="text-size-s">下拉加载更多~</text>
 				</view> -->
 			</tm-sheet>
-			<tm-button @click="shanchu" v-if="yixuanor==0 && yixuanList.length !=0" theme="gray" :round="24" class="sao mb-40" block>取消删除</tm-button>
+			<tm-button @click="shanchu" v-if="yixuanor==0 && yixuanList.length !=0" theme="gray" :round="24" class="sao mb-40" block>取消预约</tm-button>
 			<tm-button @click="yuyue" v-if="yixuanor==1" :round="24" class="sao mb-40" block>预约</tm-button>
 		</div>
 		<!-- 弹出层消息 -->
@@ -61,6 +61,7 @@ export default {
 	created() {
 		this.sys = uni.getSystemInfoSync();
 		this.getCj();
+		this.getFl();
 	},
 	methods: {
 		shanchu(){
@@ -78,7 +79,8 @@ export default {
 				if (res.data.code == 200) {
 					that.$refs.toast.show({model:'success',label:res.data.msg})
 					that.chooseindex=-1;
-					that.getCj();
+					that.getFl();
+					this.getCj();
 				}else{
 					that.$refs.toast.show({model:'error',label:res.data.msg})
 				}
@@ -101,6 +103,7 @@ export default {
 					that.$refs.toast.show({model:'success',label:'预约成功'})
 					that.chooseindex=-1;
 					that.getFl();
+					this.getCj();
 				}else{
 					that.$refs.toast.show({model:'error',label:res.data.msg})
 				}
@@ -119,14 +122,14 @@ export default {
 			this.chooseindex=-1;
 			this.yixuanor=e;
 			this.activeIndexfl=0;
-			if(e==0){
-				// var id=this.listcjall[0].id;
-				this.getCj();
-			}else{
-				// var id=this.listflall[0].id;
-				this.getCj();
-				this.getFl();
-			}
+			// if(e==0){
+			// 	// var id=this.listcjall[0].id;
+			// 	this.getCj();
+			// }else{
+			// 	// var id=this.listflall[0].id;
+			// 	this.getCj();
+			// 	this.getFl();
+			// }
 		},
 		getYxuan(id){
 			var that=this;

pages/chuanghome/index.vue

@@ -149,12 +149,15 @@ export default {
 			})
 		},
 		quindex(){
+			uni.setStorageSync("shuaxin", 1); //赋值
 			uni.switchTab({
 				url: "/pages/wardrobe/index",
 				success: function (e) {
-					var page = getCurrentPages()[0]
-					if (page == undefined || page == null) return;
-					page.shuaxin(); 
+					
+					// var page = getCurrentPages()[0]
+					// console.log(page)
+					// if (page == undefined || page == null) return;
+					// page.created(); 
 				 }
 			})
 		},

pages/dapei/index.vue

@@ -104,14 +104,14 @@ export default {
 		
 	},
 	onShow(){
-		
+		this.getFl();
+		this.touFun();
+		this.getCity()
 	},
 	created() {
 		this.sys = uni.getSystemInfoSync();
 		this.gettianqi();
-		this.getFl();
-		this.touFun();
-		this.getCity()
+		
 	},
 	methods: {
 		getCity(){

pages/dizhi/index.vue

@@ -7,6 +7,7 @@
 					<text> {{item.name}}</text>
 					<text class="ml-40 text-gray text-size-m">{{item.mobile}}</text>
 					<tm-button class="ml-50" :round="10" theme="gray" size="s">{{item.label}}</tm-button>
+					<tm-button class="ml-10" :round="10" size="s" v-if="item.default_address==1">默认</tm-button>
 				</view>
 				<view class="text-gray text-size-s mt-15">
 					<text>{{item.region}} {{item.address}}</text>

pages/guanzhu/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view :style="{ minHeight: sys.windowHeight + 'px' }"
 		:class="[$tm.vx.state().tmVuetify.black ? 'black' : ' ']">
-		<tm-menubars title="消息列表" :shadow="0" :showback="true"></tm-menubars>
+		<tm-menubars title="我的关注" :shadow="0" :showback="true"></tm-menubars>
 		<div class="zhuti">
 			<tm-sheet class="kuang" style="padding-bottom: 70px !important;">
 				<view style="width: 94%;margin:0 auto;">

pages/index/index.vue

@@ -2,7 +2,7 @@
 	<view :style="{ minHeight: sys.windowHeight + 'px' }" :class="[$tm.vx.state().tmVuetify.black ? 'black' : ' ']">
 		<tm-menubars title="" :shadow="0" :showback="false"></tm-menubars>
 		<view class="C1b1b1b">
-			<tm-search v-model="soso" color="white" confirm-text="" @click="sosoFun">
+			<tm-search disabled="true" v-model="soso" color="white" confirm-text="" @click="sosoFun">
 				<!-- <template #right>
 					<view class="xiangji">
 						<image src="/static/img/xiangji.png" mode="widthFix"></image>
@@ -10,7 +10,7 @@
 				</template> -->
 			</tm-search>
 			<view class="dingwei">
-				<tm-quickCity color="blue" v-model="offshow"  :defaultValue.sync="defaultValue" @change="qiehuandizhi">
+				<tm-quickCity color="blue" v-model="offshow"  @change="qiehuandizhi">
 					<image style="vertical-align: middle;" src="/static/img/dingwei.png" mode="widthFix"></image>
 					<text style="vertical-align: middle;" class="text-size-g">{{chengshi}}</text>
 				</tm-quickCity>
@@ -64,7 +64,7 @@
 						</image>
 					</tm-translate>
 					<view class="bbb">
-						<tm-swiper @click="tiao" class="aaa" :previmage="false" :noSwiping="true" :current="current1"
+						<tm-swiper @click="tiao()" class="aaa" :previmage="false" :noSwiping="true" :current="current1"
 							:autoplay="false" :list="list1"></tm-swiper>
 					</view>
 					<tm-translate class="a_1" ref="a_4" :auto="true" :duration="80" animation-name="zoomIn"
@@ -169,19 +169,7 @@
 				list3: [],
 				top: 60,
 				sys: null,
-				list2: [{
-					img: '/static/img/39.png',
-					title: '单品推荐',
-					text: '3.9万人追捧'
-				}, {
-					img: '/static/img/37.png',
-					title: '单品推荐',
-					text: '3.9万人追捧'
-				}, {
-					img: '/static/img/38.png',
-					title: '单品推荐',
-					text: '3.9万人追捧'
-				}],
+				list2: [],
 				list: [],
 				list1: [],
 				current: 0,
@@ -400,7 +388,8 @@
 					url: "/pages/shouyedetail/index?id="+id,
 				})
 			},
-			tiao() {
+			tiao(e) {
+				console.log(e)
 				uni.navigateTo({
 					url: "/pages/bianji/index",
 				})

pages/shop/index.vue

@@ -10,7 +10,7 @@
 						<tm-icons :size="24" color="white" name="icon-angle-down"></tm-icons>
 					</view>
 				</tm-pickersCity>
-				<tm-search v-model="soso" class="fr shuruk" color="white" confirm-text="" @click="sosoFun"></tm-search>
+				<tm-search disabled="true" v-model="soso" class="fr shuruk" color="white" confirm-text="" @click="sosoFun"></tm-search>
 			</view>
 			<view style="clear: both;"></view>
 		</view>

pages/shouhuodi/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<view :style="{ minHeight: sys.windowHeight + 'px' }" :class="[$tm.vx.state().tmVuetify.black ? 'black' : ' ']">
-		<tm-menubars title="消息列表" :shadow="0" :showback="true"></tm-menubars>
+		<tm-menubars title="地址管理" :shadow="0" :showback="true"></tm-menubars>
 		<div>
 			<tm-sheet class="kuang" style="padding-bottom: 40px !important;">
 				<view style="width: 94%;margin:0 auto;">
@@ -8,12 +8,9 @@
 					<tm-input title="手机号码" placeholder="填写收件人手机号码" v-model="dizhi.mobile"></tm-input>
 					<tm-pickersCity @confirm="dateSe_3" :default-value="d_3" btn-color="bg-gradient-deep-purple-accent"
 						style="margin:0 16px 0px;box-sizing: border-box;">
-						<tm-button class="xuanze" theme="bg-gradient-deep-purple-accent"
-							style="padding-left: 0px!important;margin-left:0px;border-bottom: 1px solid  #303030!important;">
-							<tm-input style="padding: 0px 60px 0px 0px!important;margin-left: 0!important;" title="所在地区"
-								placeholder="省市区县、乡镇等" v-model="dizhi.region" @click="dateSe_3">
-							</tm-input>
-						</tm-button>
+						<tm-input style="padding: 0px 60px 0px 0px!important;margin-left: 0!important;" title="所在地区"
+							placeholder="省市区县、乡镇等" v-model="dizhi.region" @click="dateSe_3">
+						</tm-input>
 					</tm-pickersCity>
 					<tm-input title="详细地址" placeholder="街道、楼牌号等" v-model="dizhi.address"></tm-input>
 				</view>
@@ -160,14 +157,15 @@
 								model: 'successs',
 								label: res.data.msg
 							})
-							// uni.showToast({
-							// 	title: res.data.msg,
-							// 	icon: 'success'
-							// })
 							setTimeout(() => {
-								uni.navigateTo({
-									url: '/pages/dizhi/index'
-								})
+								let pages = getCurrentPages(); // 当前页面
+								let beforePage = pages[pages.length - 2]; // 前一个页面
+								uni.navigateBack({
+									delta: 1,
+									success: function() {
+										beforePage.$vm.getAddList()
+									}
+								});
 							}, 800)
 						} else {
 							that.$refs.toast.show({
@@ -236,9 +234,14 @@
 							icon: 'success'
 						})
 						setTimeout(() => {
-							uni.navigateTo({
-								url: '/pages/dizhi/index'
-							})
+							let pages = getCurrentPages(); // 当前页面
+							let beforePage = pages[pages.length - 2]; // 前一个页面
+							uni.navigateBack({
+								delta: 1,
+								success: function() {
+									beforePage.$vm.getAddList()
+								}
+							});
 						}, 800)
 					} else {
 						that.$refs.toast.show({

pages/shouyedetail/index.vue

@@ -4,7 +4,7 @@
 		<tm-menubars title="详情" :shadow="0" :showback="true"></tm-menubars>
 		<image class="touimg" :src="moren" mode="widthFix"></image>
 		<view class="qiehuancla">
-			<view :class="index==0?'border':'border1'" class="da" v-for="(item,index) in datall.atlas_thumb" @click="qiehuan(index,item)">
+			<view :class="chooseindex==index?'border':'border1'" class="da" v-for="(item,index) in datall.atlas_thumb" @click="qiehuan(index,item)">
 				<image class="xiaoimg" :src="item"></image>
 				<image v-if="index==chooseindex" class="sanjiao" src="/static/img/93.png" mode="widthFix"></image>
 			</view>
@@ -61,6 +61,7 @@ import{myRequest} from '@/api/request.js'
 export default {
 	data() {
 		return {
+			dangqianindex:0,
 			index:0,
 			shoucangsrc:true,
 			dianzan:true,

pages/sort/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<view :style="{ minHeight: sys.windowHeight + 'px' }" :class="[$tm.vx.state().tmVuetify.black ? 'black' : ' ']">
-		<tm-menubars title="消息列表" :shadow="0" :showback="true"></tm-menubars>
+		<tm-menubars title="分类列表" :shadow="0" :showback="true"></tm-menubars>
 		<div class="zhuti">
 			<tm-sheet class="kuang" style="padding-bottom: 30px !important;" v-if="listdata.length!=0" >
 				<view style="width: 94%;margin:0 auto;" class="remen">

pages/wardrobe/index.vue

@@ -2,7 +2,7 @@
 	<view :style="{ minHeight: sys.windowHeight + 'px' }" :class="[$tm.vx.state().tmVuetify.black ? 'black' : ' ']">
 		<tm-menubars title="" :shadow="0" :showback="false"></tm-menubars>
 		<view class="C1b1b1b">
-			<tm-search @click="sosoFun" v-model="soso" color="white" confirm-text=""></tm-search>
+			<tm-search @click="sosoFun" disabled="true" v-model="soso" color="white" confirm-text=""></tm-search>
 			<view class="dingwei" v-if="itemuser!=0">
 				<image class="touxiang" style="vertical-align: middle;" src="/static/img/41.png" mode="widthFix"></image>
 				<text style="vertical-align: middle;" class="text-size-m mr-20">{{itemuser.username}}的衣橱</text>
@@ -68,10 +68,10 @@
 				</view>
 				<view style="clear: both;"></view>
 				<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()">
+				<view v-if="total>quanbuList.length" style="clear: both;" class="more ma-40 pt-40" @click="gengmore()">
 					<image src="/static/img/30.png" mode="widthFix"></image>
 					<text class="text-size-s">下拉加载更多~</text>
-				</view> -->
+				</view>
 			</tm-sheet>
 		</view>
 		<!-- 待取衣服 -->
@@ -131,7 +131,7 @@ export default {
 			listlx:[],
 			quanbuList:[],
 			list1:[],
-			pagesize:6,
+			pagesize:9,
 			page:1,
 			total:0,
 			count:0,
@@ -142,24 +142,24 @@ export default {
 			quanbuchang:[]
 		};
 	},
-	onLoad() {
+	onLoad(e) {
 		this.offset = [16, 99]
 		if(!uni.getStorageSync("token")){
 			uni.navigateTo({
 				url: "/pages/login/index",
 			})
 		}
+		
 	},
 	onShow(){
-		// this.fenleichange();
-	},
-	created() {
 		this.sys = uni.getSystemInfoSync();
 		this.getQiu()
-		this.quanbuList=[];
 		this.fenleichange();
 		this.getfenltext();
 	},
+	created() {
+		
+	},
 	methods: {
 		shuaxin(){
 			this.quanbuList=[];
@@ -290,6 +290,7 @@ export default {
 		},
 		fenleichange(){
 			var that=this;
+			console.log("11199")
 			myRequest({
 				url: "/api/MemberInfo/getFamilyMember",
 				method:'post',