Merge branch 'master' of https://bdgit.educoder.net/pu6ej7yq9/git into develop

# Conflicts:
#	wonderful.txt

README.md

@@ -0,0 +1,2 @@
+# git
+

doc/666.txt

@@ -0,0 +1,2 @@
+666666
+wbbgood

doc/wbbgood.txt

@@ -0,0 +1 @@
+wwww

mll.txt

@@ -0,0 +1 @@
+mll

model/wbb.txt

@@ -0,0 +1,2 @@
+6666677777
+wbbbbbbbb

other/wbb.txt

@@ -0,0 +1,2 @@
+6666677777
+wbbbbbbbb

scr/food/.eslintrc.js

@@ -1,31 +0,0 @@
-/*
- * Eslint config file
- * Documentation: https://eslint.org/docs/user-guide/configuring/
- * Install the Eslint extension before using this feature.
- */
-module.exports = {
-  env: {
-    es6: true,
-    browser: true,
-    node: true,
-  },
-  ecmaFeatures: {
-    modules: true,
-  },
-  parserOptions: {
-    ecmaVersion: 2018,
-    sourceType: 'module',
-  },
-  globals: {
-    wx: true,
-    App: true,
-    Page: true,
-    getCurrentPages: true,
-    getApp: true,
-    Component: true,
-    requirePlugin: true,
-    requireMiniProgram: true,
-  },
-  // extends: 'eslint:recommended',
-  rules: {},
-}

scr/food/README.md

@@ -1,279 +0,0 @@
-# **节时不节食软件系统**
-## 软件定位
-  在当前严峻的疫情影响下，校内食堂是大学生用餐的唯一选择。由于学生用餐时间集中，食堂人流量大，菜品准备时间长以及学生的“选择困难症”等问题使得用餐效率较低。“菜品选择”这一概念提出，在用户点外卖时首先通过“菜品选择”这一途径，替有选择困难的用户做出决定，减少一些不必要的时间。对于年轻的一代的生活节奏和思想观念，“菜品选择”这一软件系统能解决他们不少选择上的难题。
-  在这个选择多样化的时代，大学生常常面临着“今天吃什么？”的困扰。校内五花八门的餐饮给我们提供了数不清的选项：价格、味道、菜式等等，大学生面对众多选择时会觉得异常困难、难以做出满意的选择。或者大学生在工作学业繁忙之时，需要软件来帮其做出快速选择。有些人心中有许多心仪的选项，于是不断纠结，左右为难摇摆不定；有些人没有特别想吃的菜品，或者吃腻了想换个口味，总想挑到最合适的选项，最后什么也没买。这直接导致了他们决策时间过长，不仅饥肠辘辘，而且心烦意乱，影响生活和情绪。因此，需要寻找一种有效方法来减少大学生的决策时间，帮助他们筛选信息做出选择。
-## 软件功能
-  该系统主要实现登录、自由点单、偏好快速选择、转盘随机选择、论坛购物车和支付七大主要功能，其中通过登录功能实现新用户的注册和老用户的登录；通过论坛功能让用户进行发表帖子、评论讨论等操作；通过自由点单、偏好快速选择和转盘随机选择来确定订单，通过购物车来存储标记的食物信息并跳转支付功能；通过支付功能实现支付和订单信息的回传
-## 代码运行
-  该系统为微信小程序模式，以微信为载体实现系统运行，硬件要求为能下载并运行微信app。
-## 使用说明
-### 1.登录
-点击登录按钮进行信息授权进行登录
-***
-### 2.自由点单
-在主页面搜索框中搜索食物名称，可以显示食物信息
-***
-### 3.偏好快速选择
-点击主页面的偏好选择按钮进入两个选择页面，在第一页选择食物种类（主食/小吃），在第二页选择口味（香辣/椒麻/香咸/酸甜），页面跳转到确认订单信息
-***
-### 4.转盘随机选择
-点击主页面的随机转盘按钮进入转盘页面，点击开始按钮进行随机选择，选择结束后弹窗提示食物信息
-***
-### 5.论坛
-点击主页面下方的论坛按钮进入论坛，用户可以进行增删查改帖子、点赞评论等操作
-***
-### 6.购物车
-点击主页面下方的购物车进入，在购物车内可以对标记的菜品进行增删查改和选中下单支付操作
-***
-### 7.支付
-通过三种方式确认订单后点击立即支付按钮即可输入支付密码进行支付
-***
-##代码目录结构
-![代码目录]("C:\Users\嘉鸿宝贝\Desktop\图片1.png")
-## 云开发 quickstart
-
-这是云开发的快速启动指引，其中演示了如何上手使用云开发的三大基础能力：
-
-- 数据库：一个既可在小程序前端操作，也能在云函数中读写的 JSON 文档型数据库
-- 文件存储：在小程序前端直接上传/下载云端文件，在云开发控制台可视化管理
-- 云函数：在云端运行的代码，微信私有协议天然鉴权，开发者只需编写业务逻辑代码
-####为了适应该系统，定义全局变量，全局可调用openid，我们重写了微信小程序的云函数，重写后的云函数代码如下
-##### 1.get
-``` JavaScript
-{
-  "permissions": {
-    "openapi": [
-    ]
-  }
-}
-
-{
-  "permissions": {
-    "openapi": [
-    ]
-  }
-}
-
-{
-  "name": "get",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "wx-server-sdk": "~2.6.3"
-  }
-}
-```
-##### 2.quickstartFunctions
-
-```JavaScript
-const cloud = require('wx-server-sdk');
-
-cloud.init({
-  env: cloud.DYNAMIC_CURRENT_ENV
-});
-
-const db = cloud.database();
-// 创建集合云函数入口函数
-exports.main = async (event, context) => {
-  try {
-    // 创建集合
-    await db.createCollection('sales');
-    await db.collection('sales').add({
-      // data 字段表示需新增的 JSON 数据
-      data: {
-        region: '华东',
-        city: '上海',
-        sales: 11
-      }
-    });
-    await db.collection('sales').add({
-      // data 字段表示需新增的 JSON 数据
-      data: {
-        region: '华东',
-        city: '南京',
-        sales: 11
-      }
-    });
-    await db.collection('sales').add({
-      // data 字段表示需新增的 JSON 数据
-      data: {
-        region: '华南',
-        city: '广州',
-        sales: 22
-      }
-    });
-    await db.collection('sales').add({
-      // data 字段表示需新增的 JSON 数据
-      data: {
-        region: '华南',
-        city: '深圳',
-        sales: 22
-      }
-    });
-    return {
-      success: true
-    };
-  } catch (e) {
-    // 这里catch到的是该collection已经存在，从业务逻辑上来说是运行成功的，所以catch返回success给前端，避免工具在前端抛出异常
-    return {
-      success: true,
-      data: 'create collection success'
-    };
-  }
-};
-
-const cloud = require('wx-server-sdk');
-cloud.init({
-  env: cloud.DYNAMIC_CURRENT_ENV
-});
-// 获取小程序二维码云函数入口函数
-exports.main = async (event, context) => {
-  // 获取小程序二维码的buffer
-  const resp = await cloud.openapi.wxacode.get({
-    path: 'pages/index/index'
-  });
-  const { buffer } = resp;
-  // 将图片上传云存储空间
-  const upload = await cloud.uploadFile({
-    cloudPath: 'code.png',
-    fileContent: buffer
-  });
-  return upload.fileID;
-};
-
-const cloud = require('wx-server-sdk');
-cloud.init({
-  env: "cloud1-8g5wmepxce8a3b8a"
-});
-// 获取openId云函数入口函数
-exports.main = async (event, context) => {
-  // 获取基础信息
-  const wxContext = cloud.getWXContext();
-  return {
-    openid: wxContext.OPENID,
-    appid: wxContext.APPID,
-    unionid: wxContext.UNIONID,
-  };
-};
-
-const cloud = require('wx-server-sdk');
-cloud.init({
-  env: cloud.DYNAMIC_CURRENT_ENV
-});
-const db = cloud.database();
-// 查询数据库集合云函数入口函数
-exports.main = async (event, context) => {
-  // 返回数据库查询结果
-  return await db.collection('sales').get();
-};
-
-const cloud = require('wx-server-sdk');
-cloud.init({
-  env: cloud.DYNAMIC_CURRENT_ENV
-});
-const db = cloud.database();
-const $ = db.command.aggregate;
-
-// 聚合记录云函数入口函数
-exports.main = async (event, context) => {
-  // 返回数据库聚合结果
-  return db.collection('sales').aggregate()
-    .group({
-      _id: '$region',
-      sum: $.sum('$sales')
-    })
-    .end();
-};
-
-const cloud = require('wx-server-sdk');
-cloud.init({
-  env: cloud.DYNAMIC_CURRENT_ENV
-});
-const db = cloud.database();
-
-// 修改数据库信息云函数入口函数
-exports.main = async (event, context) => {
-  try {
-    // 遍历修改数据库信息
-    for (let i = 0; i < event.data.length; i++) {
-      await db.collection('sales').where({
-        _id: event.data[i]._id
-      })
-        .update({
-          data: {
-            sales: event.data[i].sales
-          },
-        });
-    }
-    return {
-      success: true,
-      data: event.data
-    };
-  } catch (e) {
-    return {
-      success: false,
-      errMsg: e
-    };
-  }
-};
-
-{
-  "permissions": {
-    "openapi": [
-      "wxacode.get"
-    ]
-  }
-}
-
-
-const getOpenId = require('./getOpenId/index');
-const getMiniProgramCode = require('./getMiniProgramCode/index');
-const createCollection = require('./createCollection/index');
-const selectRecord = require('./selectRecord/index');
-const updateRecord = require('./updateRecord/index');
-const sumRecord = require('./sumRecord/index');
-
-// 云函数入口函数
-exports.main = async (event, context) => {
-  switch (event.type) {
-    case 'getOpenId':
-      return await getOpenId.main(event, context);
-    case 'getMiniProgramCode':
-      return await getMiniProgramCode.main(event, context);
-    case 'createCollection':
-      return await createCollection.main(event, context);
-    case 'selectRecord':
-      return await selectRecord.main(event, context);
-    case 'updateRecord':
-      return await updateRecord.main(event, context);
-    case 'sumRecord':
-      return await sumRecord.main(event, context);
-  }
-};
-
-{
-  "name": "quickstartFunctions",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "wx-server-sdk": "~2.4.0"
-  }
-}
-```
-## 参考文档
-
-- [云开发文档](https://developers.weixin.qq.com/miniprogram/dev/wxcloud/basis/getting-started.html)
-##结论
-本系统能够基本实现一个外卖点餐系统的全部功能，同时能为用户提供两种高效的选择方式，希望能真正帮助大家解决选择困扰，实现节约时间的目的。

scr/food/app.js

@@ -1,51 +0,0 @@
-// app.js
-
-App({
-  onLaunch: function () {
-    if (!wx.cloud) {
-      console.error('请使用 2.2.3 或以上的基础库以使用云能力');
-    } else {
-      wx.cloud.init({
-        // env 参数说明：
-        //   env 参数决定接下来小程序发起的云开发调用（wx.cloud.xxx）会默认请求到哪个云环境的资源
-        //   此处请填入环境 ID, 环境 ID 可打开云控制台查看
-        //   如不填则使用默认环境（第一个创建的环境）
-        // env: 'my-env-id',
-        env:"cloud1-8g5wmepxce8a3b8a",
-        traceUser: true,
-      });
-    }
-
-    this.globalData = {};
-    // 获取用户openid
-    wx.cloud.callFunction({
-      name: 'get',
-      data: {},
-      success: res => {
-        this.globalData.openid = res.result.openid
-      },
-      fail: err => {
-        console.error('[云函数] [login] 调用失败', err)
-      }
-    })
-    console.log(this.globalData)
-
-  
-},
-getOpenid() {
-    let that = this;
-    wx.cloud.callFunction({
-      name: 'get',
-      complete: res => {
-        
-        console.log('openid: ', res.result.openid)
-        console.log('appid: ', res.result.appid)
-        // var openid = res.result.openId;
-        // that.setData({
-        //   openid: openid
-        // })
-      }
-    })
-
- }
-})

scr/food/app.json

@@ -1,73 +0,0 @@
-{
-  "pages": [
-    "pages/login/login",
-    "pages/index/index",
-    "pages/fourm/fourm",
-    "pages/submit/submit",
-    "pages/cart/cart",
-    "pages/usercenter/usercenter",
-    "pages/detail/detail",
-    "pages/searchShow/searchShow",
-    "pages/change/change",
-    "pages/answer/answer",
-    "pages/paying/paying",
-    "pages/orderlist/orderlist",
-    "pages/address/address",
-    "pages/turning/turning",
-    "pages/addAddress/addAddress",
-    "pages/myorder/myorder",
-    "pages/orderdetail/orderdetail",
-    "pages/searchfood/searchfood",
-    "pages/select1/select1",
-    "pages/select2/select2"
-
-  ],
-  "tabBar": {
-    "custom": false,
-   
-    "backgroundColor": "#ffffff",
-    "borderStyle": "black",
-    "list": [
-      {
-        "pagePath": "pages/index/index",
-        "text": "首页",
-        "iconPath": "/images/home.png",
-        "selectedIconPath": "/images/home-active.png"
-      },
-      {
-        "pagePath": "pages/fourm/fourm",
-        "text": "论坛",
-        "iconPath": "/images/message.png",
-        "selectedIconPath": "/images/message-active.png"
-      },
-      {
-        "pagePath": "pages/cart/cart",
-        "text": "购物车",
-        "iconPath": "/images/message.png",
-        "selectedIconPath": "/images/message-active.png"
-      },
-      {
-        "pagePath": "pages/usercenter/usercenter",
-        "text": "我的",
-        "iconPath": "/images/message.png",
-        "selectedIconPath": "/images/message-active.png"
-      }
-    ]
-
-  },
-  "window": {
-    "backgroundColor": "#F6F6F6",
-    "backgroundTextStyle": "light",
-    "navigationBarBackgroundColor": "#F6F6F6",
-    "navigationBarTitleText": "节时不节食",
-    "navigationBarTextStyle": "black",
-    "enablePullDownRefresh": true
-  },
-  "networkTimeout": {
-    "request": 10000,
-    "downloadFile": 10000
-  },
-  "debug": true,
-  "sitemapLocation": "sitemap.json",
-  "style": "v2"
-}

scr/food/app.wxss

@@ -1,160 +0,0 @@
-/**app.wxss**/
-.container {
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: space-between;
-  padding: 200rpx 0;
-  box-sizing: border-box;
-} 
-
-button {
-  background: initial;
-}
-
-button:focus{
-  outline: 0;
-}
-
-button::after{
-  border: none;
-}
-
-
-page {
-  background: #f6f6f6;
-  display: flex;
-  flex-direction: column;
-  justify-content: flex-start;
-}
-
-
-
-/**app.wxss**/
-/* .container {
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: space-between;
-  /*padding: 200rpx 0;*/
-  /* box-sizing: border-box;
-  background: #F0F4F3;
-} */ 
-
-.container.withtab{
-  margin: 105rpx 0 0 0;
-  /*top: 105rpx;*/
-}
-.flex-wrp{
-  display: flex;
-}
-.flex-tab{
-  flex-flow: row nowrap;
-  justify-content: space-around;
-  align-items: stretch;
-}
-.flex-item{
-  flex-grow: 1;
-  text-align: center;
-}
-.top-tab{
-  width: 750rpx;
-  height: 100rpx;
-  background: #298DE5;
-  color: #8CCEFD;
-  font-size: 28rpx;
-  line-height: 100rpx;
-  box-shadow: 0 2px 2px #bebebe;
-  margin: 0 0 8rpx 0;
-  position: fixed;
-  top: 0;
-  z-index: 9999;
-}
-.toptab.active{
-  color: #ffffff;
-  border-bottom: solid 2px #ffffff;
-}
-.container{
-  padding: 0;
-  font-size: 14rpx;
-  color: #000;
-}
-.container .feed-item{
-  width: 690rpx;
-  padding: 30rpx 30rpx 20rpx;
-  margin: 7rpx 0 6rpx 0;
-  background: #ffffff;
-  border-top: 1px solid #eee;
-  border-bottom: 1px solid #eee;
-  box-shadow: 0 2px 5px #eeeeee;
-}
-.container .feed-item .feed-source{
-  width: 690rpx;
-  left: 0;
-  height: 50rpx;
-}
-.container .feed-item .feed-source .avatar{
-  position: relative;
-  display: inline-block;
-}
-.container .feed-item .feed-source a{
-  display: inline-block;
-  height: 40rpx;
-}
-.container .feed-item .feed-source .avatar image{
-  /*position: absolute;*/
-  display: inline-block;
-  width: 45rpx;
-  height: 45rpx;
-  border-radius: 45rpx;
-  top: 10rpx;
-  vertical-align: middle;
-}
-.container .feed-item .feed-source text{
-  /*position: absolute;*/
-  display: inline-block;
-  height: 40rpx;
-  line-height: 40rpx;
-  vertical-align: middle;
-  margin: 0 0 0 15rpx;
-  color: #a0acac;
-  font-size: 26rpx;
-}
-.container .feed-item .feed-source .item-more{
-  display: inline-block;
-  width: 40rpx;
-  height: 45rpx;
-  float: right;
-}
-.container .feed-item .feed-content{
-  padding: 10rpx 0 0 0;
-}
-.container .feed-item .feed-content .question text{
-  font-size: 28rpx;
-  font-weight: 600px;
-  line-height: 40rpx;
-  word-spacing: 5rpx;
-}
-.container .feed-item .feed-content .answer-body{
-  padding: 10rpx 0 0 0;
-  /*height: 10rpx;*/
-  font-size: 24rpx;
-  line-height: 28rpx;
-  color: #5b5b5b;
-}
-.container .feed-item .feed-content .answer-actions{
-  width: 690rpx;
-  padding: 10rpx 0  0;
-  color: #a0acac;
-}
-.container .feed-item .feed-content .answer-actions view{
-  display: inline-block;
-  vertical-align: text-bottom;
-  padding: 0 10rpx 0 0;
-  font-size: 24rpx;
-}
-.container .feed-item .feed-content .answer-actions .dot ::after{
-  content: "•";
-}

scr/food/cloudfunctions/quickstartFunctions/createCollection/index.js

@@ -1,56 +0,0 @@
-const cloud = require('wx-server-sdk');
-
-cloud.init({
-  env: cloud.DYNAMIC_CURRENT_ENV
-});
-
-const db = cloud.database();
-
-// 创建集合云函数入口函数
-exports.main = async (event, context) => {
-  try {
-    // 创建集合
-    await db.createCollection('sales');
-    await db.collection('sales').add({
-      // data 字段表示需新增的 JSON 数据
-      data: {
-        region: '华东',
-        city: '上海',
-        sales: 11
-      }
-    });
-    await db.collection('sales').add({
-      // data 字段表示需新增的 JSON 数据
-      data: {
-        region: '华东',
-        city: '南京',
-        sales: 11
-      }
-    });
-    await db.collection('sales').add({
-      // data 字段表示需新增的 JSON 数据
-      data: {
-        region: '华南',
-        city: '广州',
-        sales: 22
-      }
-    });
-    await db.collection('sales').add({
-      // data 字段表示需新增的 JSON 数据
-      data: {
-        region: '华南',
-        city: '深圳',
-        sales: 22
-      }
-    });
-    return {
-      success: true
-    };
-  } catch (e) {
-    // 这里catch到的是该collection已经存在，从业务逻辑上来说是运行成功的，所以catch返回success给前端，避免工具在前端抛出异常
-    return {
-      success: true,
-      data: 'create collection success'
-    };
-  }
-};

scr/food/cloudfunctions/quickstartFunctions/getMiniProgramCode/index.js

@@ -1,20 +0,0 @@
-const cloud = require('wx-server-sdk');
-
-cloud.init({
-  env: cloud.DYNAMIC_CURRENT_ENV
-});
-
-// 获取小程序二维码云函数入口函数
-exports.main = async (event, context) => {
-  // 获取小程序二维码的buffer
-  const resp = await cloud.openapi.wxacode.get({
-    path: 'pages/index/index'
-  });
-  const { buffer } = resp;
-  // 将图片上传云存储空间
-  const upload = await cloud.uploadFile({
-    cloudPath: 'code.png',
-    fileContent: buffer
-  });
-  return upload.fileID;
-};

scr/food/cloudfunctions/quickstartFunctions/getOpenId/index.js

@@ -1,17 +0,0 @@
-const cloud = require('wx-server-sdk');
-
-cloud.init({
-  env: "cloud1-8g5wmepxce8a3b8a"
-});
-
-// 获取openId云函数入口函数
-exports.main = async (event, context) => {
-  // 获取基础信息
-  const wxContext = cloud.getWXContext();
-
-  return {
-    openid: wxContext.OPENID,
-    appid: wxContext.APPID,
-    unionid: wxContext.UNIONID,
-  };
-};

scr/food/cloudfunctions/quickstartFunctions/index.js

@@ -1,25 +0,0 @@
-const getOpenId = require('./getOpenId/index');
-const getMiniProgramCode = require('./getMiniProgramCode/index');
-const createCollection = require('./createCollection/index');
-const selectRecord = require('./selectRecord/index');
-const updateRecord = require('./updateRecord/index');
-const sumRecord = require('./sumRecord/index');
-
-
-// 云函数入口函数
-exports.main = async (event, context) => {
-  switch (event.type) {
-    case 'getOpenId':
-      return await getOpenId.main(event, context);
-    case 'getMiniProgramCode':
-      return await getMiniProgramCode.main(event, context);
-    case 'createCollection':
-      return await createCollection.main(event, context);
-    case 'selectRecord':
-      return await selectRecord.main(event, context);
-    case 'updateRecord':
-      return await updateRecord.main(event, context);
-    case 'sumRecord':
-      return await sumRecord.main(event, context);
-  }
-};

scr/food/cloudfunctions/quickstartFunctions/selectRecord/index.js

@@ -1,12 +0,0 @@
-const cloud = require('wx-server-sdk');
-
-cloud.init({
-  env: cloud.DYNAMIC_CURRENT_ENV
-});
-const db = cloud.database();
-
-// 查询数据库集合云函数入口函数
-exports.main = async (event, context) => {
-  // 返回数据库查询结果
-  return await db.collection('sales').get();
-};

scr/food/cloudfunctions/quickstartFunctions/sumRecord/index.js

@@ -1,18 +0,0 @@
-const cloud = require('wx-server-sdk');
-
-cloud.init({
-  env: cloud.DYNAMIC_CURRENT_ENV
-});
-const db = cloud.database();
-const $ = db.command.aggregate;
-
-// 聚合记录云函数入口函数
-exports.main = async (event, context) => {
-  // 返回数据库聚合结果
-  return db.collection('sales').aggregate()
-    .group({
-      _id: '$region',
-      sum: $.sum('$sales')
-    })
-    .end();
-};

scr/food/cloudfunctions/quickstartFunctions/updateRecord/index.js

@@ -1,32 +0,0 @@
-const cloud = require('wx-server-sdk');
-
-cloud.init({
-  env: cloud.DYNAMIC_CURRENT_ENV
-});
-const db = cloud.database();
-
-// 修改数据库信息云函数入口函数
-exports.main = async (event, context) => {
-  try {
-    // 遍历修改数据库信息
-    for (let i = 0; i < event.data.length; i++) {
-      await db.collection('sales').where({
-        _id: event.data[i]._id
-      })
-        .update({
-          data: {
-            sales: event.data[i].sales
-          },
-        });
-    }
-    return {
-      success: true,
-      data: event.data
-    };
-  } catch (e) {
-    return {
-      success: false,
-      errMsg: e
-    };
-  }
-};

scr/food/pages/addAddress/addAddress.js

@@ -1,282 +0,0 @@
-
-var address=require('../../utils/mock.js');
-const db = wx.cloud.database({});
-const app=getApp();
-const userid=app.globalData.openid;
-
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    animationAddressMenu: {},
-    addressMenuIsShow: false,
-    value: [0, 0, 0],
-    provinces: [],
-    citys: [],
-    areas: [],
-    consigneeName: "", 
-    phone: "",
-    consigneeRegion: "",
-    detailedAddress: "",
-    labelList: ["家", "公司", "学校"],            //标签
-    labelDefault: 0,              // 标签默认,
-addresslist:{}
-
-  },
-  consigneeNameInput: function(e) {
-    
-    this.setData({
-      consigneeName: e.detail.value
-    })
-  },
-  phoneInput: function(e) {
-    
-    this.setData({
-      phone: e.detail.value
-    })
-  },
-  consigneeRegionInput: function (e) {
-    this.setData({
-      consigneeRegion: e.detail.value
-    })
-  },
-  detailedAddressInput: function (e) {
-    this.setData({
-      detailedAddress: e.detail.value
-    })
-  },
-  chooseLabelSelect: function(e) {
-    var index = e.currentTarget.dataset.index;
-    this.setData({
-      labelDefault: index
-    })
-  },
-  submit: function() {
-    var consigneeName = this.data.consigneeName;
-    console.log(consigneeName)
-    var phone = this.data.phone;
-    console.log(phone)
-    var consigneeRegion = this.data.consigneeRegion;
-    console.log(consigneeRegion)
-    var detailedAddress = this.data.detailedAddress
-    console.log(detailedAddress)
-    if (consigneeName == "") {
-      wx: wx.showToast({
-        title: '请输入姓名',
-  
-      })
-      return false
-    }
-    else if (phone == "") {
-      wx: wx.showToast({
-        title: '请输入手机号码'
-      
-      })
-      return false
-    }
-    else if (consigneeRegion == "") {
-      wx: wx.showToast({
-        title: '请选择所在地区'
-      })
-      return false
-    }
-    else if (detailedAddress == "") {
-      wx: wx.showToast({
-        title: '请输入详细地址',
-      })
-      return false
-    }
-    else {
-      var check=false
-      var addresslist={}
-      addresslist.name=this.data.consigneeName
-      addresslist.phone=this.data.phone
-      addresslist.address=this.data.consigneeRegion
-      console.log(this.data.consigneeRegion)
-      addresslist.detailedAddress=this.data.detailedAddress
-      addresslist.check=check
-      this.setData({
-        addresslist:addresslist
-      })
-      db.collection('user').where({
-        "_openid":userid
-      }) 
-    .update(
-      {
-        data:{
-          address:db.command.push(addresslist)  
-        }
-      },
-    )
-    console.log(addresslist)
-    db.collection('user').where({
-      "_openid":userid
-    }) 
-  .get({
-    success: res => {
-      console.log(res.data)}
-  })
-    console.log(userid)
-    
-      wx.navigateTo({
-        url: '/pages/address/address',
-      })
-    }
-  },
- /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-    // 默认联动显示北京
-   
-    var id = address._provinces[0].id
-    console.log(address._provinces[0].id)
-    this.setData({
-      provinces: address._provinces,
-      citys: address._citys[id],
-      areas: address._areas[address._citys[id][0].id],
-    })
-  },
-  // 点击所在地区弹出选择框
-  select: function (e) {
-    // 如果已经显示，不在执行显示动画
-    if (this.data.addressMenuIsShow) {
-      return false
-    } else {
-      // 执行显示动画
-      this.startAddressAnimation(true)
-    }
-  },
-  // 执行动画
-  startAddressAnimation: function (isShow) {
-    if (isShow) {
-      // vh是用来表示尺寸的单位，高度全屏是100vh
-      this.animation.translateY(0 + 'vh').step()
-    } else {
-      this.animation.translateY(40 + 'vh').step()
-    }
-    this.setData({
-      animationAddressMenu: this.animation.export(),
-      addressMenuIsShow: isShow,
-    })
-  },
-  // 点击地区选择取消按钮
-  cityCancel: function (e) {
-    this.startAddressAnimation(false)
-  },
-  // 点击地区选择确定按钮
-  citySure: function (e) {
-    var that = this
-    var city = that.data.city
-    var value = that.data.value
-    that.startAddressAnimation(false)
-    console.log(value)
-    // 将选择的城市信息显示到输入框
-    var consigneeRegion = that.data.provinces[value[0]].name + '-' + that.data.citys[value[1]].name + '-' + that.data.areas[value[2]].name
-    console.log(consigneeRegion)
-    that.setData({
-      consigneeRegion: consigneeRegion
-    })
-  },
-  // 处理省市县联动逻辑
-  cityChange: function (e) {
-    var value = e.detail.value
-    console.log(value)
-    var provinces = this.data.provinces
-    var citys = this.data.citys
-    var areas = this.data.areas
-    var provinceNum = value[0]
-    var cityNum = value[1]
-    var countyNum = value[2]
-    console.log(provinceNum)
-    
-    // 如果省份选择项和之前不一样，表示滑动了省份，此时市默认是省的第一组数据，
-    if (this.data.value[0] != provinceNum) {
-    var pid = provinces[provinceNum].id
-    console.log(pid)
-    console.log(address._citys[pid][0])
-    console.log(address._citys[pid][0].id)
-   
-      this.setData({
-        value: [provinceNum, 0, 0],
-        citys: address._citys[pid],
-        areas: address._areas[address._citys[pid][0].id],
-      })
-     
-    } else if (this.data.value[1] != cityNum) {
-      // 滑动选择了第二项数据，即市，此时区显示省市对应的第一组数据
-      var id = citys[cityNum].id
-      this.setData({
-        value: [provinceNum, cityNum, 0],
-        areas: address.areas[citys[cityNum].id],
-      })
-    } 
-      
-    console.log(provinceNum)
-      console.log(cityNum)
-      console.log(countyNum)
-      // 滑动选择了区
-      this.setData({
-        value: [provinceNum, cityNum, countyNum]
-      })
-
-    
-  },
-
- 
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function() {
-    var animation = wx.createAnimation({
-      duration: 500,
-      timingFunction: 'linear',
-    })
-    this.animation = animation
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
-})