小程序修改

components/add-tips/index.js

@@ -8,7 +8,7 @@ Component({
     },
     duration: {
       type: Number,
-      value: 5
+      value: 3
     },
 		delay: {
 			type: Number,

pages/home/qrcode-info/index.js

@@ -28,7 +28,7 @@ Scene({
       if(!util.isEmpty(options.type)){
         this.data.type = Number(options.type)
       }
-      this.showQrCode(`${qrUrl}?mark=ztb_saas&type=${this.data.type}&factoryId=${app.userInfo.factoryId}&customerId=${this.data.id}`)
+      this.showQrCode(`${qrUrl}?mark=ztb_saas&type=${this.data.type}&factoryId=${app.userInfo.factoryId}&uid=${this.data.id}`)
       if(this.data.type == 0){
         this.fetchCustomerInfo()
       } else if(this.data.type == 1){

pages/process/order-list/index.wxml

@@ -61,7 +61,8 @@
             <view class="text-sm text-black">{{item.adjustedPrice || item.settlePrice || '- -'}}</view>
           </view>
           <image class="item-icon" src="/assets/image/icon-finish.png" wx:if="{{item.status == 5}}"></image>
-          <image class="item-icon" src="/assets/image/icon-delete.png" wx:if="{{item.status == 6}}"></image>
+          <image class="item-icon" src="/assets/image/icon-delete.png" wx:elif="{{item.status == 6}}"></image>
+          <image class="item-icon" src="/assets/image/icon-delete.png" wx:elif="{{item.status == 4 && item.isModify}}"></image>
         </view>
         <view class="flex" style="justify-content: flex-end;margin-top:16rpx">
           <!-- <van-button round type="danger" custom-style="height:64rpx;width:200rpx" data-id="{{item.id}}"

pages/process/outside-list/index.wxml

@@ -58,6 +58,7 @@
           </view>
           <image class="item-icon" src="/assets/image/icon-finish.png" wx:if="{{item.orderStatus == 5}}"></image>
           <image class="item-icon" src="/assets/image/icon-delete.png" wx:if="{{item.orderStatus == 6}}"></image>
+          <image class="item-icon" src="/assets/image/icon-delete.png" wx:elif="{{item.status == 4 && item.isModify}}"></image>
         </view>
         <view class="flex" style="justify-content: flex-end;margin-top:16rpx">
           <!-- <van-button round type="danger" custom-style="height:64rpx;width:200rpx" data-id="{{item.orderId}}"

pages/storage/order-settlement/index.wxml

@@ -24,7 +24,7 @@
   <van-field id="settleUnitPrice" required value="{{ form.settleUnitPrice || '' }}" type="digit" label="结算单价(元/吨)" title-width="240rpx" placeholder="{{form.konePrice || '请输入结算单价'}}" clearable input-align="right" bind:change="bindInput"></van-field>
   <van-field id="netWeight" required value="{{ form.netWeight || '' }}" type="digit" label="净重(吨)" placeholder="请输入净重" clearable input-align="right" bind:change="bindInput"></van-field>
   <van-field id="deductPercent" value="{{ form.deductPercent || '' }}" label="扣点(%)" maxlength="4" type="digit" placeholder="请输入扣点" clearable input-align="right" bind:change="bindInput"></van-field>
-  <van-field id="settleWeight" value="{{ form.settleWeight || '' }}" label="结算重量(吨)" maxlength="8" type="digit" placeholder="请输入结算重量" clearable input-align="right" bind:change="bindInput"></van-field>
+  <van-field id="settleWeight" required value="{{ form.settleWeight || '' }}" label="结算重量(吨)" maxlength="8" type="digit" placeholder="请输入结算重量" clearable input-align="right" bind:change="bindInput"></van-field>
   <!-- <van-field id="otherFee" value="{{ form.otherFee || '' }}" label="其他费用(元)" maxlength="8" type="digit" placeholder="请输入其他费用" clearable input-align="right" bind:change="bindInput"></van-field> -->
   <van-field id="settlePrice" value="{{ form.settlePrice || '' }}" title-width="240rpx" label="纸厂结算金额(元)" maxlength="8" type="digit" placeholder="请输入结算金额" clearable input-align="right" bind:change="bindInput"></van-field>
   <van-field id="proxyPaySurcharge" value="{{ form.proxyPaySurcharge || '' }}" label="代卖费(元)" maxlength="8" type="digit" placeholder="请输入代卖费" clearable input-align="right" bind:change="bindInput"></van-field>