admingit/MicroCommunityWeb
1
0
Fork 0
mirror of https://gitee.com/java110/MicroCommunityWeb.git synced 2026-02-23 21:36:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

优化代码

Browse Source
This commit is contained in:
java110 2022-01-20 17:59:41 +08:00
parent 230742c2f8
commit 42ee9a01b6
4 changed files with 10 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
public/components/admin/addShopType/addShopType.js
View File

@ -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: '',

6
public/components/admin/deleteShopType/deleteShopType.html
View File

@ -8,7 +8,9 @@
</button>
</div>
<div class="modal-body">
<tr align="center"><th>确定删除店铺类型</th></tr>
<tr align="center">
<th>确定删除店铺类型</th>
</tr>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal" v-on:click="closeDeleteShopTypeModel()">点错了</button>
@ -16,4 +18,4 @@
</div>
</div>
</div>
</div>
</div>

5
public/components/admin/deleteShopType/deleteShopType.js
View File

@ -17,13 +17,8 @@
});
},
<<<<<<< HEAD
methods: {
deleteShopType: function() {
=======
methods:{
deleteShopType:function(){
>>>>>>> c6f99a4136d2a6450c08d47bb328ee07cf4bdb68
vc.http.apiPost(
'/shopType/deleteShopType',
JSON.stringify(vc.component.deleteShopTypeInfo), {

80
public/components/admin/editShopType/editShopType.js
View File

@ -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);