From e5d8e3bb85881a5a6192f420d44427bbd160c897 Mon Sep 17 00:00:00 2001
From: "271556543@qq.com" <271556543@qq.com>
Date: Thu, 4 Aug 2022 13:38:42 +0800
Subject: [PATCH] 2022-8-4

---
 src/views/business/component/addStore.vue |  45 ++-
 src/views/login/index.vue                 |   2 +-
 src/views/system/menu.vue                 | 446 +++++++++++-----------
 3 files changed, 268 insertions(+), 225 deletions(-)

diff --git a/src/views/business/component/addStore.vue b/src/views/business/component/addStore.vue
index 7a1b680..c9e5a93 100644
--- a/src/views/business/component/addStore.vue
+++ b/src/views/business/component/addStore.vue
@@ -1,7 +1,7 @@
 <!--新增门店-->
 <template>
   <div>
-    <xy-dialog :is-show.sync="isShow" title="新增门店" type="form" :form="form">
+    <xy-dialog :is-show.sync="isShow" title="新增门店" type="form" :form="form" :rules="rules">
       <template v-slot:belongsMerchant>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
@@ -33,6 +33,15 @@
         </div>
       </template>
       <template v-slot:address>
+        <div class="xy-table-item" style="margin-bottom: 20px;">
+          <div class="xy-table-item-label">
+            地址选择
+          </div>
+          <div class="xy-table-item-content">
+            <avue-map placeholder="请选择地址" :option="option" v-model="map" @mapClick="mapClick"></avue-map>
+          </div>
+        </div>
+
         <div class="xy-table-item">
           <div class="xy-table-item-label">
             <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>地址：
@@ -83,7 +92,7 @@
         </div>
       </template>
       <template v-slot:extraFormBottom>
-        <avue-map size="small" :option="option" v-model="map" @mapClick="test"></avue-map>
+
       </template>
     </xy-dialog>
   </div>
@@ -99,12 +108,38 @@ export default {
         belongsMerchant:'',
         name:'',
         password:'',
-        address:'',
         contact:'',
         contactNumber:'',
+        address:'',
         lng:'',//经度
         lat:'',//纬度
       },
+      rules:{
+        belongsMerchant:[
+          {required:true,message:'请选择所属商家'}
+        ],
+        name:[
+          {required:true,message:'请填写名称'}
+        ],
+        password:[
+          {required:true,message:'请填写密码'}
+        ],
+        contact:[
+          {required:true,message:'请填写联系人'}
+        ],
+        contactNumber:[
+          {required:true,message:'请填写联系电话'}
+        ],
+        address:[
+          {required:true,message:'请填写地址'}
+        ],
+        lng:[
+          {required:true,message:'请选择定位'}
+        ],
+        lat:[
+          {required:true,message:'请选择定位'}
+        ]
+      },
       map:{
 
       },
@@ -126,7 +161,8 @@ export default {
     }
   },
   methods: {
-    test(r,p){
+    //地图点击
+    mapClick(r,p){
       this.$nextTick(()=>{
         this.form.lat = p
         this.form.lng = r
@@ -137,6 +173,7 @@ export default {
     map(newVal){
       this.form.lat = newVal?.location?.lat
       this.form.lng = newVal?.location?.lng
+      this.form.address = newVal?.formattedAddress
     }
   },
   mounted() {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 7954119..487eaf0 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -64,7 +64,7 @@
       return {
         loginForm: {
           username: 'admin',
-          password: 'Admin2022'
+          password: 'Yunyubang2021@'
         },
         loginRules: {
           username: [{
diff --git a/src/views/system/menu.vue b/src/views/system/menu.vue
index e233acb..9e2a47b 100644
--- a/src/views/system/menu.vue
+++ b/src/views/system/menu.vue
@@ -1,223 +1,229 @@
-<template>
-  <div class="container">
-    <!-- 查询配置 -->
-    <div style="padding: 0px 20px">
-      <div ref="lxHeader">
-        <LxHeader icon="md-apps" text="菜单管理" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
-          <div slot="content"></div>
-          <slot>
-            <div>
-              <Input style="width: 200px; margin-right: 10px" v-model.number="searchFields.Name" placeholder="关键字搜索" />
-              <Button type="primary" @click="load" style="margin-left: 10px">查询</Button>
-              <Button type="primary" @click="edit()" style="margin-left: 10px">新增菜单</Button>
-            </div>
-          </slot>
-        </LxHeader>
-      </div>
-      <div class="table-tree">
-        <el-table :data="tableData" :height="tableHeight" class="v-table" style="width: 100%;margin-bottom: 20px;"
-          row-key="id" border default-expand-all :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
-          <el-table-column type="index" align="center">
-          </el-table-column>
-          <el-table-column prop="name" label="菜单" sortable width="180">
-          </el-table-column>
-          <el-table-column prop="url" label="菜单路径" sortable>
-          </el-table-column>
-          <el-table-column prop="icon" label="图标" sortable>
-          </el-table-column>
-          <el-table-column prop="api_prefix" label="API前缀" sortable>
-          </el-table-column>
-          <el-table-column prop="sortnumber" label="排序" sortable>
-          </el-table-column>
-          <el-table-column fixed="right" label="操作" width="300">
-            <template slot-scope="scope">
-              <Button type="primary" @click="addchildren(scope.row)" size="small" style="margin-left: 10px;"
-                ghost>子菜单</Button>
-              <Button type="error" @click="del(scope.row)" size="small" style="margin-left: 10px;" ghost>删除</Button>
-              <Button type="primary" @click="edit(scope.row)" size="small" style="margin-left: 10px;" ghost>编辑</Button>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-    </div>
-
-    <el-dialog title="菜单编辑" :visible.sync="dialogFormVisible" width="30%">
-      <el-form :model="form" :rules="rules" ref="form" label-position="right" :label-width="formLabelWidth">
-        <el-form-item label="父菜单">
-          <el-input v-model="form.pname" disabled autocomplete="off"></el-input>
-        </el-form-item>
-        <el-form-item label="名称" prop="name">
-          <el-input v-model="form.name" autocomplete="off"></el-input>
-        </el-form-item>
-        <el-form-item label="菜单路径" prop="url">
-          <el-input v-model="form.url" autocomplete="off"></el-input>
-        </el-form-item>
-        <el-form-item label="是否显示" prop="visible">
-          <el-select v-model="form.visible">
-            <el-option label="显示" value="1"></el-option>
-            <el-option label="不显示" value="0"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="API前缀" prop="api_prefix">
-          <el-input v-model="form.api_prefix" autocomplete="off"></el-input>
-        </el-form-item>
-        <el-form-item label="图标" prop="icon">
-          <el-input v-model="form.icon" autocomplete="off"></el-input>
-        </el-form-item>
-        <el-form-item label="排序">
-          <el-input v-model="form.sortnumber" autocomplete="off"></el-input>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="resetForm('form')">取 消</el-button>
-        <el-button type="primary" @click="submitForm('form')">确 定</el-button>
-      </div>
-    </el-dialog>
-
-  </div>
-</template>
-<script>
-  import LxHeader from "@/components/LxHeader/index.vue";
-  import {
-    save,
+<template>
+  <div class="container">
+    <!-- 查询配置 -->
+    <div style="padding: 0px 20px">
+      <div ref="lxHeader">
+        <LxHeader icon="md-apps" text="菜单管理" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
+          <div slot="content"></div>
+          <slot>
+            <div>
+              <Input style="width: 200px; margin-right: 10px" v-model.number="searchFields.Name" placeholder="关键字搜索" />
+              <Button type="primary" @click="load" style="margin-left: 10px">查询</Button>
+              <Button type="primary" @click="edit()" style="margin-left: 10px">新增菜单</Button>
+            </div>
+          </slot>
+        </LxHeader>
+      </div>
+      <div class="table-tree">
+        <el-table :data="tableData" :height="tableHeight" class="v-table" style="width: 100%;margin-bottom: 20px;"
+          row-key="id" border default-expand-all :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+          <el-table-column type="index" align="center">
+          </el-table-column>
+          <el-table-column prop="name" label="菜单" sortable width="180">
+          </el-table-column>
+          <el-table-column prop="url" label="菜单路径" sortable>
+          </el-table-column>
+          <el-table-column prop="path" label="菜单视图" sortable>
+          </el-table-column>
+          <el-table-column prop="icon" label="图标" sortable>
+          </el-table-column>
+          <el-table-column prop="api_prefix" label="API前缀" sortable>
+          </el-table-column>
+          <el-table-column prop="sortnumber" label="排序" sortable>
+          </el-table-column>
+          <el-table-column fixed="right" label="操作" width="300">
+            <template slot-scope="scope">
+              <Button type="primary" @click="addchildren(scope.row)" size="small" style="margin-left: 10px;"
+                ghost>子菜单</Button>
+              <Button type="error" @click="del(scope.row)" size="small" style="margin-left: 10px;" ghost>删除</Button>
+              <Button type="primary" @click="edit(scope.row)" size="small" style="margin-left: 10px;" ghost>编辑</Button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+
+    <el-dialog title="菜单编辑" :visible.sync="dialogFormVisible" width="30%">
+      <el-form :model="form" :rules="rules" ref="form" label-position="right" :label-width="formLabelWidth">
+        <el-form-item label="父菜单">
+          <el-input v-model="form.pname" disabled autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="名称" prop="name">
+          <el-input v-model="form.name" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="菜单路径" prop="url">
+          <el-input v-model="form.url" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="菜单视图" prop="url">
+          <el-input v-model="form.path" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="是否显示" prop="visible">
+          <el-select v-model="form.visible">
+            <el-option label="显示" value="1"></el-option>
+            <el-option label="不显示" value="0"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="API前缀" prop="api_prefix">
+          <el-input v-model="form.api_prefix" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="图标" prop="icon">
+          <el-input v-model="form.icon" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="排序">
+          <el-input v-model="form.sortnumber" autocomplete="off"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="resetForm('form')">取 消</el-button>
+        <el-button type="primary" @click="submitForm('form')">确 定</el-button>
+      </div>
+    </el-dialog>
+
+  </div>
+</template>
+<script>
+  import LxHeader from "@/components/LxHeader/index.vue";
+  import {
+    save,
     listmenu,
-    del
-  } from "../../api/system/menu.js";
-  export default {
-    components: {
-      LxHeader
-    },
-    created() {
-      this.initLoad();
-      this.load();
-    },
-    mounted() {},
-    data() {
-      return {
-        dialogFormVisible: false,
-        formLabelWidth: "120px",
-        form: {
-          name: "",
-          id: "",
-          pid: "0",
-          url: "",
-          visible: "1",
-          sortnumber: 0,
-          icon: "",
+    del
+  } from "../../api/system/menu.js";
+  export default {
+    components: {
+      LxHeader
+    },
+    created() {
+      this.initLoad();
+      this.load();
+    },
+    mounted() {},
+    data() {
+      return {
+        dialogFormVisible: false,
+        formLabelWidth: "120px",
+        form: {
+          name: "",
+          id: "",
+          pid: "0",
+          url: "",
+          visible: "1",
+          sortnumber: 0,
+          icon: "",
           pname: "根菜单",
-          api_prefix:""
-        },
-        rules: {
-          name: [{
-            required: true,
-            message: '请输入菜单名称',
-            trigger: 'blur'
-          }],
-          url: [{
-            required: true,
-            message: '请输入菜单路径',
-            trigger: 'blur'
-          }],
-          icon: [{
-            required: true,
-            message: '请输入图标',
-            trigger: 'blur'
-          }],
-          visible: [{
-            required: true,
-            message: '请选择是否显示',
-            trigger: 'blur'
-          }],
-        },
-        tableHeight: 0,
-        //查询条件字段
-        searchFields: {
-          KeyWord: ""
-        },
-        tableData: []
-      }
-    },
-    methods: {
-      initLoad() {
-        var that = this;
-        var clientHeight = document.documentElement.clientHeight
-        var lxHeader_height = 96.5; //查询 头部
-        var paginationHeight = 37; //分页的高度
-        var topHeight = 50; //页面 头部
-        let tableHeight = clientHeight - lxHeader_height - topHeight - paginationHeight - 20;
-        that.tableHeight = tableHeight;
-      },
-      load() {
-        var that = this;
-        listmenu().then(response => {
-          that.tableData = response;
-        }).catch(error => {
-          //reject(error)
-        })
-
-      },
-      edit(obj) {
-        this.form = this.$options.data().form
-        if (obj) {
-          obj.visible = obj.visible.toString();
-          var result = Object.assign(this.form, obj)
-          this.form = result;
-        }
-        this.dialogFormVisible = true;
-      },
-      addchildren(obj) {
-        this.form = this.$options.data().form
-        if (obj) {
-          this.form.pname = obj.name;
-          this.form.pid = obj.id;
-          this.dialogFormVisible = true;
-        }
-      },
-      submitForm(formName) {
-        var that = this;
-        this.$refs[formName].validate((valid) => {
-          if (valid) {
-            save(that.form).then(response => {
-              console.log(response)
-              this.$Message.success('操作成功');
-              that.dialogFormVisible = false;
-              that.load();
-            }).catch(error => {
-              reject(error)
-            })
-          } else {
-            this.$Message.error('数据校验失败');
-            return false;
-          }
-        });
-      },
-      resetForm(formName) {
-        var that = this;
-        this.$refs[formName].resetFields();
-        that.dialogFormVisible = false;
-      },
-      del(obj) {
-        var that = this;
-        if (obj) {
-          this.$Modal.confirm({
-            title: '确认要删除数据？',
-            onOk: () => {
-              del({
-                id: obj.id
-              }).then(response => {
-                this.$Message.success('操作成功');
-                that.load();
-              }).catch(error => {
-                console.log(error)
-                reject(error)
-              })
-            },
-            onCancel: () => {
-              //this.$Message.info('Clicked cancel');
-            }
-          });
-        }
-      },
-    }
-  };
+          api_prefix:"",
+          path:''
+        },
+        rules: {
+          name: [{
+            required: true,
+            message: '请输入菜单名称',
+            trigger: 'blur'
+          }],
+          url: [{
+            required: true,
+            message: '请输入菜单路径',
+            trigger: 'blur'
+          }],
+          icon: [{
+            required: true,
+            message: '请输入图标',
+            trigger: 'blur'
+          }],
+          visible: [{
+            required: true,
+            message: '请选择是否显示',
+            trigger: 'blur'
+          }],
+        },
+        tableHeight: 0,
+        //查询条件字段
+        searchFields: {
+          KeyWord: ""
+        },
+        tableData: []
+      }
+    },
+    methods: {
+      initLoad() {
+        var that = this;
+        var clientHeight = document.documentElement.clientHeight
+        var lxHeader_height = 96.5; //查询 头部
+        var paginationHeight = 37; //分页的高度
+        var topHeight = 50; //页面 头部
+        let tableHeight = clientHeight - lxHeader_height - topHeight - paginationHeight - 20;
+        that.tableHeight = tableHeight;
+      },
+      load() {
+        var that = this;
+        listmenu().then(response => {
+          that.tableData = response;
+        }).catch(error => {
+          //reject(error)
+        })
+
+      },
+      edit(obj) {
+        this.form = this.$options.data().form
+        if (obj) {
+          obj.visible = obj.visible.toString();
+          var result = Object.assign(this.form, obj)
+          this.form = result;
+        }
+        this.dialogFormVisible = true;
+      },
+      addchildren(obj) {
+        this.form = this.$options.data().form
+        if (obj) {
+          this.form.pname = obj.name;
+          this.form.pid = obj.id;
+          this.dialogFormVisible = true;
+        }
+      },
+      submitForm(formName) {
+        var that = this;
+        this.$refs[formName].validate((valid) => {
+          if (valid) {
+            save(that.form).then(response => {
+              console.log(response)
+              this.$Message.success('操作成功');
+              that.dialogFormVisible = false;
+              that.load();
+            }).catch(error => {
+              reject(error)
+            })
+          } else {
+            this.$Message.error('数据校验失败');
+            return false;
+          }
+        });
+      },
+      resetForm(formName) {
+        var that = this;
+        this.$refs[formName].resetFields();
+        that.dialogFormVisible = false;
+      },
+      del(obj) {
+        var that = this;
+        if (obj) {
+          this.$Modal.confirm({
+            title: '确认要删除数据？',
+            onOk: () => {
+              del({
+                id: obj.id
+              }).then(response => {
+                this.$Message.success('操作成功');
+                that.load();
+              }).catch(error => {
+                console.log(error)
+                reject(error)
+              })
+            },
+            onCancel: () => {
+              //this.$Message.info('Clicked cancel');
+            }
+          });
+        }
+      },
+    }
+  };
 </script>