Browse Source

no message

feature/v2.1
xpz2018 4 years ago
parent
commit
def221146f
14 changed files with 79 additions and 36 deletions
  1. 2
      app.js
  2. 41
      components/textarea/index.js
  3. 3
      components/textarea/index.json
  4. 4
      components/textarea/index.wxml
  5. 7
      components/textarea/index.wxss
  6. 22
      pages/agent/appointment/index.js
  7. 1
      pages/agent/appointment/index.json
  8. 4
      pages/agent/appointment/index.wxml
  9. 4
      pages/home/index/index.wxml
  10. 11
      pages/process/payment/index.js
  11. 1
      pages/process/payment/index.json
  12. 4
      pages/process/payment/index.wxml
  13. 10
      xtends/statics/index/index.wxml
  14. 1
      xtends/statics/index/index.wxss

2
app.js

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

41
components/textarea/index.js

@ -0,0 +1,41 @@
Component({
/**
* 组件样式隔离
*/
options: {
addGlobalClass: true,
multipleSlots: true // 支持多个slot
},
properties: {
value: {
type: String,
value: null
},
placeholder: {
type: String,
value: ''
}
},
/**
* 组件的初始数据
*/
data: {
editing: false
},
/**
* 组件的方法列表
*/
methods: {
onEdit: function(e) {
this.setData({ editing: true })
},
onBlur: function(e) {
this.setData({ editing: false })
},
bindInput: function(e) {
this.setData({ value: e.detail.value })
this.triggerEvent('change', this.data.value)
}
}
})

3
components/textarea/index.json

@ -0,0 +1,3 @@
{
"component": true
}

4
components/textarea/index.wxml

@ -0,0 +1,4 @@
<view class="textarea {{ value ? 'text-black' : 'text-gray' }}" bindtap="onEdit" wx:if="{{!editing}}">{{value || placeholder }}</view>
<textarea wx:else maxlength="100" value="{{value}}" style="padding-top:16rpx" class="textarea"
cursor-spacing="60" focus="{{editing}}" bindfocus="onEdit" bindblur="onBlur" show-confirm-bar="{{false}}"
bindinput="bindInput" placeholder-style="color:#aaa" placeholder="{{placeholder}}"></textarea>

7
components/textarea/index.wxss

@ -0,0 +1,7 @@
.textarea{
width:100%;
height:80px;
padding:12rpx;
font-size: 14px;
border: 1rpx solid #f3f3f3;
}

22
pages/agent/appointment/index.js

@ -24,7 +24,6 @@ Scene({
plateNumber: '',
plateString: '',
vindex: -1,
picking: false,
requesting: false,
columns: [],
toolbar: '',
@ -121,7 +120,11 @@ Scene({
bindInput: function (e) {
if(!util.isEmpty(e.currentTarget.id)){
var form_data = 'form.' + e.currentTarget.id
this.setData({ [form_data]: e.detail.value })
if(e.currentTarget.id == 'remark'){
this.setData({ [form_data]: e.detail })
} else {
this.setData({ [form_data]: e.detail.value })
}
} else {
this.data.code = e.detail.value
}
@ -129,14 +132,11 @@ Scene({
showKeyboard: function(e){
var item = this.data.vehicleList[e.currentTarget.dataset.index]
this.keyboard = this.keyboard || this.selectComponent('#wux-keyboard')
this.setData({ picking: true })
this.keyboard.show(item.plateNumber, e.currentTarget.dataset.index)
},
onPlatenumber: function({detail}){
if(detail && detail.plateNumber){
this.setData({ ['vehicleList[' + detail.type + '].plateNumber']: detail.plateNumber, picking: false })
} else {
this.setData({ picking: false })
this.setData({ ['vehicleList[' + detail.type + '].plateNumber']: detail.plateNumber })
}
},
addCate: function (e) {
@ -160,17 +160,17 @@ Scene({
}
this.data.toolId = e.currentTarget.id
if(e.currentTarget.id == 'deliveryTime'){
this.setData({ visible: true, picking: true, columns: this.data.timeList, toolbar: '选择到货时间' })
this.setData({ visible: true, columns: this.data.timeList, toolbar: '选择到货时间' })
} else if(e.currentTarget.id == 'cateName'){
this.setData({ visible: true, picking: true, columns: this.data.cateList, toolbar: '选择纸品' })
this.setData({ visible: true, columns: this.data.cateList, toolbar: '选择纸品' })
}
},
onHide: function(){
this.setData({ picking: false, visible: false })
this.setData({ visible: false })
},
onConfirm: function ({detail}) {
if(this.data.toolId == 'deliveryTime'){
this.setData({ ['form.deliveryTime']: detail.value, picking: false, visible: false })
this.setData({ ['form.deliveryTime']: detail.value, visible: false })
} else if(this.data.toolId == 'cateName'){
const element = this.data.factoryDetail.paperCategoryList[detail.index]
if(element.publicSubsidies && Number(element.publicSubsidies) > 0){
@ -183,7 +183,7 @@ Scene({
this.data.cateName = element.categoryName
this.data.form.paperCategoryId = element.categoryId
this.setData({ ['form.unitPrice']: this.data.form.unitPrice, ['form.publicSubsidies']: this.data.form.publicSubsidies,
cateName: this.data.cateName, picking: false, visible: false })
cateName: this.data.cateName, visible: false })
}
},
tagChange: function(e){

1
pages/agent/appointment/index.json

@ -6,6 +6,7 @@
"van-dialog": "/components/dialog/index",
"van-loading": "/components/loading/index",
"van-image": "/components/image/index",
"van-textarea": "/components/textarea/index",
"van-picker": "/components/picker/index",
"van-popup": "/components/popup/index",
"vehicle-keyboard": "/components/vehicle-keyboard/index",

4
pages/agent/appointment/index.wxml

@ -80,9 +80,7 @@
<view class="text-black text-sg text-bold" style="margin-left: 12rpx">其他信息</view>
</view>
<view class="bg-white" style="padding:24rpx 30rpx">
<view class="textarea {{ form.remark ? 'text-black' : 'text-gray' }}" style="padding:24rpx" wx:if="{{picking}}">{{form.remark ? form.remark : '点击输入备注,最多100字' }}</view>
<textarea wx:else id="remark" maxlength="100" value="{{form.remark}}" class="textarea" cursor-spacing="60"
show-confirm-bar="{{false}}" bindinput="bindInput" placeholder-style="color:#aaa" placeholder="点击输入备注,最多100字"></textarea>
<van-textarea id="remark" bind:change="bindInput" placeholder="点击输入备注,最多100字"></van-textarea>
</view>
<view style="height:16rpx"></view>

4
pages/home/index/index.wxml

@ -46,9 +46,9 @@
<van-grid-item text="智能绑卡" url="/pages/message/card-list/index">
<van-icon slot="icon" name="/assets/home/icon-card.png" size="76rpx" />
</van-grid-item>
<!-- <van-grid-item text="智能报表" url="/xtends/statics/index/index" wx:if="{{isAdmin}}">
<van-grid-item text="智能报表" url="/xtends/statics/index/index" wx:if="{{isAdmin}}">
<van-icon slot="icon" name="/assets/home/icon-report.png" size="76rpx" />
</van-grid-item> -->
</van-grid-item>
</van-grid>
</view>
</view>

11
pages/process/payment/index.js

@ -28,8 +28,7 @@ Scene({
ids: []
},
settleType: '1',
requesting: false,
editing: false
requesting: false
},
/**
* 生命周期函数--监听页面加载
@ -153,15 +152,9 @@ Scene({
wx.navigateTo({ url: `/pages/process/order-info/index?id=${item.id}` })
}
},
onRemark: function(e){
this.setData({editing: true })
},
onBlur: function(){
this.setData({editing: false })
},
bindInput: function (e) {
var form_data = 'params.' + e.currentTarget.id
this.setData({ [form_data]: e.detail.value })
this.setData({ [form_data]: e.detail })
},
agentPayment: function(settleType){
if(Number(settleType) != 1 && Number(settleType) != 2){

1
pages/process/payment/index.json

@ -6,6 +6,7 @@
"van-radio": "/components/radio/index",
"van-radio-group": "/components/radio-group/index",
"van-image": "/components/image/index",
"van-textarea": "/components/textarea/index",
"van-dialog": "/components/dialog/index",
"submit-layout": "/components/submit-layout/index",
"notification": "/pages/message/notification/index"

4
pages/process/payment/index.wxml

@ -37,9 +37,7 @@
<view class="text-black text-sg">付款备注</view>
</view>
<view style="min-height:90rpx;padding: 0rpx 32rpx">
<!-- <textarea id="payRemark" placeholder-style="color:#aaa" style="width:100%;height:180rpx;padding:12rpx;border:1rpx solid #f3f3f3" placeholder="请输入付款备注" bindinput="bindInput" /> -->
<view class="textarea {{ params.payRemark ? 'text-black' : 'text-gray' }}" bindtap="onRemark" wx:if="{{!editing}}">{{params.payRemark ? params.payRemark : '点击输入付款备注,最多100字' }}</view>
<textarea wx:else id="payRemark" maxlength="100" value="{{params.payRemark}}" style="padding-top:16rpx" class="textarea" cursor-spacing="60" focus="{{editing}}" bindfocus="onRemark" bindblur="onBlur" show-confirm-bar="{{false}}" bindinput="bindInput" placeholder-style="color:#aaa" placeholder="点击输入付款备注,最多100字"></textarea>
<van-textarea id="payRemark" bind:change="bindInput" placeholder="点击输入付款备注,最多100字"></van-textarea>
</view>
</view>

10
xtends/statics/index/index.wxml

@ -55,17 +55,15 @@
<van-icon name="{{show ? 'arrow-up' : 'arrow-down'}}" />
</view>
</view>
<view class="bg-white flex flex-center" style="padding: 32rpx 24rpx;">
<view class="bg-white flex flex-center" style="padding: 32rpx;">
<!-- <van-circle type="2d" value="{{ 60 }}" layer-color="#007AFF" color="#FF222C" stroke-width="24" wx:if="{{!show}}"/> -->
<view style="height:100px;width:100px">
<view class="shanxing {{((percent < 50 && percent != 0) || percent == 100) ? 'shanxing1' : 'shanxing2'}}">
<view class="shanxing {{((percent < 50 && percent != 0) || percent == 100) ? 'shanxing1' : 'shanxing2'}}">
<view wx:if="{{percent != 0 && percent != 100}}" class="sx1"></view>
<view wx:if="{{percent != 50 && percent != 0 && percent != 100}}" class="sx2" style="transform: rotate({{percent < 50 ? ((360 * percent / 100) - 180):(360 * (percent - 100) / 100)}}deg);"></view>
<view class="sx_t"></view>
</view>
</view>
<view class="flex" style="margin-left:24rpx;">
<view style="width:200rpx">
<view style="width:220rpx">
<view class="text-black text-sm">收货合计(吨)</view>
<view class="text-xxl" style="color:#278CC8;margin-top:8rpx">1230.45</view>
<view class="flex" style="margin-top:24rpx;align-items: center">
@ -74,7 +72,7 @@
</view>
<view class="text-black text-bold">1230.45</view>
</view>
<view style="width:240rpx">
<view style="width:220rpx">
<view class="text-black text-sm">收货总金额(元)</view>
<view class="text-xxl" style="color:#278CC8;margin-top:8rpx">1230.45</view>
<view class="flex" style="margin-top:24rpx;align-items: center">

1
xtends/statics/index/index.wxss

@ -13,7 +13,6 @@
.shanxing {
width: 200rpx;
height: 200rpx;
margin: 10rpx auto;
position: relative;
border-radius: 50%;
overflow: hidden;

Loading…
Cancel
Save