From c8c284b0ee05a60d38b471ae56937080288e308a Mon Sep 17 00:00:00 2001 From: xpz2018 <107107461@qq.com> Date: Wed, 31 Mar 2021 15:34:05 +0800 Subject: [PATCH] no message --- components/switch/index.wxss | 2 +- pages/process/index/index.js | 9 +++++++-- pages/process/order-price/index.json | 1 + pages/process/order-price/index.wxml | 5 +++-- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/components/switch/index.wxss b/components/switch/index.wxss index e32a72a..f454ae5 100644 --- a/components/switch/index.wxss +++ b/components/switch/index.wxss @@ -1 +1 @@ -@import '../common/index.wxss';.van-switch{position:relative;display:inline-block;box-sizing:initial;width:2em;width:var(--switch-width,2em);height:1em;height:var(--switch-height,1em);background-color:#fff;background-color:var(--switch-background-color,#fff);border:1px solid rgba(0,0,0,.1);border:var(--switch-border,1px solid rgba(0,0,0,.1));border-radius:1em;border-radius:var(--switch-node-size,1em);transition:background-color .3s;transition:background-color var(--switch-transition-duration,.3s)}.van-switch__node{position:absolute;top:0;left:0;border-radius:100%;z-index:1;z-index:var(--switch-node-z-index,1);width:1em;width:var(--switch-node-size,1em);height:1em;height:var(--switch-node-size,1em);background-color:#fff;background-color:var(--switch-node-background-color,#fff);box-shadow:0 3px 1px 0 rgba(0,0,0,.05),0 2px 2px 0 rgba(0,0,0,.1),0 3px 3px 0 rgba(0,0,0,.05);box-shadow:var(--switch-node-box-shadow,0 3px 1px 0 rgba(0,0,0,.05),0 2px 2px 0 rgba(0,0,0,.1),0 3px 3px 0 rgba(0,0,0,.05));transition:-webkit-transform .3s cubic-bezier(.3,1.05,.4,1.05);transition:transform .3s cubic-bezier(.3,1.05,.4,1.05);transition:transform .3s cubic-bezier(.3,1.05,.4,1.05),-webkit-transform .3s cubic-bezier(.3,1.05,.4,1.05);transition:-webkit-transform var(--switch-transition-duration,.3s) cubic-bezier(.3,1.05,.4,1.05);transition:transform var(--switch-transition-duration,.3s) cubic-bezier(.3,1.05,.4,1.05);transition:transform var(--switch-transition-duration,.3s) cubic-bezier(.3,1.05,.4,1.05),-webkit-transform var(--switch-transition-duration,.3s) cubic-bezier(.3,1.05,.4,1.05)}.van-switch__loading{position:absolute!important;top:25%;left:25%;width:50%;height:50%}.van-switch--on{background-color:#1989fa;background-color:var(--switch-on-background-color,#1989fa)}.van-switch--on .van-switch__node{-webkit-transform:translateX(1em);transform:translateX(1em);-webkit-transform:translateX(calc(var(--switch-width, 2em) - var(--switch-node-size, 1em)));transform:translateX(calc(var(--switch-width, 2em) - var(--switch-node-size, 1em)))}.van-switch--disabled{opacity:.4;opacity:var(--switch-disabled-opacity,.4)} \ No newline at end of file +@import '../common/index.wxss';.van-switch{position:relative;display:block;box-sizing:initial;width:2em;width:var(--switch-width,2em);height:1em;height:var(--switch-height,1em);background-color:#fff;background-color:var(--switch-background-color,#fff);border:1px solid rgba(0,0,0,.1);border:var(--switch-border,1px solid rgba(0,0,0,.1));border-radius:1em;border-radius:var(--switch-node-size,1em);transition:background-color .3s;transition:background-color var(--switch-transition-duration,.3s)}.van-switch__node{position:absolute;top:0;left:0;border-radius:100%;z-index:1;z-index:var(--switch-node-z-index,1);width:1em;width:var(--switch-node-size,1em);height:1em;height:var(--switch-node-size,1em);background-color:#fff;background-color:var(--switch-node-background-color,#fff);box-shadow:0 3px 1px 0 rgba(0,0,0,.05),0 2px 2px 0 rgba(0,0,0,.1),0 3px 3px 0 rgba(0,0,0,.05);box-shadow:var(--switch-node-box-shadow,0 3px 1px 0 rgba(0,0,0,.05),0 2px 2px 0 rgba(0,0,0,.1),0 3px 3px 0 rgba(0,0,0,.05));transition:-webkit-transform .3s cubic-bezier(.3,1.05,.4,1.05);transition:transform .3s cubic-bezier(.3,1.05,.4,1.05);transition:transform .3s cubic-bezier(.3,1.05,.4,1.05),-webkit-transform .3s cubic-bezier(.3,1.05,.4,1.05);transition:-webkit-transform var(--switch-transition-duration,.3s) cubic-bezier(.3,1.05,.4,1.05);transition:transform var(--switch-transition-duration,.3s) cubic-bezier(.3,1.05,.4,1.05);transition:transform var(--switch-transition-duration,.3s) cubic-bezier(.3,1.05,.4,1.05),-webkit-transform var(--switch-transition-duration,.3s) cubic-bezier(.3,1.05,.4,1.05)}.van-switch__loading{position:absolute!important;top:25%;left:25%;width:50%;height:50%}.van-switch--on{background-color:#1989fa;background-color:var(--switch-on-background-color,#1989fa)}.van-switch--on .van-switch__node{-webkit-transform:translateX(1em);transform:translateX(1em);-webkit-transform:translateX(calc(var(--switch-width, 2em) - var(--switch-node-size, 1em)));transform:translateX(calc(var(--switch-width, 2em) - var(--switch-node-size, 1em)))}.van-switch--disabled{opacity:.4;opacity:var(--switch-disabled-opacity,.4)} \ No newline at end of file diff --git a/pages/process/index/index.js b/pages/process/index/index.js index 2a5c175..5c584e8 100644 --- a/pages/process/index/index.js +++ b/pages/process/index/index.js @@ -1,6 +1,6 @@ // pages/index/index.js import Dialog from '../../../components/dialog/dialog' -import { getStatisticsInfo } from "../../../api/saas" +import { getStatisticsInfo, getUserInfo } from "../../../api/saas" const event = require('../../../utils/event') const app = getApp() @@ -107,7 +107,12 @@ Component({ }).catch(err => { console.log(err) }) - + getUserInfo().then(result => { + app.userInfo = result.data + this.setData({ userInfo: app.userInfo }) + }).catch(err => { + console.log(err) + }) }, showSheet: function(){ // this.setData({ show: true }) diff --git a/pages/process/order-price/index.json b/pages/process/order-price/index.json index 9956fd2..e878294 100644 --- a/pages/process/order-price/index.json +++ b/pages/process/order-price/index.json @@ -10,6 +10,7 @@ "van-popup": "/components/popup/index", "van-dialog": "/components/dialog/index", "van-field": "/components/field/index", + "van-switch": "/components/switch/index", "vehicle-keyboard": "/components/vehicle-keyboard/index" } } \ No newline at end of file diff --git a/pages/process/order-price/index.wxml b/pages/process/order-price/index.wxml index f870413..91fce9e 100644 --- a/pages/process/order-price/index.wxml +++ b/pages/process/order-price/index.wxml @@ -63,8 +63,9 @@ 无皮过磅 - - {{ form.isWithoutTare ? '是' : '否'}} + + + {{ form.isWithoutTare ? '是' : '否'}}