Browse Source

no message

feature/v1.1
xpz2018 5 years ago
parent
commit
3d02a07026
16 changed files with 328 additions and 144 deletions
  1. 1
      app.json
  2. 64
      components/dialog/index.wxml
  3. 99
      pages/client/registe/index.js
  4. 6
      pages/client/registe/index.json
  5. 33
      pages/client/registe/index.wxml
  6. 4
      pages/client/registe/index.wxss
  7. 2
      pages/home/index/index.js
  8. 48
      pages/process/agent-list/index.js
  9. 22
      pages/process/agent-list/index.wxml
  10. 17
      pages/process/order-info/index.wxml
  11. 13
      pages/process/order-list/index.js
  12. 6
      pages/process/order-list/index.wxml
  13. 60
      pages/process/payment/index.js
  14. 47
      pages/process/payment/index.wxml
  15. 48
      pages/process/payment/index.wxss
  16. 2
      project.config.json

1
app.json

@ -21,6 +21,7 @@
"pages/message/detail/index",
"pages/storage/index/index",
"pages/client/index/index",
"pages/client/registe/index",
"pages/client/home/index",
"pages/client/order-list/index",
"pages/client/factory-list/index",

64
components/dialog/index.wxml

@ -1,64 +1,34 @@
<wxs src="../wxs/utils.wxs" module="utils" />
<van-popup
show="{{ show }}"
z-index="{{ zIndex }}"
overlay="{{ overlay }}"
transition="{{ transition }}"
custom-class="van-dialog {{ className }}"
custom-style="width: {{ utils.addUnit(width) }};{{ customStyle }}"
overlay-style="{{ overlayStyle }}"
close-on-click-overlay="{{ closeOnClickOverlay }}"
bind:close="onClickOverlay">
<view
wx:if="{{ title || useTitleSlot }}"
class="van-dialog__header {{ message || useSlot ? '' : 'van-dialog--isolated' }}"
>
<van-popup show="{{ show }}" z-index="{{ zIndex }}" overlay="{{ overlay }}" transition="{{ transition }}"
custom-class="van-dialog {{ className }}" custom-style="width: {{ utils.addUnit(width) }};{{ customStyle }}"
overlay-style="{{ overlayStyle }}" close-on-click-overlay="{{ closeOnClickOverlay }}" bind:close="onClickOverlay">
<view wx:if="{{ title || useTitleSlot }}"
class="van-dialog__header {{ message || useSlot ? '' : 'van-dialog--isolated' }}">
<slot wx:if="{{ useTitleSlot }}" name="title" />
<block wx:elif="{{ title }}"> {{ title }}</block>
</view>
<slot wx:if="{{ useSlot }}" />
<view
wx:elif="{{ message }}"
<view wx:elif="{{ message }}"
class="van-dialog__message {{ title ? 'van-dialog__message--has-title' : '' }} {{ messageAlign ? 'van-dialog__message--' + messageAlign : '' }}">
<text class="van-dialog__message-text">{{ message }}</text>
</view>
<view class="van-hairline--top van-dialog__footer">
<van-button
wx:if="{{ showCancelButton }}"
size="large"
loading="{{ loading.cancel }}"
class="van-dialog__button van-hairline--right"
custom-class="van-dialog__cancel"
custom-style="color: {{ cancelButtonColor }}"
bind:click="onCancel">
<van-button wx:if="{{ showCancelButton }}" size="large" loading="{{ loading.cancel }}"
class="van-dialog__button van-hairline--right" custom-class="van-dialog__cancel"
custom-style="color: {{ cancelButtonColor }}" bind:click="onCancel">
{{ cancelButtonText }}
</van-button>
<van-button
wx:if="{{ showConfirmButton }}"
size="large"
class="van-dialog__button"
loading="{{ loading.confirm }}"
custom-class="van-dialog__confirm"
custom-style="color: {{ confirmButtonColor }}"
open-type="{{ confirmButtonOpenType }}"
lang="{{ lang }}"
business-id="{{ businessId }}"
session-from="{{ sessionFrom }}"
send-message-title="{{ sendMessageTitle }}"
send-message-path="{{ sendMessagePath }}"
send-message-img="{{ sendMessageImg }}"
show-message-card="{{ showMessageCard }}"
app-parameter="{{ appParameter }}"
bind:click="onConfirm"
bindgetuserinfo="bindGetUserInfo"
bindcontact="bindContact"
bindgetphonenumber="bindGetPhoneNumber"
binderror="bindError"
bindlaunchapp="bindLaunchApp"
bindopensetting="bindOpenSetting">
<van-button wx:if="{{ showConfirmButton }}" size="large" class="van-dialog__button" loading="{{ loading.confirm }}"
custom-class="van-dialog__confirm" custom-style="color: {{ confirmButtonColor }}"
open-type="{{ confirmButtonOpenType }}" lang="{{ lang }}" business-id="{{ businessId }}"
session-from="{{ sessionFrom }}" send-message-title="{{ sendMessageTitle }}"
send-message-path="{{ sendMessagePath }}" send-message-img="{{ sendMessageImg }}"
show-message-card="{{ showMessageCard }}" app-parameter="{{ appParameter }}" bind:click="onConfirm"
bindgetuserinfo="bindGetUserInfo" bindcontact="bindContact" bindgetphonenumber="bindGetPhoneNumber"
binderror="bindError" bindlaunchapp="bindLaunchApp" bindopensetting="bindOpenSetting">
{{ confirmButtonText }}
</van-button>
</view>

99
pages/client/registe/index.js

@ -0,0 +1,99 @@
// pages/home/password/index.js
// 页面已经废弃,因为UEC的修改,暂时不会提供修改密码的功能
import { postCaptcha } from "../../../api/user"
import { getCustomerInfo, bindCustomer } from "../../../api/saas"
const util = require('../../../utils/util')
const app = getApp()
Page({
/**
* 页面的初始数据
*/
data: {
second: '获取验证码',
codeEnable: false,
pwdType: 'password',
pwd_icon: 'attention',
form: {
mobile: null,
captcha: null
},
loging: false,
customerInfo: null
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
if(options.id){
wx.showLoading({ title: '正在获取', mask: true })
getCustomerInfo(options.id).then(result => {
wx.hideLoading()
this.setData({ customerInfo: result.data })
}).catch(err => {
wx.hideLoading()
util.showToast(err)
})
}
},
bindForm: function (e) {
this.data.form[e.target.id] = e.detail.value
},
changePwd: function (e) {
if (this.data.pwdType === 'password') {
this.setData({ pwdType: 'text', pwd_icon: 'attentionforbid' })
} else {
this.setData({ pwdType: 'password', pwd_icon: 'attention' })
}
},
fetchCode: function () {
if (util.isEmpty(this.data.form.mobile)) {
util.showToast('请输入手机号码')
return
}
if (this.second && this.second.interval) return !1
wx.showLoading({ title: '正在获取', mask: true })
postCaptcha({ verifiableAccount: this.data.form.mobile, verifiableAccountType: 1, purpose: 1 }).then(result => {
wx.hideLoading()
this.setData({ codeEnable: true })
util.showToast('验证码已经发送')
this.countDown = this.countDown || this.selectComponent('.count-down')
this.countDown.reset()
this.countDown.start()
}).catch(error => {
wx.hideLoading()
util.showToast(error)
})
},
onChange: function(e) {
this.setData({ second: e.detail.seconds + ' 秒 ' })
},
onFinished: function(){
this.setData({ second: '重新获取验证码', codeEnable: false })
},
submitForm: function () {
if (this.data.loging || !this.data.customerInfo) {
return
}
if (util.isEmpty(this.data.form.mobile)) {
util.showToast('请输入客户手机号码')
return
}
if (util.isEmpty(this.data.form.captcha)) {
util.showToast('请输入验证码')
return
}
wx.showLoading({ title: '处理中', mask: true })
this.setData({ loging: true })
this.data.form.factorycustomerId = this.customerInfo.id
this.data.form.factoryId = app.userInfo.factoryId
bindCustomer(this.data.form).then(result => {
util.showBackToast('客户注册成功')
}).catch(error => {
wx.hideLoading()
util.showToast(error)
this.setData({ loging: false })
})
}
})

6
pages/client/registe/index.json

@ -0,0 +1,6 @@
{
"usingComponents": {
"van-button": "/components/button/index",
"van-count-down": "/components/count-down/index"
}
}

33
pages/client/registe/index.wxml

@ -0,0 +1,33 @@
<!--pages/home/password/index.wxml-->
<cu-custom bgColor="bg-white" isBack="{{true}}">
<view slot="content" style="color:black;font-size:18px">用户注册</view>
</cu-custom>
<view class="flex flex-center flex-column" style="width:100%;height:320rpx;margin-top:80rpx">
<image style="width:192rpx;height:192rpx" src="/assets/image/ygImg.png"></image>
<view class="text-xl" wx:if="{{customerInfo}}">{{customerInfo.name}}</view>
</view>
<view class="cu-list menu no-card sm-border margin-top">
<view class="cu-item">
<view class="flex content cu-item" style="font-size:28rpx">
<view style="min-width:170rpx">手机号:</view>
<input id="mobile" maxlength="11" disabled="true" type="number" value="{{form.mobile}}" placeholder="请输入客户手机号码" bindinput="bindForm"></input>
</view>
</view>
<view class="cu-item">
<view class="flex content cu-item" style="font-size:28rpx">
<view style="min-width:170rpx">验证码:</view>
<input id="captcha" maxlength="6" type="number" placeholder="请输入验证码" bindinput="bindForm"></input>
</view>
<van-button size="small" plain type="info" custom-style="width:220rpx" disabled="{{codeEnable}}" bind:click="fetchCode">
<van-count-down id="count-down" time="{{ 60000 }}" use-slot auto-start="{{false}}" bind:change="onChange" bind:finish="onFinished">
<text class="text-sm">{{second}}</text>
</van-count-down>
</van-button>
</view>
</view>
<view class="flex flex-direction" style="padding:80rpx 32rpx">
<van-button block type="info" loading="{{loging}}" loading-text="提交..." bind:click="submitForm">提交</van-button>
</view>

4
pages/client/registe/index.wxss

@ -0,0 +1,4 @@
/* pages/home/password/index.wxss */
page {
background-color: #fff;
}

2
pages/home/index/index.js

@ -74,7 +74,7 @@ Component({
}
},
orderList: function(){
wx.navigateTo({ url: '/pages/process/order-list/index' })
wx.navigateTo({ url: '/pages/process/agent-list/index' })
},
tipApply: function(){
wx.navigateTo({ url: '/pages/htmls/auths/index' })

48
pages/process/agent-list/index.js

@ -1,6 +1,5 @@
// pages/process/order-list/index.js
import Dialog from '../../../components/dialog/dialog'
import { getFactoryOrderList, cancelOrder } from "../../../api/saas"
import { getFactoryOrderList } from "../../../api/saas"
const event = require('../../../utils/event')
const util = require('../../../utils/util')
const app = getApp()
@ -12,10 +11,8 @@ Page({
tabIndex: 0,
tabList: [
{id: 0, name: '全部', badge: 0, status: '' },
{id: 1, name: '审核中', badge: 0, status: 1 },
{id: 2, name: '审核未通过', badge: 0, status: 2 },
{id: 4, name: '待付款', badge: 0, status: 4 },
{id: 5, name: '已结算', badge: 0, status: 5 },
{id: 1, name: '审核中', badge: 0, status: 41 },
{id: 4, name: '已付款', badge: 0, status: 42 }
// {id: 6, name: '已取消', badge: 0, status: 6 }
],
loading: true,
@ -33,22 +30,6 @@ Page({
},
// * 生命周期函数--监听页面加载
onLoad: function (options) {
if(options.status){
this.data.form.funcType = Number(options.status)
if(this.data.form.funcType == 1){
this.data.title = '待定价订单'
} else if(this.data.form.funcType == 2){
this.data.title = '过磅审核订单'
} else if(this.data.form.funcType == 3){
this.data.title = '待付款订单'
} else if(this.data.form.funcType == 4){
this.data.title = '已完成订单'
this.data.form.funcType = 6
this.data.form.status = 5
} else if(this.data.form.funcType == 5){
this.data.title = '已关闭订单'
}
}
event.on('OrderMessage', this, this.onEvent)
this.setData({ height: app.globalData.fragmentHeight - 90, title: this.data.title })
this.fetchOrderList()
@ -138,30 +119,9 @@ Page({
this.setData({ finished: true, requesting: false, loading: false })
}
},
cancelOrder: function(e){
Dialog.confirm({ title: '温馨提示', message: '确定取消该订单?' }).then(() => {
wx.showLoading({ title: '正在获取', mask: true })
cancelOrder(e.currentTarget.dataset.id).then(result => {
wx.hideLoading()
util.showToast('订单已经删除')
this.onRefreshList()
}).catch(err => {
wx.hideLoading()
util.showToast(err)
})
})
},
lookItem: function (e) {
var item = this.data.orderList[e.currentTarget.dataset.page][e.currentTarget.dataset.index]
if(item.status == 2 || item.status == 3 || item.status == 4 || item.status == 5){
wx.navigateTo({ url: `/pages/process/order-info/index?id=${item.id}` })
}
},
priceOrder: function(e){
wx.navigateTo({ url: '/pages/process/order-price/index?id=' + e.currentTarget.dataset.id })
},
checkOrder: function(e){
wx.navigateTo({ url: '/pages/process/order-info/index?id=' + e.currentTarget.dataset.id })
wx.navigateTo({ url: `/pages/process/order-info/index?id=${item.id}` })
},
onUnload: function(){
event.remove('OrderMessage', this)

22
pages/process/agent-list/index.wxml

@ -1,9 +1,9 @@
<!--pages/process/order-list/index.wxml-->
<cu-custom bgColor="bg-white" isBack="{{true}}">
<view slot="content">{{title}}</view>
<view slot="content">代付订单</view>
</cu-custom>
<van-tabs sticky active="{{tabIndex}}" color="#008AFF" bind:change="onTabChange" line-height="2px" swipe-threshold="4">
<van-tabs sticky active="{{tabIndex}}" color="#008AFF" bind:change="onTabChange" line-height="2px" swipe-threshold="5" ellipsis="{{false}}">
<van-tab wx:for="{{tabList}}" wx:key="index" title="{{item.name}}" title-style="color:{{tabIndex==index?'#008AFF':'#333333'}}"></van-tab>
</van-tabs>
@ -28,21 +28,11 @@
</view>
<view class="text-sm text-gray" style="margin-top:12rpx">毛重:{{item.totalWeight}}公斤</view>
</view>
<view class="flex flex-center" wx:if="{{item.status == 1}}" style="height: 88rpx">
<van-button plain type="default" custom-style="height:64rpx;width:132rpx" data-id="{{item.id}}"
bind:click="cancelOrder">取消</van-button>
<van-button plain type="info" custom-style="margin-left:24rpx;height:64rpx;width:132rpx" data-id="{{item.id}}"
bind:click="priceOrder">定价</van-button>
<view class="flex flex-center" wx:if="{{item.status == 41}}">
<view class="text-df" style="color:#028A00">代付中</view>
</view>
<view class="flex flex-center" wx:if="{{item.status == 3}}" style="height: 88rpx">
<van-button plain type="info" custom-style="height:64rpx;width:132rpx" data-id="{{item.id}}"
bind:click="checkOrder">审核</van-button>
</view>
<view class="flex flex-center" wx:elif="{{item.status ==2}}">
<view class="text-df text-black">待过皮重</view>
</view>
<view class="flex flex-center" wx:elif="{{item.status == 4}}">
<view class="text-df" style="color:#FA541C">待付款</view>
<view class="flex flex-center" wx:elif="{{item.status == 42}}">
<view class="text-df" style="color:#028A00">待结算</view>
</view>
<view class="flex flex-center" wx:elif="{{item.status == 5}}">
<view class="text-df" style="color:#028A00">已完成</view>

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

@ -13,11 +13,19 @@
<image style="height:42rpx;width:42rpx" src="/assets/image/icon_uncheck.png"></image>
<view class="text-white text-sg" style="margin-left:12rpx">待过磅审核</view>
</view>
<view class="flex flex-center info_status" style="justify-content: flex-start;" wx:if="{{form.status == 4}}">
<view class="flex flex-center info_status" style="justify-content: flex-start;" wx:elif="{{form.status == 4}}">
<image style="height:42rpx;width:42rpx" src="/assets/image/icon_payfor.png"></image>
<view class="text-white text-sg" style="margin-left:12rpx">待付款(请前往后台支付)</view>
</view>
<view class="flex flex-center info_status" style="justify-content: flex-start;" wx:if="{{form.status == 5}}">
<view class="flex flex-center info_status" style="justify-content: flex-start;" wx:elif="{{form.status == 41}}">
<image style="height:42rpx;width:42rpx" src="/assets/image/icon_payfor.png"></image>
<view class="text-white text-sg" style="margin-left:12rpx">代付审核中</view>
</view>
<view class="flex flex-center info_status" style="justify-content: flex-start;" wx:elif="{{form.status == 42}}">
<image style="height:42rpx;width:42rpx" src="/assets/image/icon_payfor.png"></image>
<view class="text-white text-sg" style="margin-left:12rpx">待结算(请前往后台支付)</view>
</view>
<view class="flex flex-center info_status" style="justify-content: flex-start;" wx:elif="{{form.status == 5}}">
<image style="height:42rpx;width:42rpx" src="/assets/image/icon_payfor.png"></image>
<view class="text-white text-sg" style="margin-left:12rpx">已完成</view>
</view>
@ -146,12 +154,13 @@
</van-cell>
</view>
<view style="height:{{16 + safeBottom}}rpx;"></view>
<view style="height:120rpx;" wx:if="{{form && (form.status == 3 || form.status == 4)}}"></view>
<view style="height:120rpx;" wx:if="{{form && (form.status == 3 || form.status == 4 || form.status == 42)}}"></view>
<view class="cu-bar bg-white foot" style="height:{{120 + safeBottom}}rpx;padding:0rpx 32rpx {{safeBottom}}rpx 32rpx;"
wx:if="{{form && (form.status == 3 || form.status == 4)}}">
wx:if="{{form && (form.status == 3 || form.status == 4 || form.status == 42)}}">
<van-button plain type="default" custom-style="height:88rpx;width:254rpx" bind:click="repeatOrder" wx:if="{{form.status == 3}}">重新过皮重</van-button>
<van-button type="info" custom-style="margin-left:32rpx;height:88rpx;width:400rpx" bind:click="checkOrder" wx:if="{{form.status == 3}}">通过审核</van-button>
<van-button type="info" custom-style="height:88rpx;width:686rpx" bind:click="paymentOrder" wx:if="{{form.status == 4}}">进行支付</van-button>
<van-button type="info" custom-style="height:88rpx;width:686rpx" bind:click="paymentOrder" wx:if="{{form.status == 42}}">客户结算</van-button>
</view>
<view class="booking-tool" style="bottom:300rpx" bindtap="printOrder" wx:if="{{form && (form.status == 3 || form.status == 4)}}">

13
pages/process/order-list/index.js

@ -5,6 +5,7 @@ const event = require('../../../utils/event')
const util = require('../../../utils/util')
const app = getApp()
//1-定价 2-待过皮重 3-待过榜审核 4-待付款 41-代付中 42-待结算 5-已完成 6-已关闭
Page({
// * 页面的初始数据
data: {
@ -14,10 +15,12 @@ Page({
{id: 0, name: '全部', badge: 0, status: '' },
{id: 1, name: '待定价', badge: 0, status: 1 },
{id: 2, name: '待过皮重', badge: 0, status: 2 },
{id: 3, name: '过磅审核', badge: 0, status: 3 },
{id: 3, name: '待过榜审核', badge: 0, status: 3 },
{id: 4, name: '待付款', badge: 0, status: 4 },
{id: 5, name: '已完成', badge: 0, status: 5 },
// {id: 6, name: '已取消', badge: 0, status: 6 }
{id: 5, name: '代付中', badge: 0, status: 41 },
{id: 6, name: '待结算', badge: 0, status: 42 },
{id: 7, name: '已完成', badge: 0, status: 5 },
// {id: 8, name: '已取消', badge: 0, status: 6 }
],
loading: true,
requesting: false,
@ -154,7 +157,9 @@ Page({
},
lookItem: function (e) {
var item = this.data.orderList[e.currentTarget.dataset.page][e.currentTarget.dataset.index]
if(item.status == 2 || item.status == 3 || item.status == 4 || item.status == 5){
if(item.status == 1){
wx.navigateTo({ url: `/pages/process/order-price/index?id=${item.id}` })
} else {
wx.navigateTo({ url: `/pages/process/order-info/index?id=${item.id}` })
}
},

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

@ -44,6 +44,12 @@
<view class="flex flex-center" wx:elif="{{item.status == 4}}">
<view class="text-df" style="color:#FA541C">待付款</view>
</view>
<view class="flex flex-center" wx:elif="{{item.status == 41}}">
<view class="text-df" style="color:#028A00">代付中</view>
</view>
<view class="flex flex-center" wx:elif="{{item.status == 42}}">
<view class="text-df" style="color:#028A00">待结算</view>
</view>
<view class="flex flex-center" wx:elif="{{item.status == 5}}">
<view class="text-df" style="color:#028A00">已完成</view>
</view>

60
pages/process/payment/index.js

@ -20,6 +20,7 @@ Page({
},
amount: 0,
orderList: null,
orderStatus: null,
params: {
settleType: '1',
ids: [],
@ -27,6 +28,7 @@ Page({
},
requesting: false,
popup: false,
show: false,
detail: null
},
/**
@ -65,7 +67,15 @@ Page({
this.data.params.bankCardNo = element.bankCardNo
}
}
this.setData({ height: app.globalData.fragmentHeight, safeBottom: app.globalData.safeBottom, orderList, amount, params: this.data.params })
this.data.orderStatus = orderList[0].status
this.setData({
height: app.globalData.fragmentHeight,
safeBottom: app.globalData.safeBottom,
orderList,
amount,
params: this.data.params,
orderStatus: this.data.orderStatus
})
} else {
this.setData({ height: app.globalData.fragmentHeight, safeBottom: app.globalData.safeBottom })
}
@ -107,6 +117,29 @@ Page({
bindInput: function (e) {
this.data.params[e.target.id] = e.detail.value
},
agentPayment: function(settleType){
if(Number(settleType) == 1 || Number(settleType) == 2){
settleType = 3
}
wx.showLoading({ title: '正在处理', mask: true })
this.data.requesting = true
this.data.params.settleType = settleType
paymentOrder(this.data.params).then(result => {
wx.hideLoading()
if(!util.isEmpty(result.message)){
util.showBackToast(result.message)
} else {
util.showBackToast('订单已支付')
}
const channel = this.getOpenerEventChannel()
channel.emit('onOrderChange', { what: 12, desc: 'PaymentOrder' })
event.emit('OrderMessage', { what: 12, desc: 'PaymentOrder' })
}).catch(err => {
wx.hideLoading()
this.data.requesting = false
util.showToast(err)
})
},
paymentOrder: function(){
if(this.data.requesting){
return
@ -116,29 +149,12 @@ Page({
return
}
Dialog.confirm({ title: '温馨提示', message: '订单已经付款,在此进行确认?' }).then(() => {
wx.showLoading({ title: '正在获取', mask: true })
this.data.requesting = true
this.data.params.settleType = Number(this.data.params.settleType)
paymentOrder(this.data.params).then(result => {
wx.hideLoading()
if(!util.isEmpty(result.message)){
util.showBackToast(result.message)
} else {
util.showBackToast('订单已支付')
}
const channel = this.getOpenerEventChannel()
channel.emit('onOrderChange', { what: 12, desc: 'PaymentOrder' })
event.emit('OrderMessage', { what: 12, desc: 'PaymentOrder' })
}).catch(err => {
wx.hideLoading()
this.data.requesting = false
util.showToast(err)
})
this.agentPayment(this.data.params.settleType)
}).catch(err => {
})
},
onPopupClose: function(){
this.setData({ popup: false })
this.setData({ popup: false, show: false})
},
viewImage: function (e) {
var imgList = []
@ -152,5 +168,9 @@ Page({
}
}
wx.previewImage({ urls: imgList, current: e.currentTarget.dataset.url })
},
registerCustomer: function(){
var cid = this.data.orderList[0].factoryCustomerId
wx.navigateTo({ url: '/pages/client/registe/index?id=' + cid })
}
})

47
pages/process/payment/index.wxml

@ -27,7 +27,7 @@
</text>
<van-radio slot="right-icon" name="2" disabled="{{!params.bankCardNo}}" />
</van-cell>
<van-cell title="使用千鸟代付" clickable data-name="3" bind:click="onTypeClick">
<van-cell title="使用千鸟代付" clickable data-name="3" bind:click="onTypeClick" wx:if="{{orderStatus == 4}}">
<van-radio slot="right-icon" name="3" />
</van-cell>
</van-cell-group>
@ -70,7 +70,9 @@
<view style="height:{{132 + safeBottom}}rpx;"></view>
<view class="cu-bar bg-white foot" style="height:{{132 + safeBottom}}rpx;padding:0rpx 32rpx {{safeBottom}}rpx 32rpx;" wx:if="{{orderList}}">
<van-button type="info" custom-style="height:88rpx;width:686rpx" disabled="{{amount==0}}" bind:click="paymentOrder">付款
<van-button plain type="default" custom-style="height:88rpx;width:254rpx" disabled="{{amount==0}}" bind:click="agentPayment" wx:if="{{orderStatus == 4}}">使用千鸟代付</van-button>
<van-button type="info" custom-style="margin-left:32rpx;height:88rpx;width:400rpx" disabled="{{amount==0}}" bind:click="paymentOrder" wx:if="{{orderStatus == 4}}">直接付款</van-button>
<van-button type="info" custom-style="height:88rpx;width:686rpx" disabled="{{amount==0}}" bind:click="paymentOrder" wx:if="{{orderStatus == 41}}">付款
</van-button>
</view>
@ -199,4 +201,43 @@
</scroll-view>
</van-popup>
<van-dialog id="van-dialog" />
<!-- <van-popup show="{{ show }}" z-index="66" custom-class="van-dialog" bind:close="onPopupClose">
<view class="van-dialog__message" style="padding: 24px 0px 0px 0px">
<text style="font-size:36rpx">温馨提示</text>
</view>
<view class="van-dialog__message" style="text-align: start">
<text class="van-dialog__message-text" user-select="true">该客户注册成为纸通宝用户,才可以使用千鸟代付,通过以下两种方式让您的客户注册成纸通宝用户。
1:让客户使用微信扫下面的二维码注册
2:使用客户的手机号码,获取千鸟互联的验证码进行注册
</text>
</view>
<view class="van-hairline--top">
<van-button size="large" class="van-dialog__button" custom-class="van-dialog__confirm" custom-style="color: #1989fa"
bind:click="onCancel">验证码注册</van-button>
</view>
<view class="van-hairline--top">
<van-button size="large" class="van-dialog__button" custom-class="van-dialog__confirm" custom-style="color: #1989fa"
bind:click="onCancel">扫二维码注册</van-button>
</view>
<view class="van-hairline--top">
<van-button size="large" class="van-dialog__button" custom-class="van-dialog__cancel"
custom-style="color: #323233" bind:click="onPopupClose">取消</van-button>
</view>
</van-popup> -->
<van-dialog id="van-dialog" />
<van-dialog use-slot title="温馨提示" show="{{ show }}" custom-style="top: 52% !important;" show-cancel-button confirm-button-text="验证码注册" bind:confirm="registerCustomer">
<view class="van-dialog__message" style="text-align: start;padding: 24px 24px 0px 24px">
<text class="van-dialog__message-text" user-select="true">该客户注册成为纸通宝用户,才可以使用千鸟代付,通过以下两种方式让您的客户注册成纸通宝用户。
1:让客户使用微信扫下面的二维码注册。
</text>
</view>
<view class="flex flex-center" style="padding: 12rpx 0rpx">
<image src="https://img.yzcdn.cn/1.jpg" style="height: 320rpx;width:320rpx"/>
</view>
<view class="van-dialog__message" style="text-align: start;padding: 0px 24px 24px 24px">
<text user-select="true">2:使用客户的手机号码,获取千鸟互联的验证码进行注册。</text>
</view>
</van-dialog>

48
pages/process/payment/index.wxss

@ -1,5 +1,7 @@
/* pages/process/payment/index.wxss */
.checkbox{
@import '../../../components/common/index.wxss';
.checkbox {
padding-top: 6rpx;
}
@ -7,8 +9,46 @@
margin-right: 24rpx;
}
.lable{
.lable {
padding: 32rpx 32rpx 24rpx 32rpx;
margin-top:18rpx;
border-bottom:1rpx solid #eee
margin-top: 18rpx;
border-bottom: 1rpx solid #eee
}
.van-dialog {
top: 50% !important;
overflow: hidden;
width: 320px;
width: var(--dialog-width, 320px);
font-size: 16px;
font-size: var(--dialog-font-size, 16px);
border-radius: 16rpx;
border-radius: var(--dialog-border-radius, 16rpx);
background-color: #fff;
background-color: var(--dialog-background-color, #fff)
}
.van-dialog__message {
overflow-y: auto;
text-align: center;
-webkit-overflow-scrolling: touch;
font-size: 14px;
font-size: var(--dialog-message-font-size, 14px);
line-height: 20px;
line-height: var(--dialog-message-line-height, 20px);
max-height: 60vh;
max-height: var(--dialog-message-max-height, 60vh);
padding: 24px;
padding: var(--dialog-message-padding, 24px)
}
van-dialog__button {
-webkit-flex: 1;
flex: 1
}
.van-dialog__cancel,
.van-dialog__confirm {
border: 0 !important;
border-radius: 0px;
}

2
project.config.json

@ -14,7 +14,7 @@
"coverView": true,
"nodeModules": true,
"autoAudits": false,
"showShadowRootInWxmlPanel": true,
"showShadowRootInWxmlPanel": false,
"scopeDataCheck": false,
"uglifyFileName": true,
"checkInvalidKey": true,

Loading…
Cancel
Save