Browse Source

no message

feature/v1.4
xpz2018 4 years ago
parent
commit
516b781feb
12 changed files with 35 additions and 19 deletions
  1. 2
      app.js
  2. 1
      components/submit-layout/index.wxml
  3. 1
      pages/agent/appointment/index.wxml
  4. 1
      pages/agent/order-detail/index.wxml
  5. 7
      pages/message/notification/index.js
  6. 2
      pages/message/notification/index.wxml
  7. 11
      pages/settlement/withdrawal/index.js
  8. 3
      pages/settlement/withdrawal/index.json
  9. 23
      pages/settlement/withdrawal/index.wxml
  10. 1
      pages/storage/order-create/index.wxml
  11. 1
      pages/storage/order-settlement/index.wxml
  12. 1
      pages/storage/pound-info/index.wxml

2
app.js

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

1
components/submit-layout/index.wxml

@ -1,3 +1,4 @@
<view style="height:{{136 + safeBottom}}rpx;"></view>
<view class="cu-bar bg-white foot justify-end" style="height:{{120 + safeBottom}}rpx;padding:0rpx 32rpx {{safeBottom}}rpx 32rpx;">
<slot />
</view>

1
pages/agent/appointment/index.wxml

@ -90,7 +90,6 @@
show-confirm-bar="{{false}}" bindinput="bindInput" placeholder-style="color:#aaa" placeholder="点击输入备注,最多100字"></textarea>
</view>
<view style="height:{{136 + safeBottom}}rpx;"></view>
<submit-layout>
<van-button type="info" loading="{{requesting}}" custom-style="height:88rpx;width:688rpx" bind:click="submitForm">提交订单</van-button>
</submit-layout>

1
pages/agent/order-detail/index.wxml

@ -43,7 +43,6 @@
<!-- ------订单信息------ -->
<order-info orderInfo="{{orderInfo}}" />
<view style="height:{{136}}rpx;" wx:if="{{orderInfo && ((cancel && orderInfo.status == 51) || orderInfo.status == 50)}}"></view>
<submit-layout wx:if="{{orderInfo && ((cancel && orderInfo.status == 51) || orderInfo.status == 50)}}">
<van-button type="default" custom-style="height:88rpx;width:240rpx" bind:click="cancelOrder"
wx:if="{{orderInfo.status == 50 || orderInfo.status == 51}}">取消订单</van-button>

7
pages/message/notification/index.js

@ -10,13 +10,18 @@ Component({
data: {
StatusBar: app.globalData.StatusBar,
CustomBar: app.globalData.CustomBar,
isAdmin: false,
notice: false,
message: null,
numb: 0
},
lifetimes: {
attached: function () {
this.setData({ StatusBar: app.globalData.StatusBar, CustomBar: app.globalData.CustomBar })
this.setData({
StatusBar: app.globalData.StatusBar,
CustomBar: app.globalData.CustomBar,
isAdmin: app.userInfo.type && app.userInfo.type.indexOf('ADMIN') >= 0
})
}
},
methods: {

2
pages/message/notification/index.wxml

@ -6,7 +6,7 @@
</view>
<view class="flex" style="padding: 0rpx 24rpx 24rpx 24rpx;justify-content: flex-end;margin-top: 24rpx">
<van-button round plain type="info" size="small" custom-style="width: 150rpx" bind:click="submit">稍后处理</van-button>
<van-button id="employ" round type="info" size="small" bind:click="submit" custom-style="margin-left:24rpx;width: 150rpx">绑定员工</van-button>
<van-button id="employ" round type="info" size="small" bind:click="submit" custom-style="margin-left:24rpx;width: 150rpx" wx:if="{{isAdmin}}">绑定员工</van-button>
<van-button id="client" round type="info" size="small" bind:click="submit" custom-style="margin-left:24rpx;width: 150rpx">绑定客户</van-button>
</view>
</van-popup>

11
pages/settlement/withdrawal/index.js

@ -39,11 +39,11 @@ Page({
this.data.columns = []
for (let index = 0; index < res.data.length; index++) {
const element = res.data[index]
this.data.columns.push(element.bankName + '(' + element.cardNoSuffix + ')')
this.data.columns.push(element.bankName + '(' + element.cardNoSuffix + '-' + element.ownerName + ')')
}
if (res.data && res.data.length && res.data[0].cardName) {
const element = res.data[0]
var defaultCard = { cardId: element.id, cardName: element.bankName + '(' + element.cardNoSuffix + ')' }
var defaultCard = { cardId: element.id, cardName: element.bankName + '(' + element.cardNoSuffix + '-' + element.ownerName + ')' }
this.setData({ banckCardList: res.data, columns: this.data.columns, chooseBankCard: defaultCard })
} else {
this.setData({ banckCardList: res.data, columns: this.data.columns })
@ -56,6 +56,9 @@ Page({
getUserInfo: function () {
wx.showLoading({ title: '加载中', mask: true })
getBalanceInfo().then(result => {
if(!result.data){
return
}
this.setData({ accountMoney: result.data.accountMoney, xsaccountMoney: math.minus(result.data.accountMoney, result.data.frozenMoney) })
}).catch(err => {
console.log(err)
@ -98,11 +101,9 @@ Page({
}
},
onConfirm: function({detail}){
console.log(detail)
var nowItem = this.data.banckCardList[detail.index]
console.log(detail.index)
console.log(nowItem)
this.data.chooseBankCard.cardName = nowItem.bankName
this.data.chooseBankCard.cardName = nowItem.bankName + '(' + nowItem.cardNoSuffix + '-' + nowItem.ownerName + ')'
this.data.chooseBankCard.cardId = nowItem.id
this.setData({ visible: false, chooseBankCard: this.data.chooseBankCard })
},

3
pages/settlement/withdrawal/index.json

@ -1,10 +1,11 @@
{
"usingComponents": {
"van-cell": "/components/cell/index",
"van-cell-group": "/components/cell-group/index",
"van-dialog": "/components/dialog/index",
"van-picker": "/components/picker/index",
"van-popup": "/components/popup/index",
"van-checkbox": "/components/checkbox/index",
"submit-layout": "/components/submit-layout/index",
"van-button": "/components/button/index"
}
}

23
pages/settlement/withdrawal/index.wxml

@ -20,19 +20,32 @@
<text class="text-sg text-bold text-black" bindtap="banlanceDetails">提现金额</text>
<view class="cu-form-group" style="border-bottom: 1px solid #f3f3f3;margin-top:24rpx;padding: 2rpx 0rpx">
<view><text style="font-size:50rpx;font-weight: 600; color:black">¥</text></view>
<input type="digit" style="font-size:45rpx;" value="{{expendMoney}}" bindinput="bindAndSet" placeholder="请输入金额"></input>
<input type="digit" style="font-size:45rpx;" value="{{expendMoney}}" disabled placeholder="可转出到卡{{sumMoney}}元"></input>
</view>
</view>
<van-cell>
<view class="flex" slot="title" style="align-items: center">
<text class="text-sg" style="margin-left:12rpx">账户余额¥{{formate.formateAmount(xsaccountMoney)}}</text>
<text class="text-sg" style="margin-left:12rpx">账户余额¥{{formate.formateAmount(xsaccountMoney, 2)}}</text>
<text class="text-sm text-blue" style="margin-left:30rpx" bindtap="allExpend">全部提现</text>
</view>
</van-cell>
<view style="margin-top:20rpx;padding:80rpx 32rpx">
<van-button block type="info" bind:click="submitForm">提现</van-button>
</view>
<van-cell clickable wx:for="{{orderList}}" wx:key="index" data-index="{{index}}" bind:click="checkList">
<view slot="title" class="flex flex-justify">
<view style="width:100%;flex:1">
<view class="text-sg {{item.status == 0 ? 'text-black': 'text-gray'}}">{{item.title || '代卖业务'}}{{item.status == 1 ? '(提现中)': ''}}</view>
<view class="text-sm {{item.status == 0 ? 'text-black': 'text-gray'}}">{{item.createTime}}</view>
</view>
<view class="flex flex-ceter">
<view class="text-sg {{item.status == 0 ? 'text-black': 'text-gray'}}" style="margin-right:16rpx">金额:{{item.money}}</view>
<van-checkbox value="{{ item.check }}" disabled="{{item.status != 0}}"></van-checkbox>
</view>
</view>
</van-cell>
<submit-layout>
<van-button type="info" custom-style="height:88rpx;width:686rpx" bind:click="submitForm" disabled="{{requesting}}">申请提现</van-button>
</submit-layout>
<van-dialog id="van-dialog" />
<van-popup position="bottom" show="{{ visible }}" bind:close="onHide" z-index="29">

1
pages/storage/order-create/index.wxml

@ -106,7 +106,6 @@
</van-collapse-item>
</van-collapse>
<view style="height:{{136 + safeBottom}}rpx;" wx:if="{{poundInfo}}"></view>
<submit-layout wx:if="{{poundInfo}}">
<van-button type="info" custom-style="height:88rpx;width:680rpx" bind:click="submitForm">提交</van-button>
</submit-layout>

1
pages/storage/order-settlement/index.wxml

@ -154,7 +154,6 @@
</van-collapse-item>
</van-collapse>
<view style="height:{{136 + safeBottom}}rpx;" wx:if="{{orderInfo && orderInfo.status == 1 }}"></view>
<submit-layout wx:if="{{orderInfo && orderInfo.status == 1}}">
<van-button type="danger" custom-style="height:88rpx;width:254rpx" bind:click="closeForm">关闭订单</van-button>
<van-button type="info" custom-style="margin-left:32rpx;height:88rpx;width:400rpx" bind:click="settlementForm">确认收款</van-button>

1
pages/storage/pound-info/index.wxml

@ -58,7 +58,6 @@
</view>
</van-cell>
<view style="height:{{136 + safeBottom}}rpx;" wx:if="{{ form }}"></view>
<submit-layout wx:if="{{form.status == 0 || form.status == 1}}">
<van-button type="danger" custom-style="height:88rpx;width:254rpx" bind:click="deleteForm" wx:if="{{form.status == 0 || form.status == 1}}">删除</van-button>
<van-button type="info" custom-style="margin-left:32rpx;height:88rpx;width:400rpx" bind:click="submitForm" wx:if="{{form.status == 1}}">关联出货单</van-button>

Loading…
Cancel
Save