diff --git a/pages/order/detail/detail.wxml b/pages/order/detail/detail.wxml index 9de0046..008d52b 100644 --- a/pages/order/detail/detail.wxml +++ b/pages/order/detail/detail.wxml @@ -9,70 +9,78 @@ - - 购货客户 - - - {{customer[customerIndex].Name}} + + {{customer[customerIndex].Name}} + - + - - 发货时间 - - - {{dateTimeArray1[0][dateTime1[0]]}}-{{dateTimeArray1[1][dateTime1[1]]}}-{{dateTimeArray1[2][dateTime1[2]]}} {{dateTimeArray1[3][dateTime1[3]]}}:{{dateTimeArray1[4][dateTime1[4]]}} - - - - - 会计单位 - - - {{unit[isUnit].Name}} + + {{unit[isUnit].Name}} + - + - - 销售部门 - - - {{department[departmentIndex].Name}} + + {{department[departmentIndex].Name}} + - + - - 销售类型 - - - {{saletype[saletypeIndex].Name}} + + {{saletype[saletypeIndex].Name}} + - + - - 送货地址 - - - - + + 送货地址 + + + - + + - + @@ -96,7 +104,7 @@ - + @@ -106,39 +114,41 @@ {{obj[idx].Goods_Name}} + - - - 报货数量 - - + + 报货数量 + + + - - 辅 数 量 - - + + 辅 数 量 + + - - - 单 价 - - + + 单 价 + + + - - 政策单价 - {{obj[idx].PolicyPrice}} - + + 政策单价 + {{obj[idx].PolicyPrice}} - 删除 + + 删除 + - + diff --git a/pages/order/order.wxss b/pages/order/order.wxss index f18cec6..ad478b5 100644 --- a/pages/order/order.wxss +++ b/pages/order/order.wxss @@ -1,9 +1,12 @@ /* pages/order/order.wxss */ page{ - background: rgb(240, 239, 245); + background:#EAF1F8; height: 100%; } +.custmer_list_view_main{ + background-color: #fff; +} .scroll-views { width: 100%; @@ -52,14 +55,17 @@ page{ } .view_line_main{ - background: white + height: 1rpx; + background-color: #dbdbdb; + margin-left: 20rpx; + margin-right: 0rpx; } + .view_line{ - width: 92%; - height: 2rpx; - margin-left: 4%; - margin-right: 4%; - background: rgb(219, 219, 219); + height: 1rpx; + margin-left: 20rpx; + margin-right: 0rpx; + background: #dbdbdb; } .chose{ diff --git a/pages/saleForecastList/Detail/Detail.wxml b/pages/saleForecastList/Detail/Detail.wxml index 230ae01..2e818b9 100644 --- a/pages/saleForecastList/Detail/Detail.wxml +++ b/pages/saleForecastList/Detail/Detail.wxml @@ -13,67 +13,76 @@ - - 购货客户 - - - {{customer[customerIndex].Name}} + + {{customer[customerIndex].Name}} + - + - - 发货时间 - - - {{dateTimeArray1[0][dateTime1[0]]}}-{{dateTimeArray1[1][dateTime1[1]]}}-{{dateTimeArray1[2][dateTime1[2]]}} {{dateTimeArray1[3][dateTime1[3]]}}:{{dateTimeArray1[4][dateTime1[4]]}} - - - - - 会计单位 - - - - {{unit[isUnit].Name}} + + 发货时间 + + + {{dateTimeArray1[0][dateTime1[0]]}}-{{dateTimeArray1[1][dateTime1[1]]}}-{{dateTimeArray1[2][dateTime1[2]]}} {{dateTimeArray1[3][dateTime1[3]]}}:{{dateTimeArray1[4][dateTime1[4]]}} + + - + + + 会计单位 + + + + {{unit[isUnit].Name}} + + + - - 销售部门 - - - {{department[departmentIndex].Name}} + + {{department[departmentIndex].Name}} + - + - - 销售类型 - - - {{saletype[saletypeIndex].Name}} + + {{saletype[saletypeIndex].Name}} + - - - - 送货地址 - - + + + + 送货地址 + + + - - - + + + @@ -102,41 +111,44 @@ + - 存货名称 - + 存货名称 + {{obj[idx].Goods_Name}} + - - - 报货数量 - - - - - 辅 数 量 - - - + + 报货数量 + + - - - 单 价 - - + + 辅 数 量 + + + - - 政策单价 - {{obj[idx].PolicyPrice}} - + + 单 价 + - 删除 + + + 政策单价 + {{obj[idx].PolicyPrice}} + + + 删除 + + + diff --git a/pages/saleForecastList/Detail/Detail.wxss b/pages/saleForecastList/Detail/Detail.wxss index b88f391..c35ca30 100644 --- a/pages/saleForecastList/Detail/Detail.wxss +++ b/pages/saleForecastList/Detail/Detail.wxss @@ -1,7 +1,7 @@ /* pages/orderinfo/orderinfo.wxss */ page { - background: rgb(240, 239, 245); + background: #EAF1F8; height: calc(100%-10px); } .swiper-tab { @@ -38,7 +38,6 @@ page { .swiper-items1 { height: 100%; - /* padding-top: 3%; */ } .swiper-items2 { @@ -49,82 +48,71 @@ page { height: 100%; } -.baseitem { +.backGroundContainer{ background: #fff; - width: 100%; - border-bottom: 0.1px solid #dbdbdb; - display: flex; - flex-direction: row; - align-items: center; - padding-top: 20rpx; - padding-bottom: 20rpx; } -/* .twogroup { - display: flex; - flex-direction: row; -} */ - .baseitem { - background: #fff; - width: 100%; - border-bottom: 0.1px solid #dbdbdb; + height: 60rpx; + background: #fff; + /* border-bottom: 0.1px solid #dbdbdb; */ display: flex; flex-direction: row; align-items: center; - padding-top: 20rpx; - padding-bottom: 20rpx; + padding: 20rpx 20rpx; font-size: 30rpx; + +} + +.horizontallineView { + height: 1rpx; + background-color: #dbdbdb; + margin-left: 20rpx; + margin-right: 0rpx; } .baseitem_key { color: #666; - width: 40%; - margin-left: 20rpx; + width: 30%; + /* margin-left: 20rpx; */ } .baseitem_value { color: rgb(48, 48, 48); - margin-left: 20rpx; - margin-right: 20rpx; - width: 160%; + /* margin-left: 20rpx; + margin-right: 20rpx; */ + width: 70%; text-align: right; } .baseitem_key2 { color: #666; - width: 40%; - margin-left: 20rpx; + width: 30%; + /* margin-left: 20rpx; */ } .baseitem_value2 { color: rgb(48, 48, 48); - margin-left: 20rpx; - margin-right: 20rpx; - width: 160%; + /* margin-left: 20rpx; + margin-right: 20rpx; */ + width: 70%; text-align: right; } .baseitem_key1 { color: #666; - width: 100%; + width: 30%; margin-left: 20rpx; } .baseitem_value1 { color: rgb(48, 48, 48); - margin-left: 20rpx; - margin-right: 20rpx; - width: 100%; + /* margin-left: 20rpx; + margin-right: 20rpx; */ + width: 70%; text-align: right; } -::-webkit-scrollbar { - width: 0; - height: 0; - color: transparent; -} - .add { display: flex; flex-direction: row; @@ -160,6 +148,7 @@ page { .itemView { margin-top: 20rpx; + background: #fff; } .submit { diff --git a/pages/saleForecastList/saleForecastList.wxml b/pages/saleForecastList/saleForecastList.wxml index f2eea12..7e3eacb 100644 --- a/pages/saleForecastList/saleForecastList.wxml +++ b/pages/saleForecastList/saleForecastList.wxml @@ -6,15 +6,15 @@ - - + +