Skip to content

M
mallapp
Commit d6ec30be authored by 罗超's avatar 罗超
Browse files
Options

1

parent 2311596e
Show whitespace changes
Inline Side-by-side
Showing with 516 additions and 28 deletions
pages/kotra/brand/list.vue
View file @ d6ec30be
...@@ -41,6 +41,24 @@ ...@@ -41,6 +41,24 @@
<u-icon name="filter-o" color="#111" size="42"></u-icon> <u-icon name="filter-o" color="#111" size="42"></u-icon>
</div> --> </div> -->
</view> </view>
<view class="screenBox">
<view
v-for="(item, index) in PrizeList"
:key="index"
class="screenBoxItem"
@click="chooseYear(item)"
>
<view
class="screenBoxItemYear"
:class="{ activeYear: item.Id == msg.PrizeId }"
>{{ item.YearInfo }}</view
><view
class="screenBoxItemName"
:class="{ activeName: item.Id == msg.PrizeId }"
>首店</view
>
</view>
</view>
<u-empty v-if="g.length == 0" text="暂无内容" mode="list"></u-empty> <u-empty v-if="g.length == 0" text="暂无内容" mode="list"></u-empty>
<view <view
style="height: calc(100% - 101px); padding: 2px 10px" style="height: calc(100% - 101px); padding: 2px 10px"
...@@ -71,6 +89,13 @@ ...@@ -71,6 +89,13 @@
:src="x.BannerList[0]" :src="x.BannerList[0]"
/> />
</view> </view>
<view class="img-show-prize" v-if="x.ListEnroll[0]">
<image
style="width: 100%; height: 100%"
mode="heightFix"
:src="x.ListEnroll[0].MedalImage"
/>
</view>
</view> </view>
<view class="good-info"> <view class="good-info">
<view class="good-name">{{ x.BrandName }}</view> <view class="good-name">{{ x.BrandName }}</view>
...@@ -122,6 +147,7 @@ export default { ...@@ -122,6 +147,7 @@ export default {
KongTiao: -1, KongTiao: -1,
XinFeng: -1, XinFeng: -1,
BrandClassId: 0, BrandClassId: 0,
PrizeId: 0, //
}, },
loadText: { loadText: {
loadmore: "轻轻上拉，加载更多", loadmore: "轻轻上拉，加载更多",
...@@ -132,6 +158,7 @@ export default { ...@@ -132,6 +158,7 @@ export default {
status: "loadmore", status: "loadmore",
g: [], g: [],
contentHeight: 0, contentHeight: 0,
PrizeList: [], //首店年份列表
}; };
}, },
onShareTimeline() { onShareTimeline() {
...@@ -200,6 +227,7 @@ export default { ...@@ -200,6 +227,7 @@ export default {
}, },
created() { created() {
this.mainColor = this.$uiConfig.mainColor; this.mainColor = this.$uiConfig.mainColor;
this.getPrizeList();
}, },
mounted() { mounted() {
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
...@@ -283,6 +311,29 @@ export default { ...@@ -283,6 +311,29 @@ export default {
this.g = []; this.g = [];
this.init(); this.init();
}, },
getPrizeList() {
this.request2(
{
url: "/api/AppletTrade/GetPrizePageList",
data: this.msg,
},
(res) => {
if (res.resultCode == 1) {
this.PrizeList = res.data;
}
}
);
},
chooseYear(item) {
if (this.msg.PrizeId == item.Id) {
this.msg.PrizeId = 0;
} else {
this.msg.PrizeId = item.Id;
}
this.g = [];
this.msg.pageIndex = 1;
this.init();
},
}, },
}; };
</script> </script>
...@@ -381,4 +432,68 @@ export default { ...@@ -381,4 +432,68 @@ export default {
width: 24px; width: 24px;
text-align: right; text-align: right;
} }
.screenBox {
display: flex;
align-items: center;
overflow-x: scroll;
box-sizing: border-box;
padding: 0 30rpx;
margin-top: 35rpx;
margin-bottom: 35rpx;
}
.screenBoxItem {
width: 130rpx;
height: 46rpx;
background-color: #e2e2e2;
border-radius: 23rpx;
margin-right: 30rpx;
display: flex;
color: #999999;
overflow: hidden;
}
.screenBoxItemYear {
width: 50%;
height: 46rpx;
background: #e2e2e2;
display: flex;
justify-content: center;
align-items: center;
font-size: 22rpx;
font-family: PingFang SC;
font-weight: 500;
white-space: nowrap;
border-radius: 23px 0px 0px 23px;
}
.activeYear {
background: #1f1f1f;
color: #ffffff;
}
.screenBoxItemName {
width: 50%;
height: 46rpx;
background: #eaeaea;
display: flex;
justify-content: center;
align-items: center;
font-size: 22rpx;
font-family: PingFang SC;
font-weight: 500;
white-space: nowrap;
border-radius: 0px 23px 23px 0px;
}
.activeName {
background: #d0aa7b;
color: #111111;
}
.img-show-prize {
width: 126rpx;
height: 36rpx;
background: #ffffff;
border-radius: 0rpx 0rpx 20rpx 0rpx;
background-color: #000;
position: absolute;
top: 0;
left: 0;
}
</style> </style>
pages/kotra/carrier/detail.vue
View file @ d6ec30be
...@@ -188,7 +188,7 @@ ...@@ -188,7 +188,7 @@
</view> </view>
</view> </view>
<!-- //奖章 --> <!-- //奖章 -->
<view class="MedalBox"> <view class="MedalBox" v-if="detailData.listEnroll.length > 0">
<view <view
v-for="(item, index) in detailData.listEnroll" v-for="(item, index) in detailData.listEnroll"
:key="index" :key="index"
...@@ -202,17 +202,26 @@ ...@@ -202,17 +202,26 @@
</view> </view>
</view> </view>
<!-- 首店数量 --> <!-- 首店数量 -->
<view class="FirstShopBox"> <view
class="FirstShopBox"
v-if="detailData.FirstShopNumList.length > 0"
>
<view <view
v-for="(item, index) in detailData.FirstShopNumList" v-for="(item, index) in detailData.FirstShopNumList"
:key="index" :key="index"
class="FirstShopBoxItem" class="FirstShopBoxItem"
> >
<view <view
style="font-size: 34rpx; font-weight: bold; color: #f60027" style="
width: 100%;
font-size: 34rpx;
font-weight: bold;
color: #f60027;
margin-bottom: 20rpx;
"
>{{ item.Num }}</view >{{ item.Num }}</view
> >
<view style="font-size: 24rpx; color: #a4a4a4">{{ <view style="width: 100%; font-size: 24rpx; color: #a4a4a4">{{
item.Name item.Name
}}</view> }}</view>
</view> </view>
...@@ -409,12 +418,171 @@ ...@@ -409,12 +418,171 @@
margin: 60rpx 0; margin: 60rpx 0;
" "
></view> ></view>
<view style="margin-bottom: 83rpx; text-align: right">
<view style="text-align: left">
<image
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/zhaoyinyouhui.png"
style="width: auto; height: 78rpx"
mode="heightFix"
></image>
</view>
<view
style="
display: inline-block;
padding: 32rpx 26rpx;
width: 505rpx;
min-height: 148rpx;
background: #ffffff;
box-shadow: 0px 4rpx 30rpx 0px rgba(167, 167, 167, 0.15);
border-radius: 20rpx;
margin-top: -30rpx;
"
>
<text
style="
font-size: 26rpx;
color: #1f1f1f;
line-height: 38rpx;
font-weight: 600;
"
><!--招引优惠-->{{ detailData.Discount }}</text
>
</view>
</view>
<view style="margin-bottom: 83rpx; text-align: right">
<view style="text-align: left">
<image
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/titleall.png"
style="width: auto; height: 78rpx"
mode="heightFix"
></image>
</view>
<view
style="
display: inline-block;
padding: 32rpx 26rpx;
width: 505rpx;
min-height: 148rpx;
background: #ffffff;
box-shadow: 0px 4rpx 30rpx 0px rgba(167, 167, 167, 0.15);
border-radius: 20rpx;
margin-top: -30rpx;
"
>
<text
style="
font-size: 26rpx;
color: #1f1f1f;
line-height: 38rpx;
font-weight: 600;
"
><!--首发、首展、首秀政策-->{{ detailData.StartingInfo }}</text
>
</view>
</view>
<!-- <view style="margin-bottom: 83rpx; text-align: right">
<view style="text-align: left">
<image
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/shoufa.png"
style="width: auto; height: 78rpx"
mode="heightFix"
></image>
</view>
<view
style="
display: inline-block;
padding: 32rpx 26rpx;
width: 505rpx;
min-height: 148rpx;
background: #ffffff;
box-shadow: 0px 4rpx 30rpx 0px rgba(167, 167, 167, 0.15);
border-radius: 20rpx;
margin-top: -30rpx;
"
>
<text
style="
font-size: 26rpx;
color: #1f1f1f;
line-height: 38rpx;
font-weight: 600;
"
>{{ detailData.StartingInfo }}</text
>
首发政策
</view>
</view>
<view style="margin-bottom: 83rpx; text-align: right">
<view style="text-align: left">
<image
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/shouxiu.png"
style="width: auto; height: 78rpx"
mode="heightFix"
></image>
</view>
<view
style="
display: inline-block;
padding: 32rpx 26rpx;
width: 505rpx;
min-height: 148rpx;
background: #ffffff;
box-shadow: 0px 4rpx 30rpx 0px rgba(167, 167, 167, 0.15);
border-radius: 20rpx;
margin-top: -30rpx;
"
>
<text
style="
font-size: 26rpx;
color: #1f1f1f;
line-height: 38rpx;
font-weight: 600;
"
>{{ detailData.FirstShow }}</text
>
首秀政策
</view>
</view>
<view style="margin-bottom: 83rpx; text-align: right">
<view style="text-align: left">
<image
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/shouzhan.png"
style="width: auto; height: 78rpx"
mode="heightFix"
></image>
</view>
<view
style="
display: inline-block;
padding: 32rpx 26rpx;
width: 505rpx;
min-height: 148rpx;
background: #ffffff;
box-shadow: 0px 4rpx 30rpx 0px rgba(167, 167, 167, 0.15);
border-radius: 20rpx;
margin-top: -30rpx;
"
>
<text
style="
font-size: 26rpx;
color: #1f1f1f;
line-height: 38rpx;
font-weight: 600;
"
>{{ detailData.FirstExhibition }}</text
>
首展政策
</view>
</view>-->
<view style="margin-bottom: 83rpx; text-align: right"> <view style="margin-bottom: 83rpx; text-align: right">
<view style="text-align: left"> <view style="text-align: left">
<image <image
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616480343000_409.png" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616480343000_409.png"
style="width: 425rpx; height: auto" style="width: auto; height: 78rpx"
mode="widthFix" mode="heightFix"
></image> ></image>
</view> </view>
...@@ -476,8 +644,8 @@ ...@@ -476,8 +644,8 @@
<view style="text-align: left"> <view style="text-align: left">
<image <image
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616480343000_452.png" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616480343000_452.png"
style="width: 425rpx; height: auto" style="width: auto; height: 78rpx"
mode="widthFix" mode="heightFix"
></image> ></image>
</view> </view>
<view <view
...@@ -507,8 +675,8 @@ ...@@ -507,8 +675,8 @@
<view style="text-align: left"> <view style="text-align: left">
<image <image
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616480343000_223.png" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616480343000_223.png"
style="width: 425rpx; height: auto" style="width: auto; height: 78rpx"
mode="widthFix" mode="heightFix"
></image> ></image>
</view> </view>
<view <view
...@@ -534,6 +702,51 @@ ...@@ -534,6 +702,51 @@
> >
</view> </view>
</view> </view>
<view
style="margin-bottom: 83rpx; text-align: right; position: relative"
>
<view style="text-align: left">
<image
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/zaitirongyu.png"
style="width: auto; height: 78rpx"
mode="heightFix"
></image>
</view>
<view
style="
display: inline-block;
padding: 32rpx 26rpx;
width: 505rpx;
min-height: 148rpx;
background: #ffffff;
box-shadow: 0px 4rpx 30rpx 0px rgba(167, 167, 167, 0.15);
border-radius: 20rpx;
margin-top: -30rpx;
display: flex;
flex-wrap: wrap;
position: absolute;
top: 44rpx;
left: 160rpx;
"
><!--载体荣誉-->
<!-- <text
style="
font-size: 26rpx;
color: #1f1f1f;
line-height: 38rpx;
font-weight: 600;
"
>{{ detailData.Crowd }}</text
> -->
<view
v-for="(item, index) in detailData.HonorList"
:key="index"
class="HonorItem"
>
<image :src="item" mode="heightFix" style="height: 100%" />
</view>
</view>
</view>
</view> </view>
</view> </view>
</scroll-view> </scroll-view>
...@@ -838,4 +1051,17 @@ export default { ...@@ -838,4 +1051,17 @@ export default {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
} }
.FirstShopBoxItem {
width: 33.33%;
height: 140rpx;
display: flex;
flex-wrap: wrap;
align-content: center;
}
.HonorItem {
height: 150rpx;
border-radius: 20rpx;
margin-right: 20rpx;
margin-bottom: 20rpx;
}
</style> </style>
pages/kotra/carrier/list.vue
View file @ d6ec30be
...@@ -39,11 +39,35 @@ ...@@ -39,11 +39,35 @@
<u-icon name="wap-nav" color="#111" size="42"></u-icon> <u-icon name="wap-nav" color="#111" size="42"></u-icon>
</div> --> </div> -->
</view> </view>
<view class="screen"> <view class="carrierScreen">
<picker v-model="msg" @change="bindDateChange"> <view class="statusBox">
<view class="uni-input">{{ date }}</view> <picker @change="statusChange" :range="kystatus" range-key="name">
<view class="curStatusName"
>{{ curStatusName
}}<u-icon
name="arrow-down"
color="#ffffff"
size="22"
style="margin-left: 10rpx"
></u-icon
></view>
</picker> </picker>
</view> </view>
<view
class="statusBox"
v-if="msg.FirstStoreTest === 1"
@click="changeFirstStoreTest(0)"
>
首店试验场
</view>
<view
class="statusBox2"
v-if="msg.FirstStoreTest === 0"
@click="changeFirstStoreTest(1)"
>
首店试验场
</view>
</view>
<u-empty <u-empty
v-if="dataList.length == 0" v-if="dataList.length == 0"
text="暂无数据" text="暂无数据"
...@@ -66,6 +90,10 @@ ...@@ -66,6 +90,10 @@
borderRadius: '15px', borderRadius: '15px',
}" }"
> >
<view class="carriertag" v-if="item.FirstStoreTest === 1">
<view class="carriertagsub1">首店</view>
<view class="carriertagsub2">试验场</view>
</view>
<view class="img-box"> <view class="img-box">
<view class="img-show"> <view class="img-show">
<image <image
...@@ -81,9 +109,40 @@ ...@@ -81,9 +109,40 @@
</view> </view>
<div class="good-info"> <div class="good-info">
<div class="good-name"> <div class="good-name">
<div class="span-name">{{ item.CarrierName }}</div> <div class="span-name" style="display: flex">
{{ item.CarrierName }}
<view v-if="item.ListEnroll.length > 0">
<image
style="height: 100%; border-radius: 10rpx 10rpx 0 0"
mode="hrightFix"
:src="item.ListEnroll[0]"
/>
</view>
</div>
<div class="span-type"> <div class="span-type">
{{ typeList[item.ProjectType].Name }} {{ item.ProjectTypeName }}
<text
v-if="item.OpeningStatus == 0"
style="
font-size: 24rpx;
font-family: PingFang SC;
font-weight: 500;
color: #f70027;
margin-left: 10rpx;
"
>即将开业</text
>
<text
v-if="item.OpeningStatus == 1"
style="
font-size: 24rpx;
font-family: PingFang SC;
font-weight: 500;
color: #111111;
margin-left: 10rpx;
"
>已开业</text
>
</div> </div>
</div> </div>
<div class="good-price-info"> <div class="good-price-info">
...@@ -138,6 +197,8 @@ export default { ...@@ -138,6 +197,8 @@ export default {
EndOpenTime: "", EndOpenTime: "",
ProjectType: 0, ProjectType: 0,
OrderBy: 0, OrderBy: 0,
OpeningStatus: 0,
FirstStoreTest: 0,
}, },
loading: false, loading: false,
pageCount: 0, pageCount: 0,
...@@ -155,6 +216,17 @@ export default { ...@@ -155,6 +216,17 @@ export default {
color: "#111111", color: "#111111",
}, },
list: [], list: [],
kystatus: [
{
id: 0,
name: "即将开业",
},
{
id: 1,
name: "已开业",
},
],
curStatusName: "即将开业",
}; };
}, },
onShareTimeline() { onShareTimeline() {
...@@ -303,6 +375,20 @@ export default { ...@@ -303,6 +375,20 @@ export default {
this.status = "nomore"; this.status = "nomore";
} }
}, },
statusChange(e) {
let index = parseInt(e.detail.value);
this.msg.OpeningStatus = this.kystatus[index].id;
this.curStatusName = this.kystatus[index].name;
this.msg.pageIndex = 1;
this.dataList = [];
this.getCarrierPageList();
},
changeFirstStoreTest(i) {
this.msg.FirstStoreTest = i;
this.msg.pageIndex = 1;
this.dataList = [];
this.getCarrierPageList();
},
}, },
}; };
</script> </script>
...@@ -396,18 +482,79 @@ export default { ...@@ -396,18 +482,79 @@ export default {
width: 24px; width: 24px;
text-align: right; text-align: right;
} }
.screenBox { .carrierScreen {
width: 690rpx; height: 50rpx;
height: 100%; margin: 20rpx 0;
box-sizing: border-box; display: flex;
padding: 20rpx 30rpx 45rpx; padding: 0 30rpx;
/* background-color: #999999; */
} }
.screenBox .screenTitle { .statusBox {
font-size: 28rpx; /* width: 150rpx; */
height: 46rpx;
background: #1f1f1f;
border-radius: 23rpx;
display: flex;
justify-content: center;
align-items: center;
color: #fff;
margin-right: 30rpx;
padding: 0 18rpx;
}
.curStatusName {
font-size: 22rpx;
font-family: PingFang SC;
font-weight: 500;
color: #ffffff;
display: flex;
}
.statusBox2 {
/* width: 150rpx; */
height: 46rpx;
background: #eaeaea;
border-radius: 23rpx;
display: flex;
justify-content: center;
align-items: center;
color: #999999;
padding: 0 18rpx;
}
.carriertag {
width: 130rpx;
height: 40rpx;
background: #fff;
border-radius: 0px 0px 20rpx 0px;
position: absolute;
top: 0;
left: 0;
z-index: 100;
display: flex;
justify-content: center;
align-items: center;
}
.carriertagsub1 {
width: 48rpx;
height: 22rpx;
background: #1f1f1f;
border-radius: 4rpx 0rpx 0rpx 4rpx;
font-size: 18rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 800; font-weight: bold;
color: #ffffff;
display: flex;
justify-content: center;
align-items: center;
}
.carriertagsub2 {
width: 60rpx;
height: 22rpx;
background: #d0aa7b;
border-radius: 0px 4rpx 4rpx 0rpx;
display: flex;
justify-content: center;
align-items: center;
font-size: 18rpx;
font-family: PingFang SC;
font-weight: bold;
color: #111111; color: #111111;
margin-bottom: 30rpx;
} }
</style> </style>
pages/kotra/carrierInformation.vue
View file @ d6ec30be
...@@ -215,7 +215,7 @@ ...@@ -215,7 +215,7 @@
" "
> >
<input <input
type="text" type="number"
v-model="model.YeJi" v-model="model.YeJi"
:disabled="disabled" :disabled="disabled"
style="padding: 10px 0" style="padding: 10px 0"
...@@ -362,7 +362,7 @@ ...@@ -362,7 +362,7 @@
</view> </view>
</view> </view>
<view class="label-text" style="margin-top: 20px; margin-bottom: 30rpx"> <view class="label-text" style="margin-top: 20px; margin-bottom: 30rpx">
<text>载体图片</text> <text>介绍图</text>
<text style="color: #999; font-weight: 400" <text style="color: #999; font-weight: 400"
>（最多9张,第一张为封面图）</text >（最多9张,第一张为封面图）</text
> >
......
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