From 4810dc79e37d1f74aab6c0879947ffc4a97c0a24 Mon Sep 17 00:00:00 2001
From: messi <977691291@qq.com>
Date: Mon, 19 Aug 2024 17:17:46 +0800
Subject: [PATCH] fix
---
.env.development | 2 +-
.gitignore | 0
.hbuilderx/launch.json | 0
App.vue | 0
androidPrivacy.json | 0
api/address.js | 0
api/article/category.js | 0
api/article/index.js | 0
api/balance.js | 0
api/balance/log.js | 0
api/bargain/active.js | 0
api/bargain/checkout.js | 0
api/bargain/task.js | 0
api/captcha.js | 0
api/cart.js | 0
api/cashier/index.js | 0
api/category/index.js | 0
api/checkout.js | 0
api/comment.js | 0
api/coupon.js | 0
api/dealer/apply.js | 0
api/dealer/index.js | 0
api/dealer/order.js | 0
api/dealer/poster.js | 0
api/dealer/setting.js | 0
api/dealer/team.js | 0
api/dealer/withdraw.js | 0
api/express.js | 0
api/goods/index.js | 0
api/goods/service.js | 0
api/groupon/checkout.js | 0
api/groupon/goods.js | 0
api/groupon/setting.js | 0
api/groupon/task.js | 0
api/help.js | 0
api/live/room.js | 0
api/login/index.js | 0
api/myCoupon.js | 0
api/order.js | 0
api/order/comment.js | 0
api/page.js | 0
api/points/log.js | 0
api/recharge.js | 0
api/recharge/order.js | 0
api/recharge/plan.js | 0
api/refund.js | 0
api/region.js | 0
api/setting.js | 0
api/sharp/checkout.js | 0
api/sharp/goods.js | 0
api/sharp/home.js | 0
api/shop.js | 0
api/shop/order.js | 0
api/upload.js | 0
api/user.js | 0
api/user/coupon.js | 0
api/wxofficial.js | 0
app.scss | 0
common/constant/index.js | 0
common/constant/paginate.js | 0
common/enum/Client.js | 0
common/enum/coupon/ApplyRange.js | 0
common/enum/coupon/CouponType.js | 0
common/enum/coupon/ExpireType.js | 0
common/enum/coupon/index.js | 0
common/enum/dealer/apply/ApplyStatus.js | 0
common/enum/dealer/apply/ApplyType.js | 0
common/enum/dealer/apply/index.js | 0
common/enum/dealer/withdraw/ApplyStatus.js | 0
common/enum/dealer/withdraw/PayType.js | 0
common/enum/dealer/withdraw/index.js | 0
common/enum/enum.js | 0
common/enum/goods/GoodsType.js | 0
common/enum/goods/SpecType.js | 0
common/enum/goods/index.js | 0
common/enum/groupon/ActiveStatus.js | 0
common/enum/groupon/ActiveType.js | 0
common/enum/groupon/GoodsStatus.js | 0
common/enum/groupon/TaskStatus.js | 0
common/enum/groupon/index.js | 0
common/enum/live/LiveStatus.js | 0
common/enum/live/index.js | 0
common/enum/order/DeliveryStatus.js | 0
common/enum/order/DeliveryType.js | 0
common/enum/order/OrderSource.js | 0
common/enum/order/OrderStatus.js | 0
common/enum/order/OrderType.js | 0
common/enum/order/PayStatus.js | 0
common/enum/order/PayType.js | 0
common/enum/order/ReceiptStatus.js | 0
common/enum/order/delivery/DeliveryMethod.js | 0
common/enum/order/delivery/index.js | 0
common/enum/order/index.js | 0
common/enum/order/refund/AuditStatus.js | 0
common/enum/order/refund/RefundStatus.js | 0
common/enum/order/refund/RefundType.js | 0
common/enum/order/refund/index.js | 0
common/enum/payment/Method.js | 0
common/enum/payment/index.js | 0
common/enum/setting/Key.js | 0
common/enum/sharp/ActiveStatus.js | 0
common/enum/sharp/GoodsStatus.js | 0
common/enum/sharp/index.js | 0
common/enum/store/page/category/Style.js | 0
common/enum/store/page/category/index.js | 0
common/model/Region.js | 0
common/model/Setting.js | 0
common/model/dealer/Setting.js | 0
common/model/groupon/Setting.js | 0
components/add-cart-btn/index.vue | 0
components/add-cart-popup/index.vue | 0
components/avatar-image/index.vue | 0
components/countdown/index.vue | 0
components/customer-btn/index.vue | 0
components/empty/index.vue | 0
components/goods-poster-popup/index.vue | 0
components/goods-sku-popup/index.vue | 0
.../goods-sku-popup/number-box/index.vue | 0
components/jyf-parser/jyf-parser.vue | 0
components/jyf-parser/libs/CssHandler.js | 0
components/jyf-parser/libs/MpHtmlParser.js | 0
components/jyf-parser/libs/config.js | 0
components/jyf-parser/libs/handler.wxs | 0
components/jyf-parser/libs/trees.vue | 0
.../mescroll-uni/components/mescroll-down.css | 0
.../mescroll-uni/components/mescroll-down.vue | 0
.../components/mescroll-empty.vue | 0
.../mescroll-uni/components/mescroll-top.vue | 0
.../mescroll-uni/components/mescroll-up.css | 0
.../mescroll-uni/components/mescroll-up.vue | 0
components/mescroll-uni/mescroll-body.css | 0
components/mescroll-uni/mescroll-body.vue | 0
components/mescroll-uni/mescroll-mixins.js | 0
.../mescroll-uni/mescroll-uni-option.js | 0
components/mescroll-uni/mescroll-uni.css | 0
components/mescroll-uni/mescroll-uni.js | 0
components/mescroll-uni/mescroll-uni.vue | 0
.../mescroll-uni/mixins/mescroll-comp.js | 0
.../mescroll-uni/mixins/mescroll-more-item.js | 0
.../mescroll-uni/mixins/mescroll-more.js | 0
components/mescroll-uni/wxs/mixins.js | 0
components/mescroll-uni/wxs/renderjs.js | 0
components/mescroll-uni/wxs/wxs.wxs | 0
.../page/diyComponents/article/index.vue | 0
.../page/diyComponents/banner/index.vue | 0
.../page/diyComponents/bargain/index.vue | 0
components/page/diyComponents/blank/index.vue | 0
.../page/diyComponents/coupon/index.vue | 0
components/page/diyComponents/empty.vue | 0
components/page/diyComponents/goods/index.vue | 0
.../page/diyComponents/groupon/index.vue | 0
components/page/diyComponents/guide/index.vue | 0
.../page/diyComponents/hotZone/index.vue | 0
components/page/diyComponents/image/index.vue | 0
components/page/diyComponents/mixin.js | 0
.../page/diyComponents/navBar/index.vue | 0
.../page/diyComponents/notice/index.vue | 0
.../diyComponents/officialAccount/index.vue | 0
.../page/diyComponents/richText/index.vue | 0
.../page/diyComponents/search/index.vue | 0
.../page/diyComponents/service/index.vue | 0
components/page/diyComponents/sharp/index.vue | 0
components/page/diyComponents/shop/index.vue | 0
.../page/diyComponents/special/index.vue | 0
components/page/diyComponents/video/index.vue | 0
.../page/diyComponents/window/index.vue | 0
components/page/index.vue | 0
components/recommended/index.vue | 0
components/search/index.vue | 0
components/select-region/select-region.vue | 0
components/share-sheet/index.vue | 0
components/shortcut/index.vue | 0
config.js | 0
core/app.js | 0
core/bootstrap.js | 0
core/config/defaultConfig.js | 0
core/config/index.js | 0
core/mixins/app.js | 0
core/payment/alipay.js | 0
core/payment/index.js | 0
core/platform.js | 0
js_sdk/ican-H5Api/ican-H5Api.js | 0
js_sdk/queryStringify.js | 0
main.js | 0
manifest.json | 0
node_modules/js/bin/js | 0
package/apply/components/delivery.vue | 0
package/apply/components/partner.vue | 0
package/apply/components/teamer.vue | 0
package/brand/components/search.vue | 0
package/collection/components/goods.vue | 0
package/collection/index.vue | 0
package/dealer/apply.vue | 0
package/dealer/driver.vue | 0
package/dealer/index.vue | 0
package/dealer/order.vue | 0
package/dealer/poster.vue | 0
package/dealer/team.vue | 0
package/dealer/withdraw/apply.vue | 0
package/dealer/withdraw/list.vue | 0
package/deliver/address/create.vue | 0
package/deliver/address/index.vue | 0
package/deliver/address/update.vue | 0
package/equipment/cashier/index.vue | 0
package/equipment/checkout/index.vue | 0
package/equipment/components/Comment.vue | 0
package/equipment/components/Service.vue | 0
package/equipment/components/SkuPopup.vue | 0
package/equipment/components/SlideImage.vue | 0
package/equipment/components/search.vue | 0
package/equipment/detail.scss | 0
package/equipment/detail.vue | 0
package/equipment/list.vue | 0
package/footmark/components/goods.vue | 0
package/footmark/index.vue | 0
package/shops/detail/components/commodity.vue | 0
package/shops/detail/components/primary.vue | 0
package/shops/detail/components/search.vue | 0
package/shops/detail/components/secondary.vue | 0
.../shops/detail/components/shop-banner.vue | 0
package/shops/detail/index.scss | 0
package/shops/detail/index.vue | 0
package/solution/cashier/index.vue | 0
package/solution/components/search.vue | 0
package/solution/detail.vue | 0
package/user/address/create.vue | 0
package/user/address/index.vue | 0
package/user/address/update.vue | 0
package/user/equipment/create.vue | 0
package/user/equipment/detail.vue | 0
package/user/equipment/index.vue | 0
package/user/equipment/operation.vue | 0
package/user/equipment/update.vue | 0
package/user/goods/cashier.vue | 0
package/user/goods/components/Comment.vue | 0
package/user/goods/components/Service.vue | 0
package/user/goods/components/SkuPopup.vue | 0
package/user/goods/components/SlideImage.vue | 0
package/user/goods/components/search.vue | 0
package/user/goods/detail.scss | 0
package/user/goods/detail.vue | 0
package/user/goods/list.vue | 0
package/user/order/index.vue | 0
package/user/popularize/components/goods.vue | 0
package/user/popularize/components/goods1.vue | 0
package/user/popularize/index.vue | 0
pages.json | 2 +-
pages/address/create.vue | 0
pages/address/index.vue | 0
pages/address/update.vue | 0
pages/article/detail.vue | 0
pages/article/index.vue | 0
pages/bargain/goods/components/SkuPopup.vue | 0
pages/bargain/goods/index.vue | 0
pages/bargain/goods/style.scss | 0
pages/bargain/index.vue | 0
pages/bargain/task.vue | 0
pages/cart/index.vue | 0
pages/category/components/commodity.vue | 0
pages/category/components/primary.vue | 0
pages/category/components/secondary.vue | 0
pages/category/index.vue | 0
pages/checkout/cashier/index.vue | 0
pages/checkout/index.vue | 0
pages/checkout/style.scss | 0
pages/comment/index.vue | 0
pages/coupon/index.vue | 0
pages/custom/index.vue | 0
pages/dealer/apply.vue | 0
pages/dealer/index.vue | 0
pages/dealer/order.vue | 0
pages/dealer/poster.vue | 0
pages/dealer/team.vue | 0
pages/dealer/withdraw/apply.vue | 0
pages/dealer/withdraw/list.vue | 0
pages/empty.vue | 0
pages/equipment/detail.vue | 0
pages/goods/components/Comment.vue | 0
pages/goods/components/Service.vue | 0
pages/goods/components/SkuPopup.vue | 0
pages/goods/components/SlideImage.vue | 0
pages/goods/detail.scss | 0
pages/goods/detail.vue | 0
pages/goods/list.vue | 0
pages/groupon/goods/components/SkuPopup.vue | 0
pages/groupon/goods/components/TaskList.vue | 0
.../components/goods-sku-popup/index.vue | 0
.../goods-sku-popup/number-box/index.vue | 0
pages/groupon/goods/index.vue | 0
pages/groupon/goods/style.scss | 0
pages/groupon/index.vue | 0
pages/groupon/task/index.vue | 0
pages/help/about.vue | 0
pages/help/index.vue | 0
pages/help/xieyi.vue | 0
pages/live/index.vue | 0
pages/login/components/main.vue | 0
pages/login/components/mp-weixin-mobile.vue | 0
pages/login/components/mp-weixin.vue | 0
pages/login/components/wx-official.vue | 0
pages/login/index.vue | 0
pages/login/login.vue | 0
pages/my-coupon/index.vue | 0
pages/order/comment/index.vue | 0
pages/order/delivery.vue | 19 +-
pages/order/detail.vue | 140 +++++++++-----
pages/order/express/index.vue | 0
pages/order/extract/check.vue | 0
pages/order/index.vue | 175 +++++++++++-------
pages/points/log.vue | 0
pages/refund/apply.vue | 0
pages/refund/detail.vue | 0
pages/refund/index.vue | 0
pages/search/index.vue | 0
pages/sharp/goods/components/SkuPopup.vue | 0
pages/sharp/goods/index.vue | 0
pages/sharp/goods/style.scss | 0
pages/sharp/index.vue | 0
pages/shop/detail.vue | 0
pages/shop/extract.vue | 0
pages/user/index.vue | 0
pages/user/personal/index.vue | 0
pages/wallet/balance/log.vue | 0
pages/wallet/index.vue | 0
pages/wallet/recharge/index.vue | 0
pages/wallet/recharge/order.vue | 0
static/app-plus/privacy.html | 0
static/app-plus/protocol.html | 0
static/background/user-header.png | Bin
static/background/user-header2.png | Bin
static/channel/wechat.png | Bin
static/default-avatar.png | Bin
static/empty-02.png | Bin
static/empty.png | Bin
static/not-dealer.png | Bin
static/order/refund-bg.png | Bin
static/order/status/close.png | Bin
static/order/status/received.png | Bin
static/order/status/wait_deliver.png | Bin
static/order/status/wait_pay.png | Bin
static/order/status/wait_receipt.png | Bin
static/privacy.html | 0
static/protocol.html | 0
static/tabbar/cart-active.png | Bin
static/tabbar/cart.png | Bin
static/tabbar/cate-active.png | Bin
static/tabbar/cate.png | Bin
static/tabbar/home-active.png | Bin
static/tabbar/home.png | Bin
static/tabbar/user-active.png | Bin
static/tabbar/user.png | Bin
static/wallet.png | Bin
store/getters.js | 0
store/index.js | 0
store/modules/app.js | 0
store/modules/index.js | 0
store/modules/theme.js | 0
store/modules/user.js | 0
store/mutation-types.js | 0
template.h5.html | 0
uni.scss | 0
uni_modules/mp-html/README.md | 0
uni_modules/mp-html/changelog.md | 0
.../mp-html/components/mp-html/mp-html.vue | 0
.../mp-html/components/mp-html/node/node.vue | 0
.../mp-html/components/mp-html/parser.js | 0
uni_modules/mp-html/package.json | 0
.../static/app-plus/mp-html/js/handler.js | 0
.../app-plus/mp-html/js/uni.webview.min.js | 0
.../static/app-plus/mp-html/local.html | 0
utils/app.js | 0
utils/color.js | 0
utils/iconfont.scss | 0
utils/request/core/request.js | 0
utils/request/core/utils.js | 0
utils/request/index.js | 0
utils/request/request.js | 0
utils/request/request.md | 0
utils/request/upload/qiniuUploader.js | 0
utils/request/upload/upload.js | 0
utils/request/upload/utils.js | 0
utils/storage.js | 0
utils/util.js | 0
utils/utils.scss | 0
utils/verify.js | 0
uview-ui/LICENSE | 0
uview-ui/README.md | 0
.../u-action-sheet/u-action-sheet.vue | 0
.../components/u-alert-tips/u-alert-tips.vue | 0
.../u-avatar-cropper/u-avatar-cropper.vue | 0
.../components/u-avatar-cropper/weCropper.js | 0
uview-ui/components/u-avatar/u-avatar.vue | 0
uview-ui/components/u-back-top/u-back-top.vue | 0
uview-ui/components/u-badge/u-badge.vue | 0
uview-ui/components/u-button/u-button.vue | 0
uview-ui/components/u-calendar/u-calendar.vue | 0
.../u-car-keyboard/u-car-keyboard.vue | 0
uview-ui/components/u-card/u-card.vue | 0
.../components/u-cell-group/u-cell-group.vue | 0
.../components/u-cell-item/u-cell-item.vue | 0
.../u-checkbox-group/u-checkbox-group.vue | 0
uview-ui/components/u-checkbox/u-checkbox.vue | 0
.../u-circle-progress/u-circle-progress.vue | 0
uview-ui/components/u-col/u-col.vue | 0
.../u-collapse-item/u-collapse-item.vue | 0
uview-ui/components/u-collapse/u-collapse.vue | 0
.../u-column-notice/u-column-notice.vue | 0
.../components/u-count-down/u-count-down.vue | 0
uview-ui/components/u-count-to/u-count-to.vue | 0
uview-ui/components/u-divider/u-divider.vue | 0
.../u-dropdown-item/u-dropdown-item.vue | 0
uview-ui/components/u-dropdown/u-dropdown.vue | 0
uview-ui/components/u-empty/u-empty.vue | 0
uview-ui/components/u-field/u-field.vue | 0
.../components/u-form-item/u-form-item.vue | 0
uview-ui/components/u-form/u-form.vue | 0
.../u-full-screen/u-full-screen.vue | 0
uview-ui/components/u-gap/u-gap.vue | 0
.../components/u-grid-item/u-grid-item.vue | 0
uview-ui/components/u-grid/u-grid.vue | 0
uview-ui/components/u-icon/u-icon.vue | 0
uview-ui/components/u-image/u-image.vue | 0
.../u-index-anchor/u-index-anchor.vue | 0
.../components/u-index-list/u-index-list.vue | 0
uview-ui/components/u-input/u-input.vue | 0
uview-ui/components/u-keyboard/u-keyboard.vue | 0
.../components/u-lazy-load/u-lazy-load.vue | 0
.../u-line-progress/u-line-progress.vue | 0
uview-ui/components/u-line/u-line.vue | 0
uview-ui/components/u-link/u-link.vue | 0
.../u-loading-page/u-loading-page.vue | 0
uview-ui/components/u-loading/u-loading.vue | 0
uview-ui/components/u-loadmore/u-loadmore.vue | 0
uview-ui/components/u-mask/u-mask.vue | 0
.../u-message-input/u-message-input.vue | 0
uview-ui/components/u-modal/u-modal.vue | 0
uview-ui/components/u-navbar/u-navbar.vue | 0
.../components/u-no-network/u-no-network.vue | 0
.../components/u-notice-bar/u-notice-bar.vue | 0
.../components/u-number-box/u-number-box.vue | 0
.../u-number-keyboard/u-number-keyboard.vue | 0
.../components/u-parse/libs/CssHandler.js | 0
.../components/u-parse/libs/MpHtmlParser.js | 0
uview-ui/components/u-parse/libs/config.js | 0
uview-ui/components/u-parse/libs/handler.wxs | 0
uview-ui/components/u-parse/libs/trees.vue | 0
uview-ui/components/u-parse/u-parse.vue | 0
uview-ui/components/u-picker/u-picker.vue | 0
uview-ui/components/u-popup/u-popup.vue | 0
.../u-radio-group/u-radio-group.vue | 0
uview-ui/components/u-radio/u-radio.vue | 0
uview-ui/components/u-rate/u-rate.vue | 0
.../components/u-read-more/u-read-more.vue | 0
.../components/u-row-notice/u-row-notice.vue | 0
uview-ui/components/u-row/u-row.vue | 0
uview-ui/components/u-search/u-search.vue | 0
uview-ui/components/u-section/u-section.vue | 0
uview-ui/components/u-select/u-select.vue | 0
uview-ui/components/u-skeleton/u-skeleton.vue | 0
uview-ui/components/u-slider/u-slider.vue | 0
uview-ui/components/u-steps/u-steps.vue | 0
uview-ui/components/u-sticky/u-sticky.vue | 0
.../components/u-subsection/u-subsection.vue | 0
.../u-swipe-action/u-swipe-action.vue | 0
uview-ui/components/u-swiper/u-swiper.vue | 0
uview-ui/components/u-switch/u-switch.vue | 0
uview-ui/components/u-tabbar/u-tabbar.vue | 0
uview-ui/components/u-table/u-table.vue | 0
.../u-tabs-swiper/u-tabs-swiper.vue | 0
uview-ui/components/u-tabs/u-tabs.vue | 0
uview-ui/components/u-tag/u-tag.vue | 0
uview-ui/components/u-td/u-td.vue | 0
uview-ui/components/u-th/u-th.vue | 0
.../u-time-line-item/u-time-line-item.vue | 0
.../components/u-time-line/u-time-line.vue | 0
uview-ui/components/u-toast/u-toast.vue | 0
uview-ui/components/u-top-tips/u-top-tips.vue | 0
uview-ui/components/u-tr/u-tr.vue | 0
uview-ui/components/u-upload/u-upload.vue | 0
.../u-verification-code.vue | 0
.../components/u-waterfall/u-waterfall.vue | 0
uview-ui/iconfont.css | 0
uview-ui/index.js | 0
uview-ui/index.scss | 0
uview-ui/libs/config/config.js | 0
uview-ui/libs/config/zIndex.js | 0
uview-ui/libs/css/color.scss | 0
uview-ui/libs/css/common.scss | 0
uview-ui/libs/css/style.components.scss | 0
uview-ui/libs/css/style.h5.scss | 0
uview-ui/libs/css/style.mp.scss | 0
uview-ui/libs/css/style.nvue.scss | 0
uview-ui/libs/css/style.vue.scss | 0
uview-ui/libs/function/$parent.js | 0
uview-ui/libs/function/addUnit.js | 0
uview-ui/libs/function/bem.js | 0
uview-ui/libs/function/color.js | 0
uview-ui/libs/function/colorGradient.js | 0
uview-ui/libs/function/debounce.js | 0
uview-ui/libs/function/deepClone.js | 0
uview-ui/libs/function/deepMerge.js | 0
uview-ui/libs/function/getParent.js | 0
uview-ui/libs/function/guid.js | 0
uview-ui/libs/function/md5.js | 0
uview-ui/libs/function/queryParams.js | 0
uview-ui/libs/function/random.js | 0
uview-ui/libs/function/randomArray.js | 0
uview-ui/libs/function/route.js | 0
uview-ui/libs/function/sys.js | 0
uview-ui/libs/function/test.js | 0
uview-ui/libs/function/throttle.js | 0
uview-ui/libs/function/timeFormat.js | 0
uview-ui/libs/function/timeFrom.js | 0
uview-ui/libs/function/toast.js | 0
uview-ui/libs/function/trim.js | 0
uview-ui/libs/function/type2icon.js | 0
uview-ui/libs/mixin/mixin.js | 0
uview-ui/libs/mixin/mpShare.js | 0
uview-ui/libs/request/index.js | 0
uview-ui/libs/store/index.js | 0
uview-ui/libs/util/area.js | 0
uview-ui/libs/util/async-validator.js | 0
uview-ui/libs/util/city.js | 0
uview-ui/libs/util/emitter.js | 0
uview-ui/libs/util/province.js | 0
uview-ui/package.json | 0
uview-ui/theme.scss | 0
当前是uniapp端的源码.txt | 0
528 files changed, 213 insertions(+), 125 deletions(-)
mode change 100755 => 100644 .gitignore
mode change 100755 => 100644 .hbuilderx/launch.json
mode change 100755 => 100644 App.vue
mode change 100755 => 100644 androidPrivacy.json
mode change 100755 => 100644 api/address.js
mode change 100755 => 100644 api/article/category.js
mode change 100755 => 100644 api/article/index.js
mode change 100755 => 100644 api/balance.js
mode change 100755 => 100644 api/balance/log.js
mode change 100755 => 100644 api/bargain/active.js
mode change 100755 => 100644 api/bargain/checkout.js
mode change 100755 => 100644 api/bargain/task.js
mode change 100755 => 100644 api/captcha.js
mode change 100755 => 100644 api/cart.js
mode change 100755 => 100644 api/cashier/index.js
mode change 100755 => 100644 api/category/index.js
mode change 100755 => 100644 api/checkout.js
mode change 100755 => 100644 api/comment.js
mode change 100755 => 100644 api/coupon.js
mode change 100755 => 100644 api/dealer/apply.js
mode change 100755 => 100644 api/dealer/index.js
mode change 100755 => 100644 api/dealer/order.js
mode change 100755 => 100644 api/dealer/poster.js
mode change 100755 => 100644 api/dealer/setting.js
mode change 100755 => 100644 api/dealer/team.js
mode change 100755 => 100644 api/dealer/withdraw.js
mode change 100755 => 100644 api/express.js
mode change 100755 => 100644 api/goods/index.js
mode change 100755 => 100644 api/goods/service.js
mode change 100755 => 100644 api/groupon/checkout.js
mode change 100755 => 100644 api/groupon/goods.js
mode change 100755 => 100644 api/groupon/setting.js
mode change 100755 => 100644 api/groupon/task.js
mode change 100755 => 100644 api/help.js
mode change 100755 => 100644 api/live/room.js
mode change 100755 => 100644 api/login/index.js
mode change 100755 => 100644 api/myCoupon.js
mode change 100755 => 100644 api/order.js
mode change 100755 => 100644 api/order/comment.js
mode change 100755 => 100644 api/page.js
mode change 100755 => 100644 api/points/log.js
mode change 100755 => 100644 api/recharge.js
mode change 100755 => 100644 api/recharge/order.js
mode change 100755 => 100644 api/recharge/plan.js
mode change 100755 => 100644 api/refund.js
mode change 100755 => 100644 api/region.js
mode change 100755 => 100644 api/setting.js
mode change 100755 => 100644 api/sharp/checkout.js
mode change 100755 => 100644 api/sharp/goods.js
mode change 100755 => 100644 api/sharp/home.js
mode change 100755 => 100644 api/shop.js
mode change 100755 => 100644 api/shop/order.js
mode change 100755 => 100644 api/upload.js
mode change 100755 => 100644 api/user.js
mode change 100755 => 100644 api/user/coupon.js
mode change 100755 => 100644 api/wxofficial.js
mode change 100755 => 100644 app.scss
mode change 100755 => 100644 common/constant/index.js
mode change 100755 => 100644 common/constant/paginate.js
mode change 100755 => 100644 common/enum/Client.js
mode change 100755 => 100644 common/enum/coupon/ApplyRange.js
mode change 100755 => 100644 common/enum/coupon/CouponType.js
mode change 100755 => 100644 common/enum/coupon/ExpireType.js
mode change 100755 => 100644 common/enum/coupon/index.js
mode change 100755 => 100644 common/enum/dealer/apply/ApplyStatus.js
mode change 100755 => 100644 common/enum/dealer/apply/ApplyType.js
mode change 100755 => 100644 common/enum/dealer/apply/index.js
mode change 100755 => 100644 common/enum/dealer/withdraw/ApplyStatus.js
mode change 100755 => 100644 common/enum/dealer/withdraw/PayType.js
mode change 100755 => 100644 common/enum/dealer/withdraw/index.js
mode change 100755 => 100644 common/enum/enum.js
mode change 100755 => 100644 common/enum/goods/GoodsType.js
mode change 100755 => 100644 common/enum/goods/SpecType.js
mode change 100755 => 100644 common/enum/goods/index.js
mode change 100755 => 100644 common/enum/groupon/ActiveStatus.js
mode change 100755 => 100644 common/enum/groupon/ActiveType.js
mode change 100755 => 100644 common/enum/groupon/GoodsStatus.js
mode change 100755 => 100644 common/enum/groupon/TaskStatus.js
mode change 100755 => 100644 common/enum/groupon/index.js
mode change 100755 => 100644 common/enum/live/LiveStatus.js
mode change 100755 => 100644 common/enum/live/index.js
mode change 100755 => 100644 common/enum/order/DeliveryStatus.js
mode change 100755 => 100644 common/enum/order/DeliveryType.js
mode change 100755 => 100644 common/enum/order/OrderSource.js
mode change 100755 => 100644 common/enum/order/OrderStatus.js
mode change 100755 => 100644 common/enum/order/OrderType.js
mode change 100755 => 100644 common/enum/order/PayStatus.js
mode change 100755 => 100644 common/enum/order/PayType.js
mode change 100755 => 100644 common/enum/order/ReceiptStatus.js
mode change 100755 => 100644 common/enum/order/delivery/DeliveryMethod.js
mode change 100755 => 100644 common/enum/order/delivery/index.js
mode change 100755 => 100644 common/enum/order/index.js
mode change 100755 => 100644 common/enum/order/refund/AuditStatus.js
mode change 100755 => 100644 common/enum/order/refund/RefundStatus.js
mode change 100755 => 100644 common/enum/order/refund/RefundType.js
mode change 100755 => 100644 common/enum/order/refund/index.js
mode change 100755 => 100644 common/enum/payment/Method.js
mode change 100755 => 100644 common/enum/payment/index.js
mode change 100755 => 100644 common/enum/setting/Key.js
mode change 100755 => 100644 common/enum/sharp/ActiveStatus.js
mode change 100755 => 100644 common/enum/sharp/GoodsStatus.js
mode change 100755 => 100644 common/enum/sharp/index.js
mode change 100755 => 100644 common/enum/store/page/category/Style.js
mode change 100755 => 100644 common/enum/store/page/category/index.js
mode change 100755 => 100644 common/model/Region.js
mode change 100755 => 100644 common/model/Setting.js
mode change 100755 => 100644 common/model/dealer/Setting.js
mode change 100755 => 100644 common/model/groupon/Setting.js
mode change 100755 => 100644 components/add-cart-btn/index.vue
mode change 100755 => 100644 components/add-cart-popup/index.vue
mode change 100755 => 100644 components/avatar-image/index.vue
mode change 100755 => 100644 components/countdown/index.vue
mode change 100755 => 100644 components/customer-btn/index.vue
mode change 100755 => 100644 components/empty/index.vue
mode change 100755 => 100644 components/goods-poster-popup/index.vue
mode change 100755 => 100644 components/goods-sku-popup/index.vue
mode change 100755 => 100644 components/goods-sku-popup/number-box/index.vue
mode change 100755 => 100644 components/jyf-parser/jyf-parser.vue
mode change 100755 => 100644 components/jyf-parser/libs/CssHandler.js
mode change 100755 => 100644 components/jyf-parser/libs/MpHtmlParser.js
mode change 100755 => 100644 components/jyf-parser/libs/config.js
mode change 100755 => 100644 components/jyf-parser/libs/handler.wxs
mode change 100755 => 100644 components/jyf-parser/libs/trees.vue
mode change 100755 => 100644 components/mescroll-uni/components/mescroll-down.css
mode change 100755 => 100644 components/mescroll-uni/components/mescroll-down.vue
mode change 100755 => 100644 components/mescroll-uni/components/mescroll-empty.vue
mode change 100755 => 100644 components/mescroll-uni/components/mescroll-top.vue
mode change 100755 => 100644 components/mescroll-uni/components/mescroll-up.css
mode change 100755 => 100644 components/mescroll-uni/components/mescroll-up.vue
mode change 100755 => 100644 components/mescroll-uni/mescroll-body.css
mode change 100755 => 100644 components/mescroll-uni/mescroll-body.vue
mode change 100755 => 100644 components/mescroll-uni/mescroll-mixins.js
mode change 100755 => 100644 components/mescroll-uni/mescroll-uni-option.js
mode change 100755 => 100644 components/mescroll-uni/mescroll-uni.css
mode change 100755 => 100644 components/mescroll-uni/mescroll-uni.js
mode change 100755 => 100644 components/mescroll-uni/mescroll-uni.vue
mode change 100755 => 100644 components/mescroll-uni/mixins/mescroll-comp.js
mode change 100755 => 100644 components/mescroll-uni/mixins/mescroll-more-item.js
mode change 100755 => 100644 components/mescroll-uni/mixins/mescroll-more.js
mode change 100755 => 100644 components/mescroll-uni/wxs/mixins.js
mode change 100755 => 100644 components/mescroll-uni/wxs/renderjs.js
mode change 100755 => 100644 components/mescroll-uni/wxs/wxs.wxs
mode change 100755 => 100644 components/page/diyComponents/article/index.vue
mode change 100755 => 100644 components/page/diyComponents/banner/index.vue
mode change 100755 => 100644 components/page/diyComponents/bargain/index.vue
mode change 100755 => 100644 components/page/diyComponents/blank/index.vue
mode change 100755 => 100644 components/page/diyComponents/coupon/index.vue
mode change 100755 => 100644 components/page/diyComponents/empty.vue
mode change 100755 => 100644 components/page/diyComponents/goods/index.vue
mode change 100755 => 100644 components/page/diyComponents/groupon/index.vue
mode change 100755 => 100644 components/page/diyComponents/guide/index.vue
mode change 100755 => 100644 components/page/diyComponents/hotZone/index.vue
mode change 100755 => 100644 components/page/diyComponents/image/index.vue
mode change 100755 => 100644 components/page/diyComponents/mixin.js
mode change 100755 => 100644 components/page/diyComponents/navBar/index.vue
mode change 100755 => 100644 components/page/diyComponents/notice/index.vue
mode change 100755 => 100644 components/page/diyComponents/officialAccount/index.vue
mode change 100755 => 100644 components/page/diyComponents/richText/index.vue
mode change 100755 => 100644 components/page/diyComponents/search/index.vue
mode change 100755 => 100644 components/page/diyComponents/service/index.vue
mode change 100755 => 100644 components/page/diyComponents/sharp/index.vue
mode change 100755 => 100644 components/page/diyComponents/shop/index.vue
mode change 100755 => 100644 components/page/diyComponents/special/index.vue
mode change 100755 => 100644 components/page/diyComponents/video/index.vue
mode change 100755 => 100644 components/page/diyComponents/window/index.vue
mode change 100755 => 100644 components/page/index.vue
mode change 100755 => 100644 components/recommended/index.vue
mode change 100755 => 100644 components/search/index.vue
mode change 100755 => 100644 components/select-region/select-region.vue
mode change 100755 => 100644 components/share-sheet/index.vue
mode change 100755 => 100644 components/shortcut/index.vue
mode change 100755 => 100644 config.js
mode change 100755 => 100644 core/app.js
mode change 100755 => 100644 core/bootstrap.js
mode change 100755 => 100644 core/config/defaultConfig.js
mode change 100755 => 100644 core/config/index.js
mode change 100755 => 100644 core/mixins/app.js
mode change 100755 => 100644 core/payment/alipay.js
mode change 100755 => 100644 core/payment/index.js
mode change 100755 => 100644 core/platform.js
mode change 100755 => 100644 js_sdk/ican-H5Api/ican-H5Api.js
mode change 100755 => 100644 js_sdk/queryStringify.js
mode change 100755 => 100644 main.js
mode change 100755 => 100644 manifest.json
mode change 100755 => 100644 node_modules/js/bin/js
mode change 100755 => 100644 package/apply/components/delivery.vue
mode change 100755 => 100644 package/apply/components/partner.vue
mode change 100755 => 100644 package/apply/components/teamer.vue
mode change 100755 => 100644 package/brand/components/search.vue
mode change 100755 => 100644 package/collection/components/goods.vue
mode change 100755 => 100644 package/collection/index.vue
mode change 100755 => 100644 package/dealer/apply.vue
mode change 100755 => 100644 package/dealer/driver.vue
mode change 100755 => 100644 package/dealer/index.vue
mode change 100755 => 100644 package/dealer/order.vue
mode change 100755 => 100644 package/dealer/poster.vue
mode change 100755 => 100644 package/dealer/team.vue
mode change 100755 => 100644 package/dealer/withdraw/apply.vue
mode change 100755 => 100644 package/dealer/withdraw/list.vue
mode change 100755 => 100644 package/deliver/address/create.vue
mode change 100755 => 100644 package/deliver/address/index.vue
mode change 100755 => 100644 package/deliver/address/update.vue
mode change 100755 => 100644 package/equipment/cashier/index.vue
mode change 100755 => 100644 package/equipment/checkout/index.vue
mode change 100755 => 100644 package/equipment/components/Comment.vue
mode change 100755 => 100644 package/equipment/components/Service.vue
mode change 100755 => 100644 package/equipment/components/SkuPopup.vue
mode change 100755 => 100644 package/equipment/components/SlideImage.vue
mode change 100755 => 100644 package/equipment/components/search.vue
mode change 100755 => 100644 package/equipment/detail.scss
mode change 100755 => 100644 package/equipment/detail.vue
mode change 100755 => 100644 package/equipment/list.vue
mode change 100755 => 100644 package/footmark/components/goods.vue
mode change 100755 => 100644 package/footmark/index.vue
mode change 100755 => 100644 package/shops/detail/components/commodity.vue
mode change 100755 => 100644 package/shops/detail/components/primary.vue
mode change 100755 => 100644 package/shops/detail/components/search.vue
mode change 100755 => 100644 package/shops/detail/components/secondary.vue
mode change 100755 => 100644 package/shops/detail/components/shop-banner.vue
mode change 100755 => 100644 package/shops/detail/index.scss
mode change 100755 => 100644 package/shops/detail/index.vue
mode change 100755 => 100644 package/solution/cashier/index.vue
mode change 100755 => 100644 package/solution/components/search.vue
mode change 100755 => 100644 package/solution/detail.vue
mode change 100755 => 100644 package/user/address/create.vue
mode change 100755 => 100644 package/user/address/index.vue
mode change 100755 => 100644 package/user/address/update.vue
mode change 100755 => 100644 package/user/equipment/create.vue
mode change 100755 => 100644 package/user/equipment/detail.vue
mode change 100755 => 100644 package/user/equipment/index.vue
mode change 100755 => 100644 package/user/equipment/operation.vue
mode change 100755 => 100644 package/user/equipment/update.vue
mode change 100755 => 100644 package/user/goods/cashier.vue
mode change 100755 => 100644 package/user/goods/components/Comment.vue
mode change 100755 => 100644 package/user/goods/components/Service.vue
mode change 100755 => 100644 package/user/goods/components/SkuPopup.vue
mode change 100755 => 100644 package/user/goods/components/SlideImage.vue
mode change 100755 => 100644 package/user/goods/components/search.vue
mode change 100755 => 100644 package/user/goods/detail.scss
mode change 100755 => 100644 package/user/goods/detail.vue
mode change 100755 => 100644 package/user/goods/list.vue
mode change 100755 => 100644 package/user/order/index.vue
mode change 100755 => 100644 package/user/popularize/components/goods.vue
mode change 100755 => 100644 package/user/popularize/components/goods1.vue
mode change 100755 => 100644 package/user/popularize/index.vue
mode change 100755 => 100644 pages.json
mode change 100755 => 100644 pages/address/create.vue
mode change 100755 => 100644 pages/address/index.vue
mode change 100755 => 100644 pages/address/update.vue
mode change 100755 => 100644 pages/article/detail.vue
mode change 100755 => 100644 pages/article/index.vue
mode change 100755 => 100644 pages/bargain/goods/components/SkuPopup.vue
mode change 100755 => 100644 pages/bargain/goods/index.vue
mode change 100755 => 100644 pages/bargain/goods/style.scss
mode change 100755 => 100644 pages/bargain/index.vue
mode change 100755 => 100644 pages/bargain/task.vue
mode change 100755 => 100644 pages/cart/index.vue
mode change 100755 => 100644 pages/category/components/commodity.vue
mode change 100755 => 100644 pages/category/components/primary.vue
mode change 100755 => 100644 pages/category/components/secondary.vue
mode change 100755 => 100644 pages/category/index.vue
mode change 100755 => 100644 pages/checkout/cashier/index.vue
mode change 100755 => 100644 pages/checkout/index.vue
mode change 100755 => 100644 pages/checkout/style.scss
mode change 100755 => 100644 pages/comment/index.vue
mode change 100755 => 100644 pages/coupon/index.vue
mode change 100755 => 100644 pages/custom/index.vue
mode change 100755 => 100644 pages/dealer/apply.vue
mode change 100755 => 100644 pages/dealer/index.vue
mode change 100755 => 100644 pages/dealer/order.vue
mode change 100755 => 100644 pages/dealer/poster.vue
mode change 100755 => 100644 pages/dealer/team.vue
mode change 100755 => 100644 pages/dealer/withdraw/apply.vue
mode change 100755 => 100644 pages/dealer/withdraw/list.vue
mode change 100755 => 100644 pages/empty.vue
mode change 100755 => 100644 pages/equipment/detail.vue
mode change 100755 => 100644 pages/goods/components/Comment.vue
mode change 100755 => 100644 pages/goods/components/Service.vue
mode change 100755 => 100644 pages/goods/components/SkuPopup.vue
mode change 100755 => 100644 pages/goods/components/SlideImage.vue
mode change 100755 => 100644 pages/goods/detail.scss
mode change 100755 => 100644 pages/goods/detail.vue
mode change 100755 => 100644 pages/goods/list.vue
mode change 100755 => 100644 pages/groupon/goods/components/SkuPopup.vue
mode change 100755 => 100644 pages/groupon/goods/components/TaskList.vue
mode change 100755 => 100644 pages/groupon/goods/components/goods-sku-popup/index.vue
mode change 100755 => 100644 pages/groupon/goods/components/goods-sku-popup/number-box/index.vue
mode change 100755 => 100644 pages/groupon/goods/index.vue
mode change 100755 => 100644 pages/groupon/goods/style.scss
mode change 100755 => 100644 pages/groupon/index.vue
mode change 100755 => 100644 pages/groupon/task/index.vue
mode change 100755 => 100644 pages/help/about.vue
mode change 100755 => 100644 pages/help/index.vue
mode change 100755 => 100644 pages/help/xieyi.vue
mode change 100755 => 100644 pages/live/index.vue
mode change 100755 => 100644 pages/login/components/main.vue
mode change 100755 => 100644 pages/login/components/mp-weixin-mobile.vue
mode change 100755 => 100644 pages/login/components/mp-weixin.vue
mode change 100755 => 100644 pages/login/components/wx-official.vue
mode change 100755 => 100644 pages/login/index.vue
mode change 100755 => 100644 pages/login/login.vue
mode change 100755 => 100644 pages/my-coupon/index.vue
mode change 100755 => 100644 pages/order/comment/index.vue
mode change 100755 => 100644 pages/order/delivery.vue
mode change 100755 => 100644 pages/order/detail.vue
mode change 100755 => 100644 pages/order/express/index.vue
mode change 100755 => 100644 pages/order/extract/check.vue
mode change 100755 => 100644 pages/order/index.vue
mode change 100755 => 100644 pages/points/log.vue
mode change 100755 => 100644 pages/refund/apply.vue
mode change 100755 => 100644 pages/refund/detail.vue
mode change 100755 => 100644 pages/refund/index.vue
mode change 100755 => 100644 pages/search/index.vue
mode change 100755 => 100644 pages/sharp/goods/components/SkuPopup.vue
mode change 100755 => 100644 pages/sharp/goods/index.vue
mode change 100755 => 100644 pages/sharp/goods/style.scss
mode change 100755 => 100644 pages/sharp/index.vue
mode change 100755 => 100644 pages/shop/detail.vue
mode change 100755 => 100644 pages/shop/extract.vue
mode change 100755 => 100644 pages/user/index.vue
mode change 100755 => 100644 pages/user/personal/index.vue
mode change 100755 => 100644 pages/wallet/balance/log.vue
mode change 100755 => 100644 pages/wallet/index.vue
mode change 100755 => 100644 pages/wallet/recharge/index.vue
mode change 100755 => 100644 pages/wallet/recharge/order.vue
mode change 100755 => 100644 static/app-plus/privacy.html
mode change 100755 => 100644 static/app-plus/protocol.html
mode change 100755 => 100644 static/background/user-header.png
mode change 100755 => 100644 static/background/user-header2.png
mode change 100755 => 100644 static/channel/wechat.png
mode change 100755 => 100644 static/default-avatar.png
mode change 100755 => 100644 static/empty-02.png
mode change 100755 => 100644 static/empty.png
mode change 100755 => 100644 static/not-dealer.png
mode change 100755 => 100644 static/order/refund-bg.png
mode change 100755 => 100644 static/order/status/close.png
mode change 100755 => 100644 static/order/status/received.png
mode change 100755 => 100644 static/order/status/wait_deliver.png
mode change 100755 => 100644 static/order/status/wait_pay.png
mode change 100755 => 100644 static/order/status/wait_receipt.png
mode change 100755 => 100644 static/privacy.html
mode change 100755 => 100644 static/protocol.html
mode change 100755 => 100644 static/tabbar/cart-active.png
mode change 100755 => 100644 static/tabbar/cart.png
mode change 100755 => 100644 static/tabbar/cate-active.png
mode change 100755 => 100644 static/tabbar/cate.png
mode change 100755 => 100644 static/tabbar/home-active.png
mode change 100755 => 100644 static/tabbar/home.png
mode change 100755 => 100644 static/tabbar/user-active.png
mode change 100755 => 100644 static/tabbar/user.png
mode change 100755 => 100644 static/wallet.png
mode change 100755 => 100644 store/getters.js
mode change 100755 => 100644 store/index.js
mode change 100755 => 100644 store/modules/app.js
mode change 100755 => 100644 store/modules/index.js
mode change 100755 => 100644 store/modules/theme.js
mode change 100755 => 100644 store/modules/user.js
mode change 100755 => 100644 store/mutation-types.js
mode change 100755 => 100644 template.h5.html
mode change 100755 => 100644 uni.scss
mode change 100755 => 100644 uni_modules/mp-html/README.md
mode change 100755 => 100644 uni_modules/mp-html/changelog.md
mode change 100755 => 100644 uni_modules/mp-html/components/mp-html/mp-html.vue
mode change 100755 => 100644 uni_modules/mp-html/components/mp-html/node/node.vue
mode change 100755 => 100644 uni_modules/mp-html/components/mp-html/parser.js
mode change 100755 => 100644 uni_modules/mp-html/package.json
mode change 100755 => 100644 uni_modules/mp-html/static/app-plus/mp-html/js/handler.js
mode change 100755 => 100644 uni_modules/mp-html/static/app-plus/mp-html/js/uni.webview.min.js
mode change 100755 => 100644 uni_modules/mp-html/static/app-plus/mp-html/local.html
mode change 100755 => 100644 utils/app.js
mode change 100755 => 100644 utils/color.js
mode change 100755 => 100644 utils/iconfont.scss
mode change 100755 => 100644 utils/request/core/request.js
mode change 100755 => 100644 utils/request/core/utils.js
mode change 100755 => 100644 utils/request/index.js
mode change 100755 => 100644 utils/request/request.js
mode change 100755 => 100644 utils/request/request.md
mode change 100755 => 100644 utils/request/upload/qiniuUploader.js
mode change 100755 => 100644 utils/request/upload/upload.js
mode change 100755 => 100644 utils/request/upload/utils.js
mode change 100755 => 100644 utils/storage.js
mode change 100755 => 100644 utils/util.js
mode change 100755 => 100644 utils/utils.scss
mode change 100755 => 100644 utils/verify.js
mode change 100755 => 100644 uview-ui/LICENSE
mode change 100755 => 100644 uview-ui/README.md
mode change 100755 => 100644 uview-ui/components/u-action-sheet/u-action-sheet.vue
mode change 100755 => 100644 uview-ui/components/u-alert-tips/u-alert-tips.vue
mode change 100755 => 100644 uview-ui/components/u-avatar-cropper/u-avatar-cropper.vue
mode change 100755 => 100644 uview-ui/components/u-avatar-cropper/weCropper.js
mode change 100755 => 100644 uview-ui/components/u-avatar/u-avatar.vue
mode change 100755 => 100644 uview-ui/components/u-back-top/u-back-top.vue
mode change 100755 => 100644 uview-ui/components/u-badge/u-badge.vue
mode change 100755 => 100644 uview-ui/components/u-button/u-button.vue
mode change 100755 => 100644 uview-ui/components/u-calendar/u-calendar.vue
mode change 100755 => 100644 uview-ui/components/u-car-keyboard/u-car-keyboard.vue
mode change 100755 => 100644 uview-ui/components/u-card/u-card.vue
mode change 100755 => 100644 uview-ui/components/u-cell-group/u-cell-group.vue
mode change 100755 => 100644 uview-ui/components/u-cell-item/u-cell-item.vue
mode change 100755 => 100644 uview-ui/components/u-checkbox-group/u-checkbox-group.vue
mode change 100755 => 100644 uview-ui/components/u-checkbox/u-checkbox.vue
mode change 100755 => 100644 uview-ui/components/u-circle-progress/u-circle-progress.vue
mode change 100755 => 100644 uview-ui/components/u-col/u-col.vue
mode change 100755 => 100644 uview-ui/components/u-collapse-item/u-collapse-item.vue
mode change 100755 => 100644 uview-ui/components/u-collapse/u-collapse.vue
mode change 100755 => 100644 uview-ui/components/u-column-notice/u-column-notice.vue
mode change 100755 => 100644 uview-ui/components/u-count-down/u-count-down.vue
mode change 100755 => 100644 uview-ui/components/u-count-to/u-count-to.vue
mode change 100755 => 100644 uview-ui/components/u-divider/u-divider.vue
mode change 100755 => 100644 uview-ui/components/u-dropdown-item/u-dropdown-item.vue
mode change 100755 => 100644 uview-ui/components/u-dropdown/u-dropdown.vue
mode change 100755 => 100644 uview-ui/components/u-empty/u-empty.vue
mode change 100755 => 100644 uview-ui/components/u-field/u-field.vue
mode change 100755 => 100644 uview-ui/components/u-form-item/u-form-item.vue
mode change 100755 => 100644 uview-ui/components/u-form/u-form.vue
mode change 100755 => 100644 uview-ui/components/u-full-screen/u-full-screen.vue
mode change 100755 => 100644 uview-ui/components/u-gap/u-gap.vue
mode change 100755 => 100644 uview-ui/components/u-grid-item/u-grid-item.vue
mode change 100755 => 100644 uview-ui/components/u-grid/u-grid.vue
mode change 100755 => 100644 uview-ui/components/u-icon/u-icon.vue
mode change 100755 => 100644 uview-ui/components/u-image/u-image.vue
mode change 100755 => 100644 uview-ui/components/u-index-anchor/u-index-anchor.vue
mode change 100755 => 100644 uview-ui/components/u-index-list/u-index-list.vue
mode change 100755 => 100644 uview-ui/components/u-input/u-input.vue
mode change 100755 => 100644 uview-ui/components/u-keyboard/u-keyboard.vue
mode change 100755 => 100644 uview-ui/components/u-lazy-load/u-lazy-load.vue
mode change 100755 => 100644 uview-ui/components/u-line-progress/u-line-progress.vue
mode change 100755 => 100644 uview-ui/components/u-line/u-line.vue
mode change 100755 => 100644 uview-ui/components/u-link/u-link.vue
mode change 100755 => 100644 uview-ui/components/u-loading-page/u-loading-page.vue
mode change 100755 => 100644 uview-ui/components/u-loading/u-loading.vue
mode change 100755 => 100644 uview-ui/components/u-loadmore/u-loadmore.vue
mode change 100755 => 100644 uview-ui/components/u-mask/u-mask.vue
mode change 100755 => 100644 uview-ui/components/u-message-input/u-message-input.vue
mode change 100755 => 100644 uview-ui/components/u-modal/u-modal.vue
mode change 100755 => 100644 uview-ui/components/u-navbar/u-navbar.vue
mode change 100755 => 100644 uview-ui/components/u-no-network/u-no-network.vue
mode change 100755 => 100644 uview-ui/components/u-notice-bar/u-notice-bar.vue
mode change 100755 => 100644 uview-ui/components/u-number-box/u-number-box.vue
mode change 100755 => 100644 uview-ui/components/u-number-keyboard/u-number-keyboard.vue
mode change 100755 => 100644 uview-ui/components/u-parse/libs/CssHandler.js
mode change 100755 => 100644 uview-ui/components/u-parse/libs/MpHtmlParser.js
mode change 100755 => 100644 uview-ui/components/u-parse/libs/config.js
mode change 100755 => 100644 uview-ui/components/u-parse/libs/handler.wxs
mode change 100755 => 100644 uview-ui/components/u-parse/libs/trees.vue
mode change 100755 => 100644 uview-ui/components/u-parse/u-parse.vue
mode change 100755 => 100644 uview-ui/components/u-picker/u-picker.vue
mode change 100755 => 100644 uview-ui/components/u-popup/u-popup.vue
mode change 100755 => 100644 uview-ui/components/u-radio-group/u-radio-group.vue
mode change 100755 => 100644 uview-ui/components/u-radio/u-radio.vue
mode change 100755 => 100644 uview-ui/components/u-rate/u-rate.vue
mode change 100755 => 100644 uview-ui/components/u-read-more/u-read-more.vue
mode change 100755 => 100644 uview-ui/components/u-row-notice/u-row-notice.vue
mode change 100755 => 100644 uview-ui/components/u-row/u-row.vue
mode change 100755 => 100644 uview-ui/components/u-search/u-search.vue
mode change 100755 => 100644 uview-ui/components/u-section/u-section.vue
mode change 100755 => 100644 uview-ui/components/u-select/u-select.vue
mode change 100755 => 100644 uview-ui/components/u-skeleton/u-skeleton.vue
mode change 100755 => 100644 uview-ui/components/u-slider/u-slider.vue
mode change 100755 => 100644 uview-ui/components/u-steps/u-steps.vue
mode change 100755 => 100644 uview-ui/components/u-sticky/u-sticky.vue
mode change 100755 => 100644 uview-ui/components/u-subsection/u-subsection.vue
mode change 100755 => 100644 uview-ui/components/u-swipe-action/u-swipe-action.vue
mode change 100755 => 100644 uview-ui/components/u-swiper/u-swiper.vue
mode change 100755 => 100644 uview-ui/components/u-switch/u-switch.vue
mode change 100755 => 100644 uview-ui/components/u-tabbar/u-tabbar.vue
mode change 100755 => 100644 uview-ui/components/u-table/u-table.vue
mode change 100755 => 100644 uview-ui/components/u-tabs-swiper/u-tabs-swiper.vue
mode change 100755 => 100644 uview-ui/components/u-tabs/u-tabs.vue
mode change 100755 => 100644 uview-ui/components/u-tag/u-tag.vue
mode change 100755 => 100644 uview-ui/components/u-td/u-td.vue
mode change 100755 => 100644 uview-ui/components/u-th/u-th.vue
mode change 100755 => 100644 uview-ui/components/u-time-line-item/u-time-line-item.vue
mode change 100755 => 100644 uview-ui/components/u-time-line/u-time-line.vue
mode change 100755 => 100644 uview-ui/components/u-toast/u-toast.vue
mode change 100755 => 100644 uview-ui/components/u-top-tips/u-top-tips.vue
mode change 100755 => 100644 uview-ui/components/u-tr/u-tr.vue
mode change 100755 => 100644 uview-ui/components/u-upload/u-upload.vue
mode change 100755 => 100644 uview-ui/components/u-verification-code/u-verification-code.vue
mode change 100755 => 100644 uview-ui/components/u-waterfall/u-waterfall.vue
mode change 100755 => 100644 uview-ui/iconfont.css
mode change 100755 => 100644 uview-ui/index.js
mode change 100755 => 100644 uview-ui/index.scss
mode change 100755 => 100644 uview-ui/libs/config/config.js
mode change 100755 => 100644 uview-ui/libs/config/zIndex.js
mode change 100755 => 100644 uview-ui/libs/css/color.scss
mode change 100755 => 100644 uview-ui/libs/css/common.scss
mode change 100755 => 100644 uview-ui/libs/css/style.components.scss
mode change 100755 => 100644 uview-ui/libs/css/style.h5.scss
mode change 100755 => 100644 uview-ui/libs/css/style.mp.scss
mode change 100755 => 100644 uview-ui/libs/css/style.nvue.scss
mode change 100755 => 100644 uview-ui/libs/css/style.vue.scss
mode change 100755 => 100644 uview-ui/libs/function/$parent.js
mode change 100755 => 100644 uview-ui/libs/function/addUnit.js
mode change 100755 => 100644 uview-ui/libs/function/bem.js
mode change 100755 => 100644 uview-ui/libs/function/color.js
mode change 100755 => 100644 uview-ui/libs/function/colorGradient.js
mode change 100755 => 100644 uview-ui/libs/function/debounce.js
mode change 100755 => 100644 uview-ui/libs/function/deepClone.js
mode change 100755 => 100644 uview-ui/libs/function/deepMerge.js
mode change 100755 => 100644 uview-ui/libs/function/getParent.js
mode change 100755 => 100644 uview-ui/libs/function/guid.js
mode change 100755 => 100644 uview-ui/libs/function/md5.js
mode change 100755 => 100644 uview-ui/libs/function/queryParams.js
mode change 100755 => 100644 uview-ui/libs/function/random.js
mode change 100755 => 100644 uview-ui/libs/function/randomArray.js
mode change 100755 => 100644 uview-ui/libs/function/route.js
mode change 100755 => 100644 uview-ui/libs/function/sys.js
mode change 100755 => 100644 uview-ui/libs/function/test.js
mode change 100755 => 100644 uview-ui/libs/function/throttle.js
mode change 100755 => 100644 uview-ui/libs/function/timeFormat.js
mode change 100755 => 100644 uview-ui/libs/function/timeFrom.js
mode change 100755 => 100644 uview-ui/libs/function/toast.js
mode change 100755 => 100644 uview-ui/libs/function/trim.js
mode change 100755 => 100644 uview-ui/libs/function/type2icon.js
mode change 100755 => 100644 uview-ui/libs/mixin/mixin.js
mode change 100755 => 100644 uview-ui/libs/mixin/mpShare.js
mode change 100755 => 100644 uview-ui/libs/request/index.js
mode change 100755 => 100644 uview-ui/libs/store/index.js
mode change 100755 => 100644 uview-ui/libs/util/area.js
mode change 100755 => 100644 uview-ui/libs/util/async-validator.js
mode change 100755 => 100644 uview-ui/libs/util/city.js
mode change 100755 => 100644 uview-ui/libs/util/emitter.js
mode change 100755 => 100644 uview-ui/libs/util/province.js
mode change 100755 => 100644 uview-ui/package.json
mode change 100755 => 100644 uview-ui/theme.scss
mode change 100755 => 100644 当前是uniapp端的源码.txt
diff --git a/.env.development b/.env.development
index 434d723..f0b9f79 100644
--- a/.env.development
+++ b/.env.development
@@ -1,2 +1,2 @@
VITE_APP_NAME=云芯威BMS
-apiUrl=http://127.0.0.1:8081/api
\ No newline at end of file
+apiUrl=https://yxw.wsdns.cn/api
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
old mode 100755
new mode 100644
diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
old mode 100755
new mode 100644
diff --git a/App.vue b/App.vue
old mode 100755
new mode 100644
diff --git a/androidPrivacy.json b/androidPrivacy.json
old mode 100755
new mode 100644
diff --git a/api/address.js b/api/address.js
old mode 100755
new mode 100644
diff --git a/api/article/category.js b/api/article/category.js
old mode 100755
new mode 100644
diff --git a/api/article/index.js b/api/article/index.js
old mode 100755
new mode 100644
diff --git a/api/balance.js b/api/balance.js
old mode 100755
new mode 100644
diff --git a/api/balance/log.js b/api/balance/log.js
old mode 100755
new mode 100644
diff --git a/api/bargain/active.js b/api/bargain/active.js
old mode 100755
new mode 100644
diff --git a/api/bargain/checkout.js b/api/bargain/checkout.js
old mode 100755
new mode 100644
diff --git a/api/bargain/task.js b/api/bargain/task.js
old mode 100755
new mode 100644
diff --git a/api/captcha.js b/api/captcha.js
old mode 100755
new mode 100644
diff --git a/api/cart.js b/api/cart.js
old mode 100755
new mode 100644
diff --git a/api/cashier/index.js b/api/cashier/index.js
old mode 100755
new mode 100644
diff --git a/api/category/index.js b/api/category/index.js
old mode 100755
new mode 100644
diff --git a/api/checkout.js b/api/checkout.js
old mode 100755
new mode 100644
diff --git a/api/comment.js b/api/comment.js
old mode 100755
new mode 100644
diff --git a/api/coupon.js b/api/coupon.js
old mode 100755
new mode 100644
diff --git a/api/dealer/apply.js b/api/dealer/apply.js
old mode 100755
new mode 100644
diff --git a/api/dealer/index.js b/api/dealer/index.js
old mode 100755
new mode 100644
diff --git a/api/dealer/order.js b/api/dealer/order.js
old mode 100755
new mode 100644
diff --git a/api/dealer/poster.js b/api/dealer/poster.js
old mode 100755
new mode 100644
diff --git a/api/dealer/setting.js b/api/dealer/setting.js
old mode 100755
new mode 100644
diff --git a/api/dealer/team.js b/api/dealer/team.js
old mode 100755
new mode 100644
diff --git a/api/dealer/withdraw.js b/api/dealer/withdraw.js
old mode 100755
new mode 100644
diff --git a/api/express.js b/api/express.js
old mode 100755
new mode 100644
diff --git a/api/goods/index.js b/api/goods/index.js
old mode 100755
new mode 100644
diff --git a/api/goods/service.js b/api/goods/service.js
old mode 100755
new mode 100644
diff --git a/api/groupon/checkout.js b/api/groupon/checkout.js
old mode 100755
new mode 100644
diff --git a/api/groupon/goods.js b/api/groupon/goods.js
old mode 100755
new mode 100644
diff --git a/api/groupon/setting.js b/api/groupon/setting.js
old mode 100755
new mode 100644
diff --git a/api/groupon/task.js b/api/groupon/task.js
old mode 100755
new mode 100644
diff --git a/api/help.js b/api/help.js
old mode 100755
new mode 100644
diff --git a/api/live/room.js b/api/live/room.js
old mode 100755
new mode 100644
diff --git a/api/login/index.js b/api/login/index.js
old mode 100755
new mode 100644
diff --git a/api/myCoupon.js b/api/myCoupon.js
old mode 100755
new mode 100644
diff --git a/api/order.js b/api/order.js
old mode 100755
new mode 100644
diff --git a/api/order/comment.js b/api/order/comment.js
old mode 100755
new mode 100644
diff --git a/api/page.js b/api/page.js
old mode 100755
new mode 100644
diff --git a/api/points/log.js b/api/points/log.js
old mode 100755
new mode 100644
diff --git a/api/recharge.js b/api/recharge.js
old mode 100755
new mode 100644
diff --git a/api/recharge/order.js b/api/recharge/order.js
old mode 100755
new mode 100644
diff --git a/api/recharge/plan.js b/api/recharge/plan.js
old mode 100755
new mode 100644
diff --git a/api/refund.js b/api/refund.js
old mode 100755
new mode 100644
diff --git a/api/region.js b/api/region.js
old mode 100755
new mode 100644
diff --git a/api/setting.js b/api/setting.js
old mode 100755
new mode 100644
diff --git a/api/sharp/checkout.js b/api/sharp/checkout.js
old mode 100755
new mode 100644
diff --git a/api/sharp/goods.js b/api/sharp/goods.js
old mode 100755
new mode 100644
diff --git a/api/sharp/home.js b/api/sharp/home.js
old mode 100755
new mode 100644
diff --git a/api/shop.js b/api/shop.js
old mode 100755
new mode 100644
diff --git a/api/shop/order.js b/api/shop/order.js
old mode 100755
new mode 100644
diff --git a/api/upload.js b/api/upload.js
old mode 100755
new mode 100644
diff --git a/api/user.js b/api/user.js
old mode 100755
new mode 100644
diff --git a/api/user/coupon.js b/api/user/coupon.js
old mode 100755
new mode 100644
diff --git a/api/wxofficial.js b/api/wxofficial.js
old mode 100755
new mode 100644
diff --git a/app.scss b/app.scss
old mode 100755
new mode 100644
diff --git a/common/constant/index.js b/common/constant/index.js
old mode 100755
new mode 100644
diff --git a/common/constant/paginate.js b/common/constant/paginate.js
old mode 100755
new mode 100644
diff --git a/common/enum/Client.js b/common/enum/Client.js
old mode 100755
new mode 100644
diff --git a/common/enum/coupon/ApplyRange.js b/common/enum/coupon/ApplyRange.js
old mode 100755
new mode 100644
diff --git a/common/enum/coupon/CouponType.js b/common/enum/coupon/CouponType.js
old mode 100755
new mode 100644
diff --git a/common/enum/coupon/ExpireType.js b/common/enum/coupon/ExpireType.js
old mode 100755
new mode 100644
diff --git a/common/enum/coupon/index.js b/common/enum/coupon/index.js
old mode 100755
new mode 100644
diff --git a/common/enum/dealer/apply/ApplyStatus.js b/common/enum/dealer/apply/ApplyStatus.js
old mode 100755
new mode 100644
diff --git a/common/enum/dealer/apply/ApplyType.js b/common/enum/dealer/apply/ApplyType.js
old mode 100755
new mode 100644
diff --git a/common/enum/dealer/apply/index.js b/common/enum/dealer/apply/index.js
old mode 100755
new mode 100644
diff --git a/common/enum/dealer/withdraw/ApplyStatus.js b/common/enum/dealer/withdraw/ApplyStatus.js
old mode 100755
new mode 100644
diff --git a/common/enum/dealer/withdraw/PayType.js b/common/enum/dealer/withdraw/PayType.js
old mode 100755
new mode 100644
diff --git a/common/enum/dealer/withdraw/index.js b/common/enum/dealer/withdraw/index.js
old mode 100755
new mode 100644
diff --git a/common/enum/enum.js b/common/enum/enum.js
old mode 100755
new mode 100644
diff --git a/common/enum/goods/GoodsType.js b/common/enum/goods/GoodsType.js
old mode 100755
new mode 100644
diff --git a/common/enum/goods/SpecType.js b/common/enum/goods/SpecType.js
old mode 100755
new mode 100644
diff --git a/common/enum/goods/index.js b/common/enum/goods/index.js
old mode 100755
new mode 100644
diff --git a/common/enum/groupon/ActiveStatus.js b/common/enum/groupon/ActiveStatus.js
old mode 100755
new mode 100644
diff --git a/common/enum/groupon/ActiveType.js b/common/enum/groupon/ActiveType.js
old mode 100755
new mode 100644
diff --git a/common/enum/groupon/GoodsStatus.js b/common/enum/groupon/GoodsStatus.js
old mode 100755
new mode 100644
diff --git a/common/enum/groupon/TaskStatus.js b/common/enum/groupon/TaskStatus.js
old mode 100755
new mode 100644
diff --git a/common/enum/groupon/index.js b/common/enum/groupon/index.js
old mode 100755
new mode 100644
diff --git a/common/enum/live/LiveStatus.js b/common/enum/live/LiveStatus.js
old mode 100755
new mode 100644
diff --git a/common/enum/live/index.js b/common/enum/live/index.js
old mode 100755
new mode 100644
diff --git a/common/enum/order/DeliveryStatus.js b/common/enum/order/DeliveryStatus.js
old mode 100755
new mode 100644
diff --git a/common/enum/order/DeliveryType.js b/common/enum/order/DeliveryType.js
old mode 100755
new mode 100644
diff --git a/common/enum/order/OrderSource.js b/common/enum/order/OrderSource.js
old mode 100755
new mode 100644
diff --git a/common/enum/order/OrderStatus.js b/common/enum/order/OrderStatus.js
old mode 100755
new mode 100644
diff --git a/common/enum/order/OrderType.js b/common/enum/order/OrderType.js
old mode 100755
new mode 100644
diff --git a/common/enum/order/PayStatus.js b/common/enum/order/PayStatus.js
old mode 100755
new mode 100644
diff --git a/common/enum/order/PayType.js b/common/enum/order/PayType.js
old mode 100755
new mode 100644
diff --git a/common/enum/order/ReceiptStatus.js b/common/enum/order/ReceiptStatus.js
old mode 100755
new mode 100644
diff --git a/common/enum/order/delivery/DeliveryMethod.js b/common/enum/order/delivery/DeliveryMethod.js
old mode 100755
new mode 100644
diff --git a/common/enum/order/delivery/index.js b/common/enum/order/delivery/index.js
old mode 100755
new mode 100644
diff --git a/common/enum/order/index.js b/common/enum/order/index.js
old mode 100755
new mode 100644
diff --git a/common/enum/order/refund/AuditStatus.js b/common/enum/order/refund/AuditStatus.js
old mode 100755
new mode 100644
diff --git a/common/enum/order/refund/RefundStatus.js b/common/enum/order/refund/RefundStatus.js
old mode 100755
new mode 100644
diff --git a/common/enum/order/refund/RefundType.js b/common/enum/order/refund/RefundType.js
old mode 100755
new mode 100644
diff --git a/common/enum/order/refund/index.js b/common/enum/order/refund/index.js
old mode 100755
new mode 100644
diff --git a/common/enum/payment/Method.js b/common/enum/payment/Method.js
old mode 100755
new mode 100644
diff --git a/common/enum/payment/index.js b/common/enum/payment/index.js
old mode 100755
new mode 100644
diff --git a/common/enum/setting/Key.js b/common/enum/setting/Key.js
old mode 100755
new mode 100644
diff --git a/common/enum/sharp/ActiveStatus.js b/common/enum/sharp/ActiveStatus.js
old mode 100755
new mode 100644
diff --git a/common/enum/sharp/GoodsStatus.js b/common/enum/sharp/GoodsStatus.js
old mode 100755
new mode 100644
diff --git a/common/enum/sharp/index.js b/common/enum/sharp/index.js
old mode 100755
new mode 100644
diff --git a/common/enum/store/page/category/Style.js b/common/enum/store/page/category/Style.js
old mode 100755
new mode 100644
diff --git a/common/enum/store/page/category/index.js b/common/enum/store/page/category/index.js
old mode 100755
new mode 100644
diff --git a/common/model/Region.js b/common/model/Region.js
old mode 100755
new mode 100644
diff --git a/common/model/Setting.js b/common/model/Setting.js
old mode 100755
new mode 100644
diff --git a/common/model/dealer/Setting.js b/common/model/dealer/Setting.js
old mode 100755
new mode 100644
diff --git a/common/model/groupon/Setting.js b/common/model/groupon/Setting.js
old mode 100755
new mode 100644
diff --git a/components/add-cart-btn/index.vue b/components/add-cart-btn/index.vue
old mode 100755
new mode 100644
diff --git a/components/add-cart-popup/index.vue b/components/add-cart-popup/index.vue
old mode 100755
new mode 100644
diff --git a/components/avatar-image/index.vue b/components/avatar-image/index.vue
old mode 100755
new mode 100644
diff --git a/components/countdown/index.vue b/components/countdown/index.vue
old mode 100755
new mode 100644
diff --git a/components/customer-btn/index.vue b/components/customer-btn/index.vue
old mode 100755
new mode 100644
diff --git a/components/empty/index.vue b/components/empty/index.vue
old mode 100755
new mode 100644
diff --git a/components/goods-poster-popup/index.vue b/components/goods-poster-popup/index.vue
old mode 100755
new mode 100644
diff --git a/components/goods-sku-popup/index.vue b/components/goods-sku-popup/index.vue
old mode 100755
new mode 100644
diff --git a/components/goods-sku-popup/number-box/index.vue b/components/goods-sku-popup/number-box/index.vue
old mode 100755
new mode 100644
diff --git a/components/jyf-parser/jyf-parser.vue b/components/jyf-parser/jyf-parser.vue
old mode 100755
new mode 100644
diff --git a/components/jyf-parser/libs/CssHandler.js b/components/jyf-parser/libs/CssHandler.js
old mode 100755
new mode 100644
diff --git a/components/jyf-parser/libs/MpHtmlParser.js b/components/jyf-parser/libs/MpHtmlParser.js
old mode 100755
new mode 100644
diff --git a/components/jyf-parser/libs/config.js b/components/jyf-parser/libs/config.js
old mode 100755
new mode 100644
diff --git a/components/jyf-parser/libs/handler.wxs b/components/jyf-parser/libs/handler.wxs
old mode 100755
new mode 100644
diff --git a/components/jyf-parser/libs/trees.vue b/components/jyf-parser/libs/trees.vue
old mode 100755
new mode 100644
diff --git a/components/mescroll-uni/components/mescroll-down.css b/components/mescroll-uni/components/mescroll-down.css
old mode 100755
new mode 100644
diff --git a/components/mescroll-uni/components/mescroll-down.vue b/components/mescroll-uni/components/mescroll-down.vue
old mode 100755
new mode 100644
diff --git a/components/mescroll-uni/components/mescroll-empty.vue b/components/mescroll-uni/components/mescroll-empty.vue
old mode 100755
new mode 100644
diff --git a/components/mescroll-uni/components/mescroll-top.vue b/components/mescroll-uni/components/mescroll-top.vue
old mode 100755
new mode 100644
diff --git a/components/mescroll-uni/components/mescroll-up.css b/components/mescroll-uni/components/mescroll-up.css
old mode 100755
new mode 100644
diff --git a/components/mescroll-uni/components/mescroll-up.vue b/components/mescroll-uni/components/mescroll-up.vue
old mode 100755
new mode 100644
diff --git a/components/mescroll-uni/mescroll-body.css b/components/mescroll-uni/mescroll-body.css
old mode 100755
new mode 100644
diff --git a/components/mescroll-uni/mescroll-body.vue b/components/mescroll-uni/mescroll-body.vue
old mode 100755
new mode 100644
diff --git a/components/mescroll-uni/mescroll-mixins.js b/components/mescroll-uni/mescroll-mixins.js
old mode 100755
new mode 100644
diff --git a/components/mescroll-uni/mescroll-uni-option.js b/components/mescroll-uni/mescroll-uni-option.js
old mode 100755
new mode 100644
diff --git a/components/mescroll-uni/mescroll-uni.css b/components/mescroll-uni/mescroll-uni.css
old mode 100755
new mode 100644
diff --git a/components/mescroll-uni/mescroll-uni.js b/components/mescroll-uni/mescroll-uni.js
old mode 100755
new mode 100644
diff --git a/components/mescroll-uni/mescroll-uni.vue b/components/mescroll-uni/mescroll-uni.vue
old mode 100755
new mode 100644
diff --git a/components/mescroll-uni/mixins/mescroll-comp.js b/components/mescroll-uni/mixins/mescroll-comp.js
old mode 100755
new mode 100644
diff --git a/components/mescroll-uni/mixins/mescroll-more-item.js b/components/mescroll-uni/mixins/mescroll-more-item.js
old mode 100755
new mode 100644
diff --git a/components/mescroll-uni/mixins/mescroll-more.js b/components/mescroll-uni/mixins/mescroll-more.js
old mode 100755
new mode 100644
diff --git a/components/mescroll-uni/wxs/mixins.js b/components/mescroll-uni/wxs/mixins.js
old mode 100755
new mode 100644
diff --git a/components/mescroll-uni/wxs/renderjs.js b/components/mescroll-uni/wxs/renderjs.js
old mode 100755
new mode 100644
diff --git a/components/mescroll-uni/wxs/wxs.wxs b/components/mescroll-uni/wxs/wxs.wxs
old mode 100755
new mode 100644
diff --git a/components/page/diyComponents/article/index.vue b/components/page/diyComponents/article/index.vue
old mode 100755
new mode 100644
diff --git a/components/page/diyComponents/banner/index.vue b/components/page/diyComponents/banner/index.vue
old mode 100755
new mode 100644
diff --git a/components/page/diyComponents/bargain/index.vue b/components/page/diyComponents/bargain/index.vue
old mode 100755
new mode 100644
diff --git a/components/page/diyComponents/blank/index.vue b/components/page/diyComponents/blank/index.vue
old mode 100755
new mode 100644
diff --git a/components/page/diyComponents/coupon/index.vue b/components/page/diyComponents/coupon/index.vue
old mode 100755
new mode 100644
diff --git a/components/page/diyComponents/empty.vue b/components/page/diyComponents/empty.vue
old mode 100755
new mode 100644
diff --git a/components/page/diyComponents/goods/index.vue b/components/page/diyComponents/goods/index.vue
old mode 100755
new mode 100644
diff --git a/components/page/diyComponents/groupon/index.vue b/components/page/diyComponents/groupon/index.vue
old mode 100755
new mode 100644
diff --git a/components/page/diyComponents/guide/index.vue b/components/page/diyComponents/guide/index.vue
old mode 100755
new mode 100644
diff --git a/components/page/diyComponents/hotZone/index.vue b/components/page/diyComponents/hotZone/index.vue
old mode 100755
new mode 100644
diff --git a/components/page/diyComponents/image/index.vue b/components/page/diyComponents/image/index.vue
old mode 100755
new mode 100644
diff --git a/components/page/diyComponents/mixin.js b/components/page/diyComponents/mixin.js
old mode 100755
new mode 100644
diff --git a/components/page/diyComponents/navBar/index.vue b/components/page/diyComponents/navBar/index.vue
old mode 100755
new mode 100644
diff --git a/components/page/diyComponents/notice/index.vue b/components/page/diyComponents/notice/index.vue
old mode 100755
new mode 100644
diff --git a/components/page/diyComponents/officialAccount/index.vue b/components/page/diyComponents/officialAccount/index.vue
old mode 100755
new mode 100644
diff --git a/components/page/diyComponents/richText/index.vue b/components/page/diyComponents/richText/index.vue
old mode 100755
new mode 100644
diff --git a/components/page/diyComponents/search/index.vue b/components/page/diyComponents/search/index.vue
old mode 100755
new mode 100644
diff --git a/components/page/diyComponents/service/index.vue b/components/page/diyComponents/service/index.vue
old mode 100755
new mode 100644
diff --git a/components/page/diyComponents/sharp/index.vue b/components/page/diyComponents/sharp/index.vue
old mode 100755
new mode 100644
diff --git a/components/page/diyComponents/shop/index.vue b/components/page/diyComponents/shop/index.vue
old mode 100755
new mode 100644
diff --git a/components/page/diyComponents/special/index.vue b/components/page/diyComponents/special/index.vue
old mode 100755
new mode 100644
diff --git a/components/page/diyComponents/video/index.vue b/components/page/diyComponents/video/index.vue
old mode 100755
new mode 100644
diff --git a/components/page/diyComponents/window/index.vue b/components/page/diyComponents/window/index.vue
old mode 100755
new mode 100644
diff --git a/components/page/index.vue b/components/page/index.vue
old mode 100755
new mode 100644
diff --git a/components/recommended/index.vue b/components/recommended/index.vue
old mode 100755
new mode 100644
diff --git a/components/search/index.vue b/components/search/index.vue
old mode 100755
new mode 100644
diff --git a/components/select-region/select-region.vue b/components/select-region/select-region.vue
old mode 100755
new mode 100644
diff --git a/components/share-sheet/index.vue b/components/share-sheet/index.vue
old mode 100755
new mode 100644
diff --git a/components/shortcut/index.vue b/components/shortcut/index.vue
old mode 100755
new mode 100644
diff --git a/config.js b/config.js
old mode 100755
new mode 100644
diff --git a/core/app.js b/core/app.js
old mode 100755
new mode 100644
diff --git a/core/bootstrap.js b/core/bootstrap.js
old mode 100755
new mode 100644
diff --git a/core/config/defaultConfig.js b/core/config/defaultConfig.js
old mode 100755
new mode 100644
diff --git a/core/config/index.js b/core/config/index.js
old mode 100755
new mode 100644
diff --git a/core/mixins/app.js b/core/mixins/app.js
old mode 100755
new mode 100644
diff --git a/core/payment/alipay.js b/core/payment/alipay.js
old mode 100755
new mode 100644
diff --git a/core/payment/index.js b/core/payment/index.js
old mode 100755
new mode 100644
diff --git a/core/platform.js b/core/platform.js
old mode 100755
new mode 100644
diff --git a/js_sdk/ican-H5Api/ican-H5Api.js b/js_sdk/ican-H5Api/ican-H5Api.js
old mode 100755
new mode 100644
diff --git a/js_sdk/queryStringify.js b/js_sdk/queryStringify.js
old mode 100755
new mode 100644
diff --git a/main.js b/main.js
old mode 100755
new mode 100644
diff --git a/manifest.json b/manifest.json
old mode 100755
new mode 100644
diff --git a/node_modules/js/bin/js b/node_modules/js/bin/js
old mode 100755
new mode 100644
diff --git a/package/apply/components/delivery.vue b/package/apply/components/delivery.vue
old mode 100755
new mode 100644
diff --git a/package/apply/components/partner.vue b/package/apply/components/partner.vue
old mode 100755
new mode 100644
diff --git a/package/apply/components/teamer.vue b/package/apply/components/teamer.vue
old mode 100755
new mode 100644
diff --git a/package/brand/components/search.vue b/package/brand/components/search.vue
old mode 100755
new mode 100644
diff --git a/package/collection/components/goods.vue b/package/collection/components/goods.vue
old mode 100755
new mode 100644
diff --git a/package/collection/index.vue b/package/collection/index.vue
old mode 100755
new mode 100644
diff --git a/package/dealer/apply.vue b/package/dealer/apply.vue
old mode 100755
new mode 100644
diff --git a/package/dealer/driver.vue b/package/dealer/driver.vue
old mode 100755
new mode 100644
diff --git a/package/dealer/index.vue b/package/dealer/index.vue
old mode 100755
new mode 100644
diff --git a/package/dealer/order.vue b/package/dealer/order.vue
old mode 100755
new mode 100644
diff --git a/package/dealer/poster.vue b/package/dealer/poster.vue
old mode 100755
new mode 100644
diff --git a/package/dealer/team.vue b/package/dealer/team.vue
old mode 100755
new mode 100644
diff --git a/package/dealer/withdraw/apply.vue b/package/dealer/withdraw/apply.vue
old mode 100755
new mode 100644
diff --git a/package/dealer/withdraw/list.vue b/package/dealer/withdraw/list.vue
old mode 100755
new mode 100644
diff --git a/package/deliver/address/create.vue b/package/deliver/address/create.vue
old mode 100755
new mode 100644
diff --git a/package/deliver/address/index.vue b/package/deliver/address/index.vue
old mode 100755
new mode 100644
diff --git a/package/deliver/address/update.vue b/package/deliver/address/update.vue
old mode 100755
new mode 100644
diff --git a/package/equipment/cashier/index.vue b/package/equipment/cashier/index.vue
old mode 100755
new mode 100644
diff --git a/package/equipment/checkout/index.vue b/package/equipment/checkout/index.vue
old mode 100755
new mode 100644
diff --git a/package/equipment/components/Comment.vue b/package/equipment/components/Comment.vue
old mode 100755
new mode 100644
diff --git a/package/equipment/components/Service.vue b/package/equipment/components/Service.vue
old mode 100755
new mode 100644
diff --git a/package/equipment/components/SkuPopup.vue b/package/equipment/components/SkuPopup.vue
old mode 100755
new mode 100644
diff --git a/package/equipment/components/SlideImage.vue b/package/equipment/components/SlideImage.vue
old mode 100755
new mode 100644
diff --git a/package/equipment/components/search.vue b/package/equipment/components/search.vue
old mode 100755
new mode 100644
diff --git a/package/equipment/detail.scss b/package/equipment/detail.scss
old mode 100755
new mode 100644
diff --git a/package/equipment/detail.vue b/package/equipment/detail.vue
old mode 100755
new mode 100644
diff --git a/package/equipment/list.vue b/package/equipment/list.vue
old mode 100755
new mode 100644
diff --git a/package/footmark/components/goods.vue b/package/footmark/components/goods.vue
old mode 100755
new mode 100644
diff --git a/package/footmark/index.vue b/package/footmark/index.vue
old mode 100755
new mode 100644
diff --git a/package/shops/detail/components/commodity.vue b/package/shops/detail/components/commodity.vue
old mode 100755
new mode 100644
diff --git a/package/shops/detail/components/primary.vue b/package/shops/detail/components/primary.vue
old mode 100755
new mode 100644
diff --git a/package/shops/detail/components/search.vue b/package/shops/detail/components/search.vue
old mode 100755
new mode 100644
diff --git a/package/shops/detail/components/secondary.vue b/package/shops/detail/components/secondary.vue
old mode 100755
new mode 100644
diff --git a/package/shops/detail/components/shop-banner.vue b/package/shops/detail/components/shop-banner.vue
old mode 100755
new mode 100644
diff --git a/package/shops/detail/index.scss b/package/shops/detail/index.scss
old mode 100755
new mode 100644
diff --git a/package/shops/detail/index.vue b/package/shops/detail/index.vue
old mode 100755
new mode 100644
diff --git a/package/solution/cashier/index.vue b/package/solution/cashier/index.vue
old mode 100755
new mode 100644
diff --git a/package/solution/components/search.vue b/package/solution/components/search.vue
old mode 100755
new mode 100644
diff --git a/package/solution/detail.vue b/package/solution/detail.vue
old mode 100755
new mode 100644
diff --git a/package/user/address/create.vue b/package/user/address/create.vue
old mode 100755
new mode 100644
diff --git a/package/user/address/index.vue b/package/user/address/index.vue
old mode 100755
new mode 100644
diff --git a/package/user/address/update.vue b/package/user/address/update.vue
old mode 100755
new mode 100644
diff --git a/package/user/equipment/create.vue b/package/user/equipment/create.vue
old mode 100755
new mode 100644
diff --git a/package/user/equipment/detail.vue b/package/user/equipment/detail.vue
old mode 100755
new mode 100644
diff --git a/package/user/equipment/index.vue b/package/user/equipment/index.vue
old mode 100755
new mode 100644
diff --git a/package/user/equipment/operation.vue b/package/user/equipment/operation.vue
old mode 100755
new mode 100644
diff --git a/package/user/equipment/update.vue b/package/user/equipment/update.vue
old mode 100755
new mode 100644
diff --git a/package/user/goods/cashier.vue b/package/user/goods/cashier.vue
old mode 100755
new mode 100644
diff --git a/package/user/goods/components/Comment.vue b/package/user/goods/components/Comment.vue
old mode 100755
new mode 100644
diff --git a/package/user/goods/components/Service.vue b/package/user/goods/components/Service.vue
old mode 100755
new mode 100644
diff --git a/package/user/goods/components/SkuPopup.vue b/package/user/goods/components/SkuPopup.vue
old mode 100755
new mode 100644
diff --git a/package/user/goods/components/SlideImage.vue b/package/user/goods/components/SlideImage.vue
old mode 100755
new mode 100644
diff --git a/package/user/goods/components/search.vue b/package/user/goods/components/search.vue
old mode 100755
new mode 100644
diff --git a/package/user/goods/detail.scss b/package/user/goods/detail.scss
old mode 100755
new mode 100644
diff --git a/package/user/goods/detail.vue b/package/user/goods/detail.vue
old mode 100755
new mode 100644
diff --git a/package/user/goods/list.vue b/package/user/goods/list.vue
old mode 100755
new mode 100644
diff --git a/package/user/order/index.vue b/package/user/order/index.vue
old mode 100755
new mode 100644
diff --git a/package/user/popularize/components/goods.vue b/package/user/popularize/components/goods.vue
old mode 100755
new mode 100644
diff --git a/package/user/popularize/components/goods1.vue b/package/user/popularize/components/goods1.vue
old mode 100755
new mode 100644
diff --git a/package/user/popularize/index.vue b/package/user/popularize/index.vue
old mode 100755
new mode 100644
diff --git a/pages.json b/pages.json
old mode 100755
new mode 100644
index 7c0d9f5..40216c2
--- a/pages.json
+++ b/pages.json
@@ -293,7 +293,7 @@
{
"path": "pages/order/delivery",
"style": {
- "navigationBarTitleText": "确认收货"
+ "navigationBarTitleText": "身份证上传"
}
},
{
diff --git a/pages/address/create.vue b/pages/address/create.vue
old mode 100755
new mode 100644
diff --git a/pages/address/index.vue b/pages/address/index.vue
old mode 100755
new mode 100644
diff --git a/pages/address/update.vue b/pages/address/update.vue
old mode 100755
new mode 100644
diff --git a/pages/article/detail.vue b/pages/article/detail.vue
old mode 100755
new mode 100644
diff --git a/pages/article/index.vue b/pages/article/index.vue
old mode 100755
new mode 100644
diff --git a/pages/bargain/goods/components/SkuPopup.vue b/pages/bargain/goods/components/SkuPopup.vue
old mode 100755
new mode 100644
diff --git a/pages/bargain/goods/index.vue b/pages/bargain/goods/index.vue
old mode 100755
new mode 100644
diff --git a/pages/bargain/goods/style.scss b/pages/bargain/goods/style.scss
old mode 100755
new mode 100644
diff --git a/pages/bargain/index.vue b/pages/bargain/index.vue
old mode 100755
new mode 100644
diff --git a/pages/bargain/task.vue b/pages/bargain/task.vue
old mode 100755
new mode 100644
diff --git a/pages/cart/index.vue b/pages/cart/index.vue
old mode 100755
new mode 100644
diff --git a/pages/category/components/commodity.vue b/pages/category/components/commodity.vue
old mode 100755
new mode 100644
diff --git a/pages/category/components/primary.vue b/pages/category/components/primary.vue
old mode 100755
new mode 100644
diff --git a/pages/category/components/secondary.vue b/pages/category/components/secondary.vue
old mode 100755
new mode 100644
diff --git a/pages/category/index.vue b/pages/category/index.vue
old mode 100755
new mode 100644
diff --git a/pages/checkout/cashier/index.vue b/pages/checkout/cashier/index.vue
old mode 100755
new mode 100644
diff --git a/pages/checkout/index.vue b/pages/checkout/index.vue
old mode 100755
new mode 100644
diff --git a/pages/checkout/style.scss b/pages/checkout/style.scss
old mode 100755
new mode 100644
diff --git a/pages/comment/index.vue b/pages/comment/index.vue
old mode 100755
new mode 100644
diff --git a/pages/coupon/index.vue b/pages/coupon/index.vue
old mode 100755
new mode 100644
diff --git a/pages/custom/index.vue b/pages/custom/index.vue
old mode 100755
new mode 100644
diff --git a/pages/dealer/apply.vue b/pages/dealer/apply.vue
old mode 100755
new mode 100644
diff --git a/pages/dealer/index.vue b/pages/dealer/index.vue
old mode 100755
new mode 100644
diff --git a/pages/dealer/order.vue b/pages/dealer/order.vue
old mode 100755
new mode 100644
diff --git a/pages/dealer/poster.vue b/pages/dealer/poster.vue
old mode 100755
new mode 100644
diff --git a/pages/dealer/team.vue b/pages/dealer/team.vue
old mode 100755
new mode 100644
diff --git a/pages/dealer/withdraw/apply.vue b/pages/dealer/withdraw/apply.vue
old mode 100755
new mode 100644
diff --git a/pages/dealer/withdraw/list.vue b/pages/dealer/withdraw/list.vue
old mode 100755
new mode 100644
diff --git a/pages/empty.vue b/pages/empty.vue
old mode 100755
new mode 100644
diff --git a/pages/equipment/detail.vue b/pages/equipment/detail.vue
old mode 100755
new mode 100644
diff --git a/pages/goods/components/Comment.vue b/pages/goods/components/Comment.vue
old mode 100755
new mode 100644
diff --git a/pages/goods/components/Service.vue b/pages/goods/components/Service.vue
old mode 100755
new mode 100644
diff --git a/pages/goods/components/SkuPopup.vue b/pages/goods/components/SkuPopup.vue
old mode 100755
new mode 100644
diff --git a/pages/goods/components/SlideImage.vue b/pages/goods/components/SlideImage.vue
old mode 100755
new mode 100644
diff --git a/pages/goods/detail.scss b/pages/goods/detail.scss
old mode 100755
new mode 100644
diff --git a/pages/goods/detail.vue b/pages/goods/detail.vue
old mode 100755
new mode 100644
diff --git a/pages/goods/list.vue b/pages/goods/list.vue
old mode 100755
new mode 100644
diff --git a/pages/groupon/goods/components/SkuPopup.vue b/pages/groupon/goods/components/SkuPopup.vue
old mode 100755
new mode 100644
diff --git a/pages/groupon/goods/components/TaskList.vue b/pages/groupon/goods/components/TaskList.vue
old mode 100755
new mode 100644
diff --git a/pages/groupon/goods/components/goods-sku-popup/index.vue b/pages/groupon/goods/components/goods-sku-popup/index.vue
old mode 100755
new mode 100644
diff --git a/pages/groupon/goods/components/goods-sku-popup/number-box/index.vue b/pages/groupon/goods/components/goods-sku-popup/number-box/index.vue
old mode 100755
new mode 100644
diff --git a/pages/groupon/goods/index.vue b/pages/groupon/goods/index.vue
old mode 100755
new mode 100644
diff --git a/pages/groupon/goods/style.scss b/pages/groupon/goods/style.scss
old mode 100755
new mode 100644
diff --git a/pages/groupon/index.vue b/pages/groupon/index.vue
old mode 100755
new mode 100644
diff --git a/pages/groupon/task/index.vue b/pages/groupon/task/index.vue
old mode 100755
new mode 100644
diff --git a/pages/help/about.vue b/pages/help/about.vue
old mode 100755
new mode 100644
diff --git a/pages/help/index.vue b/pages/help/index.vue
old mode 100755
new mode 100644
diff --git a/pages/help/xieyi.vue b/pages/help/xieyi.vue
old mode 100755
new mode 100644
diff --git a/pages/live/index.vue b/pages/live/index.vue
old mode 100755
new mode 100644
diff --git a/pages/login/components/main.vue b/pages/login/components/main.vue
old mode 100755
new mode 100644
diff --git a/pages/login/components/mp-weixin-mobile.vue b/pages/login/components/mp-weixin-mobile.vue
old mode 100755
new mode 100644
diff --git a/pages/login/components/mp-weixin.vue b/pages/login/components/mp-weixin.vue
old mode 100755
new mode 100644
diff --git a/pages/login/components/wx-official.vue b/pages/login/components/wx-official.vue
old mode 100755
new mode 100644
diff --git a/pages/login/index.vue b/pages/login/index.vue
old mode 100755
new mode 100644
diff --git a/pages/login/login.vue b/pages/login/login.vue
old mode 100755
new mode 100644
diff --git a/pages/my-coupon/index.vue b/pages/my-coupon/index.vue
old mode 100755
new mode 100644
diff --git a/pages/order/comment/index.vue b/pages/order/comment/index.vue
old mode 100755
new mode 100644
diff --git a/pages/order/delivery.vue b/pages/order/delivery.vue
old mode 100755
new mode 100644
index aa55e41..c66306f
--- a/pages/order/delivery.vue
+++ b/pages/order/delivery.vue
@@ -22,20 +22,7 @@
其他
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -135,7 +122,7 @@
homeAddress: '',
// 按钮禁用
// disabled: false,
- submitText: '证件已上传并确认收货',
+ submitText: '证件已上传',
}
},
@@ -261,7 +248,7 @@
homeAddress: homeAddress
}).then(result => {
if(result.code == 0) {
- that.$success("确认收货成功！")
+ that.$success("确认成功！")
// uni.navigateBack()
setTimeout(()=>{
that.$navTo('pages/order/index',{}, 'redirectTo')
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
old mode 100755
new mode 100644
index 67759ee..fdcc1a5
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -16,7 +16,8 @@
-->
-
+
@@ -34,13 +35,16 @@
待支付
退租中
- 待收货
- 待绑定
- 进行中
+ 待收货
+ 待绑定
+ 进行中
已完成
-
+
@@ -222,19 +226,25 @@
{{ equipmentGoods.batteryModel }}
-
+
订单金额
￥{{ order.totalPrice }} 元
-
+
销售价格
@@ -280,12 +290,18 @@
{{ equipmentGoods.batteryRent }} 元
-
+
设备押金
{{ equipmentGoods.batteryDeposit }} 元
+
+ 设备押金
+
+ 芝麻分免押金
+
+
设备保险
@@ -315,12 +331,18 @@
{{ equipmentGoods.batteryRent }} 元
-
+
设备押金
{{ equipmentGoods.batteryDeposit }} 元
+
+ 设备押金
+
+ 芝麻分免押金
+
+
设备保险
@@ -342,7 +364,7 @@
-->
-
+
-- 缴费记录 --
@@ -508,26 +530,34 @@
v-if="equipmentGoods.equipmentCategory != '10' && order.receiptStatus == 21 && !orderEnd">取消退租
-->
-
+
- 确认收货
- 绑定设备
-
+ 确认收货
+ 绑定设备
+
我要退租
+ v-if="order.equipmentGoods.equipmentCategory != '10' && order.receiptStatus != 21 && order.receiptStatus != 30">
+ 我要退租
取消退租
-
+ v-if="order.equipmentGoods.equipmentCategory != '10' && order.receiptStatus == 21 && !orderEnd">
+ 取消退租
+
我要续费
-
+ v-if="order.equipmentGoods.equipmentCategory != '10' && order.receiptStatus != 30 && order.receiptStatus != 21 && !orderEnd && order.orderId >= 28804 && order.deliveryStatus == 40">
+ 我要续费
+
- 换电
+
-
+
@@ -541,8 +571,9 @@
-
+
+
请输入更换的新电池编号
确定更换电池
+ 扫码
@@ -675,7 +707,21 @@
},
methods: {
+ scan() {
+ const app = this
+ my.ap.openAlipayApp({
+ appCode: 'alipayScan',
+ success: res => {
+ console.log('openAlipayApp success', res);
+ },
+ fail: err => {
+ console.log('openAlipayApp fail', err);
+ }
+ });
+
+
+ },
// 获取当前订单信息
getOrderDetail(canReset = false) {
const app = this
@@ -891,44 +937,44 @@
})
}, */
-
+
// 点击去支付
onPay(orderId) {
const app = this
OrderApi.getOrderPayByOrderId(orderId).then(res => {
- if(res.data.isRenew == 0 && res.data.hasFreeze == 0){
+ if (res.data.isRenew == 0 && res.data.hasFreeze == 0) {
if (res.data.equipmentCategory != 10 && res.data.orderStr) {
my.tradePay({
orderStr: res.data.orderStr, // 完整的支付参数拼接成的字符串，从服务端获取
success: (res) => {
-
+
},
fail: (res) => {
-
+
},
complete: () => {
OrderApi.checkFreeze(orderId).then((res) => {
- if(res.code == 0){
+ if (res.code == 0) {
// app.$success("下单成功")
setTimeout(() => {
// uni.redirectTo({
// url: '/pages/order/index'
// })
- this.$navTo('pages/checkout/cashier/index', {
- orderId: res.data.id
- })
+ this.$navTo(
+ 'pages/checkout/cashier/index', {
+ orderId: res.data.id
+ })
}, 500)
- }
- else {
+ } else {
app.$error(res.errMsg)
}
})
-
+
}
});
} else {
OrderApi.checkFreeze(orderId).then((r) => {
- if(r.code == 0){
+ if (r.code == 0) {
app.$success("下单成功")
setTimeout(() => {
// uni.redirectTo({
@@ -938,19 +984,18 @@
orderId: r.data.id
})
}, 500)
- }
- else {
+ } else {
app.$error(r.errMsg)
}
})
}
-
+
} else {
this.$navTo('pages/checkout/cashier/index', {
orderId: res.data.id
})
}
-
+
})
},
@@ -1008,7 +1053,7 @@
}
})
},
-
+
// 跳转到设备详情页
handleTargetEquipment(equipmentId) {
this.$navTo('pages/user/equipment/index', {
@@ -1021,7 +1066,7 @@
orderId: res.data.id
})
})
-
+
},
// 订单提交成功后回调
onSubmitCallback(result) {
@@ -1070,7 +1115,7 @@
const app = this
app.showQRCodeChange = true
},
-
+
// 绑定设备页面
onBind(item) {
const app = this
@@ -1140,6 +1185,17 @@
padding-bottom: calc(env(safe-area-inset-bottom) + 106rpx + 6rpx);
}
+
+
+ .scan {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ margin-top: 30rpx;
+ font-size: 24rpx;
+ color: #cecece;
+ }
+
// 页面顶部
.header {
display: flex;
@@ -1594,7 +1650,7 @@
// 弹出层 - 绑定设备码
.qrcode-bind {
width: 550rpx;
- height: 300rpx;
+
padding: 36rpx 30rpx;
.title {
diff --git a/pages/order/express/index.vue b/pages/order/express/index.vue
old mode 100755
new mode 100644
diff --git a/pages/order/extract/check.vue b/pages/order/extract/check.vue
old mode 100755
new mode 100644
diff --git a/pages/order/index.vue b/pages/order/index.vue
old mode 100755
new mode 100644
index 1b7ff84..fb713f6
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -14,12 +14,17 @@
待支付
- 待收货
- 待绑定
+ 待收货
+ 待绑定
- 进行中
- 退租中
- 已完成
+ 进行中
+ 退租中
+ 已完成
@@ -45,21 +50,25 @@
到期时间：{{ item.expirationTime }}
下单时间：{{ item.payTime }}
- 设备编号：{{ item.equipment.equipmentCode ? item.equipment.equipmentCode : ''}}
+ 设备编号：{{ item.equipment.equipmentCode ? item.equipment.equipmentCode : ''}}
设备名称：{{ item.equipmentGoods.goodsName }}
设备型号：{{ item.equipmentGoods.batteryModel }}
下单用户：{{ item.nickname }}
- 逾期状态:
+ 逾期状态:
(已逾期{{ Math.abs(item.expirationDay) }}天)
逾期状态: 即将过期
+ v-if="item.payStatus == 10 && item.expirationDay < 7 && item.expirationDay > 0">逾期状态:
+ 即将过期
- 合计：￥{{ item.totalPrice }}
+ 合计：￥{{ item.totalPrice }}
@@ -75,19 +84,23 @@
-
+
+ 绑定设备
+ 确认身份
-
+
去支付
取消
-
+
核销码
@@ -98,28 +111,34 @@
取消申请中
- 确认收货
- 绑定设备
-
- 我要退租
- 取消退租
-
- 我要续费
+
-
- 换电
+
+
+ 我要退租
+
+ 取消退租
+
+
+ 我要续费
+
+
+ 换电
+
-
-
+
+
详情
-
+
@@ -158,6 +177,7 @@
确定更换电池
+ 扫码
@@ -314,7 +334,21 @@
},
methods: {
+ scan() {
+ const app = this
+ my.ap.openAlipayApp({
+ appCode: 'alipayScan',
+ success: res => {
+ console.log('openAlipayApp success', res);
+ },
+ fail: err => {
+ console.log('openAlipayApp fail', err);
+ }
+ });
+
+
+ },
// 初始化当前选中的标签
initCurTab(options) {
const app = this
@@ -456,24 +490,28 @@
// 确认收货
onReceipt(orderId) {
const app = this
- uni.showModal({
- title: '友情提示',
- content: '确认收到商品了吗？',
- success(o) {
- if (o.confirm) {
- // OrderApi.receipt(orderId)
- // .then(result => {
- // // 显示成功信息
- // app.$success(result.message)
- // // 刷新订单列表
- // app.onRefreshList()
- // })
- app.$navTo('pages/order/delivery', {
- orderId
- })
- }
- }
- });
+
+ app.$navTo('pages/order/delivery', {
+ orderId
+ })
+ // uni.showModal({
+ // title: '友情提示',
+ // content: '确认收到商品了吗？',
+ // success(o) {
+ // if (o.confirm) {
+ // // OrderApi.receipt(orderId)
+ // // .then(result => {
+ // // // 显示成功信息
+ // // app.$success(result.message)
+ // // // 刷新订单列表
+ // // app.onRefreshList()
+ // // })
+ // app.$navTo('pages/order/delivery', {
+ // orderId
+ // })
+ // }
+ // }
+ // });
},
// 上传图片
chooseImage(orderId) {
@@ -565,7 +603,7 @@
app.showQRCodePopup = true
})
},
-
+
handleRentingOut(order) {
const app = this
uni.showModal({
@@ -589,7 +627,7 @@
}
})
},
-
+
handleRentingOutCancel(order) {
const app = this
uni.showModal({
@@ -618,29 +656,28 @@
onPay(orderId) {
const app = this
getOrderPayByOrderId(orderId).then(res => {
- if(res.data.isRenew == 0 && res.data.hasFreeze == 0){
+ if (res.data.isRenew == 0 && res.data.hasFreeze == 0) {
if (res.data.equipmentCategory != 10 && res.data.orderStr) {
my.tradePay({
orderStr: res.data.orderStr, // 完整的支付参数拼接成的字符串，从服务端获取
success: (res) => {
-
- },
- fail: (res) => {
+
},
+ fail: (res) => {},
complete: () => {
checkFreeze(orderId).then((r) => {
- if(r.code == 0){
+ if (r.code == 0) {
// app.$success("押金校验成功！")
setTimeout(() => {
// uni.redirectTo({
// url: '/pages/order/index'
// })
- this.$navTo('pages/checkout/cashier/index', {
- orderId: r.data.id
- })
+ this.$navTo(
+ 'pages/checkout/cashier/index', {
+ orderId: r.data.id
+ })
}, 500)
- }
- else {
+ } else {
app.$error(r.message)
app.onRefreshList()
}
@@ -649,7 +686,7 @@
});
} else {
checkFreeze(orderId).then((r) => {
- if(r.code == 0){
+ if (r.code == 0) {
app.$success("押金校验成功")
setTimeout(() => {
// uni.redirectTo({
@@ -660,8 +697,7 @@
orderId: r.data.id
})
}, 500)
- }
- else {
+ } else {
app.$error(r.message)
app.onRefreshList()
}
@@ -672,7 +708,7 @@
orderId: res.data.id
})
}
-
+
})
},
@@ -696,7 +732,7 @@
app.equipmentId = equipmentId
app.showQRCodeBindChange = true
},
-
+
// 续费
handleHireEquipment(orderId) {
getOrderPayByOrderId(orderId).then(res => {
@@ -704,7 +740,7 @@
orderId: res.data.id
})
})
-
+
},
// 换电
doEquipment(canReset = false) {
@@ -736,6 +772,15 @@