11

app.js

@@ -1,5 +1,5 @@
 // app.js
-var projectMode = 2;//0代表开发模式（本地环境），1代表测试模式（线上测试环境）,2代表线上模式（正式运行环境）
+var projectMode = 0;//0代表开发模式（本地环境），1代表测试模式（线上测试环境）,2代表线上模式（正式运行环境）
 var info = wx.getSystemInfoSync();
 if (info.platform != "devtools" && projectMode == 0) { projectMode = 1 }
 var envVersion = `${__wxConfig.envVersion}`;//develop	开发版，trial	体验版，release	正式版

pages/error/jiesuan/index.js

@@ -9,6 +9,7 @@ Page({
         id: 0,
         isprice: false,
         info: '',
+        updateprive: 0
     },
 
     /**
@@ -34,8 +35,10 @@ Page({
                     title: res.message.msg,
                 })
             } else {
+                let pp = (res.message.data.order_price - res.message.data.coupon_money) - (res.message.data.total_price - res.message.data.freight)>=0?(res.message.data.order_price - res.message.data.coupon_money) - (res.message.data.total_price - res.message.data.freight) : 0
                 that.setData({
                     info: res.message.data,
+                    updateprive: pp
                 })
             }
             wx.hideLoading();
@@ -44,6 +47,10 @@ Page({
             console.log(222);
         })
     },
+    changep(e){
+        this.setData({updateprive:e.detail.value})
+        console.log(e.detail.value)
+    },
     goback(){
         wx.navigateBack()
     },

pages/error/jiesuan/index.wxml

@@ -7,15 +7,17 @@
   <view>此多包裹订单有其他包裹未分拣，请等全部分拣完毕后再结算</view>
 </view>
 <view class="item_one">
-    <view>
+    <view style="padding-bottom: 30rpx;">
         <view class="item_font_view item_one_toptit">分拣差异</view>
-        <view class="itemdisplay item_one_goods">
-            <image src="{{info.thumb}}" class="item_one_goods_image"></image>
-            <view class="item_one_goods_left">
-                <view>{{info.goods_title}}</view>
-                <view class="display-between">
-                    <view>{{info.standard_title}}<text class="light_color">￥{{info.price}}</text></view>
-                    <view class="light_color">x {{info.good_no}}</view>
+        <view wx:for="{{info.good_list}}" wx:key="index">
+            <view class="itemdisplay item_one_goods">
+                <image src="{{item.thumb}}" class="item_one_goods_image"></image>
+                <view class="item_one_goods_left">
+                    <view>{{item.goods_title}}</view>
+                    <view class="display-between">
+                        <view>{{item.standard_title}}<text class="light_color">￥{{item.price}}</text></view>
+                        <view class="light_color">x {{item.good_no}}</view>
+                    </view>
                 </view>
             </view>
         </view>
@@ -26,8 +28,8 @@
                 <view>￥158</view>
             </view>
         </view> -->
-        <view class="item_one_green_view">
-            <block wx:for="{{info.list}}" wx:key="index">
+        <!-- <view class="item_one_green_view">
+            <block wx:for="{{info.goods_list}}" wx:key="index">
                 <view class="display-between item_one_green">
                     <view class="{{item.is_machining==0?'color_red':item.is_machining==1?'color_green':''}}">{{item.cat_title}}-{{item.goods_title}}</view>
                     <view>水洗码:{{item.wash_code}}</view>
@@ -35,7 +37,7 @@
                 <view class="itemdisplay item_one_goods_after" style="border: 0;">
                     <view>{{item.standard_title}}</view>
                     <view class="display-between">
-                        <!-- <view>防水处理 | 塑封包膜</view> -->
+                        <view>防水处理 | 塑封包膜</view>
                         <view></view>
                         <view class="itemdisplay">
                             <view class="itemdisplay dx_view {{item.is_machining==0?'color_red':item.is_machining==1?'color_green':''}}">
@@ -46,16 +48,17 @@
                     </view>
                 </view>
             </block>
-        </view>
+        </view> -->
     </view>
-    <view wx:if="{{info.good_no-info.list.length>0}}">
-        <view class="itemdisplay item_one_goods">
-            <image src="{{info.thumb}}" class="item_one_goods_image"></image>
+    <!-- wx:if="{{info.good_no-info.list.length>0}}" -->
+    <view>
+        <view class="itemdisplay item_one_goods" wx:for="{{info.list}}" wx:key="index">
+            <image src="{{item.thumb}}" class="item_one_goods_image"></image>
             <view class="item_one_goods_left">
-                <view>{{info.goods_title}}</view>
+                <view>{{item.goods_title}}</view>
                 <view class="display-between">
-                    <view>{{info.standard_title}}<text class="light_color">￥{{info.price}}</text></view>
-                    <view class="light_color">x {{info.good_no - info.list.length}}</view>
+                    <view>{{item.standard_title}}<text class="light_color">￥{{item.price}}</text></view>
+                    <view class="light_color">x 1</view>
                 </view>
             </view>
         </view>
@@ -66,8 +69,29 @@
                 <view></view>
             </view>
         </view> -->
+        <!-- <view class="item_one_green_view">
+            <block wx:for="{{info.list}}" wx:key="index">
+                <view class="display-between item_one_green">
+                    <view class="{{item.is_machining==0?'color_red':item.is_machining==1?'color_green':''}}">{{item.cat_title}}-{{item.goods_title}}</view>
+                    <view>水洗码:{{item.wash_code}}</view>
+                </view>
+                <view class="itemdisplay item_one_goods_after" style="border: 0;">
+                    <view>{{item.standard_title}}</view>
+                    <view class="display-between">
+                        <view>防水处理 | 塑封包膜</view>
+                        <view></view>
+                        <view class="itemdisplay">
+                            <view class="itemdisplay dx_view {{item.is_machining==0?'color_red':item.is_machining==1?'color_green':''}}">
+                                <image src="{{item.is_machining==0?'../../../image/ycm/09.png':item.is_machining==1?'../../../image/ycm/08.png':''}}" class="dx_icon"></image>{{item.is_machining==0?'不加工':item.is_machining==1?'加工':item.is_machining==2?'带确认':''}}
+                            </view>
+                            <view class="{{item.is_machining==0?'font_linethrough':''}}">￥{{item.price}}</view>
+                        </view>
+                    </view>
+                </view>
+            </block>
+        </view> -->
         <view class="display-between item_one_goods_two_one">
-            <view>未检出({{info.good_no}}/{{info.list.length}})</view>
+            <view>未检出({{info.good_list.length}}/{{info.list.length}})</view>
             <view>￥0</view>
         </view>
     </view>
@@ -76,8 +100,8 @@
         <view class="item_one_green_view">
             <block wx:for="{{info.array}}" wx:key="index">
                 <view class="display-between {{item.is_machining==0?'color_red':item.is_machining==1?'color_green':''}}">
-                    <view class="color_red">{{item.cat_title}}-{{item.goods_title}}</view>
-                    <view>水洗码:{{item.wash_code}}</view>
+                    <view class="color_red font_num">{{item.cat_title}}-{{item.goods_title}}</view>
+                    <view class="font_size">水洗码:{{item.wash_code}}</view>
                 </view>
                 <view class="itemdisplay item_one_goods_after" style="border: 0;">
                     <view>{{item.standard_title}}</view>
@@ -105,36 +129,38 @@
         <view>
             <view class="display-between">
                 <view>用户下单金额</view>
-                <view>￥116</view>
+                <view>￥{{info.total_price}}</view>
             </view>
             <view class="display-between">
                 <view>优惠券</view>
-                <view>-￥10</view>
+                <view>-￥{{info.coupon_money}}</view>
             </view>
             <view class="display-between">
                 <view>实际支付(不含运费)</view>
-                <view>￥106</view>
+                <view>￥{{info.total_price - info.freight}}</view>
             </view>
         </view>
         <view>
             <view class="display-between">
                 <view>实际清洗费用</view>
-                <view>￥145</view>
+                <view>￥{{info.order_price}}</view>
             </view>
             <view class="display-between">
                 <view>优惠券</view>
-                <view>-￥10</view>
+                <view>-￥{{info.coupon_money}}</view>
             </view>
             <view class="display-between">
                 <view>实际应付</view>
-                <view>￥135</view>
+                <view>￥{{info.order_price - info.coupon_money}}</view>
             </view>
         </view>
     </view>
     <view class="centerdispley item_two_three">
-        <view>实际应付金额：29</view>
+        <view wx:if="{{(info.order_price - info.coupon_money) - (info.total_price - info.freight)>=0}}">实际应付金额：{{(info.order_price - info.coupon_money) - (info.total_price - info.freight)}}</view>
+        <view>实际应付金额：0</view>
         <view bindtap="changeisprice">修改金额</view>
-        <view>退给用户 77</view>
+        <view wx:if="{{(info.order_price - info.coupon_money) - (info.total_price - info.freight)<0}}">退给用户 {{(info.total_price - info.freight) - (info.order_price - info.coupon_money)}}</view>
+        <view wx:else>退给用户 0</view>
     </view>
 </view>
 
@@ -149,7 +175,7 @@
     <view class="popup_item">
         <view class="centerdispley">
             <view>修改实际应付金额</view>
-            <view><input type="number" class="input_view" placeholder="请输入.."/></view>
+            <view><input type="number" value="{{updateprive}}" bindinput="changep" class="input_view" placeholder="请输入.."/></view>
         </view>
         <view class="display-between">
             <view class="centerdispley" bindtap="changeisprice">取消</view>

pages/error/jiesuan/index.wxss

@@ -135,6 +135,16 @@ page {
     background: #d8d8d8;
 }
 
+.font_num{
+    font-size: 28rpx;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 1;
+    overflow: hidden;   
+}
+.font_size{
+    font-size: 26rpx;
+}
 .item_one_goods_left {
     flex: 1;
     font-size: 24rpx;

pages/tabber/home/index.js

@@ -24,11 +24,11 @@ Page({
                 url:"/pages/control/choice/choice"
 
             },
-            // {
-            //     icon:'/image/home//icon_yichang.png',
-            //     url:"/pages/error/yichang/index",
-            //     tit:'异常单'
-            // },
+            {
+                icon:'/image/home//icon_yichang.png',
+                url:"/pages/error/yichang/index",
+                tit:'异常单'
+            },
             {
                 icon:'/image/home/icon_yiwupandian.png',
                 tit:'衣物盘点',

project.private.config.json

@@ -1,5 +1,7 @@
 {
-    "setting": {},
+    "setting": {
+        "compileHotReLoad": true
+    },
     "condition": {
         "miniprogram": {
             "list": [
@@ -201,5 +203,6 @@
             ]
         }
     },
-    "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html"
+    "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+    "projectname": "laundry_w"
 }