code-image-backup-public/lilishop-ui
1
0
Fork 0
mirror of https://gitee.com/beijing_hongye_huicheng/lilishop-ui.git synced 2025-12-18 08:55:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

bug修改

Browse Source
This commit is contained in:
mabo
2021-05-21 10:24:56 +08:00
parent 7c8d071c97
commit b1b587a50c
20 changed files with 89 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
seller/src/config/index.js
View File

@@ -22,10 +22,10 @@ export default {
buyer: 'https://buyer-api.pickmall.cn',
seller: 'https://store-api.pickmall.cn',
manager: 'https://admin-api.pickmall.cn'
// common: 'http://192.168.0.100:8890',
// buyer: 'http://192.168.0.100:8888',
// seller: 'http://192.168.0.100:8889',
// manager: 'http://192.168.0.100:8887'
// common: 'http://192.168.0.103:8890',
// buyer: 'http://192.168.0.103:8888',
// seller: 'http://192.168.0.103:8889',
// manager: 'http://192.168.0.103:8887'
},
api_prod: {
common: 'https://common-api.pickmall.cn',

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

@@ -39,16 +39,22 @@
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
<!-- 商品栏目格式化 -->
<template slot="goodsSlot" slot-scope="scope">
<template slot="goodsSlot" slot-scope="{row}">
<div style="margin-top: 5px;height: 90px; display: flex;">
<div style="">
<img :src="scope.row.original" style="height: 80px;margin-top: 3px;width: 70px">
<img :src="row.original" style="height: 80px;margin-top: 3px;width: 70px">
</div>
<div style="margin-left: 13px;">
<div class="div-zoom">
<a>{{scope.row.goodsName}}</a>
<a @click="linkTo(row.id,row.skuId)">{{row.goodsName}}</a>
</div>
<Poptip trigger="hover" title="扫码在手机中查看" transfer>
<div slot="content">
<vue-qr :text="wapLinkTo(row.id,row.skuId)" :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
</div>
<img src="../../../assets/qrcode.svg" class="hover-pointer" width="20" height="20" alt="">
</Poptip>
</div>
</div>
@@ -76,10 +82,10 @@
<Form ref="shipTemplateForm" :model="shipTemplateForm" :label-width="120">
<FormItem class="form-item-view-el" label="运费" prop="freightPayer">
<RadioGroup type="button" button-style="solid" @on-change="logisticsTemplateUndertakerChange" v-model="shipTemplateForm.freightPayer">
<Radio label="BUYER">
<span>买家承担运费</span>
</Radio>
<Radio label="STORE">
<span>卖家承担运费</span>
</Radio>
<Radio label="BUYER">
<span>使用物流规则</span>
</Radio>
</RadioGroup>
@@ -120,7 +126,7 @@ export default {
id: "", //要操作的id
loading: true, // 表单加载状态
shipTemplateForm: {
freightPayer: "BUYER",
freightPayer: "STORE",
},
shipTemplateShow: false, //物流模板是否显示
shipTemplateModal: false, // 物流模板是否显示
@@ -515,7 +521,7 @@ export default {
},
//保存运费模板信息
saveShipTemplate () {
if (this.shipTemplateForm.freightPayer == "BUYER") {
if (this.shipTemplateForm.freightPayer == "STORE") {
{
this.shipTemplateForm.templateId = 0;
}
@@ -559,7 +565,7 @@ export default {
//运费承担者变化
logisticsTemplateUndertakerChange(v) {
//如果是卖家承担运费 需要显示运费模板
if (v == "STORE") {
if (v == "BUYER") {
API_Store.getShipTemplate().then((res) => {
if (res.success) {
this.logisticsTemplate = res.result;
@@ -567,7 +573,7 @@ export default {
});
this.shipTemplateShow = true;
}
if (v == "BUYER") {
if (v == "STORE") {
this.shipTemplateShow = false;
}
},

4
seller/src/views/goods/goods-seller/goodsStock.vue
View File

@@ -1,7 +1,5 @@
<template>
<div class="search">
<Row>
<Col>
<Card>
<Row v-show="openSearch" @keydown.enter.native="handleSearch">
<Form
@@ -97,8 +95,6 @@
></Page>
</Row>
</Card>
</Col>
</Row>
<Modal
title="更新库存"
v-model="updateStockModalVisible"

12
seller/src/views/home/home.vue
View File

@@ -56,7 +56,7 @@
<h4>待办事项</h4>
<div class="detail-list">
<div class="detail-item" @click="navigateTo('order')">
<div class="detail-item" @click="navigateTo('orderList')">
<div>
<span>{{homeData.unPaidOrder || 0}}</span>
<div>待付款</div>
@@ -66,7 +66,7 @@
</div>
</div>
<div class="detail-item" @click="navigateTo('order')">
<div class="detail-item" @click="navigateTo('orderList')">
<div>
<span>{{homeData.unDeliveredOrder || 0}}</span>
<div>待发货</div>
@@ -125,7 +125,7 @@
<span>{{homeData.seckillNum || 0}}</span>
<div>待参加活动</div>
</div>
<div>
<div @click="navigateTo('accountStatementBill')">
<span>{{homeData.waitPayBill || 0}}</span>
<div>待对账</div>
</div>
@@ -161,7 +161,7 @@
</div>
</div>
<div class="count-item">
<div class="count-item" @click="navigateTo('orderStatistics')">
<div>
<Icon class="icon" size="31" type="ios-card" />
</div>
@@ -171,7 +171,7 @@
</div>
</div>
<div class="count-item" @click="navigateTo('order')">
<div class="count-item" @click="navigateTo('orderList')">
<div>
<Icon class="icon" size="31" type="md-list" />
@@ -182,7 +182,7 @@
</div>
</div>
<div class="count-item">
<div class="count-item" @click="navigateTo('trafficStatistics')">
<div>
<Icon class="icon" size="31" type="md-person" />
</div>

5
seller/src/views/member/memberComment.vue
View File

@@ -102,6 +102,7 @@
v-model="image"
:disable="true"
:remove="false"
:isView="true"
></upload-pic-thumb>
</FormItem>
<FormItem label="回复内容" prop="reply">
@@ -370,8 +371,8 @@ export default {
this.content = res.result.content
this.form.reply = res.result.reply
this.replyStatus = res.result.replyStatus
if (res.result.image) {
this.image = (res.result.image || "").split(",");
if (res.result.images) {
this.image = (res.result.images || "").split(",");
}
if (res.result.replyImage) {
this.form.replyImage = (res.result.replyImage || "").split(",");

5
seller/src/views/my-components/lili/upload-pic-thumb.vue
View File

@@ -37,6 +37,7 @@
:action="uploadFileUrl"
:headers="accessToken"
style="display: inline-block;width:58px;"
v-if="!isView"
>
<div style="width: 58px;height:58px;line-height: 58px;">
<Icon type="md-camera" size="20"></Icon>
@@ -87,6 +88,10 @@ export default {
limit: {
type: Number,
default: 10
},
isView: {
type: Boolean,
default: false
}
},
data() {

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

@@ -69,7 +69,7 @@
<template slot-scope="{ row }" slot="action">
<Button
v-if="row.promotionStatus === 'NEW' || row.promotionStatus === 'CLOSE'"
type="primary"
type="info"
size="small"
style="margin-right: 10px"
@click="edit(row)"
@@ -259,7 +259,7 @@ export default {
slot: "action",
align: "center",
fixed: "right",
width: 80,
minWidth: 80,
},
],
data: [], // 表单数据

2
seller/src/views/promotion/coupon/couponPublish.vue
View File

@@ -511,7 +511,7 @@ export default {
this.$store.state.app.storeOpenedList
);
this.$router.push({
path: "promotion/coupon",
name: "coupon",
});
},
changeSelect(e) {