diff --git a/app.js b/app.js index ad5553f1ebba0cd92c676eb1530753f5d27d8bb0..f6c5fc38c127017ba874f4243adb8a53cb33a700 100644 --- a/app.js +++ b/app.js @@ -197,7 +197,8 @@ App({ route1: [], //日记本图片返回路径 route2: [], //日记本图片返回路径 route3: [], //日记本图片返回路径 - headportrait: "servicegood/2018/12/thumbnail_54329f0e0ccc4444909cb45dcdf4ea5b.png", + // headportrait: "servicegood/2018/12/thumbnail_54329f0e0ccc4444909cb45dcdf4ea5b.png", + headportrait: "images/img_touxiang_yonghuduan.png", }, // fail 方法封装 requestFail: function(res) { diff --git a/pages/doctor-my-case-details/doctor-my-case-details.wxml b/pages/doctor-my-case-details/doctor-my-case-details.wxml index a1dae32d3789738578cbcae77ce9d13094e4f2b3..8b1ad998af2dddf8d626c9e0abfd8f8f6f302f67 100644 --- a/pages/doctor-my-case-details/doctor-my-case-details.wxml +++ b/pages/doctor-my-case-details/doctor-my-case-details.wxml @@ -60,7 +60,7 @@ - 全部评论({{casecommentinfo.length}}) + 全部评论({{caseinfo.talkNum?caseinfo.talkNum:0}}) diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 0197e3d3e8303bbab15bec2b0b80b70af5a05e1f..09dd94c4758fe26b78726fa9b7fe16be378bd9b0 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -6,7 +6,7 @@ - + {{videoadinfo.remark}} diff --git a/pages/user-diary-details/user-diary-details.wxml b/pages/user-diary-details/user-diary-details.wxml index bed6a0d80a995c0eb871009bfc55284d4f20677c..3a81e1f96910ad152589288e36f2e6d75fb173e7 100644 --- a/pages/user-diary-details/user-diary-details.wxml +++ b/pages/user-diary-details/user-diary-details.wxml @@ -133,16 +133,7 @@ {{item.userName}}: {{item.content}} - + diff --git a/pages/user-doctor-details/user-doctor-details.wxml b/pages/user-doctor-details/user-doctor-details.wxml index 55351d6a47a55670f8fa4d10fa317cbcdb4f9061..f9bfb8e849cf819c0fac19fbd8dee7223b6d8fbd 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:'请填写'}} {{info.doctorInfo.companty?info.doctorInfo.companty:'请填写'}} + {{info.doctorInfo.position?info.doctorInfo.position:'未知'}} {{info.doctorInfo.companty?info.doctorInfo.companty:'未知'}} diff --git a/pages/user-message/user-message.js b/pages/user-message/user-message.js index c400fec460622d2c57f81fd807494f915a844790..a52e2760260accbf98fba2d18fb77c073da24b9f 100644 --- a/pages/user-message/user-message.js +++ b/pages/user-message/user-message.js @@ -149,6 +149,34 @@ Page({ } }, + //互动跳转 + jopriji:function(e){ + console.log('---sha---', e.currentTarget.dataset) + var bookid = e.currentTarget.dataset.bookid; + var diaryid = e.currentTarget.dataset.diaryid; + var msgtype = e.currentTarget.dataset.msgtype; + if (bookid == null){ + console.log(1) + wx.navigateTo({ + url:"../doctor-my-case-details/doctor-my-case-details?id="+diaryid, + }) + }else{ + console.log(2) + wx.navigateTo({ + url:'../user-diary-details/user-diary-details?diaryId='+ diaryid + '&bookid=' + bookid , + }) + } + if (msgtype == 3) { + console.log(1) + wx.navigateTo({ + url: "../user-my-follow/user-my-follow", + }) + } else { + console.log(2) + + } + }, + //订单跳转 1是术前术后 2是医美 jop: function (e) { console.log("zhi3", e.currentTarget.dataset) diff --git a/pages/user-message/user-message.wxml b/pages/user-message/user-message.wxml index 88f6c22f952e87e092b17f831e0c61cb75244e6c..dbb0eb55af11979bc95571d48d724fdc0553b862 100644 --- a/pages/user-message/user-message.wxml +++ b/pages/user-message/user-message.wxml @@ -16,13 +16,15 @@ - + + {{item.userName}} {{item.content}} - + + {{item.sendTimeFormat}} diff --git a/pages/user-my-bag/user-my-bag.js b/pages/user-my-bag/user-my-bag.js index b4349be1dee1164832e597e42bd7cc91280f725b..c649325ea6596ab94a30a2b434fb82832b958e9f 100644 --- a/pages/user-my-bag/user-my-bag.js +++ b/pages/user-my-bag/user-my-bag.js @@ -85,7 +85,7 @@ Page({ * 生命周期函数--监听页面显示 */ onShow: function () { - + this.wallet(); }, /** diff --git a/pages/user-my-bag/user-my-bag.wxml b/pages/user-my-bag/user-my-bag.wxml index b534c0ba0c591568cb696502edb2bc3393bce938..5b332738f501f084c0a2f2d0a589f1ca52d10641 100644 --- a/pages/user-my-bag/user-my-bag.wxml +++ b/pages/user-my-bag/user-my-bag.wxml @@ -33,6 +33,6 @@ - + \ No newline at end of file diff --git a/pages/user-my-data/user-my-data.js b/pages/user-my-data/user-my-data.js index 0a89a90d16e0fbc0140ad4d1068d6f80df0753eb..ac03c7b29c30ea45498b68850703c976cf965bfa 100644 --- a/pages/user-my-data/user-my-data.js +++ b/pages/user-my-data/user-my-data.js @@ -144,7 +144,8 @@ Page({ console.log(e); var a = e.tempFilePaths[0]; wx.uploadFile({ - url: app.globalData.baseUrl + 'doctor/product/uploadFile', + // url: app.globalData.baseUrl + 'doctor/product/uploadFile', + url: app.globalData.baseUrl + 'doctor/member/uploadHead', filePath: a, name: "file", header: { @@ -313,7 +314,7 @@ Page({ city: userInfo.city, gender: userInfo.gender, }) - } + } }) this.zilia();//会员详情 }, diff --git a/pages/user-my-data/user-my-data.wxml b/pages/user-my-data/user-my-data.wxml index 03e4f9bb2be1c32d9bb8237b8cf5bfad3ae3a448..2ab826c9f0373d17af482273c864bd327b05837f 100644 --- a/pages/user-my-data/user-my-data.wxml +++ b/pages/user-my-data/user-my-data.wxml @@ -1,11 +1,12 @@ - + + - - + + diff --git a/pages/user-my-order-details-medical-3/user-my-order-details-medical-3.wxml b/pages/user-my-order-details-medical-3/user-my-order-details-medical-3.wxml index 3883dd5382dac4b53983f751d48e734cf17c3e6a..d88f3e450f997c1afed80e2c0c335cdc910b5bd0 100644 --- a/pages/user-my-order-details-medical-3/user-my-order-details-medical-3.wxml +++ b/pages/user-my-order-details-medical-3/user-my-order-details-medical-3.wxml @@ -23,5 +23,5 @@ 时间：{{time}}：{{richeng.timeIntervalName}} - + diff --git a/pages/user-my-recharge-record/user-my-recharge-record.wxml b/pages/user-my-recharge-record/user-my-recharge-record.wxml index fb2705596aa122688ded76701a494872e2719dea..43244b29f8901a67c46faee2886018f8295d2a90 100644 --- a/pages/user-my-recharge-record/user-my-recharge-record.wxml +++ b/pages/user-my-recharge-record/user-my-recharge-record.wxml @@ -4,6 +4,12 @@ 充值{{item.orderMoney}}元 {{item.createTimeFormat}} + + 充值成功 + + + 充值失败 + 商品订单支付 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 ea5b67e44c2a244a9ac4a98891ce01b1fd0e128a..d65c1952b4db67caf06e39925d16beec7e9cf9ec 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 @@ -19,8 +19,10 @@ Page({ orderid: options.res, //订单id payType: options.payType, //支付类型；1=商品订单支付；2=课程支付；3=充值支付 totalPrice: options.totalMoney, //支付金额 - orderType: options.orderType, //支付类型 + orderType: options.orderType, //支付类型 + }); + }, pay: function() { var that = this; @@ -28,7 +30,6 @@ Page({ var orderId = this.data.orderid; const param = { orderid: this.data.orderid, - // payType: 1, payType: this.data.payType, } app.request({ diff --git a/pages/xz/xz.wxml b/pages/xz/xz.wxml index 5906d7bd4f95f3df5cb8766a22888f7d288a0831..8ffd101b53a5610357cab347e720f0329c67b1b7 100644 --- a/pages/xz/xz.wxml +++ b/pages/xz/xz.wxml @@ -4,7 +4,7 @@ 我是求美者 - + 我是医生