diff --git a/pages.json b/pages.json index aff26b1..a20e598 100644 --- a/pages.json +++ b/pages.json @@ -5,41 +5,17 @@ "enablePullDownRefresh" : true } }, - { - "path": "pages/index/order", - "style": { - "navigationBarTitleText": "" - } - }, { "path": "pages/index/activity", "style": { "navigationBarTitleText": "" } }, - { - "path": "pages/index/message", - "style": { - "navigationBarTitleText": "" - } - }, - { - "path": "pages/index/category", - "style": { - "navigationBarTitleText": "" - } - }, { "path": "pages/index/center", "style": { "enablePullDownRefresh" : true } - }, - { - "path": "pages/index/cart", - "style": { - "navigationBarTitleText": "" - } } ], "preloadRule": { @@ -50,33 +26,13 @@ }, "subPackages": [{ "root": "pages_order", - "pages": [{ - "path": "order/orderDetail" - }, - { - "path": "mine/purse" - }, - { - "path": "mine/runningWater" - }, - { - "path": "mine/address" - }, - { - "path": "product/productDetail" - }, + "pages": [ { "path": "auth/wxLogin" }, { "path": "auth/wxUserInfo" }, - { - "path": "auth/loginAndRegisterAndForgetPassword" - }, - { - "path": "mine/help" - }, { "path": "renting/rentingList", "style": { diff --git a/pages/index/cart.vue b/pages/index/cart.vue deleted file mode 100644 index 4c9a7c2..0000000 --- a/pages/index/cart.vue +++ /dev/null @@ -1,259 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages/index/category.vue b/pages/index/category.vue deleted file mode 100644 index 17ab40d..0000000 --- a/pages/index/category.vue +++ /dev/null @@ -1,181 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages/index/order.vue b/pages/index/order.vue deleted file mode 100644 index 7a53962..0000000 --- a/pages/index/order.vue +++ /dev/null @@ -1,263 +0,0 @@ - - - - - diff --git a/pages_order/mine/address.vue b/pages_order/mine/address.vue deleted file mode 100644 index 65f82d7..0000000 --- a/pages_order/mine/address.vue +++ /dev/null @@ -1,213 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages_order/order/orderDetail.vue b/pages_order/order/orderDetail.vue deleted file mode 100644 index 8ca27b7..0000000 --- a/pages_order/order/orderDetail.vue +++ /dev/null @@ -1,567 +0,0 @@ - - - - - diff --git a/pages_order/product/productDetail.vue b/pages_order/product/productDetail.vue deleted file mode 100644 index 43d797e..0000000 --- a/pages_order/product/productDetail.vue +++ /dev/null @@ -1,169 +0,0 @@ - - - - - diff --git a/utils/oss-upload/oss/index.js b/utils/oss-upload/oss/index.js index 024eb80..7a0c5b8 100644 --- a/utils/oss-upload/oss/index.js +++ b/utils/oss-upload/oss/index.js @@ -93,9 +93,6 @@ export function ossUploadImage({ count: 1, sizeType, success(res) { - // #ifdef H5 - return uploadFileToOSS(res.tempFiles[0]).then(success).catch(fail) - // #endif ossUpload(res.tempFilePaths[0], key, folder).then(success).catch(fail) }, fail @@ -123,9 +120,6 @@ export function ossUploadVideo({ maxDuration, camera, success(res) { - // #ifdef H5 - return uploadFileToOSS(res.tempFile).then(success).catch(fail) - // #endif ossUpload(res.tempFilePath, key, folder).then(success).catch(fail) }, fail diff --git a/utils/oss-upload/oss/web.js b/utils/oss-upload/oss/web.js index dfaab6e..9b419ae 100644 --- a/utils/oss-upload/oss/web.js +++ b/utils/oss-upload/oss/web.js @@ -1,5 +1,5 @@ // 此方法适用于web -import OSS from "ali-oss" +// import OSS from "ali-oss" import config from '@/config.js' /**