Skip to content

H
hs-app-project
Commit 3614b9d3 authored by 阮藤's avatar 阮藤
Browse files
Options

相关页面编写接口对接完成

parent c9e02d4b
Show whitespace changes
Inline Side-by-side
Showing with 120 additions and 190 deletions
src/components/hs-material-thumbnail/hs-material-thumbnail.vue
View file @ 3614b9d3
<template>
<view class="home_con_content_order" @click="click">
<image style="width: 100%;height: 160rpx;" src="@/static/images/home/1@2x.png" mode=""></image>
<image class="width_100 hs-height-160" src="@/static/images/home/1@2x.png" mode=""></image>
<view class="order_tit">
<view class="u-flex justify-between u-font-32">
<span class="color_DDA973 u-line-1">{{item.name}}</span>
<span class="color_DDA973 u-line-1">{{ item.name }}</span>
<span><u-icon size="24" color="#fff" name="arrow-right"></u-icon></span>
</view>
<view class="u-font-24 u-m-t-20 color_6F6F72">
<span class="u-m-r-10">{{item.mdmMaterialCategory}}</span>
<span class="u-m-r-10">{{ item.mdmMaterialCategory }}</span>
|
<span class="u-m-l-10 u-m-r-10">{{ item.mdmMaterialClothWidth }}cm</span>
<span class="u-m-l-10 u-m-r-10">{{ item.mdmMaterialClothWidth }} cm</span>
|
<span class="u-m-l-10">{{item.mdmMaterialComponent}}</span>
<span class="u-m-l-10">{{ item.mdmMaterialComponent }}</span>
</view>
</view>
</view>
......@@ -19,7 +19,7 @@
<script>
export default {
name: "hs-material-thumbnail",
name: 'hs-material-thumbnail',
props: {
item: {
type: Object,
......@@ -29,12 +29,12 @@ export default {
data() {
return {};
},
methods:{
click(){
this.$emit("click")
methods: {
click() {
this.$emit('click');
}
}
}
};
</script>
<style scoped lang="scss">
......@@ -64,22 +64,6 @@ export default {
width: 30%;
}
.ht_136 {
height: 136rpx;
}
.ft-size-24 {
font-size: 24rpx;
}
.ft-size-28 {
font-size: 28rpx;
}
.ft-size-32 {
font-size: 32rpx;
}
.color_DDA973 {
color: #dda973;
}
......@@ -88,58 +72,6 @@ export default {
color: #6f6f72;
}
.color_fff08 {
color: rgba(255, 255, 255, 0.8);
}
.color_00004 {
color: rgba(0, 0, 0, 0.4);
}
.ft-wt-700 {
font-weight: 700;
}
.bg_fff {
background: #fff;
}
.ds_flex {
display: flex;
}
.fx_wrap {
flex-wrap: wrap;
}
.fx_dir_column {
flex-direction: column;
}
.jt_con_center {
justify-content: center;
}
.jt_con_sp_between {
justify-content: space-between;
}
.bd_rad_8 {
border-radius: 8rpx !important;
}
.txt_center {
text-align: center;
}
.ps_relative {
position: relative;
}
.ps_absolute {
position: absolute;
}
.bd_dashed {
position: relative;
}
......@@ -173,5 +105,4 @@ export default {
text-overflow: ellipsis;
white-space: nowrap;
}
</style>
src/pages/home/fabricDetails.vue
View file @ 3614b9d3
......@@ -6,15 +6,15 @@
<view class="content u-p-30">
<!-- 面料基本信息 -->
<view class="fabric_tit u-p-30">
<view class="color_DDA973 u-font-32">{{fabricObj.materialName}}</view>
<view class="color_DDA973 u-font-32">{{materialInfo.materialName}}</view>
<view class="u-font-24 u-m-t-20 color_fff08">
<span class="u-m-r-10">{{fabricObj.materialCategory}}</span>
<span class="u-m-r-10">{{materialInfo.category}}</span>
|
<span class="u-m-l-10 u-m-r-10">{{fabricObj.materialDoorWidth}}</span>
<span class="u-m-l-10 u-m-r-10">{{materialInfo.clothWidth}} cm</span>
|
<span class="u-m-l-10">{{fabricObj.materialElement}}</span>
<span class="u-m-l-10">{{materialInfo.component}}</span>
</view>
<view class="u-m-t-20"><image v-for="item in fabricObj.materialPictureList" class="img_120 u-m-r-30" :src="item.fileCode" mode=""></image></view>
<view class="u-m-t-20"><image v-for="item in materialInfo.materialPictureList" class="img_120 u-m-r-30" :src="item.fileCode" mode=""></image></view>
</view>
<!-- 建模信息 -->
<view class="modeling_tit u-p-30">
......@@ -28,6 +28,7 @@
<view class="ds_flex jt_con_center fx_dir_column ht_136">
<view class="ds_flex">
<span class="width_30 color_00004">检测服务商</span>
<!-- TODO 后期修改 -->
<span class="flex-sub">{{fabricObj.supplierId}}</span>
</view>
<view class="ds_flex u-m-t-8">
......@@ -85,6 +86,11 @@ export default {
this.id = option.id
this.materialDetail();
},
computed:{
materialInfo(){
return this.fabricObj.materialInfo
}
},
methods: {
seeStyleDetails(item) {
this.$Router.push('/pages/home/styleDetails');
......
src/pages/home/fabricList.vue
View file @ 3614b9d3
......@@ -9,22 +9,7 @@
<view>
<view class="u-m-t-30" v-for="item in fiabricList">
<!-- 后期用公共组件 fabricTitle -->
<view class="home_con_content_order" @click="click">
<image style="width: 100%;height: 160rpx;" src="@/static/images/home/1@2x.png" mode=""></image>
<view class="order_tit">
<view class="u-flex justify-between u-font-32">
<span class="color_DDA973 u-line-1">{{ item.materialName }}</span>
<span><u-icon size="24" color="#fff" name="arrow-right"></u-icon></span>
</view>
<view class="u-font-24 u-m-t-20 color_6F6F72">
<span class="u-m-r-10">{{ item.materialCategory }}</span>
|
<span class="u-m-l-10 u-m-r-10">{{ item.materialClothWidth }}cm</span>
|
<span class="u-m-l-10">{{ item.materialComponent }}</span>
</view>
</view>
</view>
<hs-material-thumbnail :item="filterFiabric(item)"></hs-material-thumbnail>
</view>
</view>
</view>
......@@ -54,6 +39,15 @@ export default {
}
},
methods: {
filterFiabric(item) {
return {
...item,
name: item.materialName,
mdmMaterialComponent: item.materialElement,
mdmMaterialClothWidth: item.materialDoorWidth,
mdmMaterialCategory: item.materialCategory,
};
},
searchCli() {
this.size = 5;
this.materialList();
......
src/pages/home/sampleConfirmation.vue
View file @ 3614b9d3
......@@ -8,7 +8,6 @@
<view @click="nextCli" :class="{ color_ccc: sum == total }">下一个</view>
</view>
<!-- 内容 -->
<!-- style="border-radius: 20rpx;" -->
<view class="u-m-20 bg_fff" style="border-radius: 20rpx;">
<view class="sample_title u-p-l-30 u-p-r-30">
<span class="u-font-32">委托单信息</span>
......@@ -37,7 +36,8 @@
<span class="u-font-24 color_DDA973">（新建面料，已同步面料建模）</span>
</view>
<view class="u-m-t-30">
<view class="home_con_content_order" @click="click">
<hs-material-thumbnail :item="mdmMaterial"></hs-material-thumbnail>
<!-- <view class="home_con_content_order" @click="click">
<image style="width: 100%;height: 160rpx;" src="@/static/images/home/1@2x.png" mode=""></image>
<view class="order_tit">
<view class="u-flex justify-between u-font-32">
......@@ -52,7 +52,7 @@
<span class="u-m-l-10">{{ tableData.mdmMaterialComponent }}</span>
</view>
</view>
</view>
</view> -->
</view>
</view>
</view>
......@@ -75,11 +75,19 @@ export default {
tableData: {}
};
},
computed: {
mdmMaterial() {
return {
name: this.tableData.mdmMaterialName,
...this.tableData
};
}
},
onLoad(option) {
console.log(option);
this.abolishIds = option.abolishIds.split(',');
this.total = this.abolishIds.length;
this.detail()
this.detail();
},
methods: {
detail() {
......@@ -126,28 +134,6 @@ export default {
display: flex;
justify-content: space-between;
}
.home_con_content_order {
position: relative;
display: flex;
align-items: center;
justify-content: space-between;
height: 160rpx;
border-radius: 8rpx;
overflow: hidden;
width: 100%;
.order_tit {
position: absolute;
width: 75%;
right: 0;
flex-direction: column;
display: flex;
justify-content: center;
padding: 20rpx;
flex: 1;
height: 100%;
background: rgba(17, 21, 30, 0.5);
}
}
.bd_top {
border-top: 1px solid #f6f6f6;
}
......
src/pages/home/styleEntrustment.vue
View file @ 3614b9d3
......@@ -27,7 +27,7 @@
</view>
</view>
<!-- tabs -->
<u-sticky offset-top="88" class="bd_rad" style="background: #fff;">
<u-sticky offset-top="88" :enable="enable" class="bd_rad" style="background: #fff;">
<u-tabs :list="list" font-size="28" :show-bar="false" active-color="#AF8D66" :current="current" @change="change"></u-tabs>
</u-sticky>
</view>
......@@ -87,7 +87,8 @@ export default {
mixins: [dom],
data() {
return {
statusBtn:true,
enable: true,
statusBtn: true,
timeOut: null,
background: { backgroundColor: 'rgba(245,245,245,0)' },
modal: {
......@@ -139,6 +140,12 @@ export default {
this.orderTicketExceptionNum();
this.noSampleOrder();
},
onShow() {
this.enable = true;
},
onHide() {
this.enable = false;
},
// 上拉加载更多
onReachBottom() {
if (this.total > this.entrustmentList.length) {
......
src/static/style/common.scss
View file @ 3614b9d3
.hs-position-relative{
position: relative;
}
.width_100{
width: 100%;
}
.height_100{
height: 100%;
}
.hs-img{
width: 100%;
height: 100%;
......
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