diff --git a/property-uniapp-project/.gitignore b/property-uniapp-project/.gitignore index 2370852..71efc7e 100644 --- a/property-uniapp-project/.gitignore +++ b/property-uniapp-project/.gitignore @@ -2,3 +2,4 @@ node_modules/ unpackage/ .hbuilderx/ .DS_Store +*.so diff --git a/property-uniapp-project/manifest.json b/property-uniapp-project/manifest.json index eb416c6..4ffa9d7 100644 --- a/property-uniapp-project/manifest.json +++ b/property-uniapp-project/manifest.json @@ -61,7 +61,7 @@ "NSPhotoLibraryAddUsageDescription" : "保存二维码图片到相册" }, "urltypes" : "uppaylyhuts", - "urlschemewhitelist" : "uppaywallet,uppaysdk,uppayx1,uppayx2,uppayx3,paesuperbank,ccbmbsylunionpay,bocom,bankabc,cmbmobilebank,cmblife,com.icbc.iphoneclient,spdbbank,spdbcccUnionPay,citicbankpay,credit,uppayxingyecredit,uppayhuaxiacredit,uppaybeijingcredit,uppayzhonghangcredit,uppayguangdacredit,uppaygonghangcredit,uppayjianhangcredit,uppayjiaohangcredit,uppayguangfa,psbccashier,uppayyouchucredit,com.cebbank.ebank,BankOfShangHai,boscgdlf,citicbankdkkj,cmbc,cibmb,bocmbankpsn,bankofbjpay,uppaynonghangcredit,uppayhuaxia,zytuppay,LZYHSJYHAUTHSSOAPP,bnbpay,dlrcb,czbank,uppayCbhb" + "urlschemewhitelist" : "bocom,bankabc,cmbmobilebank,cmblife,com.icbc.iphoneclient,spdbbank,citicbankpay,credit,com.cebbank.ebank,BankOfShangHai,boscgdlf,cmbc,cibmb,bocmbankpsn,bankofbjpay" }, /* SDK配置 */ "sdkConfigs" : { @@ -99,13 +99,40 @@ "alipay" : { "__platform__" : [ "ios", "android" ] }, - "unionpay" : { - "__platform__" : [ "ios", "android" ] - }, "weixin" : { - "__platform__" : [ "ios", "android" ], - "appid" : "", - "UniversalLinks" : "" + "__platform__" : [ "ios", "android" ] + } + } + }, + "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" } } } diff --git a/property-uniapp-project/pageSubPack/loginSub/pwd-login.vue b/property-uniapp-project/pageSubPack/loginSub/pwd-login.vue index b933f33..b27b881 100644 --- a/property-uniapp-project/pageSubPack/loginSub/pwd-login.vue +++ b/property-uniapp-project/pageSubPack/loginSub/pwd-login.vue @@ -162,7 +162,7 @@ const handleLogin = () => { } }).catch(err => { - // console.log(err) + // console.log('密码登录异常',err) uni.showToast({ title: err.msg || '网络异常', icon: 'error' diff --git a/property-uniapp-project/pageSubPack/payment-list/addHydropower.vue b/property-uniapp-project/pageSubPack/payment-list/addHydropower.vue index df21f75..b5f8972 100644 --- a/property-uniapp-project/pageSubPack/payment-list/addHydropower.vue +++ b/property-uniapp-project/pageSubPack/payment-list/addHydropower.vue @@ -200,7 +200,7 @@ } catch (err) { uni.hideLoading() uni.showToast({ - title: `${err}`, + title: err.msg || '网络异常', icon: 'none' }) console.error('绑定设备失败:', err) @@ -215,7 +215,7 @@ // 跳转成功页 const goNext = () => { uni.redirectTo({ - url: '/pageSubPack/payment-list/addPaymentSuccess' + url: '/pageSubPack/payment-list/addPaymentSuccess?type=bind' }) } diff --git a/property-uniapp-project/pageSubPack/payment-list/addPaymentSuccess.vue b/property-uniapp-project/pageSubPack/payment-list/addPaymentSuccess.vue index e038592..3e3bf9c 100644 --- a/property-uniapp-project/pageSubPack/payment-list/addPaymentSuccess.vue +++ b/property-uniapp-project/pageSubPack/payment-list/addPaymentSuccess.vue @@ -1,7 +1,7 @@