From bd01db2c7c779dec1fdcaf4fd408f39cee384009 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Thu, 22 Apr 2021 19:14:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC1.4=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/request.js                            | 3 +++
 app.js                                    | 2 +-
 pages/home/index/index.js                 | 2 +-
 pages/process/index/index.js              | 4 ++--
 pages/process/order-info/index.wxml       | 4 ++--
 pages/process/order-price/index.wxml      | 4 ++--
 pages/process/payment/index.wxml          | 4 ++--
 pages/storage/order-create/index.wxml     | 6 +++---
 pages/storage/order-info/index.js         | 2 +-
 pages/storage/order-settlement/index.wxml | 6 +++---
 10 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/api/request.js b/api/request.js
index 1b9304b..e7940ec 100644
--- a/api/request.js
+++ b/api/request.js
@@ -63,6 +63,9 @@ function handleResponse({ data, status }) {
     "200"() {
       return handleResult(data)
     },
+    "-200"() {
+      return Promise.reject('服务接口熔断')
+    },
     "400"() {
       return Promise.reject(data)
     },
diff --git a/app.js b/app.js
index 93a202a..de47ff3 100644
--- a/app.js
+++ b/app.js
@@ -1,6 +1,6 @@
 //app.js
 App({
-  evn: 0, // 0: 开发版本；1：测试版本；2：生产版本
+  evn: 2, // 0: 开发版本；1：测试版本；2：生产版本
   tmplIds: [''],
   version: 162,
   xAppId: '503258978847953926',
diff --git a/pages/home/index/index.js b/pages/home/index/index.js
index 182fad0..a3da9ae 100644
--- a/pages/home/index/index.js
+++ b/pages/home/index/index.js
@@ -59,7 +59,7 @@ Component({
         avatarUrl: util.isEmpty(app.userInfo.avatarUrl) ? '/assets/image/ygImg.png' : app.userInfo.avatarUrl,
         userInfo: app.userInfo,
         userName: nickname,
-        isAdmin: app.userInfo.type.indexOf('ADMIN') >= 0,
+        isAdmin: app.userInfo.type && app.userInfo.type.indexOf('ADMIN') >= 0,
         height: app.globalData.safeFragmentHeight - 100
       })
     },
diff --git a/pages/process/index/index.js b/pages/process/index/index.js
index 590e154..f549b45 100644
--- a/pages/process/index/index.js
+++ b/pages/process/index/index.js
@@ -50,7 +50,7 @@ Component({
       var vdate = [today.getTime(), maxDate]
       var vdateString = util.formatDate(new Date(), 'Y-M-D') + '至' + util.formatDate(max, 'Y-M-D')
       var height = app.globalData.safeFragmentHeight - 100
-      if(app.userInfo.type.indexOf('ADMIN') >= 0){
+      if(app.userInfo.type && app.userInfo.type.indexOf('ADMIN') >= 0){
         var tabList2 = [
           { status: 1, badge: '', name: '磅单信息', icon: '/assets/image/icon_pound.png' },
           { status: 2, badge: '', name: '出货审核', icon: '/assets/image/icon_outcheck.png' },
@@ -141,7 +141,7 @@ Component({
         } else {
           this.data.tabList2[0].badge = ''
         }
-        if(app.userInfo.type.indexOf('ADMIN') >= 0){
+        if(app.userInfo.type && app.userInfo.type.indexOf('ADMIN') >= 0){
           if(Number(result.data.outboundDeliveryOrderAuditNum) > 0){
             this.data.tabList2[1].badge = Number(result.data.outboundDeliveryOrderAuditNum)
           } else {
diff --git a/pages/process/order-info/index.wxml b/pages/process/order-info/index.wxml
index 1220778..a60eec1 100644
--- a/pages/process/order-info/index.wxml
+++ b/pages/process/order-info/index.wxml
@@ -93,7 +93,7 @@
     <view slot="title" class="text-black">
       <view>过毛重照片</view>
       <view class="flex" style="margin-top:18rpx">
-        <van-image wx:for="{{form.totalWeighingPicture}}" wx:key="index" use-loading-slot width="150" height="100"
+        <van-image wx:for="{{form.totalWeighingPicture}}" wx:key="index" use-loading-slot width="320rpx" height="240rpx"
           custom-class="page-icon" data-url="{{item.url}}" fit="cover" data-type="0" src="{{item.url}}" bind:click="viewImage">
           <view class="image-load" slot="loading">
             <van-loading type="spinner" size="32" />
@@ -106,7 +106,7 @@
     <view slot="title" class="text-black">
       <view>过皮重照片</view>
       <view class="flex" style="margin-top:18rpx">
-        <van-image wx:for="{{form.emptyWeighingPicture}}" wx:key="index" use-loading-slot width="150" height="100"
+        <van-image wx:for="{{form.emptyWeighingPicture}}" wx:key="index" use-loading-slot width="320rpx" height="240rpx"
           custom-class="page-icon" data-url="{{item.url}}" fit="cover" data-type="1" src="{{item.url}}" bind:click="viewImage">
           <view class="image-load" slot="loading">
             <van-loading type="spinner" size="32" />
diff --git a/pages/process/order-price/index.wxml b/pages/process/order-price/index.wxml
index 31815f1..8238f73 100644
--- a/pages/process/order-price/index.wxml
+++ b/pages/process/order-price/index.wxml
@@ -47,7 +47,7 @@
   <van-cell center bind:click="showCategory">
     <view slot="title" class="flex flex-justify">
       <view class="flex flex-center text-black">
-        <view class="text-red text-xxl" style="line-height: 10px; padding-top: 10px">*</view>
+        <view class="text-red text-xl" style="line-height: 10px; padding-top: 8px">*</view>
         <text>废纸品类</text>
       </view>
       <view class="text-gray">{{form.productName || '请选择废纸品类'}}</view>
@@ -57,7 +57,7 @@
   <van-cell>
     <view slot="title" class="flex flex-justify">
       <view class="flex flex-center text-black">
-        <view class="text-red text-xxl" style="line-height: 10px; padding-top: 10px">*</view>
+        <view class="text-red text-xl" style="line-height: 10px; padding-top: 8px">*</view>
         <text>单价(元/公斤)</text>
       </view>
       <input id="unitPrice" type="digit" placeholder-style="color:#aaa" style="text-align: right" maxlength="8"
diff --git a/pages/process/payment/index.wxml b/pages/process/payment/index.wxml
index 69f946d..dea077f 100644
--- a/pages/process/payment/index.wxml
+++ b/pages/process/payment/index.wxml
@@ -147,7 +147,7 @@
       <view slot="title" class="text-black">
         <view>过毛重照片</view>
         <view class="flex" style="margin-top:18rpx">
-          <van-image wx:for="{{detail.totalWeighingPicture}}" wx:key="index" use-loading-slot width="150" height="100"
+          <van-image wx:for="{{detail.totalWeighingPicture}}" wx:key="index" use-loading-slot width="320rpx" height="240rpx"
             custom-class="page-icon" data-url="{{item.url}}" fit="cover" data-type="0" src="{{item.url}}" bind:click="viewImage">
             <view class="image-load" slot="loading">
               <van-loading type="spinner" size="32" />
@@ -160,7 +160,7 @@
       <view slot="title" class="text-black">
         <view>过皮重照片</view>
         <view class="flex" style="margin-top:18rpx">
-          <van-image wx:for="{{detail.emptyWeighingPicture}}" wx:key="index" use-loading-slot width="150" height="100"
+          <van-image wx:for="{{detail.emptyWeighingPicture}}" wx:key="index" use-loading-slot width="320rpx" height="240rpx"
             custom-class="page-icon" data-url="{{item.url}}" fit="cover" data-type="1" src="{{item.url}}" bind:click="viewImage">
             <view class="image-load" slot="loading">
               <van-loading type="spinner" size="32" />
diff --git a/pages/storage/order-create/index.wxml b/pages/storage/order-create/index.wxml
index b9018d2..fee0818 100644
--- a/pages/storage/order-create/index.wxml
+++ b/pages/storage/order-create/index.wxml
@@ -8,7 +8,7 @@
   <van-cell center is-link bind:click="chooseFactory">
     <view slot="title" class="flex flex-justify">
       <view class="flex flex-center text-black">
-        <view class="text-red text-xxl" style="line-height: 10px; padding-top: 10px">*</view>
+        <view class="text-red text-xl" style="line-height: 10px; padding-top: 8px">*</view>
         <text>收货方名称</text>
       </view>
       <view class="text-gray">{{form.factoryName || '请选择收货方'}}</view>
@@ -17,7 +17,7 @@
   <van-cell center is-link bind:click="showCategory">
     <view slot="title" class="flex flex-justify">
       <view class="flex flex-center text-black">
-        <view class="text-red text-xxl" style="line-height: 10px; padding-top: 10px">*</view>
+        <view class="text-red text-xl" style="line-height: 10px; padding-top: 8px">*</view>
         <text>废纸品类</text>
       </view>
       <view class="text-gray">{{form.productName || '请选择废纸品类'}}</view>
@@ -33,7 +33,7 @@
   <van-cell center bind:click="showPlate">
     <view class="flex flex-justify text-black">
       <view class="flex flex-center text-black">
-        <view class="text-red text-xxl" style="line-height: 10px; padding-top: 10px">*</view>
+        <view class="text-red text-xl" style="line-height: 10px; padding-top: 8px">*</view>
         <text>车牌号码</text>
       </view>
       <view class="text-gray">{{form.plateNumber || '请输入车牌号码'}}</view>
diff --git a/pages/storage/order-info/index.js b/pages/storage/order-info/index.js
index f3b34d1..4a4df93 100644
--- a/pages/storage/order-info/index.js
+++ b/pages/storage/order-info/index.js
@@ -56,7 +56,7 @@ Scene({
             fileList: this.data.fileList
           })
         } else {
-          if(app.userInfo.type.indexOf('ADMIN') >= 0 && result.data.outboundDeliveryOrder.status == 0){
+          if(app.userInfo.type && app.userInfo.type.indexOf('ADMIN') >= 0 && result.data.outboundDeliveryOrder.status == 0){
             this.data.auditable = true
           }
           this.setData({ 
diff --git a/pages/storage/order-settlement/index.wxml b/pages/storage/order-settlement/index.wxml
index 5087da0..3821dd2 100644
--- a/pages/storage/order-settlement/index.wxml
+++ b/pages/storage/order-settlement/index.wxml
@@ -8,7 +8,7 @@
   <van-cell center is-link bind:click="showCategory">
     <view slot="title" class="flex flex-justify">
       <view class="flex flex-center text-black">
-        <view class="text-red text-xxl" style="line-height: 10px; padding-top: 10px">*</view>
+        <view class="text-red text-xl" style="line-height: 10px; padding-top: 8px">*</view>
         <text>废纸品类</text>
       </view>
       <view class="text-gray">{{form.categoryName || '请选择废纸品类'}}</view>
@@ -17,7 +17,7 @@
   <van-cell>
     <view slot="title" class="flex flex-justify">
       <view class="flex flex-center text-black">
-        <view class="text-red text-xxl" style="line-height: 10px; padding-top: 10px">*</view>
+        <view class="text-red text-xl" style="line-height: 10px; padding-top: 8px">*</view>
         <text>结算单价(元/吨)</text>
       </view>
       <input id="settleUnitPrice" type="digit" placeholder-style="color:#aaa" style="text-align: right" maxlength="8"
@@ -27,7 +27,7 @@
   <van-cell>
     <view slot="title" class="flex flex-justify">
       <view class="flex flex-center text-black">
-        <view class="text-red text-xxl" style="line-height: 10px; padding-top: 10px">*</view>
+        <view class="text-red text-xl" style="line-height: 10px; padding-top: 8px">*</view>
         <text>净重(吨)</text>
       </view>
       <input id="netWeight" type="digit" placeholder-style="color:#aaa" style="text-align: right" maxlength="8"