diff --git a/pages/doctor-my-case/doctor-my-case.json b/pages/doctor-my-case/doctor-my-case.json
index 53e82372e9e4268e61c18fb4de9c65755ea49d33..0987d377bf45e04ee4b7812ab4bcdb8586ffbcc8 100644
--- a/pages/doctor-my-case/doctor-my-case.json
+++ b/pages/doctor-my-case/doctor-my-case.json
@@ -1,3 +1,3 @@
{
- "navigationBarTitleText": "整容案例"
+ "navigationBarTitleText": "全部案例"
}
\ No newline at end of file
diff --git a/pages/user-doctor-details/user-doctor-details.wxml b/pages/user-doctor-details/user-doctor-details.wxml
index b8f38f0838864e62c9005b4034f7da0b01f101f1..55351d6a47a55670f8fa4d10fa317cbcdb4f9061 100644
--- a/pages/user-doctor-details/user-doctor-details.wxml
+++ b/pages/user-doctor-details/user-doctor-details.wxml
@@ -5,7 +5,7 @@
{{info.doctorInfo.doctorName}}
- {{info.doctorInfo.position?info.doctorInfo.position:'未知1'}} {{info.doctorInfo.companty?info.doctorInfo.companty:'未知'}}
+ {{info.doctorInfo.position?info.doctorInfo.position:'请填写'}} {{info.doctorInfo.companty?info.doctorInfo.companty:'请填写'}}
diff --git a/pages/user-my-order-list-ping/user-my-order-list-ping.js b/pages/user-my-order-list-ping/user-my-order-list-ping.js
index 295f336d489e91bdae45e470ff3e059e150b2fc2..a0dc3bc898e78487c55566f4c256d43b2b17ac55 100644
--- a/pages/user-my-order-list-ping/user-my-order-list-ping.js
+++ b/pages/user-my-order-list-ping/user-my-order-list-ping.js
@@ -13,7 +13,7 @@ Page({
orderType: "",//订单类型2医美1术前术后
options: "",
},
-
+
/**
* 生命周期函数--监听页面加载
*/
diff --git a/pages/user-my-order-list-ping/user-my-order-list-ping.wxml b/pages/user-my-order-list-ping/user-my-order-list-ping.wxml
index 8e330176394934610402a40a7360bd53527d1764..de502e9b8e8f8b9f292e5e0f39724c0b518c2e66 100644
--- a/pages/user-my-order-list-ping/user-my-order-list-ping.wxml
+++ b/pages/user-my-order-list-ping/user-my-order-list-ping.wxml
@@ -1,35 +1,35 @@
-
-
-
- {{orderType == 1?'术前术后用品':'医美产品'}}
-
-
-
-
-
- {{item.name}}
-
- ￥{{item.price}}
-
-
+
+
+
+ {{orderType == 1?'术前术后用品':'医美产品'}}
+
+
+
+
+
+ {{item.name}}
+
+ ￥{{item.price}}
+
+
+
+
+
+
+
+
+
- 评价
-
+ 评价
+
-
- 已评价
-
+ 已评价
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/user-my-order-list/user-my-order-list.js b/pages/user-my-order-list/user-my-order-list.js
index b1860ce926e59a0af170c35838f7cafbe1e05ba1..cda629cf2429ad2e87c651fa68fcc808879db583 100644
--- a/pages/user-my-order-list/user-my-order-list.js
+++ b/pages/user-my-order-list/user-my-order-list.js
@@ -1,7 +1,7 @@
// pages/user-my-order-list/user-my-order-list.js
var app = getApp();
Page({
-
+
/**
* 页面的初始数据
*/
diff --git a/pages/user-my-order-list/user-my-order-list.wxml b/pages/user-my-order-list/user-my-order-list.wxml
index 7e318399b9e1e9a0e303e481c9db56564e5afc71..8e74e5a39530b7cc0826bd2478889a23dd18072c 100644
--- a/pages/user-my-order-list/user-my-order-list.wxml
+++ b/pages/user-my-order-list/user-my-order-list.wxml
@@ -14,7 +14,7 @@
-
+
diff --git a/pages/user-my-order-refund/user-my-order-refund.js b/pages/user-my-order-refund/user-my-order-refund.js
index b000fa320525580d85addfcfbaaf40f1f42f719f..737c837cd072b6dfff2813aa1763f621722015ca 100644
--- a/pages/user-my-order-refund/user-my-order-refund.js
+++ b/pages/user-my-order-refund/user-my-order-refund.js
@@ -9,9 +9,9 @@ Page({
orderNum: "", //订单号
orderId: "", //申请售后
content: "", //内容
- currentTab:1,//默认对号
- color:1,//默认然色
- name:'',//退换货原因
+ currentTab: 1, //默认对号
+ color: 1, //默认然色
+ name: '', //退换货原因
},
/**
@@ -26,7 +26,7 @@ Page({
orderNum: orderNum,
orderId: orderId,
})
-
+
},
// 保存信息
@@ -44,39 +44,43 @@ Page({
apply: function(e) {
var that = this;
var orderType = that.data.orderId;
-
- wx.request({
- url: app.globalData.baseUrl + 'shopp/goodsOrderApi/submitExchangeGoods', //仅为示例，并非真实的接口地址
- data: {
- id: that.data.orderId,//术前术后的
- describe: that.data.content,//问题描述
- problem: that.data.name,//退换原因
- type:that.data.color,//1退货 2换货
- },
- method: 'POST',
- header: {
- 'sign': app.globalData.sign,
- 'token': app.globalData.token,
- 'content-type': 'application/x-www-form-urlencoded;charset=utf-8', // 默认值
- },
- success(res) {
- console.log("申请售后", res)
- wx.switchTab({
- url: '../user-my/user-my',
- })
- wx.showToast({
- title: '申请成功，等待审核',
- icon: 'success',
- duration: 2000,
-
- })
- }
- })
-
-
+ console.log("--id----", that.data.orderId)
+ console.log("---内容---", that.data.content)
+ console.log("--退款原因----", that.data.name)
+ console.log("---退1换2---", that.data.color)
+
+ wx.request({
+ url: app.globalData.baseUrl + 'shopp/goodsOrderApi/submitExchangeGoods', //仅为示例，并非真实的接口地址
+ data: {
+ id: that.data.orderId, //术前术后的
+ describe: that.data.content, //问题描述
+ problem: that.data.name, //退换原因
+ type: that.data.color, //1退货 2换货
+ },
+ method: 'POST',
+ header: {
+ 'sign': app.globalData.sign,
+ 'token': app.globalData.token,
+ 'content-type': 'application/x-www-form-urlencoded;charset=utf-8', // 默认值
+ },
+ success(res) {
+ console.log("申请售后", res)
+ wx.switchTab({
+ url: '../user-my/user-my',
+ })
+ wx.showToast({
+ title: '申请成功，等待审核',
+ icon: 'success',
+ duration: 2000,
+
+ })
+ }
+ })
+
+
},
//默认然色
- cickTab:function(e){
+ cickTab: function(e) {
console.log("-然色-", e)
var that = this;
@@ -89,12 +93,12 @@ Page({
}
},
//对号切换
- clickTab:function(e){
- console.log("-对号-",e)
+ clickTab: function(e) {
+ console.log("-对号-", e)
var that = this;
if (this.data.currentTab === e.target.dataset.current) {
-
+
} else {
that.setData({
currentTab: e.target.dataset.current,
@@ -108,7 +112,7 @@ Page({
onReady: function() {
},
-
+
/**
* 生命周期函数--监听页面显示
*/
diff --git a/pages/user-my-order-refund/user-my-order-refund.wxml b/pages/user-my-order-refund/user-my-order-refund.wxml
index 40b48d115fdbd26e38bd3e2c0be68852c11cc2ee..9693589a1f36b241e7cd835ccd65e7281f79c2e7 100644
--- a/pages/user-my-order-refund/user-my-order-refund.wxml
+++ b/pages/user-my-order-refund/user-my-order-refund.wxml
@@ -13,7 +13,7 @@
下错订单
个人原因
-
+
问题描述
diff --git a/pages/user-my-recharge-record/user-my-recharge-record.js b/pages/user-my-recharge-record/user-my-recharge-record.js
index bcafd02b91fb9e2093c294b5e4e9a2842871e2fe..ff3a8c62ea750390f44786c046f5af43c9517cac 100644
--- a/pages/user-my-recharge-record/user-my-recharge-record.js
+++ b/pages/user-my-recharge-record/user-my-recharge-record.js
@@ -15,6 +15,7 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
+
this.select();//查询充值记录
},
//查询充值记录
diff --git a/pages/user-shop-goods-order-2/user-shop-goods-order-2.js b/pages/user-shop-goods-order-2/user-shop-goods-order-2.js
index f4c03be4006a8167f0a74ece4e2b274e8f278e1d..d0f07d10a1b954ba40eb7527b38221bd32391a30 100644
--- a/pages/user-shop-goods-order-2/user-shop-goods-order-2.js
+++ b/pages/user-shop-goods-order-2/user-shop-goods-order-2.js
@@ -27,22 +27,12 @@ Page({
url: '../user-shop-goods/user-shop-goods',
})
}
- },
-
+ },
+
returnorder: function() {
- // var that = this;
- // var roleType = wx.getStorageSync("roleType");
- // if (roleType == 1) {
- // wx.navigateTo({
- // url: '../user-my-order-list/user-my-order-list',
- // })
- // } else if (roleType == 2) {
- // wx.navigateTo({
- // url: '../user-my-order-list/user-my-order-list',
- // })
- // }
- wx.switchTab({
- url: '../user-my/user-my',
+
+ wx.navigateTo({
+ url: '../user-my-order-list/user-my-order-list?type=2',
})
},
/**
diff --git a/pages/user-shop-goods-order-2/user-shop-goods-order-2.wxml b/pages/user-shop-goods-order-2/user-shop-goods-order-2.wxml
index b708664b06a43b1dce948ec74d186fb2f605f6f7..908d5ff65f5258a6b6512ee6a12f610dc239e34b 100644
--- a/pages/user-shop-goods-order-2/user-shop-goods-order-2.wxml
+++ b/pages/user-shop-goods-order-2/user-shop-goods-order-2.wxml
@@ -6,5 +6,5 @@
返回商城
- 查看订单状态
+ 查看订单
\ No newline at end of file
diff --git a/pages/user-shop-goods-order-pay/user-shop-goods-order-pay.js b/pages/user-shop-goods-order-pay/user-shop-goods-order-pay.js
index ad0310b4ca2922c9c9d549bcb0afe1e28bf1e85f..ea5b67e44c2a244a9ac4a98891ce01b1fd0e128a 100644
--- a/pages/user-shop-goods-order-pay/user-shop-goods-order-pay.js
+++ b/pages/user-shop-goods-order-pay/user-shop-goods-order-pay.js
@@ -6,9 +6,9 @@ Page({
*/
data: {
orderid: '',
- payType: '', // 支付类型；1=商品订单支付；2=课程支付；3=充值支付
+ payType: '', // 支付类型；1=商品订单支付；2=课程支付；3=充值支付
totalPrice: '',
- orderType:''
+ orderType: ''
},
/**
@@ -16,59 +16,68 @@ Page({
*/
onLoad: function(options) {
this.setData({
- orderid: options.res,//订单id
- payType: options.payType,//支付类型；1=商品订单支付；2=课程支付；3=充值支付
- totalPrice: options.totalMoney,//支付金额
- orderType: options.orderType,//支付类型
+ orderid: options.res, //订单id
+ payType: options.payType, //支付类型；1=商品订单支付；2=课程支付；3=充值支付
+ totalPrice: options.totalMoney, //支付金额
+ orderType: options.orderType, //支付类型
});
},
- pay: function () {
+ pay: function() {
+ var that = this;
var orderType = this.data.orderType;
- var orderId = this.data.orderid;
+ var orderId = this.data.orderid;
const param = {
orderid: this.data.orderid,
// payType: 1,
payType: this.data.payType,
}
app.request({
- url: "shopp/payment/requestPayment",
- data: param,
- success: function(res) {
- wx.removeStorageSync('invoice');
- wx.requestPayment({
- 'timeStamp': res.data.timeStamp,
- 'nonceStr': res.data.nonceStr,
- 'package': res.data.package,
- 'signType': res.data.signType,
- 'paySign': res.data.paySign,
- 'success': function(res) {
- if (res.errMsg == "requestPayment:ok") {
- wx.navigateTo({
- url: '../user-shop-goods-order-2/user-shop-goods-order-2',
- })
- wx.request({
- url: app.globalData.baseUrl + 'doctor/memberTaskApi/addBeauty',
- data: {
- userId: wx.getStorageSync('userid'),
- type: 4,
- orderType: orderType,
- orderId: orderId
- },
- header: {
- 'sign': app.globalData.sign,
- 'token': app.globalData.token,
- 'content-type': 'application/x-www-form-urlencoded;charset=utf-8',
- },
- method: 'POST',
- success(res) {
- console.log('给美丽币给美丽值', res);
+ url: "shopp/payment/requestPayment",
+ data: param,
+ success: function(res) {
+ wx.removeStorageSync('invoice');
+ wx.requestPayment({
+ 'timeStamp': res.data.timeStamp,
+ 'nonceStr': res.data.nonceStr,
+ 'package': res.data.package,
+ 'signType': res.data.signType,
+ 'paySign': res.data.paySign,
+ 'success': function(res) {
+ if (that.data.payType == 3) {
+ wx.navigateTo({
+ url: '../user-my-recharge-record/user-my-recharge-record',
+ })
+ } else {
+
+ if (res.errMsg == "requestPayment:ok") {
+ wx.navigateTo({
+ url: '../user-shop-goods-order-2/user-shop-goods-order-2',
+ })
+ wx.request({
+ url: app.globalData.baseUrl + 'doctor/memberTaskApi/addBeauty',
+ data: {
+ userId: wx.getStorageSync('userid'),
+ type: 4,
+ orderType: orderType,
+ orderId: orderId
+ },
+ header: {
+ 'sign': app.globalData.sign,
+ 'token': app.globalData.token,
+ 'content-type': 'application/x-www-form-urlencoded;charset=utf-8',
+ },
+ method: 'POST',
+ success(res) {
+ console.log('给美丽币给美丽值', res);
+ }
+ })
+ }
}
- })
- }
- },
- 'fail': function(res) {},
- 'complete': function(res) {}
- })
+ },
+ 'fail': function(res) {},
+ 'complete': function(res) {},
+
+ })
},
fail: function(res) {
@@ -76,5 +85,5 @@ Page({
}
});
- }
+}
})
\ No newline at end of file