订单修改

packageA/account/index.scss

@@ -4,8 +4,8 @@
     z-index: 1;
     display: flex;
     justify-content: space-between;
-		align-items: center;
-		width: 100vw;
+    align-items: center;
+    width: 100vw;
     height: 80rpx;
     background-color: #fff;
     box-shadow: rgba(0, 0, 0, 0.05) 0px 1px 2px 0px;
@@ -53,19 +53,19 @@
         .lower {
             display: flex;
             position: absolute;
-            left: 110rpx;
+            left: 50rpx;
             top: 190rpx;
             z-index: 9;
-
+            width: 355px;
 
             .item {
-                width: 280rpx;
+                width: 33%;
 
                 .price {
-                    font-size: 34rpx;
+                    font-size: 32rpx;
                     font-weight: bold;
                     color: #43568C;
-                    margin-top: 8rpx;
+                    margin-top: 12rpx;
                 }
             }
 
@@ -73,7 +73,7 @@
 
         .name {
             color: #999;
-            font-size: 28rpx;
+            font-size: 26rpx;
         }
 
         .image {

packageA/account/index.wxml

@@ -36,6 +36,12 @@
                     {{item.discountamount}}
                 </view>
             </view>
+            <view class="item">
+                <view class="name">信用余额(元)</view>
+                <view class="price">
+                    {{item.creditquota}}
+                </view>
+            </view>
         </view>
         <image class="image" mode="aspectFill" src="/static/image/qia.png" />
         <view class="top" />

packageA/market/detail.scss

@@ -289,7 +289,7 @@ swiper {
   .but {
     width: 690rpx;
     height: 90rpx;
-    background: #FA8C16;
+    background: #0081FF;
     border-radius: 16rpx;
     font-size: 28rpx;
     font-weight: 600;

packageA/orderForm/detail.scss

@@ -14,6 +14,7 @@
         font-family: PingFang SC-Bold, PingFang SC;
         font-weight: bold;
         color: #333333;
+        margin-bottom: 20rpx;
     }
 
     .tags {

packageA/orderForm/detail.wxml

@@ -5,10 +5,6 @@
     <view class="num">
         {{detail.sonum}}
     </view>
-    <view class="tags">
-        <text wx:if="{{detail.brandname}}" style="background-color: #0079FE;">{{detail.brandname}}</text>
-        <text wx:if="{{detail.tradefield}}" style="background-color: #4BD863;">{{detail.tradefield}}</text>
-    </view>
     <view class="exp" wx:if="{{userrole!='经销商'}}">经销商：{{detail.enterprisename || ' --'}}</view>
     <view class="exp" wx:if="{{detail.type=='项目订单'}}">关联项目：{{detail.projectname || '暂无'}}</view>
     <view class="exp">订单类型：{{detail.type}}</view>
@@ -17,7 +13,7 @@
     <view class="exp">创建日期：{{detail.createdate}}</view>
 </view>
 
-<navigator url="#" class="box location" bindtap="selectConsignee">
+<view url="#" class="box location">
     <van-icon custom-class='icon' name="location" />
     <view class="content">
         <view class="name">
@@ -27,6 +23,20 @@
             {{detail.contacts.address}}
         </view>
     </view>
+</view>
+
+<navigator url="#" class="box location" bindtap="selectFinance">
+    <view class="content">
+        <view class="name">
+            开票单位
+        </view>
+        <view class="address">
+            {{detail.finance.enterprisename || '未设置'}}
+        </view>
+        <view class="address">
+            税号：{{detail.finance.taxno}}
+        </view>
+    </view>
     <view class="iconfont icon-dibu-bianji" />
 </navigator>
 
@@ -34,13 +44,6 @@
     <view class="title">
         支付信息
     </view>
-    <navigator url="#" class="row" bindtap="selectAgent">
-        <view class="label">结算人</view>
-        <view style="font-size: 28rpx;">
-            {{detail.pay_enterprisename || '暂无'}}
-            <van-icon name="arrow" />
-        </view>
-    </navigator>
     <view class="row" style="align-items: flex-start;">
         <view class="label">支付账户</view>
         <view style="font-weight: 600;">

pages/index/collect/index.js

@@ -92,6 +92,8 @@ Component({
 					allBrandList = [];
 				list = res.data.map(v => {
 					v.showPrice = CNY(v.gradeprice)
+					v.oldprice = CNY(v.oldprice)
+					v.custamount = CNY(v.custamount)
 					v.cover = (v.attinfos.length) ? _Http.getSpecifiedImage(v.attinfos[0]) : ""
 					let obj = allBrandList.find(s => s.sa_brandid == v.sa_brandid);
 					if (obj) {

pages/index/collect/index.wxml

@@ -15,12 +15,10 @@
 						<text class="line-1">{{item.itemname}}</text>
 						<van-checkbox shape='square' disabled="{{sa_brandid && sa_brandid!=item.sa_brandid}}" icon-size='24rpx' value="{{ decide.checked(item.sa_shoppingcartid,results) }}" />
 					</view>
-					<view class="exp">编号：{{item.itemno}}</view>
+					<view class="exp">品号：{{item.itemno}}</view>
 					<view class="exp">型号：{{item.model ||" --"}}</view>
-					<view class="exp" wx:if="{{item.iscustomsize}}" data-item="{{item}}" catch:tap="customization" style="color:#085CDF;">
-						{{item.customText}}
-						<van-icon name="arrow-down" />
-					</view>
+					<view class="exp">原单价：{{item.oldprice ||" --"}}</view>
+					<view class="exp">客户资料档案费：{{item.custamount ||" --"}}</view>
 					<view class="price" style="bottom: {{item.iscustomsize?'40rpx':'0rpx'}};">{{handleHide.verify(item.showPrice,'购物车价格',privacyFieldC)}}/{{item.unitname}}</view>
 				</view>
 			</view>