更改扫码api、添加邮箱绑定功能
authorguangchao.xu <guangchao.xu@supwisdom.com>
Mon, 4 Jan 2021 09:53:47 +0000 (17:53 +0800)
committerguangchao.xu <guangchao.xu@supwisdom.com>
Mon, 4 Jan 2021 09:53:47 +0000 (17:53 +0800)
29 files changed:
App.vue
manifest.json
nativeplugins/Mpaas-Scan/ios/meta.config [new file with mode: 0644]
pages.json
pages/sub_basic/login/index.vue
pages/sub_basic/verification/index.vue
pages/sub_index/scanView/index.vue
pages/sub_medical/addPatient.vue
pages/sub_medical/appointment.vue
pages/sub_medical/cashFlow.vue
pages/sub_medical/hospital.vue
pages/sub_medical/patient.vue
pages/sub_medical/pay.vue
pages/sub_medical/payResult.vue
pages/sub_medical/z_components/keyboard-package/keyboard-package.vue [new file with mode: 0644]
pages/sub_medical/z_components/password-input/password-input.vue [new file with mode: 0644]
pages/sub_medical/z_components/uni-popup/message.js [new file with mode: 0644]
pages/sub_medical/z_components/uni-popup/popup.js [new file with mode: 0644]
pages/sub_medical/z_components/uni-popup/popup.vue [new file with mode: 0644]
pages/sub_medical/z_components/uni-popup/uni-popup-dialog.vue [new file with mode: 0644]
pages/sub_medical/z_components/uni-popup/uni-popup-message.vue [new file with mode: 0644]
pages/sub_medical/z_components/uni-popup/uni-popup-share.vue [new file with mode: 0644]
pages/sub_medical/z_components/uni-popup/uni-popup.vue [new file with mode: 0644]
pages/sub_mine/accountSafe/index.vue
pages/sub_mine/bindEmail/index.vue [new file with mode: 0644]
pages/sub_mine/lock/index.vue
pages/sub_tabbar/index.vue
static/css/iconfont.css
static/js/http.interceptor.js

diff --git a/App.vue b/App.vue
index 47af5bb..fa9f0db 100644 (file)
--- a/App.vue
+++ b/App.vue
@@ -5,6 +5,8 @@
                },
                onLaunch() {
                        let that = this
+                       
+                       //获取平台信息
                        uni.getSystemInfo({
                                success(res) {
                                        uni.setStorageSync('platform', res.platform)
@@ -18,7 +20,7 @@
                        let version = v + '(' + c + ')'
                        that.globalData.version = version
 
-                       //获取uuid
+                       //获取设备uuid
                        plus.device.getInfo({
                                success(res) {
                                        let uuid = res.uuid
index 6672599..632e48e 100644 (file)
 {
-    "name" : "大理市民卡",
-    "appid" : "__UNI__6DDB720",
-    "description" : "大理市民服务app",
-    "versionName" : "2.1.0",
-    "versionCode" : 5,
-    "transformPx" : false,
-    "app-plus" : {
-        // APP-VUE分包,可提APP升启动速度,2.7.12开始支持,兼容微信小程序分包方案,默认关闭
-        "compatible" : {
-            "ignoreVersion" : true //true为忽略版本检查框
-        },
-        "optimization" : {
-            "subPackages" : true
-        },
-        "safearea" : {
-            "bottom" : {
-                "offset" : "none"
-            }
-        },
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
-            "autoclose" : true,
-            "delay" : 0
-        },
-        "usingComponents" : true,
-        "nvueCompiler" : "uni-app",
-        "compilerVersion" : 3,
-        "modules" : {
-            "FaceID" : {},
-            "Fingerprint" : {},
-            "Maps" : {},
-            "Geolocation" : {}
-        },
-        "distribute" : {
-            "android" : {
-                "permissions" : [
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.USE_FINGERPRINT\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ],
-                "permissionExternalStorage" : {
-                    "request" : "none",
-                    "prompt" : "应用保存运行状态等信息,需要获取读写手机存储(系统提示为访问设备上的照片、媒体内容和文件)权限,请允许。"
-                },
-                "permissionPhoneState" : {
-                    "request" : "none",
-                    "prompt" : "为保证您正常、安全地使用,需要获取设备识别码(部分手机提示为获取手机号码)使用权限,请允许。"
-                },
-                "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ]
-            },
-            "ios" : {},
-            "sdkConfigs" : {
-                "ad" : {},
-                "maps" : {
-                    "amap" : {
-                        "appkey_ios" : "301567cad1afe899587917e803441d60",
-                        "appkey_android" : "6e97c7069def9d8f0f3aa3d421ce196b"
-                    }
-                },
-                "geolocation" : {
-                    "amap" : {
-                        "__platform__" : [ "ios", "android" ],
-                        "appkey_ios" : "301567cad1afe899587917e803441d60",
-                        "appkey_android" : "6e97c7069def9d8f0f3aa3d421ce196b"
-                    }
-                }
-            },
-            "icons" : {
-                "android" : {
-                    "hdpi" : "unpackage/res/icons/72x72.png",
-                    "xhdpi" : "unpackage/res/icons/96x96.png",
-                    "xxhdpi" : "unpackage/res/icons/144x144.png",
-                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
-                },
-                "ios" : {
-                    "appstore" : "unpackage/res/icons/1024x1024.png",
-                    "ipad" : {
-                        "app" : "unpackage/res/icons/76x76.png",
-                        "app@2x" : "unpackage/res/icons/152x152.png",
-                        "notification" : "unpackage/res/icons/20x20.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "proapp@2x" : "unpackage/res/icons/167x167.png",
-                        "settings" : "unpackage/res/icons/29x29.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "spotlight" : "unpackage/res/icons/40x40.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
-                    },
-                    "iphone" : {
-                        "app@2x" : "unpackage/res/icons/120x120.png",
-                        "app@3x" : "unpackage/res/icons/180x180.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "notification@3x" : "unpackage/res/icons/60x60.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "settings@3x" : "unpackage/res/icons/87x87.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
-                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
-                    }
-                }
-            },
-            "splashscreen" : {
-                "androidStyle" : "default"
-            }
-        },
-        "nativePlugins" : {
-            "KJ-JPush" : {
-                "ios_appkey" : "d644d997f2cab0551ff704a3",
-                "android_channel" : "huawei",
-                "android_appkey" : "d644d997f2cab0551ff704a3",
-                "ios_channel" : "appstore",
-                "__plugin_info__" : {
-                    "name" : "【离线包、源码优惠出售】极光推送(ios、andorid)",
-                    "description" : "【不维护试用合适再购买3.33块】离线包源码优惠价66块,购买源码加QQ:543610866",
-                    "platforms" : "Android,iOS",
-                    "url" : "https://ext.dcloud.net.cn/plugin?id=1009",
-                    "android_package_name" : "com.dalicitycard.app",
-                    "ios_bundle_id" : "com.dalicitycard.app",
-                    "isCloud" : true,
-                    "bought" : 1,
-                    "pid" : "1009",
-                    "parameters" : {
-                        "ios_appkey" : {
-                            "des" : "发布ios时,必填,填写极光推送的APPKEY",
-                            "key" : "JPUSH_APPKEY",
-                            "value" : "${ios_appkey}"
-                        },
-                        "android_channel" : {
-                            "des" : "发布android时,必填,填写发布渠道,如不知道,填写:huawei",
-                            "key" : "JPUSH_CHANNEL",
-                            "value" : "${android_channel}"
-                        },
-                        "android_appkey" : {
-                            "des" : "发布android时,必填,填写极光推送的APPKEY",
-                            "key" : "JPUSH_APPKEY",
-                            "value" : "${android_appkey}"
-                        },
-                        "ios_channel" : {
-                            "des" : "发布ios时,必填,填写发布渠道,如不知道,填写:appstore",
-                            "key" : "JPUSH_CHANNEL",
-                            "value" : "${ios_channel}"
-                        }
-                    }
-                }
-            }
-        }
-    },
-    "quickapp" : {},
-    "mp-weixin" : {
-        "appid" : "wxc458a08d7fb5b4d3",
-        "setting" : {
-            "urlCheck" : true,
-            "es6" : false,
-            "minified" : true,
-            "postcss" : true
-        },
-        "optimization" : {
-            "subPackages" : true
-        },
-        "usingComponents" : true,
-        "permission" : {
-            "scope.userLocation" : {
-                "desc" : "你的位置信息将用于小程序位置接口的效果展示"
-            }
-        }
-    },
-    "mp-alipay" : {
-        "usingComponents" : true,
-        "component2" : true
-    },
-    "mp-baidu" : {
-        "usingComponents" : true,
-        "appid" : ""
-    },
-    "mp-toutiao" : {
-        "usingComponents" : true
-    },
-    "h5" : {
-        "template" : "template.h5.html",
-        "router" : {
-            "mode" : "hash",
-            "base" : ""
-        },
-        "optimization" : {
-            "treeShaking" : {
-                "enable" : true
-            }
-        },
-        "title" : "uView UI"
-    },
-    "channel_list" : [
-        {
-            "id" : "baidu",
-            "name" : "百度应用市场"
-        }
-    ]
+       "name": "大理市民卡",
+       "appid": "__UNI__6DDB720",
+       "description": "大理市民服务app",
+       "versionName": "2.1.0",
+       "versionCode": 7,
+       "transformPx": false,
+       "app-plus": {
+               // APP-VUE分包,可提APP升启动速度,2.7.12开始支持,兼容微信小程序分包方案,默认关闭
+               "compatible": {
+                       "ignoreVersion": true //true为忽略版本检查框
+               },
+               "optimization": {
+                       "subPackages": true
+               },
+               "safearea": {
+                       "bottom": {
+                               "offset": "none"
+                       }
+               },
+               "splashscreen": {
+                       "alwaysShowBeforeRender": true,
+                       "waiting": true,
+                       "autoclose": true,
+                       "delay": 0
+               },
+               "usingComponents": true,
+               "nvueCompiler": "uni-app",
+               "compilerVersion": 3,
+               "modules": {
+                       "FaceID": {},
+                       "Fingerprint": {},
+                       "Maps": {},
+                       "Geolocation": {}
+               },
+               "distribute": {
+                       "android": {
+                               "permissions": [
+                                       "<uses-feature android:name=\"android.hardware.camera\"/>",
+                                       "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                                       "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+                                       "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+                                       "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                                       "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                                       "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+                                       "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                                       "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                                       "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                                       "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                                       "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+                                       "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                                       "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
+                                       "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                                       "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                                       "<uses-permission android:name=\"android.permission.USE_FINGERPRINT\"/>",
+                                       "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                                       "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                                       "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
+                                       "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                               ],
+                               "permissionExternalStorage": {
+                                       "request": "none",
+                                       "prompt": "应用保存运行状态等信息,需要获取读写手机存储(系统提示为访问设备上的照片、媒体内容和文件)权限,请允许。"
+                               },
+                               "permissionPhoneState": {
+                                       "request": "none",
+                                       "prompt": "为保证您正常、安全地使用,需要获取设备识别码(部分手机提示为获取手机号码)使用权限,请允许。"
+                               },
+                               "abiFilters": ["armeabi-v7a", "arm64-v8a"]
+                       },
+                       "ios": {
+                               "privacyDescription": {
+                                       "NSCameraUsageDescription": "使用扫一扫识别二维码需要访问相机权限",
+                                       "NSPhotoLibraryUsageDescription": "使用app特制功能需要访问相机权限"
+                               }
+                       },
+                       "sdkConfigs": {
+                               "ad": {},
+                               "maps": {
+                                       "amap": {
+                                               "appkey_ios": "301567cad1afe899587917e803441d60",
+                                               "appkey_android": "6e97c7069def9d8f0f3aa3d421ce196b"
+                                       }
+                               },
+                               "geolocation": {
+                                       "amap": {
+                                               "__platform__": ["ios", "android"],
+                                               "appkey_ios": "301567cad1afe899587917e803441d60",
+                                               "appkey_android": "6e97c7069def9d8f0f3aa3d421ce196b"
+                                       }
+                               }
+                       },
+                       "icons": {
+                               "android": {
+                                       "hdpi": "unpackage/res/icons/72x72.png",
+                                       "xhdpi": "unpackage/res/icons/96x96.png",
+                                       "xxhdpi": "unpackage/res/icons/144x144.png",
+                                       "xxxhdpi": "unpackage/res/icons/192x192.png"
+                               },
+                               "ios": {
+                                       "appstore": "unpackage/res/icons/1024x1024.png",
+                                       "ipad": {
+                                               "app": "unpackage/res/icons/76x76.png",
+                                               "app@2x": "unpackage/res/icons/152x152.png",
+                                               "notification": "unpackage/res/icons/20x20.png",
+                                               "notification@2x": "unpackage/res/icons/40x40.png",
+                                               "proapp@2x": "unpackage/res/icons/167x167.png",
+                                               "settings": "unpackage/res/icons/29x29.png",
+                                               "settings@2x": "unpackage/res/icons/58x58.png",
+                                               "spotlight": "unpackage/res/icons/40x40.png",
+                                               "spotlight@2x": "unpackage/res/icons/80x80.png"
+                                       },
+                                       "iphone": {
+                                               "app@2x": "unpackage/res/icons/120x120.png",
+                                               "app@3x": "unpackage/res/icons/180x180.png",
+                                               "notification@2x": "unpackage/res/icons/40x40.png",
+                                               "notification@3x": "unpackage/res/icons/60x60.png",
+                                               "settings@2x": "unpackage/res/icons/58x58.png",
+                                               "settings@3x": "unpackage/res/icons/87x87.png",
+                                               "spotlight@2x": "unpackage/res/icons/80x80.png",
+                                               "spotlight@3x": "unpackage/res/icons/120x120.png"
+                                       }
+                               }
+                       },
+                       "splashscreen": {
+                               "androidStyle": "default"
+                       }
+               },
+               "nativePlugins": {
+                       "KJ-JPush": {
+                               "ios_appkey": "d644d997f2cab0551ff704a3",
+                               "android_channel": "huawei",
+                               "android_appkey": "d644d997f2cab0551ff704a3",
+                               "ios_channel": "appstore",
+                               "__plugin_info__": {
+                                       "name": "【离线包、源码优惠出售】极光推送(ios、andorid)",
+                                       "description": "【不维护试用合适再购买3.33块】离线包源码优惠价66块,购买源码加QQ:543610866",
+                                       "platforms": "Android,iOS",
+                                       "url": "https://ext.dcloud.net.cn/plugin?id=1009",
+                                       "android_package_name": "com.dalicitycard.app",
+                                       "ios_bundle_id": "com.dalicitycard.app",
+                                       "isCloud": true,
+                                       "bought": 1,
+                                       "pid": "1009",
+                                       "parameters": {
+                                               "ios_appkey": {
+                                                       "des": "发布ios时,必填,填写极光推送的APPKEY",
+                                                       "key": "JPUSH_APPKEY",
+                                                       "value": "${ios_appkey}"
+                                               },
+                                               "android_channel": {
+                                                       "des": "发布android时,必填,填写发布渠道,如不知道,填写:huawei",
+                                                       "key": "JPUSH_CHANNEL",
+                                                       "value": "${android_channel}"
+                                               },
+                                               "android_appkey": {
+                                                       "des": "发布android时,必填,填写极光推送的APPKEY",
+                                                       "key": "JPUSH_APPKEY",
+                                                       "value": "${android_appkey}"
+                                               },
+                                               "ios_channel": {
+                                                       "des": "发布ios时,必填,填写发布渠道,如不知道,填写:appstore",
+                                                       "key": "JPUSH_CHANNEL",
+                                                       "value": "${ios_channel}"
+                                               }
+                                       }
+                               }
+                       },
+                       "Mpaas-Scan": {
+                               "AppId": "ONEX1D49B6A241152",
+                               "WorkspaceId": "default",
+                               "License": "zvI8Ix1QYGLcZWTu9pfuwRxhPIERACTAjd2rQ66ky3zCCWLCCZDiISir89uVn4y+OGn0jcPIX/mMsZ8NIZXjfsgvB/m5MzVeaycZ7WRC4cxzoXjMSeN+AYty28ssiJJMdP1kFtIAoy/80VPeOBhl+yozUFaaTtDWEyMqT6XujcLWVuTJp8WHBvvLj0KmoleFV+OAusd+9keF9aSSHGwSwM1IbU9M4JMZsKWmLaKBpC77Ag0MVUhhdnY6MZ5Mff/KDivd5oGu1hbzXBPfoUlEkNppe3gwbxRTUM6k0OndyczPgZdVL9gC1/+UGH7kwiBNjegibMdySzsQuujbtISwFA==",
+                               "__plugin_info__": {
+                                       "name": "支付宝原生扫码插件",
+                                       "description": "支付宝原生扫码组件,包体积仅0.7MB,15分钟即可完成接入。同时,mPaaS提供「扫码分析」大盘",
+                                       "platforms": "Android,iOS",
+                                       "url": "https://ext.dcloud.net.cn/plugin?id=2636",
+                                       "android_package_name": "com.dalicitycard.app",
+                                       "ios_bundle_id": "com.dalicitycard.app",
+                                       "isCloud": true,
+                                       "bought": 1,
+                                       "pid": "2636",
+                                       "parameters": {
+                                               "AppId": {
+                                                       "des": "Android平台的AppId,请填写Android的config文件中的appId对应的值",
+                                                       "key": "mobilegw.appid",
+                                                       "value": ""
+                                               },
+                                               "WorkspaceId": {
+                                                       "des": "Android平台的WorkspaceId,请填写Android的config文件中的workspaceId对应的值",
+                                                       "key": "workspaceId",
+                                                       "value": ""
+                                               },
+                                               "License": {
+                                                       "des": "Android平台的License,,请填写Android的config文件中的mpaasConfigLicense对应的值",
+                                                       "key": "mpaasConfigLicense",
+                                                       "value": ""
+                                               }
+                                       }
+                               }
+                       }
+               }
+       },
+       "quickapp": {},
+       "mp-weixin": {
+               "appid": "wxc458a08d7fb5b4d3",
+               "setting": {
+                       "urlCheck": true,
+                       "es6": false,
+                       "minified": true,
+                       "postcss": true
+               },
+               "optimization": {
+                       "subPackages": true
+               },
+               "usingComponents": true,
+               "permission": {
+                       "scope.userLocation": {
+                               "desc": "你的位置信息将用于小程序位置接口的效果展示"
+                       }
+               }
+       },
+       "mp-alipay": {
+               "usingComponents": true,
+               "component2": true
+       },
+       "mp-baidu": {
+               "usingComponents": true,
+               "appid": ""
+       },
+       "mp-toutiao": {
+               "usingComponents": true
+       },
+       "h5": {
+               "template": "template.h5.html",
+               "router": {
+                       "mode": "hash",
+                       "base": ""
+               },
+               "optimization": {
+                       "treeShaking": {
+                               "enable": true
+                       }
+               },
+               "title": "uView UI",
+               "devServer": {
+                       "proxy": {
+                               "/api": {
+                                       "target": "http://yy.dlsmk.cn:8080/portal/mobileapi",
+                                       "changeOrigin": true,
+                                       "pathRewrite": {
+                                               "^/api": ""
+                                       }
+                               }
+                       }
+               }
+       },
+       "channel_list": [{
+               "id": "baidu",
+               "name": "百度应用市场"
+       }]
 }
diff --git a/nativeplugins/Mpaas-Scan/ios/meta.config b/nativeplugins/Mpaas-Scan/ios/meta.config
new file mode 100644 (file)
index 0000000..ba57269
--- /dev/null
@@ -0,0 +1,20 @@
+{
+       "appId":"ONEX1D49B6A241152",
+       "appKey":"ONEX1D49B6A241152_IOS",
+       "base64Code":"/9j/4AAQSkZJRgABAQEAYABgAAD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAADAAMDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxFobXF3hJ2CNJ8/SWNZW5Q44QGJ22kFAwABAQAAAAQAAB4AAADAAAAAFAAAAIcAAAABAAAAAAAAAAAAAAAAAAAAAAAAABUAAAABAAAAAAAAAAAAAAAIAAAAAAAAAIsS5F93AAAAAAAAAAAAAABVWwBOfR0SrSIJ/ITdz28UX/oxae3WSeRaVQOdDjghZJQishE/xL5hzbrlqopUvulP71I8xpshIPAkvf91cmdjbngBAwF4dWZ3AwECBgEAEQEBCAFxdHNqb3bKCYAt+YFC+8IbpBxqp74LC7j6fXLnMEqcQlQvaO5IR4BCNipPRSfJukf+oiU2lvm71+Ba47r7eap/jeZSiZTB/9k96/6v6FK4vFMesbWed8FNIqh/Rz3sBFQXRol3yBlCkBypL6kbs0ywBJNO2Var/EAQ2rZ+bi0fGGf35nZZ86KpoPJYcOX7FIZAqVydeCkgh4vX81kFBVScq4Mn3HtAkztKRBKyNdxNn1C7XGGCLmC1PQoww36UL3E3Y2ijFM2Ct4GdlzCviFGr1P8AAMKgGAYAAAAA",
+       "bundleId":"com.dalicitycard.app",
+       "rootPath":"mpaas/ios/ONEX1D49B6A241152-default",
+       "workspaceId":"default",
+       "syncport":"443",
+       "syncserver":"mpaas-mss.aliyuncs.com",
+       "logGW":"https://mpaas-mas-loggw.aliyuncs.com",
+       "pushPort":"443",
+       "pushGW":"mpaas-mps.aliyuncs.com",
+       "mpaasapi":"https://cn-hangzhou-component-gw.cloud.alipay.com/mgw.htm",
+       "rpcGW":"https://mpaas-mgs.aliyuncs.com/mgw.htm",
+       "mrtcserver":"wss://cn-hangzhou-mrtc.cloud.alipay.com/ws",
+       "mpaasConfigVersion":"V_1.0",
+       "mpaasConfigEnv":"ONEX_CLOUD",
+       "mpaasConfigPluginExpired":"",
+       "mpaasConfigLicense":"Db4aL4Dac1G7SekUIk75KL9Wo2BAjGZC8O/I6tzSNxlQmS3e8uhUQHFZ/ELbMeDlfC8MC1C8Qg5vtMIwO8stxh22ZqyAPMsWnmBcuYpbQASxl+15WvtL5zvrrDXjJzlvfy6Sg95dtZsyHpUvZZ3gg4GtMLE/vBJxz0RIxaOEIEHA8A3lZ9dJJCC33LMZzID8pC3B9N7Wsltv2q9310SiOpafBS9aUc1qYWsDY8crzF+ocCt27sB0aNnK5SiCosr/Xw/pxmPeSQXUX8oHPXbhNnS8ZViQbxqsXuyE3Aj5G9X4Ys/nRRTaJo29W32PTMNzcASH1v6VMIq/h1+8zqR5Pw=="
+}
\ No newline at end of file
index 244b707..94efca2 100644 (file)
@@ -6,20 +6,20 @@
                        "path": "pages/sub_tabbar/index",
                        "style": {
                                "navigationBarTitleText": "首页",
-                               "enablePullDownRefresh":true,
+                               "enablePullDownRefresh": true,
                                "app-plus": {
                                        "titleNView": false,
-                                       "pullToRefresh":{
-                                               "support":true,
-                                               "range":"20%",
-                                               "contentdown":{
-                                                       "caption":"下拉刷新"
+                                       "pullToRefresh": {
+                                               "support": true,
+                                               "range": "20%",
+                                               "contentdown": {
+                                                       "caption": "下拉刷新"
                                                },
-                                               "contentover":{
-                                                       "caption":"正在刷新"
+                                               "contentover": {
+                                                       "caption": "正在刷新"
                                                },
-                                               "contentrefresh":{
-                                                       "caption":"刷新成功"
+                                               "contentrefresh": {
+                                                       "caption": "刷新成功"
                                                }
                                        }
                                }
                        "path": "pages/sub_tabbar/active",
                        "style": {
                                "navigationBarTitleText": "活动",
-                               "enablePullDownRefresh":true,
+                               "enablePullDownRefresh": true,
                                "app-plus": {
-                                       "pullToRefresh":{
-                                               "support":true,
-                                               "range":"20%",
-                                               "contentdown":{
-                                                       "caption":"下拉刷新"
+                                       "pullToRefresh": {
+                                               "support": true,
+                                               "range": "20%",
+                                               "contentdown": {
+                                                       "caption": "下拉刷新"
                                                },
-                                               "contentover":{
-                                                       "caption":"正在刷新"
+                                               "contentover": {
+                                                       "caption": "正在刷新"
                                                },
-                                               "contentrefresh":{
-                                                       "caption":"刷新成功"
+                                               "contentrefresh": {
+                                                       "caption": "刷新成功"
                                                }
                                        }
                                }
                                        "navigationBarTitleText": "我的卡券"
                                }
                        },
+                       {
+                               "path": "bindEmail/index",
+                               "style": {
+                                       "navigationBarTitleText": "设置邮箱"
+                               }
+                       },
                        {
                                "path": "integralQuery/index",
                                "style": {
                ]
        }, {
                "root": "pages/sub_medical",
-               "pages": [
-                       {
+               "pages": [{
                                "path": "appointment",
                                "style": {
                                        "navigationBarTitleText": "预约挂号"
index 7da6209..050f84c 100644 (file)
                                        platform: platform
                                }
                                that.$u.post('/login',params).then(res => {
-                                       
                                        uni.setStorageSync("token", res.token)
                                        uni.setStorageSync("uid", res.uid)
                                        uni.setStorageSync("userid", res.userid)
                                        uni.setStorageSync("localpwd", res.localpwd)
                                        uni.setStorageSync("phone", tel)
                                        uni.setStorageSync("phoneX", res.phone)
-                                       uni.setStorageSync("imgurl", res.imgurl)
+                                       uni.setStorageSync("imageurl", res.imageurl)
                                        uni.setStorageSync("idno", res.idno)
                                        uni.setStorageSync("cardno", res.citizenCardNo)
                                        uni.setStorageSync("bankcardno", res.bankCardNo)
+                                       uni.setStorageSync("email", res.email)
                                        let ranNum = Math.ceil(Math.random() * 25)
                                        let c = String.fromCharCode(65 + ranNum)
                                        // #ifndef MP-WEIXIN
                                        uni.setStorageSync("idno", res.idno)
                                        uni.setStorageSync("cardno", res.citizenCardNo)
                                        uni.setStorageSync("bankcardno", res.bankCardNo)
+                                       uni.setStorageSync("email", res.email)
                                        if(res.needcheck){
                                                uni.navigateTo({
                                                        url:'/pages/sub_basic/verification/index?data=' + JSON.stringify(params)
index 2f60329..f3050b0 100644 (file)
@@ -91,6 +91,7 @@
                                        uni.setStorageSync("idno", res.idno)
                                        uni.setStorageSync("cardno", res.citizenCardNo)
                                        uni.setStorageSync("bankcardno", res.bankCardNo)
+                                       uni.setStorageSync("email", res.email)
                                        uni.showToast({
                                                title: "验证成功",
                                                icon: "none",
index a9515a8..dbf9b26 100644 (file)
                onLoad(option) {
                        let that = this
                        let userid = uni.getStorageSync("userid")
-                       that.userid = userid
+                       //that.userid = userid
                        let url = option.url
-                       // if (url.indexOf("?") > 0) {
-                       //      url = url + "&userid=" + userid
-                       // } else {
-                       //      url = url + "?userid=" + userid
-                       // }
+                       if (url.indexOf("?") > 0) {
+                               url = url + "&userid=" + userid
+                       } else {
+                               url = url + "?userid=" + userid
+                       }
+                       console.log(url)
                        that.src = url
-                       //console.log(url)
                },
                onReady() {
-                       let userid = uni.getStorageSync("userid")
-                       var pages = getCurrentPages();
-                       var page = pages[pages.length - 1];
-                       var currentWebview = page.$getAppWebview();
-                       var url = currentWebview.children()[0].getURL();
-                       var wx = currentWebview.children()[0]
-                       //console.log('=== url ===', url);
-                       wx.addEventListener('loaded', function(e) {
-                               //console.log('Loaded: ' + wx.getURL());
-                               let newUrl = wx.getURL()
-                               if (newUrl.indexOf("userid") > -1) {
-                                       //console.log(1)
-                                       return false
-                               }
-                               if (newUrl.indexOf("?") > 0) {
-                                       newUrl = newUrl + "&userid=" + userid
-                               } else {
-                                       newUrl = newUrl + "?userid=" + userid
-                               }
-                               //console.log(newUrl)
-                               wx.loadURL(newUrl)
-                       }, false);
-               },
-               methods: {
-
+                       // let userid = uni.getStorageSync("userid")
+                       // var pages = getCurrentPages()
+                       // var page = pages[pages.length - 1]
+                       // var currentWebview = page.$getAppWebview()
+                       // var url = currentWebview.children()[0].getURL()
+                       // var wx = currentWebview.children()[0]
+                       // console.log('=== url ===', url);
+                       // wx.addEventListener('loaded', function(e) {
+                       //      console.log('Loaded: ' + wx.getURL());
+                       //      let newUrl = wx.getURL()
+                       //      if (newUrl.indexOf("userid") > -1) {
+                       //              //console.log(1)
+                       //              return false
+                       //      }
+                       //      if (newUrl.indexOf("?") > 0) {
+                       //              newUrl = newUrl + "&userid=" + userid
+                       //      } else {
+                       //              newUrl = newUrl + "?userid=" + userid
+                       //      }
+                       //      //console.log(newUrl)
+                       //      wx.loadURL(newUrl)
+                       // }, false);
                },
        }
 </script>
index 94cfda8..332bb0c 100644 (file)
@@ -57,7 +57,7 @@
                                        name,sex,cardno,mobile,
                                        hospitalcode:''
                                }
-                               that.$u.post('/medicineapi/medicalcard/add',params).then(res=>{
+                               that.$u.post('/medicalapi/medicalcard/add',params).then(res=>{
                                        console.log(res.data)
                                })
                        }
index 5de78b7..cf7fd6a 100644 (file)
@@ -7,7 +7,7 @@
                <view class="appointment-search">
                        <u-search placeholder="搜索医院名称" v-model="hospial" :show-action="false" bg-color="#ffffff" @focus="toPath('/pages/sub_medical/hospital')"></u-search>
                </view>
-               <view class="appointment-record">
+               <!-- <view class="appointment-record">
                        <u-cell-group>
                                <u-cell-item title="我的挂号记录" value="查看更多" @click="toPath('/pages/sub_medical/record')"></u-cell-item>
                        </u-cell-group>
                        <view class="appointment-record-nomsg" v-else>
                                <text>暂无挂号记录</text>
                        </view>
-                       <!-- <view class="appointment-record-btn">
+                       <view class="appointment-record-btn">
                                <u-button :plain="true" size="mini" type="primary" shape="circle">取消预约</u-button>
-                       </view> -->
-               </view>
+                       </view>
+               </view> -->
                <view class="appointment-hospital">
                        <u-cell-group>
                                <u-cell-item title="本地医院" value="查看更多" @click="toPath('/pages/sub_medical/hospital')"></u-cell-item>
                        </u-cell-group>
                        <view class="appointment-hospital-msg" v-if="hospital_list.length != 0">
-                               <view class="appointment-hospital-msg-box" @click="toPath('/pages/sub_medical/outpatient')" v-for="(v,i) in hospital_list" :key="i">
+                               <view class="appointment-hospital-msg-box" @click="toPath('/pages/sub_medical/cashFlow?hospitalcode=' + v.hospitalcode)" v-for="(v,i) in hospital_list" :key="i">
                                        <view class="appointment-hospital-msg-left">
-                                               <u-image :src="v.src" width="100" mode="widthFix"></u-image>
+                                               <u-image :src="v.icon" width="100" mode="widthFix"></u-image>
                                        </view>
                                        <view class="appointment-hospital-msg-right">
                                                <view class="appointment-hospital-msg-right-item">
@@ -87,6 +87,7 @@
                        }
                },
                onLoad() {
+                       uni.setNavigationBarTitle({title:'医院查询'})
                        this.get_hospital_list()
                        this.getLocal()
                },
                                        pagesize:3,
                                        name:''
                                }
-                               that.$u.get('/medicineapi/hospital/list',params).then(res=>{
-                                       that.hospital_list = res.data.list
-                                       console.log(res.data.list)
+                               that.$u.get('/medicalapi/hospital/list',params).then(res=>{
+                                       let url = uni.getStorageSync('imageurl')
+                                       let list = res.data.list
+                                       list.forEach(item=>{
+                                               item.icon = url + '/' + item.picid
+                                       })
+                                       that.hospital_list = list
+                                       console.log(list)
                                })
                        }
                }
index efe1ff2..6f5091b 100644 (file)
@@ -9,20 +9,23 @@
                <view v-if="leftOright">
                        <scroll-view scroll-y :enable-back-to-top="true" @scrolltolower="" class="scrollView">
                                <view class="cashFlow-ul">
-                                       <view class="cashFlow-ul-item">
+                                       <view class="cashFlow-ul-item" v-for = '(v,i) in unpay_list' :key='i' @click="toPath('/pages/sub_medical/pay?msg=' + JSON.stringify(v)+'&id=unpay')">
                                                <view class="cashFlow-ul-item-left">
                                                        <view class="cashFlow-ul-item-left-top">
                                                                <u-image src="./images/pay.png" width="80" height="80"></u-image>
-                                                               <text>挂号费</text>
+                                                               <text>{{v.mergingName}}</text>
                                                        </view>
                                                        <view class="cashFlow-ul-item-left-bottom">
-                                                               <text class="cashFlow-ul-item-left-bottom-bold">01</text>
-                                                               <text class="cashFlow-ul-item-left-bottom-normal">天内缴费,截止日期2020/10/28 23:59:59</text>
+                                                               <!-- <text class="cashFlow-ul-item-left-bottom-bold">科类:</text> -->
+                                                               <text class="cashFlow-ul-item-left-bottom-normal" style="margin-right: 50rpx;">科类:{{v.subjectName}}</text>
+                                                               <!-- <text class="cashFlow-ul-item-left-bottom-bold"></text> -->
+                                                               <text class="cashFlow-ul-item-left-bottom-normal">医生:{{v.doctorName}}</text>
                                                        </view>
                                                </view>
                                                <view class="cashFlow-ul-item-right">
-                                                       <text>¥23.5</text>
+                                                       <text>¥{{v.mergingSubtotal}}</text>
                                                </view>
+                                               <view class="cashFlow-ul-item-status" v-if="v.status == 'wip'">订单支付中</view>
                                        </view>
                                </view>
                        </scroll-view>
                <view v-if="!leftOright">
                        <scroll-view scroll-y :enable-back-to-top="true" @scrolltolower="" class="scrollView">
                                <view class="cashFlow-ul">
-                                       <view class="cashFlow-ul-item">
+                                       <view class="cashFlow-ul-item" v-for = '(v,i) in payed_list' :key='i' @click="toPath('/pages/sub_medical/pay?msg=' + JSON.stringify(v) +'&id=payed')">
                                                <view class="cashFlow-ul-item-left">
                                                        <view class="cashFlow-ul-item-left-top">
                                                                <u-image src="./images/pay.png" width="80" height="80"></u-image>
-                                                               <text>挂号费</text>
+                                                               <text>{{v.mergingname}}</text>
                                                        </view>
                                                        <view class="cashFlow-ul-item-left-bottom">
                                                                <text class="cashFlow-ul-item-left-bottom-normal">缴费日期:</text>
-                                                               <text class="cashFlow-ul-item-left-bottom-normal">2020-10-28 12:30:59</text>
+                                                               <text class="cashFlow-ul-item-left-bottom-normal">{{v.paytime}}</text>
                                                        </view>
                                                </view>
                                                <view class="cashFlow-ul-item-right">
-                                                       <text>¥23.5</text>
+                                                       <text>¥{{v.mergingsubtotal}}</text>
                                                </view>
+                                               <view class="cashFlow-ul-item-status" v-if="!v.notifyStatus">通知医院</view>
                                        </view>
                                </view>
                        </scroll-view>
        export default {
                data() {
                        return {
-                               leftOright: true
+                               leftOright: true,
+                               unpay_list:[],
+                               hospitalcode:'',
+                               payed_list:[]
                        }
                },
+               onLoad(options){
+                       let hospitalcode = options.hospitalcode
+                       this.hospitalcode = hospitalcode
+                       // this.get_unpay_list(hospitalcode)
+               },
                methods: {
+                       get_unpay_list(code){
+                               let that = this
+                               let param = {
+                                       hospitalcode : code
+                               }
+                               that.$u.post('/medicalapi/unpayed/list',param).then(res=>{
+                                       that.unpay_list = res.data
+                               })
+                       },
+                       get_payed_list(code){
+                               let that = this
+                               let param = {
+                                       hospitalcode : code,
+                                       pageno:1,
+                                       pagesize:100
+                               }
+                               that.$u.post('/medicalapi/payed/list',param).then(res=>{
+                                       let list = res.data
+                                       list.forEach(item=>{
+                                               item.paytime = item.transdate.substr(0, 4) +
+                                                       "-" + item.transdate.substr(4, 2) + "-" + item.transdate.substr(6, 2) + " " + item.transtime.substr(0, 2) + ":" +
+                                                       item.transtime.substr(2, 2) + ":" + item.transtime.substr(4, 2) 
+                                       })
+                                       that.payed_list = list
+                               })
+                       },
                        changeTurnoverList(e) {
                                this.leftOright = e
+                               if(e){
+                                       this.get_unpay_list(this.hospitalcode)
+                               }else{
+                                       this.get_payed_list(this.hospitalcode)
+                               }
                        },
+               },
+               onShow(){
+                       this.get_unpay_list(this.hospitalcode)
                }
        }
 </script>
                                align-items: center;
                                padding: 30rpx 20rpx;
                                border-radius: 10rpx;
+                               margin-bottom: 30rpx;
+                               position: relative;
+                               &-status{
+                                       position: absolute;
+                                       bottom: 20rpx;
+                                       right: 20rpx;
+                                       font-size: 26rpx;
+                                       color: #18B566;
+                               }
                                &-left{
                                        display:  flex;
                                        flex-direction: column;
                                        justify-content: space-between;
+                                       width: 75%;
                                        &-top{
                                                display: flex;
                                                align-items: center;
                                                text{
+                                                       overflow: hidden;
+                                                       text-overflow: ellipsis;
+                                                       white-space: nowrap;
                                                        font-size: 36rpx;
                                                        margin-left: 10rpx;
                                                        font-weight: bold;
index 1b66fc1..7cf850d 100644 (file)
@@ -67,7 +67,7 @@
                                        pagesize: 10,
                                        name: name
                                }
-                               that.$u.get('/medicineapi/hospital/list', params).then(res => {
+                               that.$u.get('/medicalapi/hospital/list', params).then(res => {
                                        that.hospital_list = res.data.list
                                        that.notice = '没有搜索到此关键词'
                                        console.log(res.data.list)
index f6d549c..094a73b 100644 (file)
@@ -62,7 +62,7 @@
                        deleteMenber(){
                                let that = this
                                let cardid = '123'
-                               that.$u.post('/medicineapi/medicalcard/delete/' + cardid).then(res=>{
+                               that.$u.post('/medicalapi/medicalcard/delete/' + cardid).then(res=>{
                                        console.log(res.data)
                                })
                        }
index 751d7d3..c763a23 100644 (file)
@@ -1,30 +1,59 @@
 <template>
        <view class="pay">
                <u-cell-group>
-                       <u-cell-item title="挂号费" :title-style="tstyle" :arrow="false">
+                       <u-cell-item :title="msg.mergingName" :title-style="tstyle" :arrow="false">
                                <u-image slot="icon" src="./images/cush.png" width="60" height="60" mode="aspectFit"></u-image>
                        </u-cell-item>
-                       <u-cell-item title="缴费金额"  :arrow="false" value="23.50元" :value-style="vstyle"></u-cell-item>
+                       <u-cell-item title="缴费金额" :arrow="false" :value="msg.mergingSubtotal+'元'" :value-style="vstyle"></u-cell-item>
                </u-cell-group>
                <u-cell-group>
-                       <u-cell-item title="商户名称"  :arrow="false" value="大理市第一人民医院"></u-cell-item>
-                       <u-cell-item title="截止日期"  :arrow="false" value="2020/10/28 23:29:29"></u-cell-item>
-                       <u-cell-item title="交易状态"  :arrow="false" value="未支付"></u-cell-item>
+                       <u-cell-item title="医院名称" :arrow="false" :value="msg.hospitalName"></u-cell-item>
+                       <u-cell-item title="订单号" :arrow="false" :value="msg.billNo"></u-cell-item>
+                       <u-cell-item title="就诊日期" :arrow="false" :value="msg.date"></u-cell-item>
+                       <!-- <u-cell-item title="截止日期"  :arrow="false" value="2020/10/28 23:29:29"></u-cell-item> -->
+                       <u-cell-item title="交易状态" :arrow="false" :value="msg.status_ok" :value-style="msg.status=='wip'?status_style:vstyle"></u-cell-item>
                </u-cell-group>
-               <u-button @click="" :custom-style="payBtn">立即支付</u-button>
+               <u-button @click="msg.status=='wip'?query():open()" :custom-style="payBtn" v-if="kind =='unpay'">{{msg.status=='wip'?'查询订单状态':'立即支付'}}</u-button>
+               <u-button @click="" :custom-style="payBtn" v-if="kind =='payed'&& msg.notifyStatus == false">通知医院</u-button>
+               <!-- 支付密码弹框 -->
+               <uni-popup ref="showPassword" class="pwd-wrapper">
+                       <view class="uni-tip uni-pwd">
+                               <text class="uni-tip-title">请输入支付密码</text>
+                               <view class="pwd-text-wrap">
+                                       <password-input @tap="openKeyBoard('number')" :length="length" :gutter="0" :list="numberList"></password-input>
+                               </view>
+                       </view>
+               </uni-popup>
+               <keyboard-package ref="number" @onInput="onInput" @onDelete="onDelete" @onConfirm="onConfirm" :disableDot="true" />
        </view>
 </template>
 
 <script>
-       export default{
-               data(){
-                       return{
+       import keyboardPackage from "./z_components/keyboard-package/keyboard-package.vue"
+       import passwordInput from "./z_components/password-input/password-input.vue"
+       import uniPopup from './z_components/uni-popup/uni-popup.vue'
+       export default {
+               components: {
+                       uniPopup,
+                       keyboardPackage,
+                       passwordInput
+               },
+               data() {
+                       return {
+                               numberList: [],
+                               length: 6,
+                               type: 'number',
                                tstyle: {
                                        marginLeft: '10rpx',
                                        fontWeight: 'bold'
                                },
                                vstyle: {
-                                       color: '#FF6F6F'
+                                       color: '#FF6F6F',
+                                       fontSize:'30rpx'
+                               },
+                               status_style: {
+                                       color: '#18B566',
+                                       fontSize:'30rpx'
                                },
                                payBtn: {
                                        backgroundColor: ' #2FA8E1',
                                        border: '1px solid #2FA8E1',
                                        marginTop: '50rpx'
                                },
+                               msg: {},
+                               kind:''
                        }
                },
-               methods:{
-                       
+               methods: {
+                       // 呼起键盘
+                       openKeyBoard(key) {
+                               this.type = key;
+                               this.$refs[key].open();
+                       },
+                       // 输入密码
+                       onInput(val) {
+                               this.numberList.push(val)
+                               if (this.numberList.length == this.length) {
+                                       this.$refs.showPassword.close()
+                                       this.$refs[this.type].close()
+                                       this.pay()
+                               }
+                       },
+                       //完成输入点击完成
+                       onConfirm() {
+                               let length = this.numberList.length
+                               if (length == this.length) {
+                                       this.$refs.showPassword.close()
+                                       this.$refs[this.type].close()
+                               } else {
+                                       this.numberList = []
+                                       uni.showToast({
+                                               title: '密码错误',
+                                               icon: 'none'
+                                       })
+                               }
+                       },
+                       //删除密码
+                       onDelete(val) {
+                               this.numberList.pop(val)
+                       },
+                       //打开密码输入框
+                       open() {
+                               this.numberList = []
+                               this.$refs.showPassword.open()
+                               this.openKeyBoard('number')
+                       },
+                       pay() {
+                               let that = this
+                               let pwd = ''
+                               let billno = that.msg.billNo
+                               that.numberList.forEach(item => {
+                                       pwd += item + ''
+                               })
+                               let param = {
+                                       paypwd: pwd,
+                                       billno
+                               }
+                               that.$u.post('/medicalapi/pay', param).then(res => {
+                                       let status = res.status
+                                       let obj = that.msg
+                                       let date = res.transdate.substr(0, 4) +
+                                               "-" + res.transdate.substr(4, 2) + "-" + res.transdate.substr(6, 2) + " " + res.transtime.substr(0, 2) + ":" +
+                                               res.transtime.substr(2, 2) + ":" + res.transtime.substr(4, 2) 
+                                               setTimeout(()=>{
+                                                       uni.navigateTo({
+                                                               url: `/pages/sub_medical/payResult?status=${status}&msg=${JSON.stringify(obj)}&date=${date}`
+                                                       })
+                                               },1500)
+                               })
+                       },
+                       query() {
+                               let that = this
+                               let billno = that.msg.billNo
+                               that.$u.post('/medicalapi/pay/query/' + billno, {}).then(res => {
+                                       let status = res.status
+                                       if(status == 'wip'){
+                                               uni.showToast({
+                                                       icon:'none',
+                                                       title:'订单正在支付中,请稍等...'
+                                               })
+                                       }else{
+                                               let status = res.status
+                                               let obj = that.msg
+                                               let date = res.transdate.substr(0, 4) +
+                                                       "-" + res.transdate.substr(4, 2) + "-" + res.transdate.substr(6, 2) + " " + res.transtime.substr(0, 2) + ":" +
+                                                       res.transtime.substr(2, 2) + ":" + res.transtime.substr(4, 2) 
+                                                       setTimeout(()=>{
+                                                               uni.navigateTo({
+                                                                       url: `/pages/sub_medical/payResult?status=${status}&msg=${JSON.stringify(obj)}&date=${date}`
+                                                               })
+                                                       },1500)
+                                       }
+                               })
+                       }
                },
-               onLoad(){
-                       
+               onLoad(options) {
+                       let msg = JSON.parse(options.msg)
+                       let id = options.id
+                       this.kind = id
+                       if(id == 'unpay'){
+                               msg.date = msg.medicalDate.substr(0, 4) + '-' + msg.medicalDate.substr(4, 2) + '-' + msg.medicalDate.substr(6, 2) +
+                                       ' ' + msg.medicalDate.substr(8, 2) + ':' + msg.medicalDate.substr(10, 2) + ':' + msg.medicalDate.substr(12, 2)
+                               switch (msg.status) {
+                                       case 'init':
+                                               msg.status_ok = '未支付';
+                                               break
+                                       case 'wip':
+                                               msg.status_ok = '订单正在支付中...'
+                                               break
+                               }
+                               this.msg = msg
+                       }else if(id == 'payed'){
+                               msg.date = msg.medicaldate.substr(0, 4) + '-' + msg.medicaldate.substr(4, 2) + '-' + msg.medicaldate.substr(6, 2) +
+                                       ' ' + msg.medicaldate.substr(8, 2) + ':' + msg.medicaldate.substr(10, 2) + ':' + msg.medicaldate.substr(12, 2)
+                                       msg.billNo = msg.billno
+                                       msg.mergingSubtotal = msg.mergingsubtotal
+                                       msg.mergingName = msg.mergingname
+                                       msg.status_ok = '已完成'
+                                       msg.hospitalName = msg.hospitalname
+                               this.msg = msg
+                       }
                }
        }
 </script>
 
 <style lang="scss" scoped>
-       .u-cell-box{
+       .u-cell-box {
                margin-bottom: 30rpx;
        }
-       .pay{
+
+       .pay {
                font-family: "PingFang-SC-Medium";
        }
-       
+
+       .pwd-wrapper {
+               background: rgba(0, 0, 0, .4);
+               z-index: 1;
+
+               /deep/.uni-popup__wrapper.uni-custom.center {
+                       .uni-popup__wrapper-box {
+                               position: unset;
+                               max-width: none;
+                               max-height: none;
+                               overflow-y: hidden;
+                               background: none;
+                               margin-top: -70rpx;
+                               padding: 60rpx 30rpx 30rpx;
+                       }
+
+                       .pwd-text-wrap {
+                               width: 100%;
+                               padding: 50rpx 43rpx 60rpx;
+                               box-sizing: border-box;
+                       }
+               }
+
+               .uni-tip {
+                       /* #ifndef APP-NVUE */
+                       display: flex;
+                       flex-direction: column;
+                       /* #endif */
+                       margin-top: -60rpx;
+                       width: 570rpx;
+                       background-color: #fff;
+                       border-radius: 12rpx;
+                       position: relative;
+               }
+
+               .uni-pwd {
+                       width: 630rpx;
+               }
+
+               .uni-tip-icon-wrap {
+                       text-align: center;
+               }
+
+               .uni-tip-content {
+                       padding: 31rpx 40rpx 60rpx;
+                       font-size: 30rpx;
+                       color: #6F737A;
+               }
+       }
+
+       .uni-tip-title {
+               margin-top: 30rpx;
+               text-align: center;
+               font-weight: 500;
+               font-size: 34rpx;
+               color: $uni-text-color;
+       }
 </style>
index bd09b48..e36fd54 100644 (file)
@@ -1,23 +1,23 @@
 <template>
        <view class="payResult">
-               <view class="payResult-status" v-if="msg.billstatus ==2">
+               <view class="payResult-status" v-if="msg.billstatus ==1">
                        <icon type="success" size="60" color="#3599FB"></icon>
                        <text class="payResult-status-text">支付成功</text>
                </view>
-               <view class="payResult-status" v-if="msg.billstatus !=2">
+               <view class="payResult-status" v-if="msg.billstatus ==0">
                        <icon type="warn" size="60"></icon>
                        <text class="payResult-status-text">支付失败</text>
                </view>
-               <view class="payResult-money" v-if="msg.billstatus ==2"><text>-¥{{msg.amount?msg.amount:'0.00'}}</text></view>
+               <view class="payResult-money" v-if="msg.billstatus ==1"><text>-¥{{msg.mergingSubtotal?msg.mergingSubtotal:'0.00'}}</text></view>
Content-type: text/html Supwisdom Source - dali_platform/mobile.git/commitdiff


500 - Internal Server Error

Unknown encoding 'gb18030' at /usr/local/share/gitweb/gitweb.cgi line 1539