Commit f73f30ad by LJM

Merge branch 'master' of http://git.ichunt.net/xiaokang/H5_2.0

parents a350b49b 0aadd62e
...@@ -141,15 +141,206 @@ ...@@ -141,15 +141,206 @@
.nppinfo{ .nppinfo{
color:$uni-coloract; color:$uni-coloract;
font-size: 24rpx; font-size: 24rpx;
height:91rpx; height:90rpx;
.icon{ .icon{
font-size:36rpx; font-size:36rpx;
margin-right: 8rpx; margin-right: 8rpx;
} }
} }
.yesztinfo{
height:90rpx;
font-size: 24rpx;
color:$uni-color999;
.zttext{
max-width: 500rpx;
flex-wrap: wrap;
text{
color:$uni-color333;
font-weight: 600;
margin-right: 24rpx;
margin-left: 5rpx;
}
}
.icon{
font-size: 32rpx;
}
}
}
}
.htbox{
margin-top: 16rpx;
height: 178rpx;
background: #FFFFFF;
border-radius: 10px 10px 0px 0px;
box-sizing: border-box;
padding:24rpx;
font-size: 24rpx;
color:$uni-color666;
input{
height: 73rpx;
display: block;
line-height: 73rpx;
background: #F5F5F7;
border-radius: 10rpx;
box-sizing: border-box;
padding:20rpx 24rpx;
font-size: 24rpx;
color:$uni-color666;
margin-top: 20rpx;
}
}
.goodsbox{
margin-top: 16rpx;
padding:24rpx;
background: #FFFFFF;
border-radius: 10px 10px 0px 0px;
padding-bottom: 28rpx;
.titledata{
font-size: 24rpx;
color:$uni-color666;
margin-bottom: 18rpx;
.tir{
color:$uni-color999;
text{
color:$uni-coloract;
margin:0 5rpx ;
}
}
}
.goodsitem{
border-top: 1rpx solid #F0F0F2;
padding-top: 16rpx;
padding-bottom: 24rpx;
.actag{
height: 28rpx;
padding: 0 10rpx;
line-height: 28rpx;
background: #FF3700;
border-radius: 0px 14rpx 14rpx 0px;
color:#fff;
position: relative;
margin-left: 10rpx;
top:8rpx;
font-size: 24rpx;
}
.goodsname{
max-width:600rpx;
font-weight: 600;
color:$uni-color333;
}
.lbo{
max-width:422rpx;
line-height: 40rpx;
margin-top: 20rpx;
font-size: 24rpx;
color:$uni-color666;
.label{
color:$uni-color999;
}
}
.rbo{
padding-top: 20rpx;
.ipbox{
font-size: 22rpx;
color:$uni-color666;
height: 48rpx;
line-height: 48rpx;
justify-content: end;
.ch{
color:$uni-color999;
margin-left:12rpx;
margin-right:12rpx;
}
.inputval{
height: 48rpx;
font-size: 24rpx;
font-weight: 600;
color:$uni-color333;
}
} }
.xjbox{
margin-top: 36rpx;
font-size: 24rpx;
color:$uni-color999;
text-align: right;
width:100%;
.xjmoney{
color:$uni-colorwarning;
font-weight: 600;
}
}
}
}
} }
.remark{
margin-top: 16rpx;
display: block;
height: 73rpx;
line-height: 73rpx;
background: #F5F5F7;
border-radius: 10rpx;
padding:0 24rpx;
font-size: 24rpx;
color:$uni-color666;
}
} }
.layer-box8{
background: #fff;
padding-bottom: 24rpx;
.title{
padding:0 24rpx;
width: 100%;
height: 88rpx;
background: linear-gradient(180deg, #F0F6FF 0%, #FFFFFF 100%);
border-radius: 10rpx 10rpx 0rpx 0rpx;
font-size: 26rpx;
color:$uni-color333;
font-weight: 600;
.iconfont{font-size: 40rpx;color:#c2c4cc;}
margin-bottom: 5rpx;
}
.cons{
padding:0 24rpx;
.inputgroup{
height: 72rpx;
background: #F5F5F7;
border-radius: 10rpx;
padding:0 24rpx;
margin-bottom: 16rpx;
text{
font-size: 24rpx; height:40rpx;line-height: 40rpx;
color:$uni-color666;
&.blue{color:$uni-coloract;}
&.label{width:140rpx;}
}
input{
font-size: 24rpx; height:40rpx;
color:$uni-color666;line-height: 40rpx;
box-sizing: border-box;
border-left: 1rpx solid #C2C4CC;
padding-left: 28rpx;
width:500rpx;
}
}
.bcztper{
height: 68rpx;
background:$uni-coloract;
border-radius: 10rpx;
line-height: 68rpx;
font-size: 28rpx;
color:#fff;
text-align: center;
margin-top: 32rpx;
}
}
}
...@@ -59,11 +59,105 @@ ...@@ -59,11 +59,105 @@
</view> </view>
<view class="ztperson"> <view class="ztperson">
<view class="nppinfo row rowCenter verCenter"><text class="icon iconfont icon-tj"></text><text>添加提货人信息</text></view> <view class="nppinfo row rowCenter verCenter" style="display:none;" @click="openzt()"><text class="icon iconfont icon-tj"></text><text>添加提货人信息</text></view>
<view class="yesztinfo row bothSide verCenter">
<view class="row">
<text>自提信息:</text>
<view class="zttext">
<text class="textp">蔡先生</text><text class="textp">5645646545</text>
</view>
</view>
<text class="icon iconfont icon-bjt" @click="openzt()"></text>
</view>
</view> </view>
</view> </view>
<view class="htbox">
<view>合同PI</view>
<input type="text" placeholder="公司名称(必填)" />
</view>
<view class="goodsbox">
<view class="row bothSide titledata">
<view>商品信息</view>
<view class="tir"><text>2</text>个型号</view>
</view>
<view class="goodsitem">
<view class="t1 row bothSide">
<view class="row">
<view class="goodsname elep">L6207PD013</view>
<view class="actag">95折</view>
</view>
</view>
<view class="t2 row bothSide">
<view class="lbo">
<view class="elep"><text class="label">品牌:</text>Ti</view>
<view class="elep"><text class="label">供应商:</text>mouse</view>
<view class="elep"><text class="label">交期:</text>大陆3-5</view>
</view>
<view class="rbo">
<view class="ipbox row">
<text>¥1.0784</text>
<text class="ch">x</text>
<view class="inputval">100</view>
</view>
<view class="xjbox ">
<text>小计:</text>
<text class="xjmoney">¥1.0784</text>
</view>
</view>
</view>
</view>
<view class="goodsitem">
<view class="t1 row bothSide">
<view class="row">
<view class="goodsname elep">L6207PD013</view>
<view class="actag">95折</view>
</view>
</view>
<view class="t2 row bothSide">
<view class="lbo">
<view class="elep"><text class="label">品牌:</text>Ti</view>
<view class="elep"><text class="label">供应商:</text>mouse</view>
<view class="elep"><text class="label">交期:</text>大陆3-5</view>
</view>
<view class="rbo">
<view class="ipbox row">
<text>¥1.0784</text>
<text class="ch">x</text>
<view class="inputval">100</view>
</view>
<view class="xjbox ">
<text>小计:</text>
<text class="xjmoney">¥1.0784</text>
</view>
</view>
</view>
</view>
<input type="text" class="remark" placeholder="备注信息:请填写有关支付、收货、发票方面"/>
</view>
<!--自提人信息弹窗-->
<uni-popup ref="popupztinfo" type="bottom">
<view class="layer-box8">
<view class="title row verCenter bothSide">
<view class="left">自提信息</view>
<view class="right"><text class="icon iconfont icon-xxx" @click="closezt()"></text></view>
</view>
<view class="cons">
<view class="inputgroup row verCenter">
<text class="label"><text class="blue">*</text>提货人</text>
<input type="text" placeholder="请输入收货人" />
</view>
<view class="inputgroup row verCenter">
<text class="label"><text class="blue">*</text>联系电话</text>
<input type="text" placeholder="请输入联系人电话" />
</view>
<view class="bcztper">保存信息</view>
</view>
</view>
</uni-popup>
</view> </view>
...@@ -77,7 +171,12 @@ ...@@ -77,7 +171,12 @@
} }
}, },
methods: { methods: {
openzt() {
this.$refs.popupztinfo.open('bottom');
},
closezt() {
this.$refs.popupztinfo.close();
}
} }
} }
</script> </script>
......
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 sign in to comment