zhuce
/
lilishop-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并master

master
lemon橪 2021-06-11 09:52:05 +08:00
parent c9ea7ba898 b7a2a681c2
commit e71ae35b17
5 changed files with 58 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
manager/src/views/promotion/coupon/coupon.vue
View File

@ -90,16 +90,15 @@ export default {
{ {
title: "活动名称", title: "活动名称",
key: "promotionName", key: "promotionName",
width: 120,
fixed: "left", fixed: "left",
}, },
{ {
title: "优惠券名称", title: "优惠券名称",
key: "couponName", key: "couponName",
width: 120,
tooltip: true, tooltip: true
}, }, {
{
title: "面额/折扣", title: "面额/折扣",
key: "price", key: "price",
width: 120, width: 120,
@ -121,10 +120,9 @@ export default {
width: 150, width: 150,
render: (h, params) => { render: (h, params) => {
return h( return h(
"div", "div", params.row.receivedNum + "/" + params.row.publishNum)
params.row.receivedNum + "/" + params.row.publishNum
);
}, },
minWidth:130,
}, },
{ {
title: "优惠券类型", title: "优惠券类型",
@ -168,6 +166,7 @@ export default {
}, },
}); });
}, },
minWidth:150,
}, },
{ {
title: "状态", title: "状态",
@ -202,13 +201,14 @@ export default {
), ),
]); ]);
}, },
minWidth:70,
}, },
{ {
title: "操作", title: "操作",
slot: "action", slot: "action",
align: "center", align: "center",
fixed: "right", fixed: "right",
width: 100, minWidth: 140
}, },
], ],
data: [], // 表单数据 data: [], // 表单数据

3
seller/src/views/goods/goods-seller/goods.vue
View File

@ -224,7 +224,7 @@ export default {
{ {
title: "商品编号", title: "商品编号",
key: "sn", key: "sn",
width: 200, width: 100,
tooltip: true, tooltip: true,
}, },
{ {
@ -336,6 +336,7 @@ export default {
title: "操作", title: "操作",
key: "action", key: "action",
align: "center", align: "center",
fixed: "right",
width: 200, width: 200,
render: (h, params) => { render: (h, params) => {
let enableOrDisable = ""; let enableOrDisable = "";

49
seller/src/views/goods/goods-seller/goodsOperation.vue
View File

@ -310,25 +310,36 @@
<FormItem class="form-item-view-el" label="商品重量" prop="weight"> <FormItem class="form-item-view-el" label="商品重量" prop="weight">
<Input v-model="baseInfoForm.weight"> <Input v-model="baseInfoForm.weight">
<span slot="append">kg</span> <span slot="append">kg</span>
</Input> </Input>
</FormItem> </FormItem>
<FormItem class="form-item-view-el" label="运费" prop="skuList"> <FormItem class="form-item-view-el" label="运费" prop="skuList">
<RadioGroup type="button" button-style="solid" @on-change="logisticsTemplateChange" v-model="baseInfoForm.freightPayer"> <RadioGroup type="button" button-style="solid"
<Radio label="STORE"> @on-change="logisticsTemplateChange"
<span>卖家承担运费</span> v-model="baseInfoForm.freightPayer"
</Radio> >
<Radio label="BUYER"> <Radio label="STORE">
<span>使用物流规则</span> <span>卖家承担运费</span>
</Radio> </Radio>
</RadioGroup> <Radio label="BUYER">
</FormItem> <span>使用物流规则</span>
<FormItem class="form-item-view-el" label="物流模板" prop="templateId" v-if="logisticsTemplateShow"> </Radio>
<Select v-model="baseInfoForm.templateId" style="width: 200px"> </RadioGroup>
<Option v-for="item in logisticsTemplate" :value="item.id" :key="item.id">{{ item.name }} </FormItem>
</Option> <FormItem
</Select> class="form-item-view-el"
</FormItem> label="物流模板"
</div> prop="templateId"
v-if="logisticsTemplateShow"
>
<Select v-model="baseInfoForm.templateId" style="width: 200px">
<Option
v-for="item in logisticsTemplate"
:value="item.id"
:key="item.id"
>{{ item.name }}
</Option>
</Select>
</FormItem>
</div> </div>
<h4>其他信息</h4> <h4>其他信息</h4>
<div class="form-item-view"> <div class="form-item-view">

12
seller/src/views/order/order/exportOrderDeliver.vue
View File

@ -40,8 +40,12 @@
</template> </template>
<script> <script>
import { downLoadDeliverExcel } from "@/api/order.js"; import JsonExcel from "vue-json-excel";
import { getLogisticsChecked } from "@/api/order.js";
export default { export default {
components: {
"download-excel": JsonExcel,
},
data() { data() {
return { return {
// 步骤集合 // 步骤集合
@ -74,9 +78,9 @@ export default {
val.checked = true; val.checked = true;
}, },
async downLoad() { async downLoad() {
let res = await downLoadDeliverExcel({ orderIds: "1402886442132217857" }); let res = await getLogisticsChecked()
console.log(res);
}, },
}, },
}; };

18
seller/src/views/promotion/coupon/coupon.vue
View File

@ -143,13 +143,13 @@ export default {
{ {
title: "活动名称", title: "活动名称",
key: "promotionName", key: "promotionName",
minWidth: 120, width: 120,
fixed: "left", fixed: "left",
}, },
{ {
title: "优惠券名称", title: "优惠券名称",
key: "couponName", key: "couponName",
minWidth: 120, width: 120,
tooltip: true tooltip: true
}, { }, {
title: "面额/折扣", title: "面额/折扣",
@ -170,11 +170,11 @@ export default {
{ {
title: "领取数量/总数量", title: "领取数量/总数量",
key: "publishNum", key: "publishNum",
width: 100,
render: (h, params) => { render: (h, params) => {
return h( return h(
"div", params.row.receivedNum + "/" + params.row.publishNum) "div", params.row.receivedNum + "/" + params.row.publishNum)
} },
minWidth:130,
}, },
{ {
title: "优惠券类型", title: "优惠券类型",
@ -210,18 +210,17 @@ export default {
}, },
{ {
title: "活动时间", title: "活动时间",
minWidth: 120,
render: (h, params) => { render: (h, params) => {
return h("div", { return h("div", {
domProps: domProps:
{innerHTML: params.row.startTime + "<br/>" + params.row.endTime} {innerHTML: params.row.startTime + "<br/>" + params.row.endTime}
}); });
}, },
minWidth:150,
}, },
{ {
title: "状态", title: "状态",
key: "promotionStatus", key: "promotionStatus",
width: 100,
fixed: "right", fixed: "right",
render: (h, params) => { render: (h, params) => {
let text = "未知", let text = "未知",
@ -248,16 +247,17 @@ export default {
}, },
}, },
text text
) ),
]); ]);
} },
minWidth:70,
}, },
{ {
title: "操作", title: "操作",
slot: "action", slot: "action",
align: "center", align: "center",
fixed: "right", fixed: "right",
minWidth: 80, minWidth: 140
}, },
], ],
data: [], // 表单数据 data: [], // 表单数据