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 @@