Browse Source

修改底部颜色

YZM 1 year ago
parent
commit
7ac8ed228e

File diff suppressed because it is too large
+ 0 - 1
App.vue


+ 11 - 11
pages.json

@@ -386,29 +386,29 @@
 		"iconfontSrc": "static/icon/iconfont.ttf",
 		"list": [{
 				"pagePath": "pages/index/index",
-				"iconPath": "/static/img/31.png",
-				"selectedIconPath": "/static/img/31.png",
+				"iconPath": "/static/icon/4.png",
+				"selectedIconPath": "/static/icon/4.png",
 				"text": "首页"
 			}, {
 				"pagePath": "pages/wardrobe/index",
-				"iconPath": "/static/img/32.png",
-				"selectedIconPath": "/static/img/32.png",
+				"iconPath": "/static/icon/3.png",
+				"selectedIconPath": "/static/icon/3.png",
 				"text": "衣橱"
 			}, {
 				"pagePath": "pages/dapei/index",
-				"iconPath": "/static/img/103.png",
-				"selectedIconPath": "/static/img/103.png",
+				"iconPath": "/static/icon/5.png",
+				"selectedIconPath": "/static/icon/5.png",
 				"text": "搭配"
 			}, {
 				"pagePath": "pages/shop/index",
-				"iconPath": "/static/img/34.png",
-				"selectedIconPath": "/static/img/34.png",
+				"iconPath": "/static/icon/2.png",
+				"selectedIconPath": "/static/icon/2.png",
 				"text": "商城"
 			}, {
 				"pagePath": "pages/user/index",
-				"iconPath": "/static/img/35.png",
-				"selectedIconPath": "/static/img/35.png",
-				"text": "衣橱"
+				"iconPath": "/static/icon/1.png",
+				"selectedIconPath": "/static/icon/1.png",
+				"text": "我的"
 			}]
 	},
 	"globalStyle": {

+ 7 - 0
pages/bianjigh/index.vue

@@ -71,6 +71,13 @@ export default {
 			}
 			var id=this.quanbuList[this.chooseindex].id;
 			if(this.old){
+				if(this.old==id){
+					setTimeout(function(){
+						uni.navigateBack();
+					},2000)
+					that.$refs.toast.show({model:'success',label:'更换成功'})
+					return
+				}
 				// 修改
 				myRequest({
 					url: "/api/Collocation/updateStyle",

+ 8 - 1
pages/qiehuan/index.vue

@@ -80,7 +80,14 @@ export default {
 				data:{family_id:uni.getStorageSync("family_id"),id:item.id}
 			}).then(res => {
 				if (res.data.code == 200) {
-					uni.navigateBack();
+					let pages = getCurrentPages(); // 当前页面
+					let beforePage = pages[pages.length - 2]; // 前一个页面
+					uni.navigateBack({
+						delta: 1,
+						success: function() {
+							beforePage.$vm.shuaxin()
+						}
+					});
 				}else{
 					uni.navigateBack();
 				}

+ 8 - 5
pages/wardrobe/index.vue

@@ -150,16 +150,19 @@ export default {
 			})
 		}
 	},
-	onShow() {
-		this.quanbuList=[];
-		this.fenleichange();
-		this.getfenltext();
-	},
 	created() {
 		this.sys = uni.getSystemInfoSync();
 		this.getQiu()
+		this.quanbuList=[];
+		this.fenleichange();
+		this.getfenltext();
 	},
 	methods: {
+		shuaxin(){
+			this.quanbuList=[];
+			this.fenleichange();
+			this.getfenltext();
+		},
 		qiehuanLb(e){
 			var that=this;
 			this.current=e;

BIN
static/icon/1.png


BIN
static/icon/2.png


BIN
static/icon/3.png


BIN
static/icon/4.png


BIN
static/icon/5.png


+ 1 - 1
tm-vuetify/tool/function/mixin.js

@@ -2,7 +2,7 @@ export function setVueTiflyThemeBlack() {
 	let vueTifly_black = this.$tm.vx.state().tmVuetify.black
 	if (vueTifly_black === true) {
 		uni.setTabBarStyle({
-			backgroundColor: "#212121"
+			backgroundColor: "#1B1B1B"
 		})
 	} else {
 		uni.setTabBarStyle({

+ 1 - 1
tm-vuetify/tool/mixin/mixin.js

@@ -28,7 +28,7 @@ module.exports = {
 			let vueTifly_black = this.$tm.vx.state().tmVuetify.black
 			if (vueTifly_black === true) {
 				uni.setTabBarStyle({
-					backgroundColor: "#212121"
+					backgroundColor: "#1B1B1B"
 				})
 			} else {
 				uni.setTabBarStyle({

+ 1 - 1
tm-vuetify/tool/store/tm-vuetify.js

@@ -70,7 +70,7 @@ const store = new Vuex.Store({
 			Vue.set(state.tmVuetify, 'black', black)
 			if (black === true) {
 				uni.setTabBarStyle({
-					backgroundColor: "#212121"
+					backgroundColor: "#1B1B1B"
 				})
 			} else {
 				uni.setTabBarStyle({

Some files were not shown because too many files changed in this diff