From 7c048f9fa3edaf398afca3f49b3dbdf6449a2f74 Mon Sep 17 00:00:00 2001
From: heshengjie3333 <heshengjie0506@163.com>
Date: Wed, 22 Jun 2022 10:52:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |   4 +-
 src/components/page/account/Login.vue         |   4 +-
 src/components/page/account/Register.vue      |   2 +-
 .../page/systemManage/MenuManage.vue          | 166 +++++++++---------
 4 files changed, 87 insertions(+), 89 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index bced65e..5cc29be 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,7 +1,7 @@
 <template>
-  <!-- <SideBar v-if="account" /> -->
+  <SideBar v-if="account" />
   <div class="app_right">
-    <!-- <Top v-if="account"/> -->
+    <Top v-if="account"/>
     <router-view></router-view>
   </div>
 </template>
diff --git a/src/components/page/account/Login.vue b/src/components/page/account/Login.vue
index f2cc18b..c218d42 100644
--- a/src/components/page/account/Login.vue
+++ b/src/components/page/account/Login.vue
@@ -87,8 +87,8 @@ export default {
           captchaId: id.value,
         }).then((res) => {
           console.log(res);
-          if (res.code == 0) {
-            localStorage.setItem("token", res.data.token);
+          if (res.data.code == 0) {
+            localStorage.setItem("token", res.data.data.token);
             ElMessage.success("登录成功");
             router.replace("/dash_board/work_bench");
           } else {
diff --git a/src/components/page/account/Register.vue b/src/components/page/account/Register.vue
index d9da267..b38722d 100644
--- a/src/components/page/account/Register.vue
+++ b/src/components/page/account/Register.vue
@@ -122,7 +122,7 @@ export default {
               email: email.value,
             })
             .then((res) => {
-              if (res.data.code == 200) {
+              if (res.data.code == 0) {
                 ElMessage.success(res.data.msg);
                 router.replace("/account/login");
               } else {
diff --git a/src/components/page/systemManage/MenuManage.vue b/src/components/page/systemManage/MenuManage.vue
index cdad792..c9d0c4b 100644
--- a/src/components/page/systemManage/MenuManage.vue
+++ b/src/components/page/systemManage/MenuManage.vue
@@ -69,24 +69,6 @@
                 <el-table-column prop="driveAddressId"  label="配送地址id" width="120" />
                 <el-table-column prop="addressId"       label="地址id"     width="120" />
             </el-table>
-          <!-- <div class="resdatadataitem" v-for="(a,b) in tableData" :key="b">
-
-            <div class="materials" style="text-align: center">
-              <table-column class="table555">{{a.materials.CreatedAt}}</table-column>
-              <table-column class="table555">{{a.materials.DeletedAt}}</table-column>
-              <table-column class="table555">{{a.materials.ID}}</table-column>
-              <table-column class="table555">{{a.materials.UpdatedAt}}</table-column>
-              <table-column class="table555">{{a.materials.addressId}}</table-column>
-              <table-column class="table555">{{a.materials.audit}}</table-column>
-              <table-column class="table555">{{a.materials.driveAddressId}}</table-column>
-              <table-column class="table555">{{a.materials.inforesourse}}</table-column>
-              <table-column class="table555">{{a.materials.name}}</table-column>
-              <table-column class="table555">{{a.materials.peo}}</table-column>
-              <table-column class="table555">{{a.materials.price}}</table-column>
-
-            </div> -->
-
-          <!-- </div> -->
         </div>
 
     </div>
@@ -99,21 +81,21 @@
           <div>
 
 
-            <div style="margin-top:5%">
+            <!-- <div style="margin-top:5%">
               <span>菜单类型</span>
               <el-button-group>
                 <el-button  type="primary" >目录</el-button>
                 <el-button  type="primary" >菜单</el-button>
                 <el-button  type="primary" >按钮</el-button>
               </el-button-group>
-            </div>
+            </div> -->
 
             <div class="inputbig">
               <div class="inputs" style="width: 50%;">
-                <span>菜单名称</span>
+                <span style="width:80px">商品名称</span>
                 <div class="menuinput">
                   <el-input
-                    v-model="input2"
+                    v-model="data.name"
                     placeholder="请输入"
                     clearable
                     type="text"
@@ -122,26 +104,26 @@
               </div>
 
 
+
+
               <div class="inputs" style="width: 50%;">
-                <span>上级菜单</span>
+                <span style="width:80px">详情网址</span>
                 <div>
-                  <el-select v-model="category">
-                    <el-option
-                      v-for="item in selectcategory"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    />
-                  </el-select>
+                  <el-input
+                    v-model="data.product"
+                    placeholder="请输入"
+                    clearable
+                    type="text"
+                  ></el-input>
                 </div>
               </div>
 
 
               <div class="inputs" style="width: 50%;">
-                <span>排序</span>
+                <span style="width:80px">详情地址</span>
                 <div>
                   <el-input
-                    v-model="input2"
+                    v-model="data.productAddress"
                     placeholder="请输入"
                     clearable
                     type="text"
@@ -151,21 +133,23 @@
 
 
               <div class="inputs" style="width: 50%;">
-                <span>图标</span>
+                <span style="width:80px">起送要求</span>
                 <div>
-
-
-
-
+                  <el-input
+                    v-model="data.purchaseNotes"
+                    placeholder="请输入"
+                    clearable
+                    type="text"
+                  ></el-input>
                 </div>
               </div>
 
 
               <div class="inputs" style="width: 50%;">
-                <span>路由地址</span>
+                <span style="width:80px">联系人</span>
                 <div>
                   <el-input
-                    v-model="input2"
+                    v-model="data.peo"
                     placeholder="请输入"
                     clearable
                     type="text"
@@ -175,10 +159,10 @@
 
 
               <div class="inputs" style="width: 50%;">
-                <span>组件路径</span>
+                <span style="width:80px">电话</span>
                 <div>
                   <el-input
-                    v-model="input2"
+                    v-model="data.tel"
                     placeholder="请输入"
                     clearable
                     type="text"
@@ -188,10 +172,10 @@
 
 
               <div class="inputs" style="width: 50%;">
-                <span>权限标识</span>
+                <span style="width:80px">信息来源</span>
                 <div>
                   <el-input
-                    v-model="input2"
+                    v-model="data.inforesourse"
                     placeholder="请输入"
                     clearable
                     type="text"
@@ -201,52 +185,71 @@
 
 
               <div class="inputs" style="width: 50%;">
-                <span>状态</span>
+                <span style="width:80px">发布企业</span>
                 <div>
-                <el-button-group>
-                  <el-button  type="primary" >启用</el-button>
-                  <el-button  type="primary" >禁用</el-button>
-                </el-button-group>
+                  <el-input
+                    v-model="data.publishingCo"
+                    placeholder="请输入"
+                    clearable
+                    type="text"
+                  ></el-input>
                 </div>
               </div>
 
 
 
               <div class="inputs" style="width: 50%;">
-                <span>是否外链</span>
+                <span style="width:80px">物资价格</span>
                 <div>
-                <el-button-group>
-                  <el-button  type="primary" >否</el-button>
-                  <el-button  type="primary" >是</el-button>
-                </el-button-group>
+                  <el-input
+                    v-model.number="data.price"
+                    placeholder="请输入"
+                    clearable
+                    type="text"
+                  ></el-input>
                 </div>
               </div>
 
 
+              <div class="inputs" style="width: 50%;">
+                <span style="width:80px">类别id</span>
+                <div>
+                  <el-input
+                    v-model.number="data.typeId"
+                    placeholder="请输入"
+                    clearable
+                    type="text"
+                  ></el-input>
+                </div>
+              </div>
 
               <div class="inputs" style="width: 50%;">
-                <span>是否缓存</span>
+                <span style="width:80px">配送地址id</span>
                 <div>
-                <el-button-group>
-                  <el-button  type="primary" >否</el-button>
-                  <el-button  type="primary" >是</el-button>
-                </el-button-group>
+                  <el-input
+                    v-model.number="data.driveAddressId"
+                    placeholder="请输入"
+                    clearable
+                    type="text"
+                  ></el-input>
                 </div>
               </div>
 
 
               <div class="inputs" style="width: 50%;">
-                <span>是否显示</span>
+                <span style="width:80px">地址id</span>
                 <div>
-                <el-button-group>
-                  <el-button  type="primary" >是</el-button>
-                  <el-button  type="primary" >否</el-button>
-                </el-button-group>
+                  <el-input
+                    v-model.number="data.addressId"
+                    placeholder="请输入"
+                    clearable
+                    type="text"
+                  ></el-input>
                 </div>
               </div>
             </div>
             <div class="anniu">
-              <el-button>取消</el-button>
+              <el-button @click="drawer = false ">取消</el-button>
               <el-button @click="tijiao">确认</el-button>
             </div>
           </div>
@@ -258,16 +261,16 @@
 </template>
 
 <script lang="js">
-import { reactive, ref ,onBeforeMount,onMounted} from 'vue'
+import { reactive, ref ,onBeforeMount,onMounted,defineComponent} from 'vue'
 import req from '../../../request'
 
-export default {
+export default defineComponent({
     setup() {
         const state = ref('')
-        const input = ref('')
-        const input2 = ref('')
+        const data = reactive({})
         const category = ref('')
         const drawer = ref( false )
+
         let tableData= ref([ ])
         const options =[
               {
@@ -292,12 +295,14 @@ export default {
         async function gettabledata(){
           let res = await req('/api/user/materialLst','post')
           // return res.materialLst
-          console.log(res);
-          tableData.value = res.data.data 
-          console.log(tableData.value,'11111111');
+          // console.log(res)
+          tableData.value = res.data.data.data
+          // console.log(tableData.value,'11111111');
         }
-        function tijiao(){
-          
+
+        async function tijiao(){
+          let sj = await req('/api/admin/materialAdd','put',data)
+          console.log(sj);
         }
         onBeforeMount(() => {
           console.log('asd');
@@ -309,17 +314,17 @@ export default {
         })
 
         return {
-            input,
-            input2,
+            data,
             state,
             drawer,
             category,
             options,
             tableData,
             selectcategory,
+            tijiao 
         }        
     }
-}
+})
 </script>
 
 
@@ -327,7 +332,6 @@ export default {
 .mm {
   background-color:#fff ;
   width: 95%;
-
 }
 .find {
   box-sizing: border-box;
@@ -356,7 +360,6 @@ export default {
 .findson2 {
   width: 50%;
 }
-
 .find2 {
   width: 350px;
   display: flex;
@@ -365,13 +368,11 @@ export default {
 .findson4 {
   width: 65%;
 }
-
 .table {
   margin: 50px;
   background-color: #fff;
 }
 .table1{
-    /* margin-top:2%; */
     display: flex;
     height: 32px;
 }
@@ -382,9 +383,6 @@ export default {
 .table2{
   margin: 25px 0 ;
 }
-/* .table555{
-  margin: 20px;
-} */
 .input {
   width: 50%;
   background-color: #fff;
-- 
Gitee