Skip to content

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

相关问题解决

parent 6e57e4fb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 380 additions and 162 deletions
src/pages/home/fabricDetails.vue
View file @ c21d994f
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<u-navbar :is-back="true" :background="{ backgroundColor: '#F5F5F5' }" title="面料详情"></u-navbar> <u-navbar :is-back="true" :background="{ backgroundColor: '#F5F5F5' }" title="面料详情"></u-navbar>
<!-- 背景图 --> <!-- 背景图 -->
<view class="back_img"></view> <view class="back_img"></view>
<view class="content u-p-30"> <view class="content u-p-30" v-if="fabricObj">
<!-- 面料基本信息 --> <!-- 面料基本信息 -->
<view class="fabric_tit u-p-30"> <view class="fabric_tit u-p-30">
<view class="color_DDA973 u-font-32">{{ materialInfo.materialName }}</view> <view class="color_DDA973 u-font-32">{{ materialInfo.materialName }}</view>
...@@ -19,13 +19,13 @@ ...@@ -19,13 +19,13 @@
<!-- 建模信息 --> <!-- 建模信息 -->
<view class="modeling_tit u-p-30"> <view class="modeling_tit u-p-30">
<view class="tit_date u-font-32"> <view class="tit_date u-font-32">
<span class="u-font-28 ft-wt-700">建模委托信息</span> <span class="u-font-28 hs-weight-700">建模委托信息</span>
<span class="u-font-24"> <span class="u-font-24">
{{ fabricObj.completionDate }} {{ fabricObj.completionDate }}
<u-icon size="28" class="u-m-l-5" color="#ccc" name="arrow-right"></u-icon> <u-icon size="28" class="u-m-l-5" color="#ccc" name="arrow-right"></u-icon>
</span> </span>
</view> </view>
<view class="ds_flex jt_con_center fx_dir_column ht_136"> <view class="ds_flex jt_con_center fx_dir_column hs-height-136">
<view class="ds_flex"> <view class="ds_flex">
<span class="width_30 color_00004">检测服务商</span> <span class="width_30 color_00004">检测服务商</span>
<!-- TODO 后期修改 --> <!-- TODO 后期修改 -->
...@@ -40,13 +40,13 @@ ...@@ -40,13 +40,13 @@
<!-- 检测委托信息 --> <!-- 检测委托信息 -->
<view class="modeling_tit bd_rad_8 u-m-t-30 u-p-30"> <view class="modeling_tit bd_rad_8 u-m-t-30 u-p-30">
<view class="tit_date"> <view class="tit_date">
<span class="u-font-28 ft-wt-700">检测委托信息</span> <span class="u-font-28 hs-weight-700">检测委托信息</span>
<span class="u-font-24"> <span class="u-font-24">
2021年12月12日 2021年12月12日
<u-icon size="28" class="u-m-l-5" color="#ccc" name="arrow-right"></u-icon> <u-icon size="28" class="u-m-l-5" color="#ccc" name="arrow-right"></u-icon>
</span> </span>
</view> </view>
<view class="ds_flex jt_con_center fx_dir_column ht_136"> <view class="ds_flex jt_con_center fx_dir_column hs-height-136">
<view class="ds_flex"> <view class="ds_flex">
<span class="width_30 color_00004">检测服务商</span> <span class="width_30 color_00004">检测服务商</span>
<span class="flex-sub">上海天飞智慧科技有限公司</span> <span class="flex-sub">上海天飞智慧科技有限公司</span>
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
</view> </view>
<!-- 已提交款式 --> <!-- 已提交款式 -->
<view class="modeling_tit bd_rad_8 u-m-t-30 u-p-30"> <view class="modeling_tit bd_rad_8 u-m-t-30 u-p-30">
<view class="u-font-28 ft-wt-700 u-m-b-24">已提交款式</view> <view class="u-font-28 hs-weight-700 u-m-b-24">已提交款式</view>
<u-search bg-color="#fff" border-color="#ececec" placeholder="请输入面料名称" :show-action="false" v-model="searchFabric"></u-search> <u-search bg-color="#fff" border-color="#ececec" placeholder="请输入面料名称" :show-action="false" v-model="searchFabric"></u-search>
<view class="ds_flex fx_wrap jt_con_sp_between txt_center"> <view class="ds_flex fx_wrap jt_con_sp_between txt_center">
<view @click="seeStyleDetails(item)" v-for="(item, index) in tableList" class="u-m-t-30"> <view @click="seeStyleDetails(item)" v-for="(item, index) in tableList" class="u-m-t-30">
...@@ -77,7 +77,7 @@ export default { ...@@ -77,7 +77,7 @@ export default {
data() { data() {
return { return {
searchFabric: '', searchFabric: '',
fabricObj: {}, fabricObj: null,
id: '', id: '',
tableList: [1, 2, 3, 4, 5] tableList: [1, 2, 3, 4, 5]
}; };
...@@ -125,9 +125,6 @@ export default { ...@@ -125,9 +125,6 @@ export default {
.color_00004 { .color_00004 {
color: rgba(0, 0, 0, 0.4); color: rgba(0, 0, 0, 0.4);
} }
.ft-wt-700 {
font-weight: 700;
}
.background_fff { .background_fff {
background: #fff; background: #fff;
} }
...@@ -210,8 +207,9 @@ export default { ...@@ -210,8 +207,9 @@ export default {
.back_img { .back_img {
position: absolute; position: absolute;
width: 100%; width: 100%;
height: 600rpx; height: 450rpx;
background-image: url(../../static/images/home/exhibition.png); background: url(../../static/images/home/exhibition.png) no-repeat;
background-size: 100% 100%;
} }
.img_120 { .img_120 {
width: 120rpx; width: 120rpx;
......
src/pages/home/index.vue
View file @ c21d994f
<template> <template>
<view> <view>
<statusBar />
<!-- 展示图 --> <!-- 展示图 -->
<view class="home_top"> <view id="header" class="back_img">
<image src="../../static/images/home/exhibition@2x.png" style="width: 100%;height: 100%;" mode=""></image> <u-navbar title="" :border-bottom="false" :background="background">
<view class="home_top_out"> <template slot="right">
<view class="out"><image style="width: 100%;height: 100%;" src="../../static/images/home/zuojiantou@2x.png" mode=""></image></view> <view @click="searchCli" class="u-m-r-24 search"><image class="hs-img" src="../../static/images/home/search@2x.png" mode=""></image></view>
<view @click="searchCli" class="search"><image style="width: 100%;height: 100%;" src="../../static/images/home/search@2x.png" mode=""></image></view> </template>
</view> </u-navbar>
</view> </view>
<!-- 按钮 --> <!-- 按钮 -->
<view class="home_btn"> <view class="home_btn">
...@@ -50,7 +49,7 @@ ...@@ -50,7 +49,7 @@
<view class="u-font-24 color_d5aa7a">查看更多</view> <view class="u-font-24 color_d5aa7a">查看更多</view>
</view> </view>
<view class="home_con_order"> <view class="home_con_order">
<view class="home_con_content_order u-m-t-24" v-for="item in 2"> <view class="home_con_content_order u-m-t-24" v-for="item in 4">
<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">加厚荷兰绒绒布布料备份</view> <view class="u-font-32">加厚荷兰绒绒布布料备份</view>
...@@ -68,13 +67,10 @@ ...@@ -68,13 +67,10 @@
</view> </view>
</template> </template>
<script> <script>
import statusBar from '@/components/statusBar.vue';
export default { export default {
components: {
statusBar
},
data() { data() {
return { return {
background: { backgroundColor: 'rgba(245,245,245,0)' },
quantityNum: 0, quantityNum: 0,
exceptionNum: 0, exceptionNum: 0,
abolishIds: [], abolishIds: [],
...@@ -90,7 +86,7 @@ export default { ...@@ -90,7 +86,7 @@ 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/demo1'
}, },
{ {
name: '检测委托', name: '检测委托',
...@@ -111,6 +107,14 @@ export default { ...@@ -111,6 +107,14 @@ export default {
this.noSampleOrder(); this.noSampleOrder();
this.materialList(); this.materialList();
}, },
onPageScroll(object){
let height = 486 /2
if (object.scrollTop >= height) {
this.background.backgroundColor = 'rgba(245,245,245,1)';
} else {
this.background.backgroundColor = 'rgba(245,245,245,0)';
}
},
methods: { methods: {
// 选款总数 // 选款总数
toBeSelectedQuantity() { toBeSelectedQuantity() {
...@@ -171,13 +175,11 @@ export default { ...@@ -171,13 +175,11 @@ export default {
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.statusBar { .back_img {
height: var(--status-bar-height); height: 486rpx;
width: 100%; width: 100%;
position: fixed; background: url(../../static/images/home/exhibition.png) no-repeat;
background-color: #fff; background-size: 100% 100%;
top: 0;
z-index: 999;
} }
.home_top { .home_top {
position: relative; position: relative;
...@@ -195,12 +197,12 @@ export default { ...@@ -195,12 +197,12 @@ export default {
width: 32rpx; width: 32rpx;
height: 32rpx; height: 32rpx;
} }
.search {
width: 60rpx;
height: 60rpx;
}
} }
} }
.search {
width: 60rpx;
height: 60rpx;
}
.tips { .tips {
display: flex; display: flex;
height: 80rpx; height: 80rpx;
......
src/pages/home/sampleConfirmation.vue
View file @ c21d994f
<template> <template>
<view class="ps_relative"> <view>
<u-navbar :is-back="true" :background="{ backgroundColor: '#F5F5F5' }" title="寄样确认"></u-navbar> <view class="" id="header">
<view class="content"> <u-navbar :is-back="true" :background="{ backgroundColor: '#F5F5F5' }" title="寄样确认"></u-navbar>
<view class="bg_fff sample_sum"> <view class="bg_fff hs-height-70 u-flex u-row-around">
<view @click="previousCli" :class="{ color_ccc: sum == 1 }">上一个</view> <view @click="previousCli" :class="{ color_ccc: sum == 1 }">上一个</view>
<view class="">{{ sum }}/{{ total }}</view> <view class="">{{ sum }}/{{ total }}</view>
<view @click="nextCli" :class="{ color_ccc: sum == total }">下一个</view> <view @click="nextCli" :class="{ color_ccc: sum == total }">下一个</view>
</view> </view>
</view>
<view class="content" :style="{ bottom: footerHeight + 'px', top: headerHeight + 'px' }">
<!-- 内容 --> <!-- 内容 -->
<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="hs-height-100 u-flex u-row-between 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">委托发布日期：{{ tableData.releaseDate }}</span> <span class="u-font-28">委托发布日期：{{ tableData.releaseDate }}</span>
</view> </view>
...@@ -35,19 +37,27 @@ ...@@ -35,19 +37,27 @@
<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"> <view class="u-m-t-30"><hs-material-thumbnail :item="mdmMaterial"></hs-material-thumbnail></view>
<hs-material-thumbnail :item="mdmMaterial"></hs-material-thumbnail>
</view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<!-- 底部按钮 确定-->
<view class="footer" id="footer">
<view class="footer-btn">
<!-- /* 以下形式在微信小程序会无效，APP和H5有效 */-->
<u-button @click="toAddItem" class="custom-style" shape="circle">确定</u-button>
</view>
</view>
<u-toast ref="uToast" />
</view> </view>
</template> </template>
<script> <script>
import dom from '@/mixins/dom';
import fabricTitle from '@/components/hs-material-thumbnail/hs-material-thumbnail.vue'; import fabricTitle from '@/components/hs-material-thumbnail/hs-material-thumbnail.vue';
export default { export default {
mixins: [dom],
components: { fabricTitle }, components: { fabricTitle },
data() { data() {
return { return {
...@@ -62,13 +72,11 @@ export default { ...@@ -62,13 +72,11 @@ export default {
computed: { computed: {
mdmMaterial() { mdmMaterial() {
return { return {
// name: this.tableData.mdmMaterialName,
...this.tableData ...this.tableData
}; };
} }
}, },
onLoad(option) { onLoad(option) {
console.log(option);
this.abolishIds = option.abolishIds.split(','); this.abolishIds = option.abolishIds.split(',');
this.total = this.abolishIds.length; this.total = this.abolishIds.length;
this.detail(); this.detail();
...@@ -76,12 +84,25 @@ export default { ...@@ -76,12 +84,25 @@ export default {
methods: { methods: {
detail() { detail() {
let i = this.sum - 1; let i = this.sum - 1;
this.$http('orderTicket.detail', this.abolishIds[i]).then(res => { this.$http('orderTicket.detail', this.abolishIds[i], '加载中...')
let { code, data } = res; .then(res => {
if (code === 200) { let { code, data } = res;
this.tableData = data; if (code === 200) {
} this.tableData = data;
}); this.$refs.uToast.show({
title: '操作成功'
});
} else {
this.$refs.uToast.show({
title: '操作失败'
});
}
})
.catch(err => {
this.$refs.uToast.show({
title: '操作失败'
});
});
}, },
previousCli() { previousCli() {
if (this.sum == 1) return; if (this.sum == 1) return;
...@@ -106,20 +127,15 @@ export default { ...@@ -106,20 +127,15 @@ export default {
</style> </style>
<style lang="scss" scoped> <style lang="scss" scoped>
@import './index.css'; @import './index.css';
.sample_sum { .content {
display: flex; position: absolute;
justify-content: space-around; width: 100%;
height: 70rpx; height: auto;
align-items: center; left: 0;
} right: 0;
.sample_title { bottom: 0;
height: 100rpx; top: 0;
align-items: center; overflow-y: auto;
display: flex;
justify-content: space-between;
}
.bd_top {
border-top: 1px solid #f6f6f6;
} }
.bd_split_line { .bd_split_line {
width: 90%; width: 90%;
...@@ -149,4 +165,21 @@ export default { ...@@ -149,4 +165,21 @@ export default {
border-radius: 100rpx; border-radius: 100rpx;
} }
} }
.custom-style {
color: #fff;
background: #000;
}
.footer {
position: fixed;
width: 100%;
bottom: 0;
z-index: 998;
background: #fff;
box-shadow: 0px -4rpx 6rpx 0px rgba(178, 182, 214, 0.1);
padding-bottom: constant(safe-area-inset-bottom);
padding-bottom: env(safe-area-inset-bottom);
.footer-btn {
padding: 20rpx 30rpx;
}
}
</style> </style>
src/pages/home/styleEntrustment.vue
View file @ c21d994f
This diff is collapsed.
src/pages/home/tenantSelection.vue 0 → 100644
View file @ c21d994f
<!--新增委托-->
<template>
<view>
<view id="header"><u-navbar title="租户选择" :border-bottom="false" :background="{ backgroundColor: 'whitesmoke' }"></u-navbar></view>
<!-- 列表 确定-->
<view class="u-p-30 body" :style="{ bottom: footerHeight + 'px', top: headerHeight + 'px' }">
<view v-for="(item, index) in list" :key="item.id" class="u-flex u-m-b-20">
<view class="u-m-r-30">
<u-icon :name="index === selectedIndex ? 'checkmark-circle-fill' : 'checkmark-circle'" color="#000" size="40" @click="triggerSelectItem(index)" />
</view>
<view class="ab">租户{{ index }}</view>
</view>
</view>
<!-- 底部按钮 确定-->
<view class="footer" id="footer">
<view class="footer-btn">
<!-- /* 以下形式在微信小程序会无效，APP和H5有效 */-->
<u-button :disabled="selectedIndex === -1" @click="toAddItem" class="custom-style" shape="circle">确定</u-button>
</view>
</view>
</view>
</template>
<script>
import dom from '@/mixins/dom';
import HsSelectItem from '../../components/hs-select-item/hs-select-item';
import HsMaterialThumbnail from '../../components/hs-material-thumbnail/hs-material-thumbnail';
export default {
name: 'listSelectToAdd',
components: { HsMaterialThumbnail, HsSelectItem },
mixins: [dom],
data() {
return {
keyword: '',
selectedIndex: -1,
list: [
{
title: '加厚荷兰绒绒布布料',
id: 2
},
{
title: '加厚荷兰绒绒布布料加厚荷兰绒绒布布料',
id: 12
},
{
title: '加厚荷兰绒绒布布料',
id: 221
},
{
title: '加厚荷兰绒绒布布料',
id: 22
},
{
title: '加厚荷兰绒绒布布料',
id: 224
},
{
title: '加厚荷兰绒绒布布料',
id: 222
}
]
};
},
onLoad() {
this.getList();
},
methods: {
getList() {
this.$http('orderTicket.materialList', {
size: 4,
materialCode: '',
materialName: ''
}).then(res => {
let { code, data } = res;
if (code == 200) {
this.list = data.data;
}
});
},
triggerSelectItem(index) {
this.selectedIndex = index === this.selectedIndex ? -1 : index;
},
// 跳转到新增详情页面
toAddItem() {
uni.setStorageSync('_item', this.list[this.selectedIndex]);
this.$Router.push({
path: '/pages/designCommissioned/addItem'
// query:{
// id: this.list[this.selectedIndex].id
// }
});
},
// 跳转到面料详情
toMaterialDetail({ id }) {
this.$Router.push({
path: '/pages/home/fabricDetails',
query: {
id
}
});
}
}
};
</script>
<style scoped lang="scss">
$h-color: #af8d66;
$main-color: #fff;
.body {
position: absolute;
width: 100%;
height: auto;
left: 0;
right: 0;
bottom: 0;
top: 0;
overflow-y: auto;
}
.title {
color: $h-color;
background-color: whitesmoke;
}
.ab {
flex: 1;
height: 160rpx;
line-height: 160rpx;
text-align: center;
background: url(../../static/images/home/tenSelet@2x.png) no-repeat;
background-size: 100% 100%;
border-radius: 16rpx;
}
.bg-fff {
background: $main-color;
}
.item {
border-radius: 8rpx;
border: 1px solid #bd4848;
height: 160rpx;
width: 100%;
overflow: hidden;
background-size: contain;
.active {
border: 1px solid #000;
}
}
.custom-style {
color: #fff;
background: #000;
}
.footer {
position: fixed;
width: 100%;
bottom: 0;
z-index: 998;
background: #fff;
box-shadow: 0px -4rpx 6rpx 0px rgba(178, 182, 214, 0.1);
padding-bottom: constant(safe-area-inset-bottom);
padding-bottom: env(safe-area-inset-bottom);
.footer-btn {
padding: 20rpx 30rpx;
}
}
</style>
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