Skip to content

H
hs-app-project
Commit 4c367dcc authored by Zheng Shang Jun's avatar Zheng Shang Jun
Browse files
Options

冲突解决1

parents 77364ced e2477f84
Show whitespace changes
Inline Side-by-side
Showing with 121 additions and 55 deletions
src/pages/home/components/fabricTitle.vue
View file @ 4c367dcc
...@@ -11,8 +11,9 @@ ...@@ -11,8 +11,9 @@
</span> </span>
</view> </view>
<view class="u-font-24 u-m-t-20 color_6F6F72"> <view class="u-font-24 u-m-t-20 color_6F6F72">
<span v-for="itemMater in dataList" :key="indexMater"> <span class="u-m-r-10" <span v-if="dataList.length>0">
v-if="itemMater.id==item.category"> {{itemMater.name}}</span></span> <span v-for="(itemMater,indexMater) in dataList" :key="indexMater"> <span class="u-m-r-10"
v-if="itemMater.id==item.category"> {{itemMater.name}}</span></span></span>
| |
<span class="u-m-l-10 u-m-r-10">{{item.clothWidth}}cm</span> <span class="u-m-l-10 u-m-r-10">{{item.clothWidth}}cm</span>
| |
......
src/pages/home/detail.vue
View file @ 4c367dcc
<template> <template>
<view class="whole"> <view class="whole">
<view class="back"> <view class="back" :style="topHeight==0?'':{'padding-top':resultpx}">
<!-- <view class="back"> -->
<view class="u-flex"> <view class="u-flex">
<u-navbar :is-back="true" :background="{ backgroundColor: '#F5F5F5' }" title="面料详情"> <u-navbar :is-back="true" :background="{ backgroundColor: '#F5F5F5' }" title="面料详情">
<template v-slot:right> <template v-slot:right>
...@@ -10,7 +11,8 @@ ...@@ -10,7 +11,8 @@
</u-navbar> </u-navbar>
</view> </view>
<view :class="fabricObj.materialPictureVOList.length>4?'back-two':'back-back'"> <view
:class="fabricObj.materialPictureVOList!=undefined&&fabricObj.materialPictureVOList.length>4?'back-two':'back-back'">
<view class="row" style="color:#F5B674"> {{fabricObj.materialName}} <view class="row" style="color:#F5B674"> {{fabricObj.materialName}}
</view> </view>
<view class="row" style="color:#fff"> <view class="row" style="color:#fff">
...@@ -30,13 +32,14 @@ ...@@ -30,13 +32,14 @@
</view> </view>
</view> </view>
</view> </view>
<view class="whole-bottom"> <view class="whole-whole">
<view :class="fabricObj.materialPictureVOList.length>4?'body-two':'body'"> <view
:class="fabricObj.materialPictureVOList!=undefined&&fabricObj.materialPictureVOList.length>4?'body-two':'body'">
<view class="font"><strong>已上架款式</strong></view> <view class="font"><strong>已上架款式</strong></view>
<view class="item" v-for="itemTab,indexTab in tableList" :key="indexTab"> <view class="item" v-for="itemTab,indexTab in tableList" :key="indexTab">
<view class="item-left"> <view class="item-left">
<view @click="previewImage(`${imgUrl}${itemTab.originalImageCode}`)"> <view @click="previewImage(`${imgUrl}${itemTab.effectPictureCode}`)">
<image class="item-img" :src="`${imgUrl}${itemTab.originalImageCode}`" mode="aspectFill"> <image class="item-img" :src="`${imgUrl}${itemTab.effectPictureCode}`" mode="aspectFill">
</image> </image>
</view> </view>
<!-- <image class="item-img" src="../../static/images/home/1@2x.png" mode=""></image> --> <!-- <image class="item-img" src="../../static/images/home/1@2x.png" mode=""></image> -->
...@@ -77,6 +80,9 @@ ...@@ -77,6 +80,9 @@
return { return {
imgUrl: this.$IMG_URL, imgUrl: this.$IMG_URL,
id: "", id: "",
topHeight: null,
heightpx: null,
resultpx:"",
fabricObj: {}, fabricObj: {},
tableList: [], tableList: [],
dataList: [], dataList: [],
...@@ -90,6 +96,21 @@ ...@@ -90,6 +96,21 @@
} }
} }
}, },
computed: {
// heightpx() {
// return uni.upx2px(100) + 'px'
// },
// topHeight() {
// uni.getSystemInfo({
// success: (result) => {
// // this.topHeight = result.safeArea.top
// console.log(result.safeArea.top, "result.safeArea.top")
// return result.safeArea.top + 'px'
// }
// })
// }
},
onLoad(option) { onLoad(option) {
this.id = option.id this.id = option.id
this.materialDetail() this.materialDetail()
...@@ -104,6 +125,17 @@ ...@@ -104,6 +125,17 @@
} }
}) })
console.log(uni.upx2px(100), )
uni.getSystemInfo({
success: (result) => {
this.topHeight = result.safeArea.top
console.log(result.safeArea.top, "result.safeArea.top")
}
})
this.heightpx = uni.upx2px(100)
this.resultpx=(this.heightpx-this.topHeight)+'px'
console.log(this.resultpx,"this.resultpx")
}, },
onShow() { onShow() {
this.id = this.$route.query.id this.id = this.$route.query.id
...@@ -198,7 +230,7 @@ ...@@ -198,7 +230,7 @@
} }
} }
.whole-bottom { .whole-whole {
padding: 0 30rpx; padding: 0 30rpx;
...@@ -208,12 +240,14 @@ ...@@ -208,12 +240,14 @@
padding: 30rpx; padding: 30rpx;
margin-top: -60rpx; margin-top: -60rpx;
} }
.body-two{
.body-two {
background: #ffffff; background: #ffffff;
border-radius: 4px; border-radius: 4px;
padding: 30rpx; padding: 30rpx;
// margin-top: -60rpx; // margin-top: -20rpx;
} }
.font { .font {
padding-bottom: 30rpx; padding-bottom: 30rpx;
} }
......
src/pages/home/editFabric.vue
View file @ 4c367dcc
...@@ -7,14 +7,14 @@ ...@@ -7,14 +7,14 @@
<view> <view>
<u-input v-model="detail.referToBrand"></u-input> <u-input v-model="detail.referToBrand"></u-input>
</view> --> </view> -->
<u-form :model="detailInfo" label-position="top" ref="uForm"> <u-form :model="detailInfo" label-position="top" ref="ruForm">
<hs-tip-title title="面料基本信息"></hs-tip-title> <hs-tip-title title="面料基本信息"></hs-tip-title>
<u-form-item label="面料名称" prop="materialName" required> <u-form-item label="面料名称" prop="materialName" required>
<u-input v-model="detailInfo.materialName" placeholder="请输入面料名称" /> <u-input v-model="detailInfo.materialName" placeholder="请输入面料名称" />
</u-form-item> </u-form-item>
<view class="title">面料门幅</view> <view class="title">面料门幅</view>
<u-number-box v-model="detailInfo.clothWidth" :step="1" :input-width="160" :input-height="60" <u-number-box v-model="detailInfo.clothWidth" :step="0.1" :positive-integer="false" :input-width="160"
@change="valChange" style="margin-right:30rpx"> :input-height="60" @change="valChange" style="margin-right:30rpx">
</u-number-box>cm </u-number-box>cm
<u-form-item label="面料成分" prop="component" required> <u-form-item label="面料成分" prop="component" required>
<u-input v-model="detailInfo.component" placeholder="请输入面料成分" /> <u-input v-model="detailInfo.component" placeholder="请输入面料成分" />
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
data() { data() {
return { return {
id: "", id: "",
step: 0.1,
detailInfo: {}, detailInfo: {},
value: 2.2, value: 2.2,
tableList: [] tableList: []
......
src/pages/home/fabricList.vue
View file @ 4c367dcc
...@@ -25,7 +25,7 @@ export default { ...@@ -25,7 +25,7 @@ export default {
components:{fabricTitle}, components:{fabricTitle},
data() { data() {
return { return {
size: 5, size: 10,
search: '', search: '',
fiabricList: [], fiabricList: [],
// dataList:[], // dataList:[],
...@@ -54,7 +54,7 @@ export default { ...@@ -54,7 +54,7 @@ export default {
}, },
methods: { methods: {
searchCli() { searchCli() {
this.size = 5; // this.size = 5;
this.materialList(); this.materialList();
}, },
// 我的面料 // 我的面料
......
src/pages/home/index.vue
View file @ 4c367dcc
...@@ -49,12 +49,32 @@ ...@@ -49,12 +49,32 @@
<view <view
class="home_con_content u-m-t-24" class="home_con_content u-m-t-24"
@click="detailFabric(item)" @click="detailFabric(item)"
v-for="item in fiabricList" v-for="(item, index) in fiabricList"
:key="index"
> >
<image <image
v-if="index == 0"
class="hs-img" class="hs-img"
src="../../static/images/home/1@2x.png" src="../../static/images/home/1@2x.png"
mode="" mode="aspectFill"
></image>
<image
v-if="index == 1"
class="hs-img"
src="../../static/images/home/2@2x.png"
mode="aspectFill"
></image>
<image
v-if="index == 2"
class="hs-img"
src="../../static/images/home/3@2x.png"
mode="aspectFill"
></image>
<image
v-if="index == 3"
class="hs-img"
src="../../static/images/home/4@2x.png"
mode="aspectFill"
></image> ></image>
<view class="home_con_content_font ov_hiden">{{ <view class="home_con_content_font ov_hiden">{{
item.materialName item.materialName
...@@ -193,7 +213,7 @@ export default { ...@@ -193,7 +213,7 @@ export default {
// this.toBeSelectedQuantity(); // this.toBeSelectedQuantity();
// this.orderTicketExceptionNum(); // this.orderTicketExceptionNum();
// this.noSampleOrder(); // this.noSampleOrder();
// this.materialList(); this.materialList();
// 潜在客户 // 潜在客户
this.potentialCustomersPage(); this.potentialCustomersPage();
}, },
...@@ -276,14 +296,16 @@ export default { ...@@ -276,14 +296,16 @@ export default {
}, },
// 我的面料 // 我的面料
materialList() { materialList() {
this.$http("orderTicket.materialList", { this.$http("materialinfo.getMaterialList", {
size: 4, size: 4,
current: 1,
materialType: "面料",
materialCode: "", materialCode: "",
materialName: "", materialName: "",
}).then((res) => { }).then((res) => {
let { code, data } = res; let { code, data } = res;
if (code == 200) { if (code == 200) {
this.fiabricList = data.data; this.fiabricList = data.page.records;
} }
}); });
}, },
...@@ -295,7 +317,7 @@ export default { ...@@ -295,7 +317,7 @@ export default {
this.$Router.push("/pages/home/fabricList"); this.$Router.push("/pages/home/fabricList");
}, },
detailFabric(data) { detailFabric(data) {
this.$Router.push("/pages/home/fabricDetails?id=" + data.id); this.$Router.push("/pages/home/detail?id=" + data.id);
}, },
sampleConfirm() { sampleConfirm() {
this.$Router.push( this.$Router.push(
...@@ -315,6 +337,7 @@ export default { ...@@ -315,6 +337,7 @@ export default {
}, },
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.item--round { .item--round {
border-radius: 8rpx; border-radius: 8rpx;
......
src/pages/home/search.vue
View file @ 4c367dcc
...@@ -10,19 +10,24 @@ ...@@ -10,19 +10,24 @@
</u-navbar> </u-navbar>
<!-- 列表 --> <!-- 列表 -->
<view class="home_con_order u-p-l-30 u-p-r-30"> <view class="home_con_order u-p-l-30 u-p-r-30">
<view class="u-m-t-30" v-for="item in fiabricList"><hs-material-thumbnail @click="detailFabric(item)" :item="filterFiabric(item)"></hs-material-thumbnail></view> <!-- <view class="u-m-t-30" v-for="item in fiabricList"> -->
<!-- <hs-material-thumbnail @click="detailFabric(item)" :item="filterFiabric(item)"></hs-material-thumbnail> -->
<fabricTitle :tableData="fiabricList"></fabricTitle>
<!-- </view> -->
</view> </view>
</view> </view>
</template> </template>
<script> <script>
import home from './mixin/index.js'; import home from './mixin/index.js';
import fabricTitle from "./components/fabricTitle.vue"
export default { export default {
mixins: [home], mixins: [home],
components:{fabricTitle},
data() { data() {
return { return {
value: '', value: '',
size: 5, size: 10,
total: 0, total: 0,
fiabricList: [] fiabricList: []
}; };
...@@ -39,20 +44,22 @@ export default { ...@@ -39,20 +44,22 @@ export default {
this.$router.push('/pages/home/index'); this.$router.push('/pages/home/index');
}, },
searchCli() { searchCli() {
this.size = 5; // this.size = 10;
this.materialList(); this.materialList();
}, },
// 我的面料 // 我的面料
materialList() { materialList() {
this.$http('orderTicket.materialList', { this.$http('materialinfo.getMaterialList', {
size: this.size, size: this.size,
materialCode: '', materialCode: '',
materialName: this.value "current": 1,
"materialType": "面料",
codeAndName: this.value
}).then(res => { }).then(res => {
let { code, data } = res; let { code, data } = res;
if (code == 200) { if (code == 200) {
this.fiabricList = data.data; this.fiabricList = data.page.records;
this.total = data.total; this.total = data.page.total;
} }
}); });
}, },
......
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