liujintao 4 weeks ago
parent
commit
3bf7e2aac9

+ 2 - 2
.env.development

@@ -3,8 +3,8 @@ ENV='development'
 
 # 本地环境接口地址
 # VITE_API_URL = 'http://127.0.0.1:8000'
-VITE_API_URL='http://192.168.1.225:82/'
-# VITE_API_URL='http://operate.zosi.com.cn/'
+#VITE_API_URL='http://192.168.1.225:82/'
+ VITE_API_URL='http://operate.zosi.com.cn/'
 # VITE_API_URL="http://192.168.1.225:82/"
 
 # 是否启用按钮权限

+ 4 - 2
src/views/product-manage/competitor-monitor/component/EditDrawer.vue

@@ -107,8 +107,10 @@ function closeDrawer() {
         </el-form-item>
         <el-form-item class="font-medium" label="状 态" prop="status">
           <el-select v-model="ruleForm.status" :disabled="true">
-            <el-option label="启用" value="1" />
-            <el-option label="暂停" value="2" />
+						<el-option label="正常" value="1" />
+						<el-option label="失败" value="2" />
+						<el-option label="暂停" value="3" />
+						<el-option label="下架" value="10" />
           </el-select>
         </el-form-item>
         <el-form-item class="font-medium" label="国 家" prop="country_code">

+ 4 - 2
src/views/product-manage/product-monitor/component/EditDrawer.vue

@@ -138,8 +138,10 @@ function closeDrawer() {
         </el-form-item>
         <el-form-item class="font-medium" label="状 态" prop="status">
           <el-select v-model="ruleForm.status" :disabled="true">
-            <el-option label="启用" value="1" />
-            <el-option label="暂停" value="2" />
+            <el-option label="正常" value="1" />
+            <el-option label="失败" value="2" />
+						<el-option label="暂停" value="3" />
+						<el-option label="下架" value="10" />
           </el-select>
         </el-form-item>
         <el-form-item class="font-medium" label="国 家" prop="country_code">

+ 18 - 15
src/views/system/user/ShopAuthorize.vue

@@ -63,23 +63,26 @@ async function fetchShopOptions() {
 }
 
 async function fetchAuthorizedShop() {
-  const resp = await useResponse(api.getAuthorizedShop, { user_id: rowData?.id});
-  const authorizedShops = (resp.data.authorized_shops ?? []).filter((item: any) => item !== null); // 过滤掉 null 值
-
-  if (resp.data.is_authorized_all_shops) {
-    radio.value = '2';
-  } else if (authorizedShops.length > 0) {
-    radio.value = '1';
-    shopTags.value = authorizedShops.map((id: string) => {
-      const selectedOption = shopOptions.value.find((option: any) => option.id === id);
-      return {
-        id: selectedOption.id,
-        name: selectedOption.name
-      };
-    });
-  }
+	const resp = await useResponse(api.getAuthorizedShop, { user_id: rowData?.id });
+	const authorizedShops = (resp.data.authorized_shops ?? []).filter((item: any) => item !== null);
+
+	if (resp.data.is_authorized_all_shops) {
+		radio.value = '2';
+	} else if (authorizedShops.length > 0) {
+		radio.value = '1';
+		shopTags.value = authorizedShops
+			.map((id: string) => {
+				const selectedOption = shopOptions.value.find((option: any) => option.id === id);
+				return selectedOption ? {
+					id: selectedOption.id,
+					name: selectedOption.name
+				} : null;
+			})
+			.filter(Boolean); // 过滤掉 null 值
+	}
 }
 
+
 async function confirmAuthorize() {
   const body = {
     ...(radio.value === '2' ? {} : { authorized_shops: shopTags.value.map((tag: any) => tag.id) }),