1

api/request.js

@@ -24,7 +24,15 @@ export const myRequest = (options) => {
 			},
 			data: obj_data,
 			success: (res) => {
-				resolve(res)
+				console.log(res)
+				if(res.data.msg=="登入已过期"){
+					uni.redirectTo({
+						url:"/pages/login/index"
+					})
+				}else{
+					resolve(res)
+				}
+				
 			},
 			fail: (err) => {
 				uni.showToast({

pages/changan/index.vue

@@ -18,7 +18,7 @@
 			<!-- 衣橱 -->
 			<tm-sheet class="yichu" style="margin-bottom: 70px !important;">
 				<tm-tabs class="C1b1b1b qiehuan" @change="fenleichange" color="white"  align="left"  v-model="activeIndex" :list="list" range-key="title"></tm-tabs>
-				<view class="yiguicla black pa-6 ma-4 fl" :class="item.aa?'C0178FD':''" v-for="(item,index) in quanbuList" @click="yifu(index,item)">
+				<view class="yiguicla black pa-6 ma-4 fl" v-for="(item,index) in quanbuList" @click="yifu(index,item)">
 					<image :src="item.src" mode="widthFix"></image>
 					<view class="text-align-center text-size-m mt-8">{{item.text}}</view>
 					<view class="text-align-center text-size-m mt-6 mb-6">{{item.type}}</view>
@@ -52,33 +52,27 @@ export default {
 			quanbuList:[{
 				src:'/static/img/45.png',
 				text:'NEO CITY 涂鸦',
-				type:'手提包',
-				aa:false
+				type:'手提包'
 			},{
 				src:'/static/img/46.png',
 				text:'满印迷你标识',
-				type:'围巾',
-				aa:false
+				type:'围巾'
 			},{
 				src:'/static/img/47.png',
 				text:'大号版型夹克',
-				type:'新品',
-				aa:false
+				type:'新品'
 			},{
 				src:'/static/img/45.png',
 				text:'NEO CITY 涂鸦',
-				type:'手提包',
-				aa:false
+				type:'手提包'
 			},{
 				src:'/static/img/46.png',
 				text:'满印迷你标识',
-				type:'围巾',
-				aa:false
+				type:'围巾'
 			},{
 				src:'/static/img/47.png',
 				text:'大号版型夹克',
-				type:'新品',
-				aa:false
+				type:'新品'
 			}],
 			chooseindex:-1
 		};

pages/shouhuodi/index.vue

@@ -11,7 +11,7 @@
 					<tm-input title="详细地址" placeholder="街道、楼牌号等"></tm-input>
 				</view>
 			</tm-sheet>
-			<tm-sheet class="kuang" style="padding-bottom: 40px !important;">
+			<tm-sheet class="kuang" style="padding-bottom: 20px !important;">
 				<view style="width: 94%;margin:0 auto;padding-top:15px;">
 					<view class="fl text-white mt-10" style="width: 15%;">标签</view>
 					<view class="fl" style="width: 80%;">
@@ -22,6 +22,11 @@
 						<tm-button class="ml-20" :round="10" theme="gray" size="s">+</tm-button>
 					</view>
 					<view style="clear: both;"></view>
+					<tm-listitem title="设置为默认地址">
+						<template v-slot:rightIcon="">
+							<tm-switch offBgcolor="yellow text-black" :text="['','']" color="primary" v-model="on"></tm-switch>
+						</template>
+					</tm-listitem>
 				</view>
 			</tm-sheet>
 			<tm-button :round="24" class="sao mb-40 mt-40" block>保存</tm-button>
@@ -35,10 +40,7 @@ import{myRequest} from '@/api/request.js'
 export default {
 	data() {
 		return {
-			checked1:false,
-			checked2:false,
-			checked3:false,
-			beizu:''
+			on:false,
 		};
 	},
 	onLoad() {
@@ -61,4 +63,5 @@ export default {
 	/deep/ .border-grey-darken-4-b-1{border-bottom:solid 1px #303030;}
 	.sao{width: 88%;margin:0 auto;margin-top: 30px;}
 	/deep/ .tm-button-label{color: white;}
+	/deep/ .tm-listitem{border-top: 1px solid #303030;margin-top: 15px;}
 </style>

pages/user/index.vue

@@ -77,11 +77,10 @@ export default {
 		};
 	},
 	onLoad() {
-		console.log(this.$store.state)
+		
 	},
 	created() {
 		this.sys = uni.getSystemInfoSync();
-		console.log(this.$store.state)
 	},
 	methods: {
 		tiaozhuan(type){

pages/wardrobe/index.vue

@@ -57,8 +57,8 @@
 			</div>
 			<!-- 衣橱 -->
 			<tm-sheet class="yichu" style="margin-bottom: 70px !important;">
-				<tm-tabs class="C1b1b1b qiehuan" @change="fenleichange" color="white"  align="left"  v-model="activeIndex" :list="list" range-key="title"></tm-tabs>
-				<view class="yiguicla black pa-6 ma-4 fl" :class="index==chooseindex?'C0178FD':''" v-for="(item,index) in quanbuList" @longpress="longpress(item)">
+				<tm-tabs class="C1b1b1b qiehuan" @change="fenleichangeFun" color="white"  align="left"  v-model="activeIndex" :list="list" range-key="title"></tm-tabs>
+				<view class="yiguicla black pa-6 ma-4 fl" :class="index==chooseindex?'C0178FD':''" v-for="(item,index) in quanbuList" @longtap="longtap">
 					<image :src="item.src" mode="widthFix"></image>
 					<view class="text-align-center text-size-m mt-8">{{item.text}}</view>
 					<view class="text-align-center text-size-m mt-6 mb-6">{{item.type}}</view>
@@ -130,13 +130,34 @@ export default {
 	},
 	created() {
 		this.sys = uni.getSystemInfoSync();
-		
 		console.log("222")
-		// this.getfenltext()
+		this.getfenltext()
 		this.fenleichange();
 	},
 	methods: {
-		longpress(){
+		fenleichangeFun(){
+			var that=this;
+			// role_id:,id:
+			myRequest({
+				url: "/api/Goods/classificationData",
+				method:'post',
+				data:{role_id:that.itemuser.id,id:that.activeIndex}
+			}).then(res => {
+				// if (res.data.code == 200) {
+				// 	if(res.data.data.length != 0){
+				// 		that.list=['全部'];
+				// 		for(let i=0;i<res.data.data.length;i++){
+				// 			that.list.push(res.data.data[i].category_name)
+				// 		}
+				// 		that.listlx=res.data.data;
+				// 	}
+				// }else{
+				// 	that.list=[];
+				// 	that.listlx=[];
+				// }
+			})
+		},
+		longtap(){
 			console.log("111")
 			uni.navigateTo({
 				url: "/pages/changan/index",
@@ -152,14 +173,13 @@ export default {
 				url: "/pages/shopsoso/index",
 			})
 		},
-		fenleichange(e){
+		fenleichange(){
 			var that=this;
 			myRequest({
 				url: "/api/MemberInfo/getFamilyMember",
 				method:'post',
 				data:{family_id:uni.getStorageSync("family_id")}
 			}).then(res => {
-				console.log(res.data)
 				if (res.data.code == 200) {
 					if(res.data.data.length != 0){
 						var wu=0;
@@ -172,6 +192,7 @@ export default {
 						if(wu==0){
 							that.itemuser=res.data.data[0];
 						}
+						this.fenleichangeFun()
 					}else{
 						that.itemuser=0;
 					}
@@ -187,7 +208,6 @@ export default {
 				method:'post',
 				data:{}
 			}).then(res => {
-				console.log(res.data)
 				if (res.data.code == 200) {
 					if(res.data.data.length != 0){
 						that.list=['全部'];