fix：“修复设备和商户筛选功能失效的问题”

src/components/typeSelectList/index.vue

@@ -130,10 +130,12 @@ export default {
     const adminTypeShow = ref(false);
     const adminShow = () => { adminTypeShow.value = true; };
     const adminList = ref([]);
-    const adminConfirm = (currentValue) => {
-      searchParams.adminType = (currentValue === t('typeSelectList.allSuboUsers')) ? 'all' : '';
-      searchParams.userName = (currentValue === t('typeSelectList.allSuboUsers')) ? 'all' : (currentValue === t('typeSelectList.thisMerchant')) ? user.username : currentValue;
+    const adminConfirm = ({ selectedOptions }) => {
+      console.log('selectedOptions[0].text', selectedOptions[0].text)
+      searchParams.adminType = (selectedOptions[0].text === t('typeSelectList.allSuboUsers')) ? 'all' : '';
+      searchParams.userName = (selectedOptions[0].text === t('typeSelectList.allSuboUsers')) ? 'all' : (selectedOptions[0].text === t('typeSelectList.thisMerchant')) ? user.username : selectedOptions[0].text;
       adminTypeShow.value = false;
+      console.log('searchParams.userName', searchParams.userName)
       outputDate();
     }
     const adminCancel = () => { adminTypeShow.value = false; }
@@ -142,10 +144,10 @@ export default {
       const { data } = await getAdminList({ adminId: user.id });
       if (data.code === '00000') {
         adminList.value = data.data.map(item => {
-          return item.username
+          return { text: item.username, value: item.id }
         });
-        adminList.value.unshift(t('typeSelectList.thisMerchant'));
-        adminList.value.unshift(t('typeSelectList.allSuboUsers'));
+        adminList.value.unshift({ text: t('typeSelectList.allSuboUsers'), value: 'all' });
+        adminList.value.unshift({ text: t('typeSelectList.thisMerchant'), value: 'this' });
       }
     }
     // 账号地区选择
@@ -263,14 +265,14 @@ export default {
     const deviceType = ref(false);
     const deviceShow = () => { deviceType.value = true; };
     const deviceList = ref([]);
-    const equipmentSourceList = ref([]);
-    const deviceConfirm = (currentValue) => {
-      allDevices.value = currentValue;
-      console.log("currentValue", currentValue)
-      if (currentValue != t('typeSelectList.allDevices')) {
-        const selectEquipment = equipmentSourceList.value.filter(i => i.name === currentValue);
+    // const equipmentSourceList = ref([]);
+    const deviceConfirm = ({ selectedOptions }) => {
+      allDevices.value = selectedOptions[0].text;
+      console.log("selectedOptions", selectedOptions)
+      if (selectedOptions[0].name != t('typeSelectList.allDevices')) {
+        const selectEquipment = deviceList.value.filter(i => i.text === selectedOptions[0].text);
         if (selectEquipment && selectEquipment.length > 0) {
-          searchParams.equipmentId = selectEquipment[0].id;
+          searchParams.equipmentId = selectEquipment[0].value;
         }
       } else {
         searchParams.equipmentId = '';
@@ -283,12 +285,16 @@ export default {
     const getDeviceListFun = async () => {
       const { data } = await getEquipmentList({ adminId: user.id });
       if (data.code === '00000') {
+        // deviceList.value = data.data.map(item => {
+        //   return item.name
+        // });
         deviceList.value = data.data.map(item => {
-          return item.name
+          return { text: item.name != null ? item.name : item.clientId, value: item.id }
         });
-        deviceList.value.unshift(t('typeSelectList.allDevices'));
-        equipmentSourceList.value = data.data;
-        equipmentSourceList.value.unshift({ name: t('typeSelectList.allDevices'), id: null });
+        deviceList.value.unshift({ text: t('typeSelectList.allDevices'), value: '' });
+        // deviceList.value.unshift(t('typeSelectList.allDevices'));
+        // equipmentSourceList.value = data.data;
+        // equipmentSourceList.value.unshift({ text: t('typeSelectList.allDevices'), value: null });
       }
     }
     // 商品选择

src/views/merchantManage/index.vue

@@ -49,6 +49,7 @@
               </div>
             </div>
           </div>
+          <van-back-top right="3vw" bottom="5vh" />
         </div>
       </van-list>
     </div>