Skip to content

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

相关页面修改

parent cd4ee676
Show whitespace changes
Inline Side-by-side
Showing with 107 additions and 30 deletions
src/pages/home/fabricDetails.vue
View file @ 61c74de7
...@@ -77,10 +77,12 @@ export default { ...@@ -77,10 +77,12 @@ export default {
return { return {
searchFabric: '', searchFabric: '',
fabricObj:{}, fabricObj:{},
id:'',
tableList: [1, 2, 3, 4, 5] tableList: [1, 2, 3, 4, 5]
}; };
}, },
onLoad() { onLoad(option) {
this.id = option.id
this.materialDetail(); this.materialDetail();
}, },
methods: { methods: {
...@@ -88,7 +90,7 @@ export default { ...@@ -88,7 +90,7 @@ export default {
this.$Router.push('/pages/home/styleDetails'); this.$Router.push('/pages/home/styleDetails');
}, },
materialDetail() { materialDetail() {
this.$http('orderTicket.materialDetail', 1).then(res => { this.$http('orderTicket.materialDetail', this.id).then(res => {
let { code, data } = res; let { code, data } = res;
if (code === 200) { if (code === 200) {
this.fabricObj = data this.fabricObj = data
......
src/pages/home/fabricList.vue
View file @ 61c74de7
...@@ -7,7 +7,25 @@ ...@@ -7,7 +7,25 @@
<u-search @search="searchCli" class="" bg-color="#fff" border-color="#ececec" placeholder="请输入面料名称" :show-action="false" v-model="search"></u-search> <u-search @search="searchCli" class="" bg-color="#fff" border-color="#ececec" placeholder="请输入面料名称" :show-action="false" v-model="search"></u-search>
</u-sticky> </u-sticky>
<view> <view>
<view class="u-m-t-30" v-for="item in fiabricList"><fabricTitle :item="item"></fabricTitle></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>
</view>
</view> </view>
</view> </view>
</view> </view>
...@@ -21,7 +39,8 @@ export default { ...@@ -21,7 +39,8 @@ export default {
return { return {
size: 5, size: 5,
search: '', search: '',
fiabricList: [] fiabricList: [],
total: 0
}; };
}, },
onLoad() { onLoad() {
...@@ -29,8 +48,10 @@ export default { ...@@ -29,8 +48,10 @@ export default {
}, },
// 上拉加载更多 // 上拉加载更多
onReachBottom() { onReachBottom() {
if (this.total > this.fiabricList.length) {
this.size = this.size + 5; this.size = this.size + 5;
this.entrustmentPage(); this.materialList();
}
}, },
methods: { methods: {
searchCli() { searchCli() {
...@@ -46,7 +67,8 @@ export default { ...@@ -46,7 +67,8 @@ export default {
}).then(res => { }).then(res => {
let { code, data } = res; let { code, data } = res;
if (code == 200) { if (code == 200) {
this.fiabricList = data; this.fiabricList = data.data;
this.total = data.total;
} }
}); });
} }
......
src/pages/home/index.vue
View file @ 61c74de7
...@@ -34,8 +34,9 @@ ...@@ -34,8 +34,9 @@
<view class="u-font-24 color_d5aa7a" @click="seeFabric">查看更多</view> <view class="u-font-24 color_d5aa7a" @click="seeFabric">查看更多</view>
</view> </view>
<view class="home_con_fabric"> <view class="home_con_fabric">
<view class="home_con_content u-m-t-24" @click="detailFabric(item)" v-for="item in 2"> <view class="home_con_content u-m-t-24" @click="detailFabric(item)" v-for="item in fiabricList">
<image class="hs-img" :src="item.fileCode" mode=""></image> <!-- <image class="hs-img" :src="item.fileCode" mode=""></image> -->
<image class="hs-img" src="../../static/images/home/1@2x.png" mode=""></image>
<view class="home_con_content_font ov_hiden">{{ item.materialName }}</view> <view class="home_con_content_font ov_hiden">{{ item.materialName }}</view>
</view> </view>
</view> </view>
...@@ -89,8 +90,8 @@ export default { ...@@ -89,8 +90,8 @@ export default {
{ {
name: '款式委托', name: '款式委托',
img: '../../static/images/home/styleEntrustment@2x.png', img: '../../static/images/home/styleEntrustment@2x.png',
// url: '/pages/home/styleEntrustment' url: '/pages/home/styleEntrustment'
url: '/pages/home/demo' // url: '/pages/home/demo'
}, },
{ {
name: '检测委托', name: '检测委托',
...@@ -148,8 +149,7 @@ export default { ...@@ -148,8 +149,7 @@ export default {
}).then(res => { }).then(res => {
let { code, data } = res; let { code, data } = res;
if (code == 200) { if (code == 200) {
this.fiabricList = data; this.fiabricList = data.data;
// this.fiabricList = [1,2];
} }
}); });
}, },
...@@ -160,10 +160,10 @@ export default { ...@@ -160,10 +160,10 @@ export default {
this.$Router.push('/pages/home/fabricList'); this.$Router.push('/pages/home/fabricList');
}, },
detailFabric(data) { detailFabric(data) {
this.$Router.push('/pages/home/fabricDetails'); this.$Router.push('/pages/home/fabricDetails?id=' + data.id);
}, },
sampleConfirm() { sampleConfirm() {
this.$Router.push('/pages/home/sampleConfirmation'); this.$Router.push('/pages/home/sampleConfirmation?abolishIds=' + this.abolishIds);
}, },
goCli(url) { goCli(url) {
this.$Router.push(url); this.$Router.push(url);
......
src/pages/home/sampleConfirmation.vue
View file @ 61c74de7
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<view class="u-m-20 bg_fff" 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"> <view class="sample_title u-p-l-30 u-p-r-30">
<span class="u-font-32">委托单信息</span> <span class="u-font-32">委托单信息</span>
<span class="u-font-28">委托发布日期：2021-12-11</span> <span class="u-font-28">委托发布日期：{{ tableData.releaseDate }}</span>
</view> </view>
<view class="bd_split_line"></view> <view class="bd_split_line"></view>
<view class="sample_info u-p-l-30 u-p-r-30 u-p-b-30"> <view class="sample_info u-p-l-30 u-p-r-30 u-p-b-30">
...@@ -36,7 +36,24 @@ ...@@ -36,7 +36,24 @@
<span class="u-font-28">所选面料</span> <span class="u-font-28">所选面料</span>
<span class="u-font-24 color_DDA973">（新建面料，已同步面料建模）</span> <span class="u-font-24 color_DDA973">（新建面料，已同步面料建模）</span>
</view> </view>
<view class="u-m-t-30"><fabricTitle :item="tableData"></fabricTitle></view> <view class="u-m-t-30">
<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">{{ tableData.mdmMaterialName }}</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">{{ tableData.mdmMaterialCategory }}</span>
|
<span class="u-m-l-10 u-m-r-10">{{ tableData.mdmMaterialClothWidth }}cm</span>
|
<span class="u-m-l-10">{{ tableData.mdmMaterialComponent }}</span>
</view>
</view>
</view>
</view>
</view> </view>
</view> </view>
</view> </view>
...@@ -54,15 +71,20 @@ export default { ...@@ -54,15 +71,20 @@ export default {
total: 1, total: 1,
// 当前数 // 当前数
sum: 1, sum: 1,
abolishIds: [],
tableData: {} tableData: {}
}; };
}, },
onLoad() { onLoad(option) {
this.detail(); console.log(option);
this.abolishIds = option.abolishIds.split(',');
this.total = this.abolishIds.length;
this.detail()
}, },
methods: { methods: {
detail() { detail() {
this.$http('orderTicket.detail', 1).then(res => { let i = this.sum - 1;
this.$http('orderTicket.detail', this.abolishIds[i]).then(res => {
let { code, data } = res; let { code, data } = res;
if (code === 200) { if (code === 200) {
this.tableData = data; this.tableData = data;
...@@ -72,10 +94,12 @@ export default { ...@@ -72,10 +94,12 @@ export default {
previousCli() { previousCli() {
if (this.sum == 1) return; if (this.sum == 1) return;
this.sum == --this.sum; this.sum == --this.sum;
this.detail();
}, },
nextCli() { nextCli() {
if (this.sum == this.total) return; if (this.sum == this.total) return;
this.sum == ++this.sum; this.sum == ++this.sum;
this.detail();
} }
} }
}; };
...@@ -102,6 +126,28 @@ export default { ...@@ -102,6 +126,28 @@ export default {
display: flex; display: flex;
justify-content: space-between; 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 { .bd_top {
border-top: 1px solid #f6f6f6; border-top: 1px solid #f6f6f6;
} }
......
src/pages/home/search.vue
View file @ 61c74de7
...@@ -13,13 +13,13 @@ ...@@ -13,13 +13,13 @@
<view class="home_con_content_order u-m-t-30" v-for="item in fiabricList"> <view class="home_con_content_order u-m-t-30" v-for="item in fiabricList">
<image style="width: 160rpx;height: 160rpx;" src="../../static/images/home/2.png" mode=""></image> <image style="width: 160rpx;height: 160rpx;" src="../../static/images/home/2.png" mode=""></image>
<view class="order_tit"> <view class="order_tit">
<view class="u-font-32">{{item.materialName}}</view> <view class="u-font-32">{{ item.materialName }}</view>
<view class="u-font-24 u-m-t-20 color_6F6F72"> <view class="u-font-24 u-m-t-20 color_6F6F72">
<span class="u-m-r-10">{{item.materialCategory}}</span> <span class="u-m-r-10">{{ item.materialCategory }}</span>
| |
<span class="u-m-l-10 u-m-r-10">{{item.materialDoorWidth}}</span> <span class="u-m-l-10 u-m-r-10">{{ item.materialDoorWidth }}</span>
| |
<span class="u-m-l-10">{{item.materialElement}}</span> <span class="u-m-l-10">{{ item.materialElement }}</span>
</view> </view>
</view> </view>
</view> </view>
...@@ -33,13 +33,15 @@ export default { ...@@ -33,13 +33,15 @@ export default {
return { return {
value: '', value: '',
size: 5, size: 5,
fiabricList:[] fiabricList: []
}; };
}, },
// 上拉加载更多 // 上拉加载更多
onReachBottom() { onReachBottom() {
if (this.total > this.fiabricList.length) {
this.size = this.size + 5; this.size = this.size + 5;
this.materialList(); this.materialList();
}
}, },
methods: { methods: {
outCli() { outCli() {
...@@ -58,7 +60,8 @@ export default { ...@@ -58,7 +60,8 @@ export default {
}).then(res => { }).then(res => {
let { code, data } = res; let { code, data } = res;
if (code == 200) { if (code == 200) {
this.fiabricList = data; this.fiabricList = data.data;
this.total = data.total;
} }
}); });
} }
......
src/pages/home/styleDetails.vue
View file @ 61c74de7
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<!-- 图片 --> <!-- 图片 -->
<view class="u-m-30 u-flex justify-between u-flex-wrap"> <view class="u-m-30 u-flex justify-between u-flex-wrap">
<view class=" u-m-b-30 hs-position-relative hs-width-330 hs-height-330" v-for="item in 5"> <view class=" u-m-b-30 hs-position-relative hs-width-330 hs-height-330" v-for="item in 5">
<image class="img" src="@/static/images/home/yanyi1@2x.png" mode=""></image> <image class="hs-img-330" src="@/static/images/home/yanyi1@2x.png" mode=""></image>
<view class="img_tit">款式正面</view> <view class="img_tit">款式正面</view>
</view> </view>
</view> </view>
......
src/pages/home/styleEntrustment.vue
View file @ 61c74de7
...@@ -260,7 +260,11 @@ export default { ...@@ -260,7 +260,11 @@ export default {
if (val == '拆单') { if (val == '拆单') {
this.$Router.push('/pages/designCommissioned/splitItem?id=' + item.id); this.$Router.push('/pages/designCommissioned/splitItem?id=' + item.id);
} else if (val == '编辑') { } else if (val == '编辑') {
this.$Router.push('/pages/designCommissioned/addItem?id=' + item.id); this.$Router.push(`/pages/designCommissioned/addItem?id=${item.id}&status=1`);
} else if (val == '选款') {
// this.$Router.push(`/pages/designCommissioned/addItem?id=${item.id}&status=2`);
} else if (val == '寄样') {
this.$Router.push(`/pages/designCommissioned/addItem?id=${item.id}&status=3`);
} else { } else {
this.$Router.push('/pages/designCommissioned/listSelectToAdd'); this.$Router.push('/pages/designCommissioned/listSelectToAdd');
} }
......
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