shopAdmin修改

shop/src/cool/request/index.js

@@ -8,7 +8,7 @@ import member from '@/service/member/index';
 import goods from '@/service/goods/index';
 import level from '@/service/level/index';
 import category from '@/service/category/index';
-import adminShop from '@/service/admin-shop/index';
+import shopAdmin from '@/service/shop-admin/index';
 import invite from '@/service/invite/index';
 import coupon from '@/service/coupon/index';
 import ad from '@/service/ad/index';
@@ -46,7 +46,7 @@ export function SET_SERVICE({ store }) {
 		coupon,
 		ad,
 		staff,
-		adminShop,
+		shopAdmin,
 		role,
 		single,
 		setting,

shop/src/service/common/index.js

@@ -224,14 +224,14 @@ export class CommonService extends BaseService {
 
 	updateRemind(params) {
 		return this.request({
-			url: '/admin-shop/update-remind',
+			url: '/shop-admin/update-remind',
 			params
 		});
 	}
 
 	updateStatus(params) {
 		return this.request({
-			url: '/admin-shop/update-status',
+			url: '/shop-admin/update-status',
 			params
 		});
 	}

shop/src/service/admin-shop/index.js → shop/src/service/shop-admin/index.js

@@ -1,7 +1,7 @@
 import { BaseService, Service } from '@/cool';
 
-@Service('admin-shop')
-export class AdminShopService extends BaseService {
+@Service('shop-admin')
+export class ShopAdminService extends BaseService {
 
 	prepareBind(data) {
 		return this.request({
@@ -12,4 +12,4 @@ export class AdminShopService extends BaseService {
 	}
 }
 
-export default new AdminShopService();
+export default new ShopAdminService();

shop/src/views/staff/list.vue

@@ -298,11 +298,11 @@ export default {
 			delete adForm.roleName;
 			if (this.addOrModify == 1) {
 				host = () => {
-					return this.$service.adminShop.prepareBind(this.adForm);
+					return this.$service.shopAdmin.prepareBind(this.adForm);
 				};
 			} else {
 				host = () => {
-					return this.$service.adminShop.update({
+					return this.$service.shopAdmin.update({
 						id: this.modifyData.id,
 						...adForm
 					});
@@ -342,7 +342,7 @@ export default {
 		// x-crud 组件ad
 		onLoad({ ctx, app }) {
 			this.app = app;
-			ctx.service(this.$service.adminShop)
+			ctx.service(this.$service.shopAdmin)
 				.set('table', {
 					columns: [
 						{

store/src/admin/adminShop/bind.vue → store/src/admin/shopAdmin/bind.vue

@@ -68,7 +68,7 @@
 import { mapGetters } from "vuex";
 import TuiListCell from "@/components/plugin/list-cell";
 const form = require("@/utils/formValidation.js");
-import { generateAdmin } from "@/api/admin-shop";
+import { generateAdmin } from "@/api/shop-admin";
 import { getWxInfo, getWxPhone } from "@/api/mini";
 export default {
   name: "bind",

store/src/admin/staff/add.vue

@@ -125,7 +125,7 @@ import {
   updateStaff as update
 } from "@/api/staff";
 import { getDet as getMemberDet } from "@/api/member";
-import { prepareBind } from "@/api/admin-shop";
+import { prepareBind } from "@/api/shop-admin";
 export default {
   name: "staff-add",
   components: {

store/src/mixins/globalMixins.js

@@ -36,9 +36,9 @@ export default {
 					// @傅威 明天要发版，我做了个临时解决方案，这块请优化
 					//现在我们分 官网 和 后台 的页面。其中官网页面不多，只有4个页面
 					//shopId=0 （即非管理员） 时不能让访问后台的页面
-					//不管shopId值是多少（是否管理员），有些页面都应允许访问，如下面的：admin/adminShop/bind
+					//不管shopId值是多少（是否管理员），有些页面都应允许访问，如下面的：admin/shopAdmin/bind
 
-					var urlArr = ['admin/adminShop/bind', 'admin/official'];
+					var urlArr = ['admin/shopAdmin/bind', 'admin/official'];
 					var redirectPage = res.redirectPage;
 					var needRedirect = true;
 					urlArr.forEach((item, index, array) => {

store/src/pages.json

@@ -297,7 +297,7 @@
 			]
 		},
 		{
-			"root": "admin/adminShop",
+			"root": "admin/shopAdmin",
 			"pages": [
 				{
 					"path": "bind",