diff --git a/apis/interfaces/order.js b/apis/interfaces/order.js
index 70da03d..928b656 100644
--- a/apis/interfaces/order.js
+++ b/apis/interfaces/order.js
@@ -134,6 +134,14 @@ const getSchemes = id => {
})
}
+// 退款单列表
+const refunds = data => {
+ return request({
+ url: 'app/refunds',
+ data
+ })
+}
+
// 支付订单
export {
lists,
@@ -151,5 +159,6 @@ export {
ordersEditorders,
orderSign,
getOrderSignStatus,
- getSchemes
+ getSchemes,
+ refunds
}
diff --git a/apis/interfaces/user.js b/apis/interfaces/user.js
index 262c44d..03e66fd 100644
--- a/apis/interfaces/user.js
+++ b/apis/interfaces/user.js
@@ -100,6 +100,16 @@ const userInfoBank = id => {
})
}
+// 获取省市区
+const getRegion = id => {
+ return request({
+ url : 'region',
+ data : {
+ parent_id: id || ''
+ }
+ })
+}
+
export {
relations,
code,
@@ -112,5 +122,6 @@ export {
eSigns,
userInfoBase,
userInfoBanks,
- userInfoBank
+ userInfoBank,
+ getRegion
}
diff --git a/manifest.json b/manifest.json
index 5626432..b36bb41 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
"name" : "抖火",
"appid" : "__UNI__C305C03",
"description" : "",
- "versionName" : "1.0.5",
+ "versionName" : "1.0.6",
"versionCode" : "100",
"transformPx" : false,
/* 5+App特有相关 */
@@ -24,7 +24,8 @@
/* 模块配置 */
"modules" : {
"Barcode" : {},
- "Camera" : {}
+ "Camera" : {},
+ "Share" : {}
},
/* 应用发布信息 */
"distribute" : {
@@ -56,7 +57,13 @@
},
/* SDK配置 */
"sdkConfigs" : {
- "ad" : {}
+ "ad" : {},
+ "share" : {
+ "weixin" : {
+ "appid" : "wx9ca2a763085ab4b6",
+ "UniversalLinks" : ""
+ }
+ }
},
"icons" : {
"android" : {
diff --git a/pages/account/cash.vue b/pages/account/cash.vue
index 271517b..8e1e584 100644
--- a/pages/account/cash.vue
+++ b/pages/account/cash.vue
@@ -88,13 +88,14 @@
// 获取列表
getLog(){
cash({
- day : this.type,
- type: this.dayType,
+ day : this.dayType,
+ type: this.type,
page: this.page.current
}).then(res => {
let { total, lists } = res;
let atList = lists.page.current == 1 ? [] : this.list
this.list = atList.concat(lists.data)
+ this.total = total
this.page = lists.page
this.pagesShow = false
}).catch(err => {
diff --git a/pages/college/answer.vue b/pages/college/answer.vue
index 0c85a4f..f5722ff 100644
--- a/pages/college/answer.vue
+++ b/pages/college/answer.vue
@@ -101,7 +101,7 @@
答题卡
-
+
diff --git a/pages/user/certification.vue b/pages/user/certification.vue
index ccd7279..b7dcbd4 100644
--- a/pages/user/certification.vue
+++ b/pages/user/certification.vue
@@ -1,20 +1,37 @@
-
+
- 请拍摄并上传你的身份证照片
-
-
-
-
+
+ 请拍摄并上传你的身份证照片
+
+
+
+
+
+ 拍摄正面
+
+
+
+
+
+ 拍摄反面
- 拍摄正面
-
-
-
-
- 拍摄反面
+
+
+
+
+
+
+ {{provinces[provincesVal].name}}
+
+
+
+
+
+ {{citys[citysVal].name}}
+
@@ -33,6 +50,14 @@
+
+
+
+
+ {{province}} {{city}}
+
+
+
@@ -41,7 +66,7 @@
@@ -102,23 +132,24 @@
.block {
text-align: center;
- margin-bottom: 30rpx;
-
+ margin-bottom: 30rpx;
+ width: 100%;
.qrcode {
display: inline-block;
border: solid 2rpx #ECC997;
background: #0E2660;
border-radius: 20rpx;
padding: 30rpx;
- .qrcode-src {
- width: 300rpx;
- height: 300rpx;
- }
+ .qrcode-src{
+ width: 150px;
+ height: 150px;
+ }
.qrcode-text {
text-align: center;
color: #FFF5C6;
line-height: 50rpx;
- padding-top: 30rpx;
+ padding-top: 30rpx;
+ font-size: 30rpx;
}
}
.btn {
diff --git a/pages/user/eSign.vue b/pages/user/eSign.vue
index 5054e85..53df466 100644
--- a/pages/user/eSign.vue
+++ b/pages/user/eSign.vue
@@ -19,7 +19,7 @@
let { data } = e.detail
data.map(val => {
if(val.type === 'back'){
- uni.navigateBack()
+ this.$Route.back()
return
}
})
diff --git a/pages/user/team.vue b/pages/user/team.vue
index b38f300..61f5ff0 100644
--- a/pages/user/team.vue
+++ b/pages/user/team.vue
@@ -2,7 +2,7 @@
@@ -44,6 +44,7 @@
relations({
larer: 1
}).then(res => {
+ console.log(res)
let { users, count } = res;
this.users = users.data
this.count = count
diff --git a/pages/work/refundOrder.vue b/pages/work/refundOrder.vue
index 31c9ee3..2b397c0 100644
--- a/pages/work/refundOrder.vue
+++ b/pages/work/refundOrder.vue
@@ -52,7 +52,7 @@