diff --git a/config/order.js b/config/order.js index 7797dfc..7c18bb4 100644 --- a/config/order.js +++ b/config/order.js @@ -50,3 +50,7 @@ export const validRelation = params => // 升级订单 export const upgradeOrder = data => http.post('/sale/api/retail-order/confirm-upg-order', data) + +// 确认收货 +export const confirmReceipt = orderCode => + http.put(`/sale/api/my-order/confirm/${orderCode}`) diff --git a/config/request.js b/config/request.js index 0cf3490..7c691d2 100644 --- a/config/request.js +++ b/config/request.js @@ -20,7 +20,7 @@ module.exports = vm => { //#ifdef DEV_SERVER console.log('DEV_SERVER') - config.baseURL = 'http://t-app.beida777.com/prod-api' + config.baseURL = 'http://192.168.0.104:8080' //#endif //#ifdef QA_SERVER diff --git a/manifest.json b/manifest.json index 0053827..3489ebc 100644 --- a/manifest.json +++ b/manifest.json @@ -1,34 +1,34 @@ { - "name": "retail-h5", - "appid": "__UNI__31B4587", - "description": "", - "versionName": "1.0.0", - "versionCode": "100", - "transformPx": false, + "name" : "retail-store-h5", + "appid" : "__UNI__31B4587", + "description" : "", + "versionName" : "1.0.0", + "versionCode" : "100", + "transformPx" : false, /* 5+App特有相关 */ - "app-plus": { - "usingComponents": true, - "nvueStyleCompiler": "uni-app", - "compilerVersion": 3, - "splashscreen": { - "alwaysShowBeforeRender": true, - "waiting": true, - "autoclose": true, - "delay": 0 + "app-plus" : { + "usingComponents" : true, + "nvueStyleCompiler" : "uni-app", + "compilerVersion" : 3, + "splashscreen" : { + "alwaysShowBeforeRender" : true, + "waiting" : true, + "autoclose" : true, + "delay" : 0 }, /* 模块配置 */ - "modules": { - "Bluetooth": {}, - "Barcode": {}, - "Camera": {}, - "Fingerprint": {}, - "FaceID": {} + "modules" : { + "Bluetooth" : {}, + "Barcode" : {}, + "Camera" : {}, + "Fingerprint" : {}, + "FaceID" : {} }, /* 应用发布信息 */ - "distribute": { + "distribute" : { /* android打包配置 */ - "android": { - "permissions": [ + "android" : { + "permissions" : [ "", "", "", @@ -45,62 +45,58 @@ "", "" ], - "abiFilters": [ - "armeabi-v7a", - "arm64-v8a", - "x86" - ] + "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ] }, /* ios打包配置 */ - "ios": { - "dSYMs": false + "ios" : { + "dSYMs" : false }, /* SDK配置 */ - "sdkConfigs": { - "push": {} + "sdkConfigs" : { + "push" : {} } } }, /* 快应用特有相关 */ - "quickapp": {}, + "quickapp" : {}, /* 小程序特有相关 */ - "mp-weixin": { - "appid": "wxe26d23c09932e93b", - "setting": { - "urlCheck": false, - "es6": false, - "minified": false + "mp-weixin" : { + "appid" : "wxe26d23c09932e93b", + "setting" : { + "urlCheck" : false, + "es6" : false, + "minified" : false }, - "usingComponents": true + "usingComponents" : true }, - "mp-alipay": { - "usingComponents": true + "mp-alipay" : { + "usingComponents" : true }, - "mp-baidu": { - "usingComponents": true + "mp-baidu" : { + "usingComponents" : true }, - "mp-toutiao": { - "usingComponents": true + "mp-toutiao" : { + "usingComponents" : true }, - "uniStatistics": { - "enable": false + "uniStatistics" : { + "enable" : false }, - "vueVersion": "2", - "h5": { - "template": "index.html", - "router": { - "mode": "hash" + "vueVersion" : "2", + "h5" : { + "template" : "index.html", + "router" : { + "mode" : "hash" }, - "devServer": { - "https": false, - "port": 8899, - "proxy": { - "/prod-api": { - "target": "http://t-mana.beida777.com", - "changeOrigin": true + "devServer" : { + "https" : false, + "port" : 8999, + "proxy" : { + "/prod-api" : { + "target" : "http://t-mana.beida777.com", + "changeOrigin" : true } } } }, - "fallbackLocale": "zh-Hans" + "fallbackLocale" : "zh-Hans" } diff --git a/pages/index/index.vue b/pages/index/index.vue index a42e698..671d9e3 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -98,7 +98,7 @@ ref="child2" @childMethodTrigger="callChildMethod" > - + 荣誉奖衔: {{ userInfo.pkMaxAwardsVal || userInfo.pkAwardsVal || '无' @@ -32,7 +31,6 @@ - 当月奖衔: {{ userInfo.pkAwardsVal || '无' @@ -43,7 +41,7 @@ {{ userInfo.pkRangeAwardsVal }} - + --> - + /> --> @@ -480,7 +478,7 @@ export default { return } this.isNormal = isNormal - this.getRegionSelect() + // this.getRegionSelect() this.getMemberBoxCount() this.getMarketDynamicBoxCount() // this.getUserAwardss() diff --git a/pages/mine/order/index.vue b/pages/mine/order/index.vue index 71eb381..390862b 100644 --- a/pages/mine/order/index.vue +++ b/pages/mine/order/index.vue @@ -104,6 +104,15 @@ :text="'查看物流'" color="#005BAC" > + @@ -493,6 +502,34 @@ export default { this.cancelCode = val.orderCode this.cancleOrder = true }, + confirmReceipt(item) { + uni.showModal({ + title: '提示', + content: '确认收货?', + success: res => { + if (res.confirm) { + api.confirmReceipt(item.orderCode).then(res => { + if (res.code == 200) { + uni.showToast({ + title: '确认收货成功', + icon: 'none', + duration: 1500, + }) + this.queryParams.pageNum = 1 + this.orderLists = [] + this.getDataList() + } else { + uni.showToast({ + title: res.msg, + icon: 'none', + duration: 1500, + }) + } + }) + } + }, + }) + }, getDetails(item) { uni.showLoading({ title: '加载中',