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

pc首页margin问题

master
mabo 2021-07-02 09:50:25 +08:00
parent be2280907e
commit e318fe5be0
4 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
buyer/src/components/indexDecorate/modelFormItem.vue
View File

@ -2,11 +2,11 @@
<div class="model-item" v-if="element && element.key"> <div class="model-item" v-if="element && element.key">
<!-- 轮播图模块，包括个人信息，快捷导航模块 --> <!-- 轮播图模块，包括个人信息，快捷导航模块 -->
<template v-if="element.type == 'carousel'"> <template v-if="element.type == 'carousel'">
<model-carousel :data="element"></model-carousel> <model-carousel :data="element" class="mb_20"></model-carousel>
</template> </template>
<!-- 热门广告 --> <!-- 热门广告 -->
<template v-if="element.type == 'hotAdvert'"> <template v-if="element.type == 'hotAdvert'">
<div> <div class="mb_20">
<img <img
style="display: block" style="display: block"
class="hover-pointer" class="hover-pointer"
@ -36,7 +36,7 @@
<!-- 折扣广告 --> <!-- 折扣广告 -->
<template v-if="element.type == 'discountAdvert'"> <template v-if="element.type == 'discountAdvert'">
<div <div
class="discountAdvert" class="discountAdvert mb_20"
:style="{ :style="{
'background-image': 'url(' + element.options.bgImg.img + ')', 'background-image': 'url(' + element.options.bgImg.img + ')',
}" }"
@ -66,28 +66,28 @@
<!-- 好货推荐 --> <!-- 好货推荐 -->
<template v-if="element.type == 'recommend'"> <template v-if="element.type == 'recommend'">
<recommend :data="element"></recommend> <recommend :data="element" class="mb_20"></recommend>
</template> </template>
<!-- 新品排行 --> <!-- 新品排行 -->
<template v-if="element.type == 'newGoodsSort'"> <template v-if="element.type == 'newGoodsSort'">
<new-goods-sort :data="element"></new-goods-sort> <new-goods-sort :data="element" class="mb_20"></new-goods-sort>
</template> </template>
<!-- 首页广告 --> <!-- 首页广告 -->
<template v-if="element.type == 'firstAdvert'"> <template v-if="element.type == 'firstAdvert'">
<first-page-advert :data="element"></first-page-advert> <first-page-advert :data="element" class="mb_20"></first-page-advert>
</template> </template>
<!-- 横幅广告 --> <!-- 横幅广告 -->
<template v-if="element.type == 'bannerAdvert'"> <template v-if="element.type == 'bannerAdvert'">
<img <img
width="1200" width="1200"
class="hover-pointer" class="hover-pointer mb_20"
@click="linkTo(element.options.url)" @click="linkTo(element.options.url)"
:src="element.options.img" :src="element.options.img"
alt="" alt=""
/> />
</template> </template>
<template v-if="element.type == 'notEnough'"> <template v-if="element.type == 'notEnough'">
<not-enough :data="element"></not-enough> <not-enough :data="element" class="mb_20"></not-enough>
</template> </template>
</div> </div>
</template> </template>
@ -122,7 +122,6 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.model-item { .model-item {
position: relative; position: relative;
margin-bottom: 20px;
background-color: #fff; background-color: #fff;
} }

1
buyer/src/components/indexDecorate/modelList/carousel.vue
View File

@ -94,7 +94,6 @@ export default {
width: 1200px; width: 1200px;
height: 340px; height: 340px;
overflow: hidden; overflow: hidden;
margin-top: -20px;
} }
/* 导航主体 */ /* 导航主体 */

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

@ -18,14 +18,14 @@ export default {
* @description api请求基础路径 * @description api请求基础路径
*/ */
api_dev: { api_dev: {
common: 'https://common-api.pickmall.cn', // common: 'https://common-api.pickmall.cn',
buyer: 'https://buyer-api.pickmall.cn', // buyer: 'https://buyer-api.pickmall.cn',
seller: 'https://store-api.pickmall.cn', // seller: 'https://store-api.pickmall.cn',
manager: 'https://admin-api.pickmall.cn', // manager: 'https://admin-api.pickmall.cn',
// common: 'http://192.168.0.109:8890', common: 'http://192.168.0.109:8890',
// buyer: 'http://192.168.0.109:8888', buyer: 'http://192.168.0.109:8888',
// seller: 'http://192.168.0.109:8889', seller: 'http://192.168.0.109:8889',
// manager: 'http://192.168.0.109:8887' manager: 'http://192.168.0.109:8887'
}, },
api_prod: { api_prod: {

9
seller/src/views/order/order/orderList.vue
View File

@ -63,7 +63,7 @@ export default {
}, },
data() { data() {
return { return {
orderCode: "", orderCode: "", // 虚拟订单核验码
loading: true, // 表单加载状态 loading: true, // 表单加载状态
searchForm: { searchForm: {
// 搜索框初始化对象 // 搜索框初始化对象
@ -289,12 +289,19 @@ export default {
storeId: userInfo.id storeId: userInfo.id
} }
const res = await API_Order.queryExportOrder(params) const res = await API_Order.queryExportOrder(params)
if (res.success) {
if (res.result.length === 0) {
this.$Message.warning('暂无待发货订单')
return []
}
for (let i=0; i<res.result.length; i++) { for (let i=0; i<res.result.length; i++) {
res.result[i].index = i+1; res.result[i].index = i+1;
res.result[i].consigneeAddress = res.result[i].consigneeAddress =
res.result[i].consigneeAddressPath.replace(/,/g, "") + res.result[i].consigneeDetail res.result[i].consigneeAddressPath.replace(/,/g, "") + res.result[i].consigneeDetail
} }
return res.result return res.result
}
}, },
// 查看订单详情 // 查看订单详情
detail(v) { detail(v) {