shish 6 лет назад
Родитель
Сommit
4c21c2dfdf
3 измененных файлов с 54 добавлено и 10 удалено
  1. 12 10
      shop/src/views/staff/list.vue
  2. 31 0
      store/src/admin/adminShop/bind.vue
  3. 11 0
      store/src/pages.json

+ 12 - 10
shop/src/views/staff/list.vue

@@ -77,7 +77,7 @@
 					label-width="100px"
 					label-width="100px"
 					class="demo-form"
 					class="demo-form"
 				>
 				>
-					<el-form-item label="员工姓名" prop="adminName">
+					<el-form-item label="姓名" prop="adminName">
 						<el-input
 						<el-input
 							v-model="adForm.adminName"
 							v-model="adForm.adminName"
 							placeholder="请输入姓名"
 							placeholder="请输入姓名"
@@ -99,6 +99,7 @@
 							>
 							>
 						</el-select>
 						</el-select>
 					</el-form-item>
 					</el-form-item>
+					<!--
 					<el-form-item label="绑定微信" prop="userId">
 					<el-form-item label="绑定微信" prop="userId">
 						<div>
 						<div>
 							<div class="member-wrap flex-center" v-if="!$util.isEmpty(memberData)">
 							<div class="member-wrap flex-center" v-if="!$util.isEmpty(memberData)">
@@ -121,13 +122,7 @@
 							</div>
 							</div>
 						</div>
 						</div>
 					</el-form-item>
 					</el-form-item>
-					<el-form-item label="收款通知" prop="remind">
-						<el-switch
-							v-model="adForm.remind"
-							active-value="1"
-							inactive-value="0"
-						></el-switch>
-					</el-form-item>
+					-->
 					<el-form-item label="登陆密码" prop="password">
 					<el-form-item label="登陆密码" prop="password">
 						<el-input
 						<el-input
 							v-model="adForm.password"
 							v-model="adForm.password"
@@ -139,7 +134,14 @@
 					<el-form-item label="备注">
 					<el-form-item label="备注">
 						<el-input v-model="adForm.remark" type="textarea" size="small"></el-input>
 						<el-input v-model="adForm.remark" type="textarea" size="small"></el-input>
 					</el-form-item>
 					</el-form-item>
-					<el-form-item label="是否启用" prop="status">
+					<el-form-item label="收款通知" prop="remind">
+						<el-switch
+							v-model="adForm.remind"
+							active-value="1"
+							inactive-value="0"
+						></el-switch>
+					</el-form-item>
+					<el-form-item label="启用状态" prop="status">
 						<el-switch
 						<el-switch
 							v-model="adForm.status"
 							v-model="adForm.status"
 							active-value="1"
 							active-value="1"
@@ -197,7 +199,7 @@ export default {
 			ruleForm: {
 			ruleForm: {
 				adminName: [{ required: true, message: '请输入名称', trigger: 'blur' }],
 				adminName: [{ required: true, message: '请输入名称', trigger: 'blur' }],
 				roleName: [{ required: true, message: '请选择角色', trigger: 'change' }],
 				roleName: [{ required: true, message: '请选择角色', trigger: 'change' }],
-				userId: [{ required: true, message: '请选择会员', trigger: 'blur' }],
+				//userId: [{ required: true, message: '请选择会员', trigger: 'blur' }],
 				password: { required: true, message: '请输入密码', trigger: 'blur' }
 				password: { required: true, message: '请输入密码', trigger: 'blur' }
 			},
 			},
 			// 角色列表
 			// 角色列表

+ 31 - 0
store/src/admin/adminShop/bind.vue

@@ -0,0 +1,31 @@
+<template>
+  <view>
+    <view style="font-size:16px;margin-left:30px;" @click="goTo">去官网</view>
+  </view>
+</template>
+<script>
+import { getMerchantDetail } from "@/api/merchant";
+export default {
+  name: "console",
+  data() {
+    return {};
+  },
+  onLoad() {},
+  methods: {
+    goTo() {
+      this.$util.pageTo({
+        url: "/admin/official/index",
+        type: 2
+      });
+    },
+    goToConsole() {
+      this.$util.pageTo({
+        url: "/admin/home/workbench",
+        type: 3
+      });
+    }
+  }
+};
+</script>
+<style lang='scss' scoped>
+</style>

+ 11 - 0
store/src/pages.json

@@ -298,6 +298,17 @@
 				}
 				}
 			]
 			]
 		},
 		},
+		{
+			"root": "admin/adminShop",
+			"pages": [
+				{
+					"path": "bind",
+					"style": {
+						"navigationBarTitleText": "管理员绑定"
+					}
+				}
+			]
+		},
 		{
 		{
 			"root": "admin/assets",
 			"root": "admin/assets",
 			"pages": [
 			"pages": [