完善相应页面跳转和选择物资组件显示

 <!--
  * @Date: 2024-07-23 10:50:38
  * @LastEditors: hookehuyr hookehuyr@gmail.com
- * @LastEditTime: 2024-07-23 14:24:52
+ * @LastEditTime: 2024-07-23 16:36:26
  * @FilePath: /temple_material_request/src/views/material_list.vue
  * @Description: 物资情况页面
 -->
@@ -87,7 +87,9 @@ const onClickTitle = (item) => { // 点击物资标题回调
 }
 
 const onClickRequest = () => { // 我要申领物资
-
+  $router.push({
+    path: '/material_request'
+  })
 }
 </script>
 

@@ -78,6 +78,9 @@
       </div>
     </div>
   </van-dialog>
+
+  <choose-material :show="show_choose_material" @close="onCloseChoose"></choose-material>
+
 </template>
 
 <script setup>
@@ -90,6 +93,8 @@ import { Cookies, $, _, axios, storeToRefs, mainStore, Toast, useTitle } from '@
 //import { } from '@/composables'
 import { styleColor } from "@/constant.js";
 import dayjs from "dayjs";
+import chooseMaterial from '@/components/chooseMaterial/index.vue';
+
 
 const $route = useRoute();
 const $router = useRouter();
@@ -141,6 +146,7 @@ onMounted(() => {
 
 const addMore = () => { // 添加更多回调
   console.warn('addMore');
+  show_choose_material.value = true;
 }
 
 const onConfirmRequest = () => { // 确定申领回调
@@ -154,6 +160,11 @@ const type_checked = ref('');
 const onDialogConfirm = () => {
   console.warn(type_checked.value);
 }
+
+const show_choose_material = ref(false);
+const onCloseChoose = () => {
+  show_choose_material.value = false;
+}
 </script>
 
 <style lang="less" scoped>

 <!--
  * @Date: 2024-07-23 12:53:15
  * @LastEditors: hookehuyr hookehuyr@gmail.com
- * @LastEditTime: 2024-07-23 16:12:12
+ * @LastEditTime: 2024-07-23 16:38:59
  * @FilePath: /temple_material_request/src/views/material_request.vue
  * @Description: 申领物资页面
 -->
@@ -9,12 +9,6 @@
   <div class="material-request-page">
     <van-tabs v-model:active="active" @change="onChange" sticky :color="styleColor.baseColor">
       <van-tab v-for="index in 8" :title="'标签 ' + index">
-        <van-list
-          v-model:loading="loading"
-          :finished="finished"
-          finished-text="没有更多了"
-          @load="onLoad"
-        >
         <div class="list-wrapper">
           <van-sticky  :offset-top="44">
             <van-row justify="space-between" class="select-all-item">
@@ -41,9 +35,8 @@
               </van-row>
             </div>
           </van-list>
-            <div style="height: 3rem;"></div>
+          <div style="height: 6rem;"></div>
         </div>
-        </van-list>
       </van-tab>
     </van-tabs>
     <div class="control-bar">
@@ -59,6 +52,8 @@
       </div>
     </div>
   </div>
+
+  <choose-material :show="show_choose_material" @close="onCloseChoose"></choose-material>
 </template>
 
 <script setup>
@@ -70,6 +65,7 @@ import { Cookies, $, _, axios, storeToRefs, mainStore, Toast, useTitle } from '@
 //import { } from '@/utils/generateIcons.js'
 //import { } from '@/composables'
 import { styleColor } from "@/constant.js";
+import chooseMaterial from '@/components/chooseMaterial/index.vue';
 
 const $route = useRoute();
 const $router = useRouter();
@@ -110,6 +106,7 @@ const onClickTitle = (item) => { // 点击物资标题回调
 
 const addMore = () => { // 添加更多
   console.warn('addMore');
+  show_choose_material.value = true;
 }
 
 const addShoppingCart = () => { // 加入购物车
@@ -118,6 +115,12 @@ const addShoppingCart = () => { // 加入购物车
 
 const goShoppingCart = () => { // 跳转购物车
   console.warn('goShoppingCart');
+  $router.push({ path: '/material_pre_request' });
+}
+
+const show_choose_material = ref(false);
+const onCloseChoose = () => {
+  show_choose_material.value = false;
 }
 </script>