From dea41b6ba0ea12d1b4afd377339e8c5d29873e68 Mon Sep 17 00:00:00 2001
From: heshupeng <hsp@bronet.cn>
Date: Thu, 24 Dec 2020 20:16:00 +0800
Subject: [PATCH] 商品编辑富文本
---
application/admin/view/shopro/goods/goods/add.html | 8 ++++----
application/admin/view/shopro/goods/goods/edit.html | 10 +++++-----
2 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 59684f9..b08e973 100644
--- a/application/admin/view/shopro/goods/goods/add.html
+++ b/application/admin/view/shopro/goods/goods/add.html
@@ -515,7 +515,7 @@ width: 100%;
<img src="/assets/addons/shopro/img/goods/selected.png">
</div>
</div>
- <div class="goods-type" @click="changeGoodsType('virtual')"
+ <!--<div class="goods-type" @click="changeGoodsType('virtual')"
:style="{border:goodsDetail.type=='virtual'?'1px solid #7438D5':'1px solid #E6E6E6'}">
<img class="label-auto goods-type-img"
src="/assets/addons/shopro/img/goods/virtual.png">
@@ -523,7 +523,7 @@ width: 100%;
:style="{display:goodsDetail.type=='virtual'?'block':''}">
<img src="/assets/addons/shopro/img/goods/selected.png">
</div>
- </div>
+ </div>-->
</div>
</el-form-item>
@@ -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">
@@ -1021,7 +1021,7 @@ width: 100%;
</div>
</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 01ac478..b176dd2 100644
--- a/application/admin/view/shopro/goods/goods/edit.html
+++ b/application/admin/view/shopro/goods/goods/edit.html
@@ -504,7 +504,7 @@
<img src="/assets/addons/shopro/img/goods/selected.png">
</div>
</div>
- <div v-if="goodsDetail.type!='normal'" class="goods-type"
+ <!--<div v-if="goodsDetail.type!='normal'" class="goods-type"
@click="changeGoodsType('virtual')"
:style="{border:goodsDetail.type=='virtual'?'1px solid #7438D5':'1px solid #E6E6E6'}">
<img class="label-auto goods-type-img"
@@ -513,7 +513,7 @@
:style="{display:goodsDetail.type=='virtual'?'block':''}">
<img src="/assets/addons/shopro/img/goods/selected.png">
</div>
- </div>
+ </div>-->
</div>
</el-form-item>
@@ -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">
@@ -1008,7 +1008,7 @@
</div>
</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;">
@@ -1019,7 +1019,7 @@
color: #606266;">{:__('Content')}:</label>
<div style="flex: 1;">
<textarea id="c-content" class="form-control editor" rows="5" name="row[content]"
- cols="50"></textarea>
+ cols="50">{$row.content|htmlentities}</textarea>
</div>
</div>
</form>
--
libgit2 0.24.0