diff --git a/pages.json b/pages.json index d6eceda..f9f3160 100644 --- a/pages.json +++ b/pages.json @@ -3,20 +3,20 @@ "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue" }, "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages - { - "path": "pages/startup/startup", - "style": { - "navigationStyle": "custom", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/homepage/homepage", - "style": { - "enablePullDownRefresh": false, - "navigationStyle": "custom" - } - }, + { + "path": "pages/startup/startup", + "style": { + "navigationStyle": "custom", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/homepage/homepage", + "style": { + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + }, { "path": "pages/myinformation/myinformation", "style": { @@ -31,8 +31,6 @@ "enablePullDownRefresh": false } }, - - { "path": "pages/medicalservice/medicalservice", "style": { @@ -58,16 +56,12 @@ "navigationBarTitleText": "人脸采集", "enablePullDownRefresh": false } - }, - { + }, { "path": "pages/location/location", "style": { "navigationBarTitleText": "定位", - "navigationStyle": "default", "enablePullDownRefresh": false - // "navigationBarBackgroundColor": "#ffffff" } - } ], "subPackages": [{ @@ -454,13 +448,13 @@ "enablePullDownRefresh": false } }, - // { - // "path": "Filinginformation/Filinginformation", - // "style": { - // "navigationBarTitleText": "查看建档信息" - // // "enablePullDownRefresh": false - // } - // }, + { + "path": "Filinginformation/Filinginformation", + "style": { + "navigationBarTitleText": "查看建档信息", + "enablePullDownRefresh": false + } + }, { "path": "Onlinesigning/Onlinesigning", "style": { @@ -659,4 +653,4 @@ } ] } -} +} \ No newline at end of file diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue index ee123fe..490f64d 100644 --- a/pages/homepage/homepage.vue +++ b/pages/homepage/homepage.vue @@ -19,7 +19,6 @@ 请选择城市 - --> @@ -86,7 +85,6 @@ detail, checkSignApply } from '@/api/pages/homepage/homepage.js' - import QQMapWX from '@/utils/qqMap/qqmap-wx-jssdk.js'; export default { data() { return { @@ -102,13 +100,12 @@ }, onShow() { this.address = uni.getStorageSync('location') - console.log(this.address,'000') + console.log(this.address, '000') if (this.address == '德州市') { uni.setStorageSync("region", 1) } else if (this.address == '东营市') { uni.setStorageSync("region", 2) - } - else if (this.address == '济南市') { + } else if (this.address == '济南市') { uni.setStorageSync("region", 3) } this.userinfo = uni.getStorageSync('userinfo'); @@ -121,8 +118,8 @@ this.checkSign = false } }) - }else{ - this.patientName='' + } else { + this.patientName = '' } }, @@ -284,4 +281,4 @@ + \ No newline at end of file diff --git a/pages/myinformation/myinformation.vue b/pages/myinformation/myinformation.vue index 1bfa172..a8aa0a7 100644 --- a/pages/myinformation/myinformation.vue +++ b/pages/myinformation/myinformation.vue @@ -17,7 +17,10 @@ 请先登录! - + + 已签约 + + 未签约 diff --git a/pagesB/mysigning/mysigning.vue b/pagesB/mysigning/mysigning.vue index b6127cc..8dfb344 100644 --- a/pagesB/mysigning/mysigning.vue +++ b/pagesB/mysigning/mysigning.vue @@ -93,7 +93,7 @@ 解约原因： - diff --git a/pagesC/selectInstitution/selectInstitution.scss b/pagesC/selectInstitution/selectInstitution.scss index e69de29..09c0946 100644 --- a/pagesC/selectInstitution/selectInstitution.scss +++ b/pagesC/selectInstitution/selectInstitution.scss @@ -0,0 +1,146 @@ + .app { + width: 94%; + margin: 20rpx auto; + padding: 20rpx 0 100rpx 0; + background-color: #fff; + font-size: 24rpx; + + .text { + width: 92%; + margin: 30rpx auto; + font-weight: 500; + color: #EE8F15; + } + + .list { + width: 92%; + margin: 0 auto; + + .item { + margin: 40rpx auto; + height: 120rpx; + position: relative; + border-bottom: 2rpx solid #E6E6E6; + + .Selected { + width: 108rpx; + height: 40rpx; + border: 1px solid #26A888; + border-radius: 5rpx; + position: absolute; + right: 0%; + top: 10%; + font-weight: 500; + color: #26A888; + line-height: 40rpx; + text-align: center; + } + + .title { + font-size: 30rpx; + font-weight: 500; + color: #333333; + } + + .address { + font-weight: 400; + color: #8E8E8E; + position: absolute; + left: 0%; + bottom: 10%; + } + + .distance { + font-weight: 400; + color: #8E8E8E; + position: absolute; + right: 0%; + bottom: 10%; + display: flex; + align-items: center; + + image { + padding-right: 10rpx; + width: 17rpx; + height: 21rpx; + } + } + } + } + + .top { + width: 90%; + margin: 0 auto; + display: flex; + height: 84rpx; + justify-content: space-around; + + .inputs { + background-color: #fff; + width: 65%; + height: 60rpx; + border-radius: 5rpx; + background-color: #Ffffff; + z-index: 999; + position: relative; + top: 50%; + transform: translateY(-50%); + background: #F6F6F6; + border: 1px solid #F6F6F6; + border-radius: 38rpx; + + .input { + margin: 0 auto; + position: absolute; + height: 60rpx; + // top: 8%; + left: 13%; + width: 80%; + font-size: 26rpx; + color: #000000; + } + + .icon { + background: url(@/static/pagesB/sousuo.png) no-repeat; + width: 30rpx; + height: 28rpx; + background-size: cover; + position: absolute; + top: 50%; + transform: translateY(-50%); + left: 3%; + } + } + + ::v-deep .u-flex { + width: 100% !important; + } + + ::v-deep .u-dropdown__content { + overflow-y: scroll !important; + height: 500rpx; + + .u-flex { + width: 0 !important; + } + } + + ::v-deep .u-dropdown__content__mask { + background: none !important; + } + + ::v-deep .u-dropdown__menu__item { + width: 100% !important; + } + + ::v-deep .u-cell__value { + flex: 0; + } + + ::v-deep .u-dropdown { + :v-deep .u-dropdown__menu {} + } + + ::v-deep .u-cell-box {} + } + } diff --git a/pagesC/selectInstitution/selectInstitution.vue b/pagesC/selectInstitution/selectInstitution.vue index 51f260c..d938e79 100644 --- a/pagesC/selectInstitution/selectInstitution.vue +++ b/pagesC/selectInstitution/selectInstitution.vue @@ -152,150 +152,5 @@ diff --git a/utils/qqMap/qqmap-wx-jssdk.js b/utils/qqMap/qqmap-wx-jssdk.js deleted file mode 100644 index 4d53c58..0000000 --- a/utils/qqMap/qqmap-wx-jssdk.js +++ /dev/null @@ -1,462 +0,0 @@ -/** - * 微信小程序JavaScriptSDK - * - * @version 1.0 - * @date 2017-01-10 - * @author jaysonzhou@tencent.com - */ - -var ERROR_CONF = { - KEY_ERR: 311, - KEY_ERR_MSG: 'key格式错误', - PARAM_ERR: 310, - PARAM_ERR_MSG: '请求参数信息有误', - SYSTEM_ERR: 600, - SYSTEM_ERR_MSG: '系统错误', - WX_ERR_CODE: 1000, - WX_OK_CODE: 200 -}; -var BASE_URL = 'https://apis.map.qq.com/ws/'; -var URL_SEARCH = BASE_URL + 'place/v1/search'; -var URL_SUGGESTION = BASE_URL + 'place/v1/suggestion'; -var URL_GET_GEOCODER = BASE_URL + 'geocoder/v1/'; -var URL_CITY_LIST = BASE_URL + 'district/v1/list'; -var URL_AREA_LIST = BASE_URL + 'district/v1/getchildren'; -var URL_DISTANCE = BASE_URL + 'distance/v1/'; -var Utils = { - /** - * 得到终点query字符串 - * @param {Array|String} 检索数据 - */ - location2query(data) { - if (typeof data == 'string') { - return data; - } - var query = ''; - for (var i = 0; i < data.length; i++) { - var d = data[i]; - if (!!query) { - query += ';'; - } - if (d.location) { - query = query + d.location.lat + ',' + d.location.lng; - } - if (d.latitude && d.longitude) { - query = query + d.latitude + ',' + d.longitude; - } - } - return query; - }, - - /** - * 使用微信接口进行定位 - */ - getWXLocation(success, fail, complete) { - wx.getLocation({ - type: 'gcj02', - success: success, - fail: fail, - complete: complete - }); - }, - - /** - * 获取location参数 - */ - getLocationParam(location) { - if (typeof location == 'string') { - var locationArr = location.split(','); - if (locationArr.length === 2) { - location = { - latitude: location.split(',')[0], - longitude: location.split(',')[1] - }; - } else { - location = {}; - } - } - return location; - }, - - /** - * 回调函数默认处理 - */ - polyfillParam(param) { - param.success = param.success || function () { }; - param.fail = param.fail || function () { }; - param.complete = param.complete || function () { }; - }, - - /** - * 验证param对应的key值是否为空 - * - * @param {Object} param 接口参数 - * @param {String} key 对应参数的key - */ - checkParamKeyEmpty(param, key) { - if (!param[key]) { - var errconf = this.buildErrorConfig(ERROR_CONF.PARAM_ERR, ERROR_CONF.PARAM_ERR_MSG + key +'参数格式有误'); - param.fail(errconf); - param.complete(errconf); - return true; - } - return false; - }, - - /** - * 验证参数中是否存在检索词keyword - * - * @param {Object} param 接口参数 - */ - checkKeyword(param){ - return !this.checkParamKeyEmpty(param, 'keyword'); - }, - - /** - * 验证location值 - * - * @param {Object} param 接口参数 - */ - checkLocation(param) { - var location = this.getLocationParam(param.location); - if (!location || !location.latitude || !location.longitude) { - var errconf = this.buildErrorConfig(ERROR_CONF.PARAM_ERR, ERROR_CONF.PARAM_ERR_MSG + ' location参数格式有误') - param.fail(errconf); - param.complete(errconf); - return false; - } - return true; - }, - - /** - * 构造错误数据结构 - * @param {Number} errCode 错误码 - * @param {Number} errMsg 错误描述 - */ - buildErrorConfig(errCode, errMsg) { - return { - status: errCode, - message: errMsg - }; - }, - - /** - * 构造微信请求参数，公共属性处理 - * - * @param {Object} param 接口参数 - * @param {Object} param 配置项 - */ - buildWxRequestConfig(param, options) { - var that = this; - options.header = { "content-type": "application/json" }; - options.method = 'GET'; - options.success = function (res) { - var data = res.data; - if (data.status === 0) { - param.success(data); - } else { - param.fail(data); - } - }; - options.fail = function (res) { - res.statusCode = ERROR_CONF.WX_ERR_CODE; - param.fail(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE, result.errMsg)); - }; - options.complete = function (res) { - var statusCode = +res.statusCode; - switch(statusCode) { - case ERROR_CONF.WX_ERR_CODE: { - param.complete(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE, res.errMsg)); - break; - } - case ERROR_CONF.WX_OK_CODE: { - var data = res.data; - if (data.status === 0) { - param.complete(data); - } else { - param.complete(that.buildErrorConfig(data.status, data.message)); - } - break; - } - default:{ - param.complete(that.buildErrorConfig(ERROR_CONF.SYSTEM_ERR, ERROR_CONF.SYSTEM_ERR_MSG)); - } - - } - } - return options; - }, - - /** - * 处理用户参数是否传入坐标进行不同的处理 - */ - locationProcess(param, locationsuccess, locationfail, locationcomplete) { - var that = this; - locationfail = locationfail || function (res) { - res.statusCode = ERROR_CONF.WX_ERR_CODE; - param.fail(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE, res.errMsg)); - }; - locationcomplete = locationcomplete || function (res) { - if (res.statusCode == ERROR_CONF.WX_ERR_CODE) { - param.complete(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE, res.errMsg)); - } - }; - if (!param.location) { - that.getWXLocation(locationsuccess, locationfail, locationcomplete); - } else if (that.checkLocation(param)) { - var location = Utils.getLocationParam(param.location); - locationsuccess(location); - } - } -} - - -class QQMapWX { - - /** - * 构造函数 - * - * @param {Object} options 接口参数,key 为必选参数 - */ - constructor(options) { - if (!options.key) { - throw Error('key值不能为空'); - } - this.key = options.key; - } - - /** - * POI周边检索 - * - * @param {Object} options 接口参数对象 - * - * 参数对象结构可以参考 - * @see http://lbs.qq.com/webservice_v1/guide-search.html - */ - search(options) { - var that = this; - options = options || {}; - - Utils.polyfillParam(options); - - if (!Utils.checkKeyword(options)) { - return; - } - - var requestParam = { - keyword: options.keyword, - orderby: options.orderby || '_distance', - page_size: options.page_size || 10, - page_index: options.page_index || 1, - output: 'json', - key: that.key - }; - - if (options.address_format) { - requestParam.address_format = options.address_format; - } - - if (options.filter) { - requestParam.filter = options.filter; - } - - var distance = options.distance || "1000"; - var auto_extend = options.auto_extend || 1; - - var locationsuccess = function (result) { - requestParam.boundary = "nearby(" + result.latitude + "," + result.longitude + "," + distance + "," + auto_extend +")"; - wx.request(Utils.buildWxRequestConfig(options, { - url: URL_SEARCH, - data: requestParam - })); - } - Utils.locationProcess(options, locationsuccess); - } - - /** - * sug模糊检索 - * - * @param {Object} options 接口参数对象 - * - * 参数对象结构可以参考 - * http://lbs.qq.com/webservice_v1/guide-suggestion.html - */ - getSuggestion(options) { - var that = this; - options = options || {}; - Utils.polyfillParam(options); - - if (!Utils.checkKeyword(options)) { - return; - } - - var requestParam = { - keyword: options.keyword, - region: options.region || '全国', - region_fix: options.region_fix || 0, - policy: options.policy || 0, - output: 'json', - key: that.key - }; - wx.request(Utils.buildWxRequestConfig(options, { - url: URL_SUGGESTION, - data: requestParam - })); - } - - /** - * 逆地址解析 - * - * @param {Object} options 接口参数对象 - * - * 请求参数结构可以参考 - * http://lbs.qq.com/webservice_v1/guide-gcoder.html - */ - reverseGeocoder(options) { - var that = this; - options = options || {}; - Utils.polyfillParam(options); - var requestParam = { - coord_type: options.coord_type || 5, - get_poi: options.get_poi || 0, - output: 'json', - key: that.key - }; - if (options.poi_options) { - requestParam.poi_options = options.poi_options - } - - var locationsuccess = function (result) { - requestParam.location = result.latitude + ',' + result.longitude; - wx.request(Utils.buildWxRequestConfig(options, { - url: URL_GET_GEOCODER, - data: requestParam - })); - }; - Utils.locationProcess(options, locationsuccess); - } - - /** - * 地址解析 - * - * @param {Object} options 接口参数对象 - * - * 请求参数结构可以参考 - * http://lbs.qq.com/webservice_v1/guide-geocoder.html - */ - geocoder(options) { - var that = this; - options = options || {}; - Utils.polyfillParam(options); - - if (Utils.checkParamKeyEmpty(options, 'address')) { - return; - } - - var requestParam = { - address: options.address, - output: 'json', - key: that.key - }; - - wx.request(Utils.buildWxRequestConfig(options, { - url: URL_GET_GEOCODER, - data: requestParam - })); - } - - - /** - * 获取城市列表 - * - * @param {Object} options 接口参数对象 - * - * 请求参数结构可以参考 - * http://lbs.qq.com/webservice_v1/guide-region.html - */ - getCityList(options) { - var that = this; - options = options || {}; - Utils.polyfillParam(options); - var requestParam = { - output: 'json', - key: that.key - }; - - wx.request(Utils.buildWxRequestConfig(options, { - url: URL_CITY_LIST, - data: requestParam - })); - } - - /** - * 获取对应城市ID的区县列表 - * - * @param {Object} options 接口参数对象 - * - * 请求参数结构可以参考 - * http://lbs.qq.com/webservice_v1/guide-region.html - */ - getDistrictByCityId(options) { - var that = this; - options = options || {}; - Utils.polyfillParam(options); - - if (Utils.checkParamKeyEmpty(options, 'id')) { - return; - } - - var requestParam = { - id: options.id || '', - output: 'json', - key: that.key - }; - - wx.request(Utils.buildWxRequestConfig(options, { - url: URL_AREA_LIST, - data: requestParam - })); - } - - /** - * 用于单起点到多终点的路线距离(非直线距离)计算： - * 支持两种距离计算方式：步行和驾车。 - * 起点到终点最大限制直线距离10公里。 - * - * @param {Object} options 接口参数对象 - * - * 请求参数结构可以参考 - * http://lbs.qq.com/webservice_v1/guide-distance.html - */ - calculateDistance(options) { - var that = this; - options = options || {}; - Utils.polyfillParam(options); - - if (Utils.checkParamKeyEmpty(options, 'to')) { - return; - } - - var requestParam = { - mode: options.mode || 'walking', - to: Utils.location2query(options.to), - output: 'json', - key: that.key - }; - - var locationsuccess = function (result) { - requestParam.from = result.latitude + ',' + result.longitude; - wx.request(Utils.buildWxRequestConfig(options, { - url: URL_DISTANCE, - data: requestParam - })); - } - if (options.from) { - options.location = options.from; - } - - Utils.locationProcess(options, locationsuccess); - } -} - -module.exports = QQMapWX; \ No newline at end of file diff --git a/utils/qqMap/qqmap-wx-jssdk.min.js b/utils/qqMap/qqmap-wx-jssdk.min.js deleted file mode 100644 index b92f25a..0000000 --- a/utils/qqMap/qqmap-wx-jssdk.min.js +++ /dev/null @@ -1,2 +0,0 @@ -var _createClass=function(){function a(e,c){for(var b=0;b