diff --git a/.gitignore b/.gitignore index 74671de..c3f90ee 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ node_modules src/images/.svn miniprogram_npm +.idea diff --git a/src/images/icon-file.png b/src/images/icon-file.png new file mode 100644 index 0000000..6b4a6c3 Binary files /dev/null and b/src/images/icon-file.png differ diff --git a/src/images/icon-file1.png b/src/images/icon-file1.png new file mode 100644 index 0000000..b092f87 Binary files /dev/null and b/src/images/icon-file1.png differ diff --git a/src/images/icon-file2.png b/src/images/icon-file2.png new file mode 100644 index 0000000..802cec7 Binary files /dev/null and b/src/images/icon-file2.png differ diff --git a/src/images/icon-file3.png b/src/images/icon-file3.png new file mode 100644 index 0000000..ec85fbb Binary files /dev/null and b/src/images/icon-file3.png differ diff --git a/src/images/login-title.png b/src/images/login-title.png index ef43f24..71fadeb 100644 Binary files a/src/images/login-title.png and b/src/images/login-title.png differ diff --git a/src/images/set-info-bg.png b/src/images/set-info-bg.png index 020908d..262f128 100644 Binary files a/src/images/set-info-bg.png and b/src/images/set-info-bg.png differ diff --git a/src/images/set-info-result-title.png b/src/images/set-info-result-title.png index 7e61bdd..f7ca2ce 100644 Binary files a/src/images/set-info-result-title.png and b/src/images/set-info-result-title.png differ diff --git a/src/images/start-title.png b/src/images/start-title.png index 4f4be6c..1763b38 100644 Binary files a/src/images/start-title.png and b/src/images/start-title.png differ diff --git a/src/miniprogram_npm/dayjs/index.js b/src/miniprogram_npm/dayjs/index.js index c105e8e..b266aa8 100644 --- a/src/miniprogram_npm/dayjs/index.js +++ b/src/miniprogram_npm/dayjs/index.js @@ -4,10 +4,10 @@ var __DEFINE__ = function(modId, func, req) { var m = { exports: {}, _tempexport var __REQUIRE__ = function(modId, source) { if(!__MODS__[modId]) return require(source); if(!__MODS__[modId].status) { var m = __MODS__[modId].m; m._exports = m._tempexports; var desp = Object.getOwnPropertyDescriptor(m, "exports"); if (desp && desp.configurable) Object.defineProperty(m, "exports", { set: function (val) { if(typeof val === "object" && val !== m._exports) { m._exports.__proto__ = val.__proto__; Object.keys(val).forEach(function (k) { m._exports[k] = val[k]; }); } m._tempexports = val }, get: function () { return m._tempexports; } }); __MODS__[modId].status = 1; __MODS__[modId].func(__MODS__[modId].req, m, m.exports); } return __MODS__[modId].m.exports; }; var __REQUIRE_WILDCARD__ = function(obj) { if(obj && obj.__esModule) { return obj; } else { var newObj = {}; if(obj != null) { for(var k in obj) { if (Object.prototype.hasOwnProperty.call(obj, k)) newObj[k] = obj[k]; } } newObj.default = obj; return newObj; } }; var __REQUIRE_DEFAULT__ = function(obj) { return obj && obj.__esModule ? obj.default : obj; }; -__DEFINE__(1729047589933, function(require, module, exports) { +__DEFINE__(1730512435827, function(require, module, exports) { !function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(t="undefined"!=typeof globalThis?globalThis:t||self).dayjs=e()}(this,(function(){var t=1e3,e=6e4,n=36e5,r="millisecond",i="second",s="minute",u="hour",a="day",o="week",c="month",f="quarter",h="year",d="date",l="Invalid Date",$=/^(\d{4})[-/]?(\d{1,2})?[-/]?(\d{0,2})[Tt\s]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?[.:]?(\d+)?$/,y=/\[([^\]]+)]|Y{1,4}|M{1,4}|D{1,2}|d{1,4}|H{1,2}|h{1,2}|a|A|m{1,2}|s{1,2}|Z{1,2}|SSS/g,M={name:"en",weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),ordinal:function(t){var e=["th","st","nd","rd"],n=t%100;return"["+t+(e[(n-20)%10]||e[n]||e[0])+"]"}},m=function(t,e,n){var r=String(t);return!r||r.length>=e?t:""+Array(e+1-r.length).join(n)+t},v={s:m,z:function(t){var e=-t.utcOffset(),n=Math.abs(e),r=Math.floor(n/60),i=n%60;return(e<=0?"+":"-")+m(r,2,"0")+":"+m(i,2,"0")},m:function t(e,n){if(e.date()1)return t(u[0])}else{var a=e.name;D[a]=e,i=a}return!r&&i&&(g=i),i||!r&&g},O=function(t,e){if(S(t))return t.clone();var n="object"==typeof e?e:{};return n.date=t,n.args=arguments,new _(n)},b=v;b.l=w,b.i=S,b.w=function(t,e){return O(t,{locale:e.$L,utc:e.$u,x:e.$x,$offset:e.$offset})};var _=function(){function M(t){this.$L=w(t.locale,null,!0),this.parse(t),this.$x=this.$x||t.x||{},this[p]=!0}var m=M.prototype;return m.parse=function(t){this.$d=function(t){var e=t.date,n=t.utc;if(null===e)return new Date(NaN);if(b.u(e))return new Date;if(e instanceof Date)return new Date(e);if("string"==typeof e&&!/Z$/i.test(e)){var r=e.match($);if(r){var i=r[2]-1||0,s=(r[7]||"0").substring(0,3);return n?new Date(Date.UTC(r[1],i,r[3]||1,r[4]||0,r[5]||0,r[6]||0,s)):new Date(r[1],i,r[3]||1,r[4]||0,r[5]||0,r[6]||0,s)}}return new Date(e)}(t),this.init()},m.init=function(){var t=this.$d;this.$y=t.getFullYear(),this.$M=t.getMonth(),this.$D=t.getDate(),this.$W=t.getDay(),this.$H=t.getHours(),this.$m=t.getMinutes(),this.$s=t.getSeconds(),this.$ms=t.getMilliseconds()},m.$utils=function(){return b},m.isValid=function(){return!(this.$d.toString()===l)},m.isSame=function(t,e){var n=O(t);return this.startOf(e)<=n&&n<=this.endOf(e)},m.isAfter=function(t,e){return O(t) { - if (!Array.isArray(res)) { + if (!Array.isArray(res) && res.AuditStatus !== 1) { this.setData({ applyHostipal: res, diff --git a/src/module1/pages/cHostipal/index.wxml b/src/module1/pages/cHostipal/index.wxml index 593f9b4..95c32ef 100644 --- a/src/module1/pages/cHostipal/index.wxml +++ b/src/module1/pages/cHostipal/index.wxml @@ -1,6 +1,9 @@ - 审核不通过原因:{{applyHostipal.RejectReason}}。 + 审核不通过原因:{{applyHostipal.RejectReason}} + + + 您提交的{{applyHostipal.Name}}医院信息正在审核中 @@ -89,7 +92,6 @@ { - wx.reLaunch({ url: "/module1/pages/index/index" }); + wx.reLaunch({ url: "/module1/pages/setInfo/index" }); }); }, handleProtool() { diff --git a/src/module1/pages/sHostipal/index.scss b/src/module1/pages/sHostipal/index.scss index 073dfd5..03fbab4 100644 --- a/src/module1/pages/sHostipal/index.scss +++ b/src/module1/pages/sHostipal/index.scss @@ -63,6 +63,7 @@ page { font-weight: bold; } .tag { + margin-left: 12rpx; vertical-align: 2px; padding: 0 8rpx; line-height: 32rpx; @@ -98,7 +99,7 @@ page { font-size: 28rpx; line-height: 72rpx; color: rgba(255, 255, 255, 1); - border-radius: 32rpx; + border-radius: 82rpx; background: linear-gradient(90deg, #00b4c5 0%, #54e2b4 100%); } } diff --git a/src/module1/pages/sHostipal/index.ts b/src/module1/pages/sHostipal/index.ts index ca0d86c..9944b6d 100644 --- a/src/module1/pages/sHostipal/index.ts +++ b/src/module1/pages/sHostipal/index.ts @@ -2,8 +2,6 @@ const app = getApp(); Page({ data: { - prev: "", - showArea: false, fieldNames: { text: "label", value: "value", children: "children" }, @@ -26,12 +24,7 @@ Page({ area: [], }, - onLoad(options) { - if (options.prev) { - this.setData({ - prev: decodeURIComponent(options.prev), - }); - } + onLoad() { app.waitLogin(true).then(() => { this.getHostipalDict(); this.getList(); @@ -121,21 +114,14 @@ Page({ handleSelect(e: any) { const { index } = e.currentTarget.dataset; - const { prev, list } = this.data; + const { list } = this.data; const item: any = list[index]; - if (prev) { - const isParams = this.data.prev.includes("?"); - wx.redirectTo({ - url: `${this.data.prev}${isParams ? "&" : "?"}hid=${item.HospitalId}&hname=${item.ShortName || item.Name}`, - }); - } else { - const eventChannel = this.getOpenerEventChannel(); - eventChannel.emit("acceptDataFromOpenedPage", { - hid: item.HospitalId, - hname: item.ShortName || item.Name, - }); - wx.navigateBack(); - } + const eventChannel = this.getOpenerEventChannel(); + eventChannel.emit("acceptDataFromOpenedPage", { + hid: item.HospitalId, + hname: item.ShortName || item.Name, + }); + wx.navigateBack(); }, handlePushDoctor() { wx.navigateTo({ diff --git a/src/module1/pages/sHostipal/index.wxml b/src/module1/pages/sHostipal/index.wxml index 4095152..baa56cd 100644 --- a/src/module1/pages/sHostipal/index.wxml +++ b/src/module1/pages/sHostipal/index.wxml @@ -9,9 +9,9 @@ @@ -24,11 +24,9 @@ - - {{item.ShortName || item.Name}} - - {{hospitalClassification[item.HospitalClassification]}}{{hospitalLevel[item.HospitalLevel]}} - + {{item.ShortName || item.Name}} + + {{hospitalClassification[item.HospitalClassification]}}{{hospitalLevel[item.HospitalLevel]}} @@ -47,7 +45,6 @@ { this.getApplyDoctor(); this.getLoastApplyHostipal(); this.getDoctorDict(); const doctorId = app.globalData.scene?.doctorId; + if (doctorId) { this.getDoctorInfo(doctorId); } @@ -55,6 +51,8 @@ Page({ QualificationImg: res.QualificationImg, RegisterImg: res.RegisterImg, PositionImg: res.PositionImg, + + RejectReason: res.AuditStatus === 2 ? res.RejectReason : "", }); } }); @@ -102,8 +100,17 @@ Page({ }); }, handleHostipal() { - wx.redirectTo({ - url: `/module1/pages/sHostipal/index?prev=${encodeURIComponent("/module1/pages/setInfo/index")}`, + wx.navigateTo({ + url: "/module1/pages/sHostipal/index", + events: { + acceptDataFromOpenedPage: (data) => { + this.setData({ + HospitalId: data.hid, + HospitalName: data.hname, + }); + }, + }, + success: () => {}, }); }, handleTitleType(e) { @@ -113,7 +120,7 @@ Page({ }); }, handleSubmit() { - const { + let { AuditId, Name, HospitalId, @@ -125,6 +132,11 @@ Page({ RegisterImg, PositionImg, } = this.data; + const scene = app.globalData.scene; + if (scene?.doctorId) { + InviteDoctorId = scene.doctorId; + } + if (!Name) { wx.showToast({ title: "请输入姓名", @@ -189,11 +201,17 @@ Page({ PositionImg, }, }).then((res) => { - wx.navigateTo({ + app.globalData.scene = null; + wx.reLaunch({ url: `/module1/pages/setInfoResult/index?isf=${res.isFollow}&iname=${res.InviteDoctorName}`, }); }); }, + handleChangeHostipal() { + wx.navigateTo({ + url: "/module1/pages/cHostipal/index", + }); + }, }); export {}; diff --git a/src/module1/pages/setInfo/index.wxml b/src/module1/pages/setInfo/index.wxml index 8eaff26..dd16413 100644 --- a/src/module1/pages/setInfo/index.wxml +++ b/src/module1/pages/setInfo/index.wxml @@ -2,22 +2,28 @@ class="page" style="background: url({{imageUrl}}set-info-bg.png?r={{Timestamp}}) no-repeat top center/100% 356rpx;" > + + + 审核不通过原因:{{RejectReason}} + {{inviteName}}医生为您的邀约医生 + 您没有邀约医生,可能会影响您的审核 - + 您的姓名 - + 所在医院 @@ -27,7 +33,11 @@ 您提交的{{applyHostipalInfo.ShortName || applyHostipalInfo.Name}}医院信息待审核 - + 您提交的{{applyHostipalInfo.ShortName || applyHostipalInfo.Name}}医院信息已驳回 去修改> @@ -53,6 +63,7 @@ type="text" placeholder="请输入" model:value="{{OtherTitle}}" + maxlength="10" /> @@ -63,7 +74,7 @@ 请上传高清图片 - 查看示例 + diff --git a/src/module1/pages/setInfoResult/index.wxml b/src/module1/pages/setInfoResult/index.wxml index cbf44a4..7b564fc 100644 --- a/src/module1/pages/setInfoResult/index.wxml +++ b/src/module1/pages/setInfoResult/index.wxml @@ -9,7 +9,7 @@ 已将信息提交给 - 王大志医生 + {{InviteDoctorName}}医生 审核通过后,您可进入罕心守护项目 diff --git a/src/module1/pages/userInfo/index.ts b/src/module1/pages/userInfo/index.ts index c2ba94a..791374f 100644 --- a/src/module1/pages/userInfo/index.ts +++ b/src/module1/pages/userInfo/index.ts @@ -1,4 +1,4 @@ -const _app = getApp() +const _app = getApp(); Page({ data: { @@ -8,12 +8,29 @@ Page({ onLoad() {}, changePhone() { wx.navigateTo({ - url: '/module1/pages/changePhone/index', - }) + url: "/module1/pages/changePhone/index", + }); }, handleBrief() { this.setData({ popupBriefShow: true, - }) + }); }, -}) + handleLoginOut() { + wx.showModal({ + title: "确认退出登录?", + success(res) { + if (res.confirm) { + wx.ajax({ + method: "POST", + url: "?r=takeda/account/reg-logout", + }).then((res) => { + wx.reLaunch({ + url: "/module1/pages/login/index", + }); + }); + } + }, + }); + }, +}); diff --git a/src/pages/cases/index.wxml b/src/pages/cases/index.wxml index 21c6f7f..f286198 100644 --- a/src/pages/cases/index.wxml +++ b/src/pages/cases/index.wxml @@ -51,7 +51,7 @@ mode="date" bind:change="handleSearch" > - {{submitTimeBegin||'开始'}} + {{submitTimeBegin || '开始'}} - - {{feedbackTimeBegin||'开始'}} + {{feedbackTimeBegin || '开始'}} - 地区 - {{cityName+countyName || '地区'}} + {{cityName + countyName || '地区'}} @@ -293,7 +293,7 @@ - {{item.ProvinceName === item.CityName ? '':item.ProvinceName}} + {{item.ProvinceName === item.CityName ? '' : item.ProvinceName}} {{item.CityName}}{{item.CountyName}}{{item.Address}} @@ -344,7 +344,6 @@ 后续病例可邀约对方参与 - 确认 + 确认