diff --git a/app.wxss b/app.wxss
index d0b2e7e..c965b64 100644
--- a/app.wxss
+++ b/app.wxss
@@ -1997,6 +1997,7 @@ page {
.navigatorBar {
position: relative;
letter-spacing:1px;
+ opacity: 0;
/* z-index: 999; */
/* background-color: var(--color-ysd); */
padding-bottom: 8px;
diff --git a/miniprogram_npm/@miniprogram-component-plus/sticky/miniprogram_dist/index.js b/miniprogram_npm/@miniprogram-component-plus/sticky/miniprogram_dist/index.js
deleted file mode 100644
index f3f5acb..0000000
--- a/miniprogram_npm/@miniprogram-component-plus/sticky/miniprogram_dist/index.js
+++ /dev/null
@@ -1,290 +0,0 @@
-module.exports =
-/******/ (function(modules) { // webpackBootstrap
-/******/ // The module cache
-/******/ var installedModules = {};
-/******/
-/******/ // The require function
-/******/ function __webpack_require__(moduleId) {
-/******/
-/******/ // Check if module is in cache
-/******/ if(installedModules[moduleId]) {
-/******/ return installedModules[moduleId].exports;
-/******/ }
-/******/ // Create a new module (and put it into the cache)
-/******/ var module = installedModules[moduleId] = {
-/******/ i: moduleId,
-/******/ l: false,
-/******/ exports: {}
-/******/ };
-/******/
-/******/ // Execute the module function
-/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
-/******/
-/******/ // Flag the module as loaded
-/******/ module.l = true;
-/******/
-/******/ // Return the exports of the module
-/******/ return module.exports;
-/******/ }
-/******/
-/******/
-/******/ // expose the modules object (__webpack_modules__)
-/******/ __webpack_require__.m = modules;
-/******/
-/******/ // expose the module cache
-/******/ __webpack_require__.c = installedModules;
-/******/
-/******/ // define getter function for harmony exports
-/******/ __webpack_require__.d = function(exports, name, getter) {
-/******/ if(!__webpack_require__.o(exports, name)) {
-/******/ Object.defineProperty(exports, name, { enumerable: true, get: getter });
-/******/ }
-/******/ };
-/******/
-/******/ // define __esModule on exports
-/******/ __webpack_require__.r = function(exports) {
-/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
-/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-/******/ }
-/******/ Object.defineProperty(exports, '__esModule', { value: true });
-/******/ };
-/******/
-/******/ // create a fake namespace object
-/******/ // mode & 1: value is a module id, require it
-/******/ // mode & 2: merge all properties of value into the ns
-/******/ // mode & 4: return value when already ns object
-/******/ // mode & 8|1: behave like require
-/******/ __webpack_require__.t = function(value, mode) {
-/******/ if(mode & 1) value = __webpack_require__(value);
-/******/ if(mode & 8) return value;
-/******/ if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
-/******/ var ns = Object.create(null);
-/******/ __webpack_require__.r(ns);
-/******/ Object.defineProperty(ns, 'default', { enumerable: true, value: value });
-/******/ if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
-/******/ return ns;
-/******/ };
-/******/
-/******/ // getDefaultExport function for compatibility with non-harmony modules
-/******/ __webpack_require__.n = function(module) {
-/******/ var getter = module && module.__esModule ?
-/******/ function getDefault() { return module['default']; } :
-/******/ function getModuleExports() { return module; };
-/******/ __webpack_require__.d(getter, 'a', getter);
-/******/ return getter;
-/******/ };
-/******/
-/******/ // Object.prototype.hasOwnProperty.call
-/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
-/******/
-/******/ // __webpack_public_path__
-/******/ __webpack_require__.p = "";
-/******/
-/******/
-/******/ // Load entry module and return exports
-/******/ return __webpack_require__(__webpack_require__.s = 9);
-/******/ })
-/************************************************************************/
-/******/ ({
-
-/***/ 10:
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-module.exports = Behavior({
- methods: {
- getRect: function getRect(selector) {
- var _this = this;
-
- return new Promise(function (resolve, reject) {
- _this.createSelectorQuery().select(selector).boundingClientRect(function (rect) {
- if (rect) {
- resolve(rect);
- } else {
- reject(new Error("can not find selector: " + selector));
- }
- }).exec();
- });
- },
- getAllRects: function getAllRects(selector) {
- var _this2 = this;
-
- return new Promise(function (resolve, reject) {
- _this2.createSelectorQuery().selectAll(selector).boundingClientRect(function (rects) {
- if (rects && rects.lenght > 0) {
- resolve(rects);
- } else {
- reject(new Error("can not find selector: " + selector));
- }
- }).exec();
- });
- }
- }
-});
-
-/***/ }),
-
-/***/ 9:
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var selectQuery = __webpack_require__(10);
-var target = '.weui-sticky';
-Component({
- options: {
- addGlobalClass: true,
- pureDataPattern: /^_/,
- multipleSlots: true
- },
- behaviors: [selectQuery],
- properties: {
- offsetTop: {
- type: Number,
- value: 0
- },
- zIndex: {
- type: Number,
- value: 99
- },
- disabled: {
- type: Boolean,
- value: false
- },
- container: {
- type: null
- }
- },
- data: {
- fixed: false,
- height: 0,
- _attached: false,
- _containerHeight: 0
- },
- observers: {
- disabled: function disabled(newVal) {
- if (!this.data._attached) return;
- newVal ? this.disconnectObserver() : this.initObserver();
- },
- container: function container(newVal) {
- if (typeof newVal !== 'function' || !this.data.height) return;
- this.observerContainer();
- },
- offsetTop: function offsetTop(newVal) {
- if (typeof newVal !== 'number' || !this.data._attached) return;
- this.initObserver();
- }
- },
- lifetimes: {
- attached: function attached() {
- this.data._attached = true;
- if (!this.data.disabled) this.initObserver();
- },
- detached: function detached() {
- this.data._attached = false;
- this.disconnectObserver();
- }
- },
- methods: {
- getContainerRect: function getContainerRect() {
- var nodesRef = this.data.container();
- return new Promise(function (resolve) {
- return nodesRef.boundingClientRect(resolve).exec();
- });
- },
- initObserver: function initObserver() {
- var _this = this;
-
- this.disconnectObserver();
- this.getRect(target).then(function (rect) {
- _this.setData({
- height: rect.height
- });
- _this.observerContent();
- _this.observerContainer();
- });
- },
- disconnectObserver: function disconnectObserver(observerName) {
- if (observerName) {
- var observer = this[observerName];
- observer && observer.disconnect();
- } else {
- this.contentObserver && this.contentObserver.disconnect();
- this.containerObserver && this.containerObserver.disconnect();
- }
- },
- observerContent: function observerContent() {
- var _this2 = this;
-
- var offsetTop = this.data.offsetTop;
-
- this.disconnectObserver('contentObserver');
- var contentObserver = this.createIntersectionObserver({
- thresholds: [1],
- initialRatio: 1
- });
- contentObserver.relativeToViewport({
- top: -offsetTop
- });
- contentObserver.observe(target, function (res) {
- if (_this2.data.disabled) return;
- _this2.setFixed(res.boundingClientRect.top);
- });
- this.contentObserver = contentObserver;
- },
- observerContainer: function observerContainer() {
- var _this3 = this;
-
- var _data = this.data,
- container = _data.container,
- height = _data.height,
- offsetTop = _data.offsetTop;
-
- if (typeof container !== 'function') return;
- this.disconnectObserver('containerObserver');
- this.getContainerRect().then(function (rect) {
- _this3.getRect(target).then(function (contentRect) {
- var _contentTop = contentRect.top;
- var _containerTop = rect.top;
- var _containerHeight = rect.height;
- var _relativeTop = _contentTop - _containerTop;
- var containerObserver = _this3.createIntersectionObserver({
- thresholds: [1],
- initialRatio: 1
- });
- containerObserver.relativeToViewport({
- top: _containerHeight - height - offsetTop - _relativeTop
- });
- containerObserver.observe(target, function (res) {
- if (_this3.data.disabled) return;
- _this3.setFixed(res.boundingClientRect.top);
- });
- _this3.data._relativeTop = _relativeTop;
- _this3.data._containerHeight = _containerHeight;
- _this3.containerObserver = containerObserver;
- });
- });
- },
- setFixed: function setFixed(top) {
- var _data2 = this.data,
- height = _data2.height,
- _containerHeight = _data2._containerHeight,
- _relativeTop = _data2._relativeTop,
- offsetTop = _data2.offsetTop;
-
- var fixed = _containerHeight && height ? top >= height + offsetTop + _relativeTop - _containerHeight && top < offsetTop : top < offsetTop;
- this.triggerEvent('scroll', {
- scrollTop: top,
- isFixed: fixed
- });
- this.setData({ fixed: fixed });
- }
- }
-});
-
-/***/ })
-
-/******/ });
\ No newline at end of file
diff --git a/miniprogram_npm/@miniprogram-component-plus/sticky/miniprogram_dist/index.json b/miniprogram_npm/@miniprogram-component-plus/sticky/miniprogram_dist/index.json
deleted file mode 100644
index 7e37c03..0000000
--- a/miniprogram_npm/@miniprogram-component-plus/sticky/miniprogram_dist/index.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "component": true,
- "usingComponents": {}
-}
\ No newline at end of file
diff --git a/miniprogram_npm/@miniprogram-component-plus/sticky/miniprogram_dist/index.wxml b/miniprogram_npm/@miniprogram-component-plus/sticky/miniprogram_dist/index.wxml
deleted file mode 100644
index 7a5d240..0000000
--- a/miniprogram_npm/@miniprogram-component-plus/sticky/miniprogram_dist/index.wxml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/miniprogram_npm/@miniprogram-component-plus/sticky/miniprogram_dist/index.wxs b/miniprogram_npm/@miniprogram-component-plus/sticky/miniprogram_dist/index.wxs
deleted file mode 100644
index 266810f..0000000
--- a/miniprogram_npm/@miniprogram-component-plus/sticky/miniprogram_dist/index.wxs
+++ /dev/null
@@ -1,20 +0,0 @@
-
-/* eslint-disable */
-function wrapStyle(data) {
- if (data.fixed) {
- return 'top: ' + data.offsetTop + 'px;'
- }
- return ''
-}
-
-function containerStyle(data) {
- if (data.fixed) {
- return 'height: ' + data.height + 'px; z-index: ' + data.zIndex + ';'
- }
- return ''
-}
-
-module.exports = {
- wrapStyle: wrapStyle,
- containerStyle: containerStyle
-}
diff --git a/miniprogram_npm/@miniprogram-component-plus/sticky/miniprogram_dist/index.wxss b/miniprogram_npm/@miniprogram-component-plus/sticky/miniprogram_dist/index.wxss
deleted file mode 100644
index 8821fcd..0000000
--- a/miniprogram_npm/@miniprogram-component-plus/sticky/miniprogram_dist/index.wxss
+++ /dev/null
@@ -1 +0,0 @@
-.weui-sticky{position:relative}.weui-sticky__fixed{position:fixed;left:0;top:0}
\ No newline at end of file
diff --git a/miniprogram_npm/@miniprogram-component-plus/sticky/package.json b/miniprogram_npm/@miniprogram-component-plus/sticky/package.json
deleted file mode 100644
index 51af927..0000000
--- a/miniprogram_npm/@miniprogram-component-plus/sticky/package.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "name": "@miniprogram-component-plus/sticky",
- "version": "1.0.1",
- "description": "",
- "main": "miniprogram_dist/index.js",
- "scripts": {
- "test": "echo \"Error: no test specified\" && exit 1"
- },
- "keywords": [
- "sticky",
- "miniprogram"
- ],
- "author": "sanfordsun",
- "license": "ISC"
-}
diff --git a/miniprogram_npm/@miniprogram-component-plus/tabs/index.js b/miniprogram_npm/@miniprogram-component-plus/tabs/index.js
deleted file mode 100644
index cfb261f..0000000
--- a/miniprogram_npm/@miniprogram-component-plus/tabs/index.js
+++ /dev/null
@@ -1,148 +0,0 @@
-module.exports =
-/******/ (function(modules) { // webpackBootstrap
-/******/ // The module cache
-/******/ var installedModules = {};
-/******/
-/******/ // The require function
-/******/ function __webpack_require__(moduleId) {
-/******/
-/******/ // Check if module is in cache
-/******/ if(installedModules[moduleId]) {
-/******/ return installedModules[moduleId].exports;
-/******/ }
-/******/ // Create a new module (and put it into the cache)
-/******/ var module = installedModules[moduleId] = {
-/******/ i: moduleId,
-/******/ l: false,
-/******/ exports: {}
-/******/ };
-/******/
-/******/ // Execute the module function
-/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
-/******/
-/******/ // Flag the module as loaded
-/******/ module.l = true;
-/******/
-/******/ // Return the exports of the module
-/******/ return module.exports;
-/******/ }
-/******/
-/******/
-/******/ // expose the modules object (__webpack_modules__)
-/******/ __webpack_require__.m = modules;
-/******/
-/******/ // expose the module cache
-/******/ __webpack_require__.c = installedModules;
-/******/
-/******/ // define getter function for harmony exports
-/******/ __webpack_require__.d = function(exports, name, getter) {
-/******/ if(!__webpack_require__.o(exports, name)) {
-/******/ Object.defineProperty(exports, name, { enumerable: true, get: getter });
-/******/ }
-/******/ };
-/******/
-/******/ // define __esModule on exports
-/******/ __webpack_require__.r = function(exports) {
-/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
-/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-/******/ }
-/******/ Object.defineProperty(exports, '__esModule', { value: true });
-/******/ };
-/******/
-/******/ // create a fake namespace object
-/******/ // mode & 1: value is a module id, require it
-/******/ // mode & 2: merge all properties of value into the ns
-/******/ // mode & 4: return value when already ns object
-/******/ // mode & 8|1: behave like require
-/******/ __webpack_require__.t = function(value, mode) {
-/******/ if(mode & 1) value = __webpack_require__(value);
-/******/ if(mode & 8) return value;
-/******/ if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
-/******/ var ns = Object.create(null);
-/******/ __webpack_require__.r(ns);
-/******/ Object.defineProperty(ns, 'default', { enumerable: true, value: value });
-/******/ if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
-/******/ return ns;
-/******/ };
-/******/
-/******/ // getDefaultExport function for compatibility with non-harmony modules
-/******/ __webpack_require__.n = function(module) {
-/******/ var getter = module && module.__esModule ?
-/******/ function getDefault() { return module['default']; } :
-/******/ function getModuleExports() { return module; };
-/******/ __webpack_require__.d(getter, 'a', getter);
-/******/ return getter;
-/******/ };
-/******/
-/******/ // Object.prototype.hasOwnProperty.call
-/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
-/******/
-/******/ // __webpack_public_path__
-/******/ __webpack_require__.p = "";
-/******/
-/******/
-/******/ // Load entry module and return exports
-/******/ return __webpack_require__(__webpack_require__.s = 5);
-/******/ })
-/************************************************************************/
-/******/ ({
-
-/***/ 5:
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Component({
- options: {
- addGlobalClass: true,
- pureDataPattern: /^_/,
- multipleSlots: true
- },
- properties: {
- tabs: { type: Array, value: [] },
- tabClass: { type: String, value: '' },
- swiperClass: { type: String, value: '' },
- activeClass: { type: String, value: '' },
- tabUnderlineColor: { type: String, value: '#07c160' },
- tabActiveTextColor: { type: String, value: '#000000' },
- tabInactiveTextColor: { type: String, value: '#000000' },
- tabBackgroundColor: { type: String, value: '#ffffff' },
- activeTab: { type: Number, value: 0 },
- swipeable: { type: Boolean, value: true },
- animation: { type: Boolean, value: true },
- duration: { type: Number, value: 500 }
- },
- data: {
- currentView: 0
- },
- observers: {
- activeTab: function activeTab(_activeTab) {
- var len = this.data.tabs.length;
- if (len === 0) return;
- var currentView = _activeTab - 1;
- if (currentView < 0) currentView = 0;
- if (currentView > len - 1) currentView = len - 1;
- this.setData({ currentView: currentView });
- }
- },
- lifetimes: {
- created: function created() {}
- },
- methods: {
- handleTabClick: function handleTabClick(e) {
- var index = e.currentTarget.dataset.index;
- this.setData({ activeTab: index });
- this.triggerEvent('tabclick', { index: index });
- },
- handleSwiperChange: function handleSwiperChange(e) {
- var index = e.detail.current;
- this.setData({ activeTab: index });
- this.triggerEvent('change', { index: index });
- }
- }
-});
-
-/***/ })
-
-/******/ });
\ No newline at end of file
diff --git a/miniprogram_npm/@miniprogram-component-plus/tabs/index.json b/miniprogram_npm/@miniprogram-component-plus/tabs/index.json
deleted file mode 100644
index b18bd46..0000000
--- a/miniprogram_npm/@miniprogram-component-plus/tabs/index.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "component": true,
- "usingComponents": {}
-}
\ No newline at end of file
diff --git a/miniprogram_npm/@miniprogram-component-plus/tabs/index.wxml b/miniprogram_npm/@miniprogram-component-plus/tabs/index.wxml
deleted file mode 100644
index ddb213c..0000000
--- a/miniprogram_npm/@miniprogram-component-plus/tabs/index.wxml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
- {{item.title}}
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/miniprogram_npm/@miniprogram-component-plus/tabs/index.wxss b/miniprogram_npm/@miniprogram-component-plus/tabs/index.wxss
deleted file mode 100644
index a6982e7..0000000
--- a/miniprogram_npm/@miniprogram-component-plus/tabs/index.wxss
+++ /dev/null
@@ -1 +0,0 @@
-.weui-tabs{width:100%}.weui-tabs-bar__wrp{width:100%;background:#fff}.weui-tabs-bar__content{width:100%;white-space:nowrap}.weui-tabs-bar__item{display:inline-block}.weui-tabs-bar__title{display:inline-block;border-bottom-width:2px;border-bottom-style:solid;border-bottom-color:transparent}
\ No newline at end of file
diff --git a/miniprogram_npm/wxml-to-canvas/index.js b/miniprogram_npm/wxml-to-canvas/index.js
deleted file mode 100644
index 2a4f21e..0000000
--- a/miniprogram_npm/wxml-to-canvas/index.js
+++ /dev/null
@@ -1,779 +0,0 @@
-(function webpackUniversalModuleDefinition(root, factory) {
- if(typeof exports === 'object' && typeof module === 'object')
- module.exports = factory();
- else if(typeof define === 'function' && define.amd)
- define([], factory);
- else {
- var a = factory();
- for(var i in a) (typeof exports === 'object' ? exports : root)[i] = a[i];
- }
-})(window, function() {
-return /******/ (function(modules) { // webpackBootstrap
-/******/ // The module cache
-/******/ var installedModules = {};
-/******/
-/******/ // The require function
-/******/ function __webpack_require__(moduleId) {
-/******/
-/******/ // Check if module is in cache
-/******/ if(installedModules[moduleId]) {
-/******/ return installedModules[moduleId].exports;
-/******/ }
-/******/ // Create a new module (and put it into the cache)
-/******/ var module = installedModules[moduleId] = {
-/******/ i: moduleId,
-/******/ l: false,
-/******/ exports: {}
-/******/ };
-/******/
-/******/ // Execute the module function
-/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
-/******/
-/******/ // Flag the module as loaded
-/******/ module.l = true;
-/******/
-/******/ // Return the exports of the module
-/******/ return module.exports;
-/******/ }
-/******/
-/******/
-/******/ // expose the modules object (__webpack_modules__)
-/******/ __webpack_require__.m = modules;
-/******/
-/******/ // expose the module cache
-/******/ __webpack_require__.c = installedModules;
-/******/
-/******/ // define getter function for harmony exports
-/******/ __webpack_require__.d = function(exports, name, getter) {
-/******/ if(!__webpack_require__.o(exports, name)) {
-/******/ Object.defineProperty(exports, name, { enumerable: true, get: getter });
-/******/ }
-/******/ };
-/******/
-/******/ // define __esModule on exports
-/******/ __webpack_require__.r = function(exports) {
-/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
-/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-/******/ }
-/******/ Object.defineProperty(exports, '__esModule', { value: true });
-/******/ };
-/******/
-/******/ // create a fake namespace object
-/******/ // mode & 1: value is a module id, require it
-/******/ // mode & 2: merge all properties of value into the ns
-/******/ // mode & 4: return value when already ns object
-/******/ // mode & 8|1: behave like require
-/******/ __webpack_require__.t = function(value, mode) {
-/******/ if(mode & 1) value = __webpack_require__(value);
-/******/ if(mode & 8) return value;
-/******/ if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
-/******/ var ns = Object.create(null);
-/******/ __webpack_require__.r(ns);
-/******/ Object.defineProperty(ns, 'default', { enumerable: true, value: value });
-/******/ if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
-/******/ return ns;
-/******/ };
-/******/
-/******/ // getDefaultExport function for compatibility with non-harmony modules
-/******/ __webpack_require__.n = function(module) {
-/******/ var getter = module && module.__esModule ?
-/******/ function getDefault() { return module['default']; } :
-/******/ function getModuleExports() { return module; };
-/******/ __webpack_require__.d(getter, 'a', getter);
-/******/ return getter;
-/******/ };
-/******/
-/******/ // Object.prototype.hasOwnProperty.call
-/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
-/******/
-/******/ // __webpack_public_path__
-/******/ __webpack_require__.p = "";
-/******/
-/******/
-/******/ // Load entry module and return exports
-/******/ return __webpack_require__(__webpack_require__.s = 1);
-/******/ })
-/************************************************************************/
-/******/ ([
-/* 0 */
-/***/ (function(module, exports) {
-
-const hex = (color) => {
- let result = null
-
- if (/^#/.test(color) && (color.length === 7 || color.length === 9)) {
- return color
- // eslint-disable-next-line no-cond-assign
- } else if ((result = /^(rgb|rgba)\((.+)\)/.exec(color)) !== null) {
- return '#' + result[2].split(',').map((part, index) => {
- part = part.trim()
- part = index === 3 ? Math.floor(parseFloat(part) * 255) : parseInt(part, 10)
- part = part.toString(16)
- if (part.length === 1) {
- part = '0' + part
- }
- return part
- }).join('')
- } else {
- return '#00000000'
- }
-}
-
-const splitLineToCamelCase = (str) => str.split('-').map((part, index) => {
- if (index === 0) {
- return part
- }
- return part[0].toUpperCase() + part.slice(1)
-}).join('')
-
-const compareVersion = (v1, v2) => {
- v1 = v1.split('.')
- v2 = v2.split('.')
- const len = Math.max(v1.length, v2.length)
- while (v1.length < len) {
- v1.push('0')
- }
- while (v2.length < len) {
- v2.push('0')
- }
- for (let i = 0; i < len; i++) {
- const num1 = parseInt(v1[i], 10)
- const num2 = parseInt(v2[i], 10)
-
- if (num1 > num2) {
- return 1
- } else if (num1 < num2) {
- return -1
- }
- }
-
- return 0
-}
-
-module.exports = {
- hex,
- splitLineToCamelCase,
- compareVersion
-}
-
-
-/***/ }),
-/* 1 */
-/***/ (function(module, exports, __webpack_require__) {
-
-
-const xmlParse = __webpack_require__(2)
-const {Widget} = __webpack_require__(3)
-const {Draw} = __webpack_require__(5)
-const {compareVersion} = __webpack_require__(0)
-
-const canvasId = 'weui-canvas'
-
-Component({
- properties: {
- width: {
- type: Number,
- value: 400
- },
- height: {
- type: Number,
- value: 300
- }
- },
- data: {
- use2dCanvas: false, // 2.9.2 后可用canvas 2d 接口
- },
- lifetimes: {
- attached() {
- const {SDKVersion, pixelRatio: dpr} = wx.getSystemInfoSync()
- const use2dCanvas = compareVersion(SDKVersion, '2.9.2') >= 0
- this.dpr = dpr
- this.setData({use2dCanvas}, () => {
- if (use2dCanvas) {
- const query = this.createSelectorQuery()
- query.select(`#${canvasId}`)
- .fields({node: true, size: true})
- .exec(res => {
- const canvas = res[0].node
- const ctx = canvas.getContext('2d')
- canvas.width = res[0].width * dpr
- canvas.height = res[0].height * dpr
- ctx.scale(dpr, dpr)
- this.ctx = ctx
- this.canvas = canvas
- })
- } else {
- this.ctx = wx.createCanvasContext(canvasId, this)
- }
- })
- }
- },
- methods: {
- async renderToCanvas(args) {
- const {wxml, style} = args
- const ctx = this.ctx
- const canvas = this.canvas
- const use2dCanvas = this.data.use2dCanvas
-
- if (use2dCanvas && !canvas) {
- return Promise.reject(new Error('renderToCanvas: fail canvas has not been created'))
- }
-
- ctx.clearRect(0, 0, this.data.width, this.data.height)
- const {root: xom} = xmlParse(wxml)
-
- const widget = new Widget(xom, style)
- const container = widget.init()
- this.boundary = {
- top: container.layoutBox.top,
- left: container.layoutBox.left,
- width: container.computedStyle.width,
- height: container.computedStyle.height,
- }
- const draw = new Draw(ctx, canvas, use2dCanvas)
- await draw.drawNode(container)
-
- if (!use2dCanvas) {
- await this.canvasDraw(ctx)
- }
- return Promise.resolve(container)
- },
-
- canvasDraw(ctx, reserve) {
- return new Promise(resolve => {
- ctx.draw(reserve, () => {
- resolve()
- })
- })
- },
-
- canvasToTempFilePath(args = {}) {
- const use2dCanvas = this.data.use2dCanvas
-
- return new Promise((resolve, reject) => {
- const {
- top, left, width, height
- } = this.boundary
-
- const copyArgs = {
- x: left,
- y: top,
- width,
- height,
- destWidth: width * this.dpr,
- destHeight: height * this.dpr,
- canvasId,
- fileType: args.fileType || 'png',
- quality: args.quality || 1,
- success: resolve,
- fail: reject
- }
-
- if (use2dCanvas) {
- delete copyArgs.canvasId
- copyArgs.canvas = this.canvas
- }
- wx.canvasToTempFilePath(copyArgs, this)
- })
- }
- }
-})
-
-
-/***/ }),
-/* 2 */
-/***/ (function(module, exports) {
-
-
-/**
- * Module dependencies.
- */
-
-
-/**
- * Expose `parse`.
- */
-
-
-/**
- * Parse the given string of `xml`.
- *
- * @param {String} xml
- * @return {Object}
- * @api public
- */
-
-function parse(xml) {
- xml = xml.trim()
-
- // strip comments
- xml = xml.replace(//g, '')
-
- return document()
-
- /**
- * XML document.
- */
-
- function document() {
- return {
- declaration: declaration(),
- root: tag()
- }
- }
-
- /**
- * Declaration.
- */
-
- function declaration() {
- const m = match(/^<\?xml\s*/)
- if (!m) return
-
- // tag
- const node = {
- attributes: {}
- }
-
- // attributes
- while (!(eos() || is('?>'))) {
- const attr = attribute()
- if (!attr) return node
- node.attributes[attr.name] = attr.value
- }
-
- match(/\?>\s*/)
-
- return node
- }
-
- /**
- * Tag.
- */
-
- function tag() {
- const m = match(/^<([\w-:.]+)\s*/)
- if (!m) return
-
- // name
- const node = {
- name: m[1],
- attributes: {},
- children: []
- }
-
- // attributes
- while (!(eos() || is('>') || is('?>') || is('/>'))) {
- const attr = attribute()
- if (!attr) return node
- node.attributes[attr.name] = attr.value
- }
-
- // self closing tag
- if (match(/^\s*\/>\s*/)) {
- return node
- }
-
- match(/\??>\s*/)
-
- // content
- node.content = content()
-
- // children
- let child
- while (child = tag()) {
- node.children.push(child)
- }
-
- // closing
- match(/^<\/[\w-:.]+>\s*/)
-
- return node
- }
-
- /**
- * Text content.
- */
-
- function content() {
- const m = match(/^([^<]*)/)
- if (m) return m[1]
- return ''
- }
-
- /**
- * Attribute.
- */
-
- function attribute() {
- const m = match(/([\w:-]+)\s*=\s*("[^"]*"|'[^']*'|\w+)\s*/)
- if (!m) return
- return {name: m[1], value: strip(m[2])}
- }
-
- /**
- * Strip quotes from `val`.
- */
-
- function strip(val) {
- return val.replace(/^['"]|['"]$/g, '')
- }
-
- /**
- * Match `re` and advance the string.
- */
-
- function match(re) {
- const m = xml.match(re)
- if (!m) return
- xml = xml.slice(m[0].length)
- return m
- }
-
- /**
- * End-of-source.
- */
-
- function eos() {
- return xml.length == 0
- }
-
- /**
- * Check for `prefix`.
- */
-
- function is(prefix) {
- return xml.indexOf(prefix) == 0
- }
-}
-
-module.exports = parse
-
-
-/***/ }),
-/* 3 */
-/***/ (function(module, exports, __webpack_require__) {
-
-const Block = __webpack_require__(4)
-const {splitLineToCamelCase} = __webpack_require__(0)
-
-class Element extends Block {
- constructor(prop) {
- super(prop.style)
- this.name = prop.name
- this.attributes = prop.attributes
- }
-}
-
-
-class Widget {
- constructor(xom, style) {
- this.xom = xom
- this.style = style
-
- this.inheritProps = ['fontSize', 'lineHeight', 'textAlign', 'verticalAlign', 'color']
- }
-
- init() {
- this.container = this.create(this.xom)
- this.container.layout()
-
- this.inheritStyle(this.container)
- return this.container
- }
-
- // 继承父节点的样式
- inheritStyle(node) {
- const parent = node.parent || null
- const children = node.children || {}
- const computedStyle = node.computedStyle
-
- if (parent) {
- this.inheritProps.forEach(prop => {
- computedStyle[prop] = computedStyle[prop] || parent.computedStyle[prop]
- })
- }
-
- Object.values(children).forEach(child => {
- this.inheritStyle(child)
- })
- }
-
- create(node) {
- let classNames = (node.attributes.class || '').split(' ')
- classNames = classNames.map(item => splitLineToCamelCase(item.trim()))
- const style = {}
- classNames.forEach(item => {
- Object.assign(style, this.style[item] || {})
- })
-
- const args = {name: node.name, style}
-
- const attrs = Object.keys(node.attributes)
- const attributes = {}
- for (const attr of attrs) {
- const value = node.attributes[attr]
- const CamelAttr = splitLineToCamelCase(attr)
-
- if (value === '' || value === 'true') {
- attributes[CamelAttr] = true
- } else if (value === 'false') {
- attributes[CamelAttr] = false
- } else {
- attributes[CamelAttr] = value
- }
- }
- attributes.text = node.content
- args.attributes = attributes
- const element = new Element(args)
- node.children.forEach(childNode => {
- const childElement = this.create(childNode)
- element.add(childElement)
- })
- return element
- }
-}
-
-module.exports = {Widget}
-
-
-/***/ }),
-/* 4 */
-/***/ (function(module, exports) {
-
-module.exports = require("widget-ui");
-
-/***/ }),
-/* 5 */
-/***/ (function(module, exports) {
-
-class Draw {
- constructor(context, canvas, use2dCanvas = false) {
- this.ctx = context
- this.canvas = canvas || null
- this.use2dCanvas = use2dCanvas
- }
-
- roundRect(x, y, w, h, r, fill = true, stroke = false) {
- if (r < 0) return
- const ctx = this.ctx
-
- ctx.beginPath()
- ctx.arc(x + r, y + r, r, Math.PI, Math.PI * 3 / 2)
- ctx.arc(x + w - r, y + r, r, Math.PI * 3 / 2, 0)
- ctx.arc(x + w - r, y + h - r, r, 0, Math.PI / 2)
- ctx.arc(x + r, y + h - r, r, Math.PI / 2, Math.PI)
- ctx.lineTo(x, y + r)
- if (stroke) ctx.stroke()
- if (fill) ctx.fill()
- }
-
- drawView(box, style) {
- const ctx = this.ctx
- const {
- left: x, top: y, width: w, height: h
- } = box
- const {
- borderRadius = 0,
- borderWidth = 0,
- borderColor,
- color = '#000',
- backgroundColor = 'transparent',
- } = style
- ctx.save()
- // 外环
- if (borderWidth > 0) {
- ctx.fillStyle = borderColor || color
- this.roundRect(x, y, w, h, borderRadius)
- }
-
- // 内环
- ctx.fillStyle = backgroundColor
- const innerWidth = w - 2 * borderWidth
- const innerHeight = h - 2 * borderWidth
- const innerRadius = borderRadius - borderWidth >= 0 ? borderRadius - borderWidth : 0
- this.roundRect(x + borderWidth, y + borderWidth, innerWidth, innerHeight, innerRadius)
- ctx.restore()
- }
-
- async drawImage(img, box, style) {
- await new Promise((resolve, reject) => {
- const ctx = this.ctx
- const canvas = this.canvas
-
- const {
- borderRadius = 0
- } = style
- const {
- left: x, top: y, width: w, height: h
- } = box
- ctx.save()
- this.roundRect(x, y, w, h, borderRadius, false, false)
- ctx.clip()
-
- const _drawImage = (img) => {
- if (this.use2dCanvas) {
- const Image = canvas.createImage()
- Image.onload = () => {
- ctx.drawImage(Image, x, y, w, h)
- ctx.restore()
- resolve()
- }
- Image.onerror = () => { reject(new Error(`createImage fail: ${img}`)) }
- Image.src = img
- } else {
- ctx.drawImage(img, x, y, w, h)
- ctx.restore()
- resolve()
- }
- }
-
- const isTempFile = /^wxfile:\/\//.test(img)
- const isNetworkFile = /^https?:\/\//.test(img)
-
- if (isTempFile) {
- _drawImage(img)
- } else if (isNetworkFile) {
- wx.downloadFile({
- url: img,
- success(res) {
- if (res.statusCode === 200) {
- _drawImage(res.tempFilePath)
- } else {
- reject(new Error(`downloadFile:fail ${img}`))
- }
- },
- fail() {
- reject(new Error(`downloadFile:fail ${img}`))
- }
- })
- } else {
- reject(new Error(`image format error: ${img}`))
- }
- })
- }
-
- // eslint-disable-next-line complexity
- drawText(text, box, style) {
- const ctx = this.ctx
- let {
- left: x, top: y, width: w, height: h
- } = box
- let {
- color = '#000',
- lineHeight = '1.4em',
- fontSize = 14,
- textAlign = 'left',
- verticalAlign = 'top',
- backgroundColor = 'transparent'
- } = style
-
- if (typeof lineHeight === 'string') { // 2em
- lineHeight = Math.ceil(parseFloat(lineHeight.replace('em')) * fontSize)
- }
- if (!text || (lineHeight > h)) return
-
- ctx.save()
- ctx.textBaseline = 'top'
- ctx.font = `${fontSize}px sans-serif`
- ctx.textAlign = textAlign
-
- // 背景色
- ctx.fillStyle = backgroundColor
- this.roundRect(x, y, w, h, 0)
-
- // 文字颜色
- ctx.fillStyle = color
-
- // 水平布局
- switch (textAlign) {
- case 'left':
- break
- case 'center':
- x += 0.5 * w
- break
- case 'right':
- x += w
- break
- default: break
- }
-
- const textWidth = ctx.measureText(text).width
- const actualHeight = Math.ceil(textWidth / w) * lineHeight
- let paddingTop = Math.ceil((h - actualHeight) / 2)
- if (paddingTop < 0) paddingTop = 0
-
- // 垂直布局
- switch (verticalAlign) {
- case 'top':
- break
- case 'middle':
- y += paddingTop
- break
- case 'bottom':
- y += 2 * paddingTop
- break
- default: break
- }
-
- const inlinePaddingTop = Math.ceil((lineHeight - fontSize) / 2)
-
- // 不超过一行
- if (textWidth <= w) {
- ctx.fillText(text, x, y + inlinePaddingTop)
- return
- }
-
- // 多行文本
- const chars = text.split('')
- const _y = y
-
- // 逐行绘制
- let line = ''
- for (const ch of chars) {
- const testLine = line + ch
- const testWidth = ctx.measureText(testLine).width
-
- if (testWidth > w) {
- ctx.fillText(line, x, y + inlinePaddingTop)
- y += lineHeight
- line = ch
- if ((y + lineHeight) > (_y + h)) break
- } else {
- line = testLine
- }
- }
-
- // 避免溢出
- if ((y + lineHeight) <= (_y + h)) {
- ctx.fillText(line, x, y + inlinePaddingTop)
- }
- ctx.restore()
- }
-
- async drawNode(element) {
- const {layoutBox, computedStyle, name} = element
- const {src, text} = element.attributes
- if (name === 'view') {
- this.drawView(layoutBox, computedStyle)
- } else if (name === 'image') {
- await this.drawImage(src, layoutBox, computedStyle)
- } else if (name === 'text') {
- this.drawText(text, layoutBox, computedStyle)
- }
- const childs = Object.values(element.children)
- for (const child of childs) {
- await this.drawNode(child)
- }
- }
-}
-
-
-module.exports = {
- Draw
-}
-
-
-/***/ })
-/******/ ]);
-});
\ No newline at end of file
diff --git a/miniprogram_npm/wxml-to-canvas/index.json b/miniprogram_npm/wxml-to-canvas/index.json
deleted file mode 100644
index e8cfaaf..0000000
--- a/miniprogram_npm/wxml-to-canvas/index.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "component": true,
- "usingComponents": {}
-}
\ No newline at end of file
diff --git a/miniprogram_npm/wxml-to-canvas/index.wxml b/miniprogram_npm/wxml-to-canvas/index.wxml
deleted file mode 100644
index a0010ad..0000000
--- a/miniprogram_npm/wxml-to-canvas/index.wxml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/miniprogram_npm/wxml-to-canvas/index.wxss b/miniprogram_npm/wxml-to-canvas/index.wxss
deleted file mode 100644
index e69de29..0000000
diff --git a/miniprogram_npm/wxml-to-canvas/miniprogram_npm/eventemitter3/index.js b/miniprogram_npm/wxml-to-canvas/miniprogram_npm/eventemitter3/index.js
deleted file mode 100644
index e2cdc39..0000000
--- a/miniprogram_npm/wxml-to-canvas/miniprogram_npm/eventemitter3/index.js
+++ /dev/null
@@ -1,349 +0,0 @@
-module.exports = (function() {
-var __MODS__ = {};
-var __DEFINE__ = function(modId, func, req) { var m = { exports: {}, _tempexports: {} }; __MODS__[modId] = { status: 0, func: func, req: req, m: m }; };
-var __REQUIRE__ = function(modId, source) { if(!__MODS__[modId]) return require(source); if(!__MODS__[modId].status) { var m = __MODS__[modId].m; m._exports = m._tempexports; var desp = Object.getOwnPropertyDescriptor(m, "exports"); if (desp && desp.configurable) Object.defineProperty(m, "exports", { set: function (val) { if(typeof val === "object" && val !== m._exports) { m._exports.__proto__ = val.__proto__; Object.keys(val).forEach(function (k) { m._exports[k] = val[k]; }); } m._tempexports = val }, get: function () { return m._tempexports; } }); __MODS__[modId].status = 1; __MODS__[modId].func(__MODS__[modId].req, m, m.exports); } return __MODS__[modId].m.exports; };
-var __REQUIRE_WILDCARD__ = function(obj) { if(obj && obj.__esModule) { return obj; } else { var newObj = {}; if(obj != null) { for(var k in obj) { if (Object.prototype.hasOwnProperty.call(obj, k)) newObj[k] = obj[k]; } } newObj.default = obj; return newObj; } };
-var __REQUIRE_DEFAULT__ = function(obj) { return obj && obj.__esModule ? obj.default : obj; };
-__DEFINE__(1668763197222, function(require, module, exports) {
-
-
-var has = Object.prototype.hasOwnProperty
- , prefix = '~';
-
-/**
- * Constructor to create a storage for our `EE` objects.
- * An `Events` instance is a plain object whose properties are event names.
- *
- * @constructor
- * @private
- */
-function Events() {}
-
-//
-// We try to not inherit from `Object.prototype`. In some engines creating an
-// instance in this way is faster than calling `Object.create(null)` directly.
-// If `Object.create(null)` is not supported we prefix the event names with a
-// character to make sure that the built-in object properties are not
-// overridden or used as an attack vector.
-//
-if (Object.create) {
- Events.prototype = Object.create(null);
-
- //
- // This hack is needed because the `__proto__` property is still inherited in
- // some old browsers like Android 4, iPhone 5.1, Opera 11 and Safari 5.
- //
- if (!new Events().__proto__) prefix = false;
-}
-
-/**
- * Representation of a single event listener.
- *
- * @param {Function} fn The listener function.
- * @param {*} context The context to invoke the listener with.
- * @param {Boolean} [once=false] Specify if the listener is a one-time listener.
- * @constructor
- * @private
- */
-function EE(fn, context, once) {
- this.fn = fn;
- this.context = context;
- this.once = once || false;
-}
-
-/**
- * Add a listener for a given event.
- *
- * @param {EventEmitter} emitter Reference to the `EventEmitter` instance.
- * @param {(String|Symbol)} event The event name.
- * @param {Function} fn The listener function.
- * @param {*} context The context to invoke the listener with.
- * @param {Boolean} once Specify if the listener is a one-time listener.
- * @returns {EventEmitter}
- * @private
- */
-function addListener(emitter, event, fn, context, once) {
- if (typeof fn !== 'function') {
- throw new TypeError('The listener must be a function');
- }
-
- var listener = new EE(fn, context || emitter, once)
- , evt = prefix ? prefix + event : event;
-
- if (!emitter._events[evt]) emitter._events[evt] = listener, emitter._eventsCount++;
- else if (!emitter._events[evt].fn) emitter._events[evt].push(listener);
- else emitter._events[evt] = [emitter._events[evt], listener];
-
- return emitter;
-}
-
-/**
- * Clear event by name.
- *
- * @param {EventEmitter} emitter Reference to the `EventEmitter` instance.
- * @param {(String|Symbol)} evt The Event name.
- * @private
- */
-function clearEvent(emitter, evt) {
- if (--emitter._eventsCount === 0) emitter._events = new Events();
- else delete emitter._events[evt];
-}
-
-/**
- * Minimal `EventEmitter` interface that is molded against the Node.js
- * `EventEmitter` interface.
- *
- * @constructor
- * @public
- */
-function EventEmitter() {
- this._events = new Events();
- this._eventsCount = 0;
-}
-
-/**
- * Return an array listing the events for which the emitter has registered
- * listeners.
- *
- * @returns {Array}
- * @public
- */
-EventEmitter.prototype.eventNames = function eventNames() {
- var names = []
- , events
- , name;
-
- if (this._eventsCount === 0) return names;
-
- for (name in (events = this._events)) {
- if (has.call(events, name)) names.push(prefix ? name.slice(1) : name);
- }
-
- if (Object.getOwnPropertySymbols) {
- return names.concat(Object.getOwnPropertySymbols(events));
- }
-
- return names;
-};
-
-/**
- * Return the listeners registered for a given event.
- *
- * @param {(String|Symbol)} event The event name.
- * @returns {Array} The registered listeners.
- * @public
- */
-EventEmitter.prototype.listeners = function listeners(event) {
- var evt = prefix ? prefix + event : event
- , handlers = this._events[evt];
-
- if (!handlers) return [];
- if (handlers.fn) return [handlers.fn];
-
- for (var i = 0, l = handlers.length, ee = new Array(l); i < l; i++) {
- ee[i] = handlers[i].fn;
- }
-
- return ee;
-};
-
-/**
- * Return the number of listeners listening to a given event.
- *
- * @param {(String|Symbol)} event The event name.
- * @returns {Number} The number of listeners.
- * @public
- */
-EventEmitter.prototype.listenerCount = function listenerCount(event) {
- var evt = prefix ? prefix + event : event
- , listeners = this._events[evt];
-
- if (!listeners) return 0;
- if (listeners.fn) return 1;
- return listeners.length;
-};
-
-/**
- * Calls each of the listeners registered for a given event.
- *
- * @param {(String|Symbol)} event The event name.
- * @returns {Boolean} `true` if the event had listeners, else `false`.
- * @public
- */
-EventEmitter.prototype.emit = function emit(event, a1, a2, a3, a4, a5) {
- var evt = prefix ? prefix + event : event;
-
- if (!this._events[evt]) return false;
-
- var listeners = this._events[evt]
- , len = arguments.length
- , args
- , i;
-
- if (listeners.fn) {
- if (listeners.once) this.removeListener(event, listeners.fn, undefined, true);
-
- switch (len) {
- case 1: return listeners.fn.call(listeners.context), true;
- case 2: return listeners.fn.call(listeners.context, a1), true;
- case 3: return listeners.fn.call(listeners.context, a1, a2), true;
- case 4: return listeners.fn.call(listeners.context, a1, a2, a3), true;
- case 5: return listeners.fn.call(listeners.context, a1, a2, a3, a4), true;
- case 6: return listeners.fn.call(listeners.context, a1, a2, a3, a4, a5), true;
- }
-
- for (i = 1, args = new Array(len -1); i < len; i++) {
- args[i - 1] = arguments[i];
- }
-
- listeners.fn.apply(listeners.context, args);
- } else {
- var length = listeners.length
- , j;
-
- for (i = 0; i < length; i++) {
- if (listeners[i].once) this.removeListener(event, listeners[i].fn, undefined, true);
-
- switch (len) {
- case 1: listeners[i].fn.call(listeners[i].context); break;
- case 2: listeners[i].fn.call(listeners[i].context, a1); break;
- case 3: listeners[i].fn.call(listeners[i].context, a1, a2); break;
- case 4: listeners[i].fn.call(listeners[i].context, a1, a2, a3); break;
- default:
- if (!args) for (j = 1, args = new Array(len -1); j < len; j++) {
- args[j - 1] = arguments[j];
- }
-
- listeners[i].fn.apply(listeners[i].context, args);
- }
- }
- }
-
- return true;
-};
-
-/**
- * Add a listener for a given event.
- *
- * @param {(String|Symbol)} event The event name.
- * @param {Function} fn The listener function.
- * @param {*} [context=this] The context to invoke the listener with.
- * @returns {EventEmitter} `this`.
- * @public
- */
-EventEmitter.prototype.on = function on(event, fn, context) {
- return addListener(this, event, fn, context, false);
-};
-
-/**
- * Add a one-time listener for a given event.
- *
- * @param {(String|Symbol)} event The event name.
- * @param {Function} fn The listener function.
- * @param {*} [context=this] The context to invoke the listener with.
- * @returns {EventEmitter} `this`.
- * @public
- */
-EventEmitter.prototype.once = function once(event, fn, context) {
- return addListener(this, event, fn, context, true);
-};
-
-/**
- * Remove the listeners of a given event.
- *
- * @param {(String|Symbol)} event The event name.
- * @param {Function} fn Only remove the listeners that match this function.
- * @param {*} context Only remove the listeners that have this context.
- * @param {Boolean} once Only remove one-time listeners.
- * @returns {EventEmitter} `this`.
- * @public
- */
-EventEmitter.prototype.removeListener = function removeListener(event, fn, context, once) {
- var evt = prefix ? prefix + event : event;
-
- if (!this._events[evt]) return this;
- if (!fn) {
- clearEvent(this, evt);
- return this;
- }
-
- var listeners = this._events[evt];
-
- if (listeners.fn) {
- if (
- listeners.fn === fn &&
- (!once || listeners.once) &&
- (!context || listeners.context === context)
- ) {
- clearEvent(this, evt);
- }
- } else {
- for (var i = 0, events = [], length = listeners.length; i < length; i++) {
- if (
- listeners[i].fn !== fn ||
- (once && !listeners[i].once) ||
- (context && listeners[i].context !== context)
- ) {
- events.push(listeners[i]);
- }
- }
-
- //
- // Reset the array, or remove it completely if we have no more listeners.
- //
- if (events.length) this._events[evt] = events.length === 1 ? events[0] : events;
- else clearEvent(this, evt);
- }
-
- return this;
-};
-
-/**
- * Remove all listeners, or those of the specified event.
- *
- * @param {(String|Symbol)} [event] The event name.
- * @returns {EventEmitter} `this`.
- * @public
- */
-EventEmitter.prototype.removeAllListeners = function removeAllListeners(event) {
- var evt;
-
- if (event) {
- evt = prefix ? prefix + event : event;
- if (this._events[evt]) clearEvent(this, evt);
- } else {
- this._events = new Events();
- this._eventsCount = 0;
- }
-
- return this;
-};
-
-//
-// Alias methods names because people roll like that.
-//
-EventEmitter.prototype.off = EventEmitter.prototype.removeListener;
-EventEmitter.prototype.addListener = EventEmitter.prototype.on;
-
-//
-// Expose the prefix.
-//
-EventEmitter.prefixed = prefix;
-
-//
-// Allow `EventEmitter` to be imported as module namespace.
-//
-EventEmitter.EventEmitter = EventEmitter;
-
-//
-// Expose the module.
-//
-if ('undefined' !== typeof module) {
- module.exports = EventEmitter;
-}
-
-}, function(modId) {var map = {}; return __REQUIRE__(map[modId], modId); })
-return __REQUIRE__(1668763197222);
-})()
-//miniprogram-npm-outsideDeps=[]
-//# sourceMappingURL=index.js.map
\ No newline at end of file
diff --git a/miniprogram_npm/wxml-to-canvas/miniprogram_npm/eventemitter3/index.js.map b/miniprogram_npm/wxml-to-canvas/miniprogram_npm/eventemitter3/index.js.map
deleted file mode 100644
index 4f2cb7b..0000000
--- a/miniprogram_npm/wxml-to-canvas/miniprogram_npm/eventemitter3/index.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"sources":["index.js"],"names":[],"mappings":";;;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","file":"index.js","sourcesContent":["\n\nvar has = Object.prototype.hasOwnProperty\n , prefix = '~';\n\n/**\n * Constructor to create a storage for our `EE` objects.\n * An `Events` instance is a plain object whose properties are event names.\n *\n * @constructor\n * @private\n */\nfunction Events() {}\n\n//\n// We try to not inherit from `Object.prototype`. In some engines creating an\n// instance in this way is faster than calling `Object.create(null)` directly.\n// If `Object.create(null)` is not supported we prefix the event names with a\n// character to make sure that the built-in object properties are not\n// overridden or used as an attack vector.\n//\nif (Object.create) {\n Events.prototype = Object.create(null);\n\n //\n // This hack is needed because the `__proto__` property is still inherited in\n // some old browsers like Android 4, iPhone 5.1, Opera 11 and Safari 5.\n //\n if (!new Events().__proto__) prefix = false;\n}\n\n/**\n * Representation of a single event listener.\n *\n * @param {Function} fn The listener function.\n * @param {*} context The context to invoke the listener with.\n * @param {Boolean} [once=false] Specify if the listener is a one-time listener.\n * @constructor\n * @private\n */\nfunction EE(fn, context, once) {\n this.fn = fn;\n this.context = context;\n this.once = once || false;\n}\n\n/**\n * Add a listener for a given event.\n *\n * @param {EventEmitter} emitter Reference to the `EventEmitter` instance.\n * @param {(String|Symbol)} event The event name.\n * @param {Function} fn The listener function.\n * @param {*} context The context to invoke the listener with.\n * @param {Boolean} once Specify if the listener is a one-time listener.\n * @returns {EventEmitter}\n * @private\n */\nfunction addListener(emitter, event, fn, context, once) {\n if (typeof fn !== 'function') {\n throw new TypeError('The listener must be a function');\n }\n\n var listener = new EE(fn, context || emitter, once)\n , evt = prefix ? prefix + event : event;\n\n if (!emitter._events[evt]) emitter._events[evt] = listener, emitter._eventsCount++;\n else if (!emitter._events[evt].fn) emitter._events[evt].push(listener);\n else emitter._events[evt] = [emitter._events[evt], listener];\n\n return emitter;\n}\n\n/**\n * Clear event by name.\n *\n * @param {EventEmitter} emitter Reference to the `EventEmitter` instance.\n * @param {(String|Symbol)} evt The Event name.\n * @private\n */\nfunction clearEvent(emitter, evt) {\n if (--emitter._eventsCount === 0) emitter._events = new Events();\n else delete emitter._events[evt];\n}\n\n/**\n * Minimal `EventEmitter` interface that is molded against the Node.js\n * `EventEmitter` interface.\n *\n * @constructor\n * @public\n */\nfunction EventEmitter() {\n this._events = new Events();\n this._eventsCount = 0;\n}\n\n/**\n * Return an array listing the events for which the emitter has registered\n * listeners.\n *\n * @returns {Array}\n * @public\n */\nEventEmitter.prototype.eventNames = function eventNames() {\n var names = []\n , events\n , name;\n\n if (this._eventsCount === 0) return names;\n\n for (name in (events = this._events)) {\n if (has.call(events, name)) names.push(prefix ? name.slice(1) : name);\n }\n\n if (Object.getOwnPropertySymbols) {\n return names.concat(Object.getOwnPropertySymbols(events));\n }\n\n return names;\n};\n\n/**\n * Return the listeners registered for a given event.\n *\n * @param {(String|Symbol)} event The event name.\n * @returns {Array} The registered listeners.\n * @public\n */\nEventEmitter.prototype.listeners = function listeners(event) {\n var evt = prefix ? prefix + event : event\n , handlers = this._events[evt];\n\n if (!handlers) return [];\n if (handlers.fn) return [handlers.fn];\n\n for (var i = 0, l = handlers.length, ee = new Array(l); i < l; i++) {\n ee[i] = handlers[i].fn;\n }\n\n return ee;\n};\n\n/**\n * Return the number of listeners listening to a given event.\n *\n * @param {(String|Symbol)} event The event name.\n * @returns {Number} The number of listeners.\n * @public\n */\nEventEmitter.prototype.listenerCount = function listenerCount(event) {\n var evt = prefix ? prefix + event : event\n , listeners = this._events[evt];\n\n if (!listeners) return 0;\n if (listeners.fn) return 1;\n return listeners.length;\n};\n\n/**\n * Calls each of the listeners registered for a given event.\n *\n * @param {(String|Symbol)} event The event name.\n * @returns {Boolean} `true` if the event had listeners, else `false`.\n * @public\n */\nEventEmitter.prototype.emit = function emit(event, a1, a2, a3, a4, a5) {\n var evt = prefix ? prefix + event : event;\n\n if (!this._events[evt]) return false;\n\n var listeners = this._events[evt]\n , len = arguments.length\n , args\n , i;\n\n if (listeners.fn) {\n if (listeners.once) this.removeListener(event, listeners.fn, undefined, true);\n\n switch (len) {\n case 1: return listeners.fn.call(listeners.context), true;\n case 2: return listeners.fn.call(listeners.context, a1), true;\n case 3: return listeners.fn.call(listeners.context, a1, a2), true;\n case 4: return listeners.fn.call(listeners.context, a1, a2, a3), true;\n case 5: return listeners.fn.call(listeners.context, a1, a2, a3, a4), true;\n case 6: return listeners.fn.call(listeners.context, a1, a2, a3, a4, a5), true;\n }\n\n for (i = 1, args = new Array(len -1); i < len; i++) {\n args[i - 1] = arguments[i];\n }\n\n listeners.fn.apply(listeners.context, args);\n } else {\n var length = listeners.length\n , j;\n\n for (i = 0; i < length; i++) {\n if (listeners[i].once) this.removeListener(event, listeners[i].fn, undefined, true);\n\n switch (len) {\n case 1: listeners[i].fn.call(listeners[i].context); break;\n case 2: listeners[i].fn.call(listeners[i].context, a1); break;\n case 3: listeners[i].fn.call(listeners[i].context, a1, a2); break;\n case 4: listeners[i].fn.call(listeners[i].context, a1, a2, a3); break;\n default:\n if (!args) for (j = 1, args = new Array(len -1); j < len; j++) {\n args[j - 1] = arguments[j];\n }\n\n listeners[i].fn.apply(listeners[i].context, args);\n }\n }\n }\n\n return true;\n};\n\n/**\n * Add a listener for a given event.\n *\n * @param {(String|Symbol)} event The event name.\n * @param {Function} fn The listener function.\n * @param {*} [context=this] The context to invoke the listener with.\n * @returns {EventEmitter} `this`.\n * @public\n */\nEventEmitter.prototype.on = function on(event, fn, context) {\n return addListener(this, event, fn, context, false);\n};\n\n/**\n * Add a one-time listener for a given event.\n *\n * @param {(String|Symbol)} event The event name.\n * @param {Function} fn The listener function.\n * @param {*} [context=this] The context to invoke the listener with.\n * @returns {EventEmitter} `this`.\n * @public\n */\nEventEmitter.prototype.once = function once(event, fn, context) {\n return addListener(this, event, fn, context, true);\n};\n\n/**\n * Remove the listeners of a given event.\n *\n * @param {(String|Symbol)} event The event name.\n * @param {Function} fn Only remove the listeners that match this function.\n * @param {*} context Only remove the listeners that have this context.\n * @param {Boolean} once Only remove one-time listeners.\n * @returns {EventEmitter} `this`.\n * @public\n */\nEventEmitter.prototype.removeListener = function removeListener(event, fn, context, once) {\n var evt = prefix ? prefix + event : event;\n\n if (!this._events[evt]) return this;\n if (!fn) {\n clearEvent(this, evt);\n return this;\n }\n\n var listeners = this._events[evt];\n\n if (listeners.fn) {\n if (\n listeners.fn === fn &&\n (!once || listeners.once) &&\n (!context || listeners.context === context)\n ) {\n clearEvent(this, evt);\n }\n } else {\n for (var i = 0, events = [], length = listeners.length; i < length; i++) {\n if (\n listeners[i].fn !== fn ||\n (once && !listeners[i].once) ||\n (context && listeners[i].context !== context)\n ) {\n events.push(listeners[i]);\n }\n }\n\n //\n // Reset the array, or remove it completely if we have no more listeners.\n //\n if (events.length) this._events[evt] = events.length === 1 ? events[0] : events;\n else clearEvent(this, evt);\n }\n\n return this;\n};\n\n/**\n * Remove all listeners, or those of the specified event.\n *\n * @param {(String|Symbol)} [event] The event name.\n * @returns {EventEmitter} `this`.\n * @public\n */\nEventEmitter.prototype.removeAllListeners = function removeAllListeners(event) {\n var evt;\n\n if (event) {\n evt = prefix ? prefix + event : event;\n if (this._events[evt]) clearEvent(this, evt);\n } else {\n this._events = new Events();\n this._eventsCount = 0;\n }\n\n return this;\n};\n\n//\n// Alias methods names because people roll like that.\n//\nEventEmitter.prototype.off = EventEmitter.prototype.removeListener;\nEventEmitter.prototype.addListener = EventEmitter.prototype.on;\n\n//\n// Expose the prefix.\n//\nEventEmitter.prefixed = prefix;\n\n//\n// Allow `EventEmitter` to be imported as module namespace.\n//\nEventEmitter.EventEmitter = EventEmitter;\n\n//\n// Expose the module.\n//\nif ('undefined' !== typeof module) {\n module.exports = EventEmitter;\n}\n"]}
\ No newline at end of file
diff --git a/miniprogram_npm/wxml-to-canvas/miniprogram_npm/widget-ui/index.js b/miniprogram_npm/wxml-to-canvas/miniprogram_npm/widget-ui/index.js
deleted file mode 100644
index 39d0d82..0000000
--- a/miniprogram_npm/wxml-to-canvas/miniprogram_npm/widget-ui/index.js
+++ /dev/null
@@ -1,13 +0,0 @@
-module.exports = (function() {
-var __MODS__ = {};
-var __DEFINE__ = function(modId, func, req) { var m = { exports: {}, _tempexports: {} }; __MODS__[modId] = { status: 0, func: func, req: req, m: m }; };
-var __REQUIRE__ = function(modId, source) { if(!__MODS__[modId]) return require(source); if(!__MODS__[modId].status) { var m = __MODS__[modId].m; m._exports = m._tempexports; var desp = Object.getOwnPropertyDescriptor(m, "exports"); if (desp && desp.configurable) Object.defineProperty(m, "exports", { set: function (val) { if(typeof val === "object" && val !== m._exports) { m._exports.__proto__ = val.__proto__; Object.keys(val).forEach(function (k) { m._exports[k] = val[k]; }); } m._tempexports = val }, get: function () { return m._tempexports; } }); __MODS__[modId].status = 1; __MODS__[modId].func(__MODS__[modId].req, m, m.exports); } return __MODS__[modId].m.exports; };
-var __REQUIRE_WILDCARD__ = function(obj) { if(obj && obj.__esModule) { return obj; } else { var newObj = {}; if(obj != null) { for(var k in obj) { if (Object.prototype.hasOwnProperty.call(obj, k)) newObj[k] = obj[k]; } } newObj.default = obj; return newObj; } };
-var __REQUIRE_DEFAULT__ = function(obj) { return obj && obj.__esModule ? obj.default : obj; };
-__DEFINE__(1668763197223, function(require, module, exports) {
-!function(t,e){if("object"==typeof exports&&"object"==typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var o=e();for(var r in o)("object"==typeof exports?exports:t)[r]=o[r]}}(this,(function(){return function(t){var e={};function o(r){if(e[r])return e[r].exports;var i=e[r]={i:r,l:!1,exports:{}};return t[r].call(i.exports,i,i.exports,o),i.l=!0,i.exports}return o.m=t,o.c=e,o.d=function(t,e,r){o.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:r})},o.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},o.t=function(t,e){if(1&e&&(t=o(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var r=Object.create(null);if(o.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var i in t)o.d(r,i,function(e){return t[e]}.bind(null,i));return r},o.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return o.d(e,"a",e),e},o.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},o.p="",o(o.s=0)}([function(t,e,o){var r=this&&this.__importDefault||function(t){return t&&t.__esModule?t:{default:t}};Object.defineProperty(e,"__esModule",{value:!0});var i=r(o(1)),l=o(2),n=0,a=function(){function t(e){var o=this;void 0===e&&(e={}),this.parent=null,this.id=t.uuid(),this.style={},this.computedStyle={},this.lastComputedStyle={},this.children={},this.layoutBox={left:0,top:0,width:0,height:0},e=Object.assign(l.getDefaultStyle(),e),this.computedStyle=Object.assign(l.getDefaultStyle(),e),this.lastComputedStyle=Object.assign(l.getDefaultStyle(),e),Object.keys(e).forEach((function(t){Object.defineProperty(o.style,t,{configurable:!0,enumerable:!0,get:function(){return e[t]},set:function(r){r!==e[t]&&void 0!==r&&(o.lastComputedStyle=o.computedStyle[t],e[t]=r,o.computedStyle[t]=r,l.scalableStyles.includes(t)&&o.style.scale&&(o.computedStyle[t]=r*o.style.scale),"scale"===t&&l.scalableStyles.forEach((function(t){e[t]&&(o.computedStyle[t]=e[t]*r)})),"hidden"===t&&(r?l.layoutAffectedStyles.forEach((function(t){o.computedStyle[t]=0})):l.layoutAffectedStyles.forEach((function(t){o.computedStyle[t]=o.lastComputedStyle[t]}))))}})})),this.style.scale&&l.scalableStyles.forEach((function(t){if(o.style[t]){var e=o.style[t]*o.style.scale;o.computedStyle[t]=e}})),e.hidden&&l.layoutAffectedStyles.forEach((function(t){o.computedStyle[t]=0}))}return t.uuid=function(){return n++},t.prototype.getAbsolutePosition=function(t){if(!t)return this.getAbsolutePosition(this);if(!t.parent)return{left:0,top:0};var e=this.getAbsolutePosition(t.parent),o=e.left,r=e.top;return{left:o+t.layoutBox.left,top:r+t.layoutBox.top}},t.prototype.add=function(t){t.parent=this,this.children[t.id]=t},t.prototype.remove=function(t){var e=this;t?this.children[t.id]&&(t.remove(),delete this.children[t.id]):Object.keys(this.children).forEach((function(t){e.children[t].remove(),delete e.children[t]}))},t.prototype.getNodeTree=function(){var t=this;return{id:this.id,style:this.computedStyle,children:Object.keys(this.children).map((function(e){return t.children[e].getNodeTree()}))}},t.prototype.applyLayout=function(t){var e=this;["left","top","width","height"].forEach((function(o){t.layout&&"number"==typeof t.layout[o]&&(e.layoutBox[o]=t.layout[o],!e.parent||"left"!==o&&"top"!==o||(e.layoutBox[o]+=e.parent.layoutBox[o]))})),t.children.forEach((function(t){e.children[t.id].applyLayout(t)}))},t.prototype.layout=function(){var t=this.getNodeTree();i.default(t),this.applyLayout(t)},t}();e.default=a},function(t,e,o){o.r(e);var r=function(){var t,e="inherit",o="ltr",r="rtl",i="row",l="row-reverse",n="column",a="column-reverse",u="flex-start",d="center",s="flex-end",y="space-between",c="space-around",f="flex-start",h="center",p="flex-end",g="stretch",v="relative",m="absolute",b={row:"left","row-reverse":"right",column:"top","column-reverse":"bottom"},x={row:"right","row-reverse":"left",column:"bottom","column-reverse":"top"},w={row:"left","row-reverse":"right",column:"top","column-reverse":"bottom"},S={row:"width","row-reverse":"width",column:"height","column-reverse":"height"};function W(t){return void 0===t}function L(t){return t===i||t===l}function k(t,e){if(void 0!==t.style.marginStart&&L(e))return t.style.marginStart;var o=null;switch(e){case"row":o=t.style.marginLeft;break;case"row-reverse":o=t.style.marginRight;break;case"column":o=t.style.marginTop;break;case"column-reverse":o=t.style.marginBottom}return void 0!==o?o:void 0!==t.style.margin?t.style.margin:0}function j(t,e){if(void 0!==t.style.marginEnd&&L(e))return t.style.marginEnd;var o=null;switch(e){case"row":o=t.style.marginRight;break;case"row-reverse":o=t.style.marginLeft;break;case"column":o=t.style.marginBottom;break;case"column-reverse":o=t.style.marginTop}return null!=o?o:void 0!==t.style.margin?t.style.margin:0}function B(t,e){if(void 0!==t.style.borderStartWidth&&t.style.borderStartWidth>=0&&L(e))return t.style.borderStartWidth;var o=null;switch(e){case"row":o=t.style.borderLeftWidth;break;case"row-reverse":o=t.style.borderRightWidth;break;case"column":o=t.style.borderTopWidth;break;case"column-reverse":o=t.style.borderBottomWidth}return null!=o&&o>=0?o:void 0!==t.style.borderWidth&&t.style.borderWidth>=0?t.style.borderWidth:0}function E(t,e){if(void 0!==t.style.borderEndWidth&&t.style.borderEndWidth>=0&&L(e))return t.style.borderEndWidth;var o=null;switch(e){case"row":o=t.style.borderRightWidth;break;case"row-reverse":o=t.style.borderLeftWidth;break;case"column":o=t.style.borderBottomWidth;break;case"column-reverse":o=t.style.borderTopWidth}return null!=o&&o>=0?o:void 0!==t.style.borderWidth&&t.style.borderWidth>=0?t.style.borderWidth:0}function C(t,e){return function(t,e){if(void 0!==t.style.paddingStart&&t.style.paddingStart>=0&&L(e))return t.style.paddingStart;var o=null;switch(e){case"row":o=t.style.paddingLeft;break;case"row-reverse":o=t.style.paddingRight;break;case"column":o=t.style.paddingTop;break;case"column-reverse":o=t.style.paddingBottom}return null!=o&&o>=0?o:void 0!==t.style.padding&&t.style.padding>=0?t.style.padding:0}(t,e)+B(t,e)}function T(t,e){return function(t,e){if(void 0!==t.style.paddingEnd&&t.style.paddingEnd>=0&&L(e))return t.style.paddingEnd;var o=null;switch(e){case"row":o=t.style.paddingRight;break;case"row-reverse":o=t.style.paddingLeft;break;case"column":o=t.style.paddingBottom;break;case"column-reverse":o=t.style.paddingTop}return null!=o&&o>=0?o:void 0!==t.style.padding&&t.style.padding>=0?t.style.padding:0}(t,e)+E(t,e)}function O(t,e){return B(t,e)+E(t,e)}function _(t,e){return k(t,e)+j(t,e)}function R(t,e){return C(t,e)+T(t,e)}function A(t,e){return e.style.alignSelf?e.style.alignSelf:t.style.alignItems?t.style.alignItems:"stretch"}function P(t,e){if(e===r){if(t===i)return l;if(t===l)return i}return t}function D(t,e){return function(t){return t===n||t===a}(t)?P(i,e):n}function H(t){return t.style.position?t.style.position:"relative"}function M(t){return H(t)===v&&t.style.flex>0}function I(t,e){return t.layout[S[e]]+_(t,e)}function N(t,e){return void 0!==t.style[S[e]]&&t.style[S[e]]>=0}function F(t,e){return void 0!==t.style[e]}function q(t,e){return void 0!==t.style[e]?t.style[e]:0}function z(t,e,o){var r={row:t.style.minWidth,"row-reverse":t.style.minWidth,column:t.style.minHeight,"column-reverse":t.style.minHeight}[e],i={row:t.style.maxWidth,"row-reverse":t.style.maxWidth,column:t.style.maxHeight,"column-reverse":t.style.maxHeight}[e],l=o;return void 0!==i&&i>=0&&l>i&&(l=i),void 0!==r&&r>=0&&le?t:e}function G(t,e){void 0===t.layout[S[e]]&&N(t,e)&&(t.layout[S[e]]=U(z(t,e,t.style[S[e]]),R(t,e)))}function J(t,e,o){e.layout[x[o]]=t.layout[S[o]]-e.layout[S[o]]-e.layout[w[o]]}function K(t,e){return void 0!==t.style[b[e]]?q(t,b[e]):-q(t,x[e])}function Q(r,E,Q){var X=function(t,r){var i;return(i=t.style.direction?t.style.direction:e)===e&&(i=void 0===r?o:r),i}(r,Q),Y=P(function(t){return t.style.flexDirection?t.style.flexDirection:n}(r),X),Z=D(Y,X),$=P(i,X);G(r,Y),G(r,Z),r.layout.direction=X,r.layout[b[Y]]+=k(r,Y)+K(r,Y),r.layout[x[Y]]+=j(r,Y)+K(r,Y),r.layout[b[Z]]+=k(r,Z)+K(r,Z),r.layout[x[Z]]+=j(r,Z)+K(r,Z);var tt=r.children.length,et=R(r,$);if(function(t){return void 0!==t.style.measure}(r)){var ot=!W(r.layout[S[$]]),rt=t;rt=N(r,$)?r.style.width:ot?r.layout[S[$]]:E-_(r,$),rt-=et;var it=!N(r,$)&&!ot,lt=!N(r,n)&&W(r.layout[S[n]]);if(it||lt){var nt=r.style.measure(rt);it&&(r.layout.width=nt.width+et),lt&&(r.layout.height=nt.height+R(r,n))}if(0===tt)return}var at,ut,dt,st,yt=function(t){return"wrap"===t.style.flexWrap}(r),ct=function(t){return t.style.justifyContent?t.style.justifyContent:"flex-start"}(r),ft=C(r,Y),ht=C(r,Z),pt=R(r,Y),gt=R(r,Z),vt=!W(r.layout[S[Y]]),mt=!W(r.layout[S[Z]]),bt=L(Y),xt=null,wt=null,St=t;vt&&(St=r.layout[S[Y]]-pt);for(var Wt=0,Lt=0,kt=0,jt=0,Bt=0,Et=0;LtSt&&at!==Wt){Rt--,kt=1;break}At&&(H(dt)!==v||M(dt))&&(At=!1,Pt=at),Dt&&(H(dt)!==v||Xt!==g&&Xt!==f||W(dt.layout[S[Z]]))&&(Dt=!1,Ht=at),At&&(dt.layout[w[Y]]+=Nt,vt&&J(r,dt,Y),Nt+=I(dt,Y),Ft=U(Ft,z(dt,Z,I(dt,Z)))),Dt&&(dt.layout[w[Z]]+=jt+ht,mt&&J(r,dt,Z)),kt=0,Tt+=qt,Lt=at+1}var zt=0,Ut=0,Gt=0;if(Gt=vt?St-Tt:U(Tt,0)-Tt,0!==Ot){var Jt,Kt,Qt=Gt/_t;for(It=Mt;null!==It;)(Jt=Qt*It.style.flex+R(It,Y))!==(Kt=z(It,Y,Jt))&&(Gt-=Kt,_t-=It.style.flex),It=It.nextFlexChild;for((Qt=Gt/_t)<0&&(Qt=0),It=Mt;null!==It;)It.layout[S[Y]]=z(It,Y,Qt*It.style.flex+R(It,Y)),Ct=t,N(r,$)?Ct=r.layout[S[$]]-et:bt||(Ct=E-_(r,$)-et),V(It,Ct,X),dt=It,It=It.nextFlexChild,dt.nextFlexChild=null}else ct!==u&&(ct===d?zt=Gt/2:ct===s?zt=Gt:ct===y?(Gt=U(Gt,0),Ut=Ot+Rt-1!=0?Gt/(Ot+Rt-1):0):ct===c&&(zt=(Ut=Gt/(Ot+Rt))/2));for(Nt+=zt,at=Pt;at1&&mt){var $t=r.layout[S[Z]]-gt,te=$t-jt,ee=0,oe=ht,re=function(t){return t.style.alignContent?t.style.alignContent:"flex-start"}(r);re===p?oe+=te:re===h?oe+=te/2:re===g&&$t>jt&&(ee=te/Et);var ie=0;for(at=0;at=0&&L(e))return t.style.borderStartWidth;var o=null;switch(e){case\"row\":o=t.style.borderLeftWidth;break;case\"row-reverse\":o=t.style.borderRightWidth;break;case\"column\":o=t.style.borderTopWidth;break;case\"column-reverse\":o=t.style.borderBottomWidth}return null!=o&&o>=0?o:void 0!==t.style.borderWidth&&t.style.borderWidth>=0?t.style.borderWidth:0}function E(t,e){if(void 0!==t.style.borderEndWidth&&t.style.borderEndWidth>=0&&L(e))return t.style.borderEndWidth;var o=null;switch(e){case\"row\":o=t.style.borderRightWidth;break;case\"row-reverse\":o=t.style.borderLeftWidth;break;case\"column\":o=t.style.borderBottomWidth;break;case\"column-reverse\":o=t.style.borderTopWidth}return null!=o&&o>=0?o:void 0!==t.style.borderWidth&&t.style.borderWidth>=0?t.style.borderWidth:0}function C(t,e){return function(t,e){if(void 0!==t.style.paddingStart&&t.style.paddingStart>=0&&L(e))return t.style.paddingStart;var o=null;switch(e){case\"row\":o=t.style.paddingLeft;break;case\"row-reverse\":o=t.style.paddingRight;break;case\"column\":o=t.style.paddingTop;break;case\"column-reverse\":o=t.style.paddingBottom}return null!=o&&o>=0?o:void 0!==t.style.padding&&t.style.padding>=0?t.style.padding:0}(t,e)+B(t,e)}function T(t,e){return function(t,e){if(void 0!==t.style.paddingEnd&&t.style.paddingEnd>=0&&L(e))return t.style.paddingEnd;var o=null;switch(e){case\"row\":o=t.style.paddingRight;break;case\"row-reverse\":o=t.style.paddingLeft;break;case\"column\":o=t.style.paddingBottom;break;case\"column-reverse\":o=t.style.paddingTop}return null!=o&&o>=0?o:void 0!==t.style.padding&&t.style.padding>=0?t.style.padding:0}(t,e)+E(t,e)}function O(t,e){return B(t,e)+E(t,e)}function _(t,e){return k(t,e)+j(t,e)}function R(t,e){return C(t,e)+T(t,e)}function A(t,e){return e.style.alignSelf?e.style.alignSelf:t.style.alignItems?t.style.alignItems:\"stretch\"}function P(t,e){if(e===r){if(t===i)return l;if(t===l)return i}return t}function D(t,e){return function(t){return t===n||t===a}(t)?P(i,e):n}function H(t){return t.style.position?t.style.position:\"relative\"}function M(t){return H(t)===v&&t.style.flex>0}function I(t,e){return t.layout[S[e]]+_(t,e)}function N(t,e){return void 0!==t.style[S[e]]&&t.style[S[e]]>=0}function F(t,e){return void 0!==t.style[e]}function q(t,e){return void 0!==t.style[e]?t.style[e]:0}function z(t,e,o){var r={row:t.style.minWidth,\"row-reverse\":t.style.minWidth,column:t.style.minHeight,\"column-reverse\":t.style.minHeight}[e],i={row:t.style.maxWidth,\"row-reverse\":t.style.maxWidth,column:t.style.maxHeight,\"column-reverse\":t.style.maxHeight}[e],l=o;return void 0!==i&&i>=0&&l>i&&(l=i),void 0!==r&&r>=0&&le?t:e}function G(t,e){void 0===t.layout[S[e]]&&N(t,e)&&(t.layout[S[e]]=U(z(t,e,t.style[S[e]]),R(t,e)))}function J(t,e,o){e.layout[x[o]]=t.layout[S[o]]-e.layout[S[o]]-e.layout[w[o]]}function K(t,e){return void 0!==t.style[b[e]]?q(t,b[e]):-q(t,x[e])}function Q(r,E,Q){var X=function(t,r){var i;return(i=t.style.direction?t.style.direction:e)===e&&(i=void 0===r?o:r),i}(r,Q),Y=P(function(t){return t.style.flexDirection?t.style.flexDirection:n}(r),X),Z=D(Y,X),$=P(i,X);G(r,Y),G(r,Z),r.layout.direction=X,r.layout[b[Y]]+=k(r,Y)+K(r,Y),r.layout[x[Y]]+=j(r,Y)+K(r,Y),r.layout[b[Z]]+=k(r,Z)+K(r,Z),r.layout[x[Z]]+=j(r,Z)+K(r,Z);var tt=r.children.length,et=R(r,$);if(function(t){return void 0!==t.style.measure}(r)){var ot=!W(r.layout[S[$]]),rt=t;rt=N(r,$)?r.style.width:ot?r.layout[S[$]]:E-_(r,$),rt-=et;var it=!N(r,$)&&!ot,lt=!N(r,n)&&W(r.layout[S[n]]);if(it||lt){var nt=r.style.measure(rt);it&&(r.layout.width=nt.width+et),lt&&(r.layout.height=nt.height+R(r,n))}if(0===tt)return}var at,ut,dt,st,yt=function(t){return\"wrap\"===t.style.flexWrap}(r),ct=function(t){return t.style.justifyContent?t.style.justifyContent:\"flex-start\"}(r),ft=C(r,Y),ht=C(r,Z),pt=R(r,Y),gt=R(r,Z),vt=!W(r.layout[S[Y]]),mt=!W(r.layout[S[Z]]),bt=L(Y),xt=null,wt=null,St=t;vt&&(St=r.layout[S[Y]]-pt);for(var Wt=0,Lt=0,kt=0,jt=0,Bt=0,Et=0;LtSt&&at!==Wt){Rt--,kt=1;break}At&&(H(dt)!==v||M(dt))&&(At=!1,Pt=at),Dt&&(H(dt)!==v||Xt!==g&&Xt!==f||W(dt.layout[S[Z]]))&&(Dt=!1,Ht=at),At&&(dt.layout[w[Y]]+=Nt,vt&&J(r,dt,Y),Nt+=I(dt,Y),Ft=U(Ft,z(dt,Z,I(dt,Z)))),Dt&&(dt.layout[w[Z]]+=jt+ht,mt&&J(r,dt,Z)),kt=0,Tt+=qt,Lt=at+1}var zt=0,Ut=0,Gt=0;if(Gt=vt?St-Tt:U(Tt,0)-Tt,0!==Ot){var Jt,Kt,Qt=Gt/_t;for(It=Mt;null!==It;)(Jt=Qt*It.style.flex+R(It,Y))!==(Kt=z(It,Y,Jt))&&(Gt-=Kt,_t-=It.style.flex),It=It.nextFlexChild;for((Qt=Gt/_t)<0&&(Qt=0),It=Mt;null!==It;)It.layout[S[Y]]=z(It,Y,Qt*It.style.flex+R(It,Y)),Ct=t,N(r,$)?Ct=r.layout[S[$]]-et:bt||(Ct=E-_(r,$)-et),V(It,Ct,X),dt=It,It=It.nextFlexChild,dt.nextFlexChild=null}else ct!==u&&(ct===d?zt=Gt/2:ct===s?zt=Gt:ct===y?(Gt=U(Gt,0),Ut=Ot+Rt-1!=0?Gt/(Ot+Rt-1):0):ct===c&&(zt=(Ut=Gt/(Ot+Rt))/2));for(Nt+=zt,at=Pt;at1&&mt){var $t=r.layout[S[Z]]-gt,te=$t-jt,ee=0,oe=ht,re=function(t){return t.style.alignContent?t.style.alignContent:\"flex-start\"}(r);re===p?oe+=te:re===h?oe+=te/2:re===g&&$t>jt&&(ee=te/Et);var ie=0;for(at=0;at {
- let result = null
-
- if (/^#/.test(color) && (color.length === 7 || color.length === 9)) {
- return color
- // eslint-disable-next-line no-cond-assign
- } else if ((result = /^(rgb|rgba)\((.+)\)/.exec(color)) !== null) {
- return '#' + result[2].split(',').map((part, index) => {
- part = part.trim()
- part = index === 3 ? Math.floor(parseFloat(part) * 255) : parseInt(part, 10)
- part = part.toString(16)
- if (part.length === 1) {
- part = '0' + part
- }
- return part
- }).join('')
- } else {
- return '#00000000'
- }
-}
-
-const splitLineToCamelCase = (str) => str.split('-').map((part, index) => {
- if (index === 0) {
- return part
- }
- return part[0].toUpperCase() + part.slice(1)
-}).join('')
-
-const compareVersion = (v1, v2) => {
- v1 = v1.split('.')
- v2 = v2.split('.')
- const len = Math.max(v1.length, v2.length)
- while (v1.length < len) {
- v1.push('0')
- }
- while (v2.length < len) {
- v2.push('0')
- }
- for (let i = 0; i < len; i++) {
- const num1 = parseInt(v1[i], 10)
- const num2 = parseInt(v2[i], 10)
-
- if (num1 > num2) {
- return 1
- } else if (num1 < num2) {
- return -1
- }
- }
-
- return 0
-}
-
-module.exports = {
- hex,
- splitLineToCamelCase,
- compareVersion
-}
diff --git a/pages/detail/index.wxml b/pages/detail/index.wxml
index 2f91f85..b5b2202 100644
--- a/pages/detail/index.wxml
+++ b/pages/detail/index.wxml
@@ -20,12 +20,6 @@
-
-
-
-
-
-
@@ -78,7 +72,7 @@
-
+
{{jobDetail.poses.store.posContent ? jobDetail.poses.store.posContent :'暂无地址信息'}}
diff --git a/pages/index/index.js b/pages/index/index.js
index 86e3da6..e880df4 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -3003,5 +3003,29 @@ Page({
wx.navigateTo({
url: "/pages/filterPage/index",
});
- },
+ },
+ goMap(){
+ wx.getLocation({
+ type: 'gcj02', //返回可以用于wx.openLocation的经纬度
+ success (res) {
+ const latitude = 34.757034;
+ const longitude = 113.772587;
+ wx.openLocation({
+ latitude,
+ longitude,
+ name:'郑州一才企业管理有限公司',
+ address:'河南省郑州市管城回族区心怡路与东站南街交叉口郑东升龙广场2号楼5楼',
+ scale: 18
+ })
+ }
+ })
+ },
+ makePhone(e){
+ var that = this;
+ var tel = e.currentTarget.dataset.tel;
+ wx.makePhoneCall({
+ // number: that.data.jobDetail.assistantUserTel + ""
+ phoneNumber: tel,
+ });
+ },
});
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 0490a36..9532ee4 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -25,7 +25,7 @@
联系电话:
- 13253506869
+ 13253506869
@@ -55,12 +55,10 @@
全部
-
-
+
-
+ -->