From e689c750f4390575ff619c212573be2f12e64618 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 23 Jan 2025 11:33:11 +0800
Subject: [PATCH] refactor(mall): 重构小程序定时任务获取 access_token 方式 - 移除 XcxProperties 类的使用 - 使用 @Value 注解直接注入小程序 appid 和 secret - 优化代码结构，提高可读性和维护性
---
src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html | 159 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 96 insertions(+), 63 deletions(-)
diff --git a/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html b/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
index 1698083..e250950 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
@@ -28,7 +28,7 @@
<label class="layui-form-label febs-form-item-require">商品编号：</label>
<div class="layui-input-block">
<input type="text" name="goodsNo" lay-verify="required"
- placeholder="" autoComplete="off" class="layui-input">
+ placeholder="" autoComplete="off" class="layui-input" readonly>
</div>
</div>
</div>
@@ -112,24 +112,21 @@
</div>
</div>
- <div class="layui-form-item febs-hide tc-set">
- <label class="layui-form-label">静态倍数</label>
- <div class="layui-input-block">
- <input type="text" name="staticMulti" placeholder="请输入静态倍数"
- autoComplete="off" class="layui-input">
- <div class="layui-form-mid layui-word-aux">支付后，赠送（购买金额*静态倍数）的赠送积分
- </div>
- </div>
- </div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">推销员返积分比例(%)</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input type="text" name="staticMulti" placeholder="请输入推销员返积分比例" autocomplete="off" class="layui-input">-->
+<!-- </div>-->
+<!-- </div>-->
- <div class="layui-form-item febs-hide tc-set">
- <label class="layui-form-label">静态占比(%)</label>
- <div class="layui-input-block">
- <input type="text" name="staticProp" placeholder="请输入静态占比"
- autoComplete="off" class="layui-input">
- <div class="layui-form-mid layui-word-aux">所有套餐静态占比相加应等于100%</div>
- </div>
- </div>
+<!-- <div class="layui-form-item febs-hide tc-set">-->
+<!-- <label class="layui-form-label">静态占比(%)</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input type="text" name="staticProp" placeholder="请输入静态占比"-->
+<!-- autoComplete="off" class="layui-input">-->
+<!-- <div class="layui-form-mid layui-word-aux">所有套餐静态占比相加应等于100%</div>-->
+<!-- </div>-->
+<!-- </div>-->
</div>
<div class="layui-tab-item">
@@ -193,14 +190,25 @@
</div>
</div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label febs-form-item-require">商品详情：</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <textarea id="goodsDetailsUpdate" lay-verify="content" name="goodsDetails" class="layui-textarea"></textarea>-->
+<!--<!– <div style="border: 1px solid #ccc;">–>-->
+<!--<!– <div id="toolbar-container-good-update" style="border-bottom: 1px solid #ccc;"></div>–>-->
+<!--<!– <div id="editor-container-good-update" style="height: 300px;"></div>–>-->
+<!--<!– </div>–>-->
+<!-- </div>-->
+<!-- </div>-->
+
<div class="layui-form-item">
<label class="layui-form-label febs-form-item-require">商品详情：</label>
<div class="layui-input-block">
- <textarea id="goodsDetailsUpdate" lay-verify="content" name="goodsDetails" class="layui-textarea"></textarea>
-<!-- <div style="border: 1px solid #ccc;">-->
-<!-- <div id="toolbar-container-good-update" style="border-bottom: 1px solid #ccc;"></div>-->
-<!-- <div id="editor-container-good-update" style="height: 300px;"></div>-->
-<!-- </div>-->
+ <!-- <textarea id="goodsDetailEditAdd" lay-verify="content" name = "goodsDetails" class="layui-textarea"></textarea>-->
+ <div style="border: 1px solid #ccc;">
+ <div id="toolbar-container" class="toolbar"></div>
+ <div id="text-container" class="text" style="height: 450px;"></div>
+ </div>
</div>
</div>
</div>
@@ -410,25 +418,49 @@
elem: '#febs-form-group-date'
});
- layedit.set({ //设置图片接口
- uploadImage: {
- url: 'admin/goods/uploadFileBase64', //接口url
- type: 'post',
+ // layedit.set({ //设置图片接口
+ // uploadImage: {
+ // url: 'admin/goods/uploadFileBase64', //接口url
+ // type: 'post',
+ // }
+ // });
+ //
+ // //创建一个编辑器
+ // var indexUpdate = layedit.build('goodsDetailsUpdate',{
+ // height: 300
+ // });
+ // form.verify({
+ // //content富文本域中的lay-verify值
+ // content: function(value) {
+ // return layedit.sync(indexUpdate);
+ // }
+ // });
+ const E = window.wangEditor;
+ const editor = new E('#toolbar-container', '#text-container'); // 传入两个元素
+ editor.config.showLinkImg = false;
+ editor.config.uploadFileName = 'file';
+ editor.config.customUploadImg = function (files, insertImgFn) {
+ // files 是 input 中选中的文件列表
+ // insertImgFn 是获取图片 url 后，插入到编辑器的方法
+ // 上传图片，返回结果，将图片插入到编辑器中
+ for (let i = 0; i < files.length; i++){
+ var form = new FormData();
+ form.append("file", files[0]);
+ $.ajax({
+ url:'/admin/goods/uploadFileBase64',
+ type: "post",
+ processData: false,
+ contentType: false,
+ data: form,
+ dataType: 'json',
+ success(res) {
+ // 上传代码返回结果之后，将图片插入到编辑器中
+ insertImgFn(res.data.src, res.data.title, '')
+ }
+ })
}
- });
-
- //创建一个编辑器
- var indexUpdate = layedit.build('goodsDetailsUpdate',{
- height: 300
- });
- form.verify({
- //content富文本域中的lay-verify值
- content: function(value) {
- return layedit.sync(indexUpdate);
- }
- });
-
- formSelects.render();
+ };
+ editor.create();
// var E = window.wangEditor;
// const editorConfig = { MENU_CONF: {} };
@@ -442,7 +474,7 @@
var category = xmSelect.render({
el: '#goods-category',
- language: 'zn',
+ language: 'zh',
prop : {
value : 'id',
children : 'child'
@@ -460,18 +492,9 @@
data: []
})
- febs.get(ctx + 'admin/goodsCategory/categoryTree', null, function(res) {
- category.update({
- data : res.data,
- autoRow: true,
- });
-
- // initValue();
- })
-
var couponRule = xmSelect.render({
el: '#coupon-rule',
- language: 'zn',
+ language: 'zh',
prop : {
value : 'id',
children : 'child'
@@ -489,18 +512,9 @@
data: []
})
- febs.get(ctx + 'admin/goods/couponTreeSet', null, function(res) {
- couponRule.update({
- data : res.data,
- autoRow: true,
- });
-
- initValue();
- })
-
var carriageRule = xmSelect.render({
el: '#carriage-rule',
- language: 'zn',
+ language: 'zh',
prop : {
value : 'id',
children : 'child'
@@ -524,6 +538,23 @@
autoRow: true,
});
})
+
+ febs.get(ctx + 'admin/goods/couponTreeSet', null, function(res) {
+ couponRule.update({
+ data : res.data,
+ autoRow: true,
+ });
+ })
+
+ febs.get(ctx + 'admin/goodsCategory/categoryTree', null, function(res) {
+ category.update({
+ data : res.data,
+ autoRow: true,
+ });
+ initValue();
+ })
+
+ formSelects.render();
var tableSkuData = [];
@@ -879,7 +910,8 @@
reloadTable(skus);
}
- layedit.setContent(indexUpdate,goodsInfo.goodsDetails, false);
+ editor.txt.html(goodsInfo.goodsDetails);
+ // layedit.setContent(indexUpdate,, false);
}
form.on('submit(goods-update-form-submit)', function (data) {
@@ -897,6 +929,7 @@
data.field.categoryId = category.getValue('valueStr');
data.field.carriageRuleId = carriageRule.getValue('valueStr');
// data.field.goodsDetails = editor.getHtml();
+ data.field.goodsDetails = editor.txt.html();
$.ajax({
'url': ctx + 'admin/goods/updateMallGoods',
'type': 'post',
--
Gitblit v1.9.1