libo
/
ztb-saas-mini
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

版本1.4发布

feature/v1.3
xpz2018 5 years ago
parent
9d43ddd8ba
commit
bd01db2c7c
10 changed files with 20 additions and 17 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      api/request.js
  2. 2
      app.js
  3. 2
      pages/home/index/index.js
  4. 4
      pages/process/index/index.js
  5. 4
      pages/process/order-info/index.wxml
  6. 4
      pages/process/order-price/index.wxml
  7. 4
      pages/process/payment/index.wxml
  8. 6
      pages/storage/order-create/index.wxml
  9. 2
      pages/storage/order-info/index.js
  10. 6
      pages/storage/order-settlement/index.wxml

3
api/request.js
View File

@ -63,6 +63,9 @@ function handleResponse({ data, status }) {
"200"() { "200"() {
return handleResult(data) return handleResult(data)
}, },
"-200"() {
return Promise.reject('服务接口熔断')
},
"400"() { "400"() {
return Promise.reject(data) return Promise.reject(data)
}, },

2
app.js
View File

@ -1,6 +1,6 @@
//app.js //app.js
App({ App({
evn: 0, // 0: 开发版本；1：测试版本；2：生产版本
evn: 2, // 0: 开发版本；1：测试版本；2：生产版本
tmplIds: [''], tmplIds: [''],
version: 162, version: 162,
xAppId: '503258978847953926', xAppId: '503258978847953926',

2
pages/home/index/index.js
View File

@ -59,7 +59,7 @@ Component({
avatarUrl: util.isEmpty(app.userInfo.avatarUrl) ? '/assets/image/ygImg.png' : app.userInfo.avatarUrl, avatarUrl: util.isEmpty(app.userInfo.avatarUrl) ? '/assets/image/ygImg.png' : app.userInfo.avatarUrl,
userInfo: app.userInfo, userInfo: app.userInfo,
userName: nickname, userName: nickname,
isAdmin: app.userInfo.type.indexOf('ADMIN') >= 0,
isAdmin: app.userInfo.type && app.userInfo.type.indexOf('ADMIN') >= 0,
height: app.globalData.safeFragmentHeight - 100 height: app.globalData.safeFragmentHeight - 100
}) })
}, },

4
pages/process/index/index.js
View File

@ -50,7 +50,7 @@ Component({
var vdate = [today.getTime(), maxDate] var vdate = [today.getTime(), maxDate]
var vdateString = util.formatDate(new Date(), 'Y-M-D') + '至' + util.formatDate(max, 'Y-M-D') var vdateString = util.formatDate(new Date(), 'Y-M-D') + '至' + util.formatDate(max, 'Y-M-D')
var height = app.globalData.safeFragmentHeight - 100 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 = [ var tabList2 = [
{ status: 1, badge: '', name: '磅单信息', icon: '/assets/image/icon_pound.png' }, { status: 1, badge: '', name: '磅单信息', icon: '/assets/image/icon_pound.png' },
{ status: 2, badge: '', name: '出货审核', icon: '/assets/image/icon_outcheck.png' }, { status: 2, badge: '', name: '出货审核', icon: '/assets/image/icon_outcheck.png' },
@ -141,7 +141,7 @@ Component({
} else { } else {
this.data.tabList2[0].badge = '' 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){ if(Number(result.data.outboundDeliveryOrderAuditNum) > 0){
this.data.tabList2[1].badge = Number(result.data.outboundDeliveryOrderAuditNum) this.data.tabList2[1].badge = Number(result.data.outboundDeliveryOrderAuditNum)
} else { } else {

4
pages/process/order-info/index.wxml
View File

@ -93,7 +93,7 @@
<view slot="title" class="text-black"> <view slot="title" class="text-black">
<view>过毛重照片</view> <view>过毛重照片</view>
<view class="flex" style="margin-top:18rpx"> <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"> 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"> <view class="image-load" slot="loading">
<van-loading type="spinner" size="32" /> <van-loading type="spinner" size="32" />
@ -106,7 +106,7 @@
<view slot="title" class="text-black"> <view slot="title" class="text-black">
<view>过皮重照片</view> <view>过皮重照片</view>
<view class="flex" style="margin-top:18rpx"> <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"> 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"> <view class="image-load" slot="loading">
<van-loading type="spinner" size="32" /> <van-loading type="spinner" size="32" />

4
pages/process/order-price/index.wxml
View File

@ -47,7 +47,7 @@
<van-cell center bind:click="showCategory"> <van-cell center bind:click="showCategory">
<view slot="title" class="flex flex-justify"> <view slot="title" class="flex flex-justify">
<view class="flex flex-center 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> <text>废纸品类</text>
</view> </view>
<view class="text-gray">{{form.productName || '请选择废纸品类'}}</view> <view class="text-gray">{{form.productName || '请选择废纸品类'}}</view>
@ -57,7 +57,7 @@
<van-cell> <van-cell>
<view slot="title" class="flex flex-justify"> <view slot="title" class="flex flex-justify">
<view class="flex flex-center 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> <text>单价(元/公斤)</text>
</view> </view>
<input id="unitPrice" type="digit" placeholder-style="color:#aaa" style="text-align: right" maxlength="8" <input id="unitPrice" type="digit" placeholder-style="color:#aaa" style="text-align: right" maxlength="8"

4
pages/process/payment/index.wxml
View File

@ -147,7 +147,7 @@
<view slot="title" class="text-black"> <view slot="title" class="text-black">
<view>过毛重照片</view> <view>过毛重照片</view>
<view class="flex" style="margin-top:18rpx"> <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"> 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"> <view class="image-load" slot="loading">
<van-loading type="spinner" size="32" /> <van-loading type="spinner" size="32" />
@ -160,7 +160,7 @@
<view slot="title" class="text-black"> <view slot="title" class="text-black">
<view>过皮重照片</view> <view>过皮重照片</view>
<view class="flex" style="margin-top:18rpx"> <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"> 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"> <view class="image-load" slot="loading">
<van-loading type="spinner" size="32" /> <van-loading type="spinner" size="32" />

6
pages/storage/order-create/index.wxml
View File

@ -8,7 +8,7 @@
<van-cell center is-link bind:click="chooseFactory"> <van-cell center is-link bind:click="chooseFactory">
<view slot="title" class="flex flex-justify"> <view slot="title" class="flex flex-justify">
<view class="flex flex-center 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> <text>收货方名称</text>
</view> </view>
<view class="text-gray">{{form.factoryName || '请选择收货方'}}</view> <view class="text-gray">{{form.factoryName || '请选择收货方'}}</view>
@ -17,7 +17,7 @@
<van-cell center is-link bind:click="showCategory"> <van-cell center is-link bind:click="showCategory">
<view slot="title" class="flex flex-justify"> <view slot="title" class="flex flex-justify">
<view class="flex flex-center 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> <text>废纸品类</text>
</view> </view>
<view class="text-gray">{{form.productName || '请选择废纸品类'}}</view> <view class="text-gray">{{form.productName || '请选择废纸品类'}}</view>
@ -33,7 +33,7 @@
<van-cell center bind:click="showPlate"> <van-cell center bind:click="showPlate">
<view class="flex flex-justify text-black"> <view class="flex flex-justify text-black">
<view class="flex flex-center 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> <text>车牌号码</text>
</view> </view>
<view class="text-gray">{{form.plateNumber || '请输入车牌号码'}}</view> <view class="text-gray">{{form.plateNumber || '请输入车牌号码'}}</view>

2
pages/storage/order-info/index.js
View File

@ -56,7 +56,7 @@ Scene({
fileList: this.data.fileList fileList: this.data.fileList
}) })
} else { } 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.data.auditable = true
} }
this.setData({ this.setData({

6
pages/storage/order-settlement/index.wxml
View File

@ -8,7 +8,7 @@
<van-cell center is-link bind:click="showCategory"> <van-cell center is-link bind:click="showCategory">
<view slot="title" class="flex flex-justify"> <view slot="title" class="flex flex-justify">
<view class="flex flex-center 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> <text>废纸品类</text>
</view> </view>
<view class="text-gray">{{form.categoryName || '请选择废纸品类'}}</view> <view class="text-gray">{{form.categoryName || '请选择废纸品类'}}</view>
@ -17,7 +17,7 @@
<van-cell> <van-cell>
<view slot="title" class="flex flex-justify"> <view slot="title" class="flex flex-justify">
<view class="flex flex-center 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> <text>结算单价(元/吨)</text>
</view> </view>
<input id="settleUnitPrice" type="digit" placeholder-style="color:#aaa" style="text-align: right" maxlength="8" <input id="settleUnitPrice" type="digit" placeholder-style="color:#aaa" style="text-align: right" maxlength="8"
@ -27,7 +27,7 @@
<van-cell> <van-cell>
<view slot="title" class="flex flex-justify"> <view slot="title" class="flex flex-justify">
<view class="flex flex-center 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> <text>净重(吨)</text>
</view> </view>
<input id="netWeight" type="digit" placeholder-style="color:#aaa" style="text-align: right" maxlength="8" <input id="netWeight" type="digit" placeholder-style="color:#aaa" style="text-align: right" maxlength="8"

Write Preview
Loading…
Cancel
Save