相关页面提交

src/pages/fabricModeling/mixins/dom.js

+export default {
+    data(){
+        return{
+            headerHeight: 0,
+            footerHeight: 0
+        }
+    },
+    methods:{
+        getHeaderHeight(){
+            this.$nextTick(() =>{
+                this.uGetRect("#header").then(res =>{
+                    this.headerHeight = res.height;
+                })
+            })
+        },
+        getFooterHeight(){
+            this.$nextTick(() =>{
+                this.uGetRect("#footer").then(res =>{
+                    this.footerHeight = res.height;
+                })
+            })
+        },
+        uGetRect(selector, all) {
+            return new Promise((resolve) => {
+                uni.createSelectorQuery()
+                    .in(this)[all ? 'selectAll' : 'select'](selector)
+                    .boundingClientRect((rect) => {
+                        if (all && Array.isArray(rect) && rect.length) {
+                            resolve(rect)
+                        }
+                        if (!all && rect) {
+                            resolve(rect)
+                        }
+                        if(rect === null){
+                            resolve({})
+                        }
+                    })
+                    .exec()
+            })
+        },
+    },
+    mounted() {
+        this.getHeaderHeight();
+        this.getFooterHeight();
+    },
+}

src/pages/fabricModeling/mixins/status.js

+
+let statusList = [
+    {label:"全部",value: null ,close: false},
+    {label:"备选",value: 1,close: false},
+    {label:"待定",value: 2,close: false},
+    {label:"选中",value: 3,close: false},
+    {label:"放弃",value: 4,close: false},
+    {label:"已提交",value: 5,close: false}
+]
+export default {
+    data(){
+        return {
+            status: statusList
+        }
+    },
+    filters:{
+        filterStatus(value){
+            switch (value) {
+
+            }
+        }
+    },
+    methods:{
+        getStatus(){
+
+        },
+        changeStatus(status){
+            switch (status) {
+                case (1):
+                    return 0;
+                case (2):
+                    return 4;
+                case (3):
+                    return 5;
+                case (4):
+                    return 2;
+                case (5):
+                    return 3;
+                default:
+                    return 1;
+            }
+        },
+    }
+}

src/pages/fabricModeling/mixins/styleTree.js

+export default {
+    methods:{
+        getStyleTreeList(){
+            function filterArray(data){
+                for (let i = 0; i < data.length; i++) {
+                    let item = data[i];
+                    if(item.children.length === 0){
+                        delete item.children;
+                    }else{
+                        filterArray(item.children)
+                    }
+                }
+                return data
+            }
+            return new Promise((resolve, reject) =>{
+                this.$http("orderTicket.styleTreeList").then(res =>{
+                    let {
+                        code, data
+                    } = res;
+                    if(code === 200){
+                        this.brandSelectList = filterArray(data);
+                        resolve();
+                    }
+                }).catch(err =>{
+                    reject(err);
+                })
+            })
+
+        },
+    }
+}

src/pages/home/modelingOrder.vue → src/pages/fabricModeling/modelingOrder.vue

@@ -19,7 +19,10 @@
 						></u-search>
 					</view>
 					<template v-slot:right>
-						<view v-if="searchFlag" @click="searchCli" class="u-m-r-24"><u-icon name="search" size="38"></u-icon></view>
+						<view v-if="searchFlag" @click="searchCli" class="u-m-r-24">
+							<!-- <u-icon name="search" size="38"></u-icon> -->
+							<image class="hs-img-56" src="@/static/images/home/search@2x.png" mode=""></image>
+						</view>
 					</template>
 				</u-navbar>
 				<!-- 总数 -->
@@ -45,7 +48,7 @@
 				</u-sticky>
 			</view>
 			<view class="content" :style="{ bottom: footerHeight + 'px', top: headerHeight + 'px' }">
-				<view class="u-flex u-row-between u-p-t-24 u-p-b-24 u-p-l-30 u-p-r-30">
+				<view v-if="!isEmpty" class="u-flex u-row-between u-p-t-24 u-p-b-24 u-p-l-30 u-p-r-30">
 					<view class="">全部订单：共30单</view>
 					<view class="">截止日期：2021-12-21</view>
 				</view>
@@ -91,10 +94,12 @@
 		</view>
 		<view class="footer" id="footer">
 			<view class="footer-btn">
-				<view class="custom-style-round-circle custom-style-btn custom-style">
+				<!-- <view class="custom-style-round-circle custom-style-btn custom-style">
 					<view class="custom-style-left save">新面料建模</view>
 					<view class="custom-style-right submit">已有面料建模</view>
-				</view>
+				</view> -->
+				<!--        /* 以下形式在微信小程序会无效，APP和H5有效 */-->
+				<u-button @click="dateilEnt" class="custom-style" shape="circle">面料委托建模</u-button>
 			</view>
 		</view>
 		<u-modal v-model="modal.show" :show-cancel-button="true" :content="modal.title" @cancel="modal.show = false" @confirm="confirm"></u-modal>
@@ -403,7 +408,6 @@ export default {
 	left: 0;
 	right: 0;
 	bottom: 0;
-	overflow: auto;
 }
 .custom-style {
 	color: #fff;
@@ -444,6 +448,10 @@ export default {
 		}
 	}
 }
+.custom-style {
+	color: #fff;
+	background: #000;
+}
 .footer {
 	position: fixed;
 	width: 100%;
@@ -459,7 +467,7 @@ export default {
 }
 .bg_img {
 	width: 100%;
-	background: url(../../static/images/home/entrustment@2x.png) no-repeat;
+	background: url(@/static/images/home/entrustment@2x.png) no-repeat;
 	background-size: 100% 100%;
 }
 .content {

src/pages/home/components/fabricTitle.vue

@@ -34,7 +34,6 @@ export default {
 </script>
 
 <style scoped lang="scss">
-@import '../index.css';
 .home_con_content_order {
 	position: relative;
 	display: flex;
@@ -56,4 +55,15 @@ export default {
 		background: rgba(17, 21, 30, 0.5);
 	}
 }
+.ov_hiden {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+.color_DDA973 {
+	color: #dda973;
+}
+.color_6F6F72 {
+	color: #6f6f72;
+}
 </style>

src/pages/home/index.vue

@@ -80,24 +80,39 @@ export default {
 				{
 					name: '面料建模',
 					img: '../../static/images/home/fabricModeling@2x.png',
-					url: ''
+					url: '/pages/fabricModeling/modelingOrder'
 				},
 				{
-					name: '款式委托',
+					name: '搜款',
 					img: '../../static/images/home/styleEntrustment@2x.png',
-					url: '/pages/home/styleEntrustment'
-					// url: '/pages/home/demo1'
-				},
-				{
-					name: '检测委托',
-					img: '../../static/images/home/styleManageme@2x.png',
 					url: ''
 				},
 				{
-					name: '款式管理',
-					img: '../../static/images/home/testCommission@2x.png',
+					name: '上架管理',
+					img: '../../static/images/home/styleManageme@2x.png',
 					url: ''
 				}
+				// TODO 旧版本  可能以后会用到
+				// {
+				// 	name: '面料建模',
+				// 	img: '../../static/images/home/fabricModeling@2x.png',
+				// 	url: '/pages/fabricModeling/modelingOrder'
+				// },
+				// {
+				// 	name: '款式委托',
+				// 	img: '../../static/images/home/styleEntrustment@2x.png',
+				// 	url: '/pages/home/styleEntrustment'
+				// },
+				// {
+				// 	name: '检测委托',
+				// 	img: '../../static/images/home/styleManageme@2x.png',
+				// 	url: ''
+				// },
+				// {
+				// 	name: '款式管理',
+				// 	img: '../../static/images/home/testCommission@2x.png',
+				// 	url: ''
+				// }
 			]
 		};
 	},
@@ -107,8 +122,8 @@ export default {
 		this.noSampleOrder();
 		this.materialList();
 	},
-	onPageScroll(object){
-		let height = 486 /2
+	onPageScroll(object) {
+		let height = 486 / 2;
 		if (object.scrollTop >= height) {
 			this.background.backgroundColor = 'rgba(245,245,245,1)';
 		} else {
@@ -170,7 +185,14 @@ export default {
 			this.$Router.push('/pages/home/sampleConfirmation?abolishIds=' + this.abolishIds);
 		},
 		goCli(url) {
+			if (url) {
 				this.$Router.push(url);
+			}else{
+				uni.showToast({
+					title:'该功能正在开发中...',
+					icon: 'none'
+				})
+			}
 		}
 	}
 };

src/pages/home/sampleConfirmation.vue

@@ -124,9 +124,20 @@ export default {
 .color_ccc {
 	color: #ccc;
 }
+.color_00004 {
+	color: rgba(0, 0, 0, 0.4);
+}
+.color_DDA973 {
+	color: #dda973;
+}
 </style>
 <style lang="scss" scoped>
-@import './index.css';
+.ds_flex {
+	display: flex;
+}
+.width_30 {
+	width: 30%;
+}
 .content {
 	position: absolute;
 	width: 100%;