From d7ec5835ba9cfcc918ed08c46ecb9a9c207a66a4 Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Fri, 6 Jan 2023 17:46:31 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Utils/Api.js | 4 ++
pages.json | 28 ++++-----
pages/index/addService/addService.vue | 2 +-
pages/index/doorManage/doorManage.vue | 26 +++++++-
.../merchant-details/merchant-details.vue | 4 +-
.../merchant-management.vue | 2 +-
pages/index/mineService/mineService.vue | 25 ++++----
.../serviceOrderDetails.vue | 60 +++++++++++++++++--
pages/tabBar/home/home.vue | 11 ++--
pages/welcome/welcome.vue | 17 ++++--
unpackage/dist/build/h5/index.html | 2 +-
11 files changed, 136 insertions(+), 45 deletions(-)
diff --git a/Utils/Api.js b/Utils/Api.js
index 94d6da3..26279a7 100644
--- a/Utils/Api.js
+++ b/Utils/Api.js
@@ -129,6 +129,10 @@ export const replace = params => {
export const orderRefund = params => {
return POST('POST', `${base}/deviceOrder/orderRefund`, params).then(res => res.data);
}
+//订单分配退款
+export const deviceRefund = params => {
+ return POST('POST', `${base}/deviceOrder/deviceRefund`, params).then(res => res.data);
+}
// ----------------
diff --git a/pages.json b/pages.json
index e1eadb9..c560622 100644
--- a/pages.json
+++ b/pages.json
@@ -1,18 +1,6 @@
{
"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
- {
- "path": "pages/login/login",
- "style": {
- "navigationBarTextStyle": "white",
- "navigationBarTitleText": "登录",
- "onReachBottomDistance": 50,
- "app-plus": {
- "titleNView": false, //禁用原生导航栏
- "softinputNavBar": "none"
- }
- }
-
- }, {
+ {
"path" : "pages/welcome/welcome",
"style" :
{
@@ -24,7 +12,19 @@
}
}
- }, {
+ },{
+ "path": "pages/login/login",
+ "style": {
+ "navigationBarTextStyle": "white",
+ "navigationBarTitleText": "登录",
+ "onReachBottomDistance": 50,
+ "app-plus": {
+ "titleNView": false, //禁用原生导航栏
+ "softinputNavBar": "none"
+ }
+ }
+
+ }, {
"path": "pages/index/serviceApplicationList/serviceApplicationList",
"style": {
"navigationBarTextStyle": "white",
diff --git a/pages/index/addService/addService.vue b/pages/index/addService/addService.vue
index eaf1221..e901b1b 100644
--- a/pages/index/addService/addService.vue
+++ b/pages/index/addService/addService.vue
@@ -164,7 +164,7 @@
title: '支付中...'
})
jweixin.config({
- debug: true, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
+ // debug: true, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
appId: self.return_data.appId, // 必填，公众号的唯一标识
timestamp: self.return_data.timeStamp, // 必填，生成签名的时间戳
nonceStr: self.return_data.nonceStr, // 必填，生成签名的随机串
diff --git a/pages/index/doorManage/doorManage.vue b/pages/index/doorManage/doorManage.vue
index a2ab1dc..7416ff0 100644
--- a/pages/index/doorManage/doorManage.vue
+++ b/pages/index/doorManage/doorManage.vue
@@ -38,7 +38,12 @@
{{item.storeRegion.address}}
-
+
+
+
+
+
+
@@ -91,6 +96,12 @@
uni.navigateTo({
url: '../addStore/addStore'
})
+ },
+ //跳转设备列表
+ jumpMineDevice(item){
+ uni.navigateTo({
+ url:'/pages/index/mineService/mineService?id=5'+'&storeid='+item
+ })
}
}
}
@@ -135,5 +146,18 @@
bottom: 60rpx;
position: fixed;
right: 40rpx;
+ }
+
+ .btns {
+ width: 21%;
+ margin-left: 5%;
+ float: left;
+ height: 35px;
+ line-height: 35px;
+ background-color: #0083f5;
+ color: #FFFFFF;
+ font-weight: bold;
+ font-size: 12px;
+ padding: 0px;
}
diff --git a/pages/index/merchant-details/merchant-details.vue b/pages/index/merchant-details/merchant-details.vue
index 2a24dda..54c08e0 100644
--- a/pages/index/merchant-details/merchant-details.vue
+++ b/pages/index/merchant-details/merchant-details.vue
@@ -74,12 +74,12 @@
{{item.storeRegion.address}}
-
+
diff --git a/pages/index/merchant-management/merchant-management.vue b/pages/index/merchant-management/merchant-management.vue
index 2c47506..1c97a44 100644
--- a/pages/index/merchant-management/merchant-management.vue
+++ b/pages/index/merchant-management/merchant-management.vue
@@ -14,7 +14,7 @@
@click="jumpmerdes(item.id)">
-
+
{{item.regPhone}}
{{item.createTime | timeFormat('yyyy-mm-dd')}}
diff --git a/pages/index/mineService/mineService.vue b/pages/index/mineService/mineService.vue
index 631302a..394a827 100644
--- a/pages/index/mineService/mineService.vue
+++ b/pages/index/mineService/mineService.vue
@@ -28,7 +28,7 @@
设备类型: {{item.deviceType | toFilter()}}
-
+
@@ -47,7 +47,8 @@
orderNo: '', //订单号
buildStatus: false, //是否分配
deviceNo: '', // 设备编号
- assderid: '', //分配id
+ assderid: '', //分配id
+ storeid:'', //门店id
pageNum: 1,
pagesize: 10,
isLoadMore: false, //是否加载中
@@ -64,19 +65,20 @@
}
return codeName;
},
- },
- onReachBottom() { //上拉触底函数
- if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
- this.isLoadMore = true
- this.pageNum += 1
- this.getDeviceList()
- }
+ },
+ onReachBottom() { //上拉触底函数
+ if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
+ this.isLoadMore = true
+ this.pageNum += 1
+ this.getDeviceList()
+ }
},
onLoad(options) {
this.sourceId = options.id;
this.orderNo = options.orderNo;
+ this.storeid = options.storeid;
this.assderid = options.assderid;
- if (this.sourceId == 1) {
+ if (this.sourceId == 1 || this.sourceId == 5) {
this.buildStatus = true;
this.getDeviceList();
}
@@ -96,7 +98,8 @@
pageNum: this.pageNum,
pageSize: this.pagesize,
buildStatus: this.buildStatus,
- deviceNo: this.deviceNo
+ deviceNo: this.deviceNo,
+ storeId: this.storeid
}
getDeviceList(datas).then(res => {
if (res.return_code == '000000' && res.return_data.list != '') {
diff --git a/pages/index/serviceOrderDetails/serviceOrderDetails.vue b/pages/index/serviceOrderDetails/serviceOrderDetails.vue
index ceb697d..1f33934 100644
--- a/pages/index/serviceOrderDetails/serviceOrderDetails.vue
+++ b/pages/index/serviceOrderDetails/serviceOrderDetails.vue
@@ -59,19 +59,22 @@
{{ orderDetails.orderAssignList[0].orderType | toFilterDdevic()}}
-
-
+
+
+