Browse Source

feat:1.盼达点餐的后台管理系统 多语言新增

suwenjiang 1 week ago
parent
commit
79e81b1236

+ 2 - 1
.env.development

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = fuint餐饮点餐营销管理系统
+VUE_APP_TITLE = 盼达点餐管理系统
 
 # 开发环境配置
 ENV = 'development'
@@ -11,4 +11,5 @@ VUE_APP_BASE_API = '/dev-api'
 VUE_APP_PUBLIC_PATH = '/'
 
 # 后端接口地址
+# VUE_APP_SERVER_URL = 'http://192.168.1.44:8080'
 VUE_APP_SERVER_URL = 'http://192.168.1.44:8080'

+ 1 - 1
.env.production

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = fuint餐饮点餐营销管理系统
+VUE_APP_TITLE = 盼达点餐管理系统
 
 # 生产环境配置
 ENV = 'production'

+ 2 - 1
package.json

@@ -1,7 +1,7 @@
 {
   "name": "fuintAdmin",
   "version": "3.0.3",
-  "description": "fuint会员营销系统后台管理端",
+  "description": "盼达点餐系统后台管理端",
   "author": "FSQ",
   "license": "MIT",
   "scripts": {
@@ -55,6 +55,7 @@
     "vue": "2.6.12",
     "vue-count-to": "1.0.13",
     "vue-cropper": "0.5.5",
+    "vue-i18n": "^8.28.2",
     "vue-meta": "2.4.0",
     "vue-print-nb": "^1.7.5",
     "vue-router": "3.4.9",

+ 21 - 0
src/api/currency.js

@@ -0,0 +1,21 @@
+import request from '@/utils/request'
+
+
+// 获取货币列表
+export function getCurrencyList(param) {
+  return request({
+      url: 'backendApi/currency/list',
+      method: 'get',
+      params: param
+  })
+}
+
+// 新增货币
+export function saveCurrency(data) {
+  return request({
+    url: 'backendApi/currency/save',
+    method: 'post',
+    data: data
+  })
+}
+

+ 20 - 0
src/i18n.js

@@ -0,0 +1,20 @@
+import Vue from 'vue';
+import VueI18n from 'vue-i18n';
+
+Vue.use(VueI18n);
+
+// 引入语言包
+import en from '@/locales/en.json';
+import zh from '@/locales/zh.json';
+
+// 创建 i18n 实例
+const i18n = new VueI18n({
+  locale: 'en', // 默认语言
+  fallbackLocale: 'en', // 回退语言
+  messages: {
+    en, // 英文语言包
+    zh, // 中文语言包
+  },
+});
+
+export default i18n;

+ 36 - 13
src/layout/components/Navbar.vue

@@ -1,26 +1,39 @@
 <template>
   <div class="navbar">
-    <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
-    <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/>
-    <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>
+    <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container"
+      @toggleClick="toggleSideBar" />
+    <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav" />
+    <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav" />
     <div class="right-menu">
-      <template v-if="device!=='mobile'">
-        <search id="header-search" class="right-menu-item" />
-        <screenfull id="screenfull" class="right-menu-item hover-effect" />
-        <FuintDoc id="fuint-doc" class="right-menu-item hover-effect" />
+      <template v-if="device !== 'mobile'">
+        <!-- <search id="header-search" class="right-menu-item" /> -->
+        <!-- <screenfull id="screenfull" class="right-menu-item hover-effect" /> -->
+        <!-- <FuintDoc id="fuint-doc" class="right-menu-item hover-effect" /> -->
+        <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
+          <div class="avatar-wrapper">
+            <!-- <img :src="avatar" class="user-avatar"> -->
+            <span class="user-name">{{ $i18n.messages[lang].lang }}</span>
+            <i class="el-icon-caret-bottom" />
+          </div>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item v-for="(item, index) in langList" :key="index">
+              <span @click="setLang(index)">{{ item.lang }}</span>
+            </el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
       </template>
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
         <div class="avatar-wrapper">
           <img :src="avatar" class="user-avatar">
           <span class="user-name">{{ name }}</span>
-          <i class="el-icon-caret-bottom"/>
+          <i class="el-icon-caret-bottom" />
         </div>
         <el-dropdown-menu slot="dropdown">
           <el-dropdown-item @click.native="setting = true">
-            <span>布局设置</span>
+            <span>{{ $t('nav.setLayout') }}</span>
           </el-dropdown-item>
           <el-dropdown-item divided @click.native="logout">
-            <span>退出登录</span>
+            <span>{{ $t('nav.logout') }}</span>
           </el-dropdown-item>
         </el-dropdown-menu>
       </el-dropdown>
@@ -55,6 +68,12 @@ export default {
       'name',
       'device'
     ]),
+    lang() {
+      return this.$i18n.locale;
+    },
+    langList() {
+      return this.$i18n.messages;
+    },
     setting: {
       get() {
         return this.$store.state.settings.showSettings
@@ -73,6 +92,10 @@ export default {
     }
   },
   methods: {
+    setLang(language) {
+      this.$i18n.locale = language;
+      console.log(language)
+    },
     toggleSideBar() {
       this.$store.dispatch('app/toggleSideBar')
     },
@@ -85,7 +108,7 @@ export default {
         this.$store.dispatch('LogOut').then(() => {
           location.href = '/';
         })
-      }).catch(() => {});
+      }).catch(() => { });
     }
   }
 }
@@ -97,7 +120,7 @@ export default {
   overflow: hidden;
   position: relative;
   background: #fff;
-  box-shadow: 0 1px 4px rgba(0,21,41,.08);
+  box-shadow: 0 1px 4px rgba(0, 21, 41, .08);
 
   .hamburger-container {
     line-height: 46px;
@@ -105,7 +128,7 @@ export default {
     float: left;
     cursor: pointer;
     transition: background .3s;
-    -webkit-tap-highlight-color:transparent;
+    -webkit-tap-highlight-color: transparent;
 
     &:hover {
       background: rgba(0, 0, 0, .025)

+ 21 - 0
src/locales/en.json

@@ -0,0 +1,21 @@
+{
+    "lang":"English",
+    "curency":"Dollar",
+    "search":"Search",
+    "reset":"Reset",
+    "phone":"Phone",
+    "contact":"Contact",
+
+    "nav.setLayout": "Set Layout",
+    "nav.logout": "Logout",
+
+    "operational.overview":"Operational Overview",
+    "today.revenue":"Today's Revenue",
+
+    "store.list.storeName":"Store Name",
+    "store.list.storeStatus":"Status",
+    "store.list.addStore":"Add Store",
+    "store.list.belongTo":"Belong To"
+    
+    
+  }

+ 10 - 0
src/locales/ru.json

@@ -0,0 +1,10 @@
+{
+    "lang":"русский язык",
+
+    "nav.setLayout": "Set Layout",
+    "nav.logout": "Logout",
+    
+    "welcome": "Welcome",
+    "greeting": "Hello, {name}!"
+    
+  }

+ 0 - 0
src/locales/sr.json


+ 13 - 0
src/locales/zh.json

@@ -0,0 +1,13 @@
+{
+    "lang":"中文",
+    "curency":"人民币",
+
+    "nav.setLayout": "布局设置",
+    "nav.logout": "退出登录",
+
+    "operational.overview":"运营概况",
+    "today.revenue":"今日营收",
+
+    "welcome": "欢迎",
+    "greeting": "你好, {name}!"
+  }

+ 4 - 0
src/main.js

@@ -43,6 +43,9 @@ import TreeSelect from '@/components/TreeSelect'
 // 会员选择组件
 import UserSelect from '@/components/UserSelect'
 
+// 多语言
+import i18n from './i18n'; 
+
 // 全局方法挂载
 Vue.prototype.getConfigKey = getConfigKey
 Vue.prototype.parseTime = parseTime
@@ -88,5 +91,6 @@ new Vue({
   el: '#app',
   router,
   store,
+  i18n,
   render: h => h(App)
 })

+ 367 - 0
src/views/currency/list.vue

@@ -0,0 +1,367 @@
+<template>
+    <div class="app-container">
+      <el-form
+        :model="queryParams"
+        class="main-search"
+        ref="queryForm"
+        size="small"
+        :inline="true"
+        v-show="showSearch"
+        label-width="68px"
+      >
+        <el-form-item label="货币" prop="name">
+          <el-input
+            v-model="queryParams.name"
+            placeholder="请输货币名称/符号"
+            clearable
+            style="width: 240px"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        
+        <el-form-item>
+          <el-button
+            type="primary"
+            icon="el-icon-search"
+            size="mini"
+            @click="handleQuery"
+            >搜索</el-button
+          >
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+            >重置</el-button
+          >
+          <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAdd"
+            v-hasPermi="['store:add']"
+            >新增货币</el-button
+          >
+        </el-form-item>
+      </el-form>
+  
+      <el-table
+        ref="tables"
+        v-loading="loading"
+        :data="list"
+        @selection-change="handleSelectionChange"
+        :default-sort="defaultSort"
+        @sort-change="handleSortChange"
+      >
+        <el-table-column label="ID" prop="id" width="55" />
+        <el-table-column label="货币名称" align="center" prop="name" />
+        <el-table-column label="货币符号" align="center" prop="symbol" />
+        
+        <el-table-column
+          label="创建时间"
+          align="center"
+          prop="createTime"
+          sortable="custom"
+          :sort-orders="['descending', 'ascending']"
+          width="180"
+        >
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
+        
+        <el-table-column
+          label="操作"
+          align="center"
+          width="180"
+          class-name="small-padding fixed-width"
+        >
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleUpdate(scope.row)"
+              >修改</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+  
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="queryParams.page"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+  
+      <!-- 添加或修改对话框 -->
+      <el-dialog
+        :title="title"
+        :visible.sync="open"
+        class="common-dialog"
+        width="800px"
+        append-to-body
+      >
+        <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="货币名称" prop="name">
+                <el-input
+                  v-model="form.name"
+                  placeholder="请输入货币名称"
+                  maxlength="30"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="货币符号" prop="name">
+                <el-input
+                  v-model="form.symbol"
+                  placeholder="请输入货币符号"
+                  maxlength="30"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          
+          
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确定</el-button>
+          <el-button @click="cancel">取消</el-button>
+        </div>
+      </el-dialog>
+      <FuintQrCode :showDialog="openQrCode" :qr="qr" @closeDialog="closeDialog" />
+    </div>
+  </template>
+  
+  <script>
+  import FuintQrCode from "@/components/Fuint/QrCode";
+  import { getToken } from "@/utils/auth";
+  import {
+    getStoreList,
+    updateStoreStatus,
+    getStoreInfo,
+    saveStore,
+  } from "@/api/store";
+  import {saveCurrency,getCurrencyList} from '@/api/currency'
+  export default {
+    name: "StoreList",
+    components: {
+      FuintQrCode,
+    },
+    data() {
+      return {
+        // 二维码
+        qr: null,
+        // 二维码对话框
+        openQrCode: false,
+        // 遮罩层
+        loading: true,
+        // 标题
+        title: "",
+        // 选中数组
+        ids: [],
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 表格数据
+        list: [],
+        // 是否显示弹出层
+        open: false,
+        // 日期范围
+        dateRange: [],
+        // 默认排序
+        defaultSort: { prop: "operTime", order: "descending" },
+        // 表单参数
+        form: {
+          name: "",
+          symbol:''
+        },
+        // 微信支付证书
+        wxCertPath: "",
+        // 上传地址
+        uploadAction: process.env.VUE_APP_SERVER_URL + "/backendApi/file/upload",
+        // 隐藏上传
+        hideUpload: false,
+        // 上传文件列表
+        uploadFiles: [],
+        uploadHeader: { "Access-Token": getToken() },
+        merchantOptions: [],
+        // 图片根目录
+        imagePath: "",
+        // 查询参数
+        queryParams: {
+          page: 1,
+          pageSize: 10,
+          name: "",
+        },
+        // 表单校验
+        rules: {
+          name: [
+            { required: true, message: "货币名称不能为空", trigger: "blur" },
+            
+          ],
+          symbol:[
+            { required: true, message: "货币符号不能为空", trigger: "blur" },
+          ]
+        },
+      };
+    },
+    created() {
+      this.getList();
+    },
+    methods: {
+      // 查询列表
+      getList() {
+        this.loading = true;
+        getCurrencyList(this.queryParams).then(
+          (response) => {
+            console.log('res;',response)
+            this.list = response.data
+            this.total = response.total
+            this.loading = false;
+          }
+        );
+      },
+      // 搜索按钮操作
+      handleQuery() {
+        this.queryParams.page = 1;
+        this.getList();
+      },
+      // 重置按钮操作
+      resetQuery() {
+        this.dateRange = [];
+        this.resetForm("queryForm");
+        this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order);
+        this.handleQuery();
+      },
+      // 状态修改
+      handleStatusChange(row) {
+        let text = row.status == "A" ? "启用" : "禁用";
+        this.$modal
+          .confirm("确认要" + text + '"' + row.name + '"店铺吗?')
+          .then(function () {
+            return updateStoreStatus(row.id, row.status);
+          })
+          .then(() => {
+            this.$modal.msgSuccess(text + "成功");
+          })
+          .catch(function () {
+            row.status = row.status === "N" ? "A" : "N";
+          });
+      },
+      // 多选框选中数据
+      handleSelectionChange(selection) {
+        this.ids = selection.map((item) => item.operId);
+        this.multiple = !selection.length;
+      },
+      // 排序触发事件
+      handleSortChange(column, prop, order) {
+        this.queryParams.orderByColumn = column.prop;
+        this.queryParams.isAsc = column.order;
+        this.getList();
+      },
+      // 新增按钮操作
+      handleAdd() {
+        this.reset();
+        this.open = true;
+        this.title = "新增货币";
+      },
+      // 表单重置
+      reset() {
+        this.form = {
+          id: "",
+          name: "",
+          symbol:'',
+        };
+        this.resetForm("form");
+      },
+      // 取消按钮
+      cancel() {
+        this.open = false;
+        this.reset();
+      },
+      // 提交按钮
+      submitForm: function () {
+        this.$refs["form"].validate((valid) => {
+          if (valid) {
+            if(this.form.id){
+
+            }else{
+                saveCurrency(this.form).then(response => {
+                    this.$modal.msgSuccess("新增成功");
+                    this.open = false;
+                    this.getList();
+                });
+            }
+            // if (this.form.id) {
+            //   saveStore(this.form).then((response) => {
+            //     this.$modal.msgSuccess("修改成功");
+            //     this.open = false;
+            //     this.getList();
+            //   });
+            // } else {
+            //   saveStore(this.form).then((response) => {
+            //     this.$modal.msgSuccess("新增成功");
+            //     this.open = false;
+            //     this.getList();
+            //   });
+            // }
+          }
+        });
+      },
+      // 二维码
+      handleQrCode(row) {
+        this.qr = { type: "store", id: row.id };
+        this.openQrCode = true;
+      },
+      // 关闭二维码
+      closeDialog() {
+        this.openQrCode = false;
+      },
+      // 修改按钮操作
+      handleUpdate(row) {
+        this.reset();
+      
+        this.title = "编辑货币";
+        this.open = true;
+        const {id,name,symbol} = row
+        this.form={id,name,symbol}
+        
+      },
+     
+      handleUploadSuccess(file) {
+        this.form.logo = file.data.fileName;
+      },
+      handleUploadLicenseSuccess(file) {
+        this.form.license = file.data.fileName;
+      },
+      handleUploadCertSuccess(file) {
+        this.form.wxCertPath = file.data.fileName;
+        this.wxCertPath = file.data.fileName;
+      },
+    },
+  };
+  </script>
+  <style scoped>
+  .common-dialog >>> .el-upload--picture-card {
+    width: 60px;
+    height: 50px;
+    line-height: 60px;
+  }
+  .upload-cert >>> .el-upload {
+    width: 20px;
+    height: 20px;
+    line-height: 20px;
+  }
+  .upload-cert .file-name {
+    width: 700px;
+    text-align: left;
+  }
+  </style>
+  

+ 56 - 24
src/views/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <div class="overview">
-      <div class="title">运营概况</div>
+      <div class="title">{{ $t('operational.overview') }}</div>
       <div class="content" v-loading="loading">
         <el-row class="line">
-          <el-col class="item" :span="6">
+          <!-- <el-col class="item" :span="6">
             <div class="do">
               <svg
                 t="1641957967018"
@@ -30,7 +30,7 @@
               <p class="text">今日新增订单数(笔)</p>
               <p class="number">{{ homeData.todayOrder }}</p>
             </div>
-          </el-col>
+          </el-col> -->
           <el-col class="item" :span="6">
             <div class="do">
               <svg
@@ -54,7 +54,7 @@
                   p-id="10176"
                 ></path>
               </svg>
-              <p class="text">今日交易金额(元)</p>
+              <p class="text">{{$t('today.revenue')}}({{$t('curency')}})</p>
               <p class="number">
                 {{
                   homeData.todayPay
@@ -64,7 +64,36 @@
               </p>
             </div>
           </el-col>
-          <el-col class="item" :span="6">
+          <el-col class="item second-line" :span="6">
+            <div class="do">
+              <svg
+                t="1641969647517"
+                class="icon"
+                viewBox="0 0 1024 1024"
+                version="1.1"
+                xmlns="http://www.w3.org/2000/svg"
+                p-id="3586"
+                width="64"
+                height="64"
+              >
+                <path
+                  d="M128 544h128v288H128zM320 480h128v352H320zM512 320h128v512H512zM704 416h128v416H704z"
+                  p-id="3587"
+                  fill="#8a8a8a"
+                ></path>
+                <path
+                  d="M576 128L352 352h448L576 128z"
+                  p-id="3588"
+                  fill="#8a8a8a"
+                ></path>
+              </svg>
+              <p class="text">总交易金额(元)</p>
+              <p class="number">
+                {{ homeData.totalPay ? homeData.totalPay : "0.00" }}
+              </p>
+            </div>
+          </el-col>
+          <!-- <el-col class="item" :span="6">
             <div class="do">
               <svg
                 t="1641957839736"
@@ -95,8 +124,8 @@
               <p class="text">今日新增会员数</p>
               <p class="number">{{ homeData.todayUser }}</p>
             </div>
-          </el-col>
-          <el-col class="item" :span="6">
+          </el-col> -->
+          <!-- <el-col class="item" :span="6">
             <div class="do">
               <svg
                 t="1641958094548"
@@ -117,10 +146,10 @@
               <p class="text">今日活跃会员数</p>
               <p class="number">{{ homeData.todayActiveUser }}</p>
             </div>
-          </el-col>
+          </el-col> -->
         </el-row>
         <el-row class="line">
-          <el-col class="item second-line" :span="6">
+          <!-- <el-col class="item second-line" :span="6">
             <div class="do">
               <svg
                 t="1641957661068"
@@ -146,8 +175,8 @@
               <p class="text">总会员数</p>
               <p class="number">{{ homeData.totalUser }}</p>
             </div>
-          </el-col>
-          <el-col class="item second-line" :span="6">
+          </el-col> -->
+          <!-- <el-col class="item second-line" :span="6">
             <div class="do">
               <svg
                 t="1641969647517"
@@ -175,8 +204,8 @@
                 {{ homeData.totalPay ? homeData.totalPay : "0.00" }}
               </p>
             </div>
-          </el-col>
-          <el-col class="item second-line" :span="6">
+          </el-col> -->
+          <!-- <el-col class="item second-line" :span="6">
             <div class="do">
               <svg
                 t="1641957411945"
@@ -197,8 +226,8 @@
               <p class="text">总订单数</p>
               <p class="number">{{ homeData.totalOrder }}</p>
             </div>
-          </el-col>
-          <el-col class="item second-line" :span="6">
+          </el-col> -->
+          <!-- <el-col class="item second-line" :span="6">
             <div class="do">
               <svg
                 t="1641958462543"
@@ -234,32 +263,33 @@
               <p class="text">总支付人数</p>
               <p class="number">{{ homeData.totalPayUser }}</p>
             </div>
-          </el-col>
+          </el-col> -->
         </el-row>
       </div>
     </div>
     <div class="overview">
+      
       <div class="title">常用功能</div>
       <div class="content">
         <el-row class="line home-tools">
-          <el-col class="item no-border" :span="8"
+          <!-- <el-col class="item no-border" :span="8"
             ><div class="do" @click="toCashier('/fuintCashier/')">
               <img class="t-icon" src="@/assets/images/home/pay.png" />
               <div class="text">收银下单</div>
             </div></el-col
-          >
-          <el-col class="item no-border" :span="8"
+          > -->
+          <!-- <el-col class="item no-border" :span="8"
             ><div class="do" @click="toTarget('/coupon/confirm/index')">
               <img class="t-icon" src="@/assets/images/home/coupon.png" />
               <div class="text">核销卡券</div>
             </div></el-col
-          >
-          <el-col class="item no-border" :span="8"
+          > -->
+          <!-- <el-col class="item no-border" :span="8"
             ><div class="do" @click="toTarget('/member/index')">
               <img class="t-icon" src="@/assets/images/home/member.png" />
               <div class="text">会员管理</div>
             </div></el-col
-          >
+          > -->
         </el-row>
         <el-row class="line home-tools">
           <el-col class="item no-border" :span="8"
@@ -268,12 +298,12 @@
               <div class="text">订单管理</div>
             </div></el-col
           >
-          <el-col class="item no-border" :span="8"
+          <!-- <el-col class="item no-border" :span="8"
             ><div class="do" @click="toTarget('/coupon/coupon/index')">
               <img class="t-icon" src="@/assets/images/home/card.png" />
               <div class="text">卡券管理</div>
             </div></el-col
-          >
+          > -->
           <el-col class="item no-border" :span="8"
             ><div class="do" @click="toTarget('/goods/goods/index')">
               <img class="t-icon" src="@/assets/images/home/goods.png" />
@@ -356,6 +386,8 @@ export default {
       chartData2: [],
     };
   },
+  computed: {
+  },
   created() {
     this.getHomeData();
     this.getChartsData();

+ 36 - 36
src/views/store/list.vue

@@ -74,7 +74,7 @@
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="默认店铺" align="center" prop="isDefault">
+      <!-- <el-table-column label="默认店铺" align="center" prop="isDefault">
         <template slot-scope="scope">
           <el-switch
             v-model="scope.row.isDefault"
@@ -83,7 +83,7 @@
             disabled
           ></el-switch>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="联系人" align="center" prop="contact" />
       <el-table-column label="手机号" align="center" prop="phone" />
       <el-table-column label="地址" align="center" prop="address" />
@@ -117,14 +117,14 @@
         class-name="small-padding fixed-width"
       >
         <template slot-scope="scope">
-          <el-button
+          <!-- <el-button
             size="mini"
             type="text"
             icon="el-icon-copy-document"
             v-hasPermi="['store:list']"
             @click="handleQrCode(scope.row)"
             >二维码</el-button
-          >
+          > -->
           <el-button
             size="mini"
             type="text"
@@ -196,7 +196,7 @@
           </el-col>
           <p class="form-tips">(提示:点击图片修改)</p>
         </el-row>
-        <el-row>
+        <!-- <el-row>
           <el-col :span="24">
             <el-form-item label="是否默认店铺">
               <el-radio-group v-model="form.isDefault">
@@ -205,7 +205,7 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row> -->
         <el-row>
           <el-col :span="24">
             <el-form-item label="所属商户" prop="merchantId">
@@ -265,7 +265,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
+        <!-- <el-row>
           <el-col :span="24">
             <el-form-item label="店铺纬度" prop="latitude">
               <el-input
@@ -275,8 +275,8 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
+        </el-row> -->
+        <!-- <el-row>
           <el-col :span="24">
             <el-form-item label="店铺经度" prop="longitude">
               <el-input
@@ -286,8 +286,8 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
+        </el-row> -->
+        <!-- <el-row>
           <el-col :span="9">
             <el-form-item label="营业执照" prop="license">
               <el-upload
@@ -319,8 +319,8 @@
               >(查看大图)</a
             >
           </p>
-        </el-row>
-        <el-row>
+        </el-row> -->
+        <!-- <el-row>
           <el-col :span="24">
             <el-form-item label="统一社会信用码" prop="creditCode">
               <el-input
@@ -330,8 +330,8 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
+        </el-row> -->
+        <!-- <el-row>
           <el-col :span="24">
             <el-form-item label="银行名称" prop="bankName">
               <el-input
@@ -341,8 +341,8 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
+        </el-row> -->
+        <!-- <el-row>
           <el-col :span="24">
             <el-form-item label="银行卡账户名" prop="bankCardName">
               <el-input
@@ -352,8 +352,8 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
+        </el-row> -->
+        <!-- <el-row>
           <el-col :span="24">
             <el-form-item label="银行卡卡号" prop="bankCardNo">
               <el-input
@@ -363,8 +363,8 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row v-hasPermi="['store:paySetting']">
+        </el-row> -->
+        <!-- <el-row v-hasPermi="['store:paySetting']">
           <el-col :span="24">
             <el-form-item label="微信支付商户号" prop="wxMchId">
               <el-input
@@ -374,8 +374,8 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row v-hasPermi="['store:paySetting']">
+        </el-row> -->
+        <!-- <el-row v-hasPermi="['store:paySetting']">
           <el-col :span="24">
             <el-form-item label="微信支付APIv2" prop="wxMchId">
               <el-input
@@ -385,8 +385,8 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
+        </el-row> -->
+        <!-- <el-row>
           <el-col :span="24">
             <el-form-item label="微信支付证书" prop="wxCertPath">
               <el-upload
@@ -405,8 +405,8 @@
               </el-upload>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row v-hasPermi="['store:paySetting']">
+        </el-row> -->
+        <!-- <el-row v-hasPermi="['store:paySetting']">
           <el-col :span="24">
             <el-form-item label="支付宝appId" prop="alipayAppId">
               <el-input
@@ -416,8 +416,8 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row v-hasPermi="['store:paySetting']">
+        </el-row> -->
+        <!-- <el-row v-hasPermi="['store:paySetting']">
           <el-col :span="24">
             <el-form-item label="支付宝应用私钥" prop="alipayPrivateKey">
               <el-input
@@ -427,8 +427,8 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row v-hasPermi="['store:paySetting']">
+        </el-row> -->
+        <!-- <el-row v-hasPermi="['store:paySetting']">
           <el-col :span="24">
             <el-form-item label="支付宝公钥" prop="alipayPublicKey">
               <el-input
@@ -438,7 +438,7 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row> -->
 
         <el-row>
           <el-col :span="24">
@@ -534,7 +534,7 @@ export default {
       // 微信支付证书
       wxCertPath: "",
       // 上传地址
-      uploadAction: process.env.VUE_APP_SERVER_URL + "backendApi/file/upload",
+      uploadAction: process.env.VUE_APP_SERVER_URL + "/backendApi/file/upload",
       // 隐藏上传
       hideUpload: false,
       // 上传文件列表
@@ -651,11 +651,11 @@ export default {
       this.form = {
         id: "",
         name: "",
-        logo: "",
+        // logo: "",
         merchantId: this.$store.getters.merchantId,
         status: "A",
-        isDefault: "N",
-        wxCertPath: "",
+        // isDefault: "N",
+        // wxCertPath: "",
       };
       this.resetForm("form");
     },

+ 3 - 0
src/views/system/menu/index.vue

@@ -302,6 +302,8 @@ export default {
     },
     // 修改按钮操作
     handleUpdate(row) {
+      console.log('ros:w',row)
+      // return
       this.reset();
       this.getTreeSelect();
       getMenu(row.id).then(response => {
@@ -314,6 +316,7 @@ export default {
     submitForm: function() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          console.log('forim:',this.form)
           if (this.form.id) {
             updateMenu(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");