From 0ec6d4409d0b59e9a5ca8e7ae11f7d963a382457 Mon Sep 17 00:00:00 2001
From: heshupeng <hsp@bronet.cn>
Date: Thu, 14 Jan 2021 13:54:18 +0800
Subject: [PATCH] 服务标签
---
application/admin/view/shopro/goods/goods/add.html | 8 ++++----
application/admin/view/shopro/goods/goods/edit.html | 8 ++++----
public/assets/js/backend/shopro/goods/service.js | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/application/admin/view/shopro/goods/goods/add.html b/application/admin/view/shopro/goods/goods/add.html
index 28e21c4..65e9d15 100644
--- a/application/admin/view/shopro/goods/goods/add.html
+++ b/application/admin/view/shopro/goods/goods/add.html
@@ -959,7 +959,7 @@ width: 100%;
</div>
</div>
</div>
- <!--<div v-if="stepActive==3">
+ <div v-if="stepActive==3">
<el-form-item label="服务标签：">
<div class="display-flex">
<div class="flex-1">
@@ -975,7 +975,7 @@ width: 100%;
</div>
</div>
</el-form-item>
- <el-form-item label="参数详情：">
+ <!--<el-form-item label="参数详情：">
<div>
<div class="goods-detail-table">
<div class="display-flex goods-detail-item">
@@ -1019,9 +1019,9 @@ width: 100%;
<span>添加参数</span>
</div>
</div>
- </el-form-item>
+ </el-form-item>-->
- </div>-->
+ </div>
<form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action=""
v-show="stepActive==3">
<div class="display-flex" style="margin: 0;align-items: flex-start;">
diff --git a/application/admin/view/shopro/goods/goods/edit.html b/application/admin/view/shopro/goods/goods/edit.html
index e71396c..41fb571 100644
--- a/application/admin/view/shopro/goods/goods/edit.html
+++ b/application/admin/view/shopro/goods/goods/edit.html
@@ -946,7 +946,7 @@
</div>
</div>
</div>
- <!--<div v-if="stepActive==3">
+ <div v-if="stepActive==3">
<el-form-item label="服务标签：">
<div class="display-flex">
<div class="flex-1">
@@ -962,7 +962,7 @@
</div>
</div>
</el-form-item>
- <el-form-item label="参数详情：">
+ <!--<el-form-item label="参数详情：">
<div>
<div class="goods-detail-table">
<div class="display-flex goods-detail-item">
@@ -1006,9 +1006,9 @@
<span>添加参数</span>
</div>
</div>
- </el-form-item>
+ </el-form-item>-->
- </div>-->
+ </div>
<form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action=""
v-show="stepActive==3">
<div class="display-flex" style="margin: 0;align-items: flex-start;">
diff --git a/public/assets/js/backend/shopro/goods/service.js b/public/assets/js/backend/shopro/goods/service.js
index 0246431..5e75f87 100644
--- a/public/assets/js/backend/shopro/goods/service.js
+++ b/public/assets/js/backend/shopro/goods/service.js
@@ -50,7 +50,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
// 初始化表格
table.bootstrapTable({
- url: 'shopro/goods_service/recyclebin' + location.search,
+ url: 'shopro/goods/service/recyclebin' + location.search,
pk: 'id',
sortName: 'id',
columns: [
--
libgit2 0.24.0