yumoqing/kboss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'main' (#14) from main into prod

Browse Source 
Reviewed-on: #14
This commit is contained in:
charles 2025-08-19 20:34:22 +08:00
commit 7ff8481e70
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
b/product/product_category_search.dspy
View File

@ -64,7 +64,7 @@ async def product_category_search(ns={}):
orgid = user_list[0]['orgid']
user_role = await get_user_role({'userid': userid, 'sor': sor})
try:
if user_role == '客户':
if user_role == '客户' or user_role == '管理员':
find_sql = """SELECT * FROM user_publish_product_category WHERE domain_name = '%s' AND permission = '1' AND del_flg = '0' ORDER BY priority;""" % domain_name
else:
find_sql = """SELECT * FROM user_publish_product_category WHERE domain_name = '%s' AND del_flg = '0' ORDER BY priority;""" % domain_name

9
f/web-kboss/src/views/homePage/ncmatch/mainPage/sendProduct/index.vue
View File

@ -148,14 +148,14 @@
<el-form-item class="full-width">
<template slot="label">
<span>平台服务费用</span>
<el-tooltip content="平台服务费用为商品价格的3%，如有疑问请联系客服进行处理。" placement="top" effect="light">
<el-tooltip content="平台服务费用为商品价格的1%，如有疑问请联系客服进行处理。" placement="top" effect="light">
<i class="el-icon-warning-outline"
style="margin-left: 5px; color: #333; cursor: pointer;"></i>
</el-tooltip>
</template>
<span v-if=" form.price && !isNaN(Number(form.price))" style="color: red;font-size: 14px;font-weight: bold;">￥
<span v-if="form.discount == 0 || !form.discount">{{ Number(form.price)* 0.03.toFixed(2) }}</span>
<span v-else>{{ (Number(form.price) * Number(form.discount) / 10 * 0.03).toFixed(2) }}</span>
<span v-if="form.discount == 0 || !form.discount">{{ Number(form.price)* 0.01.toFixed(2) }}</span>
<span v-else>{{ (Number(form.price) * Number(form.discount) / 10 * 0.01).toFixed(2) }}</span>
</span>
<span v-else>-</span>
@ -285,7 +285,7 @@ export default {
},
rules: {
product_name: [
{ required: true, message: '请输入商品名称', trigger: 'blur' }
{ required: true, message: '请输入名称', trigger: 'blur' }
],
product_category: [
{ required: true, message: '请选择所属类别', trigger: 'change' }
@ -605,6 +605,7 @@ export default {
formdata.append(key, this.form[key]);
}
formdata.append('publish_type', this.publish_type)
formdata.append('service_charge',this.form.discount==0?this.form.price*0.01: this.form.price*this.form.discount/10*0.01)
// 如果是编辑模式，添加编辑标识
if (this.isEdit) {