From 9b3fa3663b5f6cbcbdfd03dd78a911e7ace51e03 Mon Sep 17 00:00:00 2001
From: 15870290085 <ZHENAI157135>
Date: Wed, 26 May 2021 15:16:42 +0800
Subject: [PATCH] =?UTF-8?q?fix(index):=20=E7=AD=9B=E9=80=89=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E5=AE=9A=E4=BD=8D=EF=BC=8Capi=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                       |   9 +-
 api/README.md                                 | 177 --------
 api/index.js                                  |  59 ++-
 api/request.js                                | 102 +++--
 api/requestAxios.js                           | 202 ---------
 cliShell/comTem/README.md                     |  37 --
 cliShell/comTem/index.vue                     |  32 --
 cliShell/createComponent.js                   | 308 -------------
 cliShell/pageTem/page.vue                     |  23 -
 components/c-ad/index.vue                     |   4 +-
 components/c-help-list/index.vue              |   2 +-
 components/c-images-grid/index.vue            |   4 +-
 components/c-map/index.vue                    |  23 +-
 components/c-page/index.vue                   |  48 +-
 components/c-tabbar-popup/index.vue           |   9 +-
 package.json                                  |  13 +-
 .../index/components/screenControls/index.vue | 206 +++++++++
 .../components/selectLocaltion/index.vue      |  44 ++
 pages/index/index.vue                         | 143 ++----
 pages/login/WXLogin.vue                       |   5 +-
 store/index.js                                |  11 +-
 uview-ui/components/u-search/u-search.vue     |   1 -
 yarn.lock                                     | 422 ++----------------
 23 files changed, 529 insertions(+), 1355 deletions(-)
 delete mode 100644 api/README.md
 delete mode 100644 api/requestAxios.js
 delete mode 100644 cliShell/comTem/README.md
 delete mode 100644 cliShell/comTem/index.vue
 delete mode 100644 cliShell/createComponent.js
 delete mode 100644 cliShell/pageTem/page.vue
 create mode 100644 pages/index/components/screenControls/index.vue
 create mode 100644 pages/index/components/selectLocaltion/index.vue

diff --git a/App.vue b/App.vue
index 914d886..ea61fb7 100644
--- a/App.vue
+++ b/App.vue
@@ -3,9 +3,9 @@
 @import "./assets/styles/global.scss";
 @import "uview-ui/index.scss";
 /* 使用手机系统的字体 */
-input,page{
+/*input,page{
   font-family:Monospaced Number,Chinese Quote,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,PingFang SC,Hiragino Sans GB,Microsoft YaHei,Helvetica Neue,Helvetica,Arial,sans-serif!important;
-}
+}*/
 </style>
 
 <script>
@@ -19,7 +19,9 @@ export default {
 
     }else {
       //转跳的login
-
+uni.reLaunch({
+      url: '/pages/login/WXLogin'
+    });
     }*/
     uni.reLaunch({
       url: '/pages/login/WXLogin'
@@ -27,6 +29,7 @@ export default {
 
 
 
+
     // #ifdef MP-WEIXIN
     Vue.prototype.VIEWTYPE = "MP-WEIXIN"
     // #endif
diff --git a/api/README.md b/api/README.md
deleted file mode 100644
index 3fd42be..0000000
--- a/api/README.md
+++ /dev/null
@@ -1,177 +0,0 @@
-# 欢迎使用 uni_request.js
-
-最近在使用uni-app开发应用，因为用axios用的太顺手了，就对uni.request方法做了一个封装，使其使用起来和axios的方法和效果一样。因为是自己现做现用，api设计的都比较简单，代码不也不复杂，但是却很实用。如有BUG，还请不吝指出，非常感谢。
-
-### 主要功能：
-
-- 支持异步拦截器（请求/响应拦截器中支持异步操作并阻塞）
-- 支持Promise 操作，错误捕获
-- 支持全局错误监听
-- 支持文件上传/下载
-- 支持主动取消请求（包括普通请求 GET POST 等）
-- 支持超时取消
-
-------
-
-# 封装
-
-## 初始化
-
-```js
-import uni_request from './uni_request.js'
-
-const request = uni_request({ // 有效配置项只有三个
-	baseURL: 'http://192.168.0.13/dwbsapp', //baseURL
-	timeout: 12345, // 超时时间，单位毫秒。默认 60 秒
-	header: { 'x-custom-header': 'x-custom-header' }, // 设置请求头，建议放在请求拦截器中
-	statusCode: [200, 401] // 服务器相应状态码为 200/401 时，网络请求不会 reject。也就是不会被 catch 到。如响应 401 时可以在响应拦截后 await 刷新 token + await 重新请求 + return response。即可实现无痛刷新。 
-})
-```
-
-## 请求拦截器
-
-可以设置多个, 同时可以也可以使用异步方法。拦截器回调函数接受4个参数，分别是 config, method, url, data。其中 config 中包含请求头和请求体（ uploadFile()请求的请求体只包含 formData 部分），同时也可以在请求拦截器中取消请求：
-
-```js
-request.interceptors.request.use(async (config, ...args) => {
-	await new Promise(resolve => setTimeout(() => resolve(), 3000))
-	console.log('请求拦截器, 网络请求会等 3 秒后上面的异步任务结束后执行') // args[0] method args[1] url args[3] data
-	config.header.Authorization = 'Bearer ' + $store.state.app.token // 修改请求头
-	config.body.test = 'test' // 修改请求体
-	// config.cancel = true // 取消请求
-	return config
-})
-```
-
-## 响应拦截器
-
-响应拦截器（可以设置多个, 同时可以也可以使用异步方法。拦截器回调函数接受4个参数，分别是 response, method, url, data：
-
-```js
-request.interceptors.response.use(async (response, ...args) => { // 响应拦截器（可以设置多个, 同时可以也可以使用异步方法）
-	const { data: res } = response // args[0] method args[1] url args[3] data
-	await new Promise(resolve => setTimeout(() => resolve(), 3000))
-	if (res.code === 200) {
-		console.log('响应拦截器， 会阻塞 3 s')
-	}
-	return response
-})
-```
-
-## 全局错误监听
-
-当某个请求出现 请求失败、超时、服务器请求异常、主动取消等都会触发 onerror 方法。onerror 接收4个参数，分别是 method url data reason（失败原因）。 onerror 事件一个 request 实例只能设置一个，后设置的会覆盖前面的。onerror 中也支持异步操作：
-
-```js
-request.onerror = async (...args) => { // 请求失败统一处理方法（可以也可以使用异步方法）
-	console.log('网络请求失败了', `url为${args[1]}`)
-}
-```
-
-# 使用
-
-## 基本使用
-
-```js
-request.get('/').then(res => {
-	console.log(res)
-}).catch(e => console.error(e))
-
-request.get('http://xxx.com').then(res => { // 也可以使用配置的 baseURL 之外的 url，但是注意 url 路径要写完整
-	console.log(res)
-}).catch(e => console.error(e))
-```
-
-## 高级使用
-
-request[method] 最多可以接受 5 个参数。本别是：
-
-| 参数         | 类型    | 备注                 | 默认值 |
-| ------------ | ------- | -------------------- | ------ |
-| url          | String  | url                  | 必填   |
-| data         | Object  | data                 | {}     |
-| header       | Object  | 自定义请求头         | {}     |
-| reqIntercept | Boolean | 是否被请求拦截器拦截 | false  |
-| resIntercept | Boolean | 是否被响应拦截器拦截 | false  |
-
-```js
-request.get('/', { name: 'zhangsan' }, { 'Content-Type': 'application/x-www-form-urlencoded' }, true, true).then(res => {
-	console.log(res)
-}).catch(e => console.error(e)) // 此请求不被被任意拦截器拦截
-```
-
-## 取消请求
-
-如果想要取消某个请求，需要在 then 之前将 request.get 方法返回的 promise 对象保存在一个变量里。在需要的时候调用 abort 方法，会使当前网络请求取消并且使 request.get 方法返回的 promise 进入 reject 状态，可被 catch 捕获，错误信息为 【网络请求失败：主动取消】。如果在请求拦截器的异步期间取消，那么会在请求拦截器的异步操作结束后直接使返回的 Promise 进入 reject 状态，并不会发出网络请求
-
-```js
-const task = request.get('/abort') 
-task.then(res => {
-	console.log(res)
-}).catch(e => console.error(e)) // 网络请求失败：主动取消
-task.abort()
-```
-
-## 上传下载
-
-### 上传
-
-上传文件仅支持单文件上传，uploadFile() 方法接受两个参数：url 和 config。config 中有效配置项有四个，分别是：name filePaht header formData：
-
-```js
-request.uploadFile('/upload', {
-	name: 'img',
-	filePath: 'tempFilePath',
-	formData: {
-		a: 1,
-		b: 2
-	},
-	header: {}
-}).then(res => ...).catch(e => console.error(e))
-```
-
-### 下载
-
-uploadFile() 方法接受两个参数：url 和 config。config 中有效配置项只有有一个 header ：
-
-```js
-request.uploadFile('/download', {
-	header: {}
-}).then(res => {
-	console.log(res) // cookies: [], errMsg: "downloadFile:ok", header: { ... },statusCode: 200, tempFilePath: "http://tmp/w...d2.jpg"
-}).catch(e => console.error(e))
-```
-
-### 取消上传/下载
-
-和普通请求取消一样。也需要在 then 之前将 request 方法返回的 promise 对象保存在一个变量里。在需要的时候调用 abort 方法。
-
-```js
-const task = request.uploadFile('/download', {
-	header: {}
-})
-task.then(res => {
-	console.log(res) // cookies: [], errMsg: "downloadFile:ok", header: { ... },statusCode: 200, tempFilePath: "http://tmp/w...d2.jpg"
-}).catch(e => console.error(e))
-
-task.abort() // 取消上传/下载
-```
-
-### 监听上传/下载进度
-
-和请求取消一样。也需要在 then 之前将 request 方法返回的 promise 对象保存在一个变量里。
-
-```js
-const task = request.uploadFile('/download', {
-	header: {}
-})
-task.then(res => {
-	console.log(res) // cookies: [], errMsg: "downloadFile:ok", header: { ... },statusCode: 200, tempFilePath: "http://tmp/w...d2.jpg"
-}).catch(e => console.error(e))
-
-fileU.onProgressUpdate(e => console.log(e)) // { progress: 2， totalBytesExpectedToSend: 1254676， totalBytesSent: 35244 }
-```
-
-### 注意事项
-
-#### 默认所有服务器响应不为 [200, 401] 的请求会被视为请求失败，会被 catch 和被 onerror 监听，如果想要更多请求不被 catch 。可以在实例化时配置 statusCode: [201, 302, ...]
\ No newline at end of file
diff --git a/api/index.js b/api/index.js
index 3eee6dc..a9bc15d 100644
--- a/api/index.js
+++ b/api/index.js
@@ -1,43 +1,66 @@
 import request from './request.js'
+import queryParams from '../uview-ui/libs/function/queryParams.js'
 
+//帮助
+//查询帮助列表
+export const getHelpListApi = (params)=>request.get("/information/page",{params})
+//获取指定id帮助详情
+export const getInfoApi = (informationId)=>request.get("/information/InformationById",{params:{informationId}})
+export const setCommentsApi = (params)=>request.get("/information/addConments", {params})
+export const userReceiveApi = (typeId)=>request.get("/user/myreceive",{params:{typeId}})
+export const userReleaseApi = (typeId)=>request.get("/user/myPublish",{params:{typeId}})
+export const addInformationApi = (params)=>request.post("/information/addInformation", params)
+export const getTagsApi = (params)=>request.get("/information/getTag", {params})
+export const getTypeApi = (params)=>request.get("/information/type", {params})
+export const receiveInformationApi = (informationId)=>request.get("/information/receiveInforation",{params:{informationId}})
+export const CancelReceiveInforationApi = (informationId)=>request.get("/information/CancelReceiveInforation",{params:{informationId}})
+export const completeInformationApi = (informationId)=>request.get("/information/completeInformation",{params:{informationId}})
+export const deleteInformationApi = (informationId)=>request.get("/information/deleteInformation",{params:{informationId}})
+export const WXLoginApi = (params)=>request.post("/user/Thirdlogin",params)
+export const AutoLoginApi = (params)=>request.get("/user/AutoLogin", {params})
+export const getCheckUserApi = (userId)=>request.get("/user/CheckUser",{params:{userId}})
+export const getUserPhoneApi = (userId)=>request.get("/user/UserPhone",{params:{userId}})
+export const addAuthenticationApi = (params)=>request.post("/authentication/addAuthentication",params)
+export const addReportUserApi = (params)=>request.post("/ReportUser/addReportUser",params)
 export const home = {
-    getHelpList: (params)=>request.get("/information/page",params),
+    getHelpList: getHelpListApi,
 }
 
 export const helpInfo = {
-    getInfo:(informationId)=>request.get("/information/InformationById",{informationId}),
-    setComments:(params)=>request.get("/information/addConments",params),
-    userReceive: (typeId)=>request.get("/user/myreceive",{typeId}),
-    userRelease: (typeId)=>request.get("/user/myPublish",{typeId})
+    getInfo:getInfoApi,
+    setComments:setCommentsApi,
+    userReceive: userReceiveApi,
+    userRelease: userReleaseApi
 }
 
 export const helpForm = {
-    addInformation: (params)=>request.post("/information/addInformation",params),
-    getTags: (params)=>request.get("/information/getTag",params),
-    getType: (params)=>request.get("/information/type",params),
-    receiveInformation: (informationId)=>request.get("/information/receiveInforation",{informationId}),
-    CancelReceiveInforation: (informationId)=>request.get("/information/CancelReceiveInforation",{informationId}),
-    completeInformation: (informationId)=>request.get("/information/completeInformation",{informationId}),
-    deleteInformation:(informationId)=>request.get("/information/deleteInformation",{informationId})
+    addInformation: addInformationApi,
+    getTags: getTagsApi,
+    getType: getTypeApi,
+    receiveInformation: receiveInformationApi,
+    CancelReceiveInforation: CancelReceiveInforationApi,
+    completeInformation: completeInformationApi,
+    deleteInformation:deleteInformationApi
 }
 
 export const login = {
-    WXLogin: (params)=>request.post("/user/Thirdlogin",params),
-    AutoLogin: (params)=>request.get("/user/AutoLogin",params)
+    WXLogin: WXLoginApi,
+    AutoLogin: AutoLoginApi
 }
 
 export const userInfo = {
-    getCheckUser: (userId)=>request.get("/user/CheckUser",{userId}),
-    getUserPhone: (userId)=>request.get("/user/UserPhone",{userId})
+    getCheckUser: getCheckUserApi,
+    getUserPhone: getUserPhoneApi
 }
 
 //实名认证
 export const authentication = {
-    addAuthentication: (params)=>request.post("/authentication/addAuthentication",params),
+    addAuthentication: addAuthenticationApi
 }
 
 //举报
 export const ReportUser = {
-    addReportUser: (params)=>request.post("/ReportUser/addReportUser",params),
+    addReportUser: addReportUserApi
+
 }
 
diff --git a/api/request.js b/api/request.js
index bccb063..32b1d64 100644
--- a/api/request.js
+++ b/api/request.js
@@ -1,40 +1,88 @@
-import uni_request from './requestAxios.js'
-import Vue from "vue"
+import Request from 'luch-request'
 import store from "../store"
 import {URL} from '../config'
 
-const request = uni_request({ // 有效配置项只有三个
-    baseURL: URL.apiServer, //baseURL
-    timeout: 12345, // 超时时间，单位毫秒。默认 60 秒
-    header: {'x-custom-header': 'x-custom-header'}, // 设置请求头，建议放在请求拦截器中
-    statusCode: [200, 401] // 服务器相应状态码为 200/401 时，网络请求不会 reject。也就是不会被 catch 到。如响应 401 时可以在响应拦截后 await 刷新 token + await 重新请求 + return response。即可实现无痛刷新。
-})
+const request = new Request({
+    baseURL: URL.apiServer,
+    header: {},
+    dataType: 'json',
+    // 注：如果局部custom与全局custom有同名属性，则后面的属性会覆盖前面的属性，相当于Object.assign(全局，局部)
+    custom: {}, // 全局自定义参数默认值
+    // #ifdef H5 || APP-PLUS || MP-ALIPAY || MP-WEIXIN
+    timeout: 60000,
+    // #endif
+    // #ifdef APP-PLUS
+    sslVerify: true,
+    // #endif
+    // #ifdef H5
+    // 跨域请求时是否携带凭证（cookies）仅H5支持（HBuilderX 2.6.15+）
+    withCredentials: false,
+    // #endif
+    // #ifdef APP-PLUS
+    firstIpv4: false, // DNS解析时优先使用ipv4 仅 App-Android 支持 (HBuilderX 2.8.0+)
+    // #endif
+    // 局部优先级高于全局，返回当前请求的task,options。请勿在此处修改options。非必填
+    // getTask: (task, options) => {
+    // 相当于设置了请求超时时间500ms
+    //   setTimeout(() => {
+    //     task.abort()
+    //   }, 500)
+    // },
+    // 全局自定义验证器。参数为statusCode 且必存在，不用判断空情况。
+    validateStatus: (statusCode) => { // statusCode 必存在。此处示例为全局默认配置
+        return (statusCode >= 200 && statusCode < 300)/* || statusCode===401*/
+    }
+});
 
-request.interceptors.request.use(async (config, ...args) => {
-    //await new Promise(resolve => setTimeout(() => resolve()))
-    //config.header.Authorization = 'Bearer ' + $store.state.app.token // 修改请求头
-    //config.body.test = 'test' // 修改请求体
-    // config.cancel = true // 取消请求
-    config.header.token = store.state.token
+
+request.interceptors.request.use((config) => { // 可使用async await 做异步操作
+    config.custom = {responseInterceptors:true,token:true,...config.custom}
+    //不需要token
+    if(!config.custom.token){
+        config.header = {
+            ...config.header,
+        }
+    }else{
+        if(!store.state.token){
+            console.warn(`Request Warn:${config.url}需要token，但是我们没有找到token的存在。`)
+            config.header = {
+                ...config.header
+            }
+        }else {
+            config.header = {
+                ...config.header,
+                token: store.state.token,
+            }
+        }
+    }
+    //表面该接口使用loading
+    if(config.custom.loading){
+        uni.showLoading({title:config.custom.loading})
+    }
     return config
+}, config => {
+    return Promise.reject(config)
 })
 
-request.interceptors.response.use(async (response, ...args) => { // 响应拦截器（可以设置多个, 同时可以也可以使用异步方法）
-    const {data: res} = response // args[0] method args[1] url args[3] data
-    //await new Promise(resolve => setTimeout(() => resolve(), 3000))
-    if (res.token) {
-        store.commit("setToken",res.token)
+request.interceptors.response.use((response) => {
+    if(response.data.token){
+        store.commit("setToken",response.data.token)
+    }
+    //表明改接口不需要经过拦截器
+    if(!response.config.custom.responseInterceptors){
+        return response
     }
-    if (res.statusCode === 401 && !args[1].endsWith("AutoLogin")) {
-        //console.log('响应拦截器， 会阻塞 3 s')
-        uni.navigateTo({url:"/pages/login/login"})
+    //表面该接口使用loading
+    if(response.config.custom.loading){
+        uni.hideLoading()
     }
-    return response
+    return response.data
+}, (response) => {
+    if(response.config.custom.loading){
+        uni.hideLoading()
+    }
+    return Promise.reject(response)
 })
 
-request.onerror = async (...args) => { // 请求失败统一处理方法（可以也可以使用异步方法）
-    console.error('网络请求失败了', `url为${args[1]}`,args)
-}
-
 
 export default request;
diff --git a/api/requestAxios.js b/api/requestAxios.js
deleted file mode 100644
index a8d3098..0000000
--- a/api/requestAxios.js
+++ /dev/null
@@ -1,202 +0,0 @@
-export default function ({baseURL, timeout = 56 * 1000, header: headers, statusCode = [200, 401]}) {
-    return {
-        get(url, data, header, ...args) {
-            return this.request('GET', url, data, {...header, ...headers}, ...args)
-        },
-        post(url, data, header, ...args) {
-            return this.request('POST', url, data, {...header, ...headers}, ...args)
-        },
-        put(url, data, header, ...args) {
-            return this.request('PUT', url, data, {...header, ...headers}, ...args)
-        },
-        delete(url, data, header, ...args) {
-            return this.request('DELETE', url, data, {...header, ...headers}, ...args)
-        },
-        connect(url, data, header, ...args) {
-            return this.request('CONNECT', url, data, {...header, ...headers}, ...args)
-        },
-        head(url, data, header, ...args) {
-            return this.request('HEAD', url, data, {...header, ...headers}, ...args)
-        },
-        options(url, data, header, ...args) {
-            return this.request('OPTIONS', url, data, {...header, ...headers}, ...args)
-        },
-        reace(url, data, header, ...args) {
-            return this.request('TRACE', url, data, {...header, ...headers}, ...args)
-        },
-        uploadFile(url, data, header, ...args) {
-            return this.file('uploadFile', url, data || {}, {...header, ...headers}, ...args)
-        },
-        downloadFile(url, data, header, ...args) {
-            return this.file('downloadFile', url, data || {}, {...header, ...headers}, ...args)
-        },
-        onerror: () => {
-        }, // 请求错误钩子函数集合
-        file(method, url, data, header, reqIntercept, resIntercept) {
-            let timer, // timer 检测超时定时器
-                requestTask, // requestTask 网络请求 task 对象
-                aborted = false, // aborted 请求是否已被取消
-                overtime = false, // overtime 请求是否超时
-                abort = () => { // abort 取消请求方法
-                    aborted = true // 将请求状态标记为已取消
-                    requestTask ? requestTask.abort() : '' // 执行取消请求方法
-                },
-                progressUpdateHandle,
-                onProgressUpdate = e => progressUpdateHandle = e // progressUpdateHandle 监听上传进度变化回调，onProgressUpdate 监听上传进度变化方法
-            return new Proxy(new Promise((resolve, reject) => { // 返回经过 Proxy 后的 Promise 对象使其可以监听到是否调用 abort 和 onProgressUpdate 方法
-                this.interceptors.request.intercept({
-                    header: header || {},
-                    body: data.formData || {}
-                }, method, url, data, reqIntercept)
-                    .then(async ({header, body, cancel}) => { // 等待请求拦截器里的方法执行完
-                        if (aborted || cancel) { // 如果请求已被取消,停止执行,返回 reject
-                            await this.onerror(method, url, data, '网络请求失败：主动取消')
-                            return reject('网络请求失败：主动取消')
-                        }
-                        requestTask = uni[method]({
-                            url: url[0] === '/' ? baseURL + url : url,
-                            name: data.name,
-                            header,
-                            filePath: data.filePath,
-                            formData: body,
-                            success: async res => {
-                                clearTimeout(timer)
-                                !statusCode.includes(res.statusCode) ? await this.onerror(method, url, data, `网络请求异常：服务器响应异常：状态码：${res.statusCode}`) : '',
-                                    this.interceptors.response.intercept(statusCode.includes(res.statusCode) ? resolve : reject, {
-                                        success: statusCode.includes(res.statusCode), ...res,
-                                    }, method, url, data, reject, resIntercept) // 执行响应拦截器
-                            },
-                            fail: async res => {
-                                clearTimeout(timer)
-                                !overtime && await this.onerror(method, url, data, aborted ? '网络请求失败：主动取消' : '网络请求失败：（URL无效|无网络|DNS解析失败）')
-                                aborted ? reject('网络请求失败：主动取消') : reject('网络请求失败：（URL无效|无网络|DNS解析失败）')
-                            }
-                        })
-                        requestTask.onProgressUpdate(progressUpdateHandle) // 监听下载进度变化
-                        timer = setTimeout(async () => { // 请求超时执行方法
-                            overtime = true // 将状态标记为超时，不会被 fail 中的 onerror 重复执行
-                            requestTask.abort() // 执行取消请求方法
-                            await this.onerror(method, url, data, '网络请求失败：超时取消')
-                            reject('网络请求时间超时') // reject 原因
-                        }, timeout) // 设定检测超时定时器
-                    })
-            }), {
-                get: (target, prop) => {
-                    if (prop === 'abort') {
-                        return abort
-                    } else {
-                        if (Reflect.get(target, prop) && Reflect.get(target, prop).bind) {
-                            return Reflect.get(target, prop)
-                                .bind(target)
-                        } else {
-                            return Reflect.get(target, prop)
-                        }
-                    }
-                }
-            }) // 如果调用 cancel 方法,返回 _watcher.cancel 方法
-        },
-        request(method, url, data, header, reqIntercept, resIntercept) {
-            let timer, // timer 检测超时定时器
-                requestTask, // requestTask 网络请求 task 对象
-                aborted = false, // aborted 请求是否已被取消
-                overtime = false, // overtime 请求是否超时
-                abort = () => { // timer 检测超时定时器，requestTask 网络请求 task 对象，aborted 请求是否已被取消，abort 取消请求方法
-                    aborted = true // 将请求状态标记为已取消
-                    requestTask ? requestTask.abort() : '' // 执行取消请求方法
-                }
-            return new Proxy(new Promise((resolve, reject) => { // 返回经过 Proxy 后的 Promise 对象使其可以监听到是否调用 abort 方法
-                this.interceptors.request.intercept({
-                    header: header || {},
-                    body: data || {}
-                }, method, url, data, reqIntercept)
-                    .then(async ({header, body: data, cancel}) => { // 等待请求拦截器里的方法执行完
-                        if (aborted || cancel) { // 如果请求已被取消,停止执行,返回 reject
-                            await this.onerror(method, url, data, '网络请求失败：主动取消')
-                            return reject('网络请求失败：主动取消')
-                        }
-                        requestTask = uni.request({
-                            url: url[0] === '/' ? baseURL + url : url,
-                            data, method, header,
-                            success: async res => { // 网络请求成功
-                                clearTimeout(timer) // 清除检测超时定时器
-                                !statusCode.includes(res.statusCode) ? await this.onerror(method, url, data, `网络请求异常：服务器响应异常：状态码：${res.statusCode}`) : ''
-                                this.interceptors.response.intercept(statusCode.includes(res.statusCode) ? resolve : reject, {
-                                    success: statusCode.includes(res.statusCode), ...res,
-                                }, method, url, data, reject, resIntercept) // 执行响应拦截器
-                            },
-                            fail: async res => { // 网络请求失败
-                                clearTimeout(timer) // 清除检测超时定时器
-                                !overtime && await this.onerror(method, url, data, aborted ? '网络请求失败：主动取消' : '网络请求失败：（URL无效|无网络|DNS解析失败）')
-                                aborted ? reject('网络请求失败：主动取消') : reject('网络请求失败：（URL无效|无网络|DNS解析失败）')
-                            }
-                        })
-                        timer = setTimeout(async () => { // 请求超时执行方法
-                            overtime = true // 将状态标记为超时，不会被 fail 中的 onerror 重复执行
-                            requestTask.abort() // 执行取消请求方法
-                            await this.onerror(method, url, data, '网络请求失败：超时取消')
-                            reject('网络请求时间超时') // reject 原因
-                        }, timeout || 12345) // 设定检测超时定时器
-                    })
-            }), {
-                get: (target, prop) => {
-                    if (prop === 'abort') {
-                        return abort
-                    } else {
-                        if (Reflect.get(target, prop) && Reflect.get(target, prop).bind) {
-                            return Reflect.get(target, prop)
-                                .bind(target)
-                        } else {
-                            return Reflect.get(target, prop)
-                        }
-                    }
-                }
-            }) // 如果调用 abort 方法,返回 abort 方法
-        },
-        interceptors: { // 拦截器
-            request: {
-                interceptors: [],
-                use(fun) {
-                    this.interceptors.push(fun)
-                },
-                async intercept(config, method, url, data, reqIntercept) {
-                    if (!reqIntercept) { // 如果请求允许被拦截
-                        for (let i = 0; i < this.interceptors.length; i++) {
-                            config = await this.interceptors[i](config, method, url, data)
-                        }
-                    }
-                    return config
-                }
-            },
-            response: {
-                interceptors: [],
-                use(fun) {
-                    this.interceptors.push(fun)
-                },
-                async intercept(STATUS, response, method, url, data, reject, resIntercept) {
-                    try {
-                        if (!resIntercept) { // 如果请求允许被拦截
-                            for (let i = 0; i < this.interceptors.length; i++) {
-                                response = await this.interceptors[i](response, method, url, data)
-                            }
-                        }
-                        if (response.success) {
-                            if(typeof response.data === 'string'){
-                                try {
-                                    return STATUS(JSON.parse(response))
-                                }catch (e){
-                                    return STATUS(response)
-                                }
-                            }
-                            return STATUS(response)
-                        } else {
-                            delete response.success
-                            return STATUS(response, method, url, data)
-                        }
-                    } catch (e) {
-                        reject(e)
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/cliShell/comTem/README.md b/cliShell/comTem/README.md
deleted file mode 100644
index 9ae7725..0000000
--- a/cliShell/comTem/README.md
+++ /dev/null
@@ -1,37 +0,0 @@
-# {{componentName}}
-作者：{{user.name}}
-
-Email: {{user.email}}
-
-这里是 {{componentName}} 组件的基本作用,记得写这个组件是干嘛的。
-
-## 使用方式
-**在 script 中引用组件**
-
-```vue
-import {{componentName1}} from "@/components/{{componentName}}"
-export default {
-    components: { {{componentName1}} }
-}
-```
-
-**在 template 中使用组件**
-
-```vue
-<{{componentName}}></{{componentName}}>
-```
-
-# 属性说明
-
-## props
-|属性名 |是否必填 |	类型 |	默认值 |	说明 |
-|-------|---------|--------|-----|-----|
-|无 |否 |	无 |	无 |	无 |
-
-
-# 事件说明
-
-## event
-| 事件名	| 是否必填	| 事件说明 | 返回参数 |
-|-------|---------|--------|--------|
-|无|否|无|无 |
\ No newline at end of file
diff --git a/cliShell/comTem/index.vue b/cliShell/comTem/index.vue
deleted file mode 100644
index a8068ee..0000000
--- a/cliShell/comTem/index.vue
+++ /dev/null
@@ -1,32 +0,0 @@
-<template>
-  <view {{if config.userStyle}} :style="userStyle" {{/if}} {{if config.className}} :class="className" {{/if}} >
-    <text style="font-size: 20px">{{ msg }}</text>
-  </view>
-</template>
-
-<script>
-export default {
-  name: "{{componentName}}",
-  props: {
-    {{if config.userStyle}}userStyle: {
-      type: String,
-      default: ""
-    },
-{{/if}}{{if config.className}}
-    className: {
-      type: String,
-      default: ""
-    },{{/if}}
-  },
-  data() {
-    return {
-      msg: "{{componentName}}组件\n标题都不写，这不是什么善茬"
-    }
-  },
-  methods: {}
-}
-</script>
-
-<style lang="scss" scoped>
-
-</style>
\ No newline at end of file
diff --git a/cliShell/createComponent.js b/cliShell/createComponent.js
deleted file mode 100644
index 940295c..0000000
--- a/cliShell/createComponent.js
+++ /dev/null
@@ -1,308 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-const template = require('art-template');
-const execa = require("execa");
-const inquirer = require('inquirer');
-const chalk = require('chalk');
-const CPath = chalk.blue.underline.bold;
-const CErr = str => chalk.bgRed.white.bold(" ERROR ") + chalk.red("   " + str)
-const CSuc = chalk.green
-
-
-class FileUtil {
-    constructor(componentsDirPath, componentName, templateDirPath, Prefix, compileData, type) {
-        this.compileData = compileData || {}
-        let keys = Object.keys(compileData)
-        /*        for (let key in compileData) {
-                    keys.push(key)
-                }*/
-        this.Prefix = Prefix
-        if(type === "组件"){
-            console.log(CSuc(`组件前缀:  ${this.Prefix}`))
-        }
-        console.log(CSuc(`本次被检查的模板文件:  ${keys.join(",         ")}`))
-        console.log(CSuc(`${type}  ${this.Prefix + componentName}  开始创建`))
-        this.generate(componentsDirPath, componentName, templateDirPath)
-    }
-
-    //检测文件夹是否存在
-    isDir(DirPath) {
-        return fs.existsSync(DirPath);
-    }
-
-    //生成组件
-    async generate(componentsDirPath, componentName, templateDirPath) {
-        componentName = this.Prefix + componentName;
-        try {
-            if (this.isDir(path.join(componentsDirPath, componentName))) {
-                console.log(CErr(`目标文件夹  ${CPath(path.join(componentsDirPath, componentName))}  已经存在，进程终止`))
-            } else {
-                //对模板文件夹下的所有文件读取并编译并写入目标文件夹
-                for (let fp in this.compileData) {
-                    const dirPath = path.join(componentsDirPath, componentName, fp, "../");
-                    const data = this.compileData[fp]
-                    const filePath = data.fileName ?
-                        path.join(componentsDirPath, componentName, fp, "../", data.fileName) :
-                        path.join(componentsDirPath, componentName, fp)
-                    const templatePath = path.join(templateDirPath, fp);
-                    if (!this.isDir(dirPath)) {
-                        await this.createDir(dirPath)
-                        console.log(CSuc('组件文件夹 ' + CPath(dirPath) + ' 生成!'));
-                    }
-                    console.log(CSuc(`模板文件  ${CPath(templatePath)}  开始编译，目标：${CPath(filePath)}`));
-                    await this.compileFileAndReadPath(templatePath, data, filePath);
-                    console.log(CSuc(`文件  ${CPath(filePath)}  生成!`));
-                    await execa(`git add ${filePath}`);
-                    console.log(CSuc(`git 跟踪文件  ${CPath(filePath)}  成功!`));
-
-                }
-                console.log(CSuc(`组件  ${componentName}  创建完成`))
-            }
-        } catch (e) {
-            console.log(CErr("进程异常终止 错误信息:"), e);
-            console.log(CErr("请手动删除已创建的文件"));
-        }
-
-    }
-
-    createDir(DirPath) {
-        return new Promise(((resolve, reject) => {
-            fs.mkdir(DirPath, function (err, files) {
-                if (err) {
-                    console.log(CErr(`文件夹  ${CPath(DirPath)}  创建失败,进程终止`))
-                    reject(err)
-                } else {
-                    resolve(files)
-                }
-            })
-        }))
-    }
-
-    //编译指定文件并且写入到指定位置
-    async compileFileAndReadPath(filePath, data, readFilePath) {
-        let str = await this.readFile(filePath)
-        str = template.render(str, data)
-        console.log(CSuc(`模板文件  ${CPath(filePath)}  编译成功!`));
-        await this.writeFile(readFilePath, str)
-        return true
-    }
-
-    //读取文件
-    readFile(filePath) {
-        return new Promise((resolve, reject) => {
-            fs.readFile(filePath, function (err, data) {
-                if (err) {
-                    console.log(CErr(`模板文件  ${CPath(filePath)}  读取失败,进程终止`));
-                    reject(err)
-                } else {
-                    resolve(data.toString())
-                }
-            })
-        })
-    }
-
-    //写入文件
-    writeFile(path, data) {
-        return new Promise((resolve, reject) => {
-            fs.writeFile(path, data, 'utf8', function (err) {
-                if (err) {
-                    console.log(CErr(`组件文件 ${CPath(path)} 写入失败,进程终止`));
-                    reject(err)
-                } else {
-                    resolve()
-                }
-            })
-        })
-    }
-}
-
-
-class NameUtil {
-    //testName、TestName    ->  test(join)name
-    static CapitalToLowercaseAndJoin(str, join) {
-        return [...str].map((v, i) => {
-            let charCode = v.charCodeAt()
-            if (charCode >= 65 && charCode <= 90) {
-                if (i === 0) {
-                    return String.fromCharCode(charCode + 32)
-                }
-                return join + String.fromCharCode(charCode + 32)
-            }
-            return v
-        })
-            .join("")
-    }
-
-    //test(join)name    ->  TestName
-    static LowercaseToCapital(str, join) {
-        str = [...str]
-        str.forEach((v, i) => {
-            if (v === join) {
-                let charCode = str[i + 1].charCodeAt()
-                str[i + 1] = String.fromCharCode(charCode - 32)
-            }
-        })
-        return str.filter(v => v !== "-")
-            .join("")
-    }
-
-    //删除一个字符串头部所有的目标字符串
-    static deleteStartsWith(str, start) {
-        if (str.startsWith(start)) {
-            return this.deleteStartsWith(str.slice(2), start)
-        }
-        return str
-    }
-}
-
-
-class Input {
-    getTemplateType() {
-        return new Promise((resolve) => {
-            inquirer.prompt({
-                type: 'list',
-                name: 'getTemplateType',
-                message: '你要创建什么模板',
-                choices: ['组件', '页面'],
-            })
-                .then(answers => {
-                    resolve(answers.getTemplateType)
-                })
-        })
-    }
-
-    async getName(msg) {
-        const {name} = await inquirer.prompt({
-            type: 'input',
-            name: 'name',
-            message: msg,
-        })
-        return name.length ? name : await this.getName();
-    }
-
-    async cct() {
-        let username = await execa("git config user.name")
-        let email = await execa("git config user.email")
-        username = username.stdout
-        email = email.stdout
-        console.log(CSuc(`用户:  ${CPath(username)}  邮箱:  ${CPath(email)}!`))
-        let name = await this.getName('组件名')
-        let {prefix, templateFiles, config} = await inquirer.prompt([
-            {
-                type: 'input',
-                name: 'prefix',
-                message: '前缀',
-                default: function () {
-                    return 'c-';
-                }
-            },
-            {
-                type: 'checkbox',
-                message: '你要创建那些模板文件呢？',
-                name: 'templateFiles',
-                choices: [
-                    new inquirer.Separator('选择你要创建的模板文件'),
-                    {
-                        name: 'index.vue',
-                        checked: true,
-                    },
-                    {
-                        name: 'README.md',
-                        checked: true,
-                    },
-                ],
-            },
-            {
-                type: 'checkbox',
-                message: '配置项',
-                name: 'config',
-                choices: [
-                    new inquirer.Separator('选择你要初始化的配置项'),
-                    {
-                        name: '使用userStyle作为style传递',
-                        value: "userStyle"
-                    },
-                    {
-                        name: '使用className作为class传递',
-                        value: "className"
-                    },
-                ],
-            }
-        ])
-        NameUtil.deleteStartsWith(name, prefix)//TestCom
-        name = NameUtil.CapitalToLowercaseAndJoin(name, "-")//test-com
-        let CasePrefix = prefix.replace(/[^a-zA-Z0-9]/g, "")
-            .toUpperCase();//大写前缀，无符号
-        let componentName1 = NameUtil.LowercaseToCapital(CasePrefix + name, "-")//大写全组件名
-        let componentName = prefix + name//小写前缀拼接后的全组件名
-        let Tconfig = {};
-        config.forEach((item) => {
-            Tconfig[item] = item;
-        })
-        const Files = {//所有模板文件配置项
-            "index.vue": {
-                msg: "{{msg}}",
-                componentName: componentName,
-                config: Tconfig
-            },
-            "README.md": {
-                componentName: componentName,
-                user: {name: username, email: email},
-                componentName1,
-                config: Tconfig
-            },
-        }
-        for (const file in Files) {
-            if (templateFiles.indexOf(file) === -1) {
-                delete Files[file]
-            }
-        }
-        await new FileUtil(path.join(__dirname, "../components"), name, path.join(__dirname, "./comTem"), prefix, Files, "组件")
-
-    }
-
-    async cpt() {
-        let name = await this.getName('页面名')
-        NameUtil.deleteStartsWith(name, "-")
-        name = NameUtil.CapitalToLowercaseAndJoin(name, "-")
-        const {templateFiles} = await inquirer.prompt([{
-            type: 'checkbox',
-            message: '你要创建那些模板文件呢？',
-            name: 'templateFiles',
-            choices: [
-                new inquirer.Separator('选择你要创建的模板文件'),
-                {
-                    name: 'page.vue',
-                    checked: true,
-                }
-            ],
-        }])
-
-        const Files = {
-            'page.vue': {
-                pageName: name,
-                fileName: `${name}.vue`
-            }
-        }
-        for (const file in Files) {
-            if (templateFiles.indexOf(file) === -1) {
-                delete Files[file]
-            }
-        }
-        await new FileUtil(path.join(__dirname, "../pages"), name, path.join(__dirname, "./pageTem"), "", Files, "页面")
-    }
-
-    async ct() {
-        const getTemplateType = await this.getTemplateType()
-        switch (getTemplateType) {
-            case "组件":
-                await this.cct()
-                break;
-            case "页面":
-                await this.cpt()
-                break;
-        }
-    }
-}
-
-new Input().ct()
diff --git a/cliShell/pageTem/page.vue b/cliShell/pageTem/page.vue
deleted file mode 100644
index c1fcdf2..0000000
--- a/cliShell/pageTem/page.vue
+++ /dev/null
@@ -1,23 +0,0 @@
-<template>
-  <c-page ref="page">
-    <text v-text="msg"></text>
-  </c-page>
-</template>
-
-<script>
-export default {
-  name: "{{pageName}}",
-  data() {
-    return {
-      msg: "{{pageName}}页面"
-    }
-  },
-  methods: {},
-  mounted() {},
-  created() {},
-}
-</script>
-
-<style lang="scss" scoped>
-
-</style>
\ No newline at end of file
diff --git a/components/c-ad/index.vue b/components/c-ad/index.vue
index a5da26b..872bd3f 100644
--- a/components/c-ad/index.vue
+++ b/components/c-ad/index.vue
@@ -12,7 +12,7 @@
       indicator-active-color="#DD524D"
     >
       <swiper-item v-for="(item, index) in adImgList" :key="index">
-        <image :src="item.src"></image>
+        <image class="img" :src="item.src"></image>
       </swiper-item>
     </swiper>
     <view class="closeAdButton" @tap="hideAd = true">
@@ -68,7 +68,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-image {
+.img {
   width: 100%;
   height: 100%;
 }
diff --git a/components/c-help-list/index.vue b/components/c-help-list/index.vue
index f88b470..caad46a 100644
--- a/components/c-help-list/index.vue
+++ b/components/c-help-list/index.vue
@@ -226,7 +226,7 @@ export default {
     font-size: 20upx;
     line-height: 24upx;
 
-    > view > text {
+    .item_footer_time {
       margin-right: 18upx;
     }
 
diff --git a/components/c-images-grid/index.vue b/components/c-images-grid/index.vue
index 9094dde..ca81a66 100644
--- a/components/c-images-grid/index.vue
+++ b/components/c-images-grid/index.vue
@@ -1,6 +1,6 @@
 <template>
   <view class="c-images-grid">
-    <view @tap="imgListPreview(index)" v-for="(image,index) in images.map(v=>$c.getImageUrl(v))" :key="index">
+    <view class="item" @tap="imgListPreview(index)" v-for="(image,index) in images.map(v=>$c.getImageUrl(v))" :key="index">
       <view class="imgBox">
         <u-image width="100%" height="100%" :src="image"></u-image>
       </view>
@@ -36,7 +36,7 @@ export default {
   flex-wrap: wrap;
   justify-content: flex-start;
 
-  &>view{
+  .item{
     position: relative;
     width:32.8%;
     padding:32.8% 0 0;
diff --git a/components/c-map/index.vue b/components/c-map/index.vue
index 77c4b7d..a35c503 100644
--- a/components/c-map/index.vue
+++ b/components/c-map/index.vue
@@ -20,7 +20,7 @@
 </template>
 
 <script>
-
+import {mapState, mapMutations} from "vuex"
 export default {
   name: "c-map",
   props: {
@@ -37,9 +37,9 @@ export default {
     return {
       title: 'map',
       mapShow: true,//是否显示地图
-      latitude: 39.909,//默认视野
+      latitude: 26.375082,//默认视野
       scaleState: false,//是否需要归类
-      longitude: 116.39742,//默认视野
+      longitude: 106.623055,//默认视野
       prev: Date.now(),//用于节流的计时器
       scale: 16,//默认缩放级别
       mapControls: [//控件点
@@ -52,6 +52,7 @@ export default {
     }
   },
   methods: {
+    ...mapMutations(['setLocaltion']),
     //方法容器
     init() {
       //定位
@@ -65,11 +66,11 @@ export default {
       uni.getLocation({
         type: "gbs",
         success(e) {
-          console.log("getLocation定位成功");
           if (new Date().getTime() - date1 < time) {
             let {latitude, longitude} = e
             that.latitude = latitude
             that.longitude = longitude
+            that.setLocaltion({latitude, longitude, name:''})
             that.$emit("loadSuccess")
             state = true
           }
@@ -80,7 +81,6 @@ export default {
             that.getMapContext()
                 .moveToLocation({
                   success() {
-                    console.log("moveToLocation定位成功");
                     that.$emit("loadSuccess")
                     state = true
                     clearInterval(Interval)
@@ -102,7 +102,6 @@ export default {
     },
     //视野与当前我的位置回到当前最新位置(节流)
     async goBack() {
-      console.log("c-map goBack");
       return new Promise((resolve, reject) => {
         let newDate = Date.now()
         const that = this;
@@ -133,12 +132,10 @@ export default {
     },
     //获取地图对象
     getMapContext() {
-      console.log("c-map getMapContext");
       return uni.createMapContext("map1", this)
     },
 
     scaleChange() {
-      console.log("c-map scaleChange");
       const that = this;
       this.getMapContext()
           .getScale({
@@ -150,18 +147,22 @@ export default {
 
   },
   computed: {
+    ...mapState(["localtion"]),
     covers(){
       return this.mapCovers
           .filter(value => (value.latitude < 90 && value.latitude > -90) & (value.longitude < 180 && value.longitude > -180))
           .map(value => value)
     }
   },
+  watch:{
+    localtion(newValue){
+      this.latitude = newValue.latitude
+      this.longitude = newValue.longitude
+    }
+  },
   mounted() {
     //当数据与方法可以用时，执行
     this.init()
-  },
-  beforeUpdate() {
-    console.log(this.covers)
   }
 }
 </script>
diff --git a/components/c-page/index.vue b/components/c-page/index.vue
index 377315b..0c3a8a3 100644
--- a/components/c-page/index.vue
+++ b/components/c-page/index.vue
@@ -1,16 +1,18 @@
 <template>
   <view :class="['page']">
     <!--导航栏-->
-    <c-navbar :back-text="$t('page.back')"
+    <c-navbar :back-text="isBack && getBackText"
+              :is-back="isBack"
               title-color="#fff"
               :border-bottom="borderBottom"
               back-icon-color="#fff"
-              :title="title"
+              :title="title || ''"
               :background="{background: 'linear-gradient(to right, #56ccf2, #2f80ed)'}"
               :back-text-style="{color: '#fff'}">
       <template slot="right">
 
       </template>
+      <slot name="nav_left"></slot>
     </c-navbar>
     <!--全局组件-->
     <c-loading :show="loadingState.show" :title="loadingState.title"></c-loading>
@@ -59,8 +61,7 @@ export default {
     },
     title: {
       type: String,
-      default:
-          "首页"
+      default: ""
     },
     tabbar: {
       type: Boolean,
@@ -81,6 +82,10 @@ export default {
     hideScroll:{
       type: Boolean,
       default: true
+    },
+    backText:{
+      type: String,
+      default: "$"
     }
   },
   data() {
@@ -91,6 +96,38 @@ export default {
       }
     }
   },
+  computed:{
+    isBack(){
+      let pages = getCurrentPages();
+      return pages.length>1
+    },
+    //获取上一页的标题
+    getBackText(){
+      if(this.backText === "$"){
+        let pages = getCurrentPages();
+        if(pages.length>1){
+          // #ifdef H5
+          if(pages[pages.length-2].$refs.page){
+            return pages[pages.length-2].$refs.page.title
+          }else {
+            return ""
+          }
+          // #endif
+          // #ifndef H5
+          if(pages[pages.length-2].$vm.$refs.page){
+            return pages[pages.length-2].$vm.$refs.page.title
+          }else {
+            return ""
+          }
+          // #endif
+        }else {
+          return ""
+        }
+      }else{
+        return this.backText;
+      }
+    }
+  },
   methods: {
     refresherrefresh(e){this.$emit('refresherrefresh',e)},
     scrolltoupper(e){this.$emit('scrolltoupper',e)},
@@ -106,6 +143,9 @@ export default {
       this.$refs.uToast.show(...config)
     },
   },
+  mounted(){
+
+  }
 }
 </script>
 
diff --git a/components/c-tabbar-popup/index.vue b/components/c-tabbar-popup/index.vue
index 163ccee..e1670f3 100644
--- a/components/c-tabbar-popup/index.vue
+++ b/components/c-tabbar-popup/index.vue
@@ -2,7 +2,7 @@
 	<view class="createBox">
 		<text class="selectTitle">需求</text>
 		<view class="selectBtns">
-			<view class="selectBtn" v-for="type in typs" @tap="toHelpForm(type)">
+			<view class="selectBtn" v-for="(type, index) in typs" @tap="toHelpForm(type)" :key="index">
 				<img class="selectBtnIcon" :src="type.url">
 				<text class="selectBtnText">{{ type.name }}</text>
 			</view>
@@ -10,7 +10,7 @@
 
 		<text class="selectTitle">动态</text>
 		<view class="selectBtns">
-			<view class="selectBtn" v-for="tag in tags" @tap="toHelpForm(tag)">
+			<view class="selectBtn" v-for="(tag, index) in tags" @tap="toHelpForm(tag)" :key="index">
 				<view class="selectBtnIcon"></view>
 				<text class="selectBtnText">{{ tag.name }}</text>
 			</view>
@@ -53,11 +53,12 @@
 		created() {
 			//获取所有标签
 			helpForm.getTags().then((res) => {
-				this.tags = res;
+        console.log(res);
+        this.tags = res.data;
 			});
 			helpForm.getType().then(res => {
 				/*console.log("1111", res.data.data);*/
-				this.typs = res.data.data;
+				this.typs = res.data;
 			})
 		},
 	};
diff --git a/package.json b/package.json
index abceb4c..39a1af7 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,6 @@
   "description": "",
   "main": "main.js",
   "scripts": {
-    "cct": "node ./cliShell/createComponent.js",
     "commit": "git-cz",
     "addAll": "git add -A"
   },
@@ -17,14 +16,14 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "art-template": "^4.13.2",
-    "chalk": "^4.1.0",
     "commitizen": "^4.2.1",
-    "cz-conventional-changelog": "^3.3.0",
-    "execa": "^4.0.3",
-    "inquirer": "^7.3.3"
+    "cz-conventional-changelog": "^3.3.0"
   },
   "dependencies": {
-    "uni-crazy-router": "0.0.26"
+    "luch-request": "^3.0.5",
+    "qs": "^6.10.1",
+    "uni-crazy-router": "0.0.26",
+    "uni-read-pages": "^1.0.5",
+    "uni-simple-router": "^2.0.0-beta.8"
   }
 }
diff --git a/pages/index/components/screenControls/index.vue b/pages/index/components/screenControls/index.vue
new file mode 100644
index 0000000..5bb2df5
--- /dev/null
+++ b/pages/index/components/screenControls/index.vue
@@ -0,0 +1,206 @@
+<template>
+  <view>
+    <view class="searchBox">
+      <u-search
+          v-model="formData.searchText"
+          :clearabled="true"
+          input-align="center"
+          placeholder="请输入关键字"
+          @search="searchHelp"
+          @focus="closeSelect"
+      >
+      </u-search>
+    </view>
+    <view class="expandList">
+      <view class="expandList_item" @tap="showSortClick">
+        <text class="u-m-r-10">{{formData.sort.label}}</text>
+        <u-icon :class="['select_icon', showSort && 'select_icon_rotate']"  name="arrow-down-fill" size="20" color="#c8c9cc"/>
+      </view>
+      <view class="expandList_item" @tap="showScreenClick">
+        <text class="u-m-r-10">筛选</text>
+        <u-icon :class="['select_icon', showScreen && 'select_icon_rotate']" name="arrow-down-fill" size="20" color="#c8c9cc"/>
+      </view>
+    </view>
+    <view class="itemBox" @touchend.stop>
+      <view v-show="showSort" class="item">
+        <view
+            :class="['sort_item', 'u-border-bottom', formData.sort.label===sort.label && 'sort_item_active']"
+            v-for="(sort,index) in sortList"
+            :key="index"
+            @tap="clickSort(sort,index)"
+        >{{sort.label}}</view>
+      </view>
+      <view v-show="showScreen" class="item u-p-20">
+        <view>
+          <view class="u-p-20">帮助类型（多选）</view>
+          <view class="help_type">
+            <view
+                :class="['help_type_item', formData.types.find(v=>v.typeId===type.typeId) && 'tag_active']"
+                v-for="(type, index) in typeList"
+                :key="index"
+                @tap="clickType(type, index)">{{type.name}}</view>
+          </view>
+          <view class="u-p-20">帮助标签（多选）</view>
+          <view class="help_type">
+            <view
+                :class="['help_type_item', formData.tags.find(v=>v.id===tag.id) && 'tag_active']"
+                v-for="(tag, index) in tagList"
+                :key="index"
+                @tap="clickTag(tag, index)">{{tag.name}}</view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+import {getTagsApi, getTypeApi} from "@api"
+export default {
+  name: "screenControls",
+  data(){
+    return{
+      formData:{
+        searchText: "",//搜索的文字
+        tags:[],//选中的标签
+        types:[],//选中的类型
+        sort:{label:"综合排序", value:1}
+      },
+      showSort:false,
+      showScreen:false,
+      tagList:[],
+      typeList:[],
+      sortList:[{label:"综合排序", value:1}, {label:"最近距离", value:2}, {label: "最近时间", value:3}, {label: "最多赏金", value:4}, {label: "最多人帮", value:5},]
+    }
+  },
+  methods:{
+    searchHelp(){
+      this.closeSelect()
+      this.$emit("screen",this.formData)
+    },
+    showSortClick(){
+      this.showSort = !this.showSort
+      this.showScreen = false
+    },
+    showScreenClick(){
+      this.showScreen = !this.showScreen
+      this.showSort = false
+    },
+    clickTag(tag, index){
+      let i = this.formData.tags.findIndex(v=>v.id===tag.id)
+      if(i !== -1){
+        this.formData.tags.splice(i,1)
+      }else {
+        this.formData.tags.push(JSON.parse(JSON.stringify(tag)))
+      }
+      this.$emit("screen",this.formData)
+    },
+    clickType(type, index){
+      let i = this.formData.types.findIndex(v=>v.typeId===type.typeId)
+      if(i !== -1){
+        this.formData.types.splice(i,1)
+      }else {
+        this.formData.types.push(JSON.parse(JSON.stringify(type)))
+      }
+      this.$emit("screen",this.formData)
+    },
+    closeSelect(){
+      this.showSort = false;
+      this.showScreen = false;
+    },
+    clickSort(sort,index){
+      this.formData.sort = JSON.parse(JSON.stringify(sort))
+      this.closeSelect()
+      this.$emit("screen",this.formData)
+    }
+  },
+  mounted(){
+    getTagsApi()
+    .then(({data}) => {
+      this.tagList = data
+    })
+    getTypeApi()
+    .then(({data}) => {
+      this.typeList = data
+    })
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.itemBox{
+  height: 0px;
+  position: relative;
+  margin: 0 -20rpx;
+
+  .item{
+    width: 100%;
+    position: absolute;
+    z-index: 10;
+    background-color:#fff;
+    max-height: 330px;
+    overflow: auto;
+
+    .sort_item{
+      padding: 0 40rpx;
+      height: 100rpx;
+      width: 100%;
+      display: flex;
+      align-items: center;
+
+      &_active{
+        color: $u-type-primary;
+      }
+    }
+  }
+}
+.expandList {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding-bottom: 20rpx;
+
+  &_item{
+    padding: 0 20rpx;
+
+    .select_icon{
+      transition: all 0.3s;
+      transform: rotate(0deg);
+    }
+    .select_icon_rotate{
+      transform: rotate(180deg);
+    }
+  }
+}
+
+.searchBox {
+  padding-top: 20rpx;
+  padding-bottom: 20rpx;
+
+  & ::v-deep .u-input {
+    height: 100%;
+  }
+}
+
+.help_type{
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+
+  &_item{
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    width: 31%;
+    height: 60rpx;
+    background-color: #ececec;
+    color: $u-type-info;
+    margin: 10rpx 0;
+  }
+
+  .tag_active{
+    color: $u-type-primary;
+    background-color: $u-type-primary-disabled;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pages/index/components/selectLocaltion/index.vue b/pages/index/components/selectLocaltion/index.vue
new file mode 100644
index 0000000..1a3293c
--- /dev/null
+++ b/pages/index/components/selectLocaltion/index.vue
@@ -0,0 +1,44 @@
+<template>
+  <view class="select_localtion" @tap="selectLocaltion">
+    <u-icon name="map" size="40" color="#fff"></u-icon>
+    <text>{{localtion.name || "请选择位置"}}</text>
+    <u-icon name="arrow-right" size="30" color="#fff"></u-icon>
+  </view>
+</template>
+
+<script>
+import {mapState, mapMutations } from "vuex"
+export default {
+  name: "selectLocaltion",
+  computed:{
+    ...mapState(["localtion"])
+  },
+  methods:{
+    ...mapMutations(["setLocaltion"]),
+    //选择当前定位
+    selectLocaltion(){
+      wx.choosePoi({
+        success: (res)=>{
+          delete res.errMsg
+          if(res.type === 1) return
+          if(JSON.stringify(res) !== JSON.stringify(this.localtion)) this.setLocaltion(res)
+        }
+      });
+    }
+  },
+  mounted() {
+    if(!this.localtion.name){
+      this.selectLocaltion()
+    }
+  }
+}
+</script>
+
+<style scoped>
+.select_localtion{
+  display: flex;
+  padding-left: 20rpx;
+  align-items: center;
+  color: #FFF;
+}
+</style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 172be41..32e92e5 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,8 +1,11 @@
 <template>
   <c-page ref="page" :tabbar="true">
+    <template slot="nav_left">
+      <select-local/>
+    </template>
     <view class="home">
       <view :class="{ mapBox: true, mapBox1: showBraceBox }">
-        <c-map
+        <c-map :localtion="localtion"
           :mapCovers="helplist.map(help => ({latitude:help.informationLatitude,longitude:help.informationLongitude,title:help.informationTitle}))"
           user-style="height: 100%"
           @loadError="mapLoadError"
@@ -17,29 +20,7 @@
         @touchmove="handletouchmove"
         @touchstart="handletouchstart"
       >
-        <view class="expandList">
-          <view
-            :class="{
-              expandList_icon: true,
-              expandList_xuanzhuan: showBraceBox
-            }"
-          >
-            <text
-              class="iconfont icon-zhankai"
-              @tap="showBraceBox = !showBraceBox"
-            ></text>
-          </view>
-        </view>
-        <view class="searchBox">
-          <u-search
-            v-model="searchText"
-            :clearabled="true"
-            input-align="center"
-            placeholder="请输入关键字"
-            @search="searchHelp"
-          >
-          </u-search>
-        </view>
+        <screenControls @screen="screen"/>
         <scroll-view
           :class="['ListBox', showBraceBox && 'ListBox1']"
           :lower-threshold="600"
@@ -61,9 +42,15 @@
 </template>
 
 <script>
-import { home } from "../../api";
+import { getHelpListApi } from "../../api";
+import Qs from "qs"
+import {mapState, mapMutations } from "vuex"
+import selectLocal from "./components/selectLocaltion"
+import screenControls from "./components/screenControls"
+
 
 export default {
+  components:{selectLocal,screenControls},
   data() {
     return {
       showBraceBox: false, //是否展开
@@ -78,32 +65,38 @@ export default {
         isLoading: false, //数据列表是否在加载中
         isAll: false //数据是否已经全部加载完毕
       },
-      searchText: "", //搜索内容
       helplist: [],
       mapCovers: [],
-      keys:"",
-      page: 1
+      page: 0,
+      screenForm:{},//查询对象
     };
   },
+  computed:{
+    ...mapState(["localtion"])
+  },
+  watch:{
+    localtion(newValue){
+      this.screenForm.local = newValue
+    }
+  },
   methods: {
-    //搜索
-    searchHelp(value) {
-      this.page = 1;
+    //查询
+    screen(screenForm) {
+      this.page = 0;
       this.helplist = [];
       this.helpListLoadingState.isAll = false;
-      this.helpListLoadingState.Loading = true;
-      this.keys = this.searchText
-      home
-        .getHelpList({ page: this.page++, keys: this.keys })
-        .then(({ data: res }) => {
-          this.helplist.push(...res.data.items);
-          if (res.data.total < this.page) {
-            this.helpListLoadingState.isAll = true;
-          }
-        })
-        .finally(() => {
-          this.helpListLoadingState.Loading = false;
-        });
+
+      //构建查询对象
+      let screenObject = {}
+      if(screenForm.searchText) screenObject.key = screenForm.searchText
+      if(screenForm.tags.length) screenObject.tags = screenForm.tags.map(v=>v.id)
+      if(screenForm.types.length) screenObject.types = screenForm.types.map(v=>v.typeId)
+      screenObject.local = this.localtion
+      /*if(screenForm.sort.label === "综合排序")*/
+      if(screenForm.sort.value !== 1) screenObject.types = screenForm.sort.value
+
+      this.screenForm = screenObject
+      this.getNextData()
     },
     mapLoadError() {
       uni.hideLoading();
@@ -163,46 +156,27 @@ export default {
       //list滑动到底
       if (!this.helpListLoadingState.isAll) {
         //到底，加载
-        this.getItems();
+        this.getNextData();
       }
     },
-    getItems() {
-      if (this.searchText == "" || this.searchText == null) {
-        this.helpListLoadingState.Loading = true;
-        home
-          .getHelpList({ page: this.page++ })
-          .then(({ data: res }) => {
-            this.helplist.push(...res.data.items);
-            if (res.data.total < this.page) {
-              this.helpListLoadingState.isAll = true;
-            }
-          })
-          .finally(() => {
-            this.helpListLoadingState.Loading = false;
-          });
-      } else {
-        this.helpListLoadingState.Loading = true;
-        home
-          .getHelpList({ page: this.page++, keys: this.keys })
-          .then(({ data: res }) => {
+    getNextData() {
+      this.helpListLoadingState.Loading = true;
+      console.log(this.screenForm);
+      getHelpListApi({ page: ++this.page, ...this.screenForm })
+          .then((res) => {
             this.helplist.push(...res.data.items);
-            if (res.data.total < this.page) {
-              this.helpListLoadingState.isAll = true;
-            }
-            console.log("搜索:", res.data);
+            this.helpListLoadingState.isAll = res.data.total === this.page;
           })
           .finally(() => {
             this.helpListLoadingState.Loading = false;
           });
-      }
     }
   },
-  created() {
-    console.log(this.$c);
-    this.getItems();
-  },
   mounted() {
     uni.showLoading({ title: "定位中..." });
+    this.getNextData();
+    /*this.getItems();
+    uni.showLoading({ title: "定位中..." });*/
   }
 };
 </script>
@@ -249,29 +223,6 @@ $box-height2: 75%; /*上拉后列表高度*/
     height: $box-height2;
   }
 
-  .expandList {
-    text-align: center;
-
-    &_icon {
-      width: 40px;
-      height: 40px;
-      transition: all 0.3s;
-      margin: 0 auto;
-    }
-
-    &_xuanzhuan {
-      transform: rotate(180deg);
-    }
-  }
-
-  .searchBox {
-    height: 50px;
-
-    & ::v-deep .u-input {
-      height: 100%;
-    }
-  }
-
   .ListBox {
     height: calc(100% - 27px);
     overflow: hidden;
diff --git a/pages/login/WXLogin.vue b/pages/login/WXLogin.vue
index f2c6b2e..9acbee3 100644
--- a/pages/login/WXLogin.vue
+++ b/pages/login/WXLogin.vue
@@ -48,7 +48,7 @@ export default {
         form.code = code;
         //console.log(code)
         return login.WXLogin(form)
-      }).then(({data})=>{
+      }).then((data)=>{
         uni.showToast({icon:"none",title: '登录成功'});
         this.$store.commit("setUser",data.data);
         this.$store.commit("setToken",data.token);
@@ -89,7 +89,6 @@ export default {
       uni.showLoading({title:"正在自动登录"})
       login.AutoLogin()
           .then(res=>{
-            console.log("then",res.data);
             if(res.statusCode === 401){
               this.$u.toast("登录过期")
             }else {
@@ -139,4 +138,4 @@ export default {
     }
   }
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/store/index.js b/store/index.js
index b2d4786..e7b0369 100644
--- a/store/index.js
+++ b/store/index.js
@@ -21,7 +21,8 @@ const store = new Vuex.Store({
         config:{
             languageList,
             language: getLanguage()
-        }
+        },
+        localtion:{}
     },
     getters: {
         //获取当前语言信息
@@ -31,8 +32,6 @@ const store = new Vuex.Store({
         getUser(state){
             return state.user
         }
-
-
     },
     mutations: {
         setLanguage(state, language){
@@ -46,14 +45,20 @@ const store = new Vuex.Store({
 		},
 		setUser(state, user){
             state.user = user
+		},
+		setLocaltion(state, localtion){
+            state.localtion = localtion
+            uni.setStorageSync("localtion",localtion)
 		}
     },
     actions:{
         userInit({ commit }){
             const token = uni.getStorageSync("token")
             const language = uni.getStorageSync("language")
+            const localtion = uni.getStorageSync("localtion")
             commit("setLanguage",language)
             commit("setToken",token)
+            commit("setLocaltion",localtion)
         },
         logout({ commit }){
             commit("setToken","")
diff --git a/uview-ui/components/u-search/u-search.vue b/uview-ui/components/u-search/u-search.vue
index f2bf22a..6891026 100644
--- a/uview-ui/components/u-search/u-search.vue
+++ b/uview-ui/components/u-search/u-search.vue
@@ -244,7 +244,6 @@ export default {
 		},
 		// 确定搜索
 		search(e) {
-			console.log("22222")
 			this.$emit('search', e.detail.value);
 			try{
 				// 收起键盘
diff --git a/yarn.lock b/yarn.lock
index 12c7bd5..545ee1d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -56,28 +56,21 @@
   resolved "https://registry.npm.taobao.org/@commitlint/types/download/@commitlint/types-11.0.0.tgz#719cf05fcc1abb6533610a2e0f5dd1e61eac14fe"
   integrity sha1-cZzwX8wau2UzYQouD13R5h6sFP4=
 
+"@dcloudio/types@^2.0.16":
+  version "2.2.7"
+  resolved "https://registry.yarnpkg.com/@dcloudio/types/-/types-2.2.7.tgz#80d815b673e5e839c087fe252127cf79f9761eb8"
+  integrity sha512-ipipcszcqXxG/PEIZKi5uFw4ttITpKWD0c2mwB3Bprm7p+/CEgtXYGpo6rLi8aZCc8JDgUsXMgOz79kSABAW4Q==
+
 "@types/parse-json@^4.0.0":
   version "4.0.0"
   resolved "https://registry.npm.taobao.org/@types/parse-json/download/@types/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
   integrity sha1-L4u0QUNNFjs1+4/9zNcTiSf/uMA=
 
-acorn@^5.0.3:
-  version "5.7.4"
-  resolved "https://registry.npm.taobao.org/acorn/download/acorn-5.7.4.tgz?cache=0&sync_timestamp=1601885832302&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Facorn%2Fdownload%2Facorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e"
-  integrity sha1-Po2KmUfQWZoXltECJddDL0pKz14=
-
 ansi-escapes@^3.2.0:
   version "3.2.0"
   resolved "https://registry.npm.taobao.org/ansi-escapes/download/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
   integrity sha1-h4C5j/nb9WOBUtHx/lwde0RCl2s=
 
-ansi-escapes@^4.2.1:
-  version "4.3.1"
-  resolved "https://registry.npm.taobao.org/ansi-escapes/download/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61"
-  integrity sha1-pcR8xDGB8fOP/XB2g3cA05VSKmE=
-  dependencies:
-    type-fest "^0.11.0"
-
 ansi-regex@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npm.taobao.org/ansi-regex/download/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
@@ -88,11 +81,6 @@ ansi-regex@^4.1.0:
   resolved "https://registry.npm.taobao.org/ansi-regex/download/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
   integrity sha1-i5+PCM8ay4Q3Vqg5yox+MWjFGZc=
 
-ansi-regex@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.npm.taobao.org/ansi-regex/download/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
-  integrity sha1-OIU59VF5vzkznIGvMKZU1p+Hy3U=
-
 ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-3.2.1.tgz?cache=0&sync_timestamp=1601839122515&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fansi-styles%2Fdownload%2Fansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
@@ -127,20 +115,6 @@ array-unique@^0.3.2:
   resolved "https://registry.npm.taobao.org/array-unique/download/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
   integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
-art-template@^4.13.2:
-  version "4.13.2"
-  resolved "https://registry.npm.taobao.org/art-template/download/art-template-4.13.2.tgz#4c4cbd44de08aad031660240871f45c7d737cfc1"
-  integrity sha1-TEy9RN4IqtAxZgJAhx9Fx9c3z8E=
-  dependencies:
-    acorn "^5.0.3"
-    escodegen "^1.8.1"
-    estraverse "^4.2.0"
-    html-minifier "^3.4.3"
-    is-keyword-js "^1.0.3"
-    js-tokens "^3.0.1"
-    merge-source-map "^1.0.3"
-    source-map "^0.5.6"
-
 assign-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npm.taobao.org/assign-symbols/download/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
@@ -218,15 +192,7 @@ callsites@^3.0.0:
   resolved "https://registry.npm.taobao.org/callsites/download/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
   integrity sha1-s2MKvYlDQy9Us/BRkjjjPNffL3M=
 
-camel-case@3.0.x:
-  version "3.0.0"
-  resolved "https://registry.npm.taobao.org/camel-case/download/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"
-  integrity sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=
-  dependencies:
-    no-case "^2.2.0"
-    upper-case "^1.1.1"
-
-chalk@4.1.0, chalk@^4.1.0:
+chalk@4.1.0:
   version "4.1.0"
   resolved "https://registry.npm.taobao.org/chalk/download/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
   integrity sha1-ThSHCmGNni7dl92DRf2dncMVZGo=
@@ -258,13 +224,6 @@ class-utils@^0.3.5:
     isobject "^3.0.0"
     static-extend "^0.1.1"
 
-clean-css@4.2.x:
-  version "4.2.3"
-  resolved "https://registry.npm.taobao.org/clean-css/download/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78"
-  integrity sha1-UHtd59l7SO5T2ErbAWD/YhY4D3g=
-  dependencies:
-    source-map "~0.6.0"
-
 cli-cursor@^2.1.0:
   version "2.1.0"
   resolved "https://registry.npm.taobao.org/cli-cursor/download/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
@@ -272,23 +231,11 @@ cli-cursor@^2.1.0:
   dependencies:
     restore-cursor "^2.0.0"
 
-cli-cursor@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.npm.taobao.org/cli-cursor/download/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
-  integrity sha1-JkMFp65JDR0Dvwybp8kl0XU68wc=
-  dependencies:
-    restore-cursor "^3.1.0"
-
 cli-width@^2.0.0:
   version "2.2.1"
   resolved "https://registry.npm.taobao.org/cli-width/download/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"
   integrity sha1-sEM9C06chH7xiGik7xb9X8gnHEg=
 
-cli-width@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npm.taobao.org/cli-width/download/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
-  integrity sha1-ovSEN6LKqaIkNueUvwceyeYc7fY=
-
 collection-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npm.taobao.org/collection-visit/download/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
@@ -321,16 +268,6 @@ color-name@~1.1.4:
   resolved "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=
 
-commander@2.17.x:
-  version "2.17.1"
-  resolved "https://registry.npm.taobao.org/commander/download/commander-2.17.1.tgz?cache=0&sync_timestamp=1598576088458&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
-  integrity sha1-vXerfebelCBc6sxy8XFtKfIKd78=
-
-commander@~2.19.0:
-  version "2.19.0"
-  resolved "https://registry.npm.taobao.org/commander/download/commander-2.19.0.tgz?cache=0&sync_timestamp=1598576088458&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
-  integrity sha1-9hmKqE5bg8RgVLlN3tv+1e6f8So=
-
 commitizen@^4.0.3, commitizen@^4.2.1:
   version "4.2.1"
   resolved "https://registry.npm.taobao.org/commitizen/download/commitizen-4.2.1.tgz#3b098b16c6b1a37f0d129018dff6751b20cd3103"
@@ -382,15 +319,6 @@ cosmiconfig@^7.0.0:
     path-type "^4.0.0"
     yaml "^1.10.0"
 
-cross-spawn@^7.0.0:
-  version "7.0.3"
-  resolved "https://registry.npm.taobao.org/cross-spawn/download/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
-  integrity sha1-9zqFudXUHQRVUcF34ogtSshXKKY=
-  dependencies:
-    path-key "^3.1.0"
-    shebang-command "^2.0.0"
-    which "^2.0.1"
-
 cz-conventional-changelog@3.2.0:
   version "3.2.0"
   resolved "https://registry.npm.taobao.org/cz-conventional-changelog/download/cz-conventional-changelog-3.2.0.tgz#6aef1f892d64113343d7e455529089ac9f20e477"
@@ -436,11 +364,6 @@ dedent@0.7.0:
   resolved "https://registry.npm.taobao.org/dedent/download/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
   integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=
 
-deep-is@~0.1.3:
-  version "0.1.3"
-  resolved "https://registry.npm.taobao.org/deep-is/download/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
-  integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
-
 define-property@^0.2.5:
   version "0.2.5"
   resolved "https://registry.npm.taobao.org/define-property/download/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
@@ -473,18 +396,6 @@ detect-indent@6.0.0:
   resolved "https://registry.npm.taobao.org/detect-indent/download/detect-indent-6.0.0.tgz#0abd0f549f69fc6659a254fe96786186b6f528fd"
   integrity sha1-Cr0PVJ9p/GZZolT+lnhhhrb1KP0=
 
-emoji-regex@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.npm.taobao.org/emoji-regex/download/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
-  integrity sha1-6Bj9ac5cz8tARZT4QpY79TFkzDc=
-
-end-of-stream@^1.1.0:
-  version "1.4.4"
-  resolved "https://registry.npm.taobao.org/end-of-stream/download/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
-  integrity sha1-WuZKX0UFe682JuwU2gyl5LJDHrA=
-  dependencies:
-    once "^1.4.0"
-
 error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.npm.taobao.org/error-ex/download/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
@@ -497,48 +408,6 @@ escape-string-regexp@^1.0.5:
   resolved "https://registry.npm.taobao.org/escape-string-regexp/download/escape-string-regexp-1.0.5.tgz?cache=0&sync_timestamp=1587627107924&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fescape-string-regexp%2Fdownload%2Fescape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
-escodegen@^1.8.1:
-  version "1.14.3"
-  resolved "https://registry.npm.taobao.org/escodegen/download/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503"
-  integrity sha1-TnuB+6YVgdyXWC7XjKt/Do1j9QM=
-  dependencies:
-    esprima "^4.0.1"
-    estraverse "^4.2.0"
-    esutils "^2.0.2"
-    optionator "^0.8.1"
-  optionalDependencies:
-    source-map "~0.6.1"
-
-esprima@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.npm.taobao.org/esprima/download/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
-  integrity sha1-E7BM2z5sXRnfkatph6hpVhmwqnE=
-
-estraverse@^4.2.0:
-  version "4.3.0"
-  resolved "https://registry.npm.taobao.org/estraverse/download/estraverse-4.3.0.tgz?cache=0&sync_timestamp=1596641353460&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Festraverse%2Fdownload%2Festraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
-  integrity sha1-OYrT88WiSUi+dyXoPRGn3ijNvR0=
-
-esutils@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.npm.taobao.org/esutils/download/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
-  integrity sha1-dNLrTeC42hKTcRkQ1Qd1ubcQ72Q=
-
-execa@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.npm.taobao.org/execa/download/execa-4.0.3.tgz#0a34dabbad6d66100bd6f2c576c8669403f317f2"
-  integrity sha1-CjTau61tZhAL1vLFdshmlAPzF/I=
-  dependencies:
-    cross-spawn "^7.0.0"
-    get-stream "^5.0.0"
-    human-signals "^1.1.1"
-    is-stream "^2.0.0"
-    merge-stream "^2.0.0"
-    npm-run-path "^4.0.0"
-    onetime "^5.1.0"
-    signal-exit "^3.0.2"
-    strip-final-newline "^2.0.0"
-
 expand-brackets@^2.1.4:
   version "2.1.4"
   resolved "https://registry.npm.taobao.org/expand-brackets/download/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
@@ -597,11 +466,6 @@ extglob@^2.0.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-fast-levenshtein@~2.0.6:
-  version "2.0.6"
-  resolved "https://registry.npm.taobao.org/fast-levenshtein/download/fast-levenshtein-2.0.6.tgz?cache=0&sync_timestamp=1595428045324&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffast-levenshtein%2Fdownload%2Ffast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
-  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
-
 figures@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npm.taobao.org/figures/download/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
@@ -609,13 +473,6 @@ figures@^2.0.0:
   dependencies:
     escape-string-regexp "^1.0.5"
 
-figures@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.npm.taobao.org/figures/download/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
-  integrity sha1-YlwYvSk8YE3EqN2y/r8MiDQXRq8=
-  dependencies:
-    escape-string-regexp "^1.0.5"
-
 fill-range@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npm.taobao.org/fill-range/download/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
@@ -675,13 +532,6 @@ fs.realpath@^1.0.0:
   resolved "https://registry.npm.taobao.org/fs.realpath/download/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
-get-stream@^5.0.0:
-  version "5.2.0"
-  resolved "https://registry.npm.taobao.org/get-stream/download/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
-  integrity sha1-SWaheV7lrOZecGxLe+txJX1uItM=
-  dependencies:
-    pump "^3.0.0"
-
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.npm.taobao.org/get-value/download/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
@@ -772,11 +622,6 @@ has-values@^1.0.0:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
-he@1.2.x:
-  version "1.2.0"
-  resolved "https://registry.npm.taobao.org/he/download/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
-  integrity sha1-hK5l+n6vsWX922FWauFLrwVmTw8=
-
 homedir-polyfill@^1.0.1:
   version "1.0.3"
   resolved "https://registry.npm.taobao.org/homedir-polyfill/download/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
@@ -784,24 +629,6 @@ homedir-polyfill@^1.0.1:
   dependencies:
     parse-passwd "^1.0.0"
 
-html-minifier@^3.4.3:
-  version "3.5.21"
-  resolved "https://registry.npm.taobao.org/html-minifier/download/html-minifier-3.5.21.tgz#d0040e054730e354db008463593194015212d20c"
-  integrity sha1-0AQOBUcw41TbAIRjWTGUAVIS0gw=
-  dependencies:
-    camel-case "3.0.x"
-    clean-css "4.2.x"
-    commander "2.17.x"
-    he "1.2.x"
-    param-case "2.1.x"
-    relateurl "0.2.x"
-    uglify-js "3.4.x"
-
-human-signals@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.npm.taobao.org/human-signals/download/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
-  integrity sha1-xbHNFPUK6uCatsWf5jujOV/k36M=
-
 iconv-lite@^0.4.24:
   version "0.4.24"
   resolved "https://registry.npm.taobao.org/iconv-lite/download/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
@@ -854,25 +681,6 @@ inquirer@6.5.2:
     strip-ansi "^5.1.0"
     through "^2.3.6"
 
-inquirer@^7.3.3:
-  version "7.3.3"
-  resolved "https://registry.npm.taobao.org/inquirer/download/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003"
-  integrity sha1-BNF2sq8Er8FXqD/XwQDpjuCq0AM=
-  dependencies:
-    ansi-escapes "^4.2.1"
-    chalk "^4.1.0"
-    cli-cursor "^3.1.0"
-    cli-width "^3.0.0"
-    external-editor "^3.0.3"
-    figures "^3.0.0"
-    lodash "^4.17.19"
-    mute-stream "0.0.8"
-    run-async "^2.4.0"
-    rxjs "^6.6.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-    through "^2.3.6"
-
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
   resolved "https://registry.npm.taobao.org/is-accessor-descriptor/download/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
@@ -951,11 +759,6 @@ is-fullwidth-code-point@^2.0.0:
   resolved "https://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
   integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
 
-is-fullwidth-code-point@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
-  integrity sha1-8Rb4Bk/pCz94RKOJl8C3UFEmnx0=
-
 is-glob@^4.0.0:
   version "4.0.1"
   resolved "https://registry.npm.taobao.org/is-glob/download/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
@@ -963,11 +766,6 @@ is-glob@^4.0.0:
   dependencies:
     is-extglob "^2.1.1"
 
-is-keyword-js@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.npm.taobao.org/is-keyword-js/download/is-keyword-js-1.0.3.tgz#ac30dcf35b671f4b27b17f5cb57235126021132d"
-  integrity sha1-rDDc81tnH0snsX9ctXI1EmAhEy0=
-
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npm.taobao.org/is-number/download/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
@@ -982,11 +780,6 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   dependencies:
     isobject "^3.0.1"
 
-is-stream@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npm.taobao.org/is-stream/download/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3"
-  integrity sha1-venDJoDW+uBBKdasnZIc54FfeOM=
-
 is-utf8@^0.2.1:
   version "0.2.1"
   resolved "https://registry.npm.taobao.org/is-utf8/download/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
@@ -1019,11 +812,6 @@ isobject@^3.0.0, isobject@^3.0.1:
   resolved "https://registry.npm.taobao.org/isobject/download/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
-js-tokens@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.npm.taobao.org/js-tokens/download/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
-  integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
-
 js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npm.taobao.org/js-tokens/download/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
@@ -1065,14 +853,6 @@ kind-of@^6.0.0, kind-of@^6.0.2:
   resolved "https://registry.npm.taobao.org/kind-of/download/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha1-B8BQNKbDSfoG4k+jWqdttFgM5N0=
 
-levn@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.npm.taobao.org/levn/download/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
-  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
-  dependencies:
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-
 lines-and-columns@^1.1.6:
   version "1.1.6"
   resolved "https://registry.npm.taobao.org/lines-and-columns/download/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
@@ -1093,10 +873,12 @@ longest@^2.0.1:
   resolved "https://registry.npm.taobao.org/longest/download/longest-2.0.1.tgz#781e183296aa94f6d4d916dc335d0d17aefa23f8"
   integrity sha1-eB4YMpaqlPbU2RbcM10NF676I/g=
 
-lower-case@^1.1.1:
-  version "1.1.4"
-  resolved "https://registry.npm.taobao.org/lower-case/download/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
-  integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw=
+luch-request@^3.0.5:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/luch-request/-/luch-request-3.0.6.tgz#5a2cf049cb8bf8157aa562f8e25b1ab95da42d9a"
+  integrity sha512-Usv3fcQzrPL1RsVVLTJjPrzyv7NGxPTXoz+hnmq/bDPpcQeKApD2iCSHjxey0zbA6LPB6MbPZL9zBtLKl+GznA==
+  dependencies:
+    "@dcloudio/types" "^2.0.16"
 
 map-cache@^0.2.2:
   version "0.2.2"
@@ -1110,18 +892,6 @@ map-visit@^1.0.0:
   dependencies:
     object-visit "^1.0.0"
 
-merge-source-map@^1.0.3:
-  version "1.1.0"
-  resolved "https://registry.npm.taobao.org/merge-source-map/download/merge-source-map-1.1.0.tgz#2fdde7e6020939f70906a68f2d7ae685e4c8c646"
-  integrity sha1-L93n5gIJOfcJBqaPLXrmheTIxkY=
-  dependencies:
-    source-map "^0.6.1"
-
-merge-stream@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npm.taobao.org/merge-stream/download/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
-  integrity sha1-UoI2KaFN0AyXcPtq1H3GMQ8sH2A=
-
 merge@^1.2.1:
   version "1.2.1"
   resolved "https://registry.npm.taobao.org/merge/download/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
@@ -1151,11 +921,6 @@ mimic-fn@^1.0.0:
   resolved "https://registry.npm.taobao.org/mimic-fn/download/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
   integrity sha1-ggyGo5M0ZA6ZUWkovQP8qIBX0CI=
 
-mimic-fn@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.npm.taobao.org/mimic-fn/download/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
-  integrity sha1-ftLCzMyvhNP/y3pptXcR/CCDQBs=
-
 minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.npm.taobao.org/minimatch/download/minimatch-3.0.4.tgz?cache=0&sync_timestamp=1597044082534&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fminimatch%2Fdownload%2Fminimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
@@ -1186,11 +951,6 @@ mute-stream@0.0.7:
   resolved "https://registry.npm.taobao.org/mute-stream/download/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
   integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
 
-mute-stream@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.npm.taobao.org/mute-stream/download/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
-  integrity sha1-FjDEKyJR/4HiooPelqVJfqkuXg0=
-
 nanomatch@^1.2.9:
   version "1.2.13"
   resolved "https://registry.npm.taobao.org/nanomatch/download/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
@@ -1208,20 +968,6 @@ nanomatch@^1.2.9:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-no-case@^2.2.0:
-  version "2.3.2"
-  resolved "https://registry.npm.taobao.org/no-case/download/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac"
-  integrity sha1-YLgTOWvjmz8SiKTB7V0efSi0ZKw=
-  dependencies:
-    lower-case "^1.1.1"
-
-npm-run-path@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.npm.taobao.org/npm-run-path/download/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
-  integrity sha1-t+zR5e1T2o43pV4cImnguX7XSOo=
-  dependencies:
-    path-key "^3.0.0"
-
 object-copy@^0.1.0:
   version "0.1.0"
   resolved "https://registry.npm.taobao.org/object-copy/download/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
@@ -1245,7 +991,7 @@ object.pick@^1.3.0:
   dependencies:
     isobject "^3.0.1"
 
-once@^1.3.0, once@^1.3.1, once@^1.4.0:
+once@^1.3.0:
   version "1.4.0"
   resolved "https://registry.npm.taobao.org/once/download/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
@@ -1259,37 +1005,11 @@ onetime@^2.0.0:
   dependencies:
     mimic-fn "^1.0.0"
 
-onetime@^5.1.0:
-  version "5.1.2"
-  resolved "https://registry.npm.taobao.org/onetime/download/onetime-5.1.2.tgz?cache=0&sync_timestamp=1597003654288&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fonetime%2Fdownload%2Fonetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
-  integrity sha1-0Oluu1awdHbfHdnEgG5SN5hcpF4=
-  dependencies:
-    mimic-fn "^2.1.0"
-
-optionator@^0.8.1:
-  version "0.8.3"
-  resolved "https://registry.npm.taobao.org/optionator/download/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
-  integrity sha1-hPodA2/p08fiHZmIS2ARZ+yPtJU=
-  dependencies:
-    deep-is "~0.1.3"
-    fast-levenshtein "~2.0.6"
-    levn "~0.3.0"
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-    word-wrap "~1.2.3"
-
 os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.npm.taobao.org/os-tmpdir/download/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
-param-case@2.1.x:
-  version "2.1.1"
-  resolved "https://registry.npm.taobao.org/param-case/download/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247"
-  integrity sha1-35T9jPZTHs915r75oIWPvHK+Ikc=
-  dependencies:
-    no-case "^2.2.0"
-
 parent-module@^1.0.0:
   version "1.0.1"
   resolved "https://registry.npm.taobao.org/parent-module/download/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
@@ -1322,11 +1042,6 @@ path-is-absolute@^1.0.0:
   resolved "https://registry.npm.taobao.org/path-is-absolute/download/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
-path-key@^3.0.0, path-key@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.npm.taobao.org/path-key/download/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
-  integrity sha1-WB9q3mWMu6ZaDTOA3ndTKVBU83U=
-
 path-type@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npm.taobao.org/path-type/download/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
@@ -1337,19 +1052,6 @@ posix-character-classes@^0.1.0:
   resolved "https://registry.npm.taobao.org/posix-character-classes/download/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
   integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
 
-prelude-ls@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.npm.taobao.org/prelude-ls/download/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
-  integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
-
-pump@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npm.taobao.org/pump/download/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
-  integrity sha1-tKIRaBW94vTh6mAjVOjHVWUQemQ=
-  dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.1"
-
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
   resolved "https://registry.npm.taobao.org/regex-not/download/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
@@ -1358,11 +1060,6 @@ regex-not@^1.0.0, regex-not@^1.0.2:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
 
-relateurl@0.2.x:
-  version "0.2.7"
-  resolved "https://registry.npm.taobao.org/relateurl/download/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
-  integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=
-
 repeat-element@^1.1.2:
   version "1.1.3"
   resolved "https://registry.npm.taobao.org/repeat-element/download/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
@@ -1411,25 +1108,17 @@ restore-cursor@^2.0.0:
     onetime "^2.0.0"
     signal-exit "^3.0.2"
 
-restore-cursor@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.npm.taobao.org/restore-cursor/download/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
-  integrity sha1-OfZ8VLOnpYzqUjbZXPADQjljH34=
-  dependencies:
-    onetime "^5.1.0"
-    signal-exit "^3.0.2"
-
 ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.npm.taobao.org/ret/download/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
   integrity sha1-uKSCXVvbH8P29Twrwz+BOIaBx7w=
 
-run-async@^2.2.0, run-async@^2.4.0:
+run-async@^2.2.0:
   version "2.4.1"
   resolved "https://registry.npm.taobao.org/run-async/download/run-async-2.4.1.tgz?cache=0&sync_timestamp=1587965791385&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frun-async%2Fdownload%2Frun-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
   integrity sha1-hEDsz5nqPnC9QJ1JqriOEMGJpFU=
 
-rxjs@^6.4.0, rxjs@^6.6.0:
+rxjs@^6.4.0:
   version "6.6.3"
   resolved "https://registry.npm.taobao.org/rxjs/download/rxjs-6.6.3.tgz?cache=0&sync_timestamp=1600896740146&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frxjs%2Fdownload%2Frxjs-6.6.3.tgz#8ca84635c4daa900c0d3967a6ee7ac60271ee552"
   integrity sha1-jKhGNcTaqQDA05Z6buesYCce5VI=
@@ -1458,18 +1147,6 @@ set-value@^2.0.0, set-value@^2.0.1:
     is-plain-object "^2.0.3"
     split-string "^3.0.1"
 
-shebang-command@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npm.taobao.org/shebang-command/download/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
-  integrity sha1-zNCvT4g1+9wmW4JGGq8MNmY/NOo=
-  dependencies:
-    shebang-regex "^3.0.0"
-
-shebang-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npm.taobao.org/shebang-regex/download/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
-  integrity sha1-rhbxZE2HPsrYQ7AwexQzYtTEIXI=
-
 signal-exit@^3.0.2:
   version "3.0.3"
   resolved "https://registry.npm.taobao.org/signal-exit/download/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
@@ -1526,11 +1203,6 @@ source-map@^0.5.6:
   resolved "https://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
 
-source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
-  integrity sha1-dHIq8y6WFOnCh6jQu95IteLxomM=
-
 split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
   resolved "https://registry.npm.taobao.org/split-string/download/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
@@ -1554,15 +1226,6 @@ string-width@^2.1.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
-string-width@^4.1.0:
-  version "4.2.0"
-  resolved "https://registry.npm.taobao.org/string-width/download/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5"
-  integrity sha1-lSGCxGzHssMT0VluYjmSvRY7crU=
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.0"
-
 strip-ansi@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
@@ -1577,23 +1240,11 @@ strip-ansi@^5.1.0:
   dependencies:
     ansi-regex "^4.1.0"
 
-strip-ansi@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
-  integrity sha1-CxVx3XZpzNTz4G4U7x7tJiJa5TI=
-  dependencies:
-    ansi-regex "^5.0.0"
-
 strip-bom@4.0.0:
   version "4.0.0"
   resolved "https://registry.npm.taobao.org/strip-bom/download/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"
   integrity sha1-nDUFwdtFvO3KPZz3oW9cWqOQGHg=
 
-strip-final-newline@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npm.taobao.org/strip-final-newline/download/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
-  integrity sha1-ibhS+y/L6Tb29LMYevsKEsGrWK0=
-
 strip-json-comments@3.0.1:
   version "3.0.1"
   resolved "https://registry.npm.taobao.org/strip-json-comments/download/strip-json-comments-3.0.1.tgz?cache=0&sync_timestamp=1594567471207&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstrip-json-comments%2Fdownload%2Fstrip-json-comments-3.0.1.tgz#85713975a91fb87bf1b305cca77395e40d2a64a7"
@@ -1655,25 +1306,20 @@ tslib@^1.9.0:
   resolved "https://registry.npm.taobao.org/tslib/download/tslib-1.14.1.tgz?cache=0&sync_timestamp=1602286730817&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftslib%2Fdownload%2Ftslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha1-zy04vcNKE0vK8QkcQfZhni9nLQA=
 
-type-check@~0.3.2:
-  version "0.3.2"
-  resolved "https://registry.npm.taobao.org/type-check/download/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
-  integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
-  dependencies:
-    prelude-ls "~1.1.2"
+uni-crazy-router@0.0.26:
+  version "0.0.26"
+  resolved "https://registry.yarnpkg.com/uni-crazy-router/-/uni-crazy-router-0.0.26.tgz#e3d1f8e4d06485df6484bf6879c2f221e50e1602"
+  integrity sha512-lvw6igPkSn8alGJJlclvG+9TTlKj3guAQFB9gsEJP1av9eXJ6i30koHQAK8qFapRpgGeb85iKURexR1wRCY6+g==
 
-type-fest@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.npm.taobao.org/type-fest/download/type-fest-0.11.0.tgz?cache=0&sync_timestamp=1601425488573&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftype-fest%2Fdownload%2Ftype-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1"
-  integrity sha1-l6vwhyMQ/tiKXEZrJWgVdhReM/E=
+uni-read-pages@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/uni-read-pages/-/uni-read-pages-1.0.5.tgz#452c8dcaa8977bbaef600909be926c8d9704387c"
+  integrity sha512-GkrrZ0LX0vn9R5k6RKEi0Ez3Q3e2vUpjXQ8Z6/K/d28KudI9ajqgt8WEjQFlG5EPm1K6uTArN8LlqmZTEixDUA==
 
-uglify-js@3.4.x:
-  version "3.4.10"
-  resolved "https://registry.npm.taobao.org/uglify-js/download/uglify-js-3.4.10.tgz?cache=0&sync_timestamp=1601823880483&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fuglify-js%2Fdownload%2Fuglify-js-3.4.10.tgz#9ad9563d8eb3acdfb8d38597d2af1d815f6a755f"
-  integrity sha1-mtlWPY6zrN+404WX0q8dgV9qdV8=
-  dependencies:
-    commander "~2.19.0"
-    source-map "~0.6.1"
+uni-simple-router@^2.0.0-beta.8:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/uni-simple-router/-/uni-simple-router-2.0.5.tgz#db58fa907cd4018f4d846d0fd93a8b8f7e4ff606"
+  integrity sha512-QpJFw6JXTs3R11jq8fTTu/xPCnL672zmahwLQ0qj2GHYSyzqt9LkRzUXjJPssjmZNvNxIlI8V5GybovXe4uX7Q==
 
 union-value@^1.0.0:
   version "1.0.1"
@@ -1698,11 +1344,6 @@ unset-value@^1.0.0:
     has-value "^0.3.1"
     isobject "^3.0.0"
 
-upper-case@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.npm.taobao.org/upper-case/download/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
-  integrity sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=
-
 urix@^0.1.0:
   version "0.1.0"
   resolved "https://registry.npm.taobao.org/urix/download/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
@@ -1720,14 +1361,7 @@ which@^1.2.14:
   dependencies:
     isexe "^2.0.0"
 
-which@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.npm.taobao.org/which/download/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
-  integrity sha1-fGqN0KY2oDJ+ELWckobu6T8/UbE=
-  dependencies:
-    isexe "^2.0.0"
-
-word-wrap@^1.0.3, word-wrap@~1.2.3:
+word-wrap@^1.0.3:
   version "1.2.3"
   resolved "https://registry.npm.taobao.org/word-wrap/download/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
   integrity sha1-YQY29rH3A4kb00dxzLF/uTtHB5w=
-- 
Gitee