mcrm-mobile 1.0.5 → 1.0.8

package/es/address-picker/index.css

@@ -258,32 +258,9 @@
   color: #fff;
   border-color: #fff;
 }
-.mm-address-picker-mask {
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: 10000;
-  width: 100%;
-  height: 100%;
-  background: rgba(0, 0, 0, 0.6);
-}
 .mm-address-picker-content {
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  width: 100%;
-  z-index: 10001;
   background-color: #fff;
 }
-.mm-address-picker-content-title {
-  padding: 10px 15px;
-  color: #999999;
-  font-size: 14px;
-  text-align: center;
-}
-.mm-address-picker-content-close {
-  float: right;
-}
 .mm-address-picker-content-tab {
   border-bottom: 1px solid #999999;
 }

package/es/address-picker/index.js

@@ -1,7 +1,9 @@
 import province from "../data/province.json";
 import city from "../data/city.json";
 import county from "../data/county.json";
-import create from "../utils/create";
+import create from "../utils/create"; // Component
+
+import ActionSheet from "../action-sheet";
 export default create({
   render: function render() {
     var _vm = this;
@@ -10,38 +12,26 @@ export default create({
 
     var _c = _vm._self._c || _h;
 
-    return _vm.isShow ? _c('div', {
+    return _c('action-sheet', {
       class: _vm.b(),
-      on: {
-        "click": _vm.hide
+      attrs: {
+        "title": "选择地址"
+      },
+      model: {
+        value: _vm.isShow,
+        callback: function callback($$v) {
+          _vm.isShow = $$v;
+        },
+        expression: "isShow"
       }
     }, [_c('div', {
-      class: _vm.b('mask'),
-      on: {
-        "touchmove": function touchmove($event) {
-          $event.preventDefault();
-        }
-      }
-    }), _c('div', {
       class: _vm.b('content'),
       on: {
         "click": function click($event) {
           $event.stopPropagation();
         }
       }
-    }, [_c('p', {
-      class: _vm.b('content-title')
-    }, [_vm._v("\n      请选择\n      "), _c('icon', {
-      class: _vm.b('content-close'),
-      attrs: {
-        "name": "close",
-        "color": "#707070",
-        "size": "30"
-      },
-      on: {
-        "click": _vm.hide
-      }
-    })], 1), _c('ul', {
+    }, [_c('ul', {
       class: _vm.b('content-tab', {
         landscape: _vm.landscape
       })
@@ -74,9 +64,12 @@ export default create({
           selected: item.name === _vm.tabList[_vm.tabIndex].name
         }
       }, [_vm._v("\n          " + _vm._s(item.name) + "\n        ")])]);
-    }), 0)])]) : _vm._e();
+    }), 0)])]);
   },
   name: "address-picker",
+  components: {
+    ActionSheet: ActionSheet
+  },
   props: {
     value: Boolean,
     provinceName: {

package/es/address-picker/index.less

@@ -1,35 +1,9 @@
 @import "../style/theme";
 
 .mm-address-picker {
-  &-mask {
-    position: absolute;
-    top: 0;
-    left: 0;
-    z-index: 10000;
-    width: 100%;
-    height: 100%;
-    background: @cover-background;
-  }
-
   &-content {
-    position: absolute;
-    bottom: 0;
-    left: 0;
-    width: 100%;
-    z-index: 10001;
     background-color: @address-content-background;
 
-    &-title {
-      padding: @content-padding;
-      color: @gray-6;
-      font-size: @font-size-md;
-      text-align: center;
-    }
-
-    &-close {
-      float: right;
-    }
-
     &-tab {
       border-bottom: 1px solid @gray-6;
 

package/es/address-picker/style/index.js

@@ -4,4 +4,7 @@ import '../../info/index.css';
 import '../../icon/index.css';
 import '../../cell/index.css';
 import '../../loading/index.css';
+import '../../popup/index.css';
+import '../../overlay/index.css';
+import '../../action-sheet/index.css';
 import '../index.css';

package/es/address-picker/style/less.js

@@ -4,4 +4,7 @@ import '../../info/index.less';
 import '../../icon/index.less';
 import '../../cell/index.less';
 import '../../loading/index.less';
+import '../../popup/index.less';
+import '../../overlay/index.less';
+import '../../action-sheet/index.less';
 import '../index.less';

package/es/cell-group/index.js

@@ -9,7 +9,7 @@ export default create({
 
     return _c('div', {
       class: [_vm.b(), {
-        'mm-hairline-top-bottom': _vm.border
+        'mm-hairline--top-bottom': _vm.border
       }]
     }, [_vm.title ? _c('div', {
       class: _vm.b('title')

package/es/circle/index.js

@@ -5,8 +5,8 @@ import { raf, cancel } from "../utils/dom/raf";
 var PERIMETER = 3140;
 var uid = 0;
 
-function format(rate) {
-  return Math.min(Math.max(rate, 0), 100);
+function format(rate, total) {
+  return Math.min(Math.max(rate, 0), total);
 }
 
 function getPath(clockwise, viewBoxSize) {
@@ -94,6 +94,10 @@ export default create({
     clockwise: {
       type: Boolean,
       default: true
+    },
+    total: {
+      type: [Number, String],
+      default: 100
     }
   },
   beforeCreate: function beforeCreate() {
@@ -126,7 +130,7 @@ export default create({
       };
     },
     hoverStyle: function hoverStyle() {
-      var offset = PERIMETER * this.value / 100;
+      var offset = PERIMETER * this.value / this.total;
       return {
         stroke: "" + this.color,
         strokeWidth: +this.strokeWidth + 1 + "px",
@@ -143,7 +147,7 @@ export default create({
       handler: function handler(rate) {
         this.startTime = Date.now();
         this.startRate = this.value;
-        this.endRate = format(rate);
+        this.endRate = format(rate, this.total);
         this.increase = this.endRate > this.startRate;
         this.duration = Math.abs((this.startRate - this.endRate) * 1000 / this.speed);
 
@@ -162,7 +166,7 @@ export default create({
       var now = Date.now();
       var progress = Math.min((now - this.startTime) / this.duration, 1);
       var rate = progress * (this.endRate - this.startRate) + this.startRate;
-      this.$emit("input", format(parseFloat(rate.toFixed(1))));
+      this.$emit("input", format(parseFloat(rate.toFixed(1)), this.total));
 
       if (this.increase ? rate < this.endRate : rate > this.endRate) {
         this.rafId = raf(this.animate);

package/es/collapse/index.js

@@ -10,7 +10,7 @@ export default create({
 
     return _c('div', {
       class: [_vm.b(), {
-        'mm-hairline-top-bottom': _vm.border
+        'mm-hairline--top-bottom': _vm.border
       }]
     }, [_vm._t("default")], 2);
   },

package/es/collapse-item/index.js

@@ -14,7 +14,7 @@ export default create({
 
     return _c('div', {
       class: [_vm.b(), {
-        'mm-hairline-top': _vm.index
+        'mm-hairline--top': _vm.index
       }]
     }, [_c('cell', _vm._b({
       class: _vm.b('title', {