Commit fb5e2c61 authored by 刘小敏's avatar 刘小敏

fix: 修复华为OBS上传签名及佣金等级展示问题

parent 8179c67a
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
<el-form-item label="等级徽章" prop="image"> <el-form-item label="等级徽章" prop="image">
<sa-uploader v-model="form.model.image"></sa-uploader> <sa-uploader v-model="form.model.image"></sa-uploader>
</el-form-item> </el-form-item>
<el-form-item label="一级(自购)佣金比例" prop="commission_rules.commission_1" <el-form-item label="一级佣金比例" prop="commission_rules.commission_1"
:rules="form.rules.commission_rules.commission"> :rules="form.rules.commission_rules.commission">
<el-input class="sa-w-360" v-model="form.model.commission_rules.commission_1" type="number"> <el-input class="sa-w-360" v-model="form.model.commission_rules.commission_1" type="number">
<template #append>%</template> <template #append>%</template>
...@@ -104,12 +104,12 @@ ...@@ -104,12 +104,12 @@
<template #append>%</template> <template #append>%</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="三级佣金比例" prop="commission_rules.commission_3" <!-- <el-form-item label="三级佣金比例" prop="commission_rules.commission_3"
:rules="form.rules.commission_rules.commission"> :rules="form.rules.commission_rules.commission">
<el-input class="sa-w-360" v-model="form.model.commission_rules.commission_3" type="number"> <el-input class="sa-w-360" v-model="form.model.commission_rules.commission_3" type="number">
<template #append>%</template> <template #append>%</template>
</el-input> </el-input>
</el-form-item> </el-form-item> -->
<template v-if="form.model.level != 1"> <template v-if="form.model.level != 1">
<div class="sa-title is-line">添加升级条件</div> <div class="sa-title is-line">添加升级条件</div>
<el-form-item label="升级方式" prop="upgrade_rules"> <el-form-item label="升级方式" prop="upgrade_rules">
......
...@@ -30,15 +30,15 @@ ...@@ -30,15 +30,15 @@
<sa-image :url="scope.row.image" size="24"></sa-image> <sa-image :url="scope.row.image" size="24"></sa-image>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="一级(自购)佣金比例" min-width="160"> <el-table-column label="一级佣金比例" min-width="160">
<template #default="scope"> {{ scope.row.commission_rules?.commission_1 }}% </template> <template #default="scope"> {{ scope.row.commission_rules?.commission_1 }}% </template>
</el-table-column> </el-table-column>
<el-table-column label="二级佣金比例" min-width="120"> <el-table-column label="二级佣金比例" min-width="120">
<template #default="scope"> {{ scope.row.commission_rules?.commission_2 }}% </template> <template #default="scope"> {{ scope.row.commission_rules?.commission_2 }}% </template>
</el-table-column> </el-table-column>
<el-table-column label="三级佣金比例" min-width="120"> <!-- <el-table-column label="三级佣金比例" min-width="120">
<template #default="scope"> {{ scope.row.commission_rules?.commission_3 }}% </template> <template #default="scope"> {{ scope.row.commission_rules?.commission_3 }}% </template>
</el-table-column> </el-table-column> -->
<el-table-column label="操作" min-width="120" fixed="right"> <el-table-column label="操作" min-width="120" fixed="right">
<template #default="scope"> <template #default="scope">
{if $auth->check('shopro/commission/level/edit')} {if $auth->check('shopro/commission/level/edit')}
......
...@@ -199,7 +199,7 @@ if (typeof Config.upload.storage !== 'undefined' && Config.upload.storage === 'h ...@@ -199,7 +199,7 @@ if (typeof Config.upload.storage !== 'undefined' && Config.upload.storage === 'h
file.date = data.date; file.date = data.date;
file.uploadId = data.uploadId; file.uploadId = data.uploadId;
file.policy = data.policy; file.policy = data.policy;
file.signature = data.Signature; file.Signature = data.Signature; // OBS要求大写S
file.partsAuthorization = data.partsAuthorization; file.partsAuthorization = data.partsAuthorization;
file.headers = data.headers; file.headers = data.headers;
delete data.headers; delete data.headers;
...@@ -288,8 +288,8 @@ if (typeof Config.upload.storage !== 'undefined' && Config.upload.storage === 'h ...@@ -288,8 +288,8 @@ if (typeof Config.upload.storage !== 'undefined' && Config.upload.storage === 'h
this.on("sending", function (file, xhr, formData) { this.on("sending", function (file, xhr, formData) {
var that = this; var that = this;
var _send = xhr.send; var _send = xhr.send;
//仅允许部分字段 //仅允许部分字段(V4签名需要额外字段,OBS要求固定字段名和顺序)
var allowFields = ['partNumber', 'uploadId', 'key', 'AccessKeyId', 'policy', 'Signature', 'X-Amz-Algorithm', 'X-Amz-Credential', 'X-Amz-Date', 'acl', 'file']; var allowFields = ['partNumber', 'uploadId','key', 'X-Amz-Algorithm', 'X-Amz-Credential', 'X-Amz-Date', 'AccessKeyId', 'policy', 'Signature', 'acl', 'file'];
formData.forEach(function (value, key) { formData.forEach(function (value, key) {
if (allowFields.indexOf(key) < 0) { if (allowFields.indexOf(key) < 0) {
formData.delete(key); formData.delete(key);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment