From 42ee9a01b6aa4f9c108e4223365d2bb3df9f0704 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Thu, 20 Jan 2022 17:59:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../admin/addShopType/addShopType.js | 69 ++--------------
.../admin/deleteShopType/deleteShopType.html | 6 +-
.../admin/deleteShopType/deleteShopType.js | 5 --
.../admin/editShopType/editShopType.js | 80 +------------------
4 files changed, 10 insertions(+), 150 deletions(-)
diff --git a/public/components/admin/addShopType/addShopType.js b/public/components/admin/addShopType/addShopType.js
index 191678901..19866258b 100644
--- a/public/components/admin/addShopType/addShopType.js
+++ b/public/components/admin/addShopType/addShopType.js
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
(function(vc) {
-=======
-(function (vc) {
->>>>>>> c6f99a4136d2a6450c08d47bb328ee07cf4bdb68
vc.extends({
propTypes: {
@@ -21,19 +17,11 @@
}
},
-<<<<<<< HEAD
_initMethod: function() {
},
_initEvent: function() {
vc.on('addShopType', 'openAddShopTypeModal', function() {
-=======
- _initMethod: function () {
-
- },
- _initEvent: function () {
- vc.on('addShopType', 'openAddShopTypeModal', function () {
->>>>>>> c6f99a4136d2a6450c08d47bb328ee07cf4bdb68
$('#addShopTypeModel').modal('show');
});
},
@@ -43,12 +31,7 @@
addShopTypeInfo: vc.component.addShopTypeInfo
}, {
-<<<<<<< HEAD
'addShopTypeInfo.typeName': [{
-=======
- 'addShopTypeInfo.typeName': [
- {
->>>>>>> c6f99a4136d2a6450c08d47bb328ee07cf4bdb68
limit: "required",
param: "",
errInfo: "店铺类型不能为空"
@@ -59,7 +42,6 @@
errInfo: "店铺类型太长"
},
],
-<<<<<<< HEAD
'addShopTypeInfo.isShow': [{
limit: "required",
param: "",
@@ -71,22 +53,6 @@
errInfo: "是否默认不能为空"
}, ],
'addShopTypeInfo.seq': [{
-=======
- 'addShopTypeInfo.isShow': [
- {
- limit: "required",
- param: "",
- errInfo: "是否展示不能为空"
- },],
- 'addShopTypeInfo.isDefault': [
- {
- limit: "required",
- param: "",
- errInfo: "是否默认不能为空"
- },],
- 'addShopTypeInfo.seq': [
- {
->>>>>>> c6f99a4136d2a6450c08d47bb328ee07cf4bdb68
limit: "required",
param: "",
errInfo: "显示序号不能为空"
@@ -95,16 +61,6 @@
limit: "num",
param: "",
errInfo: "显示序号不是有效数字"
-<<<<<<< HEAD
-=======
- },
- ],
- 'addShopTypeInfo.remark': [
- {
- limit: "maxLength",
- param: "120",
- errInfo: "描述太长"
->>>>>>> c6f99a4136d2a6450c08d47bb328ee07cf4bdb68
},
],
'addShopTypeInfo.remark': [{
@@ -112,17 +68,18 @@
param: "120",
errInfo: "描述太长"
}, ],
+ 'addShopTypeInfo.remark': [{
+ limit: "maxLength",
+ param: "120",
+ errInfo: "描述太长"
+ }, ],
});
},
-<<<<<<< HEAD
saveShopTypeInfo: function() {
-=======
- saveShopTypeInfo: function () {
->>>>>>> c6f99a4136d2a6450c08d47bb328ee07cf4bdb68
if (!vc.component.addShopTypeValidate()) {
vc.toast(vc.validate.errInfo);
@@ -138,18 +95,10 @@
vc.http.apiPost(
'/shopType/saveShopType',
-<<<<<<< HEAD
JSON.stringify(vc.component.addShopTypeInfo), {
emulateJSON: true
},
function(json, res) {
-=======
- JSON.stringify(vc.component.addShopTypeInfo),
- {
- emulateJSON: true
- },
- function (json, res) {
->>>>>>> c6f99a4136d2a6450c08d47bb328ee07cf4bdb68
//vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
let _json = JSON.parse(json);
if (_json.code == 0) {
@@ -163,22 +112,14 @@
vc.message(_json.msg);
},
-<<<<<<< HEAD
function(errInfo, error) {
-=======
- function (errInfo, error) {
->>>>>>> c6f99a4136d2a6450c08d47bb328ee07cf4bdb68
console.log('请求失败处理');
vc.message(errInfo);
});
},
-<<<<<<< HEAD
clearAddShopTypeInfo: function() {
-=======
- clearAddShopTypeInfo: function () {
->>>>>>> c6f99a4136d2a6450c08d47bb328ee07cf4bdb68
vc.component.addShopTypeInfo = {
shopTypeId: '',
typeName: '',
diff --git a/public/components/admin/deleteShopType/deleteShopType.html b/public/components/admin/deleteShopType/deleteShopType.html
index fb1ce09e6..5e637b324 100644
--- a/public/components/admin/deleteShopType/deleteShopType.html
+++ b/public/components/admin/deleteShopType/deleteShopType.html
@@ -8,7 +8,9 @@
-
| 确定删除店铺类型 |
|---|
+
+ | 确定删除店铺类型 |
+
-
+
\ No newline at end of file
diff --git a/public/components/admin/deleteShopType/deleteShopType.js b/public/components/admin/deleteShopType/deleteShopType.js
index 14635517a..d092db001 100644
--- a/public/components/admin/deleteShopType/deleteShopType.js
+++ b/public/components/admin/deleteShopType/deleteShopType.js
@@ -17,13 +17,8 @@
});
},
-<<<<<<< HEAD
methods: {
deleteShopType: function() {
-=======
- methods:{
- deleteShopType:function(){
->>>>>>> c6f99a4136d2a6450c08d47bb328ee07cf4bdb68
vc.http.apiPost(
'/shopType/deleteShopType',
JSON.stringify(vc.component.deleteShopTypeInfo), {
diff --git a/public/components/admin/editShopType/editShopType.js b/public/components/admin/editShopType/editShopType.js
index ff21192e9..25961f3e2 100644
--- a/public/components/admin/editShopType/editShopType.js
+++ b/public/components/admin/editShopType/editShopType.js
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
(function(vc, vm) {
-=======
-(function (vc, vm) {
->>>>>>> c6f99a4136d2a6450c08d47bb328ee07cf4bdb68
vc.extends({
data: {
@@ -17,39 +13,22 @@
}
},
-<<<<<<< HEAD
_initMethod: function() {
},
_initEvent: function() {
vc.on('editShopType', 'openEditShopTypeModal', function(_params) {
-=======
- _initMethod: function () {
-
- },
- _initEvent: function () {
- vc.on('editShopType', 'openEditShopTypeModal', function (_params) {
->>>>>>> c6f99a4136d2a6450c08d47bb328ee07cf4bdb68
vc.component.refreshEditShopTypeInfo();
$('#editShopTypeModel').modal('show');
vc.copyObject(_params, vc.component.editShopTypeInfo);
});
},
methods: {
-<<<<<<< HEAD
editShopTypeValidate: function() {
return vc.validate.validate({
editShopTypeInfo: vc.component.editShopTypeInfo
}, {
'editShopTypeInfo.typeName': [{
-=======
- editShopTypeValidate: function () {
- return vc.validate.validate({
- editShopTypeInfo: vc.component.editShopTypeInfo
- }, {
- 'editShopTypeInfo.typeName': [
- {
->>>>>>> c6f99a4136d2a6450c08d47bb328ee07cf4bdb68
limit: "required",
param: "",
errInfo: "店铺类型不能为空"
@@ -60,7 +39,6 @@
errInfo: "店铺类型太长"
},
],
-<<<<<<< HEAD
'editShopTypeInfo.isShow': [{
limit: "required",
param: "",
@@ -72,22 +50,6 @@
errInfo: "是否默认不能为空"
}, ],
'editShopTypeInfo.seq': [{
-=======
- 'editShopTypeInfo.isShow': [
- {
- limit: "required",
- param: "",
- errInfo: "是否展示不能为空"
- },],
- 'editShopTypeInfo.isDefault': [
- {
- limit: "required",
- param: "",
- errInfo: "是否默认不能为空"
- },],
- 'editShopTypeInfo.seq': [
- {
->>>>>>> c6f99a4136d2a6450c08d47bb328ee07cf4bdb68
limit: "required",
param: "",
errInfo: "显示序号不能为空"
@@ -98,7 +60,6 @@
errInfo: "显示序号不是有效数字"
},
],
-<<<<<<< HEAD
'editShopTypeInfo.remark': [{
limit: "maxLength",
param: "120",
@@ -113,25 +74,6 @@
});
},
editShopType: function() {
-=======
- 'editShopTypeInfo.remark': [
- {
- limit: "maxLength",
- param: "120",
- errInfo: "描述太长"
- },
- ],
- 'editShopTypeInfo.shopTypeId': [
- {
- limit: "required",
- param: "",
- errInfo: "店铺类型id不能为空"
- }]
-
- });
- },
- editShopType: function () {
->>>>>>> c6f99a4136d2a6450c08d47bb328ee07cf4bdb68
if (!vc.component.editShopTypeValidate()) {
vc.toast(vc.validate.errInfo);
return;
@@ -139,18 +81,10 @@
vc.http.apiPost(
'/shopType/updateShopType',
-<<<<<<< HEAD
JSON.stringify(vc.component.editShopTypeInfo), {
emulateJSON: true
},
function(json, res) {
-=======
- JSON.stringify(vc.component.editShopTypeInfo),
- {
- emulateJSON: true
- },
- function (json, res) {
->>>>>>> c6f99a4136d2a6450c08d47bb328ee07cf4bdb68
//vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
let _json = JSON.parse(json);
if (_json.code == 0) {
@@ -161,21 +95,13 @@
}
vc.message(_json.msg);
},
-<<<<<<< HEAD
function(errInfo, error) {
-=======
- function (errInfo, error) {
->>>>>>> c6f99a4136d2a6450c08d47bb328ee07cf4bdb68
console.log('请求失败处理');
vc.message(errInfo);
});
},
-<<<<<<< HEAD
refreshEditShopTypeInfo: function() {
-=======
- refreshEditShopTypeInfo: function () {
->>>>>>> c6f99a4136d2a6450c08d47bb328ee07cf4bdb68
vc.component.editShopTypeInfo = {
shopTypeId: '',
shopTypeId: '',
@@ -190,8 +116,4 @@
}
});
-<<<<<<< HEAD
-})(window.vc, window.vc.component);
-=======
-})(window.vc, window.vc.component);
->>>>>>> c6f99a4136d2a6450c08d47bb328ee07cf4bdb68
+})(window.vc, window.vc.component);
\ No newline at end of file