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

Reviewed-on: #120
This commit is contained in:
charles 2026-06-10 11:07:01 +08:00
commit e35b34ca69
3 changed files with 1526 additions and 430 deletions

View File

@ -85,7 +85,7 @@ async def publish_product_add(ns={}):
if ns.get('price') and ns.get('discount'):
ns_dic['discount_price'] = float(ns.get('price')) * float(ns['discount']) / 10
else:
ns_dic['discount_price'] = ns['price']
ns_dic['discount_price'] = ns.get('price')
user_role = await get_user_role({'userid': userid, 'sor': sor})
# 非客户角色不需要审批
if user_role != '客户' and user_role != '管理员':

View File

@ -630,7 +630,7 @@ export default {
const successMessage = this.publish_type === '2' ? '添加需求成功!' : '添加产品成功!'
this.$message.success(successMessage)
} else {
this.$message.error(res.msg || '添加失败,请重试')
// this.$message.error(res.msg || '')
}
}).catch(error => {
loading.close();