Browse Source

no message

feature/v1.5
xpz2018 4 years ago
parent
commit
f88c1807d9
6 changed files with 8 additions and 7 deletions
  1. 2
      components/uploader/index.wxml
  2. 2
      components/uploader/index.wxss
  3. 4
      pages/home/customer-info/index.js
  4. 2
      pages/home/customer-info/index.wxml
  5. 3
      pages/process/outside-price/index.js
  6. 2
      pages/process/payment/index.wxml

2
components/uploader/index.wxml

@ -14,7 +14,7 @@
<van-loading wx:else class="van-uploader__loading" /> <van-loading wx:else class="van-uploader__loading" />
<text wx:if="{{ item.message }}" class="van-uploader__upload-text">{{ item.message }}</text> <text wx:if="{{ item.message }}" class="van-uploader__upload-text">{{ item.message }}</text>
</view> </view>
<van-icon wx:if="{{ deletable }}" name="clear" class="van-uploader__preview-delete" data-index="{{ index }}" bind:tap="deleteItem" />
<van-icon wx:if="{{ deletable }}" name="clear" class="van-uploader__preview-delete" data-index="{{ index }}" bind:tap="deleteItem" size="20"/>
</view> </view>
<!-- 上传样式 --> <!-- 上传样式 -->
<block wx:if="{{ isInCount }}"> <block wx:if="{{ isInCount }}">

2
components/uploader/index.wxss

@ -1 +1 @@
@import '../common/index.wxss';.van-uploader{position:relative;display:inline-block}.van-uploader__wrapper{display:-webkit-flex;display:flex;-webkit-flex-wrap:wrap;flex-wrap:wrap}.van-uploader__slot:empty{display:none}.van-uploader__slot:not(:empty)+.van-uploader__upload{display:none!important}.van-uploader__upload{position:relative;display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;box-sizing:border-box;width:80px;height:80px;margin:0 8px 8px 0;background-color:#f7f8fa;border-radius:1px}.van-uploader__upload:active{background-color:#f2f3f5}.van-uploader__upload-icon{color:#dcdee0;font-size:24px}.van-uploader__upload-text{margin-top:8px;color:#969799;font-size:12px}.van-uploader__upload--disabled{opacity:.5;opacity:var(--uploader-disabled-opacity,.5)}.van-uploader__preview{position:relative;margin:0 8px 8px 0;cursor:pointer}.van-uploader__preview-image{display:block;width:80px;height:80px;overflow:hidden;border-radius:1px}.van-uploader__preview-delete{position:absolute;top:-8px;right:-8px;color:#969799;font-size:18px;background-color:#fff;border-radius:100%}.van-uploader__file{display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;width:80px;height:80px;background-color:#f7f8fa;border-radius:1px}.van-uploader__file-icon{color:#646566;font-size:20px}.van-uploader__file-name{box-sizing:border-box;width:100%;margin-top:8px;padding:0 4px;color:#646566;font-size:12px;text-align:center}.van-uploader__mask{position:absolute;top:0;right:0;bottom:0;left:0;display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;color:#fff;background-color:rgba(50,50,51,.88);border-radius:1px}.van-uploader__mask-icon{font-size:22px}.van-uploader__mask-message{margin-top:6px;padding:0 4px;font-size:12px;line-height:14px}.van-uploader__loading{width:22px;height:22px;color:#fff}
@import '../common/index.wxss';.van-uploader{position:relative;display:inline-block}.van-uploader__wrapper{display:-webkit-flex;display:flex;-webkit-flex-wrap:wrap;flex-wrap:wrap}.van-uploader__slot:empty{display:none}.van-uploader__slot:not(:empty)+.van-uploader__upload{display:none!important}.van-uploader__upload{position:relative;display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;box-sizing:border-box;width:80px;height:80px;margin:0 8px 8px 0;background-color:#f7f8fa;border-radius:1px}.van-uploader__upload:active{background-color:#f2f3f5}.van-uploader__upload-icon{color:#dcdee0;font-size:24px}.van-uploader__upload-text{margin-top:8px;color:#969799;font-size:12px}.van-uploader__upload--disabled{opacity:.5;opacity:var(--uploader-disabled-opacity,.5)}.van-uploader__preview{position:relative;margin:0 12px 8px 0;cursor:pointer}.van-uploader__preview-image{display:block;width:80px;height:80px;overflow:hidden;border-radius:1px}.van-uploader__preview-delete{position:absolute;top:-8px;right:-8px;color:#969799;font-size:18px;background-color:#fff;border-radius:100%}.van-uploader__file{display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;width:80px;height:80px;background-color:#f7f8fa;border-radius:1px}.van-uploader__file-icon{color:#646566;font-size:20px}.van-uploader__file-name{box-sizing:border-box;width:100%;margin-top:8px;padding:0 4px;color:#646566;font-size:12px;text-align:center}.van-uploader__mask{position:absolute;top:0;right:0;bottom:0;left:0;display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;color:#fff;background-color:rgba(50,50,51,.88);border-radius:1px}.van-uploader__mask-icon{font-size:22px}.van-uploader__mask-message{margin-top:6px;padding:0 4px;font-size:12px;line-height:14px}.van-uploader__loading{width:22px;height:22px;color:#fff}

4
pages/home/customer-info/index.js

@ -16,8 +16,8 @@ Scene({
}, },
show: false, show: false,
actions: [ actions: [
{ id: 2, name: '转账' },
{ id: 1, name: '现金' }
{ id: 2, name: '银行卡转账' },
{ id: 1, name: '现金支付' }
], ],
visible: false, visible: false,
bankList: null bankList: null

2
pages/home/customer-info/index.wxml

@ -7,7 +7,7 @@
<van-field id="name" value="{{ form.name }}" label="客户姓名:" placeholder="请输入客户姓名" bind:input="bindInput" /> <van-field id="name" value="{{ form.name }}" label="客户姓名:" placeholder="请输入客户姓名" bind:input="bindInput" />
<van-field id="mobile" value="{{ form.mobile }}" type="number" label="手机号码:" placeholder="请输入手机号码" <van-field id="mobile" value="{{ form.mobile }}" type="number" label="手机号码:" placeholder="请输入手机号码"
bind:input="bindInput" /> bind:input="bindInput" />
<van-field value="{{ form.defaultPaymentMethod == 1 ? '现金' : (form.defaultPaymentMethod == 2 ? '转账' : '' )}}" readonly
<van-field value="{{ form.defaultPaymentMethod == 1 ? '现金支付' : (form.defaultPaymentMethod == 2 ? '银行卡转账' : '' )}}" readonly
label="付款方式:" is-link bindtap="chooseMethod" placeholder="请选择付款方式" /> label="付款方式:" is-link bindtap="chooseMethod" placeholder="请选择付款方式" />
<van-field id="bankName" value="{{ form.bankName }}" label="银行名称:" readonly is-link placeholder="请选择银行" <van-field id="bankName" value="{{ form.bankName }}" label="银行名称:" readonly is-link placeholder="请选择银行"
bind:input="bindInput" wx:if="{{form.defaultPaymentMethod == 2}}" bindtap="chooseMethod" /> bind:input="bindInput" wx:if="{{form.defaultPaymentMethod == 2}}" bindtap="chooseMethod" />

3
pages/process/outside-price/index.js

@ -173,7 +173,8 @@ Scene({
if(this.data.form.onsideGrossWeight) { if(this.data.form.onsideGrossWeight) {
util.showBackToast('定价成功') util.showBackToast('定价成功')
} else { } else {
Dialog.confirm({ title: '温馨提示', message: '定价成功,请过磅刷卡获取厂内毛重!' }).then(() => {
Dialog.alert({ title: '温馨提示', message: '定价成功,请过磅刷卡获取厂内毛重!' }).then(() => {
wx.navigateBack()
}) })
} }
event.emit('OrderMessage', { what: 12, desc: 'pricingOrder' }) event.emit('OrderMessage', { what: 12, desc: 'pricingOrder' })

2
pages/process/payment/index.wxml

@ -17,7 +17,7 @@
<view style="min-height:90rpx;padding-right:32rpx"> <view style="min-height:90rpx;padding-right:32rpx">
<van-radio-group value="{{ settleType }}" bind:change="onTypeChange"> <van-radio-group value="{{ settleType }}" bind:change="onTypeChange">
<van-cell-group> <van-cell-group>
<van-cell title="现金" clickable data-name="1" bind:click="onTypeClick">
<van-cell title="现金支付" clickable data-name="1" bind:click="onTypeClick">
<van-radio slot="right-icon" name="1" /> <van-radio slot="right-icon" name="1" />
</van-cell> </van-cell>
<van-cell clickable data-name="2" bind:click="onTypeClick"> <van-cell clickable data-name="2" bind:click="onTypeClick">

Loading…
Cancel
Save