From: guangchao.xu Date: Fri, 16 Apr 2021 09:44:30 +0000 (+0800) Subject: android添加银行插件 X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=6cdd45eb29ac9b3d3309225c2e79d4a1e721a71a;p=dali_platform%2Fmobile.git android添加银行插件 --- diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json new file mode 100644 index 0000000..501e01c --- /dev/null +++ b/.hbuilderx/launch.json @@ -0,0 +1,11 @@ +{ // launch.json 配置了启动调试时相关设置,configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/ + // launchtype项可配置值为local或remote, local代表前端连本地云函数,remote代表前端连云端云函数 + "version": "0.0", + "configurations": [{ + "type": "uniCloud", + "default": { + "launchtype": "remote" + } + } + ] +} diff --git a/App.vue b/App.vue index 9d1fac8..9ed2cc6 100644 --- a/App.vue +++ b/App.vue @@ -2,9 +2,9 @@ export default { globalData: { msg: {}, - verno:'10', - vername:'2.2.0', - version:'2.2.0(11)' + verno:'', + vername:'', + version:'' }, onLaunch() { let that = this @@ -33,9 +33,6 @@ } }) - - - //锁定屏幕 plus.screen.lockOrientation("portrait-primary") @@ -69,49 +66,16 @@ } }); - let uid = uni.getStorageSync("uid") + let uid = uni.getStorageSync("userid") //设置Alias KJJPush.setAlias(uid ? uid : 'tourist', 1, result => { - //console.log("setAlias:" + JSON.stringify(result)); + console.log("setAlias:" + JSON.stringify(result)); }); //监听推送打开通知,(前台、后台、ios app完全退出)都可以监听 KJJPush.addNotifyMessageOpened(result => { - console.log(result) - var str = JSON.stringify(result); - // uni.showModal({ - // title: '推送通知测试', - // content: str, - // success: function(res) {} - // }); }); - //监听自定义推送消息 - KJJPush.addCustomizeNotifyMessage(result => { - var str = JSON.stringify(result); - // uni.showModal({ - // title: 'KJ-JPush', - // content: str, - // showCancel: false, - // success: function(res) {} - // }); - }); - //监听推送消息 - // KJJPush.addNotifyMessage(result => { - // console.log(result) - // var str = JSON.stringify(result); - // uni.showModal({ - // title: '推送通知', - // content: str, - // success: function(res) { - // if (res.confirm) { - // KJJPush.clearAllNotifications(); - // KJJPush.ios_resetJPushBadge(); - // } - // } - // }); - // }); - // #endif //判断token是否过期 @@ -122,7 +86,7 @@ if (!token) { //if (isFirstTimeEnterApp) { //判断是否第一次进入App 先入引导页 uni.reLaunch({ - url: "/pages/sub_basic/login/index" + url: "/pages/sub_basic/login" }) //} } else { @@ -141,7 +105,7 @@ if (hands) { uni.setStorageSync("login", 2) uni.reLaunch({ - url: "/pages/sub_mine/lock/index" + url: "/pages/sub_mine/lock" }) } else { uni.switchTab({ @@ -152,9 +116,9 @@ }).catch(res => { uni.setStorageSync('token', '') - if (routes.length != 0 || curRoute != 'pages/sub_basic/login/index') { + if (routes.length != 0 || curRoute != 'pages/sub_basic/login') { uni.reLaunch({ - url: "/pages/sub_basic/login/index" + url: "/pages/sub_basic/login" }) } @@ -178,12 +142,15 @@ if (!res.isConnected || res.networkType == '2g' || res.networkType == 'none') { let routes = getCurrentPages() let curRoute = routes[routes.length - 1].route - if (curRoute == 'pages/sub_basic/login/index' || curRoute == 'pages/sub_basic/register/index' || curRoute == - 'pages/sub_basic/forgetPwd/index') { - + if (curRoute == 'pages/sub_basic/login' || curRoute == 'pages/sub_basic/register' || curRoute == + 'pages/sub_basic/forgetPwd') { + uni.showToast({ + title:'暂无可用网络。请开启网络', + icon:'none' + }) } else { uni.navigateTo({ - url: "/pages/sub_basic/network/index" + url: "/pages/sub_basic/network" }) } } diff --git a/main.js b/main.js index 1f1a6bb..59255e9 100644 --- a/main.js +++ b/main.js @@ -16,7 +16,6 @@ import store from '@/store' // 引入uView提供的对vuex的简写法文件 let vuexStore = require('@/store/$u.mixin.js') Vue.mixin(vuexStore) - // #ifndef H5 var value = "" uni.getScreenBrightness({ @@ -60,7 +59,7 @@ Vue.prototype.toPath = function(e) { success(res) { if (res.confirm) { uni.reLaunch({ - url: '/pages/sub_basic/login/index' + url: '/pages/sub_basic/login' }) } } diff --git a/manifest.json b/manifest.json index 80841d5..e9777a4 100644 --- a/manifest.json +++ b/manifest.json @@ -3,7 +3,7 @@ "appid" : "__UNI__6DDB720", "description" : "大理市民服务app", "versionName" : "2.2.1", - "versionCode" : 12, + "versionCode" : 13, "transformPx" : false, "app-plus" : { // APP-VUE分包,可提APP升启动速度,2.7.12开始支持,兼容微信小程序分包方案,默认关闭 @@ -199,6 +199,20 @@ } } } + }, + "ynrcc-pay" : { + "__plugin_info__" : { + "name" : "云南农信支付", + "description" : "云南农信支付", + "platforms" : "Android", + "url" : "", + "android_package_name" : "", + "ios_bundle_id" : "", + "isCloud" : false, + "bought" : -1, + "pid" : "", + "parameters" : {} + } } } }, diff --git a/nativeplugins/ynrcc-pay/android/ynrcc-openapi-release-1.01.aar b/nativeplugins/ynrcc-pay/android/ynrcc-openapi-release-1.01.aar new file mode 100644 index 0000000..7163646 Binary files /dev/null and b/nativeplugins/ynrcc-pay/android/ynrcc-openapi-release-1.01.aar differ diff --git a/nativeplugins/ynrcc-pay/android/ynrcc-release.aar b/nativeplugins/ynrcc-pay/android/ynrcc-release.aar new file mode 100644 index 0000000..86042f6 Binary files /dev/null and b/nativeplugins/ynrcc-pay/android/ynrcc-release.aar differ diff --git a/nativeplugins/ynrcc-pay/package.json b/nativeplugins/ynrcc-pay/package.json new file mode 100644 index 0000000..a8b5693 --- /dev/null +++ b/nativeplugins/ynrcc-pay/package.json @@ -0,0 +1,35 @@ +{ + "name": "云南农信支付", + "id": "ynrcc-pay", // 插件标识 + "version": "1.0", + "description": "云南农信支付", + "_dp_type": "nativeplugin", + "_dp_nativeplugin": { + "android": { + "plugins": [{ + "type": "module", + "name": "ynrcc-pay", //id为前缀 + "class": "com.test.ynrcc.YnrccPay" + }], + "hooksClass": "", + "integrateType": "aar", + "dependencies": [ + "com.github.xiaosalanqiao:utilslibrary:1.04", + "org.projectlombok:lombok:1.18.12" + + ], + "compileOptions": { //可选,Java编译参数配置 + "sourceCompatibility": "1.8", + "targetCompatibility": "1.8" + }, + "abis": ["armeabi-v7a", "x86"], + "minSdkVersion": "16", + "useAndroidX": true, //可选,是否兼容使用AndroidX + "permissions": [ + "android.permission.INTERNET", + "android.permission.ACCESS_NETWORK_STATE", + "android.permission.ACCESS_WIFI_STATE" + ] + } + } +} diff --git a/pages.json b/pages.json index a918896..60ec098 100644 --- a/pages.json +++ b/pages.json @@ -77,7 +77,7 @@ "subPackages": [{ "root": "pages/sub_basic", "pages": [{ - "path": "register/index", + "path": "register", "style": { "navigationBarTitleText": "注册", "app-plus": { @@ -86,7 +86,7 @@ } }, { - "path": "login/index", + "path": "login", "style": { "navigationBarTitleText": "登录", "app-plus": { @@ -95,13 +95,13 @@ } }, { - "path": "network/index", + "path": "network", "style": { "navigationBarTitleText": "网络错误" } }, { - "path": "forgetPwd/index", + "path": "forgetPwd", "style": { "navigationBarTitleText": "忘记密码", "app-plus": { @@ -110,13 +110,13 @@ } }, { - "path": "verification/index", + "path": "verification", "style": { "navigationBarTitleText": "手机认证" } }, { - "path": "forgetPwd/question", + "path": "question", "style": { "navigationBarTitleText": "密保验证" } @@ -126,13 +126,13 @@ }, { "root": "pages/sub_index", "pages": [{ - "path": "activeDetails/index", + "path": "activeDetails", "style": { "navigationBarTitleText": "活动详情" } }, { - "path": "issueQuestion/index", + "path": "issueQuestion", "style": { "navigationBarTitleText": "发布咨询", "app-plus": { @@ -141,7 +141,7 @@ } }, { - "path": "qrcode/index", + "path": "qrcode", "style": { "navigationBarTitleText": "我的码", "app-plus": { @@ -150,7 +150,7 @@ } }, { - "path": "introduce/index", + "path": "introduce", "style": { "navigationBarTitleText": "市民卡简介", "app-plus": { @@ -159,37 +159,37 @@ } }, { - "path": "getCityCard/index", + "path": "getCityCard", "style": { "navigationBarTitleText": "市民卡办理" } }, { - "path": "activateCard/index", + "path": "activateCard", "style": { "navigationBarTitleText": "开卡" } }, { - "path": "cardApply/index", + "path": "cardApply", "style": { "navigationBarTitleText": "卡应用" } }, { - "path": "chat/index", + "path": "chat", "style": { "navigationBarTitleText": "咨询" } }, { - "path": "chatIssue/index", + "path": "chatIssue", "style": { "navigationBarTitleText": "咨询库" } }, { - "path": "offlineHelp/index", + "path": "offlineHelp", "style": { "navigationBarTitleText": "网点查询", "app-plus": { @@ -203,25 +203,25 @@ } }, { - "path": "question/index", + "path": "question", "style": { "navigationBarTitleText": "常见问题" } }, { - "path": "busRecords/index", + "path": "busRecords", "style": { "navigationBarTitleText": "乘车记录" } }, { - "path": "chatDetails/index", + "path": "chatDetails", "style": { "navigationBarTitleText": "详情" } }, { - "path": "scanView/index", + "path": "scanView", "style": { "navigationBarTitleText": "二维码扫描结果", "app-plus": { @@ -230,7 +230,7 @@ } }, { - "path": "scanView/pay", + "path": "pay", "style": { "navigationBarTitleText": "二维码扫描结果", "app-plus": { @@ -242,13 +242,13 @@ }, { "root": "pages/sub_mine", "pages": [{ - "path": "reportheLoss/index", + "path": "reportheLoss", "style": { "navigationBarTitleText": "挂失" } }, { - "path": "lock/index", + "path": "lock", "style": { "navigationBarTitleText": "手势解锁", "app-plus": { @@ -261,7 +261,7 @@ } }, { - "path": "billsDetails/index", + "path": "billsDetails", "style": { "navigationBarTitleText": "账单详情", "app-plus": { @@ -270,55 +270,61 @@ } }, { - "path": "accountSafe/index", + "path": "shop", + "style": { + "navigationBarTitleText": "商户管理" + } + }, + { + "path": "accountSafe", "style": { "navigationBarTitleText": "账户安全" } }, { - "path": "bindBankCard/index", + "path": "bindBankCard", "style": { "navigationBarTitleText": "绑定市民卡" } }, { - "path": "changeLoginPwd/index", + "path": "changeLoginPwd", "style": { "navigationBarTitleText": "修改登录密码" } }, { - "path": "changePayPwd/index", + "path": "changePayPwd", "style": { "navigationBarTitleText": "设置支付密码" } }, { - "path": "findPayPwd/index", + "path": "findPayPwd", "style": { "navigationBarTitleText": "找回密码" } }, { - "path": "otherPay/index", + "path": "otherPay", "style": { "navigationBarTitleText": "支付(指纹)" } }, { - "path": "otherLogin/index", + "path": "otherLogin", "style": { "navigationBarTitleText": "指纹/手势/人脸登录" } }, { - "path": "leaveMsgDetail/index", + "path": "leaveMsgDetail", "style": { "navigationBarTitleText": "留言详情" } }, { - "path": "cashFlow/index", + "path": "cashFlow", "style": { "navigationBarTitleText": "我的足迹", "app-plus": { @@ -327,79 +333,85 @@ } }, { - "path": "agreement/index", + "path": "agreement", "style": { "navigationBarTitleText": "用户协议" } }, { - "path": "bindSxy/index", + "path": "bindSxy", "style": { "navigationBarTitleText": "签约" } }, { - "path": "agreementSign/index", + "path": "agreementSign", "style": { "navigationBarTitleText": "市民卡免密代扣签约协议" } }, { - "path": "unbindBankCard/index", + "path": "unbindBankCard", "style": { "navigationBarTitleText": "解绑市民卡" } }, { - "path": "personalMsg/index", + "path": "personalMsg", "style": { "navigationBarTitleText": "我的信息" } }, { - "path": "leaveMsg/index", + "path": "leaveMsg", "style": { "navigationBarTitleText": "留言" } }, { - "path": "message/index", + "path": "message", "style": { - "navigationBarTitleText": "我的消息" + "navigationBarTitleText": "消息" } }, { - "path": "integral/index", + "path": "integral", "style": { "navigationBarTitleText": "我的积分" } }, { - "path": "voucher/index", + "path": "voucher", "style": { "navigationBarTitleText": "我的卡券" } }, { - "path": "bindEmail/index", + "path": "bindEmail", "style": { "navigationBarTitleText": "设置邮箱" } }, { - "path": "question/index", + "path": "question", "style": { "navigationBarTitleText": "密保" } }, { - "path": "setQuestion/index", + "path": "setQuestion", "style": { "navigationBarTitleText": "设置密保" } }, { - "path": "integralQuery/index", + "path": "setting", + "style": { + "navigationBarTitleText": "我的设置" + } + }, + { + "path": "integralQuery", "style": { "navigationBarTitleText": "积分查询" //#ifdef APP-PLUS @@ -427,6 +439,12 @@ "navigationBarTitleText": "门诊预约" } }, + { + "path": "queryBills", + "style": { + "navigationBarTitleText": "查询订单" + } + }, { "path": "queryDate", "style": { diff --git a/pages/sub_basic/forgetPwd/index.vue b/pages/sub_basic/forgetPwd.vue similarity index 93% rename from pages/sub_basic/forgetPwd/index.vue rename to pages/sub_basic/forgetPwd.vue index 0c5e66e..97105ba 100644 --- a/pages/sub_basic/forgetPwd/index.vue +++ b/pages/sub_basic/forgetPwd.vue @@ -5,7 +5,12 @@ @@ -17,7 +22,7 @@ - 密保改密 + 密保改密 修改密码 @@ -156,7 +161,7 @@ complete(res) { setTimeout(() => { uni.reLaunch({ - url: "/pages/sub_basic/login/index" + url: "/pages/sub_basic/login" }) }, 1500) } diff --git a/static/images/login/face.png b/pages/sub_basic/images/login/face.png similarity index 100% rename from static/images/login/face.png rename to pages/sub_basic/images/login/face.png diff --git a/static/images/login/finge.png b/pages/sub_basic/images/login/finge.png similarity index 100% rename from static/images/login/finge.png rename to pages/sub_basic/images/login/finge.png diff --git a/static/images/login/hands.png b/pages/sub_basic/images/login/hands.png similarity index 100% rename from static/images/login/hands.png rename to pages/sub_basic/images/login/hands.png diff --git a/static/images/login/logo.png b/pages/sub_basic/images/login/logo.png similarity index 100% rename from static/images/login/logo.png rename to pages/sub_basic/images/login/logo.png diff --git a/pages/sub_basic/login/index.vue b/pages/sub_basic/login.vue similarity index 86% rename from pages/sub_basic/login/index.vue rename to pages/sub_basic/login.vue index 716fc47..372f6c7 100644 --- a/pages/sub_basic/login/index.vue +++ b/pages/sub_basic/login.vue @@ -5,7 +5,12 @@ 登录 - 注册 + 注册 @@ -150,7 +163,7 @@ uni.setStorageSync("pwd", b) if(res.needcheck){ uni.navigateTo({ - url:'/pages/sub_basic/verification/index?data=' + JSON.stringify(params) + url:'/pages/sub_basic/verification?data=' + JSON.stringify(params) }) return false } @@ -216,7 +229,7 @@ uni.setStorageSync("email", res.email) if(res.needcheck){ uni.navigateTo({ - url:'/pages/sub_basic/verification/index?data=' + JSON.stringify(params) + url:'/pages/sub_basic/verification?data=' + JSON.stringify(params) }) return false } @@ -285,7 +298,6 @@ icon: "none", mask: true, }) - // plus.nativeUI.toast("未开启指纹登录,请使用其他方式登录"); } }, faceIn() { @@ -304,7 +316,6 @@ icon: "none", mask: true, }) - //plus.nativeUI.toast("未开启面容登录,请使用其他方式登录"); } }, handsIn() { @@ -312,7 +323,7 @@ if (hands) { uni.setStorageSync("login", 1) uni.navigateTo({ - url: "/pages/sub_mine/lock/index" + url: "/pages/sub_mine/lock" }) } else { uni.showToast({ @@ -321,7 +332,6 @@ icon: "none", mask: true, }) - //plus.nativeUI.toast("未开启手势登录,请使用其他方式登录"); } } } @@ -408,7 +418,7 @@ display: flex; justify-content: center; flex-direction: column; - + align-items: center; &-title { display: flex; justify-content: center; @@ -417,6 +427,7 @@ } &-icon { + width: 50%; display: flex; justify-content: space-around; margin-top: 30rpx; diff --git a/pages/sub_basic/network/index.vue b/pages/sub_basic/network.vue similarity index 100% rename from pages/sub_basic/network/index.vue rename to pages/sub_basic/network.vue diff --git a/pages/sub_basic/forgetPwd/question.vue b/pages/sub_basic/question.vue similarity index 86% rename from pages/sub_basic/forgetPwd/question.vue rename to pages/sub_basic/question.vue index 36b90e7..f8da803 100644 --- a/pages/sub_basic/forgetPwd/question.vue +++ b/pages/sub_basic/question.vue @@ -7,7 +7,15 @@ @click="choose_list(i,'confirm'+i)"> - + + + + + + + + + 验证密保 @@ -59,7 +67,7 @@ a_value: '', a_title: 'A1:', isShow: false, - func: null + func: function(){} }, { q_title: 'Q2:', @@ -67,7 +75,7 @@ a_value: '', a_title: 'A2:', isShow: false, - func: null + func: function(){} }, { q_title: 'Q3:', @@ -75,7 +83,7 @@ a_value: '', a_title: 'A3:', isShow: false, - func: null + func: function(){} }, ], answers: [{ @@ -101,6 +109,7 @@ }, methods: { choose_list(e, fun_name) { + // console.log(e,fun_name) this.list_select[e].isShow = true this.list_select[e].func = this[fun_name] }, @@ -240,7 +249,7 @@ complete(res) { setTimeout(() => { uni.reLaunch({ - url: "/pages/sub_basic/login/index" + url: "/pages/sub_basic/login" }) }, 1500) } diff --git a/pages/sub_basic/register/index.vue b/pages/sub_basic/register.vue similarity index 93% rename from pages/sub_basic/register/index.vue rename to pages/sub_basic/register.vue index 1928b39..40732c5 100644 --- a/pages/sub_basic/register/index.vue +++ b/pages/sub_basic/register.vue @@ -5,7 +5,12 @@ @@ -19,7 +24,7 @@ :password="true" type="number"clear-size="40"> - 我已同意《用户协议》 + 我已同意《用户协议》 立即注册 @@ -167,7 +172,7 @@ complete(res) { setTimeout(() => { uni.reLaunch({ - url: "/pages/sub_basic/login/index" + url: "/pages/sub_basic/login" }) }, 1500) } diff --git a/pages/sub_basic/verification/index.vue b/pages/sub_basic/verification.vue similarity index 100% rename from pages/sub_basic/verification/index.vue rename to pages/sub_basic/verification.vue diff --git a/pages/sub_index/activateCard/index.vue b/pages/sub_index/activateCard.vue similarity index 89% rename from pages/sub_index/activateCard/index.vue rename to pages/sub_index/activateCard.vue index 8fc7bfe..5bb6dac 100644 --- a/pages/sub_index/activateCard/index.vue +++ b/pages/sub_index/activateCard.vue @@ -10,12 +10,12 @@ - + - + @@ -25,12 +25,12 @@ - + - + diff --git a/pages/sub_index/activeDetails/index.vue b/pages/sub_index/activeDetails.vue similarity index 97% rename from pages/sub_index/activeDetails/index.vue rename to pages/sub_index/activeDetails.vue index 13fed63..e75322c 100644 --- a/pages/sub_index/activeDetails/index.vue +++ b/pages/sub_index/activeDetails.vue @@ -19,7 +19,7 @@ - 报名 + diff --git a/pages/sub_index/busRecords/index.vue b/pages/sub_index/busRecords.vue similarity index 100% rename from pages/sub_index/busRecords/index.vue rename to pages/sub_index/busRecords.vue diff --git a/pages/sub_index/cardApply/index.vue b/pages/sub_index/cardApply.vue similarity index 99% rename from pages/sub_index/cardApply/index.vue rename to pages/sub_index/cardApply.vue index 217ab3e..2665275 100644 --- a/pages/sub_index/cardApply/index.vue +++ b/pages/sub_index/cardApply.vue @@ -27,8 +27,7 @@ 我的权益: - 公交乘车:普通卡9折、爱心卡、学生卡原价5折;阳光卡、老年卡每年享1500次免费乘坐。 - 市民卡日(每月第一周的周六周日):到指定商户消费享受最低5折优惠。 + @@ -37,7 +36,7 @@ export default { data() { return { - cardApplyBtn:{ + cardApplyBtn: { width: '600rpx', backgroundColor: '#2FA8E1', color: '#FFFFFF', @@ -46,44 +45,57 @@ marginTop: '50rpx', padding: '50rpx 0' }, - name:'', - bankcardno:'', - cardno:'' + name: '', + bankcardno: '', + cardno: '', + text:'' } }, methods: { - apply(){ + apply() { uni.showToast({ - title:"暂无其他卡可申请", - icon:"none", - duration:1500 + title: "暂无其他卡可申请", + icon: "none", + duration: 1500 }) } }, - onLoad(){ + onLoad() { let that = this - that.name = uni.getStorageSync('name')?uni.getStorageSync('name'):'佚名' - that.bankcardno = uni.getStorageSync('bankcardno')?uni.getStorageSync('bankcardno').substr(uni.getStorageSync('bankcardno').length-4):'****' - that.cardno = uni.getStorageSync('cardno')?uni.getStorageSync('cardno'):'暂无市民卡信息' + that.name = uni.getStorageSync('name') ? uni.getStorageSync('name') : '佚名' + that.bankcardno = uni.getStorageSync('bankcardno') ? uni.getStorageSync('bankcardno').substr(uni.getStorageSync( + 'bankcardno').length - 4) : '****' + that.cardno = uni.getStorageSync('cardno') ? uni.getStorageSync('cardno') : '暂无市民卡信息' + that.get_rule() + }, + methods: { + get_rule() { + let that = this + that.$u.get('/i/prompt/get/rights',).then(res => { + let content = res.prompt + that.text = content.replace(/\n/g,"
") + }) + } } } diff --git a/pages/sub_index/chat/index.vue b/pages/sub_index/chat.vue similarity index 95% rename from pages/sub_index/chat/index.vue rename to pages/sub_index/chat.vue index 20c9f37..26c04c4 100644 --- a/pages/sub_index/chat/index.vue +++ b/pages/sub_index/chat.vue @@ -11,10 +11,10 @@ - + - + diff --git a/pages/sub_index/chatDetails/index.vue b/pages/sub_index/chatDetails.vue similarity index 100% rename from pages/sub_index/chatDetails/index.vue rename to pages/sub_index/chatDetails.vue diff --git a/pages/sub_index/chatIssue/index.vue b/pages/sub_index/chatIssue.vue similarity index 97% rename from pages/sub_index/chatIssue/index.vue rename to pages/sub_index/chatIssue.vue index fa3f256..bf86ec1 100644 --- a/pages/sub_index/chatIssue/index.vue +++ b/pages/sub_index/chatIssue.vue @@ -11,7 +11,7 @@ - + 发布 @@ -23,7 +23,7 @@ - 哇,好大的雪啊,你们那里雪大吗? + 哇,好大的雪啊,你们那里雪大吗? 张嚣 diff --git a/pages/sub_index/getCityCard/index.vue b/pages/sub_index/getCityCard.vue similarity index 95% rename from pages/sub_index/getCityCard/index.vue rename to pages/sub_index/getCityCard.vue index ed67fab..7430f4b 100644 --- a/pages/sub_index/getCityCard/index.vue +++ b/pages/sub_index/getCityCard.vue @@ -2,7 +2,7 @@ - + @@ -11,7 +11,7 @@ - + diff --git a/static/images/activateCard/photo.png b/pages/sub_index/images/activateCard/photo.png similarity index 100% rename from static/images/activateCard/photo.png rename to pages/sub_index/images/activateCard/photo.png diff --git a/static/images/activateCard/photo1.png b/pages/sub_index/images/activateCard/photo1.png similarity index 100% rename from static/images/activateCard/photo1.png rename to pages/sub_index/images/activateCard/photo1.png diff --git a/static/images/activateCard/photo2.png b/pages/sub_index/images/activateCard/photo2.png similarity index 100% rename from static/images/activateCard/photo2.png rename to pages/sub_index/images/activateCard/photo2.png diff --git a/static/images/cardApply/banner.png b/pages/sub_index/images/cardApply/banner.png similarity index 100% rename from static/images/cardApply/banner.png rename to pages/sub_index/images/cardApply/banner.png diff --git a/static/images/introduce/bannar1.png b/pages/sub_index/images/introduce/bannar1.png similarity index 100% rename from static/images/introduce/bannar1.png rename to pages/sub_index/images/introduce/bannar1.png diff --git a/static/images/map/mark.png b/pages/sub_index/images/map/mark.png similarity index 100% rename from static/images/map/mark.png rename to pages/sub_index/images/map/mark.png diff --git a/static/images/map/my.png b/pages/sub_index/images/map/my.png similarity index 100% rename from static/images/map/my.png rename to pages/sub_index/images/map/my.png diff --git a/pages/sub_index/introduce/index.vue b/pages/sub_index/introduce.vue similarity index 99% rename from pages/sub_index/introduce/index.vue rename to pages/sub_index/introduce.vue index 657bb24..375e7a7 100644 --- a/pages/sub_index/introduce/index.vue +++ b/pages/sub_index/introduce.vue @@ -73,7 +73,7 @@ display: flex; flex-direction: column; align-items: center; - background-image: url(/static/images/introduce/bannar1.png); + background-image: url(./images/introduce/bannar1.png); background-position: top; border-radius: 30rpx; background-size: cover; diff --git a/pages/sub_index/issueQuestion/index.vue b/pages/sub_index/issueQuestion.vue similarity index 100% rename from pages/sub_index/issueQuestion/index.vue rename to pages/sub_index/issueQuestion.vue diff --git a/pages/sub_index/offlineHelp/index.nvue b/pages/sub_index/offlineHelp.nvue similarity index 98% rename from pages/sub_index/offlineHelp/index.nvue rename to pages/sub_index/offlineHelp.nvue index 89e3fe0..315f56e 100644 --- a/pages/sub_index/offlineHelp/index.nvue +++ b/pages/sub_index/offlineHelp.nvue @@ -49,16 +49,16 @@ circles: [{ longitude: 0, latitude: 0, - fillColor: 'rgba(219, 244, 255, .6)', + fillColor: '#DBF4FF99', radius: 1500, - color: 'rgba(219, 244, 255, .6)' + color: '#DBF4FF99' }], markList: [{ id: 0, longitude: 0, latitude: 0, title: '我所在位置', - iconPath: '/static/images/map/my.png', + iconPath: './images/map/my.png', width: 20, height: 20, index: 0 @@ -152,7 +152,7 @@ that.markList.push({ longitude: value.location.substr(0, value.location.indexOf(",")), latitude: value.location.substr(value.location.indexOf(",") + 1), - iconPath: '/static/images/map/mark.png', + iconPath: './images/map/mark.png', width: 20, height: 35, title: value.name, diff --git a/pages/sub_index/scanView/pay.vue b/pages/sub_index/pay.vue similarity index 100% rename from pages/sub_index/scanView/pay.vue rename to pages/sub_index/pay.vue diff --git a/pages/sub_index/qrcode/index.vue b/pages/sub_index/qrcode.vue similarity index 98% rename from pages/sub_index/qrcode/index.vue rename to pages/sub_index/qrcode.vue index d2a5ce4..ef5f0b2 100644 --- a/pages/sub_index/qrcode/index.vue +++ b/pages/sub_index/qrcode.vue @@ -78,7 +78,7 @@ success(res) { if (res.confirm) { uni.navigateTo({ - url: "/pages/sub_mine/bindBankCard/index" + url: "/pages/sub_mine/bindBankCard" }) } } diff --git a/pages/sub_index/question/index.vue b/pages/sub_index/question.vue similarity index 100% rename from pages/sub_index/question/index.vue rename to pages/sub_index/question.vue diff --git a/pages/sub_index/scanView/index.vue b/pages/sub_index/scanView.vue similarity index 100% rename from pages/sub_index/scanView/index.vue rename to pages/sub_index/scanView.vue diff --git a/pages/sub_medical/appointment.vue b/pages/sub_medical/appointment.vue index a80132d..5b530a5 100644 --- a/pages/sub_medical/appointment.vue +++ b/pages/sub_medical/appointment.vue @@ -89,7 +89,7 @@ onLoad() { uni.setNavigationBarTitle({title:'医院查询'}) this.get_hospital_list() - this.getLocal() + //this.getLocal() }, methods: { getLocal() { @@ -123,7 +123,7 @@ item.icon = url + '/' + item.picid }) that.hospital_list = list - console.log(list) + // console.log(list) }) } } diff --git a/pages/sub_medical/cashFlow.vue b/pages/sub_medical/cashFlow.vue index c1030de..406018c 100644 --- a/pages/sub_medical/cashFlow.vue +++ b/pages/sub_medical/cashFlow.vue @@ -9,6 +9,7 @@ + @@ -33,6 +34,7 @@ + @@ -67,14 +69,17 @@ }, onLoad(options) { let hospitalcode = options.hospitalcode + let cardno = options.cardno this.hospitalcode = hospitalcode - // this.get_unpay_list(hospitalcode) + this.cardno = cardno + //this.get_unpay_list(hospitalcode,cardno) }, methods: { - get_unpay_list(code) { + get_unpay_list(code,no) { let that = this let param = { - hospitalcode: code + hospitalcode: code, + cardno:no?no:'' } that.$u.post('/medicalapi/unpayed/list', param).then(res => { that.unpay_list = res.data @@ -101,19 +106,24 @@ changeTurnoverList(e) { this.leftOright = e if (e) { - this.get_unpay_list(this.hospitalcode) + this.get_unpay_list(this.hospitalcode,this.cardno) } else { this.get_payed_list(this.hospitalcode) } }, }, onShow() { - let e = this.leftOright - if (e) { - this.get_unpay_list(this.hospitalcode) - } else { - this.get_payed_list(this.hospitalcode) - } + let list = [{mergingName:'西药',subjectName:'骨科',doctorName:'张三',mergingSubtotal:'0.01',status:'init',medicalDate:'20210315143000', + hospitalName:'大理市第一人民医院',hospitalcode:'532901107',billNo:'20210407160526000105'}, + {mergingName:'感冒药',subjectName:'儿科',doctorName:'李武',mergingSubtotal:'0.01',status:'init',medicalDate:'20210315143000', + hospitalName:'大理市第一人民医院',hospitalcode:'530602999',billNo:'20210407160526000106',}] + this.unpay_list = list + // let e = this.leftOright + // if (e) { + // this.get_unpay_list(this.hospitalcode) + // } else { + // this.get_payed_list(this.hospitalcode) + // } } } diff --git a/pages/sub_medical/z_components/calendar/calendar.vue b/pages/sub_medical/components/calendar/calendar.vue similarity index 100% rename from pages/sub_medical/z_components/calendar/calendar.vue rename to pages/sub_medical/components/calendar/calendar.vue diff --git a/pages/sub_medical/z_components/keyboard-package/keyboard-package.vue b/pages/sub_medical/components/keyboard-package/keyboard-package.vue similarity index 100% rename from pages/sub_medical/z_components/keyboard-package/keyboard-package.vue rename to pages/sub_medical/components/keyboard-package/keyboard-package.vue diff --git a/pages/sub_medical/z_components/password-input/password-input.vue b/pages/sub_medical/components/password-input/password-input.vue similarity index 100% rename from pages/sub_medical/z_components/password-input/password-input.vue rename to pages/sub_medical/components/password-input/password-input.vue diff --git a/pages/sub_medical/z_components/uni-popup/message.js b/pages/sub_medical/components/uni-popup/message.js similarity index 100% rename from pages/sub_medical/z_components/uni-popup/message.js rename to pages/sub_medical/components/uni-popup/message.js diff --git a/pages/sub_medical/z_components/uni-popup/popup.js b/pages/sub_medical/components/uni-popup/popup.js similarity index 100% rename from pages/sub_medical/z_components/uni-popup/popup.js rename to pages/sub_medical/components/uni-popup/popup.js diff --git a/pages/sub_medical/z_components/uni-popup/popup.vue b/pages/sub_medical/components/uni-popup/popup.vue similarity index 100% rename from pages/sub_medical/z_components/uni-popup/popup.vue rename to pages/sub_medical/components/uni-popup/popup.vue diff --git a/pages/sub_medical/z_components/uni-popup/uni-popup-dialog.vue b/pages/sub_medical/components/uni-popup/uni-popup-dialog.vue similarity index 100% rename from pages/sub_medical/z_components/uni-popup/uni-popup-dialog.vue rename to pages/sub_medical/components/uni-popup/uni-popup-dialog.vue diff --git a/pages/sub_medical/z_components/uni-popup/uni-popup-message.vue b/pages/sub_medical/components/uni-popup/uni-popup-message.vue similarity index 100% rename from pages/sub_medical/z_components/uni-popup/uni-popup-message.vue rename to pages/sub_medical/components/uni-popup/uni-popup-message.vue diff --git a/pages/sub_medical/z_components/uni-popup/uni-popup-share.vue b/pages/sub_medical/components/uni-popup/uni-popup-share.vue similarity index 100% rename from pages/sub_medical/z_components/uni-popup/uni-popup-share.vue rename to pages/sub_medical/components/uni-popup/uni-popup-share.vue diff --git a/pages/sub_medical/z_components/uni-popup/uni-popup.vue b/pages/sub_medical/components/uni-popup/uni-popup.vue similarity index 100% rename from pages/sub_medical/z_components/uni-popup/uni-popup.vue rename to pages/sub_medical/components/uni-popup/uni-popup.vue diff --git a/pages/sub_medical/hospital.vue b/pages/sub_medical/hospital.vue index 7cf850d..3bd99f2 100644 --- a/pages/sub_medical/hospital.vue +++ b/pages/sub_medical/hospital.vue @@ -14,8 +14,8 @@ {{notice}} - - + + @@ -35,7 +35,6 @@ - @@ -52,11 +51,13 @@ value: 1, }], hospital_list: [], - notice:'暂无数据' + notice: '暂无医院', + } }, - onLoad() { - + onLoad(options) { + this.kind = options.id + this.get_hospital_list() }, methods: { get_hospital_list() { @@ -64,14 +65,29 @@ let name = that.hospial let params = { pageno: 1, - pagesize: 10, + pagesize: 100, name: name } that.$u.get('/medicalapi/hospital/list', params).then(res => { - that.hospital_list = res.data.list - that.notice = '没有搜索到此关键词' - console.log(res.data.list) + let list = res.data.list + if (!list.length) { + that.notice = '没有搜索到此关键词' + return + } + that.hospital_list = list }) + }, + get(e) { + let kind = this.kind + if (kind == 'toReports') { + uni.navigateTo({ + url: '/pages/sub_medical/report?code=' + e + }) + } else if (kind == 'toBills') { + uni.navigateTo({ + url: '/pages/sub_medical/queryBills?code=' + e + }) + } } } } diff --git a/pages/sub_medical/pay.vue b/pages/sub_medical/pay.vue index 5c9ebe5..52266e6 100644 --- a/pages/sub_medical/pay.vue +++ b/pages/sub_medical/pay.vue @@ -15,10 +15,11 @@ - {{msg.status=='wip'?'查询订单状态':'立即支付'}} + {{msg.status=='wip'?'查询订单状态':'立即支付'}} 通知医院 + 申请退款 - + + + diff --git a/pages/sub_medical/queryDate.vue b/pages/sub_medical/queryDate.vue index d2ff8d8..ffd4601 100644 --- a/pages/sub_medical/queryDate.vue +++ b/pages/sub_medical/queryDate.vue @@ -46,7 +46,7 @@ @@ -174,7 +180,7 @@ font-family: "PingFang-SC-Medium"; &-bannar { - background-image: url(/static/images/integral/bannar.png); + background-image: url(./images/integral/bannar.png); background-position: top; background-repeat: no-repeat; background-size: cover; diff --git a/pages/sub_mine/integralQuery/index.vue b/pages/sub_mine/integralQuery.vue similarity index 100% rename from pages/sub_mine/integralQuery/index.vue rename to pages/sub_mine/integralQuery.vue diff --git a/pages/sub_mine/leaveMsg/index.vue b/pages/sub_mine/leaveMsg.vue similarity index 100% rename from pages/sub_mine/leaveMsg/index.vue rename to pages/sub_mine/leaveMsg.vue diff --git a/pages/sub_mine/leaveMsgDetail/index.vue b/pages/sub_mine/leaveMsgDetail.vue similarity index 97% rename from pages/sub_mine/leaveMsgDetail/index.vue rename to pages/sub_mine/leaveMsgDetail.vue index 58bf971..624fbf3 100644 --- a/pages/sub_mine/leaveMsgDetail/index.vue +++ b/pages/sub_mine/leaveMsgDetail.vue @@ -19,7 +19,7 @@ - + diff --git a/pages/sub_mine/lock/index.vue b/pages/sub_mine/lock.vue similarity index 95% rename from pages/sub_mine/lock/index.vue rename to pages/sub_mine/lock.vue index 547e5b0..72aa6f8 100644 --- a/pages/sub_mine/lock/index.vue +++ b/pages/sub_mine/lock.vue @@ -11,7 +11,7 @@ + + diff --git a/pages/sub_mine/shop.vue b/pages/sub_mine/shop.vue new file mode 100644 index 0000000..f7b9f54 --- /dev/null +++ b/pages/sub_mine/shop.vue @@ -0,0 +1,98 @@ + + + + + diff --git a/pages/sub_mine/unbindBankCard/index.vue b/pages/sub_mine/unbindBankCard.vue similarity index 100% rename from pages/sub_mine/unbindBankCard/index.vue rename to pages/sub_mine/unbindBankCard.vue diff --git a/pages/sub_mine/voucher/index.vue b/pages/sub_mine/voucher.vue similarity index 100% rename from pages/sub_mine/voucher/index.vue rename to pages/sub_mine/voucher.vue diff --git a/pages/sub_tabbar/active.vue b/pages/sub_tabbar/active.vue index 3f6b446..5a90715 100644 --- a/pages/sub_tabbar/active.vue +++ b/pages/sub_tabbar/active.vue @@ -10,8 +10,8 @@ {{item.title}} - 查看详情 - + 查看详情 + @@ -145,6 +145,10 @@ onLoad() { this.getActivity(1, "OnlineActivities") this.getActivity(1, "OfflineActivities") + let token = uni.getStorageSync('token') + if (token) { + this.getIntegralStatus() + } }, methods: { getActivity(no, code) { diff --git a/pages/sub_tabbar/index.vue b/pages/sub_tabbar/index.vue index 7264790..ebd1fe7 100644 --- a/pages/sub_tabbar/index.vue +++ b/pages/sub_tabbar/index.vue @@ -11,10 +11,10 @@ - + - + @@ -57,11 +57,11 @@ 签到即可领积分 - + - {{activity.title?activity.title:''}} - {{activity.subtitle?activity.subtitle:'暂无'}} + {{activity.title?activity.title:'暂无'}} + {{activity.subtitle?activity.subtitle:'热门活动'}} @@ -76,21 +76,21 @@ 市民卡业务 - + 市民卡简介 - + 办理 网络快速办理 - + 咨询 24小时在线咨询 @@ -144,6 +144,8 @@ }, methods: { get_prompt() { + let is_notice = uni.getStorageSync('is_notice') + if (!is_notice && is_notice != '') return false //提示更新或通告 let vername = app.globalData.vername let verno = app.globalData.verno @@ -156,7 +158,19 @@ if (!!is_have_content) { uni.showModal({ title: '提示', - content: is_have_content + content: is_have_content, + cancelText: '不再提醒', + confirmText: '我知道了', + success(res) { + if (res.cancel) { + uni.setStorageSync('is_notice', false) + uni.showModal({ + title:"提示", + content:'您可以通过"我的->我的设置->通知功能"重新开启通知提示', + showCancel:false + }) + } + } }) } @@ -168,9 +182,59 @@ title: "搜索服务功能暂未开通", duration: 1500 }) + this.searchVal ='' }, scan() { + // #ifdef MP-WEIXIN + uni.scanCode({ + success(res) { + let url = res.result + uni.showToast({ + title: "扫描成功", + icon: "none", + duration: 800, + complete() { + let param = { + url: url + } + //console.log(param.url) + that.$u.get('/v1/qrcode/auth', param).then(ret => { + // console.log(ret.data) + if (ret.data.permit) { + if (ret.data.action == 'water') { + setTimeout(() => { + uni.navigateTo({ + url: "/pages/sub_index/scanView?url=" + ret.data.url + }) + }, 1500) + // } else if (ret.data.action == 'dlsmkh5') { + // let token = uni.getStorageSync('token') + // let wv = plus.webview.create(ret.data.url, 'webview_pay', { + // backButtonAutoControl: 'close', + // additionalHttpHeaders: { + // Authorization: 'Bearer ' + token + // } + // }) + // setTimeout(() => { + // wv.show() + // }, 1500) + // } + } else { + uni.showToast({ + icon: "none", + title: "暂不支持此二维码", + duration: 1500 + }) + } + } + }) + } + }) + } + }) + // #endif + // #ifdef APP-PLUS let that = this var ali = uni.requireNativePlugin("Mpaas-Scan-Module") @@ -199,7 +263,7 @@ if (ret.data.action == 'water') { setTimeout(() => { uni.navigateTo({ - url: "/pages/sub_index/scanView/index?url=" + ret.data.url + url: "/pages/sub_index/scanView?url=" + ret.data.url }) }, 1500) } else if (ret.data.action == 'dlsmkh5') { @@ -247,7 +311,7 @@ let that = this let obj = that.activeImgList[index] uni.navigateTo({ - url: '/pages/sub_index/activeDetails/index?id=' + obj.articleno + url: '/pages/sub_index/activeDetails?id=' + obj.articleno }) }, getBannarList() { @@ -274,11 +338,11 @@ }, onLoad() { this.getBannarList() + this.getActivityList() + // #ifdef APP-PLUS setTimeout(() => { this.get_prompt() }, 5 * 1000) - this.getActivityList() - // #ifdef APP-PLUS //引入插件 const KJJPush = uni.requireNativePlugin('KJ-JPush'); let uid = uni.getStorageSync("uid") diff --git a/pages/sub_tabbar/life.vue b/pages/sub_tabbar/life.vue index a03c0f9..e7dfce4 100644 --- a/pages/sub_tabbar/life.vue +++ b/pages/sub_tabbar/life.vue @@ -1,15 +1,27 @@ @@ -18,52 +30,131 @@ export default { data() { return { - list:[{ - name:'洱海', - src:'/static/images/life/erhai.jpg' - }, - { - name:'丽江', - src:'/static/images/life/lijiang.jpg' - }, - { - name:'香格里拉', - src:'/static/images/life/xianggelila.jpg' - }, - { - name:'玉龙雪山', - src:'/static/images/life/yulongxueshan.jpg' + list: [{ + name: '医疗就诊', + isShow: true, + list: [ + // { + // title: "预约挂号", + // src: "/static/images/index/wyjf.png", + // path:"" + // }, + { + title: "医疗缴费", + src: "/static/images/index/smkhd.png", + path: "/pages/sub_medical/hospital", + id: 'toBills' + }, + { + title: "报告查询", + src: "/static/images/index/wyjf.png", + path: "/pages/sub_medical/hospital", + id: "toReports" + } + ], + }, { + name: '生活缴费', + isShow: false, + list: [{ + title: "物业缴费", + src: "/static/images/index/wyjf.png", + path: "" + }, { + title: "电费", + src: "/static/images/index/df.png", + path: "" + }, { + title: "加油卡充值", + src: "/static/images/index/jykcz.png", + path: "" + }, { + title: "宽带费", + src: "/static/images/index/kdf.png", + path: "" + }, { + title: "手机缴费", + src: "/static/images/index/sjjf.png", + path: "" + }, { + title: "固话充值", + src: "/static/images/index/ghcz.png", + path: "" + }, { + title: "违章查询", + src: "/static/images/index/wzcx.png", + path: "" + }, { + title: "全部", + src: "/static/images/index/all.png", + path: "" + }], }] } }, methods: { - + // #ifdef MP-WEIXIN + toast(){ + uni.showToast({ + title:'暂不支持小程序,请前往app使用', + icon:'none' + }) + } + // #endif } } diff --git a/pages/sub_tabbar/mine.vue b/pages/sub_tabbar/mine.vue index a3f72e8..ab114f3 100644 --- a/pages/sub_tabbar/mine.vue +++ b/pages/sub_tabbar/mine.vue @@ -2,7 +2,7 @@ - + @@ -50,40 +50,46 @@ }, list: [{ name: "我的积分", - path: "/pages/sub_mine/integral/index", + path: "/pages/sub_mine/integral", icon: "integral", value:'0积分' }, { name: "我的足迹", - path: "/pages/sub_mine/cashFlow/index", + path: "/pages/sub_mine/cashFlow", icon: "bills", value:'' }, { name: "我的卡券", - path: "/pages/sub_mine/voucher/index", + path: "/pages/sub_mine/voucher", icon: "voucher", value:'' }, { name: "账户安全", - path: "/pages/sub_mine/accountSafe/index", + path: "/pages/sub_mine/accountSafe", icon: "safe", value:'' }, { name: "我的消息", - path: "/pages/sub_mine/message/index", + path: "/pages/sub_mine/message", icon: "message", value:'' }, { name: "留言反馈", - path: "/pages/sub_mine/leaveMsg/index", + path: "/pages/sub_mine/leaveMsg", icon: "leaveMsg", value:'' }, + { + name: "我的设置", + path: "/pages/sub_mine/setting", + icon: "setting", + value:'' + }, ], loginOut: { width: '600rpx', @@ -112,7 +118,9 @@ that.tel = '暂无号码' that.name = '游客' } + // #ifndef MP-WEIXIN that.list[that.list.length-1].value = 'v' + app.globalData.version + // #endif }, methods: { exit() { @@ -128,7 +136,7 @@ uni.clearStorageSync() setTimeout(() => { uni.reLaunch({ - url: "/pages/sub_basic/login/index" + url: "/pages/sub_basic/login" }) }, 1500) } @@ -143,7 +151,7 @@ complete() { setTimeout(() => { uni.reLaunch({ - url: "/pages/sub_basic/login/index" + url: "/pages/sub_basic/login" }) }, 1500) } diff --git a/pages/sub_tabbar/qrcode.vue b/pages/sub_tabbar/qrcode.vue index 9d139b2..b38a343 100644 --- a/pages/sub_tabbar/qrcode.vue +++ b/pages/sub_tabbar/qrcode.vue @@ -7,7 +7,7 @@ - 温馨提示:二维码对准闸机扫码进站 + 温馨提示:二维码对准机具扫码 @@ -78,7 +78,7 @@ success(res) { if (res.confirm) { uni.reLaunch({ - url: '/pages/sub_basic/login/index' + url: '/pages/sub_basic/login' }) } } @@ -94,7 +94,7 @@ success(res) { if (res.confirm) { uni.navigateTo({ - url: "/pages/sub_mine/bindBankCard/index" + url: "/pages/sub_mine/bindBankCard" }) } } @@ -149,11 +149,7 @@ diff --git a/static/css/iconfont.css b/static/css/iconfont.css index e35a107..765bf68 100644 --- a/static/css/iconfont.css +++ b/static/css/iconfont.css @@ -1,6 +1,6 @@ @font-face {font-family: "custom-icon"; src: - url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2') + url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2') } .custom-icon { @@ -11,6 +11,18 @@ -moz-osx-font-smoothing: grayscale; } +.custom-icon-shop:before { + content: "\e63e"; +} + +.custom-icon-tongzhi:before { + content: "\e628"; +} + +.custom-icon-setting:before { + content: "\e696"; +} + .custom-icon-mibao:before { content: "\e6ce"; } @@ -111,8 +123,8 @@ content: "\e674"; } -.custom-icon-money:before { - content: "\e602"; +.custom-icon-money-copy:before { + content: "\ec4e"; } .custom-icon-reflash:before { diff --git a/static/images/index/all.png b/static/images/index/all.png index 4de6d5b..df0eab9 100644 Binary files a/static/images/index/all.png and b/static/images/index/all.png differ diff --git a/static/images/index/bannar.png b/static/images/index/bannar.png index 7b93e96..d202f66 100644 Binary files a/static/images/index/bannar.png and b/static/images/index/bannar.png differ diff --git a/static/images/index/bannar01.png b/static/images/index/bannar01.png index a27ae44..542b477 100644 Binary files a/static/images/index/bannar01.png and b/static/images/index/bannar01.png differ diff --git a/static/images/index/bannar1.png b/static/images/index/bannar1.png index 5460723..c531110 100644 Binary files a/static/images/index/bannar1.png and b/static/images/index/bannar1.png differ diff --git a/static/images/index/bl.png b/static/images/index/bl.png index a63c1ff..b10ddf6 100644 Binary files a/static/images/index/bl.png and b/static/images/index/bl.png differ diff --git a/static/images/index/df.png b/static/images/index/df.png index 7828a2f..9fd11c4 100644 Binary files a/static/images/index/df.png and b/static/images/index/df.png differ diff --git a/static/images/index/ghcz.png b/static/images/index/ghcz.png index f769fbe..d7205a3 100644 Binary files a/static/images/index/ghcz.png and b/static/images/index/ghcz.png differ diff --git a/static/images/index/jykcz.png b/static/images/index/jykcz.png index ab3c3bf..d951923 100644 Binary files a/static/images/index/jykcz.png and b/static/images/index/jykcz.png differ diff --git a/static/images/index/kdf.png b/static/images/index/kdf.png index 492e1f0..8ff3a97 100644 Binary files a/static/images/index/kdf.png and b/static/images/index/kdf.png differ diff --git a/static/images/index/money.png b/static/images/index/money.png index ce41426..ad53d90 100644 Binary files a/static/images/index/money.png and b/static/images/index/money.png differ diff --git a/static/images/index/more.png b/static/images/index/more.png index c2ca100..9aae944 100644 Binary files a/static/images/index/more.png and b/static/images/index/more.png differ diff --git a/static/images/index/mrqd.png b/static/images/index/mrqd.png index 14df632..5a695ac 100644 Binary files a/static/images/index/mrqd.png and b/static/images/index/mrqd.png differ diff --git a/static/images/index/scan.png b/static/images/index/scan.png index 348eeea..e707df1 100644 Binary files a/static/images/index/scan.png and b/static/images/index/scan.png differ diff --git a/static/images/index/sjjf.png b/static/images/index/sjjf.png index d5f7c09..d36c5d4 100644 Binary files a/static/images/index/sjjf.png and b/static/images/index/sjjf.png differ diff --git a/static/images/index/smkhd.png b/static/images/index/smkhd.png index 903e4e7..bc58cc4 100644 Binary files a/static/images/index/smkhd.png and b/static/images/index/smkhd.png differ diff --git a/static/images/index/square.png b/static/images/index/square.png index 1512658..c994e98 100644 Binary files a/static/images/index/square.png and b/static/images/index/square.png differ diff --git a/static/images/index/wyjf.png b/static/images/index/wyjf.png index cf6e898..cfe36b6 100644 Binary files a/static/images/index/wyjf.png and b/static/images/index/wyjf.png differ diff --git a/static/images/index/wzcx.png b/static/images/index/wzcx.png index 3eec4bd..cda8b39 100644 Binary files a/static/images/index/wzcx.png and b/static/images/index/wzcx.png differ diff --git a/static/images/index/zx.png b/static/images/index/zx.png index a1a57e3..79c19e2 100644 Binary files a/static/images/index/zx.png and b/static/images/index/zx.png differ diff --git a/static/images/life/erhai.jpg b/static/images/life/erhai.jpg deleted file mode 100644 index 76ea9c3..0000000 Binary files a/static/images/life/erhai.jpg and /dev/null differ diff --git a/static/images/life/lijiang.jpg b/static/images/life/lijiang.jpg deleted file mode 100644 index 7546e30..0000000 Binary files a/static/images/life/lijiang.jpg and /dev/null differ diff --git a/static/images/life/xianggelila.jpg b/static/images/life/xianggelila.jpg deleted file mode 100644 index a3877fe..0000000 Binary files a/static/images/life/xianggelila.jpg and /dev/null differ diff --git a/static/images/life/yulongxueshan.jpg b/static/images/life/yulongxueshan.jpg deleted file mode 100644 index 61689f5..0000000 Binary files a/static/images/life/yulongxueshan.jpg and /dev/null differ diff --git a/static/js/config.js b/static/js/config.js index e6285be..879b555 100644 --- a/static/js/config.js +++ b/static/js/config.js @@ -5,18 +5,21 @@ if (process.env.NODE_ENV === 'development') { config = { // #ifdef H5 base_api: "/api", //测试地址 + // base_api: "http://172.28.43.23:8089/portal/mobileapi",//本地地址 // #endif - // base_api: "http://172.28.43.20:8089/portal/mobileapi",//本地地址 + // #ifndef H5 base_api: 'http://yy.dlsmk.cn:8080/portal/mobileapi', + base_api: 'https://yy.dlsmk.cn/portal/mobileapi', + base_api: "http://172.28.43.23:8089/portal/mobileapi",//本地地址 // #endif } } else { // 生产环境 config = { - base_api: 'https://yy.dlsmk.cn/portal/mobileapi' + base_api: 'https://yy.dlsmk.cn/portal/mobileapi', } -} +} -export default config +module.exports = config diff --git a/static/js/http.interceptor.js b/static/js/http.interceptor.js index db568be..040d6c9 100644 --- a/static/js/http.interceptor.js +++ b/static/js/http.interceptor.js @@ -1,6 +1,5 @@ import config from './config.js' const base_url = config.base_api -console.log(base_url) const install = (Vue, vm) => { // 此为自定义配置参数,具体参数见上方说明 Vue.prototype.$u.http.setConfig({ @@ -30,8 +29,9 @@ const install = (Vue, vm) => { //console.log(config.url,config.header['Authorization']) config.header["X-TENANT-ID"] = tenantid; if (config.url == "/i/activity" || config.url == "/v1/feedback/release" || - config.url == '/medicineapi/medicalcard/add' || config.url == '/medicalapi/pay' || - config.url == '/v1/security/save' || config.url == '/i/security/check' || config.url == '/i/security/pwdset') { + config.url == '/medicineapi/medicalcard/add' || config.url == '/medicalapi/quickpay/payinit' || + config.url == '/v1/security/save' || config.url == '/i/security/check' || config.url == '/i/security/pwdset' || + config.url == '/medicalapi/quickpay/confirm') { config.header['content-type'] = "application/json"; } else { config.header['content-type'] = "application/x-www-form-urlencoded"; @@ -45,7 +45,7 @@ const install = (Vue, vm) => { // res为服务端返回值,可能有code,result等字段 // 这里对res.result进行返回,将会在this.$u.post(url).then(res => {})的then回调中的res的到 // 如果配置了originalData为true,请留意这里的返回值 - if (res.data.code == 200) { + if (res.data.code == 200 || res.data.code == 501) { return res.data } else if (res.data.code == 500) { uni.showModal({ @@ -71,7 +71,7 @@ const install = (Vue, vm) => { complete(res) { setTimeout(() => { uni.reLaunch({ - url: "/pages/sub_basic/login/index" + url: "/pages/sub_basic/login" }) }, 1500) }