修改小程序首页

App.vue

@@ -1,158 +1,172 @@
-<script>
-	export default {
-		onLaunch: function() {
-			const that = this;
-			that.forceUpdate();
-		},
-		onShow: function() {
-			const that = this;
-			that.search();
-		},
-		onHide: function() {
-			console.log('App Hide')
-		},
-		methods: {
-			search() {
-				const that = this;
-				uni.login({
-					success: function(res) {
-						if (res.code) {
-							uni.getStorage({
-								key: 'openid',
-								success: function(res) {},
-								fail: async function(err) {
-									const aee = await that.$api('/tool/app', 'GET', {
-										js_code: res.code,
-										config: that.$config.wx_projectkey
-									})
-									if (aee.errcode == '0') {
-										uni.setStorage({
-											key: "openid",
-											data: aee.data.openid
-										})
-									} else {
-										uni.showToast({
-											title: aee.errmsg,
-											icon: 'none'
-										})
-									}
-								}
-							})
-						} else {
-							uni.showToast({
-								title: res.errMsg,
-								icon: 'none'
-							})
-						}
-					}
-				});
-
-			},
-			// 强制更新
-			forceUpdate() {
-				const that = this;
-				let system = uni.getSystemInfoSync();
-				if (system.uniPlatform == 'mp-weixin') {
-					const updateManager = uni.getUpdateManager();
-					updateManager.onCheckForUpdate(function(res) {
-						// 请求完新版本信息的回调
-						console.log(res.hasUpdate);
-					});
-					updateManager.onUpdateReady(function(res) {
-						uni.showModal({
-							title: '更新提示',
-							content: '新版本已经准备好，是否重启应用？',
-							success(res) {
-								if (res.confirm) {
-									uni.clearStorage();
-									updateManager.applyUpdate();
-								}
-							}
-						});
-					});
-					updateManager.onUpdateFailed(function(res) {
-						console.log(res);
-						console.log('更新失败');
-					});
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	/*每个页面公共css */
-	@import '@/uni_modules/uni-scss/index.scss';
-	@import '@/common/css/font-icon.css';
-
-	/* 公用 */
-	.container {
-		display: flex;
-		flex-direction: column;
-		box-sizing: border-box;
-		width: 100vw;
-		height: 100vh;
-	}
-
-	.textOver {
-		overflow: hidden;
-		text-overflow: ellipsis;
-		word-break: break-all;
-		display: -webkit-box;
-		-webkit-box-orient: vertical;
-		-webkit-line-clamp: 2;
-	}
-
-	// 弹框公共样式
-
-	.uni-dialog-content {
-		padding: 2vw !important;
-		max-height: 40vh;
-		overflow-y: auto;
-		align-items: normal !important;
-		box-sizing: border-box;
-	}
-
-	/* 设置整个项目的公用样式*/
-	page {
-		/* 窗口可用高度 */
-		/* 有头有底 */
-		--oneHeight: 100vh;
-		/* 有头无底 */
-		--twoHeight: 92vh;
-		/* 可用窗口背景颜色 */
-		--mainColor: #ffffff;
-		/* 底部菜单背景颜色 */
-		--footColor: #f1f1f1;
-		/* 字体大小 */
-		--font20Szie: 20px;
-		--font19Szie: 19px;
-		--font18Szie: 18px;
-		--font17Size: 17px;
-		--font16Size: 16px;
-		--font15Size: 15px;
-		--font14Size: 14px;
-		--font13Size: 13px;
-		--font12Size: 12px;
-		/* 颜色 */
-		--f1Color: #f1f1f1;
-		--f2Color: #f2f2f2;
-		--f3Color: #f3f3f3;
-		--f4Color: #f4f4f4;
-		--f5Color: #f5f5f5;
-		--f6Color: #f6f6f6;
-		--f7Color: #f7f7f7;
-		--f8Color: #f8f8f8;
-		--f9Color: #f9f9f9;
-		--f99Color: #999999;
-		--f85Color: #858585;
-		--f80Color: #808080;
-		--fDCColor: #DCDCDC;
-		--fcColor: #cccccc;
-		--f00Color: #000000;
-		--fffColor: #ffffff;
-		--f3CColor: #007AFF;
-		--fFB1Color: #7A7E83;
-		--fF0Color: #FF0000;
-	}
-</style>
+<script>
+	export default {
+		onLaunch: function() {
+			const that = this;
+			that.forceUpdate();
+		},
+		onShow: function() {
+			const that = this;
+			that.search();
+		},
+		onHide: function() {
+			console.log('App Hide')
+		},
+		methods: {
+			search() {
+				const that = this;
+				uni.login({
+					success: function(res) {
+						if (res.code) {
+							uni.getStorage({
+								key: 'openid',
+								success: function(res) {},
+								fail: async function(err) {
+									const aee = await that.$api('/tool/app', 'GET', {
+										js_code: res.code,
+										config: that.$config.wx_projectkey
+									})
+									if (aee.errcode == '0') {
+										uni.setStorage({
+											key: "openid",
+											data: aee.data.openid
+										})
+									} else {
+										uni.showToast({
+											title: aee.errmsg,
+											icon: 'none'
+										})
+									}
+								}
+							})
+						} else {
+							uni.showToast({
+								title: res.errMsg,
+								icon: 'none'
+							})
+						}
+					}
+				});
+
+			},
+			// 强制更新
+			forceUpdate() {
+				const that = this;
+				let system = uni.getSystemInfoSync();
+				if (system.uniPlatform == 'mp-weixin') {
+					const updateManager = uni.getUpdateManager();
+					updateManager.onCheckForUpdate(function(res) {
+						// 请求完新版本信息的回调
+						console.log(res.hasUpdate);
+					});
+					updateManager.onUpdateReady(function(res) {
+						uni.showModal({
+							title: '更新提示',
+							content: '新版本已经准备好，是否重启应用？',
+							success(res) {
+								if (res.confirm) {
+									uni.clearStorage();
+									updateManager.applyUpdate();
+								}
+							}
+						});
+					});
+					updateManager.onUpdateFailed(function(res) {
+						console.log(res);
+						console.log('更新失败');
+					});
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	/*每个页面公共css */
+	@import '@/uni_modules/uni-scss/index.scss';
+	@import '@/common/css/font-icon.css';
+
+	/* 公用 */
+	.container {
+		display: flex;
+		flex-direction: column;
+		box-sizing: border-box;
+		width: 100vw;
+		height: 100vh;
+	}
+
+	.textOver {
+		overflow: hidden;
+		text-overflow: ellipsis;
+		word-break: break-all;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2;
+	}
+
+	// 弹框公共样式
+
+	.uni-dialog-content {
+		padding: 2vw !important;
+		max-height: 40vh;
+		overflow-y: auto;
+		align-items: normal !important;
+		box-sizing: border-box;
+	}
+
+	// 轮播图样式
+
+	wx-swiper .wx-swiper-dot {
+		width: 30rpx;
+		height: 4rpx;
+		border-radius: 10rpx;
+	}
+
+	wx-swiper .wx-swiper-dot-active {
+		background-color: #ffffff;
+		width: 50rpx;
+		border-radius: 10rpx;
+	}
+
+	/* 设置整个项目的公用样式*/
+	page {
+		/* 窗口可用高度 */
+		/* 有头有底 */
+		--oneHeight: 100vh;
+		/* 有头无底 */
+		--twoHeight: 92vh;
+		/* 可用窗口背景颜色 */
+		--mainColor: #ffffff;
+		/* 底部菜单背景颜色 */
+		--footColor: #f1f1f1;
+		/* 字体大小 */
+		--font20Szie: 20px;
+		--font19Szie: 19px;
+		--font18Szie: 18px;
+		--font17Size: 17px;
+		--font16Size: 16px;
+		--font15Size: 15px;
+		--font14Size: 14px;
+		--font13Size: 13px;
+		--font12Size: 12px;
+		/* 颜色 */
+		--f1Color: #f1f1f1;
+		--f2Color: #f2f2f2;
+		--f3Color: #f3f3f3;
+		--f4Color: #f4f4f4;
+		--f5Color: #f5f5f5;
+		--f6Color: #f6f6f6;
+		--f7Color: #f7f7f7;
+		--f8Color: #f8f8f8;
+		--f9Color: #f9f9f9;
+		--f99Color: #999999;
+		--f85Color: #858585;
+		--f80Color: #808080;
+		--fDCColor: #DCDCDC;
+		--fcColor: #cccccc;
+		--f00Color: #000000;
+		--fffColor: #ffffff;
+		--f3CColor: #007AFF;
+		--fFB1Color: #7A7E83;
+		--fF0Color: #FF0000;
+	}
+</style>

common/computed.js

@@ -1,38 +0,0 @@
-import Vue from 'vue';
-import Decimal from 'decimal.js';
-const toNumber = (num) => {
-  return new Decimal(num).toNumber();
-};
-const plus = (n1 = 0, n2 = 0) => {
-  const number1 = new Decimal(n1);
-  const number2 = new Decimal(n2);
-  let result = number1.add(number2);
-  result = result.toFixed(2, Decimal.ROUND_DOWN);
-  return toNumber(result);
-};
-const minus = (n1 = 0, n2 = 0) => {
-  const number1 = new Decimal(n1);
-  const number2 = new Decimal(n2);
-  let result = number1.minus(number2);
-  result = result.toFixed(2, Decimal.ROUND_DOWN);
-  return toNumber(result);
-};
-const multiply = (n1 = 0, n2 = 0) => {
-  const number1 = new Decimal(n1);
-  const number2 = new Decimal(n2);
-  let result = number1.mul(number2);
-  result = result.toFixed(2, Decimal.ROUND_DOWN);
-  return toNumber(result);
-};
-const divide = (n1 = 0, n2 = 0) => {
-  const number1 = new Decimal(n1);
-  const number2 = new Decimal(n2);
-  let result = number1.div(number2);
-  result = result.toFixed(2, Decimal.ROUND_DOWN);
-  return toNumber(result);
-};
-
-Vue.prototype.$plus = plus;
-Vue.prototype.$minus = minus;
-Vue.prototype.$multiply = multiply;
-Vue.prototype.$divide = divide;

components/swiper/index.vue

@@ -1,100 +0,0 @@
-<template>
-	<swiper class="image-container" previous-margin="45rpx" next-margin="45rpx" circular autoplay
-		@change="swiperChange">
-		<swiper-item :class="currentIndex == index ? 'swiper-item' : 'swiper-item-side'"
-			v-for="(item, index) in imgList" :key="item[urlKey]">
-			<image @click="clickImg(item)" :class="currentIndex == index ? 'item-img' : 'item-img-side'"
-				:src="item[urlKey]" lazy-load :style="dontFirstAnimation ? 'animation: none;' : ''" mode="aspectFill">
-			</image>
-		</swiper-item>
-	</swiper>
-</template>
-<script>
-	export default {
-		props: {
-			imgList: {
-				type: Array,
-				default () {
-					return []
-				}
-			},
-			urlKey: {
-				type: String,
-				default () {
-					return ''
-				}
-			},
-		},
-		data() {
-			return {
-				currentIndex: 0,
-				dontFirstAnimation: true
-			}
-		},
-		methods: {
-			swiperChange(e) {
-				this.dontFirstAnimation = false
-				this.currentIndex = e.detail.current
-			},
-			clickImg(item) {
-				this.$emit('selected', item, this.currentIndex)
-			}
-		}
-	}
-</script>
-<style scoped>
-	.image-container {
-		width: 750rpx;
-		height: 350rpx;
-	}
-
-	.item-img {
-		width: 630rpx;
-		height: 300rpx;
-		border-radius: 14rpx;
-		animation: to-big .3s;
-	}
-
-	.swiper-item {
-		width: 630rpx;
-		height: 300rpx;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-	}
-
-	.item-img-side {
-		width: 630rpx;
-		height: 260rpx;
-		border-radius: 14rpx;
-		animation: to-mini .3s;
-	}
-
-	.swiper-item-side {
-		width: 630rpx;
-		height: 260rpx;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-	}
-
-	@keyframes to-mini {
-		from {
-			height: 300rpx;
-		}
-
-		to {
-			height: 260rpx;
-		}
-	}
-
-	@keyframes to-big {
-		from {
-			height: 260rpx;
-		}
-
-		to {
-			height: 300rpx;
-		}
-	}
-</style>

main.js

@@ -12,7 +12,6 @@ Vue.prototype.$api = requestBase;
 Vue.prototype.$apifile = requestFile;
 // 配置文件
 import config from '@/config.js';
-import '@/common/computed.js';
 Vue.prototype.$config = config;
 
 Vue.config.productionTip = false;

node_modules/.package-lock.json

@@ -1,12 +0,0 @@
-{
-  "name": "travel_applet",
-  "lockfileVersion": 2,
-  "requires": true,
-  "packages": {
-    "node_modules/decimal.js": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
-      "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA=="
-    }
-  }
-}

node_modules/decimal.js/LICENCE.md

@@ -1,23 +0,0 @@
-The MIT Licence.
-
-Copyright (c) 2022 Michael Mclaughlin
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-

node_modules/decimal.js/README.md

@@ -1,246 +0,0 @@
-![decimal.js](https://raw.githubusercontent.com/MikeMcl/decimal.js/gh-pages/decimaljs.png)
-
-An arbitrary-precision Decimal type for JavaScript.
-
-[![npm version](https://img.shields.io/npm/v/decimal.js.svg)](https://www.npmjs.com/package/decimal.js)
-[![npm downloads](https://img.shields.io/npm/dw/decimal.js)](https://www.npmjs.com/package/decimal.js)
-[![Build Status](https://travis-ci.org/MikeMcl/decimal.js.svg)](https://travis-ci.org/MikeMcl/decimal.js)
-[![CDNJS](https://img.shields.io/cdnjs/v/decimal.js.svg)](https://cdnjs.com/libraries/decimal.js)
-
-<br>
-
-## Features
-
-  - Integers and floats
-  - Simple but full-featured API
-  - Replicates many of the methods of JavaScript's `Number.prototype` and `Math` objects
-  - Also handles hexadecimal, binary and octal values
-  - Faster, smaller, and perhaps easier to use than JavaScript versions of Java's BigDecimal
-  - No dependencies
-  - Wide platform compatibility: uses JavaScript 1.5 (ECMAScript 3) features only
-  - Comprehensive [documentation](https://mikemcl.github.io/decimal.js/) and test set
-  - Used under the hood by [math.js](https://github.com/josdejong/mathjs)
-  - Includes a TypeScript declaration file: *decimal.d.ts*
-
-![API](https://raw.githubusercontent.com/MikeMcl/decimal.js/gh-pages/API.png)
-
-The library is similar to [bignumber.js](https://github.com/MikeMcl/bignumber.js/), but here
-precision is specified in terms of significant digits rather than decimal places, and all
-calculations are rounded to the precision (similar to Python's decimal module) rather than just
-those involving division.
-
-This library also adds the trigonometric functions, among others, and supports non-integer powers,
-which makes it a significantly larger library than *bignumber.js* and the even smaller
-[big.js](https://github.com/MikeMcl/big.js/).
-
-For a lighter version of this library without the trigonometric functions see
-[decimal.js-light](https://github.com/MikeMcl/decimal.js-light/).
-
-## Load
-
-The library is the single JavaScript file *decimal.js* or ES module *decimal.mjs*.
-
-Browser:
-
-```html
-<script src='path/to/decimal.js'></script>
-
-<script type="module">
-  import Decimal from './path/to/decimal.mjs';
-  ...
-</script>
-```
-
-[Node.js](https://nodejs.org):
-
-```bash
-npm install decimal.js
-```
-```js
-const Decimal = require('decimal.js');
-
-import Decimal from 'decimal.js';
-
-import {Decimal} from 'decimal.js';
-```
-
-## Use
-
-*In all examples below, semicolons and `toString` calls are not shown.
-If a commented-out value is in quotes it means `toString` has been called on the preceding expression.*
-
-The library exports a single constructor function, `Decimal`, which expects a single argument that is a number, string or Decimal instance.
-
-```js
-x = new Decimal(123.4567)
-y = new Decimal('123456.7e-3')
-z = new Decimal(x)
-x.equals(y) && y.equals(z) && x.equals(z)        // true
-```
-
-If using values with more than a few digits, it is recommended to pass strings rather than numbers to avoid a potential loss of precision.
-
-```js
-// Precision loss from using numeric literals with more than 15 significant digits.
-new Decimal(1.0000000000000001)         // '1'
-new Decimal(88259496234518.57)          // '88259496234518.56'
-new Decimal(99999999999999999999)       // '100000000000000000000'
-
-// Precision loss from using numeric literals outside the range of Number values.
-new Decimal(2e+308)                     // 'Infinity'
-new Decimal(1e-324)                     // '0'
-
-// Precision loss from the unexpected result of arithmetic with Number values.
-new Decimal(0.7 + 0.1)                  // '0.7999999999999999'
-```
-
-As with JavaScript numbers, strings can contain underscores as separators to improve readability.
-
-```js
-x = new Decimal('2_147_483_647')
-```
-
-String values in binary, hexadecimal or octal notation are also accepted if the appropriate prefix is included.
-
-```js
-x = new Decimal('0xff.f')            // '255.9375'
-y = new Decimal('0b10101100')        // '172'
-z = x.plus(y)                        // '427.9375'
-
-z.toBinary()                         // '0b110101011.1111'
-z.toBinary(13)                       // '0b1.101010111111p+8'
-
-// Using binary exponential notation to create a Decimal with the value of `Number.MAX_VALUE`.
-x = new Decimal('0b1.1111111111111111111111111111111111111111111111111111p+1023')
-// '1.7976931348623157081e+308'
-```
-
-Decimal instances are immutable in the sense that they are not changed by their methods.
-
-```js
-0.3 - 0.1                     // 0.19999999999999998
-x = new Decimal(0.3)
-x.minus(0.1)                  // '0.2'
-x                             // '0.3'
-```
-
-The methods that return a Decimal can be chained.
-
-```js
-x.dividedBy(y).plus(z).times(9).floor()
-x.times('1.23456780123456789e+9').plus(9876.5432321).dividedBy('4444562598.111772').ceil()
-```
-
-Many method names have a shorter alias.
-
-```js
-x.squareRoot().dividedBy(y).toPower(3).equals(x.sqrt().div(y).pow(3))     // true
-x.comparedTo(y.modulo(z).negated() === x.cmp(y.mod(z).neg())              // true
-```
-
-Most of the methods of JavaScript's `Number.prototype` and `Math` objects are replicated.
-
-```js
-x = new Decimal(255.5)
-x.toExponential(5)                       // '2.55500e+2'
-x.toFixed(5)                             // '255.50000'
-x.toPrecision(5)                         // '255.50'
-
-Decimal.sqrt('6.98372465832e+9823')      // '8.3568682281821340204e+4911'
-Decimal.pow(2, 0.0979843)                // '1.0702770511687781839'
-
-// Using `toFixed()` to avoid exponential notation:
-x = new Decimal('0.0000001')
-x.toString()                             // '1e-7'
-x.toFixed()                              // '0.0000001'
-```
-
-And there are `isNaN` and `isFinite` methods, as `NaN` and `Infinity` are valid `Decimal` values.
-
-```js
-x = new Decimal(NaN)                                           // 'NaN'
-y = new Decimal(Infinity)                                      // 'Infinity'
-x.isNaN() && !y.isNaN() && !x.isFinite() && !y.isFinite()      // true
-```
-
-There is also a `toFraction` method with an optional *maximum denominator* argument.
-
-```js
-z = new Decimal(355)
-pi = z.dividedBy(113)        // '3.1415929204'
-pi.toFraction()              // [ '7853982301', '2500000000' ]
-pi.toFraction(1000)          // [ '355', '113' ]
-```
-
-All calculations are rounded according to the number of significant digits and rounding mode specified
-by the `precision` and `rounding` properties of the Decimal constructor.
-
-For advanced usage, multiple Decimal constructors can be created, each with their own independent
-configuration which applies to all Decimal numbers created from it.
-
-```js
-// Set the precision and rounding of the default Decimal constructor
-Decimal.set({ precision: 5, rounding: 4 })
-
-// Create another Decimal constructor, optionally passing in a configuration object
-Dec = Decimal.clone({ precision: 9, rounding: 1 })
-
-x = new Decimal(5)
-y = new Dec(5)
-
-x.div(3)                           // '1.6667'
-y.div(3)                           // '1.66666666'
-```
-
-The value of a Decimal is stored in a floating point format in terms of its digits, exponent and sign, but these properties should be considered read-only.
-
-```js
-x = new Decimal(-12345.67);
-x.d                            // [ 12345, 6700000 ]    digits (base 10000000)
-x.e                            // 4                     exponent (base 10)
-x.s                            // -1                    sign
-```
-
-For further information see the [API](http://mikemcl.github.io/decimal.js/) reference in the *doc* directory.
-
-## Test
-
-To run the tests using Node.js from the root directory:
-
-```bash
-npm test
-```
-
-Each separate test module can also be executed individually, for example:
-
-```bash
-node test/modules/toFraction
-```
-
-To run the tests in a browser, open *test/test.html*.
-
-## Minify
-
-Two minification examples:
-
-Using [uglify-js](https://github.com/mishoo/UglifyJS) to minify the *decimal.js* file:
-
-```bash
-npm install uglify-js -g
-uglifyjs decimal.js --source-map url=decimal.min.js.map -c -m -o decimal.min.js
-```
-
-Using [terser](https://github.com/terser/terser) to minify the ES module version, *decimal.mjs*:
-
-```bash
-npm install terser -g
-terser decimal.mjs --source-map url=decimal.min.mjs.map -c -m --toplevel -o decimal.min.mjs
-```
-
-```js
-import Decimal from './decimal.min.mjs';
-```
-
-## Licence
-
-[The MIT Licence (Expat).](LICENCE.md)

node_modules/decimal.js/decimal.d.ts

@@ -1,299 +0,0 @@
-// Type definitions for decimal.js >=7.0.0
-// Project: https://github.com/MikeMcl/decimal.js
-// Definitions by: Michael Mclaughlin <https://github.com/MikeMcl>
-// Definitions: https://github.com/MikeMcl/decimal.js
-//
-// Documentation: http://mikemcl.github.io/decimal.js/
-//
-// Exports:
-//
-//   class     Decimal (default export)
-//   type      Decimal.Constructor
-//   type      Decimal.Instance
-//   type      Decimal.Modulo
-//   type      Decimal.Rounding
-//   type      Decimal.Value
-//   interface Decimal.Config
-//
-// Example (alternative syntax commented-out):
-//
-//   import {Decimal} from "decimal.js"
-//   //import Decimal from "decimal.js"
-//
-//   let r: Decimal.Rounding = Decimal.ROUND_UP;
-//   let c: Decimal.Configuration = {precision: 4, rounding: r};
-//   Decimal.set(c);
-//   let v: Decimal.Value = '12345.6789';
-//   let d: Decimal = new Decimal(v);
-//   //let d: Decimal.Instance = new Decimal(v);
-//
-// The use of compiler option `--strictNullChecks` is recommended.
-
-export default Decimal;
-
-export namespace Decimal {
-  export type Constructor = typeof Decimal;
-  export type Instance = Decimal;
-  export type Rounding = 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8;
-  export type Modulo = Rounding | 9;
-  export type Value = string | number | Decimal;
-
-  // http://mikemcl.github.io/decimal.js/#constructor-properties
-  export interface Config {
-    precision?: number;
-    rounding?: Rounding;
-    toExpNeg?: number;
-    toExpPos?: number;
-    minE?: number;
-    maxE?: number;
-    crypto?: boolean;
-    modulo?: Modulo;
-    defaults?: boolean;
-  }
-}
-
-export declare class Decimal {
-  readonly d: number[];
-  readonly e: number;
-  readonly s: number;
-
-  constructor(n: Decimal.Value);
-
-  absoluteValue(): Decimal;
-  abs(): Decimal;
-
-  ceil(): Decimal;
-  
-  clampedTo(min: Decimal.Value, max: Decimal.Value): Decimal;
-  clamp(min: Decimal.Value, max: Decimal.Value): Decimal;
-
-  comparedTo(n: Decimal.Value): number;
-  cmp(n: Decimal.Value): number;
-
-  cosine(): Decimal;
-  cos(): Decimal;
-
-  cubeRoot(): Decimal;
-  cbrt(): Decimal;
-
-  decimalPlaces(): number;
-  dp(): number;
-
-  dividedBy(n: Decimal.Value): Decimal;
-  div(n: Decimal.Value): Decimal;
-
-  dividedToIntegerBy(n: Decimal.Value): Decimal;
-  divToInt(n: Decimal.Value): Decimal;
-
-  equals(n: Decimal.Value): boolean;
-  eq(n: Decimal.Value): boolean;
-
-  floor(): Decimal;
-
-  greaterThan(n: Decimal.Value): boolean;
-  gt(n: Decimal.Value): boolean;
-
-  greaterThanOrEqualTo(n: Decimal.Value): boolean;
-  gte(n: Decimal.Value): boolean;
-
-  hyperbolicCosine(): Decimal;
-  cosh(): Decimal;
-
-  hyperbolicSine(): Decimal;
-  sinh(): Decimal;
-
-  hyperbolicTangent(): Decimal;
-  tanh(): Decimal;
-
-  inverseCosine(): Decimal;
-  acos(): Decimal;
-
-  inverseHyperbolicCosine(): Decimal;
-  acosh(): Decimal;
-
-  inverseHyperbolicSine(): Decimal;
-  asinh(): Decimal;
-
-  inverseHyperbolicTangent(): Decimal;
-  atanh(): Decimal;
-
-  inverseSine(): Decimal;
-  asin(): Decimal;
-
-  inverseTangent(): Decimal;
-  atan(): Decimal;
-
-  isFinite(): boolean;
-
-  isInteger(): boolean;
-  isInt(): boolean;
-
-  isNaN(): boolean;
-
-  isNegative(): boolean;
-  isNeg(): boolean;
-
-  isPositive(): boolean;
-  isPos(): boolean;
-
-  isZero(): boolean;
-
-  lessThan(n: Decimal.Value): boolean;
-  lt(n: Decimal.Value): boolean;
-
-  lessThanOrEqualTo(n: Decimal.Value): boolean;
-  lte(n: Decimal.Value): boolean;
-
-  logarithm(n?: Decimal.Value): Decimal;
-  log(n?: Decimal.Value): Decimal;
-
-  minus(n: Decimal.Value): Decimal;
-  sub(n: Decimal.Value): Decimal;
-
-  modulo(n: Decimal.Value): Decimal;
-  mod(n: Decimal.Value): Decimal;
-
-  naturalExponential(): Decimal;
-  exp(): Decimal;
-
-  naturalLogarithm(): Decimal;
-  ln(): Decimal;
-
-  negated(): Decimal;
-  neg(): Decimal;
-
-  plus(n: Decimal.Value): Decimal;
-  add(n: Decimal.Value): Decimal;
-
-  precision(includeZeros?: boolean): number;
-  sd(includeZeros?: boolean): number;
-
-  round(): Decimal;
-
-  sine() : Decimal;
-  sin() : Decimal;
-
-  squareRoot(): Decimal;
-  sqrt(): Decimal;
-
-  tangent() : Decimal;
-  tan() : Decimal;
-
-  times(n: Decimal.Value): Decimal;
-  mul(n: Decimal.Value) : Decimal;
-
-  toBinary(significantDigits?: number): string;
-  toBinary(significantDigits: number, rounding: Decimal.Rounding): string;
-
-  toDecimalPlaces(decimalPlaces?: number): Decimal;
-  toDecimalPlaces(decimalPlaces: number, rounding: Decimal.Rounding): Decimal;
-  toDP(decimalPlaces?: number): Decimal;
-  toDP(decimalPlaces: number, rounding: Decimal.Rounding): Decimal;
-
-  toExponential(decimalPlaces?: number): string;
-  toExponential(decimalPlaces: number, rounding: Decimal.Rounding): string;
-
-  toFixed(decimalPlaces?: number): string;
-  toFixed(decimalPlaces: number, rounding: Decimal.Rounding): string;
-
-  toFraction(max_denominator?: Decimal.Value): Decimal[];
-
-  toHexadecimal(significantDigits?: number): string;
-  toHexadecimal(significantDigits: number, rounding: Decimal.Rounding): string;
-  toHex(significantDigits?: number): string;
-  toHex(significantDigits: number, rounding?: Decimal.Rounding): string;
-
-  toJSON(): string;
-
-  toNearest(n: Decimal.Value, rounding?: Decimal.Rounding): Decimal;
-
-  toNumber(): number;
-
-  toOctal(significantDigits?: number): string;
-  toOctal(significantDigits: number, rounding: Decimal.Rounding): string;
-
-  toPower(n: Decimal.Value): Decimal;
-  pow(n: Decimal.Value): Decimal;
-
-  toPrecision(significantDigits?: number): string;
-  toPrecision(significantDigits: number, rounding: Decimal.Rounding): string;
-
-  toSignificantDigits(significantDigits?: number): Decimal;
-  toSignificantDigits(significantDigits: number, rounding: Decimal.Rounding): Decimal;
-  toSD(significantDigits?: number): Decimal;
-  toSD(significantDigits: number, rounding: Decimal.Rounding): Decimal;
-
-  toString(): string;
-
-  truncated(): Decimal;
-  trunc(): Decimal;
-
-  valueOf(): string;
-
-  static abs(n: Decimal.Value): Decimal;
-  static acos(n: Decimal.Value): Decimal;
-  static acosh(n: Decimal.Value): Decimal;
-  static add(x: Decimal.Value, y: Decimal.Value): Decimal;
-  static asin(n: Decimal.Value): Decimal;
-  static asinh(n: Decimal.Value): Decimal;
-  static atan(n: Decimal.Value): Decimal;
-  static atanh(n: Decimal.Value): Decimal;
-  static atan2(y: Decimal.Value, x: Decimal.Value): Decimal;
-  static cbrt(n: Decimal.Value): Decimal;
-  static ceil(n: Decimal.Value): Decimal;
-  static clamp(n: Decimal.Value, min: Decimal.Value, max: Decimal.Value): Decimal;
-  static clone(object?: Decimal.Config): Decimal.Constructor;
-  static config(object: Decimal.Config): Decimal.Constructor;
-  static cos(n: Decimal.Value): Decimal;
-  static cosh(n: Decimal.Value): Decimal;
-  static div(x: Decimal.Value, y: Decimal.Value): Decimal;
-  static exp(n: Decimal.Value): Decimal;
-  static floor(n: Decimal.Value): Decimal;
-  static hypot(...n: Decimal.Value[]): Decimal;
-  static isDecimal(object: any): object is Decimal;
-  static ln(n: Decimal.Value): Decimal;
-  static log(n: Decimal.Value, base?: Decimal.Value): Decimal;
-  static log2(n: Decimal.Value): Decimal;
-  static log10(n: Decimal.Value): Decimal;
-  static max(...n: Decimal.Value[]): Decimal;
-  static min(...n: Decimal.Value[]): Decimal;
-  static mod(x: Decimal.Value, y: Decimal.Value): Decimal;
-  static mul(x: Decimal.Value, y: Decimal.Value): Decimal;
-  static noConflict(): Decimal.Constructor;   // Browser only
-  static pow(base: Decimal.Value, exponent: Decimal.Value): Decimal;
-  static random(significantDigits?: number): Decimal;
-  static round(n: Decimal.Value): Decimal;
-  static set(object: Decimal.Config): Decimal.Constructor;
-  static sign(n: Decimal.Value): number;
-  static sin(n: Decimal.Value): Decimal;
-  static sinh(n: Decimal.Value): Decimal;
-  static sqrt(n: Decimal.Value): Decimal;
-  static sub(x: Decimal.Value, y: Decimal.Value): Decimal;
-  static sum(...n: Decimal.Value[]): Decimal;
-  static tan(n: Decimal.Value): Decimal;
-  static tanh(n: Decimal.Value): Decimal;
-  static trunc(n: Decimal.Value): Decimal;
-
-  static readonly default?: Decimal.Constructor;
-  static readonly Decimal?: Decimal.Constructor;
-
-  static readonly precision: number;
-  static readonly rounding: Decimal.Rounding;
-  static readonly toExpNeg: number;
-  static readonly toExpPos: number;
-  static readonly minE: number;
-  static readonly maxE: number;
-  static readonly crypto: boolean;
-  static readonly modulo: Decimal.Modulo;
-
-  static readonly ROUND_UP: 0;
-  static readonly ROUND_DOWN: 1;
-  static readonly ROUND_CEIL: 2;
-  static readonly ROUND_FLOOR: 3;
-  static readonly ROUND_HALF_UP: 4;
-  static readonly ROUND_HALF_DOWN: 5;
-  static readonly ROUND_HALF_EVEN: 6;
-  static readonly ROUND_HALF_CEIL: 7;
-  static readonly ROUND_HALF_FLOOR: 8;
-  static readonly EUCLID: 9;
-}

node_modules/decimal.js/package.json

@@ -1,55 +0,0 @@
-{
-  "name": "decimal.js",
-  "description": "An arbitrary-precision Decimal type for JavaScript.",
-  "version": "10.4.3",
-  "keywords": [
-    "arbitrary",
-    "precision",
-    "arithmetic",
-    "big",
-    "number",
-    "decimal",
-    "float",
-    "biginteger",
-    "bigdecimal",
-    "bignumber",
-    "bigint",
-    "bignum"
-  ],
-  "repository" : {
-    "type": "git",
-    "url": "https://github.com/MikeMcl/decimal.js.git"
-  },
-  "main": "decimal",
-  "module": "decimal.mjs",
-  "browser": "decimal.js",
-  "exports": {
-    ".": {
-      "types": "./decimal.d.ts",
-      "import": "./decimal.mjs",
-      "require": "./decimal.js"
-    },
-    "./decimal.mjs": "./decimal.mjs",
-    "./decimal.js": "./decimal.js",
-    "./package.json": "./package.json",
-    "./decimal": {
-      "types": "./decimal.d.ts",
-      "import": "./decimal.mjs",
-      "require": "./decimal.js"
-    }
-  },
-  "author": {
-    "name": "Michael Mclaughlin",
-    "email": "M8ch88l@gmail.com"
-  },
-  "license": "MIT",
-  "scripts": {
-    "test": "node ./test/test.js"
-  },
-  "types": "decimal.d.ts",
-  "files": [
-    "decimal.js",
-    "decimal.mjs",
-    "decimal.d.ts"
-  ]
-}

package-lock.json

@@ -5,13 +5,19 @@
   "packages": {
     "": {
       "dependencies": {
-        "decimal.js": "^10.4.3"
+        "decimal.js": "^10.4.3",
+        "lodash": "^4.17.21"
       }
     },
     "node_modules/decimal.js": {
       "version": "10.4.3",
       "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
       "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA=="
+    },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     }
   },
   "dependencies": {
@@ -19,6 +25,11 @@
       "version": "10.4.3",
       "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
       "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA=="
+    },
+    "lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     }
   }
 }

package.json

@@ -1,5 +1,6 @@
 {
   "dependencies": {
-    "decimal.js": "^10.4.3"
+    "decimal.js": "^10.4.3",
+    "lodash": "^4.17.21"
   }
 }

pages/home/index.vue

@@ -1,24 +1,33 @@
 <template>
 	<view class="main">
 		<view class="one">
-			<swiper :img-list="imgList" url-key="url" @selected="selectedBanner"></swiper>
+			<swiper class="swiper" circular :indicator-dots="true" indicator-color="#F5F5F5" :autoplay="true"
+				:interval="3000" :duration="1000">
+				<swiper-item class="list" v-for="(item,index) in imgList" :key="index" @tap="toBanner(item)">
+					<image class="image" :src="item.url" mode="">
+					</image>
+				</swiper-item>
+			</swiper>
 		</view>
 		<view class="two">
-			<view class="list" v-for="(item,index) in moduleList" :key="index" @tap="toChange(item)">
-				<image class="image" :src="item.url&&item.url.length>0?item.url[0].url:''" mode="aspectFill">
-				</image>
-				<text class="text">{{ item.name }}</text>
-			</view>
+			<swiper class="swiper" circular :indicator-dots="true" indicator-color="#F5F5F5" :autoplay="false">
+				<swiper-item class="swiper-item" v-for="(item,index) in moduleList" :key="index">
+					<view class="list" v-for="(as,index) in item" :key="indexs" @tap="toChange(as)">
+						<image class="image" :src="as.url&&as.url.length>0?as.url[0].url:''" mode="aspectFill">
+						</image>
+						<text class="text">{{ as.name }}</text>
+					</view>
+				</swiper-item>
+			</swiper>
 		</view>
 	</view>
 </template>
 
 <script>
-	import swiper from '../../components/swiper/index.vue';
 	import tabs from '../../components/tabs/index.vue';
 	export default {
 		components: {
-			swiper
+			tabs
 		},
 		data() {
 			return {
@@ -49,12 +58,17 @@
 					is_use: '0'
 				});
 				if (res.errcode == '0') {
-					that.$set(that, `moduleList`, res.data);
+					const data = res.data.reduce((acc, cur, i) => {
+						if (i % 10 === 0) acc.push([cur]); // 新增一个小数组
+						else acc[acc.length - 1].push(cur); // 将当前元素加入最后一个小数组中
+						return acc;
+					}, []);
+					that.$set(that, `moduleList`, data);
 				}
 			},
 			// 点击轮播图图片
-			selectedBanner(item, index) {
-				console.log(item, index)
+			toBanner(item) {
+				console.log(item)
 			},
 			// 点击模块
 			toChange(item) {
@@ -66,29 +80,52 @@
 
 <style lang="scss">
 	.main {
-		.two {
-			display: flex;
-			flex-wrap: wrap;
-			padding: 8vw 0 2vw 0;
+		.one {
+			padding: 0 0 2vw 0;
 
-			.list {
-				display: flex;
-				flex-direction: column;
-				justify-content: space-between;
-				align-items: center;
-				width: 20vw;
-				padding: 1vw 0 0 0;
+			.swiper {
+				height: 65vw;
 
-				.image {
-					width: 15vw;
-					height: 15vw;
-					border-radius: 15vw;
-					box-shadow: 0 0 5px var(--f1Color);
+				.list {
+					.image {
+						width: 100%;
+						height: 100%;
+					}
 				}
-				.text{
-					font-size: var(--font14Size);
-					margin-top: 5px;
-					color: var(--f85Color);
+			}
+		}
+
+		.two {
+
+			.swiper {
+				height: 45vw;
+
+				.swiper-item {
+					display: flex;
+					flex-direction: column;
+					flex-wrap: wrap;
+
+					.list {
+						display: flex;
+						flex-direction: column;
+						justify-content: space-between;
+						align-items: center;
+						width: 20vw;
+						padding: 1vw 0 0 0;
+
+						.image {
+							width: 15vw;
+							height: 15vw;
+							border-radius: 15vw;
+							box-shadow: 0 0 5px var(--f1Color);
+						}
+
+						.text {
+							font-size: var(--font14Size);
+							margin-top: 5px;
+							color: var(--f85Color);
+						}
+					}
 				}
 			}
 		}

pages/index/index.vue

@@ -23,7 +23,7 @@
 				const that = this;
 				let res = await that.$api(`/config`, 'GET', {});
 				if (res.errcode == '0') {
-					that.$set(that, `logoUrl`, res.data.file[0].url);
+					that.$set(that, `logoUrl`, res.data.logo_url[0].url);
 					let url = `/pages/home/index`;
 					uni.reLaunch({
 						url
@@ -39,7 +39,7 @@
 		display: flex;
 		flex-direction: column;
 		width: 100vw;
-		height: 100vh;
+		height: 100vh;
 
 		.one {
 			text-align: center;

unpackage/dist/dev/mp-weixin/common/main.wxss

@@ -2431,6 +2431,16 @@
   align-items: normal !important;
   box-sizing: border-box;
 }
+wx-swiper .wx-swiper-dot {
+  width: 30rpx;
+  height: 4rpx;
+  border-radius: 10rpx;
+}
+wx-swiper .wx-swiper-dot-active {
+  background-color: #ffffff;
+  width: 50rpx;
+  border-radius: 10rpx;
+}
 /* 设置整个项目的公用样式*/
 page {
   /* 窗口可用高度 */

unpackage/dist/dev/mp-weixin/common/runtime.js

@@ -105,11 +105,11 @@
 /******/
 /******/
 /******/ 		// mini-css-extract-plugin CSS loading
-/******/ 		var cssChunks = {"components/swiper/index":1};
+/******/ 		var cssChunks = {"components/tabs/index":1};
 /******/ 		if(installedCssChunks[chunkId]) promises.push(installedCssChunks[chunkId]);
 /******/ 		else if(installedCssChunks[chunkId] !== 0 && cssChunks[chunkId]) {
 /******/ 			promises.push(installedCssChunks[chunkId] = new Promise(function(resolve, reject) {
-/******/ 				var href = "" + ({"components/swiper/index":"components/swiper/index"}[chunkId]||chunkId) + ".wxss";
+/******/ 				var href = "" + ({"components/tabs/index":"components/tabs/index"}[chunkId]||chunkId) + ".wxss";
 /******/ 				var fullhref = __webpack_require__.p + href;
 /******/ 				var existingLinkTags = document.getElementsByTagName("link");
 /******/ 				for(var i = 0; i < existingLinkTags.length; i++) {

unpackage/dist/dev/mp-weixin/components/swiper/index.json

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

unpackage/dist/dev/mp-weixin/components/swiper/index.wxss

@@ -1,66 +0,0 @@
-
-.image-container.data-v-731911b6 {
-	width: 750rpx;
-	height: 350rpx;
-}
-.item-img.data-v-731911b6 {
-	width: 630rpx;
-	height: 300rpx;
-	border-radius: 14rpx;
-	-webkit-animation: to-big-data-v-731911b6 .3s;
-	        animation: to-big-data-v-731911b6 .3s;
-}
-.swiper-item.data-v-731911b6 {
-	width: 630rpx;
-	height: 300rpx;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-}
-.item-img-side.data-v-731911b6 {
-	width: 630rpx;
-	height: 260rpx;
-	border-radius: 14rpx;
-	-webkit-animation: to-mini-data-v-731911b6 .3s;
-	        animation: to-mini-data-v-731911b6 .3s;
-}
-.swiper-item-side.data-v-731911b6 {
-	width: 630rpx;
-	height: 260rpx;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-}
-@-webkit-keyframes to-mini-data-v-731911b6 {
-from {
-		height: 300rpx;
-}
-to {
-		height: 260rpx;
-}
-}
-@keyframes to-mini-data-v-731911b6 {
-from {
-		height: 300rpx;
-}
-to {
-		height: 260rpx;
-}
-}
-@-webkit-keyframes to-big-data-v-731911b6 {
-from {
-		height: 260rpx;
-}
-to {
-		height: 300rpx;
-}
-}
-@keyframes to-big-data-v-731911b6 {
-from {
-		height: 260rpx;
-}
-to {
-		height: 300rpx;
-}
-}
-

unpackage/dist/dev/mp-weixin/components/tabs/index.wxss

@@ -0,0 +1,23 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.tabs .one {
+  padding: 2vw;
+}
+.tabs .one .scrollView {
+  display: flex;
+  white-space: nowrap;
+  text-align: center;
+}
+.tabs .one .list {
+  display: inline-block;
+  padding: 2vw;
+  margin: 0 1.5vw;
+  text-align: center;
+  border-radius: 5px;
+}
+.tabs .one .list text {
+  font-weight: bold;
+  font-size: 14px;
+}
+

unpackage/dist/dev/mp-weixin/pages/home/index.json

@@ -2,6 +2,6 @@
   "navigationBarTitleText": "神鹿峰旅游度假区",
   "enablePullDownRefresh": true,
   "usingComponents": {
-    "swiper": "/components/swiper/index"
+    "tabs": "/components/tabs/index"
   }
 }

unpackage/dist/dev/mp-weixin/pages/home/index.wxss

@@ -1,35 +1,25 @@
 @charset "UTF-8";
 /* 水平间距 */
 /* 水平间距 */
-.tabs .one {
-  padding: 2vw;
+.main .one {
+  padding: 0 0 2vw 0;
 }
-.tabs .one .scrollView {
-  display: flex;
-  white-space: nowrap;
-  text-align: center;
+.main .one .swiper {
+  height: 65vw;
 }
-.tabs .one .list {
-  display: inline-block;
-  padding: 2vw;
-  margin: 0 1.5vw;
-  text-align: center;
-  border-radius: 5px;
+.main .one .swiper .list .image {
+  width: 100%;
+  height: 100%;
 }
-.tabs .one .list text {
-  font-weight: bold;
-  font-size: 14px;
+.main .two .swiper {
+  height: 45vw;
 }
-
-@charset "UTF-8";
-/* 水平间距 */
-/* 水平间距 */
-.main .two {
+.main .two .swiper .swiper-item {
   display: flex;
+  flex-direction: column;
   flex-wrap: wrap;
-  padding: 8vw 0 2vw 0;
 }
-.main .two .list {
+.main .two .swiper .swiper-item .list {
   display: flex;
   flex-direction: column;
   justify-content: space-between;
@@ -37,13 +27,13 @@
   width: 20vw;
   padding: 1vw 0 0 0;
 }
-.main .two .list .image {
+.main .two .swiper .swiper-item .list .image {
   width: 15vw;
   height: 15vw;
   border-radius: 15vw;
   box-shadow: 0 0 5px var(--f1Color);
 }
-.main .two .list .text {
+.main .two .swiper .swiper-item .list .text {
   font-size: var(--font14Size);
   margin-top: 5px;
   color: var(--f85Color);

unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -196,7 +196,7 @@ var _default = {
               case 3:
                 res = _context2.sent;
                 if (res.errcode == '0') {
-                  that.$set(that, "logoUrl", res.data.file[0].url);
+                  that.$set(that, "logoUrl", res.data.logo_url[0].url);
                   url = "/pages/home/index";
                   uni.reLaunch({
                     url: url