Browse Source

no message

feature/v1.3
xpz2018 5 years ago
parent
commit
0c62ed22f3
10 changed files with 27 additions and 24 deletions
  1. 2
      app.js
  2. 8
      components/transition/index.js
  3. 7
      pages/formate.wxs
  4. 6
      pages/process/order-info/index.wxml
  5. 2
      pages/process/order-price/index.wxml
  6. 6
      pages/process/payment/index.wxml
  7. 4
      pages/storage/order-create/index.wxml
  8. 8
      pages/storage/order-info/index.wxml
  9. 4
      pages/storage/order-settlement/index.wxml
  10. 4
      pages/storage/pound-info/index.wxml

2
app.js

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

8
components/transition/index.js

@ -1,8 +1,8 @@
'use strict'; 'use strict';
Object.defineProperty(exports, '__esModule', { value: true }); Object.defineProperty(exports, '__esModule', { value: true });
var component_1 = require('../common/component');
var transition_1 = require('../mixins/transition');
component_1.VantComponent({
var component = require('../common/component');
var transition = require('../mixins/transition');
component.VantComponent({
classes: [ classes: [
'enter-class', 'enter-class',
'enter-active-class', 'enter-active-class',
@ -11,5 +11,5 @@ component_1.VantComponent({
'leave-active-class', 'leave-active-class',
'leave-to-class', 'leave-to-class',
], ],
mixins: [transition_1.transition(true)],
mixins: [transition.transition(true)],
}); });

7
pages/formate.wxs

@ -52,11 +52,14 @@ function formateDate(datetime) {
return datetime + week return datetime + week
} }
function formateAmount(amount) {
function formateAmount(amount, fix) {
if (isEmpty(amount)) { if (isEmpty(amount)) {
return '' return ''
} }
return Number(amount).toFixed(2)
if(!fix){
fix = 3
}
return Number(amount).toFixed(fix)
} }
function formateWeight(weight) { function formateWeight(weight) {

6
pages/process/order-info/index.wxml

@ -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="320rpx" height="240rpx"
<van-image wx:for="{{form.totalWeighingPicture}}" wx:key="index" use-loading-slot width="330rpx" 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="320rpx" height="240rpx"
<van-image wx:for="{{form.emptyWeighingPicture}}" wx:key="index" use-loading-slot width="330rpx" 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" />
@ -137,7 +137,7 @@
<van-cell> <van-cell>
<view slot="title" class="flex flex-justify"> <view slot="title" class="flex flex-justify">
<view class="text-black">结算金额(元)</view> <view class="text-black">结算金额(元)</view>
<view class="text-gray">{{formate.formateAmount(form.settlePrice) || '- -'}}</view>
<view class="text-gray">{{formate.formateAmount(form.settlePrice, 2) || '- -'}}</view>
</view> </view>
</van-cell> </van-cell>
<van-cell> <van-cell>

2
pages/process/order-price/index.wxml

@ -108,7 +108,7 @@
<view slot="title"> <view slot="title">
<view class="text-black">过毛重照片</view> <view class="text-black">过毛重照片</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="320rpx" height="240rpx"
<van-image wx:for="{{form.totalWeighingPicture}}" wx:key="index" use-loading-slot width="330rpx" height="240rpx"
custom-class="page-icon" data-url="{{item.url}}" fit="cover" src="{{item.url}}" bind:click="viewImage"> custom-class="page-icon" data-url="{{item.url}}" fit="cover" 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/process/payment/index.wxml

@ -6,7 +6,7 @@
<view class="flex flex-column" style="height:360rpx;background-color:#008AFF;align-items: center"> <view class="flex flex-column" style="height:360rpx;background-color:#008AFF;align-items: center">
<view class="text-white text-sg" style="margin-top:72rpx">付款金额(元)</view> <view class="text-white text-sg" style="margin-top:72rpx">付款金额(元)</view>
<view class="text-white text-sl text-bold" style="margin-top:16rpx">{{formate.formateAmount(amount)}}</view>
<view class="text-white text-sl text-bold" style="margin-top:16rpx">{{formate.formateAmount(amount, 2)}}</view>
</view> </view>
<view class="bg-white" style="border-radius: 20rpx 20rpx 0rpx 0rpx;padding: 32rpx 0rpx;margin-top:-90rpx" wx:if="{{orderList}}"> <view class="bg-white" style="border-radius: 20rpx 20rpx 0rpx 0rpx;padding: 32rpx 0rpx;margin-top:-90rpx" wx:if="{{orderList}}">
@ -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="320rpx" height="240rpx"
<van-image wx:for="{{detail.totalWeighingPicture}}" wx:key="index" use-loading-slot width="330rpx" 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="320rpx" height="240rpx"
<van-image wx:for="{{detail.emptyWeighingPicture}}" wx:key="index" use-loading-slot width="330rpx" 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/storage/order-create/index.wxml

@ -59,7 +59,7 @@
</view> </view>
</van-cell> </van-cell>
<view class="bg-white flex flex-justify" style="padding:24rpx 32rpx" wx:if="{{poundInfo.emptyWeighingPicture.length}}"> <view class="bg-white flex flex-justify" style="padding:24rpx 32rpx" wx:if="{{poundInfo.emptyWeighingPicture.length}}">
<van-image wx:for="{{poundInfo.emptyWeighingPicture}}" wx:key="index" use-loading-slot width="320rpx" height="240rpx"
<van-image wx:for="{{poundInfo.emptyWeighingPicture}}" wx:key="index" use-loading-slot width="330rpx" height="240rpx"
data-url="{{item}}" fit="cover" data-type="0" src="{{item}}" bind:click="viewImage"> data-url="{{item}}" fit="cover" data-type="0" src="{{item}}" 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" />
@ -73,7 +73,7 @@
</view> </view>
</van-cell> </van-cell>
<view class="bg-white flex flex-justify" style="padding:24rpx 32rpx" wx:if="{{poundInfo.totalWeighingPicture.length}}"> <view class="bg-white flex flex-justify" style="padding:24rpx 32rpx" wx:if="{{poundInfo.totalWeighingPicture.length}}">
<van-image wx:for="{{poundInfo.totalWeighingPicture}}" wx:key="index" use-loading-slot width="320rpx" height="240rpx"
<van-image wx:for="{{poundInfo.totalWeighingPicture}}" wx:key="index" use-loading-slot width="330rpx" height="240rpx"
data-url="{{item}}" fit="cover" data-type="1" src="{{item}}" bind:click="viewImage"> data-url="{{item}}" fit="cover" data-type="1" src="{{item}}" 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" />

8
pages/storage/order-info/index.wxml

@ -50,7 +50,7 @@
</view> </view>
</van-cell> </van-cell>
<view class="bg-white flex flex-justify" style="padding:24rpx 32rpx" wx:if="{{poundInfo.emptyWeighingPicture.length}}"> <view class="bg-white flex flex-justify" style="padding:24rpx 32rpx" wx:if="{{poundInfo.emptyWeighingPicture.length}}">
<van-image wx:for="{{poundInfo.emptyWeighingPicture}}" wx:key="index" use-loading-slot width="320rpx" height="240rpx"
<van-image wx:for="{{poundInfo.emptyWeighingPicture}}" wx:key="index" use-loading-slot width="330rpx" height="240rpx"
data-url="{{item}}" fit="cover" data-type="0" src="{{item}}" bind:click="viewImage"> data-url="{{item}}" fit="cover" data-type="0" src="{{item}}" 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" />
@ -64,7 +64,7 @@
</view> </view>
</van-cell> </van-cell>
<view class="bg-white flex flex-justify" style="padding:24rpx 32rpx" wx:if="{{poundInfo.totalWeighingPicture.length}}"> <view class="bg-white flex flex-justify" style="padding:24rpx 32rpx" wx:if="{{poundInfo.totalWeighingPicture.length}}">
<van-image wx:for="{{poundInfo.totalWeighingPicture}}" wx:key="index" use-loading-slot width="320rpx" height="240rpx"
<van-image wx:for="{{poundInfo.totalWeighingPicture}}" wx:key="index" use-loading-slot width="330rpx" height="240rpx"
data-url="{{item}}" fit="cover" data-type="1" src="{{item}}" bind:click="viewImage"> data-url="{{item}}" fit="cover" data-type="1" src="{{item}}" 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" />
@ -181,7 +181,7 @@
</view> </view>
</van-cell> </van-cell>
<view class="bg-white flex flex-justify" style="padding:24rpx 32rpx" wx:if="{{poundInfo.emptyWeighingPicture.length}}"> <view class="bg-white flex flex-justify" style="padding:24rpx 32rpx" wx:if="{{poundInfo.emptyWeighingPicture.length}}">
<van-image wx:for="{{poundInfo.emptyWeighingPicture}}" wx:key="index" use-loading-slot width="320rpx" height="240rpx"
<van-image wx:for="{{poundInfo.emptyWeighingPicture}}" wx:key="index" use-loading-slot width="330rpx" height="240rpx"
data-url="{{item}}" fit="cover" data-type="0" src="{{item}}" bind:click="viewImage"> data-url="{{item}}" fit="cover" data-type="0" src="{{item}}" 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" />
@ -195,7 +195,7 @@
</view> </view>
</van-cell> </van-cell>
<view class="bg-white flex flex-justify" style="padding:24rpx 32rpx" wx:if="{{poundInfo.totalWeighingPicture.length}}"> <view class="bg-white flex flex-justify" style="padding:24rpx 32rpx" wx:if="{{poundInfo.totalWeighingPicture.length}}">
<van-image wx:for="{{poundInfo.totalWeighingPicture}}" wx:key="index" use-loading-slot width="320rpx" height="240rpx"
<van-image wx:for="{{poundInfo.totalWeighingPicture}}" wx:key="index" use-loading-slot width="330rpx" height="240rpx"
data-url="{{item}}" fit="cover" data-type="1" src="{{item}}" bind:click="viewImage"> data-url="{{item}}" fit="cover" data-type="1" src="{{item}}" 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/storage/order-settlement/index.wxml

@ -114,7 +114,7 @@
</view> </view>
</van-cell> </van-cell>
<view class="bg-white flex flex-justify" style="padding:24rpx 32rpx" wx:if="{{poundInfo.emptyWeighingPicture.length}}"> <view class="bg-white flex flex-justify" style="padding:24rpx 32rpx" wx:if="{{poundInfo.emptyWeighingPicture.length}}">
<van-image wx:for="{{poundInfo.emptyWeighingPicture}}" wx:key="index" use-loading-slot width="320rpx" height="240rpx"
<van-image wx:for="{{poundInfo.emptyWeighingPicture}}" wx:key="index" use-loading-slot width="330rpx" height="240rpx"
data-url="{{item}}" fit="cover" data-type="0" src="{{item}}" bind:click="viewImage"> data-url="{{item}}" fit="cover" data-type="0" src="{{item}}" 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" />
@ -128,7 +128,7 @@
</view> </view>
</van-cell> </van-cell>
<view class="bg-white flex flex-justify" style="padding:24rpx 32rpx" wx:if="{{poundInfo.totalWeighingPicture.length}}"> <view class="bg-white flex flex-justify" style="padding:24rpx 32rpx" wx:if="{{poundInfo.totalWeighingPicture.length}}">
<van-image wx:for="{{poundInfo.totalWeighingPicture}}" wx:key="index" use-loading-slot width="320rpx" height="240rpx"
<van-image wx:for="{{poundInfo.totalWeighingPicture}}" wx:key="index" use-loading-slot width="330rpx" height="240rpx"
data-url="{{item}}" fit="cover" data-type="1" src="{{item}}" bind:click="viewImage"> data-url="{{item}}" fit="cover" data-type="1" src="{{item}}" 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/storage/pound-info/index.wxml

@ -11,7 +11,7 @@
</view> </view>
</van-cell> </van-cell>
<view class="bg-white flex flex-justify" style="padding:24rpx 32rpx" wx:if="{{form.emptyWeighingPicture.length}}"> <view class="bg-white flex flex-justify" style="padding:24rpx 32rpx" wx:if="{{form.emptyWeighingPicture.length}}">
<van-image wx:for="{{form.emptyWeighingPicture}}" wx:key="index" use-loading-slot width="320rpx" height="240rpx"
<van-image wx:for="{{form.emptyWeighingPicture}}" wx:key="index" use-loading-slot width="330rpx" height="240rpx"
data-url="{{item}}" fit="cover" data-type="0" src="{{item}}" bind:click="viewImage"> data-url="{{item}}" fit="cover" data-type="0" src="{{item}}" 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" />
@ -25,7 +25,7 @@
</view> </view>
</van-cell> </van-cell>
<view class="bg-white flex flex-justify" style="padding:24rpx 32rpx" wx:if="{{form.totalWeighingPicture.length}}"> <view class="bg-white flex flex-justify" style="padding:24rpx 32rpx" wx:if="{{form.totalWeighingPicture.length}}">
<van-image wx:for="{{form.totalWeighingPicture}}" wx:key="index" use-loading-slot width="320rpx" height="240rpx"
<van-image wx:for="{{form.totalWeighingPicture}}" wx:key="index" use-loading-slot width="330rpx" height="240rpx"
data-url="{{item}}" fit="cover" data-type="1" src="{{item}}" bind:click="viewImage"> data-url="{{item}}" fit="cover" data-type="1" src="{{item}}" 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" />

Loading…
Cancel
Save