diff --git a/manifest.json b/manifest.json index 5c7aa9f..ade7ac4 100644 --- a/manifest.json +++ b/manifest.json @@ -23,8 +23,7 @@ "OAuth" : {}, "Maps" : {}, "Camera" : {}, - "Record" : {}, - "Push" : {} + "Record" : {} }, /* 应用发布信息 */ "distribute" : { @@ -89,9 +88,9 @@ "ad" : {}, "maps" : { "amap" : { - "appkey_ios" : "0745993c59c890b5bb67ba6595400e76", - "appkey_android" : "eb38bf53409f58cbf43f383cb5733747", - "name" : "amapnk4ecquC" + "appkey_ios" : "078d73c3d9a2dfa551108b1f7e80e4d5", + "appkey_android" : "ddd9f8703b3696ce47216ff7783bbe38", + "name" : "amapAfvorp8OK" } }, "push" : {}, @@ -109,33 +108,33 @@ }, "icons" : { "android" : { - "hdpi" : "static/logo.png", - "xhdpi" : "static/logo.png", - "xxhdpi" : "static/logo.png", - "xxxhdpi" : "static/logo.png" + "hdpi" : "unpackage/res/icons/72x72.png", + "xhdpi" : "unpackage/res/icons/96x96.png", + "xxhdpi" : "unpackage/res/icons/144x144.png", + "xxxhdpi" : "unpackage/res/icons/192x192.png" }, "ios" : { - "appstore" : "static/logo.png", + "appstore" : "unpackage/res/icons/1024x1024.png", "ipad" : { - "app" : "static/logo.png", - "app@2x" : "static/logo.png", - "notification" : "static/logo.png", - "notification@2x" : "static/logo.png", - "proapp@2x" : "static/logo.png", - "settings" : "static/logo.png", - "settings@2x" : "static/logo.png", - "spotlight" : "static/logo.png", - "spotlight@2x" : "static/logo.png" + "app" : "unpackage/res/icons/76x76.png", + "app@2x" : "unpackage/res/icons/152x152.png", + "notification" : "unpackage/res/icons/20x20.png", + "notification@2x" : "unpackage/res/icons/40x40.png", + "proapp@2x" : "unpackage/res/icons/167x167.png", + "settings" : "unpackage/res/icons/29x29.png", + "settings@2x" : "unpackage/res/icons/58x58.png", + "spotlight" : "unpackage/res/icons/40x40.png", + "spotlight@2x" : "unpackage/res/icons/80x80.png" }, "iphone" : { - "app@2x" : "static/logo.png", - "app@3x" : "static/logo.png", - "notification@2x" : "static/logo.png", - "notification@3x" : "static/logo.png", - "settings@2x" : "static/logo.png", - "settings@3x" : "static/logo.png", - "spotlight@2x" : "static/logo.png", - "spotlight@3x" : "static/logo.png" + "app@2x" : "unpackage/res/icons/120x120.png", + "app@3x" : "unpackage/res/icons/180x180.png", + "notification@2x" : "unpackage/res/icons/40x40.png", + "notification@3x" : "unpackage/res/icons/60x60.png", + "settings@2x" : "unpackage/res/icons/58x58.png", + "settings@3x" : "unpackage/res/icons/87x87.png", + "spotlight@2x" : "unpackage/res/icons/80x80.png", + "spotlight@3x" : "unpackage/res/icons/120x120.png" } } }, diff --git a/my/order/revenueDetails.vue b/my/order/revenueDetails.vue index 5ad7534..2947de6 100644 --- a/my/order/revenueDetails.vue +++ b/my/order/revenueDetails.vue @@ -276,16 +276,18 @@ 服务完成 确认接单 - 拒单申请 联系客服 + 联系客户 @@ -319,7 +321,7 @@ - + @@ -373,7 +375,7 @@ - 拒绝申请原因 + 拒单申请原因 @@ -665,7 +667,7 @@ toggle(type,order) {// 弹出框 this.type = type // open 方法传入参数 等同在 uni-popup 组件上绑定 type属性 - this.$refs.popup.open(type); + this.$refs.popupW.open(type); this.$Request.getT('/app/artificer/getPingjiaTagList').then(res => { if (res.code == 0) { this.fuwuBtn=res.data; @@ -1393,7 +1395,7 @@ closePopup(type){// 关闭弹出框 this.type = type - this.$refs.popup.close(type); + this.$refs.popupW.close(type); }, } diff --git a/my/wallet/mymoneydetail.vue b/my/wallet/mymoneydetail.vue index 7508098..6bf7a63 100644 --- a/my/wallet/mymoneydetail.vue +++ b/my/wallet/mymoneydetail.vue @@ -8,11 +8,11 @@ 提现 --> - {{item.title}} + {{item.title}} - {{item.content}} - 创建时间:{{item.createTime}} + {{item.content}} + 下单时间:{{item.createTime}} +{{item.money}}元 -{{item.money}}元 @@ -94,7 +94,7 @@ diff --git a/pages/order/index.vue b/pages/order/index.vue index 0f160be..59e3dc0 100644 --- a/pages/order/index.vue +++ b/pages/order/index.vue @@ -129,7 +129,7 @@ 开始服务 转待补单 + @click="goChat" v-if="item.status == 8">转待补单 服务完成 diff --git a/unpackage/res/icons/1024x1024.png b/unpackage/res/icons/1024x1024.png new file mode 100644 index 0000000..4d42881 Binary files /dev/null and b/unpackage/res/icons/1024x1024.png differ diff --git a/unpackage/res/icons/120x120.png b/unpackage/res/icons/120x120.png new file mode 100644 index 0000000..b6b016c Binary files /dev/null and b/unpackage/res/icons/120x120.png differ diff --git a/unpackage/res/icons/144x144.png b/unpackage/res/icons/144x144.png new file mode 100644 index 0000000..351b42d Binary files /dev/null and b/unpackage/res/icons/144x144.png differ diff --git a/unpackage/res/icons/152x152.png b/unpackage/res/icons/152x152.png new file mode 100644 index 0000000..4c65e81 Binary files /dev/null and b/unpackage/res/icons/152x152.png differ diff --git a/unpackage/res/icons/167x167.png b/unpackage/res/icons/167x167.png new file mode 100644 index 0000000..325f5d2 Binary files /dev/null and b/unpackage/res/icons/167x167.png differ diff --git a/unpackage/res/icons/180x180.png b/unpackage/res/icons/180x180.png new file mode 100644 index 0000000..fa4499e Binary files /dev/null and b/unpackage/res/icons/180x180.png differ diff --git a/unpackage/res/icons/192x192.png b/unpackage/res/icons/192x192.png new file mode 100644 index 0000000..2b9fb61 Binary files /dev/null and b/unpackage/res/icons/192x192.png differ diff --git a/unpackage/res/icons/20x20.png b/unpackage/res/icons/20x20.png new file mode 100644 index 0000000..ccfbd92 Binary files /dev/null and b/unpackage/res/icons/20x20.png differ diff --git a/unpackage/res/icons/29x29.png b/unpackage/res/icons/29x29.png new file mode 100644 index 0000000..a112ab9 Binary files /dev/null and b/unpackage/res/icons/29x29.png differ diff --git a/unpackage/res/icons/40x40.png b/unpackage/res/icons/40x40.png new file mode 100644 index 0000000..9af5b44 Binary files /dev/null and b/unpackage/res/icons/40x40.png differ diff --git a/unpackage/res/icons/58x58.png b/unpackage/res/icons/58x58.png new file mode 100644 index 0000000..f08f356 Binary files /dev/null and b/unpackage/res/icons/58x58.png differ diff --git a/unpackage/res/icons/60x60.png b/unpackage/res/icons/60x60.png new file mode 100644 index 0000000..132dc69 Binary files /dev/null and b/unpackage/res/icons/60x60.png differ diff --git a/unpackage/res/icons/72x72.png b/unpackage/res/icons/72x72.png new file mode 100644 index 0000000..6a7a40e Binary files /dev/null and b/unpackage/res/icons/72x72.png differ diff --git a/unpackage/res/icons/76x76.png b/unpackage/res/icons/76x76.png new file mode 100644 index 0000000..d675529 Binary files /dev/null and b/unpackage/res/icons/76x76.png differ diff --git a/unpackage/res/icons/80x80.png b/unpackage/res/icons/80x80.png new file mode 100644 index 0000000..753fe49 Binary files /dev/null and b/unpackage/res/icons/80x80.png differ diff --git a/unpackage/res/icons/87x87.png b/unpackage/res/icons/87x87.png new file mode 100644 index 0000000..4bd0aaf Binary files /dev/null and b/unpackage/res/icons/87x87.png differ diff --git a/unpackage/res/icons/96x96.png b/unpackage/res/icons/96x96.png new file mode 100644 index 0000000..b1739dd Binary files /dev/null and b/unpackage/res/icons/96x96.png differ diff --git a/unpackage/res/icons/icon.png b/unpackage/res/icons/icon.png new file mode 100644 index 0000000..b21daab Binary files /dev/null and b/unpackage/res/icons/icon.png differ