Merge branch 'master' of https://dkb.xmyuedian.com/18016688350/agent-vending-machine

# Conflicts:
#	pages/billing/index.js
#	project.config.json

app.json

@@ -101,5 +101,6 @@
       "version": "1.0.9",
       "provider": "wx76a9a06e5b4e693e"
     }
-  }
+  },
+  "lazyCodeLoading": "requiredComponents"
 }

components/drawer/drawer.js

@@ -1,31 +0,0 @@
-//抽屉组件
-Component({
-  externalClasses: ['tui-drawer-class'], //自定义样式
-  properties: {
-    visible: {
-      type: Boolean,
-      value: false
-    },
-    mask: {
-      type: Boolean,
-      value: true
-    },
-    maskClosable: {
-      type: Boolean,
-      value: true
-    },
-    mode: {
-      type: String,
-      value: 'left' // left right
-    }
-  },
-  data: {},
-  methods: {
-    handleMaskClick() {
-      if (!this.data.maskClosable) {
-        return;
-      }
-      this.triggerEvent('close', {});
-    }
-  }
-});

components/drawer/drawer.json

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

components/drawer/drawer.wxml

@@ -1,7 +0,0 @@
-<view class="tui-drawer-class tui-drawer {{ visible ? 'tui-drawer-show' : '' }} {{ 'tui-drawer-' + mode }}">
-    <view wx:if="{{ mask }}" class="tui-drawer-mask" bindtap="handleMaskClick"></view>
-    <view class="tui-drawer-container">
-        <slot></slot>
-    </view>
-</view>
-

components/drawer/drawer.wxss

@@ -1,64 +0,0 @@
-.tui-drawer {
-  visibility: hidden;
-}
-
-.tui-drawer-show {
-  visibility: visible;
-}
-
-.tui-drawer-show .tui-drawer-mask {
-  display: block;
-  opacity: 1;
-}
-
-.tui-drawer-show .tui-drawer-container {
-  opacity: 1;
-}
-
-.tui-drawer-show.tui-drawer-left .tui-drawer-container,
-.tui-drawer-show.tui-drawer-right .tui-drawer-container {
-  transform: translate3d(0, -50%, 0);
-}
-
-.tui-drawer-mask {
-  opacity: 0;
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  z-index: 8888;
-  background: rgba(0, 0, 0, 0.6);
-  transition: all 0.3s ease-in-out;
-}
-
-.tui-drawer-container {
-  position: fixed;
-  left: 50%;
-  height: 100%;
-  top: 0;
-  transform: translate3d(-50%, -50%, 0);
-  transform-origin: center;
-  transition: all 0.3s ease-in-out;
-  z-index: 99999;
-  opacity: 0;
-  overflow-y: scroll;
-  background: #fff;
-  -webkit-overflow-scrolling: touch;
-  -ms-touch-action: pan-y cross-slide-y;
-  -ms-scroll-chaining: none;
-  -ms-scroll-limit: 0 50 0 50;
-}
-
-.tui-drawer-left .tui-drawer-container {
-  left: 0;
-  top: 50%;
-  transform: translate3d(-100%, -50%, 0);
-}
-
-.tui-drawer-right .tui-drawer-container {
-  right: 0;
-  top: 50%;
-  left: auto;
-  transform: translate3d(100%, -50%, 0);
-}

components/list-view/list-view.js

@@ -1,15 +0,0 @@
-Component({
-  externalClasses: ['tui-view-class'], //自定义样式
-  properties: {
-    title: {
-      type: String,
-      value: ''
-    },
-    unlined: {
-      type: String,
-      value: '' //top,bottom,all
-    }
-  },
-  data: {},
-  methods: {}
-})

components/list-view/list-view.json

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

components/list-view/list-view.wxml

@@ -1,6 +0,0 @@
-<view class="tui-list-view tui-view-class">
-  <view class="tui-list-title" wx:if="{{title}}">{{title}}</view>
-  <view class="tui-list-content {{unlined?'tui-border-'+unlined:''}}">
-    <slot></slot>
-  </view>
-</view>

components/list-view/list-view.wxss

@@ -1,46 +0,0 @@
-.tui-list-title{
-  width: 100%;
-  padding: 30rpx;
-  box-sizing: border-box;
-  font-size: 30rpx;
-  line-height: 30rpx;
-  color: #666;
-}
-.tui-list-content{
-  width: 100%;
-  position: relative;
-}
-.tui-list-content::before {
-  content: " ";
-  position: absolute;
-  top: -1rpx;
-  right: 0;
-  left: 0;
-  border-top: 1rpx solid #eaeef1;
-  -webkit-transform: scaleY(0.5);
-  transform: scaleY(0.5);
-
-}
-.tui-list-content::after {
-  content: '';
-  position: absolute;
-  border-bottom: 1rpx solid #eaeef1;
-  -webkit-transform: scaleY(0.5);
-  transform: scaleY(0.5);
-  bottom: 0;
-  right: 0;
-  left: 0;
-}
-
-.tui-border-top::before {
-  border-top: 0;
-}
-.tui-border-bottom::after {
-  border-bottom:0;
-}
-.tui-border-all::after {
-  border-bottom:0;
-}
-.tui-border-all::before {
-  border-top:0;
-}

components/top-dropdown/top-dropdown.js

@@ -1,47 +0,0 @@
-// 顶部下拉列表
-Component({
-  externalClasses: ['tui-top-dropdown'],
-  properties: {
-    //是否需要mask
-    mask: {
-      type: Boolean,
-      value: true
-    },
-    //控制显示
-    show: {
-      type: Boolean,
-      value: false
-    },
-    //背景颜色
-    bgcolor: {
-      type: String,
-      value: "#f2f2f2"
-    },
-    //padding-bottom  rpx
-    paddingbtm: {
-      type: Number,
-      value: 0
-    },
-    //高度 rpx
-    height: {
-      type: Number,
-      value: 580
-    },
-    //移动距离 需要计算
-    translatey: {
-      type: Number,
-      value: 0
-    }
-  },
-  data: {
-
-  },
-  methods: {
-    handleClose() {
-      if (!this.data.show) {
-        return;
-      }
-      this.triggerEvent('close', {});
-    }
-  }
-})

components/top-dropdown/top-dropdown.json

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

components/top-dropdown/top-dropdown.wxml

@@ -1,4 +0,0 @@
-<view class="tui-top-dropdown tui-dropdown-box {{show?'tui-dropdown-show':''}}" style="height:{{height?height+'rpx':'auto'}}; background: {{bgcolor}};padding-bottom: {{paddingbtm}}rpx;transform: translateZ(0) translateY({{show?translatey+'rpx':'-100%'}});">
-  <slot></slot>
-</view>
-<view class="tui-dropdown-mask {{mask && show ?'tui-mask-show':''}}" bindtap="handleClose"></view>

components/top-dropdown/top-dropdown.wxss

@@ -1,35 +0,0 @@
-.tui-dropdown-box {
-  width: 100%;
-  position: fixed;
-  box-sizing: border-box;
-  border-bottom-right-radius: 24rpx;
-  border-bottom-left-radius: 24rpx;
-  transform: translateZ(0);
-  overflow: hidden;
-  visibility: hidden;
-  transition: all 0.3s ease-in-out;
-  z-index: 998;
-  top:0;
-}
-
-.tui-dropdown-show {
-  visibility: visible;
-}
-
-.tui-dropdown-mask {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background: rgba(0, 0, 0, 0.6);
-  z-index: 996;
-  transition: all 0.3s ease-in-out;
-  opacity: 0;
-  visibility: hidden;
-}
-
-.tui-mask-show {
-  opacity: 1;
-  visibility: visible;
-}

components/tui-upload/tui-upload.js

@@ -1,270 +0,0 @@
-Component({
-  properties: {
-    //初始化图片路径
-    value: {
-      type: Array,
-      value: [],
-      observer(val) {
-        this.initImages()
-      }
-    },
-    //禁用删除
-    forbidDel: {
-      type: Boolean,
-      value: false
-    },
-    //禁用添加
-    forbidAdd: {
-      type: Boolean,
-      value: false
-    },
-    //服务器地址
-    serverUrl: {
-      type: String,
-      value: ""
-    },
-    //限制数
-    limit: {
-      type: Number,
-      value: 9
-    },
-    //original 原图，compressed 压缩图，默认二者都有
-    sizeType: {
-      type: Array,
-      value:['original', 'compressed']
-    },
-    //album 从相册选图，camera 使用相机，默认二者都有。如需直接开相机或直接选相册，请只使用一个选项
-    sourceType: {
-      type: Array,
-      value:['album', 'camera']
-    },
-    //可上传图片类型，默认为空，不限制  Array<String> [jpg,png,gif]
-    imageFormat: {
-      type: Array,
-      value:[]
-    },
-    //单张图片大小限制 MB 
-    size: {
-      type: Number,
-      value: 4
-    },
-    //项目名，默认为 file
-    fileKeyName: {
-      type: String,
-      value: "file"
-    },
-    //HTTP 请求 Header, header 中不能设置 Referer。
-    header: {
-      type: Object,
-      value: {}
-    },
-    //HTTP 请求中其他额外的 form data
-    formData: {
-      type: Object,
-      value: {}
-    }
-  },
-  lifetimes: {
-    ready: function () {
-      this.initImages()
-    }
-  },
-  data: {
-    //图片地址
-    imageList: [],
-    //上传状态：1-上传成功 2-上传中 3-上传失败
-    statusArr: []
-  },
-
-  /**
-   * 组件的方法列表
-   */
-  methods: {
-    initImages() {
-      let imgArr = [...this.data.value]
-      let status = []
-      for (let item of imgArr) {
-        status.push("1")
-      }
-      this.setData({
-        imageList: [...imgArr],
-        statusArr: status
-      })
-    },
-    // 重新上传
-    reUpLoad(e) {
-      let index = Number(e.currentTarget.dataset.index)
-      let value = `statusArr[${index}]`
-      this.setData({
-        [value]: "2"
-      })
-      this.change()
-      this.uploadImage(index, this.data.imageList[index]).then(() => {
-        this.change()
-      }).catch(() => {
-        this.change()
-      })
-    },
-    change() {
-      let status = ~this.data.statusArr.indexOf("2") ? 2 : 1
-      if (status != 2 && ~this.data.statusArr.indexOf("3")) {
-        // 上传失败
-        status = 3
-      }
-      this.triggerEvent('complete', {
-        status: status,
-        imgArr: this.data.imageList
-      })
-    },
-    toast(text) {
-      text && wx.showToast({
-        title: text,
-        icon: "none"
-      });
-    },
-    chooseImage: function () {
-      let _this = this;
-      wx.chooseImage({
-        count: _this.data.limit - _this.data.imageList.length,
-        sizeType: _this.data.sizeType,
-				sourceType: _this.data.sourceType,
-        success: function (e) {
-          let imageArr = [];
-          let status = []
-          for (let i = 0; i < e.tempFiles.length; i++) {
-            let len = _this.data.imageList.length;
-            if (len >= _this.data.limit) {
-              _this.toast(`最多可上传${_this.data.limit}张图片`);
-              break;
-            }
-
-            //过滤图片类型
-							let path = e.tempFiles[i].path;
-
-							if (_this.data.imageFormat.length > 0) {
-								let format = path.split(".")[(path.split(".")).length - 1];
-								if (_this.data.imageFormat.indexOf(format) == -1) {
-									let text = `只能上传 ${_this.data.imageFormat.join(',')} 格式图片！`
-									_this.toast(text);
-									continue;
-								}
-							}
-
-							//过滤超出大小限制图片
-							let size = e.tempFiles[i].size;
-
-							if (_this.data.size * 1024 * 1024 < size){
-								let err=`单张图片大小不能超过：${_this.data.size}MB`
-								_this.toast(err);
-								continue;
-							}
-
-            imageArr.push(path)
-            status.push("2")
-          }
-          _this.setData({
-            imageList: _this.data.imageList.concat(imageArr),
-            statusArr: _this.data.statusArr.concat(status)
-          })
-          _this.change()
-
-          let start = _this.data.imageList.length - imageArr.length
-          for (let j = 0; j < imageArr.length; j++) {
-            let index = start + j
-            //服务器地址
-            if (_this.data.serverUrl) {
-              _this.uploadImage(index, imageArr[j]).then(() => {
-                _this.change()
-              }).catch(() => {
-                _this.change()
-              })
-            } else {
-              //无服务器地址则直接返回成功
-              let value = `statusArr[${index}]`
-              _this.setData({
-                [value]: "1"
-              })
-              _this.change()
-            }
-          }
-        }
-      })
-    },
-    uploadImage: function (index, url) {
-      let _this = this;
-      let status = `statusArr[${index}]`;
-      return new Promise((resolve, reject) => {
-        wx.uploadFile({
-          url: this.data.serverUrl,
-          name: this.data.fileKeyName,
-          header: this.data.header,
-          formData: this.data.formData,
-          filePath: url,
-          success: function (res) {
-            console.log(res)
-            if (res.statusCode == 200) {
-              //返回结果 此处需要按接口实际返回进行修改
-              let d = JSON.parse(res.data.replace(/\ufeff/g, "") || "{}")
-              //判断code，以实际接口规范判断
-              if (d.code % 100 === 0) {
-                // 上传成功 d.url 为上传后图片地址，以实际接口返回为准
-                if (d.url) {
-                  let value = `imageList[${index}]`
-                  _this.setData({
-                    [value]: d.url
-                  })
-                }
-                _this.setData({
-                  [status]: d.url ? "1" : "3"
-                })
-              } else {
-                // 上传失败
-                _this.setData({
-                  [status]: "3"
-                })
-              }
-              resolve(index)
-            } else {
-              _this.setData({
-                [status]: "3"
-              })
-              reject(index)
-            }
-          },
-          fail: function (res) {
-            _this.setData({
-              [status]: "3"
-            })
-            reject(index)
-          }
-        })
-      })
-
-    },
-    delImage: function (e) {
-      let index = Number(e.currentTarget.dataset.index)
-
-      let imgList = [...this.data.imageList]
-      let status = [...this.data.statusArr]
-      imgList.splice(index, 1)
-      status.splice(index, 1)
-      this.setData({
-        imageList: imgList,
-        statusArr: status
-      })
-      this.triggerEvent("remove", {
-        index: index
-      })
-      this.change()
-    },
-    previewImage: function (e) {
-      let index = Number(e.currentTarget.dataset.index)
-      if (!this.data.imageList.length) return;
-      wx.previewImage({
-        current: this.data.imageList[index],
-        loop: true,
-        urls: this.data.imageList
-      })
-    }
-  }
-})

components/tui-upload/tui-upload.json

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

components/tui-upload/tui-upload.wxml

@@ -1,16 +0,0 @@
-<view class="tui-container">
-  <view class="tui-upload-box">
-    <view class="tui-image-item" wx:for="{{imageList}}" wx:key="{{index}}">
-      <image src="{{item}}" class="tui-item-img" catchtap="previewImage" data-index="{{index}}" mode="aspectFill"></image>
-      <view wx:if="{{!forbidDel}}" class="tui-img-del" catchtap="delImage" data-index="{{index}}"></view>
-      <view wx:if="{{statusArr[index]!=1}}" class="tui-upload-mask">
-        <view class="tui-upload-loading" wx:if="{{statusArr[index]==2}}"></view>
-        <text class="tui-tips">{{statusArr[index]==2?'上传中...':'上传失败'}}</text>
-        <view class="tui-mask-btn" wx:if="{{statusArr[index]==3}}" catchtap="reUpLoad" data-index="{{index}}" hover-class="tui-hover" hover-stay-time="150">重新上传</view>
-      </view>
-    </view>
-    <view wx:if="{{!forbidAdd && imageList.length < limit}}" class="tui-upload-add" bindtap="chooseImage">
-      <view class="tui-upload-icon tui-icon-plus"></view>
-    </view>
-  </view>
-</view>

components/tui-upload/tui-upload.wxss

@@ -1,137 +0,0 @@
-@font-face {
-  font-family: 'tuiUpload';
-  src: url(data:application/font-woff;charset=utf-8;base64,d09GRgABAAAAAATcAA0AAAAAByQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABGRlRNAAAEwAAAABoAAAAciR52BUdERUYAAASgAAAAHgAAAB4AKQALT1MvMgAAAaAAAABCAAAAVjxvR/tjbWFwAAAB+AAAAEUAAAFK5ibpuGdhc3AAAASYAAAACAAAAAj//wADZ2x5ZgAAAkwAAADXAAABAAmNjcZoZWFkAAABMAAAAC8AAAA2FpiS+WhoZWEAAAFgAAAAHQAAACQH3QOFaG10eAAAAeQAAAARAAAAEgwAACBsb2NhAAACQAAAAAwAAAAMAEoAgG1heHAAAAGAAAAAHwAAACABEgA2bmFtZQAAAyQAAAFJAAACiCnmEVVwb3N0AAAEcAAAACgAAAA6OMUs4HjaY2BkYGAAYo3boY/i+W2+MnCzMIDAzb3qdQj6fwPzf+YGIJeDgQkkCgA/KAtvAHjaY2BkYGBu+N/AEMPCAALM/xkYGVABCwBZ4wNrAAAAeNpjYGRgYGBl0GJgZgABJiDmAkIGhv9gPgMADTABSQB42mNgZGFgnMDAysDA1Ml0hoGBoR9CM75mMGLkAIoysDIzYAUBaa4pDA7PGJ9xMjf8b2CIYW5gaAAKM4LkANt9C+UAAHjaY2GAABYIVmBgAAAA+gAtAAAAeNpjYGBgZoBgGQZGBhBwAfIYwXwWBg0gzQakGRmYnjE+4/z/n4EBQksxSf6GqgcCRjYGOIeRCUgwMaACRoZhDwCiLwmoAAAAAAAAAAAAAAAASgCAeNpdjkFKw0AARf/vkIR0BkPayWRKQZtYY90ohJju2kOIbtz0KD1HVm50UfEmWXoAr9ADOHFARHHzeY//Fx8Ci+FJfIgdJFa4AhgiMshbrCuIsLxhFJZVs+Vl1bT1GddtbXTC3OhohN4dg4BJ3zMJAnccyfm468ZzHXddrH9ZKbHzdf9n/vkY/xv9sPQXgGEvBrHHwst5kTbXLE+YpYVPkxepPmW94W16UbdNJd6f3SAzo5W7m1jaKd+8ZZIvk5nlKw9SK6Wle7BLS3f/bTzQLmfAF2T1NsQAeNp9kD1OAzEQhZ/zByQSQiCoXVEA2vyUKRMp9Ailo0g23pBo1155nUg5AS0VB6DlGByAGyDRcgpelkmTImvt6PObmeexAZzjGwr/3yXuhBWO8ShcwREy4Sr1F+Ea+V24jhY+hRvUf4SbuFUD4RYu1BsdVO2Eu5vSbcsKZxgIV3CKJ+Eq9ZVwjfwqXMcVPoQb1L+EmxjjV7iFa2WpDOFhMEFgnEFjig3jAjEcLJIyBtahOfRmEsxMTzd6ETubOBso71dilwMeaDnngCntPbdmvkon/mDLgdSYbh4FS7YpjS4idCgbXyyc1d2oc7D9nu22tNi/a4E1x+xRDWzU/D3bM9JIbAyvkJI18jK3pBJTj2hrrPG7ZynW814IiU68y/SIx5o0dTr3bmniwOLn8owcfbS5kj33qBw+Y1kIeb/dTsQgil2GP5PYcRkAAAB42mNgYoAALjDJyIAOWMGiTIxMjMxsKak5qSWpbFmZiRmJ+QAmgAUIAAAAAf//AAIAAQAAAAwAAAAWAAAAAgABAAMABAABAAQAAAACAAAAAHjaY2BgYGQAgqtL1DlA9M296nUwGgA+8QYgAAA=) format('woff');
-  font-weight: normal;
-  font-style: normal;
-}
-
-.tui-upload-icon {
-  font-family: "tuiUpload" !important;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  padding: 10rpx;
-}
-
-.tui-icon-delete:before {
-  content: "\e601";
-}
-
-.tui-icon-plus:before {
-  content: "\e609";
-}
-
-.tui-upload-box {
-  width: 100%;
-  display: flex;
-  flex-wrap: wrap;
-}
-
-.tui-upload-add {
-  width: 220rpx;
-  height: 220rpx;
-  font-size: 68rpx;
-  font-weight: 100;
-  color: #888;
-  background-color: #F7F7F7;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  padding: 0;
-}
-
-.tui-image-item {
-  width: 220rpx;
-  height: 220rpx;
-  position: relative;
-  margin-right: 20rpx;
-  margin-bottom: 20rpx;
-}
-
-.tui-image-item:nth-of-type(3n) {
-  margin-right: 0;
-}
-
-.tui-item-img {
-  width: 220rpx;
-  height: 220rpx;
-  display: block;
-}
-
-.tui-img-del {
-  width: 36rpx;
-  height: 36rpx;
-  position: absolute;
-  right: -12rpx;
-  top: -12rpx;
-  background-color: #EB0909;
-  border-radius: 50%;
-  color: white;
-  font-size: 34rpx;
-  z-index: 999;
-}
-
-.tui-img-del::before {
-  content: '';
-  width: 16rpx;
-  height: 1px;
-  position: absolute;
-  left: 10rpx;
-  top: 18rpx;
-  background-color: #fff;
-}
-
-.tui-upload-mask {
-  width: 100%;
-  height: 100%;
-  position: absolute;
-  left: 0;
-  top: 0;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: space-around;
-  padding: 40rpx 0;
-  box-sizing: border-box;
-  background-color: rgba(0, 0, 0, 0.6);
-}
-
-.tui-upload-loading {
-  width: 28rpx;
-  height: 28rpx;
-  border-radius: 50%;
-  border: 2px solid;
-  border-color: #B2B2B2 #B2B2B2 #B2B2B2 #fff;
-  animation: tui-rotate 0.7s linear infinite;
-}
-
-@keyframes tui-rotate {
-  0% {
-    transform: rotate(0);
-  }
-
-  100% {
-    transform: rotate(360deg);
-  }
-}
-
-.tui-tips {
-  font-size: 26rpx;
-  color: #fff;
-}
-
-.tui-mask-btn {
-  padding: 4rpx 16rpx;
-  border-radius: 40rpx;
-  text-align: center;
-  font-size: 24rpx;
-  color: #fff;
-  border: 1rpx solid #fff;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.tui-btn-hover {
-  opacity: 0.8;
-}

pages/accountBind/index.json

@@ -3,7 +3,6 @@
   "navigationBarBackgroundColor": "#5677fc",
   "navigationBarTextStyle": "white",
   "usingComponents": {
-    "tui-upload": "../../components/tui-upload/tui-upload",
     "tui-list-cell":"../../components/list-cell/list-cell",
     "tui-button": "../../components/button/button"
   }

pages/accountRecord/index.json

@@ -5,7 +5,6 @@
   "usingComponents": {
     "tui-list-cell":"../../components/list-cell/list-cell",
     "time-picker": "../../components/timePicker/timePicker",
-    "tui-view": "../../../components/list-view/list-view",
     "tui-cell": "../../../components/list-cell/list-cell" 
   }
 }

pages/billing/index.js

@@ -118,7 +118,7 @@ Page({
       ["searchParams.createTime_end"]: data.endTime,
       list:[]
     });
-    this.getList()
+    this.getList();
   },
   getList() {
     var that = this

pages/billing/index.json

@@ -6,7 +6,6 @@
     "tui-tabs": "../../components/tui-tabs/tui-tabs",
     "tui-list-cell":"../../components/list-cell/list-cell",
     "time-picker": "../../components/timePicker/timePicker",
-    "tui-view": "../../../components/list-view/list-view",
     "tui-cell": "../../../components/list-cell/list-cell"
   }
 }

pages/divide/index.json

@@ -5,7 +5,6 @@
   "usingComponents": {
     "tui-list-cell":"../../components/list-cell/list-cell",
     "time-picker": "../../components/timePicker/timePicker",
-    "tui-view": "../../../components/list-view/list-view",
     "tui-cell": "../../../components/list-cell/list-cell" 
   }
 }

pages/index/index.json

@@ -3,7 +3,6 @@
   "navigationBarBackgroundColor": "#5677fc",
   "navigationBarTextStyle": "white",
   "usingComponents": {
-    "tui-tabs": "../../components/tui-tabs/tui-tabs",
-    "tui-view": "../../components/list-view/list-view"
+    "tui-tabs": "../../components/tui-tabs/tui-tabs"
   }
 }

pages/order/index.json

@@ -6,8 +6,6 @@
     "tui-button": "../../components/extend/button/button",
     "tui-list-cell":"../../components/list-cell/list-cell",
     "tui-icon":"../../components/icon/icon",
-    "tui-top-dropdown": "../../components/top-dropdown/top-dropdown",
-    "tui-drawer": "../../components/drawer/drawer",
     "tui-loadmore": "../../components/loadmore/loadmore",
     "tui-nomore": "../../components/nomore/nomore",
     "time-picker": "../../components/timePicker/timePicker"

pages/orderGoods/order.json

@@ -7,8 +7,6 @@
     "tui-button": "../../components/extend/button/button",
     "tui-list-cell":"../../components/list-cell/list-cell",
     "tui-icon":"../../components/icon/icon",
-    "tui-top-dropdown": "../../components/top-dropdown/top-dropdown",
-    "tui-drawer": "../../components/drawer/drawer",
     "tui-loadmore": "../../components/loadmore/loadmore",
     "tui-nomore": "../../components/nomore/nomore",
     "time-picker": "../../components/timePicker/timePicker"

pages/pwdSet/index.json

@@ -3,7 +3,6 @@
   "navigationBarBackgroundColor": "#5677fc",
   "navigationBarTextStyle": "white",
   "usingComponents": {
-    "tui-upload": "../../components/tui-upload/tui-upload",
     "tui-list-cell":"../../components/list-cell/list-cell",
     "tui-button": "../../components/button/button"
   }

pages/scheme/form.json

@@ -4,7 +4,6 @@
   "navigationBarTextStyle": "white",
   "usingComponents": {
     "tui-list-cell":"/components/list-cell/list-cell",
-    "tui-button": "/components/extend/button/button",
-    "tui-upload": "/components/tui-upload/tui-upload"
+    "tui-button": "/components/extend/button/button"
   }
 }

pages/vendingMachine/index.json

@@ -3,7 +3,6 @@
   "navigationBarBackgroundColor": "#5677fc",
   "navigationBarTextStyle": "white",
   "usingComponents": {
-    "tui-view": "../../components/list-view/list-view",
     "tui-icon": "../../components/icon/icon"
   }
 }

project.config.json

@@ -1,22 +1,19 @@
 {
-  "description": "项目配置文件",
-  "packOptions": {
-    "ignore": []
-  },
+  "description": "项目配置文件，详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
   "setting": {
     "urlCheck": false,
-    "es6": true,
-    "enhance": false,
+    "es6": false,
+    "enhance": true,
     "postcss": true,
     "preloadBackgroundData": false,
     "minified": true,
     "newFeature": false,
     "coverView": true,
-    "nodeModules": false,
+    "nodeModules": true,
     "autoAudits": false,
     "showShadowRootInWxmlPanel": true,
     "scopeDataCheck": false,
-    "uglifyFileName": false,
+    "uglifyFileName": true,
     "checkInvalidKey": true,
     "checkSiteMap": true,
     "uploadWithSourceMap": true,
@@ -36,40 +33,23 @@
     "packNpmRelationList": [],
     "minifyWXSS": true,
     "disableUseStrict": false,
+    "minifyWXML": true,
     "showES6CompileOption": false,
     "useCompilerPlugins": false,
-    "ignoreUploadUnusedFiles": true,
-    "minifyWXML": true
+    "ignoreUploadUnusedFiles": true
   },
   "compileType": "miniprogram",
-  "libVersion": "2.16.0",
-  "appid": "wxc42df73f9710a566",
-  "projectname": "mg-vending-machine-applets-manage",
-  "debugOptions": {
-    "hidedInDevtools": []
-  },
-  "scripts": {},
-  "isGameTourist": false,
   "simulatorType": "wechat",
   "simulatorPluginLibVersion": {},
-  "condition": {
-    "search": {
-      "list": []
-    },
-    "conversation": {
-      "list": []
-    },
-    "game": {
-      "list": []
-    },
-    "plugin": {
-      "list": []
-    },
-    "gamePlugin": {
-      "list": []
-    },
-    "miniprogram": {
-      "list": []
-    }
-  }
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 4
+  },
+  "libVersion": "2.24.5",
+  "packOptions": {
+    "ignore": [],
+    "include": []
+  },
+  "appid": "wxc42df73f9710a566",
+  "condition": {}
 }

utils/util.js

@@ -30,8 +30,8 @@ const utils = {
   
   interfaceUrl: function () {
     //接口地址
-    // return "http://automatapi.mengguohotel.com/";
-     return "http://127.0.0.1:8111/";
+    return "http://automatapi.mengguohotel.com/";
+    //  return "http://127.0.0.1:8111/";
   },
   toast: function (text, duration, success) {
     wx.showToast({