From 67ba91620b218b691af4d08f20884e97d79d69d5 Mon Sep 17 00:00:00 2001
From: air <30444667+sszdot@users.noreply.github.com>
Date: Mon, 30 Jun 2025 17:52:15 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=B1=BB=20=20=E5=9E=8B=E3=80=91?=
 =?UTF-8?q?=EF=BC=9Afeat=20=E3=80=90=E5=8E=9F=20=20=E5=9B=A0=E3=80=91?=
 =?UTF-8?q?=EF=BC=9A=E6=B7=BB=E5=8A=A0=E5=95=86=E9=93=BA=E7=9A=84=E6=97=B6?=
 =?UTF-8?q?=E5=80=99=20=20=E5=90=8C=E6=97=B6=E6=B7=BB=E5=8A=A0=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E5=92=8C=E5=95=86=E9=93=BA=E7=BB=91=E5=AE=9A=E7=9A=84?=
 =?UTF-8?q?=20=E4=B8=8D=E5=8F=AF=E9=99=8D=E6=9D=83=E7=9A=84=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=91=98=20=E3=80=90=E8=BF=87=20=20=E7=A8=8B=E3=80=91?=
 =?UTF-8?q?=EF=BC=9A=E6=B7=BB=E5=8A=A0=E5=AE=8C=E5=95=86=E9=93=BA=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=AE=A1=E7=90=86=E5=91=98=20=20=E8=BF=99?=
 =?UTF-8?q?=E9=87=8C=E9=87=87=E7=94=A8=20=E4=BA=8B=E5=8A=A1=E5=9B=9E?=
 =?UTF-8?q?=E6=BB=9A=20=E3=80=90=E5=BD=B1=20=20=E5=93=8D=E3=80=91=EF=BC=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .tgitconfig                                   |  0
 src/store/index.js                            |  4 +++
 src/styles/index.scss                         |  2 +-
 src/views/layout/components/main/home/set.vue | 16 ++++++++---
 src/views/layout/components/main/shop/add.vue | 27 ++++++++++++++++---
 5 files changed, 42 insertions(+), 7 deletions(-)
 create mode 100644 .tgitconfig

diff --git a/.tgitconfig b/.tgitconfig
new file mode 100644
index 0000000..e69de29
diff --git a/src/store/index.js b/src/store/index.js
index 78237ed..d0395b0 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -204,7 +204,10 @@ const store = new Vuex.Store({
      * @return {*} 服务器返回值
      */
     async fetchAddShop ({ dispatch }, form) {
+      console.log('fetchAddShop', form)
       const params = new URLSearchParams()
+      params.append('admin_name', form.admin_name)
+      params.append('pwd', form.pwd)
       params.append('name', form.name)
       params.append('waiter', form.waiter)
       params.append('service_wx', form.service_wx)
@@ -223,6 +226,7 @@ const store = new Vuex.Store({
       const res = await api.post('addShop', params, 'Admin')
       if (res.data.status === 1) {
         await dispatch('fetchShopList')// 刷新商铺列表
+        await dispatch('fetchAdminList')// 刷新用户列表
         Message.success(res.data.msg)
       } else {
         Message.error(res.data.msg)
diff --git a/src/styles/index.scss b/src/styles/index.scss
index d054fc7..6189df9 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -134,7 +134,7 @@ label {
 .el-form-item__label {
   font-style: italic;
   font-weight: bold;
-  color: #303133 !important;
+  color: #606266 !important;
 }
 
 /* 当屏幕宽度小于等于480px时 */
diff --git a/src/views/layout/components/main/home/set.vue b/src/views/layout/components/main/home/set.vue
index 5e9294e..2f8b206 100644
--- a/src/views/layout/components/main/home/set.vue
+++ b/src/views/layout/components/main/home/set.vue
@@ -13,7 +13,12 @@
             <el-form label-width="120px">
 
               <!-- 语言设置 -->
-              <el-form-item label="语言设置">
+              <div class="p-b-5">
+                <el-divider content-position="left">
+                  <font class="fb f-s-18 normalFontColor">语言设置</font>
+                </el-divider>
+              </div>
+              <el-form-item label="设置">
                 <el-radio-group v-model="currentLang" @change="changeLang">
                   <el-radio label="zh-CN">简体中文</el-radio>
                   <!-- 你可以继续添加更多语言 -->
@@ -21,8 +26,13 @@
                 </el-radio-group>
               </el-form-item>
 
-              <!-- 添加删除系统模块 -->
-              <el-form-item label="增删系统模块">
+              <!-- 显示隐藏系统模块 -->
+              <div class="p-t-10 p-b-5">
+                <el-divider content-position="left">
+                  <font class="fb f-s-18 normalFontColor">显示隐藏系统模块</font>
+                </el-divider>
+              </div>
+              <el-form-item label="显示模块">
                 <el-checkbox-group v-model="selectedModules" @change="handleChange">
                   <el-checkbox v-for="item in moduleOptions" :key="item.value" :label="item.value">
                     {{ item.label }}
diff --git a/src/views/layout/components/main/shop/add.vue b/src/views/layout/components/main/shop/add.vue
index 3913b82..6cce184 100644
--- a/src/views/layout/components/main/shop/add.vue
+++ b/src/views/layout/components/main/shop/add.vue
@@ -13,7 +13,24 @@
           <el-main class="border p-20 m-b-20">
             <el-form ref="form" :model="form" label-width="120px"
               :label-position="$store.state.app.isWideScreen ? 'top' : 'right'">
-              <!-- 用户select选项 -->
+              <!-- 添加关联初始账号 -->
+              <div class="p-b-10">
+                <el-divider content-position="left" v-if="pageState === 'add'">
+                  <font class="fb f-s-18 normalFontColor">关联初始账号</font>
+                </el-divider>
+              </div>
+              <el-form-item label="账号" v-if="pageState === 'add'">
+                <el-input v-model="form.admin_name" placeholder="绑定店铺的初始账号。PS:此账号为管理员身份且不可变更" />
+              </el-form-item>
+              <el-form-item label="初始密码" class="m-b-20" v-if="pageState === 'add'">
+                <el-input show-password v-model="form.pwd" placeholder="'密码'" />
+              </el-form-item>
+              <!-- 添加店铺 -->
+              <div class="p-t-10 p-b-5" v-if="pageState === 'add'">
+                <el-divider content-position="left">
+                  <font class="fb f-s-18 normalFontColor">店铺参数</font>
+                </el-divider>
+              </div>
               <el-form-item v-if="pageState === 'edit'" label="商铺选择">
                 <SelectionShopId v-model="form.shop_id" />
               </el-form-item>
@@ -67,8 +84,8 @@
               </el-form-item>
               <!-- 退款订单备注预设 -->
               <el-form-item label="退款备注预设">
-                <el-tag :key="index" v-for="(tag, index) in form.refund_remark_presup" closable :disable-transitions="false"
-                  @close="handleCloseTagRefund(tag)">
+                <el-tag :key="index" v-for="(tag, index) in form.refund_remark_presup" closable
+                  :disable-transitions="false" @close="handleCloseTagRefund(tag)">
                   {{ tag }}
                 </el-tag>
                 <span class="" v-if="inputTagVisibleRefund">
@@ -125,6 +142,8 @@ export default {
       action: this.$store.state.settings.baseURL + this.$store.state.settings.apiAdminPath + 'upImgFile',
       myheader: { token: this.$store.state.user.token },
       form: {
+        admin_name: '', // 初始账号
+        pwd: '', // 初始密码
         shop_id: '',
         name: '',
         waiter: '',
@@ -238,6 +257,8 @@ export default {
       if (data.desc == null) {
         data.desc = ''
       }
+      this.admin_name = data.admin_name || ''
+      this.pwd = data.pwd || ''
       this.form.name = data.name
       this.form.waiter = data.waiter
       this.form.service_wx = data.service_wx