diff --git a/b/product/product_category_search.dspy b/b/product/product_category_search.dspy index 7894e9b..3f37b8a 100644 --- a/b/product/product_category_search.dspy +++ b/b/product/product_category_search.dspy @@ -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 diff --git a/f/web-kboss/src/views/homePage/ncmatch/mainPage/sendProduct/index.vue b/f/web-kboss/src/views/homePage/ncmatch/mainPage/sendProduct/index.vue index cce95c7..91f0d48 100644 --- a/f/web-kboss/src/views/homePage/ncmatch/mainPage/sendProduct/index.vue +++ b/f/web-kboss/src/views/homePage/ncmatch/mainPage/sendProduct/index.vue @@ -148,14 +148,14 @@ ¥ - {{ Number(form.price)* 0.03.toFixed(2) }} - {{ (Number(form.price) * Number(form.discount) / 10 * 0.03).toFixed(2) }} + {{ Number(form.price)* 0.01.toFixed(2) }} + {{ (Number(form.price) * Number(form.discount) / 10 * 0.01).toFixed(2) }} - @@ -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) {