From f86c251edbf19989fc2cfd47e3b437e28750351a Mon Sep 17 00:00:00 2001
From: yangsanTT <812952667@qq.com>
Date: Tue, 26 Oct 2021 21:23:32 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=95=B4=E7=90=86=E9=93=B6=E8=81=94=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
high-unionPay/App.vue | 16 +-
high-unionPay/manifest.json | 6 +-
high-unionPay/pages.json | 104 +++++++++----
.../pages/goods/goods-list/goods-list.vue | 4 +-
high-unionPay/pages/goods/refuel/refuel.vue | 2 +-
high-unionPay/pages/login/register.vue | 20 +--
high-unionPay/pages/tabBar/user/user.vue | 41 ++---
.../recharge-centre/recharge-centre.vue | 145 ++++++++++++++++++
.../pages/unionPay/recharge/recharge.vue | 30 ++++
.../unionPay-entrance/unionPay-entrance.vue | 55 +++++++
high-unionPay/pages/unionPay/unionPay.vue | 28 ++++
high-unionPay/static/img/unionimg/hsg1.jpg | Bin 0 -> 124627 bytes
high-unionPay/static/img/unionimg/hsg2.jpg | Bin 0 -> 117715 bytes
high-unionPay/static/img/unionimg/hsg3.jpg | Bin 0 -> 107418 bytes
high-unionPay/static/img/unionimg/hsg4.jpg | Bin 0 -> 155649 bytes
high-unionPay/static/img/unionimg/union1.jpg | Bin 0 -> 274638 bytes
high-unionPay/static/img/unionimg/union2.jpg | Bin 0 -> 221828 bytes
high-unionPay/static/img/unionimg/upay1.jpg | Bin 0 -> 115944 bytes
high-unionPay/static/img/unionimg/upay2.jpg | Bin 0 -> 126459 bytes
high-unionPay/static/img/unionimg/upay3.jpg | Bin 0 -> 294697 bytes
high-unionPay/static/img/unionimg/upay4.jpg | Bin 0 -> 143388 bytes
21 files changed, 380 insertions(+), 71 deletions(-)
create mode 100644 high-unionPay/pages/unionPay/recharge-centre/recharge-centre.vue
create mode 100644 high-unionPay/pages/unionPay/recharge/recharge.vue
create mode 100644 high-unionPay/pages/unionPay/unionPay-entrance/unionPay-entrance.vue
create mode 100644 high-unionPay/pages/unionPay/unionPay.vue
create mode 100644 high-unionPay/static/img/unionimg/hsg1.jpg
create mode 100644 high-unionPay/static/img/unionimg/hsg2.jpg
create mode 100644 high-unionPay/static/img/unionimg/hsg3.jpg
create mode 100644 high-unionPay/static/img/unionimg/hsg4.jpg
create mode 100644 high-unionPay/static/img/unionimg/union1.jpg
create mode 100644 high-unionPay/static/img/unionimg/union2.jpg
create mode 100644 high-unionPay/static/img/unionimg/upay1.jpg
create mode 100644 high-unionPay/static/img/unionimg/upay2.jpg
create mode 100644 high-unionPay/static/img/unionimg/upay3.jpg
create mode 100644 high-unionPay/static/img/unionimg/upay4.jpg
diff --git a/high-unionPay/App.vue b/high-unionPay/App.vue
index 0ded058..b9d974e 100644
--- a/high-unionPay/App.vue
+++ b/high-unionPay/App.vue
@@ -5,15 +5,15 @@
// brestUrl: 'http://192.168.3.4:9302/brest',
// imgUrl: 'https://192.168.3.4:9301/filesystem/',
//正式
- // url: 'https://hsg.dctpay.com/crest',
- // imgUrl: 'https://hsg.dctpay.com/filesystem/',
- // brestUrl : 'https://hsg.dctpay.com/brest',
- // imageWxImg:'https://hsg.dctpay.com/filesystem/wxApplets/',
+ url: 'https://hsg.dctpay.com/crest',
+ imgUrl: 'https://hsg.dctpay.com/filesystem/',
+ brestUrl : 'https://hsg.dctpay.com/brest',
+ imageWxImg:'https://hsg.dctpay.com/filesystem/wxApplets/',
//测试
- url: 'https://hsgcs.dctpay.com/crest',
- brestUrl : 'https://hsgcs.dctpay.com/brest',
- imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
- imageWxImg:'https://hsgcs.dctpay.com/filesystem/wxApplets/',
+ // url: 'https://hsgcs.dctpay.com/crest',
+ // brestUrl : 'https://hsgcs.dctpay.com/brest',
+ // imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
+ // imageWxImg:'https://hsgcs.dctpay.com/filesystem/wxApplets/',
userInfo: "",
brestUserInfo : '',
openId: '',
diff --git a/high-unionPay/manifest.json b/high-unionPay/manifest.json
index 8c5e513..90913b7 100644
--- a/high-unionPay/manifest.json
+++ b/high-unionPay/manifest.json
@@ -83,13 +83,13 @@
"title" : "嗨森逛",
"router" : {
"mode" : "hash",
- "base" : "/H5"
+ "base" : "/unionPay"
},
"devServer" : {
"port" : "",
- "https" : true
+ "https" : false
},
- "domain" : "https://hsgcs.dctpay.com",
+ "domain" : "https://hsg.dctpay.com",
"template" : ""
}
}
diff --git a/high-unionPay/pages.json b/high-unionPay/pages.json
index 21c7711..b0e8ff7 100644
--- a/high-unionPay/pages.json
+++ b/high-unionPay/pages.json
@@ -1,6 +1,17 @@
{
"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
{
+ "path" : "pages/unionPay/unionPay",
+ "style" :
+ {
+ "navigationBarTitleText": "银联支付",
+ "navigationBarTextStyle": "white",
+ "navigationBarBackgroundColor": "#0083f5",
+ "backgroundColorTop": "#0083f5",
+ "enablePullDownRefresh": false
+ }
+
+ },{
"path": "pages/tabBar/home/home",
"style": {
"navigationBarTextStyle": "white",
@@ -139,7 +150,7 @@
"backgroundColorTop": "#0083f5",
"navigationBarTextStyle": "white",
"app-plus": {
- "titleNView": false, //禁用原生导航栏
+ // "titleNView": false, //禁用原生导航栏
"subNVues": [{
"id": "userTitleNvue", // 唯一标识
"path": "pages/tabBar/user/subNvue/userTitleNvue", // 页面路径
@@ -463,8 +474,43 @@
}
}
-
- ],
+ ,{
+ "path" : "pages/unionPay/recharge/recharge",
+ "style" :
+ {
+ "navigationBarTitleText": "话费充值",
+ "navigationBarTextStyle": "white",
+ "navigationBarBackgroundColor": "#0083f5",
+ "backgroundColorTop": "#0083f5",
+ "enablePullDownRefresh": false
+ }
+
+ }
+ ,{
+ "path" : "pages/unionPay/unionPay-entrance/unionPay-entrance",
+ "style" :
+ {
+ "navigationBarTitleText": "银联入口",
+ "navigationBarTextStyle": "white",
+ "navigationBarBackgroundColor": "#0083f5",
+ "backgroundColorTop": "#0083f5",
+ "enablePullDownRefresh": false
+ }
+
+ }
+ ,{
+ "path" : "pages/unionPay/recharge-centre/recharge-centre",
+ "style" :
+ {
+ "navigationBarTitleText": "",
+ "navigationBarTextStyle": "white",
+ "navigationBarBackgroundColor": "#0083f5",
+ "backgroundColorTop": "#0083f5",
+ "enablePullDownRefresh": false
+ }
+
+ }
+ ],
"subpackages": [{
"root": "subPages",
"pages": [{
@@ -487,31 +533,31 @@
"backgroundColor": "#ffffff",
"backgroundColorTop": "#ffffff",
"backgroundColorBottom": "#ffffff"
- },
- "tabBar": {
- "color": "#333333",
- "selectedColor": "#0083f5",
- "borderStyle": "black",
- "backgroundColor": "#ffffff",
- "list": [{
- "pagePath": "pages/tabBar/home/home",
- "iconPath": "static/img/tabBar/home.png",
- "selectedIconPath": "static/img/tabBar/home-on.png",
- "text": "首页"
- },
- {
- "pagePath": "pages/tabBar/category/category",
- "iconPath": "static/img/tabBar/category.png",
- "selectedIconPath": "static/img/tabBar/category-on.png",
- "text": "导航"
- },
-
- {
- "pagePath": "pages/tabBar/user/user",
- "iconPath": "static/img/tabBar/user.png",
- "selectedIconPath": "static/img/tabBar/user-on.png",
- "text": "我的"
- }
- ]
}
+ // "tabBar": {
+ // "color": "#333333",
+ // "selectedColor": "#0083f5",
+ // "borderStyle": "black",
+ // "backgroundColor": "#ffffff",
+ // "list": [{
+ // "pagePath": "pages/tabBar/home/home",
+ // "iconPath": "static/img/tabBar/home.png",
+ // "selectedIconPath": "static/img/tabBar/home-on.png",
+ // "text": "首页"
+ // },
+ // {
+ // "pagePath": "pages/tabBar/category/category",
+ // "iconPath": "static/img/tabBar/category.png",
+ // "selectedIconPath": "static/img/tabBar/category-on.png",
+ // "text": "导航"
+ // },
+
+ // {
+ // "pagePath": "pages/tabBar/user/user",
+ // "iconPath": "static/img/tabBar/user.png",
+ // "selectedIconPath": "static/img/tabBar/user-on.png",
+ // "text": "我的"
+ // }
+ // ]
+ // }
}
diff --git a/high-unionPay/pages/goods/goods-list/goods-list.vue b/high-unionPay/pages/goods/goods-list/goods-list.vue
index e06335b..d062775 100644
--- a/high-unionPay/pages/goods/goods-list/goods-list.vue
+++ b/high-unionPay/pages/goods/goods-list/goods-list.vue
@@ -110,7 +110,7 @@
//获取弹出或者弹窗
getCmsContent() {
let params = {
- regionId: app.globalData.cityId,
+ regionId: '500000',
categoryCode: 'CMS_WX_APPLETS_GOODS_LIST'
}
getCmsContent(params).then(res => {
@@ -134,7 +134,7 @@
}
let pagenum = this.pageNum;
let params = {
- regionId: app.globalData.cityId,
+ regionId: '500000',
pageNum: pagenum,
pageSize: this.pageSize,
displayArea: this.typeId,
diff --git a/high-unionPay/pages/goods/refuel/refuel.vue b/high-unionPay/pages/goods/refuel/refuel.vue
index d088b05..ffecd34 100644
--- a/high-unionPay/pages/goods/refuel/refuel.vue
+++ b/high-unionPay/pages/goods/refuel/refuel.vue
@@ -391,7 +391,7 @@
let params = {
storeName: this.searname,
distance: this.distanceNum,
- regionId: app.globalData.cityId,
+ regionId: '500000',
oilNoName: this.onilName,
latitude: this.latitudeful,
longitude: this.longitudeful,
diff --git a/high-unionPay/pages/login/register.vue b/high-unionPay/pages/login/register.vue
index 04f79fc..f99c3f0 100644
--- a/high-unionPay/pages/login/register.vue
+++ b/high-unionPay/pages/login/register.vue
@@ -9,11 +9,11 @@
- {{getCodeText}}
-
+ {{getCodeText}}
+
-
+
-
+
@@ -43,7 +43,7 @@
return {
phoneNumber: "",
imagewxUrl: app.globalData.imageWxImg,
- imgadres:'wx.png',
+ imgadres: 'wx.png',
code: '',
passwd: "",
getCodeText: '获取验证码',
@@ -149,13 +149,14 @@
})
if (this.isWeiXinLogin()) {
//微信内核支付
- location.href ='https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https%3A%2F%2Fhsgcs.dctpay.com%2FH5%2Findex.html%23%2F&response_type=code&scope=snsapi_base&state=1#wechat_redirect'
- }else{
+ location.href =
+ 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https%3A%2F%2Fhsgcs.dctpay.com%2FH5%2Findex.html%23%2F&response_type=code&scope=snsapi_base&state=1#wechat_redirect'
+ } else {
uni.reLaunch({
url: '/pages/tabBar/home/home'
})
}
-
+
} else {
uni.showToast({
title: res.return_msg,
@@ -224,6 +225,7 @@
width: 50px;
height: 50px;
margin-left: 40%;
- margin-top: 250upx;
+ margin-top: 90px;
+ margin-bottom: 40px;
}
diff --git a/high-unionPay/pages/tabBar/user/user.vue b/high-unionPay/pages/tabBar/user/user.vue
index 2e754a5..7822422 100644
--- a/high-unionPay/pages/tabBar/user/user.vue
+++ b/high-unionPay/pages/tabBar/user/user.vue
@@ -31,12 +31,12 @@
-