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

合并Master

master
lemon橪 2021-09-03 11:38:35 +08:00
parent 3d418fa9e1 9feff82451
commit a6052bcd9d
6 changed files with 130 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buyer/src/pages/Cart.vue
View File

@ -90,14 +90,14 @@
</div> </div>
</div> </div>
<div class="width_150"> <div class="width_150">
{{ goods.goodsSku.price | unitPrice("￥") }} {{ goods.purchasePrice | unitPrice("￥") }}
</div> </div>
<div class="width_100"> <div class="width_100">
<InputNumber :min="1" size="small" v-model="goods.num" @on-change="changeNum(goods.num, goods.goodsSku.id)"></InputNumber> <InputNumber :min="1" size="small" v-model="goods.num" @on-change="changeNum(goods.num, goods.goodsSku.id)"></InputNumber>
<div class="fontsize_12">{{goods.goodsSku.quantity > 0 ? '有货' : '无货'}}</div> <div class="fontsize_12">{{goods.goodsSku.quantity > 0 ? '有货' : '无货'}}</div>
</div> </div>
<div class="width_150"> <div class="width_150">
{{ goods.num * goods.goodsSku.price | unitPrice("￥") }} {{ goods.subTotal | unitPrice("￥") }}
</div> </div>
<div class="width_100"> <div class="width_100">
<span class="handle-btn" v-if="!goods.errorMessage" @click="delGoods(goods.goodsSku.id)">删除</span> <span class="handle-btn" v-if="!goods.errorMessage" @click="delGoods(goods.goodsSku.id)">删除</span>

12
buyer/src/pages/GoodsList.vue
View File

@ -49,27 +49,27 @@
class="goods-show-info" class="goods-show-info"
v-for="(item, index) in goodsList" v-for="(item, index) in goodsList"
:key="index" :key="index"
@click="goGoodsDetail(item.id, item.goodsId)" @click="goGoodsDetail(item.id, item.content.goodsId)"
> >
<div class="goods-show-img"> <div class="goods-show-img">
<img width="220" height="220" :src="item.thumbnail" /> <img width="220" height="220" :src="item.content.thumbnail" />
</div> </div>
<div class="goods-show-price"> <div class="goods-show-price">
<span> <span>
<span class="seckill-price text-danger">{{ <span class="seckill-price text-danger">{{
item.price | unitPrice("￥") item.content.price | unitPrice("￥")
}}</span> }}</span>
</span> </span>
</div> </div>
<div class="goods-show-detail"> <div class="goods-show-detail">
<span>{{ item.goodsName }}</span> <span>{{ item.content.goodsName }}</span>
</div> </div>
<div class="goods-show-num"> <div class="goods-show-num">
已有<span>{{ item.commentNum || 0 }}</span 已有<span>{{ item.content.commentNum || 0 }}</span
>人评价 >人评价
</div> </div>
<div class="goods-show-seller"> <div class="goods-show-seller">
<Tag v-if="item.selfOperated" style="padding:0 4px;" size="default" color="error">自营</Tag><span>{{ item.storeName }}</span> <Tag v-if="item.content.selfOperated" style="padding:0 4px;" size="default" color="error">自营</Tag><span>{{ item.content.storeName }}</span>
</div> </div>
</div> </div>
</div> </div>

158
buyer/src/pages/payment/Pay.vue
View File

@ -5,7 +5,7 @@
<div class="width_1200 logo"> <div class="width_1200 logo">
<div> <div>
<router-link to="/" <router-link to="/"
><img :src="$store.state.logoImg" alt="lili shop" title="lilishop" ><img :src="$store.state.logoImg" alt="lili shop" title="lilishop"
/></router-link> /></router-link>
<div>结算页</div> <div>结算页</div>
</div> </div>
@ -23,7 +23,7 @@
<span :class="stepIndex == 2 ? 'active' : ''">3.成功提交订单</span> <span :class="stepIndex == 2 ? 'active' : ''">3.成功提交订单</span>
</div> </div>
</div> </div>
<Divider /> <Divider/>
<div class="content width_1200"> <div class="content width_1200">
<!-- 收货地址 --> <!-- 收货地址 -->
<div class="address"> <div class="address">
@ -46,8 +46,9 @@
<span>{{ item.name }}</span> <span>{{ item.name }}</span>
<Tag class="ml_10" v-if="item.isDefault" color="red">默认</Tag> <Tag class="ml_10" v-if="item.isDefault" color="red">默认</Tag>
<Tag class="ml_10" v-if="item.alias" color="warning">{{ <Tag class="ml_10" v-if="item.alias" color="warning">{{
item.alias item.alias
}}</Tag> }}
</Tag>
</div> </div>
<div>{{ item.mobile }}</div> <div>{{ item.mobile }}</div>
<div> <div>
@ -59,16 +60,16 @@
class="ml_10" class="ml_10"
v-if="!item.isDefault" v-if="!item.isDefault"
@click.stop="delAddress(item)" @click.stop="delAddress(item)"
>删除</span >删除</span
> >
</div> </div>
<div class="corner-icon" v-show="selectedAddress.id === item.id"> <div class="corner-icon" v-show="selectedAddress.id === item.id">
<div></div> <div></div>
<Icon type="md-checkmark" /> <Icon type="md-checkmark"/>
</div> </div>
</div> </div>
<div class="add-address" @click="editAddress('')"> <div class="add-address" @click="editAddress('')">
<Icon type="ios-add-circle-outline" /> <Icon type="ios-add-circle-outline"/>
<div>添加新地址</div> <div>添加新地址</div>
</div> </div>
</div> </div>
@ -79,8 +80,8 @@
v-if="addressList.length > 3" v-if="addressList.length > 3"
> >
{{ moreAddr ? "收起地址" : "更多地址" }} {{ moreAddr ? "收起地址" : "更多地址" }}
<Icon v-show="!moreAddr" type="md-arrow-dropdown" /> <Icon v-show="!moreAddr" type="md-arrow-dropdown"/>
<Icon v-show="moreAddr" type="md-arrow-dropup" /> <Icon v-show="moreAddr" type="md-arrow-dropup"/>
</div> </div>
</div> </div>
<!-- 商品信息 --> <!-- 商品信息 -->
@ -97,8 +98,8 @@
<div class="shop-name"> <div class="shop-name">
<span> <span>
<span class="hover-color" @click="goShopPage(shop.storeId)">{{ <span class="hover-color" @click="goShopPage(shop.storeId)">{{
shop.storeName shop.storeName
}}</span }}</span
>&nbsp;&nbsp; >&nbsp;&nbsp;
</span> </span>
</div> </div>
@ -114,19 +115,19 @@
goGoodsDetail(goods.goodsSku.id, goods.goodsSku.goodsId) goGoodsDetail(goods.goodsSku.id, goods.goodsSku.goodsId)
" "
> >
<img :src="goods.goodsSku.thumbnail" alt="" /> <img :src="goods.goodsSku.thumbnail" alt=""/>
<span style="vertical-align: top">{{ <span style="vertical-align: top">{{
goods.goodsSku.goodsName goods.goodsSku.goodsName
}}</span> }}</span>
</span> </span>
<span class="goods-price">{{ <span class="goods-price">{{
goods.goodsSku.price | unitPrice("￥") goods.purchasePrice | unitPrice("￥")
}}</span> }}</span>
<span>x{{ goods.num }}</span> <span>x{{ goods.num }}</span>
<span>{{ goods.goodsSku.quantity > 0 ? "有货" : "无货" }}</span> <span>{{ goods.goodsSku.quantity > 0 ? "有货" : "无货" }}</span>
<span class="goods-price">{{ <span class="goods-price">{{
(goods.goodsSku.price * goods.num) | unitPrice("￥") goods.subTotal | unitPrice("￥")
}}</span> }}</span>
</div> </div>
</div> </div>
<div class="order-mark"> <div class="order-mark">
@ -138,7 +139,7 @@
placeholder="订单备注" placeholder="订单备注"
/> />
<span style="font-size: 12px; color: #999" <span style="font-size: 12px; color: #999"
>提示：请勿填写有关支付、收货、发票方面的信息</span >提示：请勿填写有关支付、收货、发票方面的信息</span
> >
</div> </div>
</div> </div>
@ -147,7 +148,7 @@
<div class="invoice"> <div class="invoice">
<div class="card-head mt_20 mb_20"> <div class="card-head mt_20 mb_20">
<span class="relative" <span class="relative"
>发票信息<span class="inv-tips"> >发票信息<span class="inv-tips">
<Icon <Icon
type="ios-alert-outline" type="ios-alert-outline"
/>开企业抬头发票须填写纳税人识别号，以免影响报销 />开企业抬头发票须填写纳税人识别号，以免影响报销
@ -177,18 +178,18 @@
<span <span
v-if="item.couponType === 'PRICE'" v-if="item.couponType === 'PRICE'"
class="fontsize_12 global_color" class="fontsize_12 global_color"
>￥<span class="price">{{ >￥<span class="price">{{
item.price | unitPrice item.price | unitPrice
}}</span></span }}</span></span
> >
<span <span
v-if="item.couponType === 'DISCOUNT'" v-if="item.couponType === 'DISCOUNT'"
class="fontsize_12 global_color" class="fontsize_12 global_color"
><span class="price">{{ item.discount }}</span ><span class="price">{{ item.discount }}</span
>折</span >折</span
> >
<span class="describe" <span class="describe"
>满{{ item.consumeThreshold }}元可用</span >满{{ item.consumeThreshold }}元可用</span
> >
</div> </div>
<p>使用范围：{{ useScope(item.scopeType) }}</p> <p>使用范围：{{ useScope(item.scopeType) }}</p>
@ -206,7 +207,7 @@
class="c-right" class="c-right"
v-if="usedCouponId.includes(item.id)" v-if="usedCouponId.includes(item.id)"
@click="useCoupon(item.id, false)" @click="useCoupon(item.id, false)"
>放弃优惠</a >放弃优惠</a
> >
<i class="circle-top"></i> <i class="circle-top"></i>
<i class="circle-bottom"></i> <i class="circle-bottom"></i>
@ -219,21 +220,27 @@
<span>{{ totalNum }}件商品，总商品金额：</span <span>{{ totalNum }}件商品，总商品金额：</span
><span>{{ priceDetailDTO.goodsPrice | unitPrice("￥") }}</span> ><span>{{ priceDetailDTO.goodsPrice | unitPrice("￥") }}</span>
</div> </div>
<div> <div v-if="priceDetailDTO.freightPrice>0">
<span>运费：</span <span>运费：</span
><span>{{ priceDetailDTO.freightPrice | unitPrice("￥") }}</span> ><span>{{ priceDetailDTO.freightPrice | unitPrice("￥") }}</span>
</div> </div>
<div> <div v-if="priceDetailDTO.discountPrice>0">
<span>优惠金额：</span <span>优惠金额：</span
><span ><span
>-{{ >-{{
(priceDetailDTO.discountPrice + priceDetailDTO.discountPrice | unitPrice("￥")
priceDetailDTO.couponPrice + }}</span
priceDetailDTO.updatePrice) >
| unitPrice("￥")
}}</span
>
</div> </div>
<div v-if="priceDetailDTO.couponPrice>0">
<span>优惠券金额：</span
><span
>-{{
priceDetailDTO.couponPrice | unitPrice("￥")
}}</span
>
</div>
<div v-if="$route.query.way === 'POINTS'"> <div v-if="$route.query.way === 'POINTS'">
<span>应付积分：</span <span>应付积分：</span
><span class="actrual-price">{{ ><span class="actrual-price">{{
@ -277,7 +284,7 @@
<script> <script>
import invoiceModal from '@/components/invoiceModal'; import invoiceModal from '@/components/invoiceModal';
import addressManage from '@/components/addressManage'; import addressManage from '@/components/addressManage';
import { memberAddress, delMemberAddress } from '@/api/address'; import {memberAddress, delMemberAddress} from '@/api/address';
import { import {
cartGoodsPay, cartGoodsPay,
createTrade, createTrade,
@ -285,10 +292,11 @@ import {
selectCoupon, selectCoupon,
couponNum couponNum
} from '@/api/cart'; } from '@/api/cart';
import { canUseCouponList } from '@/api/member.js'; import {canUseCouponList} from '@/api/member.js';
export default { export default {
name: 'Pay', name: 'Pay',
components: { invoiceModal, addressManage }, components: {invoiceModal, addressManage},
data () { data () {
return { return {
stepIndex: 1, // 顶部步骤条状态 stepIndex: 1, // 顶部步骤条状态
@ -341,7 +349,7 @@ export default {
getGoodsDetail () { getGoodsDetail () {
// 订单商品详情 // 订单商品详情
this.$Spin.show(); this.$Spin.show();
cartGoodsPay({ way: this.$route.query.way }) cartGoodsPay({way: this.$route.query.way})
.then((res) => { .then((res) => {
this.$Spin.hide(); this.$Spin.hide();
if (res.success) { if (res.success) {
@ -385,7 +393,7 @@ export default {
}, },
getCouponNum () { getCouponNum () {
// 获取可用优惠券数量 // 获取可用优惠券数量
couponNum({ way: this.$route.query.way }).then((res) => { couponNum({way: this.$route.query.way}).then((res) => {
this.canUseCouponNum = res.result; this.canUseCouponNum = res.result;
if (res.result) { if (res.result) {
let storeArr = []; let storeArr = [];
@ -459,14 +467,15 @@ export default {
} }
}); });
}, },
onCancel: () => {} onCancel: () => {
}
}); });
}, },
goGoodsDetail (skuId, goodsId) { goGoodsDetail (skuId, goodsId) {
// 跳转商品详情 // 跳转商品详情
let routeUrl = this.$router.resolve({ let routeUrl = this.$router.resolve({
path: '/goodsDetail', path: '/goodsDetail',
query: { skuId, goodsId } query: {skuId, goodsId}
}); });
window.open(routeUrl.href, '_blank'); window.open(routeUrl.href, '_blank');
}, },
@ -474,7 +483,7 @@ export default {
goShopPage (id) { goShopPage (id) {
let routeUrl = this.$router.resolve({ let routeUrl = this.$router.resolve({
path: '/Merchant', path: '/Merchant',
query: { id: id } query: {id: id}
}); });
window.open(routeUrl.href, '_blank'); window.open(routeUrl.href, '_blank');
}, },
@ -529,7 +538,7 @@ export default {
} else { } else {
this.$router.push({ this.$router.push({
path: '/payment', path: '/payment',
query: { orderType: 'TRADE', sn: res.result.sn } query: {orderType: 'TRADE', sn: res.result.sn}
}); });
} }
} }
@ -567,30 +576,36 @@ export default {
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
margin: 20px auto 0; margin: 20px auto 0;
div:nth-child(1) { div:nth-child(1) {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
img { img {
width: 150px; width: 150px;
height: auto; height: auto;
cursor: pointer; cursor: pointer;
} }
div:nth-child(2) { div:nth-child(2) {
width: 200px; width: 200px;
color: #999; color: #999;
font-size: 16px; font-size: 16px;
margin: 0 20px; margin: 0 20px;
span { span {
color: $theme_color; color: $theme_color;
} }
} }
} }
} }
.cart-steps { .cart-steps {
height: 30px; height: 30px;
display: flex; display: flex;
align-items: center; align-items: center;
span { span {
@include content_color($light_content_color); @include content_color($light_content_color);
height: 30px; height: 30px;
@ -616,6 +631,7 @@ export default {
color: #ff8f23; color: #ff8f23;
} }
} }
/** logo end */ /** logo end */
/** content start */ /** content start */
.content { .content {
@ -624,10 +640,12 @@ export default {
min-height: 200px; min-height: 200px;
padding: 15px 25px; padding: 15px 25px;
} }
/** 地址管理 */ /** 地址管理 */
.address-manage { .address-manage {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
> div { > div {
border: 1px dotted #949494; border: 1px dotted #949494;
width: 265px; width: 265px;
@ -637,47 +655,58 @@ export default {
cursor: pointer; cursor: pointer;
color: #999; color: #999;
} }
.add-address { .add-address {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
flex-direction: column; flex-direction: column;
.ivu-icon { .ivu-icon {
font-size: 24px; font-size: 24px;
} }
} }
.address-item { .address-item {
position: relative; position: relative;
font-size: 12px; font-size: 12px;
> div:nth-child(1) { > div:nth-child(1) {
margin-bottom: 10px; margin-bottom: 10px;
span { span {
margin-right: 10px; margin-right: 10px;
} }
> span:nth-child(1) { > span:nth-child(1) {
color: #000000; color: #000000;
font-size: 14px; font-size: 14px;
} }
} }
.edit-btn { .edit-btn {
font-size: 12px; font-size: 12px;
position: absolute; position: absolute;
top: 15px; top: 15px;
right: 20px; right: 20px;
color: $theme_color; color: $theme_color;
span:hover { span:hover {
border-bottom: 1px solid $theme_color; border-bottom: 1px solid $theme_color;
} }
} }
.corner-icon { .corner-icon {
position: absolute; position: absolute;
right: -1px; right: -1px;
bottom: -1px; bottom: -1px;
div { div {
width: 0; width: 0;
border-top: 20px solid transparent; border-top: 20px solid transparent;
border-right: 20px solid $theme_color; border-right: 20px solid $theme_color;
} }
.ivu-icon { .ivu-icon {
font-size: 12px; font-size: 12px;
position: absolute; position: absolute;
@ -688,29 +717,36 @@ export default {
} }
} }
} }
.border-red { .border-red {
border-color: $theme_color; border-color: $theme_color;
} }
} }
/** 购买商品列表 start */ /** 购买商品列表 start */
.shop-name { .shop-name {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
> span:nth-child(1) { > span:nth-child(1) {
font-weight: bold; font-weight: bold;
.ivu-icon { .ivu-icon {
color: #ff8f23; color: #ff8f23;
&:hover { &:hover {
color: $theme_color; color: $theme_color;
} }
} }
} }
> span:nth-child(2) { > span:nth-child(2) {
color: #999; color: #999;
position: relative; position: relative;
display: flex; display: flex;
width: 200px; width: 200px;
} }
.delivery-list { .delivery-list {
position: absolute; position: absolute;
right: 0; right: 0;
@ -722,19 +758,23 @@ export default {
width: 200px; width: 200px;
min-height: 100px; min-height: 100px;
padding: 10px; padding: 10px;
li { li {
width: 90px; width: 90px;
height: 30px; height: 30px;
text-align: center; text-align: center;
&:hover { &:hover {
cursor: pointer; cursor: pointer;
} }
} }
} }
} }
.goods-list { .goods-list {
background-color: #f8f8f8; background-color: #f8f8f8;
margin: 10px 0 20px 0; margin: 10px 0 20px 0;
.goods-item { .goods-item {
display: flex; display: flex;
align-items: center; align-items: center;
@ -742,34 +782,42 @@ export default {
padding: 20px 0; padding: 20px 0;
margin: 0 20px; margin: 0 20px;
border-bottom: 1px dotted #999; border-bottom: 1px dotted #999;
&:last-child { &:last-child {
border: none; border: none;
} }
img { img {
width: 48px; width: 48px;
height: 48px; height: 48px;
} }
> span { > span {
text-align: center; text-align: center;
width: 100px; width: 100px;
} }
> span:nth-child(1) { > span:nth-child(1) {
font-size: 12px; font-size: 12px;
flex: 1; flex: 1;
text-align: left; text-align: left;
} }
> span:last-child { > span:last-child {
color: $theme_color; color: $theme_color;
font-weight: bold; font-weight: bold;
} }
.goods-price { .goods-price {
font-size: 16px; font-size: 16px;
} }
} }
} }
.order-mark { .order-mark {
width: 500px; width: 500px;
} }
/** 购买商品列表 end */ /** 购买商品列表 end */
/** 发票信息 start */ /** 发票信息 start */
.invoice { .invoice {
@ -781,6 +829,7 @@ export default {
margin: 0 0 0 10px; margin: 0 0 0 10px;
font-size: 12px !important; font-size: 12px !important;
box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
&::before { &::before {
content: ""; content: "";
display: inline-block; display: inline-block;
@ -791,6 +840,7 @@ export default {
position: absolute; position: absolute;
left: -9px; left: -9px;
} }
.ivu-icon { .ivu-icon {
color: #ff8f23; color: #ff8f23;
margin-right: 3px; margin-right: 3px;
@ -798,19 +848,23 @@ export default {
font-weight: bold; font-weight: bold;
} }
} }
.inovice-content { .inovice-content {
> span { > span {
margin-right: 10px; margin-right: 10px;
} }
> span:last-child { > span:last-child {
color: $theme_color; color: $theme_color;
cursor: pointer; cursor: pointer;
&:hover { &:hover {
border-bottom: 1px solid $theme_color; border-bottom: 1px solid $theme_color;
} }
} }
} }
} }
/** 发票信息 end */ /** 发票信息 end */
/** 订单价格 */ /** 订单价格 */
@ -819,18 +873,21 @@ export default {
margin-top: 30px; margin-top: 30px;
font-size: 16px; font-size: 16px;
color: #999; color: #999;
> div > span:nth-child(2) { > div > span:nth-child(2) {
width: 130px; width: 130px;
text-align: right; text-align: right;
display: inline-block; display: inline-block;
margin-top: 10px; margin-top: 10px;
} }
.actrual-price { .actrual-price {
color: $theme_color; color: $theme_color;
font-weight: bold; font-weight: bold;
font-size: 20px; font-size: 20px;
} }
} }
/** content end */ /** content end */
/** 底部支付栏 */ /** 底部支付栏 */
.order-footer { .order-footer {
@ -842,11 +899,14 @@ export default {
flex-direction: row-reverse; flex-direction: row-reverse;
border-top: 1px solid #ddd; border-top: 1px solid #ddd;
margin: 10px auto; margin: 10px auto;
div { div {
text-align: center; text-align: center;
} }
position: sticky; position: sticky;
bottom: 0; bottom: 0;
.pay { .pay {
background-color: $theme_color; background-color: $theme_color;
width: 150px; width: 150px;
@ -857,6 +917,7 @@ export default {
cursor: pointer; cursor: pointer;
} }
} }
/** 公共表头 */ /** 公共表头 */
.card-head { .card-head {
display: flex; display: flex;
@ -868,44 +929,54 @@ export default {
span:nth-child(1) { span:nth-child(1) {
font-size: 18px; font-size: 18px;
} }
span:nth-child(2) { span:nth-child(2) {
font-size: 12px; font-size: 12px;
color: #438cde; color: #438cde;
cursor: pointer; cursor: pointer;
&:hover { &:hover {
color: $theme_color; color: $theme_color;
} }
} }
} }
.ivu-divider { .ivu-divider {
background: $theme_color; background: $theme_color;
height: 2px; height: 2px;
} }
.pay-address { .pay-address {
font-size: 12px; font-size: 12px;
} }
.more-addr { .more-addr {
cursor: pointer; cursor: pointer;
margin-top: 10px; margin-top: 10px;
display: inline-block; display: inline-block;
} }
.coupon-item { .coupon-item {
width: 260px; width: 260px;
height: 125px; height: 125px;
margin-right: 10px; margin-right: 10px;
margin-bottom: 10px; margin-bottom: 10px;
.c-right { .c-right {
width: 30px; width: 30px;
padding: 10px 7px; padding: 10px 7px;
} }
b { b {
background: url("../../assets/images/small-circle.png") top left repeat-y; background: url("../../assets/images/small-circle.png") top left repeat-y;
right: 28px; right: 28px;
} }
.circle-top, .circle-top,
.circle-bottom { .circle-bottom {
right: 22px; right: 22px;
} }
.used { .used {
position: absolute; position: absolute;
top: 60px; top: 60px;
@ -914,6 +985,7 @@ export default {
height: 50px; height: 50px;
} }
} }
.coupon-list { .coupon-list {
max-height: 260px; max-height: 260px;
overflow: scroll; overflow: scroll;

6
manager/src/views/goods/goods-manage/parameter.vue
View File

@ -79,6 +79,9 @@
<Checkbox label=1 v-model="paramForm.required">必填</Checkbox> <Checkbox label=1 v-model="paramForm.required">必填</Checkbox>
<Checkbox label=1 v-model="paramForm.isIndex">可索引</Checkbox> <Checkbox label=1 v-model="paramForm.isIndex">可索引</Checkbox>
</FormItem> </FormItem>
<FormItem label="排序" prop="specName3">
<Input type="number" v-model="paramForm.sort" style="width: 100%" />
</FormItem>
</Form> </Form>
<div slot="footer"> <div slot="footer">
@ -170,6 +173,7 @@ export default {
options: "", options: "",
required: false, required: false,
isIndex: false, isIndex: false,
sort: 0,
groupId: group.groupId, groupId: group.groupId,
categoryId: this.categoryId, categoryId: this.categoryId,
}; };
@ -186,9 +190,9 @@ export default {
isIndex: param.isIndex==1?true:false, isIndex: param.isIndex==1?true:false,
groupId: group.groupId, groupId: group.groupId,
categoryId: this.categoryId, categoryId: this.categoryId,
sort: param.sort,
id: param.id, id: param.id,
}; };
console.warn(this.paramForm.options)
this.ops = this.paramForm.options this.ops = this.paramForm.options
this.modalType = 1; this.modalType = 1;
this.modalTitle = "修改参数"; this.modalTitle = "修改参数";

2
seller/src/views/goods/goods-seller/goodsOperationSec.vue
View File

@ -509,6 +509,7 @@ export default {
isIndex: "", isIndex: "",
required: "", required: "",
paramId: "", paramId: "",
sort: ""
}; };
} }
this.baseInfoForm.goodsParamsDTOList[groupIndex].goodsParamsItemDTOList[ this.baseInfoForm.goodsParamsDTOList[groupIndex].goodsParamsItemDTOList[
@ -519,6 +520,7 @@ export default {
isIndex: params.isIndex, isIndex: params.isIndex,
required: params.required, required: params.required,
paramId: params.id, paramId: params.id,
sort: params.sort
}; };
}, },
// 编辑sku图片 // 编辑sku图片

7
seller/src/views/promotion/pintuan/pintuanGoods.vue
View File

@ -285,13 +285,6 @@ export default {
mounted () { mounted () {
this.init(); this.init();
}, },
// 如果是从详情页返回列表页，修改列表页keepAlive为true，确保不刷新页面
beforeRouteLeave(to, from, next){
if(to.name === 'pintuan') {
to.meta.keepAlive = true
}
next()
}
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>