From 61c455cdb7c4245774435913f55f096314964bff Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Tue, 15 Oct 2024 16:53:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=86=E7=B1=BB=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=EF=BC=9A=201.=E8=AF=A6=E6=83=85=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=EF=BC=8C=E5=88=97=E8=A1=A8=E6=9C=AA=E6=9B=B4=E6=96=B0=202.?=
 =?UTF-8?q?=E5=BC=80=E5=90=AF=E5=BA=93=E5=AD=98=E5=90=8E=E4=B8=8D=E5=A1=AB?=
 =?UTF-8?q?=E5=86=99=E5=BA=93=E5=AD=98=EF=BC=8C=E4=BF=9D=E5=AD=98=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=203.=E5=A4=9A=E8=A7=84=E6=A0=BC=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E7=BC=96=E8=BE=91=E6=9D=83=E9=99=90=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pageCategory/edit-category/edit-category.vue |  5 +++--
 pageCategory/index/components/category.vue   | 15 +++++++++------
 pageCategory/index/index.vue                 | 17 +++++++++++------
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/pageCategory/edit-category/edit-category.vue b/pageCategory/edit-category/edit-category.vue
index 6efa5ee..c841e09 100644
--- a/pageCategory/edit-category/edit-category.vue
+++ b/pageCategory/edit-category/edit-category.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="page">
+	<view class="page min-page">
 		<view class="box">
 			<view>
 				<uni-forms :model="category" :rules="rules" err-show-type="toast"  ref="form"
@@ -649,8 +649,9 @@
 		infoBox.showToast(option.type === 'edit' ? '修改成功' : '添加成功')
 		timer = setTimeout(() => {
 			clearTimeout(timer)
+			uni.$emit('update:pageCategoryIndex')
 			go.back()
-		}, 1500);
+		}, 500);
 		// const res = await form.value.validate().then(res => {
 		// 	go.back()
 		// })
diff --git a/pageCategory/index/components/category.vue b/pageCategory/index/components/category.vue
index 2eec596..6c17731 100644
--- a/pageCategory/index/components/category.vue
+++ b/pageCategory/index/components/category.vue
@@ -25,20 +25,18 @@
 
 		<view class="u-m-t-24 u-flex u-row-between">
 			<view >
-				<template v-if="data.childrenList.length">
+				<!-- <template v-if="data.childrenList.length">
 					<view  class="u-flex color-999 u-flex u-col-center" @tap="useTypeClick">
 						<text class="u-font-24">{{computedUserType}} </text>
 						<view class="u-flex">
 							<uni-icons type="right" color="#999"></uni-icons>
 						</view>
 					</view>
-				</template>
-				<template v-else>
+				</template> -->
 					<view class="u-flex">
 						<view class="u-m-r-18 color-999">开关</view>
 						<my-switch v-model="isShow" @change="isShowChange"></my-switch>
 					</view>
-				</template>
 			</view>
 			
 			<view class="u-flex no-wrap">
@@ -54,6 +52,7 @@
 	import {
 		computed,
 		ref,
+		watch,
 		watchEffect
 	} from 'vue';
 	import mySwitch from '@/components/my-components/my-switch.vue'
@@ -71,7 +70,9 @@
 		data: {
 			type: Object,
 			default: () => {
-				return {}
+				return {
+					isShow:true
+				}
 			}
 		},
 		showChecked: {
@@ -79,8 +80,10 @@
 			default: false
 		}
 	})
-	
 	let isShow=ref(props.data.isShow)
+	watch(()=>props.data.isShow,(newval)=>{
+		isShow.value=newval
+	})
 	function isShowChange(){
 		console.log(isShow.value);
 		emits('isShowChange',{...props.data,isShow:isShow.value})
diff --git a/pageCategory/index/index.vue b/pageCategory/index/index.vue
index a04b091..c86676a 100644
--- a/pageCategory/index/index.vue
+++ b/pageCategory/index/index.vue
@@ -96,14 +96,10 @@
 	import {
 		reactive, ref, watch
 	} from 'vue';
-	import {onShow} from '@dcloudio/uni-app'
+	import {onShow,onLoad} from '@dcloudio/uni-app'
 	import go from '@/commons/utils/go.js';
 	import myCategory from './components/category.vue'
 	import infoBox from "@/commons/utils/infoBox.js"
-	import myPagination from '@/components/my-components/my-pagination.vue'
-	import myModel from "@/components/my-components/my-model.vue"
-	import myButton from "@/components/my-components/my-button.vue"
-	import mySwitch from "@/components/my-components/my-switch.vue"
 	import {$productCategory} from '@/http/yskApi/goods.js'
 	
 	
@@ -162,9 +158,18 @@
 		})
 		pageData.totalElements=res.totalElements
 	}
-	onShow(()=>{
+	onLoad(()=>{
 		init()
 	})
+	function watchEvent(){
+		uni.$off('update:pageCategoryIndex')
+		uni.$on('update:pageCategoryIndex',(data)=>{
+			init()
+		})
+	}
+	onShow(()=>{
+		watchEvent()
+	})
 	function toAddCategory(){
 		go.to('PAGES_CATEGORY_EDIT',{type:'add'})
 	}